Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

src/api/mes/reportpStore/index.ts

@@ -0,0 +1,56 @@
+import request from '@/config/axios'
+
+export interface ReportpStoreVO {
+  status: string
+  remark: string
+  planDayCode: string
+  workBillNo: string
+  batchCode: string
+  reportUuid: string
+  itemBasicCode: string
+  itemCounts: number
+  itemUom: string
+  workstationCode: string
+  productCode: string
+}
+
+// 查询工序报工物料明细列表
+export const getReportpStorePage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/mes/reportp-store/senior', data })
+  } else {
+    return await request.get({ url: `/mes/reportp-store/page`, params })
+  }
+}
+
+// 查询工序报工物料明细详情
+export const getReportpStore = async (id: number) => {
+  return await request.get({ url: `/mes/reportp-store/get?id=` + id })
+}
+
+// 新增工序报工物料明细
+export const createReportpStore = async (data: ReportpStoreVO) => {
+  return await request.post({ url: `/mes/reportp-store/create`, data })
+}
+
+// 修改工序报工物料明细
+export const updateReportpStore = async (data: ReportpStoreVO) => {
+  return await request.put({ url: `/mes/reportp-store/update`, data })
+}
+
+// 删除工序报工物料明细
+export const deleteReportpStore = async (id: number) => {
+  return await request.delete({ url: `/mes/reportp-store/delete?id=` + id })
+}
+
+// 导出工序报工物料明细 Excel
+export const exportReportpStore = async (params) => {
+  return await request.download({ url: `/mes/reportp-store/export-excel`, params })
+}
+
+// 下载用户导入模板
+export const importTemplate = () => {
+  return request.download({ url: '/mes/reportp-store/get-import-template' })
+}

src/views/mes/orderDay/components/schedule.vue

@@ -25,12 +25,12 @@
             <template #header>
               <div class="card-header">
                 <span>工艺路线</span>
-                <el-button
+                <!-- <el-button
                   type="text"
                   icon="el-icon-plus"
                   @click="opensearchTable"
                   style="float: right; padding: 3px 0"
-                >添加工序</el-button>
+                >添加工序</el-button> -->
               </div>
             </template>
             <el-table :data="processData" ref="tableProcess" style="width: 100%; height: 80%" @cell-dblclick="userAddNode">
@@ -40,11 +40,11 @@
                 <template #header>
                   <span>操作</span>
                 </template>
-                <template #default="scope">
+                <!-- <template #default="scope">
                   <el-button type="danger" size="mini" text @click="deleteNode(scope.row)"
                   >移除</el-button
                   >
-                </template>
+                </template> -->
               </el-table-column>
             </el-table>
           </el-card>
