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

src/components/BasicForm/src/BasicForm.vue

@@ -271,6 +271,16 @@ const props = defineProps({
     type: Number,
     required: false,
     default: 0
+  },
+  //表单中展示的数据，需要用searchTable中字段计算
+  /***[{
+    formField:form中对应的field,
+    valueField:searchtable中对应的field,
+  }]*/
+  sumFormData:{
+    type: Array,
+    required: false,
+    default: null
   }
 })
 
@@ -383,6 +393,25 @@ const opensearchTable = (
     _searchCondition
   )
 }
+
+
+const changeSumFormData = () => {
+  if(props.sumFormData){
+    const sumObject = {}
+    props.sumFormData.forEach(sumItem=>{
+      sumObject[sumItem?.formField]= props.tableData.reduce((prev, item) => prev + item[sumItem?.valueField],0)
+    })
+    nextTick(()=>{
+      formRef.value.setValues(sumObject)
+    })
+  }
+}
+watch(()=>props.tableData,() => {
+  changeSumFormData()
+},{
+  deep:true
+})
+
 // 弹层确定返回所选数据
 // val ： 弹层列表row 数据
 const searchTableSuccess = (formField, searchField, val, type, row) => {

src/views/qms/basicDataManage/inspectionPlan/addForm.vue

@@ -18,7 +18,7 @@
             <el-col :span="12">
               <el-form-item label="物料编码" prop="itemCode">
                 <div style="display: flex; width: 100%">
-                  <el-input v-model="data.itemCode" disabled placeholder="请选择物料编码" />
+                  <el-input v-model="data.itemName" disabled placeholder="请选择物料编码" />
                   <el-button
                     type="info"
                     plain
@@ -32,7 +32,7 @@
                         ItemBasicApi.getItembasicPage,
                         null,
                         false,
-                        'form',
+                        'main',
                         null
                       )
                     "
@@ -49,7 +49,7 @@
             <el-col :span="12">
               <el-form-item label="检验类型编码" prop="testTypeCode">
                 <div style="display: flex; width: 100%">
-                  <el-input v-model="data.testTypeCode" disabled placeholder="请选择检验类型编码" />
+                  <el-input v-model="data.testTypeName" disabled placeholder="请选择检验类型编码" />
                   <el-button
                     type="info"
                     plain
@@ -63,7 +63,7 @@
                         SamplingProcessApi.getSamplingProcessPage,
                         null,
                         false,
-                        'form',
+                        'main',
                         null
                       )
                     "
@@ -76,7 +76,7 @@
               <el-form-item label="检验模板编码" prop="programmeTemplateCode">
                 <div style="display: flex; width: 100%">
                   <el-input
-                    v-model="data.programmeTemplateCode"
+                    v-model="data.programmeTemplateName"
                     disabled
                     placeholder="请选择检验模板编码"
                   />
@@ -93,7 +93,7 @@
                         InspectionTemplateApi.inspectionTemplatePage,
                         null,
                         false,
-                        'form',
+                        'main',
                         null
                       )
                     "
@@ -238,122 +238,122 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item
-                    label="检验方法编码"
-                    prop="inspectionCharacteristicsBaseVO.inspectionMethodCode"
-                  >
-                    <div style="display: flex; width: 100%">
-                      <el-input
-                        v-model="item.inspectionCharacteristicsBaseVO.inspectionMethodCode"
-                        disabled
-                        placeholder="请选择检验方法编码"
-                      />
-                      <el-button
-                        type="info"
-                        plain
-                        style="width: 40px"
-                        @click="
-                          opensearchTable(
-                            'inspectionMethodCode',
-                            null,
-                            '检验方法',
-                            InspectionMethod.allSchemas,
-                            InspectionMethodApi.getInspectionMethodPage,
-                            [
-                              {
-                                key: 'available',
-                                value: 'TRUE',
-                                isMainValue: false
-                              }
-                            ],
-                            false,
-                            null,
-                            item
-                          )
-                        "
-                        ><Icon icon="ep:search"
-                      /></el-button>
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item
-                    label="采样过程编码"
-                    prop="inspectionCharacteristicsBaseVO.dynamicUpdateCode"
-                  >
-                    <div style="display: flex; width: 100%">
-                      <el-input
-                        v-model="item.inspectionCharacteristicsBaseVO.dynamicUpdateCode"
-                        disabled
-                        placeholder="请选择采样过程编码"
-                      />
-                      <el-button
-                        type="info"
-                        plain
-                        style="width: 40px"
-                        @click="
-                          opensearchTable(
-                            'dynamicUpdateCode',
-                            null,
-                            '采样过程编码',
-                            SamplingProcess.allSchemas,
-                            SamplingProcessApi.getSamplingProcessPage,
-                            [
-                              {
-                                key: 'available',
-                                value: 'TRUE',
-                                isMainValue: false
-                              }
-                            ],
-                            false,
-                            null,
-                            item
-                          )
-                        "
-                        ><Icon icon="ep:search"
-                      /></el-button>
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item
-                    label="动态修改规则编码"
-                    prop="inspectionCharacteristicsBaseVO.inspectionMethod"
-                  >
-                    <div style="display: flex; width: 100%">
-                      <el-input
-                        v-model="item.inspectionCharacteristicsBaseVO.inspectionMethod"
-                        disabled
-                        placeholder="请选择动态修改规则编码"
-                      />
-                      <el-button
-                        type="info"
-                        plain
-                        style="width: 40px"
-                        @click="
-                          opensearchTable(
-                            'inspectionMethod',
-                            null,
-                            '动态修改规则编码',
-                            DynamicRule.allSchemas,
-                            DynamicRuleApi.getDynamicRulePage,
-                            [
+                <el-form-item
+                  label="检验方法"
+                  prop="inspectionCharacteristicsBaseVO.inspectionMethodCode"
+                >
+                  <div style="display: flex; width: 100%">
+                    <el-input
+                      v-model="item.inspectionCharacteristicsBaseVO.inspectionMethodName"
+                      disabled
+                      placeholder="请选择检验方法"
+                    />
+                    <el-button
+                      type="info"
+                      plain
+                      style="width: 40px"
+                      @click="
+                        opensearchTable(
+                          'inspectionMethodCode',
+                          null,
+                          '检验方法',
+                          InspectionMethod.allSchemas,
+                          InspectionMethodApi.getInspectionMethodPage,
+                          [
                             {
                               key: 'available',
                               value: 'TRUE',
                               isMainValue: false
                             }
                           ],
-                            false,
-                            null,
-                            item
-                          )
-                        "
-                        ><Icon icon="ep:search"
-                      /></el-button>
-                    </div>
-                  </el-form-item>
-                </el-col>
+                          false,
+                          'features',
+                          item
+                        )
+                      "
+                      ><Icon icon="ep:search"
+                    /></el-button>
+                  </div>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label="采样过程编码"
+                  prop="inspectionCharacteristicsBaseVO.inspectionMethod"
+                >
+                  <div style="display: flex; width: 100%">
+                    <el-input
+                      v-model="item.inspectionCharacteristicsBaseVO.inspectionName"
+                      disabled
+                      placeholder="请选择采样过程编码"
+                    />
+                    <el-button
+                      type="info"
+                      plain
+                      style="width: 40px"
+                      @click="
+                        opensearchTable(
+                          'inspectionMethod',
+                          null,
+                          '采样过程编码',
+                          SamplingProcess.allSchemas,
+                          SamplingProcessApi.getSamplingProcessPage,
+                          [
+                            {
+                              key: 'available',
+                              value: 'TRUE',
+                              isMainValue: false
+                            }
+                          ],
+                          false,
+                          'features',
+                          item
+                        )
+                      "
+                      ><Icon icon="ep:search"
+                    /></el-button>
+                  </div>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item
+                  label="动态修改规则编码"
+                  prop="inspectionCharacteristicsBaseVO.dynamicUpdateCode"
+                >
+                  <div style="display: flex; width: 100%">
+                    <el-input
+                      v-model="item.inspectionCharacteristicsBaseVO.dynamicUpdateName"
+                      disabled
+                      placeholder="请选择动态修改规则编码"
+                    />
+                    <el-button
+                      type="info"
+                      plain
+                      style="width: 40px"
+                      @click="
+                        opensearchTable(
+                          'dynamicUpdateCode',
+                          null,
+                          '动态修改规则编码',
+                          DynamicRule.allSchemas,
+                          DynamicRuleApi.getDynamicRulePage,
+                          [
+                            {
+                              key: 'available',
+                              value: 'TRUE',
+                              isMainValue: false
+                            }
+                          ],
+                          false,
+                          'features',
+                          item
+                        )
+                      "
+                      ><Icon icon="ep:search"
+                    /></el-button>
+                  </div>
+                </el-form-item>
+              </el-col>
                 <el-col :span="12">
                   <el-form-item
                     label="是否允许修改特征值"
@@ -1011,14 +1011,24 @@ const opensearchTable = (
 // 弹层确定返回所选数据
 // val ： 弹层列表row 数据
 const searchTableSuccess = async (formField, searchField, val, type, row) => {
-  if (type == 'tableForm') {
-    // 明细查询页赋值
-    row[formField] = val[0][searchField]
-  } else {
-    console.log(formField)
-    console.log(val[0].code)
-    console.log(type)
+  if(type == 'features'){
+    row.inspectionCharacteristicsBaseVO[formField] = val[0].code
+    if(formField == 'inspectionMethodCode'){
+      row.inspectionCharacteristicsBaseVO.inspectionMethodName = val[0].description
+    }else if(formField == 'dynamicUpdateCode'){
+      row.inspectionCharacteristicsBaseVO.dynamicUpdateName = val[0].description
+    }else if(formField == 'inspectionMethod'){
+      row.inspectionCharacteristicsBaseVO.inspectionName = val[0].description
+    }
+  } else if(type == 'main'){
     data.value[formField] = val[0].code
+    if(formField == 'itemCode'){
+      data.value.itemName = val[0].name
+    }else if(formField == 'testTypeCode'){
+      data.value.testTypeName = val[0].description
+    }else if(formField == 'programmeTemplateCode'){
+      data.value.programmeTemplateName = val[0].description
+    }
     if (formField == 'programmeTemplateCode') {
       let list = await InspectionProcessPageApi.getListByTempleteCode(val[0].code)
       list.forEach((item, index) => {

src/views/qms/basicDataManage/inspectionTemplate/addForm.vue

@@ -106,14 +106,14 @@
               </el-col>
               <el-col :span="12">
                 <el-form-item
-                  label="检验方法编码"
+                  label="检验方法"
                   prop="inspectionCharacteristicsBaseVO.inspectionMethodCode"
                 >
                   <div style="display: flex; width: 100%">
                     <el-input
-                      v-model="item.inspectionCharacteristicsBaseVO.inspectionMethodCode"
+                      v-model="item.inspectionCharacteristicsBaseVO.inspectionMethodName"
                       disabled
-                      placeholder="请选择检验方法编码"
+                      placeholder="请选择检验方法"
                     />
                     <el-button
                       type="info"
@@ -134,7 +134,7 @@
                             }
                           ],
                           false,
-                          null,
+                          'features',
                           item
                         )
                       "
@@ -146,11 +146,11 @@
               <el-col :span="12">
                 <el-form-item
                   label="采样过程编码"
-                  prop="inspectionCharacteristicsBaseVO.dynamicUpdateCode"
+                  prop="inspectionCharacteristicsBaseVO.inspectionMethod"
                 >
                   <div style="display: flex; width: 100%">
                     <el-input
-                      v-model="item.inspectionCharacteristicsBaseVO.dynamicUpdateCode"
+                      v-model="item.inspectionCharacteristicsBaseVO.inspectionName"
                       disabled
                       placeholder="请选择采样过程编码"
                     />
@@ -160,7 +160,7 @@
                       style="width: 40px"
                       @click="
                         opensearchTable(
-                          'dynamicUpdateCode',
+                          'inspectionMethod',
                           null,
                           '采样过程编码',
                           SamplingProcess.allSchemas,
@@ -173,7 +173,7 @@
                             }
                           ],
                           false,
-                          null,
+                          'features',
                           item
                         )
                       "
@@ -185,11 +185,11 @@
               <el-col :span="12">
                 <el-form-item
                   label="动态修改规则编码"
-                  prop="inspectionCharacteristicsBaseVO.inspectionMethod"
+                  prop="inspectionCharacteristicsBaseVO.dynamicUpdateCode"
                 >
                   <div style="display: flex; width: 100%">
                     <el-input
-                      v-model="item.inspectionCharacteristicsBaseVO.inspectionMethod"
+                      v-model="item.inspectionCharacteristicsBaseVO.dynamicUpdateName"
                       disabled
                       placeholder="请选择动态修改规则编码"
                     />
@@ -199,7 +199,7 @@
                       style="width: 40px"
                       @click="
                         opensearchTable(
-                          'inspectionMethod',
+                          'dynamicUpdateCode',
                           null,
                           '动态修改规则编码',
                           DynamicRule.allSchemas,
@@ -212,7 +212,7 @@
                             }
                           ],
                           false,
-                          null,
+                          'features',
                           item
                         )
                       "
@@ -813,14 +813,17 @@ const opensearchTable = (
 // val ： 弹层列表row 数据
 const searchTableSuccess = (formField, searchField, val, type, row) => {
   console.log(row)
-  data.value.process.forEach((item) => {
-    if (item.description == row.description) {
-      item.inspectionCharacteristicsBaseVO[formField] = val[0].code
+  if(type == 'features'){
+    row.inspectionCharacteristicsBaseVO[formField] = val[0].code
+    if(formField == 'inspectionMethodCode'){
+      row.inspectionCharacteristicsBaseVO.inspectionMethodName = val[0].description
+    }else if(formField == 'dynamicUpdateCode'){
+      row.inspectionCharacteristicsBaseVO.dynamicUpdateName = val[0].description
+    }else if(formField == 'inspectionMethod'){
+      row.inspectionCharacteristicsBaseVO.inspectionName = val[0].description
     }
-  })
-
-  // row.inspectionCharacteristicsBaseVO.inspectionMethodCode = val[0].code
-  // emit('searchTableSuccess', formField, searchField, val, formRef.value, type, row)
+  }
+ 
 }
 // 选择是否设定上限值
 const changeIsCapping = (e) => {

src/views/qms/basicDataManage/inspectionTemplate/inspectionTemplate.data.ts

@@ -151,11 +151,11 @@ export const InspectionTemplateFeatures= useCrudSchemas(reactive<CrudSchema[]>([
     sort: 'custom',
   },{
     label: '采样过程编码',
-    field: 'dynamicUpdateCode',
+    field: 'inspectionMethod',
     sort: 'custom',
   },{
     label: '动态修改规则编码',
-    field: 'inspectionMethod',
+    field: 'dynamicUpdateCode',
     sort: 'custom',
   },{
     label: '是否允许修改特征值',

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

@@ -117,8 +117,8 @@
 
   // 列表头部按钮
   const HeadButttondata = [
-    defaultButtons.defaultAddBtn(null), // 新增
-    // defaultButtons.defaultExportBtn(null), // 导出
+    // defaultButtons.defaultAddBtn(null), // 新增
+    defaultButtons.defaultExportBtn(null), // 导出
     defaultButtons.defaultFreshBtn(null), // 刷新
     defaultButtons.defaultFilterBtn(null), // 筛选
     defaultButtons.defaultSetBtn(null), // 设置
@@ -284,6 +284,6 @@
   /** 初始化 **/
   onMounted(async () => {
     getList()
-    importTemplateData.templateUrl = await InspectionJobMainApi.importTemplate()
+    // importTemplateData.templateUrl = await InspectionJobMainApi.importTemplate()
   })
 </script>

src/views/qms/inspection/inspectionJob/inspectionJobMain.data.ts

@@ -5,18 +5,18 @@ import { dateFormatter } from '@/utils/formatTime'
 const { t } = useI18n() // 国际化
 
 /**
- * @returns {Array} 备件申请主表
+ * @returns {Array} 检验任务主表
  */
 export const InspectionJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
-    label: '工序编号',
+    label: '编码',
     field: 'number',
     sort: 'custom',
     isSearch: true,
   },
   {
-    label: '申请编码',
-    field: 'inspectionCode',
+    label: '申请单号',
+    field: 'requestNumber',
     sort: 'custom',
     isSearch: true,
   },

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue

@@ -43,6 +43,10 @@
     :tableAllSchemas="SupplierinvoiceRequestDetail.allSchemas" 
     :tableFormRules="SupplierinvoiceRequestDetailRules"
     :tableData="tableData" 
+    :sumFormData = "[{
+      formField:'amount',
+      valueField:'singlePrice'
+    }]"
     :apiUpdate="SupplierinvoiceRequestMainApi.updateSupplierinvoiceRequestMain"
     :apiCreate="SupplierinvoiceRequestMainApi.createSupplierinvoiceRequestMain" 
     :isBusiness="true"
@@ -148,6 +152,7 @@
             newRow['recvBillNum'] = item['recvBillNum']
             newRow['asnBillNum'] = item['asnBillNum']
             newRow['supplierCode'] = item['supplierCode']
+            newRow['singlePrice'] = item['purchasePrice']//单价默认值 = 采购价格
             newRow['purchasePrice'] = item['purchasePrice']
             newRow['invoicableQuantity'] = item['invoicableQuantity']
             newRow['itemCode'] = item['itemCode']

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts

@@ -148,6 +148,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       componentProps: {
         min: 0,
         precision: 6,
+        disabled: true,
       }
     },
     tableForm: {