@@ -395,13 +395,13 @@ const opensearchTable = (
 ) => {
   //console.log("opensearchTable")
   const _searchCondition = {}
-  const _searchTableTitle = "工序查询"
+  // const _searchTableTitle = "工序查询"
-  const _searchTableAllSchemas = ProcessSearch.allSchemas
+  // const _searchTableAllSchemas = ProcessSearch.allSchemas
-  const _searchTablePage = ProcessApi.getProcessPage
+  // const _searchTablePage = ProcessApi.getProcessPage
   searchTableRef.value.open(
-    _searchTableTitle,
+    '工序查询',
-    _searchTableAllSchemas,
+    ProcessSearch.allSchemas,
-    _searchTablePage,
+    ProcessApi.getProcessPage,
     'process',
     'process',
     true,
@@ -409,8 +409,9 @@ const opensearchTable = (
     undefined,
     _searchCondition,
     false,
-    true
+    //true
   )
+  
 }
 const publishPlan=()=>{
      message.confirm("确认发布当前计划？","question").then(async () => {

src/views/mes/processroute/components/configDialog.vue

@@ -194,7 +194,7 @@ const opensearchTable = (
     undefined,
     _searchCondition,
     false,
-    true
+    //true
   )
 }
 //查询工序

src/views/mes/reportpStore/index.vue

@@ -0,0 +1,244 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <Search :schema="ReportpStore.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+  </ContentWrap>
+
+    <!-- 列表头部 -->
+    <TableHead
+      :HeadButttondata="HeadButttondata"
+      @button-base-click="buttonBaseClick"
+      :routeName="routeName"
+      @updataTableColumns="updataTableColumns"
+      @searchFormClick="searchFormClick"
+      :allSchemas="ReportpStore.allSchemas"
+    />
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <Table
+      :columns="tableColumns"
+      :data="tableObject.tableList"
+      :loading="tableObject.loading"
+      :pagination="{
+        total: tableObject.total
+      }"
+      v-model:pageSize="tableObject.pageSize"
+      v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+    >
+      <template #code="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
+          <span>{{ row.code }}</span>
+        </el-button>
+      </template>
+      <template #action="{ row }">
+        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+      </template>
+    </Table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <BasicForm
+    ref="basicFormRef"
+    @success="formsSuccess"
+    :rules="ReportpStoreRules"
+    :formAllSchemas="ReportpStore.allSchemas"
+    :apiUpdate="ReportpStoreApi.updateReportpStore"
+    :apiCreate="ReportpStoreApi.createReportpStore"
+    @searchTableSuccess="searchTableSuccess"
+    :isBusiness="false"
+  />
+
+  <!-- 详情 -->
+  <Detail ref="detailRef" :isBasic="true" :allSchemas="ReportpStore.allSchemas" />
+
+  <!-- 导入 -->
+  <ImportForm ref="importFormRef" url="/mes/reportp-store/import" :importTemplateData="importTemplateData" @success="importSuccess" />
+</template>
+
+<script setup lang="ts">
+import download from '@/utils/download'
+import { ReportpStore,ReportpStoreRules } from './reportpStore.data'
+import * as ReportpStoreApi from '@/api/mes/reportpStore'
+import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import TableHead from '@/components/TableHead/src/TableHead.vue'
+import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
+import Detail from '@/components/Detail/src/Detail.vue'
+
+defineOptions({ name: 'MesReportpStore' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const route = useRoute() // 路由信息
+const routeName = ref()
+routeName.value = route.name
+const tableColumns = ref(ReportpStore.allSchemas.tableColumns)
+
+// 查询页面返回
+const searchTableSuccess = (formField, searchField, val, formRef) => {
+  nextTick(() => {
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
+  })
+}
+
+// 字段设置 更新主列表字段
+const updataTableColumns = (val) => {
+  tableColumns.value = val
+}
+
+const { tableObject, tableMethods } = useTable({
+  getListApi: ReportpStoreApi.getReportpStorePage // 分页接口
+})
+
+// 获得表格的各种操作
+const { getList, setSearchParams } = tableMethods
+
+// 列表头部按钮
+const HeadButttondata = [
+  defaultButtons.defaultAddBtn({hasPermi:'wms:reportpStore:create'}), // 新增
+  defaultButtons.defaultImportBtn({hasPermi:'wms:reportpStore:import'}), // 导入
+  defaultButtons.defaultExportBtn({hasPermi:'wms:reportpStore:export'}), // 导出
+  defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultFilterBtn(null), // 筛选
+  defaultButtons.defaultSetBtn(null), // 设置
+  // {
+  //   label: '自定义扩展按钮',
+  //   name: 'zdy',
+  //   hide: false,
+  //   type: 'primary',
+  //   icon: 'Select',
+  //   color: ''
+  // },
+]
+
+// 头部按钮事件
+const buttonBaseClick = (val, item) => {
+  if (val == 'add') { // 新增
+    openForm('create')
+  } else if (val == 'import') { // 导入
+    handleImport()
+  } else if (val == 'export') { // 导出
+    handleExport()
+  } else if (val == 'refresh') { // 刷新
+    getList()
+  } else if (val == 'filtrate') { // 筛选
+  } else { // 其他按钮
+    console.log('其他按钮', item)
+  }
+}
+
+// 列表-操作按钮
+const butttondata = [
+  defaultButtons.mainListEditBtn({hasPermi:'wms:reportpStore:update'}), // 编辑
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:reportpStore:delete'}), // 删除
+]
+
+// 列表-操作按钮事件
+const buttonTableClick = async (val, row) => {
+  if (val == 'edit') { // 编辑
+    openForm('update', row)
+  } else if (val == 'delete') { // 删除
+    handleDelete(row.id)
+  }
+}
+
+/** 添加/修改操作 */
+const basicFormRef = ref()
+const openForm = (type: string, row?: any) => {
+  basicFormRef.value.open(type, row)
+}
+
+// form表单提交
+const formsSuccess = async (formType,data) => {
+  var isHave =ReportpStore.allSchemas.formSchema.some(function (item) {
+    return item.field === 'activeTime' || item.field === 'expireTime';
+  });
+  if(isHave){
+    if(data.activeTime && data.expireTime && data.activeTime >=data.expireTime){
+      message.error('失效时间要大于生效时间')
+      return;
+    }
+  }
+  if(data.activeTime==0)data.activeTime = null;
+  if(data.expireTime==0)data.expireTime = null;
+  if (formType === 'create') {
+    await ReportpStoreApi.createReportpStore(data)
+    message.success(t('common.createSuccess'))
+  } else {
+    await ReportpStoreApi.updateReportpStore(data)
+    message.success(t('common.updateSuccess'))
+  }
+  basicFormRef.value.dialogVisible = false
+  getList()
+}
+
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (row: any, titleName: any, titleValue: any) => {
+  detailRef.value.openDetail(row, titleName, titleValue, 'basicReportpStore')
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ReportpStoreApi.deleteReportpStore(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const exportLoading = ref(false) // 导出的加载中
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ReportpStoreApi.exportReportpStore(tableObject.params)
+    download.excel(data, '工序报工物料明细.xlsx')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 导入 */
+const importFormRef = ref()
+const handleImport = () => {
+  importFormRef.value.open()
+}
+// 导入附件弹窗所需的参数
+const importTemplateData = reactive({
+  templateUrl: '',
+  templateTitle: '工序报工物料明细导入模版.xlsx'
+})
+// 导入成功之后
+const importSuccess = () => {
+  getList()
+}
+
+// 筛选提交
+const searchFormClick = (searchData) => {
+  tableObject.params = {
+    isSearch: true,
+    filters: searchData.filters
+  }
+  getList() // 刷新当前列表
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  getList()
+  importTemplateData.templateUrl = await ReportpStoreApi.importTemplate()
+})
+
+</script>

src/views/mes/reportpStore/reportpStore.data.ts

@@ -0,0 +1,111 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const ReportpStoreRules = reactive({
+})
+
+export const ReportpStore = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '状态',
+    field: 'status',
+    sort: 'custom',
+    isSearch: true,
+    form: {
+      component: 'Radio'
+    },
+  },
+  {
+    label: '并发乐观锁',
+    field: 'concurrencyStamp',
+    sort: 'custom',
+    isTable: false,
+    isSearch: true,
+    isForm: false,
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    sort: 'custom',
+    isTable: false,
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    isSearch: true,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    isForm: false,
+  },
+  {
+    label: '计划编码',
+    field: 'planDayCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '工单编码',
+    field: 'workBillNo',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '批次编码',
+    field: 'batchCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '报工流水号',
+    field: 'reportUuid',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '物料编码',
+    field: 'itemBasicCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '物料数量',
+    field: 'itemCounts',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '物料单位',
+    field: 'itemUom',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '工位',
+    field: 'workstationCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '产品编码',
+    field: 'productCode',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '操作',
+    field: 'action',
+    isForm: false,
+    table: {
+      width: 150,
+      fixed: 'right'
+    }
+  }
+]))

src/views/qms/inspection/inspectionJob/addForm.vue

@@ -62,9 +62,9 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="样品份数" prop="inspectionJobCharacteristicsUpdateReqVO.inspectionQty">
+                  <el-form-item label="样品份数" prop="inspectionJobCharacteristicsUpdateReqVO.sampleQty">
                     <div style="display: flex; width: 100%">
-                      <el-input v-model="  item.inspectionJobCharacteristicsUpdateReqVO.inspectionQty" disabled placeholder="请输入样品份数" />
+                      <el-input v-model="  item.inspectionJobCharacteristicsUpdateReqVO.sampleQty" disabled placeholder="请输入样品份数" />
                     </div>
                   </el-form-item>
                 
@@ -317,7 +317,7 @@ const rules = ref({
   'inspectionJobCharacteristicsUpdateReqVO.estimateCode': [
     { required: true, message: '请选择评估代码', trigger: 'blur' }
   ],
-  'inspectionJobCharacteristicsUpdateReqVO.inspectionQty': [
+  'inspectionJobCharacteristicsUpdateReqVO.sampleQty': [
     { required: true, message: '请输入样品份数', trigger: 'blur' }
   ],
   qualifiedQuantity: [{ required: true, message: '请输入选择结束时间', trigger: 'blur' }]
@@ -347,7 +347,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
       if (item.inspectionJobCharacteristicsUpdateReqVO.resultEntryMethod == 0) {
         // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
       item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
-        for (let i = 0; i < parseInt(item.inspectionJobCharacteristicsUpdateReqVO.inspectionQty); i++) {
+        for (let i = 0; i < parseInt(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty); i++) {
           item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({
             inspectionValue: '', //检验值
             qualitativeCode: '', //定性字典项值
@@ -597,8 +597,8 @@ const submitForm = async () => {
             (cur, key) => {
               console.log(12,cur.qualifiedQuantity)
               console.log(13,cur.unqualifiedQuantity)
-              console.log(14,item.inspectionJobCharacteristicsUpdateReqVO.inspectionQty)
+              console.log(14,item.inspectionJobCharacteristicsUpdateReqVO.sampleQty)
-              return parseFloat(cur.qualifiedQuantity) + parseFloat(cur.unqualifiedQuantity) !=  parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.inspectionQty)
+              return parseFloat(cur.qualifiedQuantity) + parseFloat(cur.unqualifiedQuantity) !=  parseFloat(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty)
             }
           )
         )
@@ -783,7 +783,7 @@ const resultEntryMethodChange = (e, item) => {
   item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList = []
   if (e == 0) {
     // rules.value['inspectionJobCharacteristicsUpdateReqVO.quantifyCapping'][0].required = true
-    for (let i = 0; i <  parseInt(item.inspectionJobCharacteristicsUpdateReqVO.inspectionQty); i++) {
+    for (let i = 0; i <  parseInt(item.inspectionJobCharacteristicsUpdateReqVO.sampleQty); i++) {
       item.inspectionJobCharacteristicsUpdateReqVO.recordInspectionQuantifyList.push({
         inspectionValue: '', //检验值
         qualitativeCode: '', //定性字典项值