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

@@ -706,20 +706,20 @@ const submitForm = async () => {
         return
       }
       // 主子表——提交请求
-      // try {
+      try {
         const data = unref(formRef)?.formModel
         emit('submitForm', formType.value, data)
-      // } finally {
+      } finally {
         // formLoading.value = false
-      // }
+      }
     } else {
       // 编辑
-      // try {
+      try {
         const data = unref(formRef)?.formModel
         emit('submitForm', formType.value, data)
-      // } finally {
+      } finally {
         // formLoading.value = false
-      // }
+      }
     }
   } else {
     // 基础数据单表——提交请求
@@ -728,7 +728,7 @@ const submitForm = async () => {
       const data = unref(formRef)?.formModel
       emit('success', formType.value, data)
     } finally {
-      formLoading.value = false
+      // formLoading.value = false
     }
   }
 }

src/views/qms/inspectionQ1/index.vue

@@ -187,6 +187,8 @@ nextTick(() => {
       handleTime: new Date().getTime(),
       claimTime: new Date().getTime(),
       priority: '3',
+      qty: 1,
+      claimAmount: 1,
     })
   })
   }

src/views/qms/inspectionQ1/inspectionQ1.data.ts

@@ -82,7 +82,15 @@ export const Q1 = useCrudSchemas(
               value: 'TRUE',
               isMainValue: false
             }
-          ]
+          ],
+          verificationParams: [{
+            key: 'code',
+            action: '==',
+            value: '',
+            isMainValue: false,
+            isSearch: true,
+            isFormModel: true,
+          }], // 失去焦点校验参数
         }
       },
       isSearch: true
@@ -143,7 +151,7 @@ export const Q1 = useCrudSchemas(
       form: {
         component: 'InputNumber',
         componentProps: {
-          min: 1,
+          min: 0.01,
           precision: 2
         }
       }
@@ -213,9 +221,14 @@ export const Q1 = useCrudSchemas(
         width: 150
       },
       form: {
-        component: 'InputNumber'
+        component: 'InputNumber',
+        componentProps: {
+          min: 0.01,
+          precision: 2
+        }
       }
     },
+
     {
       label: '成本中心',
       field: 'costCode',
@@ -225,6 +238,7 @@ export const Q1 = useCrudSchemas(
       form: {
         // labelMessage: '信息提示说明！！！',
         componentProps: {
+          enterSearch:true,
           isSearchList: true, // 开启查询弹窗
           searchListPlaceholder: '请选择成本中心代码', // 输入框占位文本
           searchField: 'costcentreCode', // 查询弹窗赋值字段
@@ -237,7 +251,15 @@ export const Q1 = useCrudSchemas(
               value: 'TRUE',
               isMainValue: false
             }
-          ]
+          ],
+          verificationParams: [{
+            key: 'costcentreCode',
+            action: '==',
+            value: '',
+            isMainValue: false,
+            isSearch: true,
+            isFormModel: true,
+          }], // 失去焦点校验参数
         }
       }
     },

src/views/qms/inspectionQ2/index.vue

@@ -195,6 +195,8 @@ nextTick(() => {
       handleTime: new Date().getTime(),
       claimTime: new Date().getTime(),
       priority: '3',
+         qty: 1,
+      claimAmount: 1,
     })
   })
   }

src/views/qms/inspectionQ2/inspectionQ2.data.ts

@@ -77,7 +77,15 @@ export const Q2 = useCrudSchemas(
               value: '0',
               isMainValue: false
             }
-          ]
+          ],
+          verificationParams: [{
+            key: 'number',
+            action: '==',
+            value: '',
+            isMainValue: false,
+            isSearch: true,
+            isFormModel: true,
+          }], // 失去焦点校验参数
         }
       },
       isSearch: true
@@ -123,7 +131,15 @@ export const Q2 = useCrudSchemas(
               value: 'TRUE',
               isMainValue: false
             }
-          ]
+          ],
+          verificationParams: [{
+            key: 'code',
+            action: '==',
+            value: '',
+            isMainValue: false,
+            isSearch: true,
+            isFormModel: true,
+          }], // 失去焦点校验参数
         }
       }
     },
@@ -218,7 +234,15 @@ export const Q2 = useCrudSchemas(
               value: 'itemCode',
               isMainValue: true
             }
-          ]
+          ],
+          verificationParams: [{
+            key: 'number',
+            action: '==',
+            value: '',
+            isMainValue: false,
+            isSearch: true,
+            isFormModel: true,
+          }], // 失去焦点校验参数
         }
       }
     },
@@ -234,7 +258,7 @@ export const Q2 = useCrudSchemas(
       form: {
         component: 'InputNumber',
         componentProps: {
-          min: 1,
+          min: 0.01,
           precision: 2
         }
       }
@@ -287,7 +311,11 @@ export const Q2 = useCrudSchemas(
         width: 150
       },
       form: {
-        component: 'InputNumber'
+        component: 'InputNumber',
+        componentProps: {
+          min: 0.01,
+          precision: 2
+        }
       }
     },
     {
@@ -300,6 +328,7 @@ export const Q2 = useCrudSchemas(
       form: {
         // labelMessage: '信息提示说明！！！',
         componentProps: {
+          enterSearch:true,
           isSearchList: true, // 开启查询弹窗
           searchListPlaceholder: '请选择成本中心', // 输入框占位文本
           searchField: 'costcentreCode', // 查询弹窗赋值字段
@@ -312,7 +341,15 @@ export const Q2 = useCrudSchemas(
               value: 'TRUE',
               isMainValue: false
             }
-          ]
+          ],
+          verificationParams: [{
+            key: 'costcentreCode',
+            action: '==',
+            value: '',
+            isMainValue: false,
+            isSearch: true,
+            isFormModel: true,
+          }], // 失去焦点校验参数
         }
       }
     },

src/views/qms/inspectionQ3/index.vue

@@ -188,6 +188,8 @@ nextTick(() => {
     basicFormRef.value.formRef.setValues({
       handleTime: new Date().getTime(),
       priority: '3',
+         qty: 1,
+      amount: 1,
     })
   })
   }

src/views/qms/inspectionQ3/inspectionQ3.data.ts

@@ -71,7 +71,15 @@ export const Q3 = useCrudSchemas(
               value: '0',
               isMainValue: false
             }
-          ]
+          ],
+          verificationParams: [{
+            key: 'number',
+            action: '==',
+            value: '',
+            isMainValue: false,
+            isSearch: true,
+            isFormModel: true,
+          }], // 失去焦点校验参数
         }
       },
       isSearch: true
@@ -103,6 +111,7 @@ export const Q3 = useCrudSchemas(
         width: 150
       },
       tableForm: {
+        enterSearch: true,
         isInpuFocusShow: true,
         searchListPlaceholder: '请选择物料代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
@@ -115,11 +124,20 @@ export const Q3 = useCrudSchemas(
             value: 'TRUE',
             isMainValue: false
           }
-        ]
+        ],
+        verificationParams: [{
+          key: 'code',
+          action: '==',
+          value: '',
+          isMainValue: false,
+          isSearch: true,
+          isFormModel: true,
+        }], // 失去焦点校验参数
       },
       form: {
         // labelMessage: '信息提示说明！！！',
         componentProps: {
+          enterSearch: true,
           isSearchList: true, // 开启查询弹窗
           searchListPlaceholder: '请选择物料代码', // 输入框占位文本
           searchField: 'code', // 查询弹窗赋值字段
@@ -132,7 +150,15 @@ export const Q3 = useCrudSchemas(
               value: 'TRUE',
               isMainValue: false
             }
-          ]
+          ],
+          verificationParams: [{
+            key: 'code',
+            action: '==',
+            value: '',
+            isMainValue: false,
+            isSearch: true,
+            isFormModel: true,
+          }], // 失去焦点校验参数
         }
       }
     },
@@ -148,7 +174,7 @@ export const Q3 = useCrudSchemas(
       form: {
         component: 'InputNumber',
         componentProps: {
-          min: 1,
+          min: 0.01,
           precision: 2
         }
       }
@@ -254,7 +280,11 @@ export const Q3 = useCrudSchemas(
         width: 150
       },
       form: {
-        component: 'InputNumber'
+        component: 'InputNumber',
+        componentProps: {
+          min: 0.01,
+          precision: 2
+        }
       }
     },
     {
@@ -267,6 +297,7 @@ export const Q3 = useCrudSchemas(
       form: {
         // labelMessage: '信息提示说明！！！',
         componentProps: {
+          enterSearch: true,
           isSearchList: true, // 开启查询弹窗
           searchListPlaceholder: '请选择成本中心', // 输入框占位文本
           searchField: 'costcentreCode', // 查询弹窗赋值字段
@@ -279,7 +310,15 @@ export const Q3 = useCrudSchemas(
               value: 'TRUE',
               isMainValue: false
             }
-          ]
+          ],
+          verificationParams: [{
+            key: 'costcentreCode',
+            action: '==',
+            value: '',
+            isMainValue: false,
+            isSearch: true,
+            isFormModel: true,
+          }], // 失去焦点校验参数
         }
       }
     },

src/views/qms/inspectionRecordFirst/addForm.vue

@@ -34,7 +34,9 @@
             <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.itemCode" placeholder="请选择物料编码" 
+                    @blur="onBlur('item', ItemBasicApi.getItembasicPage)"
+                    @focus="onFocus"/>
                   <el-button type="info" plain style="width: 40px" @click="opensearchItemsTable()"
                     ><Icon icon="ep:search" />
                   </el-button>
@@ -56,9 +58,9 @@
                 <div style="display: flex; width: 100%">
                   <el-input
                     v-model="data.inspectionSchemeCode"
-                    disabled
                     placeholder="请选择检验方案"
-                  />
+                    @blur="onBlur('inspectionScheme', InspectionSchemeApi.InspectionSchemePage)"
+                    @focus="onFocus"/>
                   <el-button
                     type="info"
                     plain
@@ -545,7 +547,7 @@
         
       </div>
       <template #footer>
-        <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" />
+        <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" :key="count"/>
       </template>
     </Dialog>
     <Dialog
@@ -1465,6 +1467,59 @@ const inspectionValueInput = (item, cur) => {
     }
   }
 }
+//失去焦点
+const onBlur = async (field, pageApi, item) => {
+  const dataObj = item ? item.inspectionCharacteristicsBaseVO : data.value
+  if (dataObj[field + 'Code']) {
+    const _searchCondition = {}
+    const filters: any[] = []
+    filters.push(
+      {
+        action: '==',
+        column: 'available',
+        value: 'TRUE'
+      },
+      {
+        column: 'code',
+        action: '==',
+        value: dataObj[field + 'Code']?.trim()
+      }
+    )
+    // 参数整理
+    _searchCondition.isSearch = true
+    _searchCondition.filters = filters
+    const array = await pageApi(_searchCondition)
+    Butttondata = [
+      defaultButtons.formSaveBtn(null), // 保存
+      defaultButtons.formCloseBtn(null) // 关闭
+    ]
+    count.value++
+    const obj = array.list[0]
+    if (obj) {
+      dataObj[field + 'Name'] = obj.description
+    } else {
+      message.alert('暂无数据')
+      dataObj[field + 'Code'] = ''
+      dataObj[field + 'Name'] = ''
+    }
+  } else {
+    dataObj[field + 'Name'] = ''
+    Butttondata = [
+      defaultButtons.formSaveBtn(null), // 保存
+      defaultButtons.formCloseBtn(null) // 关闭
+    ]
+    count.value++
+  }
+}
+const count = ref(0)
+// 聚焦的时候不可以保存
+const onFocus = () => {
+  Butttondata = [
+    defaultButtons.formSaveBtn({ disabled: true }), // 保存
+    defaultButtons.formCloseBtn(null) // 关闭
+  ]
+  count.value++
+}
 </script>
 <style scoped>
 .small-title {

src/views/qms/inspectionRequest/inspectionRequestMain.data.ts

@@ -235,6 +235,7 @@ export const InspectionMain = useCrudSchemas(
       },
       form: {
         componentProps: {
+          enterSearch: true,
           isSearchList: true, // 开启查询弹窗
           searchTitle: '供应商信息', // 查询弹窗标题
           searchListPlaceholder: '请选择供应商', // 输入框占位文本
@@ -248,7 +249,15 @@ export const InspectionMain = useCrudSchemas(
               value: 'TRUE',
               isMainValue: false
             }
-          ]
+          ],
+          verificationParams: [{
+            key: 'code',
+            action: '==',
+            value: '',
+            isMainValue: false,
+            isSearch: true,
+            isFormModel: true,
+          }], // 失去焦点校验参数
         }
       }
     },
@@ -276,6 +285,7 @@ export const InspectionMain = useCrudSchemas(
       },
       form: {
         componentProps: {
+          enterSearch: true,
           isSearchList: true, // 开启查询弹窗
           searchTitle: '物料信息', // 查询弹窗标题
           searchListPlaceholder: '请选择物料', // 输入框占位文本
@@ -289,7 +299,15 @@ export const InspectionMain = useCrudSchemas(
               value: 'TRUE',
               isMainValue: false
             }
-          ]
+          ],
+          verificationParams: [{
+            key: 'code',
+            action: '==',
+            value: '',
+            isMainValue: false,
+            isSearch: true,
+            isFormModel: true,
+          }], // 失去焦点校验参数
         }
       }
     },

src/views/qms/inspectionScheme/addForm.vue

@@ -18,7 +18,12 @@
             <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.itemCode"
+                    placeholder="请选择物料编码"
+                    @blur="onBlur('item', ItemBasicApi.getItembasicPage)"
+                    @focus="onFocus"
+                  />
                   <el-button
                     type="info"
                     plain
@@ -41,6 +46,13 @@
                 </div>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="物料名称" prop="itemName">
+                <div style="display: flex; width: 100%">
+                  <el-input v-model="data.itemName" placeholder="请选择物料" disabled />
+                </div>
+              </el-form-item>
+            </el-col>
             <el-col :span="12">
               <el-form-item label="描述" prop="description">
                 <el-input v-model="data.description" placeholder="请填写描述" />
@@ -53,28 +65,6 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="检验类型" prop="inspectionType">
-                <!-- <div style="display: flex; width: 100%">
-                  <el-input v-model="data.testTypeName" disabled placeholder="请选择检验类型" />
-                  <el-button
-                    type="info"
-                    plain
-                    style="width: 40px"
-                    @click="
-                      opensearchTable(
-                        'testTypeCode',
-                        null,
-                        '检验类型',
-                        SamplingProcess.allSchemas,
-                        SamplingProcessApi.getSamplingProcessPage,
-                        null,
-                        false,
-                        'main',
-                        null
-                      )
-                    "
-                    ><Icon icon="ep:search" />
-                  </el-button>
-                </div> -->
                 <el-select v-model="data.inspectionType" placeholder="请选择检验类型">
                   <el-option
                     v-for="dict in getStrDictOptions(DICT_TYPE.INSPECTION_TYPE)"
@@ -89,9 +79,12 @@
               <el-form-item label="检验模板" prop="programmeTemplateCode">
                 <div style="display: flex; width: 100%">
                   <el-input
-                    v-model="data.programmeTemplateName"
+                    v-model="data.programmeTemplateCode"
-                    disabled
                     placeholder="请选择检验模板"
+                    @blur="
+                      onBlur('programmeTemplate', InspectionTemplateApi.inspectionTemplatePage)
+                    "
+                    @focus="onFocus"
                   />
                   <el-button
                     type="info"
@@ -122,12 +115,24 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="动态修改规则" prop="dynamicUpdateCode">
+              <el-form-item label="检验模板描述" prop="programmeTemplateName">
                 <div style="display: flex; width: 100%">
                   <el-input
-                    v-model="data.dynamicUpdateName"
+                    v-model="data.programmeTemplateName"
+                    placeholder="请选择检验模板"
                     disabled
+                  />
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="动态修改规则" prop="dynamicUpdateCode">
+                <div style="display: flex; width: 100%">
+                  <el-input
+                    v-model="data.dynamicUpdateCode"
                     placeholder="请选择动态修改规则"
+                    @blur="onBlur('dynamicUpdate', DynamicRuleApi.getDynamicRulePage)"
+                    @focus="onFocus"
                   />
                   <el-button
                     type="info"
@@ -157,6 +162,17 @@
                 </div>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="动态修改规则描述" prop="dynamicUpdateName">
+                <div style="display: flex; width: 100%">
+                  <el-input
+                    v-model="data.dynamicUpdateName"
+                    placeholder="请选择动态修改规则描述"
+                    disabled
+                  />
+                </div>
+              </el-form-item>
+            </el-col>
             <!-- <el-col :span="12">
               <el-form-item label="拆分规则" prop="splitRule">
                 <el-select v-model="data.splitRule" placeholder="请选择拆分规则">
@@ -344,9 +360,16 @@
                   >
                     <div style="display: flex; width: 100%">
                       <el-input
-                        v-model="item.inspectionCharacteristicsBaseVO.inspectionMethodName"
+                        v-model="item.inspectionCharacteristicsBaseVO.inspectionMethodCode"
-                        disabled
                         placeholder="请选择检验方法"
+                        @blur="
+                          onBlur(
+                            'inspectionMethod',
+                            InspectionMethodApi.getInspectionMethodPage,
+                            item
+                          )
+                        "
+                        @focus="onFocus"
                       />
                       <el-button
                         type="info"
@@ -376,6 +399,20 @@
                     </div>
                   </el-form-item>
                 </el-col>
+                <el-col :span="12">
+                  <el-form-item
+                    label="检验方法描述"
+                    prop="inspectionCharacteristicsBaseVO.inspectionMethodName"
+                  >
+                    <div style="display: flex; width: 100%">
+                      <el-input
+                        v-model="item.inspectionCharacteristicsBaseVO.inspectionMethodName"
+                        disabled
+                        placeholder="请选择检验方法"
+                      />
+                    </div>
+                  </el-form-item>
+                </el-col>
                 <el-col :span="12">
                   <el-form-item
                     label="采样过程"
@@ -383,9 +420,12 @@
                   >
                     <div style="display: flex; width: 100%">
                       <el-input
-                        v-model="item.inspectionCharacteristicsBaseVO.samplingProcessName"
+                        v-model="item.inspectionCharacteristicsBaseVO.samplingProcessCode"
-                        disabled
                         placeholder="请选择采样过程"
+                        @blur="
+                          onBlur('samplingProcess', SamplingProcessApi.getSamplingProcessPage, item)
+                        "
+                        @focus="onFocus"
                       />
                       <el-button
                         type="info"
@@ -415,6 +455,20 @@
                     </div>
                   </el-form-item>
                 </el-col>
+                <el-col :span="12">
+                  <el-form-item
+                    label="采样过程描述"
+                    prop="inspectionCharacteristicsBaseVO.inspectionMethodName"
+                  >
+                    <div style="display: flex; width: 100%">
+                      <el-input
+                        v-model="item.inspectionCharacteristicsBaseVO.inspectionMethodName"
+                        disabled
+                        placeholder="请选择采样过程描述"
+                      />
+                    </div>
+                  </el-form-item>
+                </el-col>
                 <el-col :span="12">
                   <el-form-item
                     label="是否允许修改特征值"
@@ -586,8 +640,9 @@
                     <div style="display: flex; width: 100%">
                       <el-input
                         v-model="item.inspectionCharacteristicsBaseVO.quantifyQuantifyCode"
-                        disabled
                         placeholder="请选择选定集"
+                        @blur="onBlur('quantifyQuantify', SelectedSetApi.getSelectedSetPage, item)"
+                        @focus="onFocus"
                       />
                       <el-button
                         type="info"
@@ -618,13 +673,27 @@
                     </div>
                   </el-form-item>
                 </el-col>
+                <el-col :span="12" v-if="item.inspectionCharacteristicsBaseVO.featureType == 1">
+                  <el-form-item
+                    label="选定集描述"
+                    prop="inspectionCharacteristicsBaseVO.quantifyQuantifyName"
+                  >
+                    <div style="display: flex; width: 100%">
+                      <el-input
+                        v-model="item.inspectionCharacteristicsBaseVO.quantifyQuantifyName"
+                        disabled
+                        placeholder="请选择选定集描述"
+                      />
+                    </div>
+                  </el-form-item>
+                </el-col>
               </el-row>
             </el-form>
           </el-tab-pane>
         </el-tabs>
       </div>
       <template #footer>
-        <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" />
+        <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" :key="count" />
       </template>
     </Dialog>
     <Dialog
@@ -861,7 +930,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
             quantifyUom: item.inspectionCharacteristicsBaseVO.quantifyUom,
             resultEntryMethod: item.inspectionCharacteristicsBaseVO.resultEntryMethod,
             samplingProcessCode: item.inspectionCharacteristicsBaseVO.samplingProcessCode,
-            samplingProcessName:item.inspectionCharacteristicsBaseVO.samplingProcessName,
+            samplingProcessName: item.inspectionCharacteristicsBaseVO.samplingProcessName
           }
         }
 
@@ -925,9 +994,6 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
       }
       data.value.process = list
     }
-   
-   
-   
   } else {
     data.value = {
       code: '',
@@ -1382,6 +1448,59 @@ const changeIsTarget = (e, item) => {
     rules.value['inspectionCharacteristicsBaseVO.quantifyTarget'][0].required = false
   }
 }
+//失去焦点
+const onBlur = async (field, pageApi, item) => {
+  const dataObj = item ? item.inspectionCharacteristicsBaseVO : data.value
+  if (dataObj[field + 'Code']) {
+    const _searchCondition = {}
+    const filters: any[] = []
+    filters.push(
+      {
+        action: '==',
+        column: 'available',
+        value: 'TRUE'
+      },
+      {
+        column: 'code',
+        action: '==',
+        value: dataObj[field + 'Code']?.trim()
+      }
+    )
+    // 参数整理
+    _searchCondition.isSearch = true
+    _searchCondition.filters = filters
+    const array = await pageApi(_searchCondition)
+    Butttondata = [
+      defaultButtons.formSaveBtn(null), // 保存
+      defaultButtons.formCloseBtn(null) // 关闭
+    ]
+    count.value++
+    const obj = array.list[0]
+    if (obj) {
+      dataObj[field + 'Name'] = obj.description
+    } else {
+      message.alert('暂无数据')
+      dataObj[field + 'Code'] = ''
+      dataObj[field + 'Name'] = ''
+    }
+  } else {
+    dataObj[field + 'Name'] = ''
+    Butttondata = [
+      defaultButtons.formSaveBtn(null), // 保存
+      defaultButtons.formCloseBtn(null) // 关闭
+    ]
+    count.value++
+  }
+}
+const count = ref(0)
+// 聚焦的时候不可以保存
+const onFocus = () => {
+  Butttondata = [
+    defaultButtons.formSaveBtn({ disabled: true }), // 保存
+    defaultButtons.formCloseBtn(null) // 关闭
+  ]
+  count.value++
+}
 </script>
 <style scoped>
 .small-title {

src/views/qms/inspectionTemplate/addForm.vue

@@ -26,15 +26,13 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-                <el-form-item
+            <el-form-item label="动态修改规则编码" prop="dynamicUpdateCode">
-                  label="动态修改规则编码"
-                  prop="dynamicUpdateCode"
-                >
               <div style="display: flex; width: 100%">
                 <el-input
                   v-model="data.dynamicUpdateCode"
                   placeholder="请选择动态修改规则编码"
-                      @blur='dynamicUpdateCodeBlur'
+                  @blur="onBlur('dynamicUpdate', DynamicRuleApi.getDynamicRulePage)"
+                  @focus="onFocus"
                 />
                 <el-button
                   type="info"
@@ -65,10 +63,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-                <el-form-item
+            <el-form-item label="动态修改规则描述" prop="dynamicUpdateName">
-                  label="动态修改规则描述"
-                  prop="dynamicUpdateName"
-                >
               <div style="display: flex; width: 100%">
                 <el-input
                   v-model="data.dynamicUpdateName"
@@ -97,7 +92,6 @@
         >
           <template #label>
             <span class="custom-tabs-label" style="display: flex; align-items: center">
-               
               <span>{{ item.description }}</span>
               <Icon
                 icon="ep:document-copy"
@@ -150,7 +144,6 @@
                   />
                 </el-form-item>
               </el-col> -->
-              
             </el-row>
           </el-form>
           <div class="small-title">检验特性</div>
@@ -179,8 +172,14 @@
                     <el-input
                       v-model="item.inspectionCharacteristicsBaseVO.inspectionMethodCode"
                       placeholder="请选择检验方法编码"
-                      disabled
+                      @blur="
-                      @blur='inspectionMethodCodeBlur(item)'
+                        onBlur(
+                          'inspectionMethod',
+                          InspectionMethodApi.getInspectionMethodPage,
+                          item
+                        )
+                      "
+                      @focus="onFocus"
                     />
                     <el-button
                       type="info"
@@ -219,7 +218,7 @@
                     <el-input
                       v-model="item.inspectionCharacteristicsBaseVO.inspectionMethodName"
                       disabled
-                      placeholder="请选择检验方法编码"
+                      placeholder="请选择检验方法"
                     />
                   </div>
                 </el-form-item>
@@ -231,9 +230,12 @@
                 >
                   <div style="display: flex; width: 100%">
                     <el-input
-                      v-model="item.inspectionCharacteristicsBaseVO.samplingProcessName"
+                      v-model="item.inspectionCharacteristicsBaseVO.samplingProcessCode"
-                      disabled
                       placeholder="请选择采样过程"
+                      @blur="
+                        onBlur('samplingProcess', SamplingProcessApi.getSamplingProcessPage, item)
+                      "
+                      @focus="onFocus"
                     />
                     <el-button
                       type="info"
@@ -263,7 +265,20 @@
                   </div>
                 </el-form-item>
               </el-col>
-              
+              <el-col :span="12">
+                <el-form-item
+                  label="采样过程描述"
+                  prop="inspectionCharacteristicsBaseVO.inspectionMethodName"
+                >
+                  <div style="display: flex; width: 100%">
+                    <el-input
+                      v-model="item.inspectionCharacteristicsBaseVO.inspectionMethodName"
+                      disabled
+                      placeholder="请选择采样过程描述"
+                    />
+                  </div>
+                </el-form-item>
+              </el-col>
               <el-col :span="12">
                 <el-form-item
                   label="是否允许修改特征值"
@@ -322,9 +337,7 @@
                     placeholder="请选择结果录入方式"
                   >
                     <el-option
-                      v-for="dict in getStrDictOptions(
+                      v-for="dict in getStrDictOptions(DICT_TYPE.UOM)"
-                        DICT_TYPE.UOM
-                      )"
                       :key="dict.value"
                       :label="dict.label"
                       :value="dict.value"
@@ -338,8 +351,10 @@
                   prop="inspectionCharacteristicsBaseVO.quantifyDecimal"
                   v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
                 >
-                  <el-input v-model="item.inspectionCharacteristicsBaseVO.quantifyDecimal" 
+                  <el-input
-                  type="number"/>
+                    v-model="item.inspectionCharacteristicsBaseVO.quantifyDecimal"
+                    type="number"
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="12" v-if="item.inspectionCharacteristicsBaseVO.featureType == 0">
@@ -347,7 +362,10 @@
                   label="是否设定上限"
                   prop="inspectionCharacteristicsBaseVO.quantifyIsCapping"
                 >
-                  <el-switch v-model="item.inspectionCharacteristicsBaseVO.quantifyIsCapping" @change="changeIsCapping($event,item)"/>
+                  <el-switch
+                    v-model="item.inspectionCharacteristicsBaseVO.quantifyIsCapping"
+                    @change="changeIsCapping($event, item)"
+                  />
                 </el-form-item>
               </el-col>
 
@@ -356,56 +374,80 @@
                   prop="inspectionCharacteristicsBaseVO.quantifyIsLowlimit"
                   label="是否设定下限"
                 >
-                <el-switch v-model="item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit" @change="changeLowlimit($event,item)"/>
+                  <el-switch
-                 
+                    v-model="item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit"
+                    @change="changeLowlimit($event, item)"
+                  />
                 </el-form-item>
               </el-col>
 
-              <el-col :span="12">
+              <el-col :span="12" v-if="item.inspectionCharacteristicsBaseVO.featureType == 0">
                 <el-form-item
                   prop="inspectionCharacteristicsBaseVO.quantifyIsTarget"
                   label="是否设定目标值"
-                  v-if="item.inspectionCharacteristicsBaseVO.featureType == 0"
                 >
-                  <el-switch v-model="item.inspectionCharacteristicsBaseVO.quantifyIsTarget" @change="changeIsTarget($event,item)" />
+                  <el-switch
-                 
+                    v-model="item.inspectionCharacteristicsBaseVO.quantifyIsTarget"
+                    @change="changeIsTarget($event, item)"
+                  />
                 </el-form-item>
               </el-col>
-              <el-col :span="12" v-if="item.inspectionCharacteristicsBaseVO.featureType == 0 && item.inspectionCharacteristicsBaseVO. quantifyIsCapping">
+              <el-col
-                <el-form-item
+                :span="12"
-                  label="上限值"
+                v-if="
-                  prop="inspectionCharacteristicsBaseVO.quantifyCapping"
+                  item.inspectionCharacteristicsBaseVO.featureType == 0 &&
+                  item.inspectionCharacteristicsBaseVO.quantifyIsCapping
+                "
               >
-                  <el-input v-model="item.inspectionCharacteristicsBaseVO.quantifyCapping" type="number"/>
+                <el-form-item label="上限值" prop="inspectionCharacteristicsBaseVO.quantifyCapping">
+                  <el-input
+                    v-model="item.inspectionCharacteristicsBaseVO.quantifyCapping"
+                    type="number"
+                  />
                 </el-form-item>
               </el-col>
-              <el-col :span="12" v-if="item.inspectionCharacteristicsBaseVO.featureType == 0 && item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit">
+              <el-col
+                :span="12"
+                v-if="
+                  item.inspectionCharacteristicsBaseVO.featureType == 0 &&
+                  item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit
+                "
+              >
                 <el-form-item
                   label="下限值"
                   prop="inspectionCharacteristicsBaseVO.quantifyLowlimit"
                 >
-                  <el-input v-model="item.inspectionCharacteristicsBaseVO.quantifyLowlimit" type="number"/>
+                  <el-input
+                    v-model="item.inspectionCharacteristicsBaseVO.quantifyLowlimit"
+                    type="number"
+                  />
                 </el-form-item>
               </el-col>
-              <el-col :span="12"  v-if="item.inspectionCharacteristicsBaseVO.featureType == 0 && item.inspectionCharacteristicsBaseVO.quantifyIsTarget">
+              <el-col
-                <el-form-item
+                :span="12"
-                  label="目标值"
+                v-if="
-                  prop="inspectionCharacteristicsBaseVO.quantifyTarget"
+                  item.inspectionCharacteristicsBaseVO.featureType == 0 &&
+                  item.inspectionCharacteristicsBaseVO.quantifyIsTarget
+                "
               >
-                  <el-input v-model="item.inspectionCharacteristicsBaseVO.quantifyTarget" type="number"/>
+                <el-form-item label="目标值" prop="inspectionCharacteristicsBaseVO.quantifyTarget">
+                  <el-input
+                    v-model="item.inspectionCharacteristicsBaseVO.quantifyTarget"
+                    type="number"
+                  />
                 </el-form-item>
               </el-col>
-              <el-col :span="12">
+              <el-col :span="12"  v-if="item.inspectionCharacteristicsBaseVO.featureType == 1">
                 <el-form-item
                   label="选定集"
                   prop="inspectionCharacteristicsBaseVO.quantifyQuantifyCode"
-                  v-if="item.inspectionCharacteristicsBaseVO.featureType == 1"
                 >
                   <div style="display: flex; width: 100%">
                     <el-input
-                      v-model="item.inspectionCharacteristicsBaseVO.quantifyQuantifyName"
+                      v-model="item.inspectionCharacteristicsBaseVO.quantifyQuantifyCode"
-                      disabled
                       placeholder="请选择选定集"
+                      @blur="onBlur('quantifyQuantify', SelectedSetApi.getSelectedSetPage, item)"
+                      @focus="onFocus"
                     />
                     <el-button
                       type="info"
@@ -435,13 +477,31 @@
                   </div>
                 </el-form-item>
               </el-col>
+              <el-col :span="12" v-if="item.inspectionCharacteristicsBaseVO.featureType == 1">
+                <el-form-item
+                  label="选定集描述"
+                  prop="inspectionCharacteristicsBaseVO.quantifyQuantifyName"
+                >
+                  <div style="display: flex; width: 100%">
+                    <el-input
+                      v-model="item.inspectionCharacteristicsBaseVO.quantifyQuantifyName"
+                      disabled
+                      placeholder="请选择选定集描述"
+                    />
+                  </div>
+                </el-form-item>
+              </el-col>
             </el-row>
           </el-form>
         </el-tab-pane>
       </el-tabs>
     </div>
     <template #footer>
-      <ButtonBase :Butttondata="Butttondata" @button-base-click="buttonBaseClick" />
+      <ButtonBase
+        :Butttondata="Butttondata"
+        @button-base-click="buttonBaseClick"
+        :key="count"
+      />
     </template>
   </Dialog>
   <Dialog title="修改名称" v-model="dialogVisibleName" width="500px" :close-on-click-modal="false">
@@ -476,7 +536,12 @@ import * as DynamicRuleApi from '@/api/qms/dynamicRule' //动态修改规则
 import { DynamicRule } from '@/views/qms/dynamicRule/dynamicRule.data' //动态修改规则
 import * as SelectedSetApi from '@/api/qms/selectedSet' //选择集
 import { SelectedSet } from '@/views/qms/selectedSet/selectedSet.data' //选择集
-import { validateInteger,validateTwoNum,validateMaxNumber5,validateNumSix } from '@/utils/validator'
+import {
+  validateInteger,
+  validateTwoNum,
+  validateMaxNumber5,
+  validateNumSix
+} from '@/utils/validator'
 const message = useMessage() // 消息弹窗
 
 const props = defineProps({
@@ -571,13 +636,13 @@ const rules = ref({
     { required: true, message: '请选择特征类型', trigger: ['blur', 'change'] }
   ],
   'inspectionCharacteristicsBaseVO.quantifyTarget': [
-    { required: true, message: '请输入目标值', trigger: 'blur' },
+    { required: true, message: '请输入目标值', trigger: 'blur' }
   ],
   'inspectionCharacteristicsBaseVO.quantifyCapping': [
-    { required: true, message: '请输入上限值', trigger: 'blur' },
+    { required: true, message: '请输入上限值', trigger: 'blur' }
   ],
   'inspectionCharacteristicsBaseVO.quantifyLowlimit': [
-    { required: true, message: '请输入下限值', trigger: 'blur' },
+    { required: true, message: '请输入下限值', trigger: 'blur' }
   ],
   'inspectionCharacteristicsBaseVO.quantifyUom': [
     { required: true, message: '请选择计量单位', trigger: 'blur' }
@@ -592,7 +657,6 @@ const rules = ref({
   ]
 })
 
-
 /** 打开弹窗 */
 let tabIndex = 1
 const open = async (type: string, row?: any, masterParmas?: any, titleName?: any) => {
@@ -644,7 +708,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
             quantifyUom: item.inspectionCharacteristicsBaseVO.quantifyUom,
             resultEntryMethod: item.inspectionCharacteristicsBaseVO.resultEntryMethod,
             samplingProcessCode: item.inspectionCharacteristicsBaseVO.samplingProcessCode,
-            samplingProcessName:item.inspectionCharacteristicsBaseVO.samplingProcessName,
+            samplingProcessName: item.inspectionCharacteristicsBaseVO.samplingProcessName
           }
         }
 
@@ -667,7 +731,6 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
         arr.push(obj)
       })
       data.value.process = arr
-      
     } else {
       data.value = JSON.parse(JSON.stringify(row))
       data.value.version = String(data.value.version)
@@ -694,7 +757,6 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
       })
       data.value.process = list
     }
-   
   } else {
     data.value = {
       code: '',
@@ -786,6 +848,7 @@ const buttonBaseClick1 = (val) => {
   }
 }
 const buttonBaseClick = (val) => {
+  console.log(val)
   // 保存
   if (val == 'save') {
     submitForm()
@@ -813,10 +876,7 @@ const validateForm = (formRef) => {
   return array.some((item, index) => {
     return (
       array.findIndex((v, i) => {
-            return (
+        return i !== index && JSON.stringify(v.sequenceCode) === JSON.stringify(item.sequenceCode)
-              i !== index &&
-              JSON.stringify(v.sequenceCode) === JSON.stringify(item.sequenceCode)
-            )
       }) !== -1
     )
   })
@@ -824,7 +884,6 @@ const validateForm = (formRef) => {
 
 const submitForm = async () => {
   try {
-  
     // 检验主表字段
     await validateForm(formProcessRef.value)
     await formMainRef.value.validate()
@@ -862,9 +921,15 @@ const submitForm = async () => {
     console.log(data.value.process)
     const arr1 = data.value.process.filter(
       (item) =>
-      ((item.inspectionCharacteristicsBaseVO.quantifyIsCapping && (String(item.inspectionCharacteristicsBaseVO.quantifyCapping).split('.')[1]?.length>Number(item.inspectionCharacteristicsBaseVO.quantifyDecimal)))||
+        ((item.inspectionCharacteristicsBaseVO.quantifyIsCapping &&
-      (item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit && (String(item.inspectionCharacteristicsBaseVO.quantifyLowlimit).split('.')[1]?.length>Number(item.inspectionCharacteristicsBaseVO.quantifyDecimal)))||
+          String(item.inspectionCharacteristicsBaseVO.quantifyCapping).split('.')[1]?.length >
-      (item.inspectionCharacteristicsBaseVO.quantifyIsTarget && (String(item.inspectionCharacteristicsBaseVO.quantifyTarget).split('.')[1]?.length>Number(item.inspectionCharacteristicsBaseVO.quantifyDecimal)))) &&
+            Number(item.inspectionCharacteristicsBaseVO.quantifyDecimal)) ||
+          (item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit &&
+            String(item.inspectionCharacteristicsBaseVO.quantifyLowlimit).split('.')[1]?.length >
+              Number(item.inspectionCharacteristicsBaseVO.quantifyDecimal)) ||
+          (item.inspectionCharacteristicsBaseVO.quantifyIsTarget &&
+            String(item.inspectionCharacteristicsBaseVO.quantifyTarget).split('.')[1]?.length >
+              Number(item.inspectionCharacteristicsBaseVO.quantifyDecimal))) &&
         item.inspectionCharacteristicsBaseVO.featureType == 0
     )
     if (arr1 && arr1.length > 0) {
@@ -873,19 +938,38 @@ const submitForm = async () => {
       return
     }
     // 检验上限值应大目标值大于下限值
-    const arr2 = data.value.process.filter(
+    const arr2 = data.value.process.filter((item) => {
-      (item) =>
-     {
       // 上限值存在并且下限值存在时,目标值不存在，上限值应大于下限值
-     return (item.inspectionCharacteristicsBaseVO.quantifyIsCapping && item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit && !item.inspectionCharacteristicsBaseVO.quantifyIsTarget  &&  (parseFloat(item.inspectionCharacteristicsBaseVO.quantifyCapping) <=parseFloat(item.inspectionCharacteristicsBaseVO.quantifyLowlimit)))||
+      return (
+        (item.inspectionCharacteristicsBaseVO.quantifyIsCapping &&
+          item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit &&
+          !item.inspectionCharacteristicsBaseVO.quantifyIsTarget &&
+          parseFloat(item.inspectionCharacteristicsBaseVO.quantifyCapping) <=
+            parseFloat(item.inspectionCharacteristicsBaseVO.quantifyLowlimit)) ||
         // 上限值存在并且目标值存在时，下限值不存在，上限值应大于目标值
-      (item.inspectionCharacteristicsBaseVO.quantifyIsCapping && item.inspectionCharacteristicsBaseVO.quantifyIsTarget && !item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit  && (parseFloat(item.inspectionCharacteristicsBaseVO.quantifyCapping) <=parseFloat(item.inspectionCharacteristicsBaseVO.quantifyTarget)))||
+        (item.inspectionCharacteristicsBaseVO.quantifyIsCapping &&
+          item.inspectionCharacteristicsBaseVO.quantifyIsTarget &&
+          !item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit &&
+          parseFloat(item.inspectionCharacteristicsBaseVO.quantifyCapping) <=
+            parseFloat(item.inspectionCharacteristicsBaseVO.quantifyTarget)) ||
         // 下限值存在并且目标值存在时，上限值不存在，下限值应小于目标值
-      ( item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit && item.inspectionCharacteristicsBaseVO.quantifyIsTarget&&!item.inspectionCharacteristicsBaseVO.quantifyIsCapping && (parseFloat(item.inspectionCharacteristicsBaseVO.quantifyLowlimit) >= parseFloat(item.inspectionCharacteristicsBaseVO.quantifyTarget)))||
+        (item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit &&
+          item.inspectionCharacteristicsBaseVO.quantifyIsTarget &&
+          !item.inspectionCharacteristicsBaseVO.quantifyIsCapping &&
+          parseFloat(item.inspectionCharacteristicsBaseVO.quantifyLowlimit) >=
+            parseFloat(item.inspectionCharacteristicsBaseVO.quantifyTarget)) ||
         // 上限值，下限值，目标值都存在时，上限值应大于目标值大于下限值
-      (item.inspectionCharacteristicsBaseVO.quantifyIsCapping && item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit && item.inspectionCharacteristicsBaseVO.quantifyIsTarget && ((parseFloat(item.inspectionCharacteristicsBaseVO.quantifyCapping) <=parseFloat(item.inspectionCharacteristicsBaseVO.quantifyLowlimit) )||(parseFloat(item.inspectionCharacteristicsBaseVO.quantifyCapping) <=parseFloat(item.inspectionCharacteristicsBaseVO.quantifyTarget))||(parseFloat(item.inspectionCharacteristicsBaseVO.quantifyLowlimit) >= parseFloat(item.inspectionCharacteristicsBaseVO.quantifyTarget))))
+        (item.inspectionCharacteristicsBaseVO.quantifyIsCapping &&
-     }
+          item.inspectionCharacteristicsBaseVO.quantifyIsLowlimit &&
+          item.inspectionCharacteristicsBaseVO.quantifyIsTarget &&
+          (parseFloat(item.inspectionCharacteristicsBaseVO.quantifyCapping) <=
+            parseFloat(item.inspectionCharacteristicsBaseVO.quantifyLowlimit) ||
+            parseFloat(item.inspectionCharacteristicsBaseVO.quantifyCapping) <=
+              parseFloat(item.inspectionCharacteristicsBaseVO.quantifyTarget) ||
+            parseFloat(item.inspectionCharacteristicsBaseVO.quantifyLowlimit) >=
+              parseFloat(item.inspectionCharacteristicsBaseVO.quantifyTarget)))
       )
+    })
     console.log(99, arr2)
     if (arr2 && arr2.length > 0) {
       const str = arr2.map((item) => item.description).join(',')
@@ -1025,7 +1109,6 @@ const searchTableSuccess = (formField, searchField, val, type, row) => {
       data.value.dynamicUpdateName = val[0].description
     }
   }
- 
 }
 // 选择是否设定上限值
 const changeIsCapping = (e, item) => {
@@ -1035,7 +1118,6 @@ const changeIsCapping = (e,item) => {
   } else {
     rules.value['inspectionCharacteristicsBaseVO.quantifyCapping'][0].required = false
   }
-  
 }
 // 选择是否设定下限值
 const changeLowlimit = (e, item) => {
@@ -1061,15 +1143,19 @@ const copy = (item)=>{
   newItem.name = data.value.process[data.value.process.length - 1].name + 1
   newItem.code = ''
   newItem.id = ''
-  newItem.sequenceCode =data.value?.process[data.value?.process?.length-1]?.sequenceCode? parseInt(data.value.process[data.value.process.length-1].sequenceCode) + 1 : ''
+  newItem.sequenceCode = data.value?.process[data.value?.process?.length - 1]?.sequenceCode
+    ? parseInt(data.value.process[data.value.process.length - 1].sequenceCode) + 1
+    : ''
   newItem.inspectionCharacteristicsBaseVO.code = ''
   newItem.inspectionCharacteristicsBaseVO.id = ''
   newItem.inspectionCharacteristicsBaseVO.concurrencyStamp = 1
   data.value.process.push(newItem)
   editableTabsValue.value = newItem.name
 }
-// 动态修改规则失去焦点
+//失去焦点
-const dynamicUpdateCodeBlur = async () => {
+const onBlur = async (field, pageApi, item) => {
+  const dataObj = item ? item.inspectionCharacteristicsBaseVO : data.value
+  if (dataObj[field + 'Code']) {
     const _searchCondition = {}
     const filters: any[] = []
     filters.push(
@@ -1081,27 +1167,44 @@ const dynamicUpdateCodeBlur = async () => {
       {
         column: 'code',
         action: '==',
-      value: data.value?.dynamicUpdateCode?.trim()
+        value: dataObj[field + 'Code']?.trim()
       }
     )
     // 参数整理
     _searchCondition.isSearch = true
     _searchCondition.filters = filters
-  const array = await DynamicRuleApi.getDynamicRulePage(_searchCondition)
+    const array = await pageApi(_searchCondition)
+    Butttondata = [
+      defaultButtons.formSaveBtn(null), // 保存
+      defaultButtons.formCloseBtn(null) // 关闭
+    ]
+    count.value++
     const obj = array.list[0]
     if (obj) {
-    data.value.dynamicUpdateName = obj.description
+      dataObj[field + 'Name'] = obj.description
     } else {
       message.alert('暂无数据')
-    data.value.dynamicUpdateCode =''
+      dataObj[field + 'Code'] = ''
-    data.value.dynamicUpdateName =''
+      dataObj[field + 'Name'] = ''
+    }
+  } else {
+    dataObj[field + 'Name'] = ''
+    Butttondata = [
+      defaultButtons.formSaveBtn(null), // 保存
+      defaultButtons.formCloseBtn(null) // 关闭
+    ]
+    count.value++
   }
 }
-// 检验方法失去焦点
+const count = ref(0)
-const inspectionMethodCodeBlur = async () => { 
+// 聚焦的时候不可以保存
-
+const onFocus = () => {
+  Butttondata = [
+    defaultButtons.formSaveBtn({ disabled: true }), // 保存
+    defaultButtons.formCloseBtn(null) // 关闭
+  ]
+  count.value++
 }
-
 </script>
 <style scoped>
 .small-title {

src/views/report/printBusinesstypeTemplate/printBusinesstypeTemplate.data.ts

@@ -64,7 +64,6 @@ export const PrintBusinesstypeTemplate = useCrudSchemas(reactive<CrudSchema[]>([
     label: '备注',
     field: 'remark',
     sort: 'custom',
-    isSearch: true,
   },
   {
     label: '操作',

src/views/report/printClientPrinter/index.vue

@@ -99,9 +99,9 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:printClientPrinter:create'}), // 新增
+  defaultButtons.defaultAddBtn({hasPermi:'wms:print-client-printer:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:printClientPrinter:import'}), // 导入
+  defaultButtons.defaultImportBtn({hasPermi:'wms:print-client-printer:import'}), // 导入
-  defaultButtons.defaultExportBtn({hasPermi:'wms:printClientPrinter:export'}), // 导出
+  defaultButtons.defaultExportBtn({hasPermi:'wms:print-client-printer:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -133,8 +133,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:printClientPrinter:update'}), // 编辑
+  defaultButtons.mainListEditBtn({hasPermi:'wms:print-client-printer:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:printClientPrinter:delete'}), // 删除
+  defaultButtons.mainListDeleteBtn({hasPermi:'wms:print-client-printer:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件
@@ -165,6 +165,7 @@ const formsSuccess = async (formType,data) => {
   }
   if(data.activeTime==0)data.activeTime = null;
   if(data.expireTime==0)data.expireTime = null;
+  basicFormRef.value.formLoading = true
   if (formType === 'create') {
     await PrintClientPrinterApi.createPrintClientPrinter(data)
     message.success(t('common.createSuccess'))
@@ -172,6 +173,7 @@ const formsSuccess = async (formType,data) => {
     await PrintClientPrinterApi.updatePrintClientPrinter(data)
     message.success(t('common.updateSuccess'))
   }
+  basicFormRef.value.formLoading = false
   basicFormRef.value.dialogVisible = false
   getList()
 }

src/views/report/printClientPrinter/printClientPrinter.data.ts

@@ -18,18 +18,45 @@ export const PrintClientPrinter = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'clientCode',
     sort: 'custom',
     isSearch: true,
+    form: {
+      component: 'Select',
+      componentProps: {
+        options: [{
+          name:1111,
+          id:111
+        }],
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        },
+        filterable: true,
+      }
+    }
   },
   {
     label: '打印机名称',
     field: 'printerName',
     sort: 'custom',
     isSearch: true,
+    form: {
+      component: 'Select',
+      componentProps: {
+        options: [{
+          name:2222,
+          id:222
+        }],
+        optionsAlias: {
+          labelField: 'name',
+          valueField: 'id'
+        },
+        filterable: true,
+      }
+    }
   },
   {
     label: '备注',
     field: 'remark',
     sort: 'custom',
-    isSearch: true,
   },
   {
     label: '操作',

src/views/wms/basicDataManage/documentSetting/switch/index.vue

@@ -32,8 +32,8 @@
           <span>{{ row.code }}</span>
         </el-button>
       </template>
-      <template #action="{ row }">
+      <template #action="{ row, $index }">
-        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
+        <ButtonBase :Butttondata="butttondata(row, $index)" @button-base-click="buttonTableClick($event,row)" />
       </template>
     </Table>
   </ContentWrap>
@@ -129,10 +129,21 @@ const buttonBaseClick = (val, item) => {
 }
 
 // 列表-操作按钮
-const butttondata = [
+
-  defaultButtons.mainListEditBtn(null), // 编辑
+const butttondata = (row, $index)=>{ 
+  const hiddenArray = ['CreatePutawayRequestAfterInspectRecordCreated',
+    'CreateBackflushRecordAfterProductreceiptRecordCreated',
+    'CreateProductputawayRequestAfterProductreceiptRecordCreated',
+    'ExecuteProductreceiptJobPredictIsCreatePutawayRequest',
+    'CreatePurchasePlanAfterDiscretePurchaseOrderPublished',
+    'ExemptItemCreatePutawayRequestAfterPurchaseReceiptRecordCreated',
+    'CreatePurchaseReceiptRequestAfterSupplierDeliverRecordCreated'
+  ]
+  return [
+    defaultButtons.mainListEditBtn({hide:hiddenArray.indexOf(row.code)>-1}), // 编辑
     // defaultButtons.mainListDeleteBtn({hasPermi:'wms:switch:delete'}), // 删除
   ]
+}
 
 // 列表-操作按钮事件 
 const buttonTableClick = async (val, row) => {

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

@@ -602,8 +602,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '创建时间',
+    label: '供应商创建时间',
-    field: 'createTime',
+    field: 'requestTime',
     isTable: true,
     sortTableDefault:1001,
     formatter: dateFormatter,
@@ -879,10 +879,13 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
     isDetail: true,
   },
   {
-    label: '供应商创建日期',
+    label: '供应商创建时间',
-    field: 'supplierDate',
+    field: 'requestTime',
     sort: 'custom',
-    
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
@@ -1160,19 +1163,19 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive<CrudSchem
     isSearch: false,
     isDetail: true,
   },
-  {
+  // {
-    label: '创建时间',
+  //   label: '创建时间',
-    field: 'createTime',
+  //   field: 'createTime',
-    formatter: dateFormatter,
+  //   formatter: dateFormatter,
-    sortTableDefault:1000,
+  //   sortTableDefault:1000,
-    detail: {
+  //   detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
+  //   },
-    isForm: false,
+  //   isForm: false,
-    isTable: false,
+  //   isTable: false,
-    isSearch: false,
+  //   isSearch: false,
-    isDetail: true,
+  //   isDetail: true,
-  }
+  // }
 ]))
 //表单校验
 export const SupplierinvoiceRecordMainRules = reactive({
@@ -1209,7 +1212,7 @@ export const SupplierinvoiceRecordMainRules = reactive({
   businessType: [
     { required: true, message: '请输入业务类型', trigger: 'blur' }
   ],
-  createTime: [
+  requestTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
   ],
   creator: [
@@ -1533,7 +1536,7 @@ export const SupplierinvoiceRecordDetailRules = reactive({
   itemCode: [
     { required: true, message: '请输入物料代码', trigger: 'blur' }
   ],
-  createTime: [
+  requestTime: [
     { required: true, message: '请输入创建时间', trigger: 'blur' }
   ],
   creator: [

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

@@ -724,8 +724,8 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     isForm: false,
   },
   {
-    label: '创建时间',
+    label: '供应商创建时间',
-    field: 'createTime',
+    field: 'requestTime',
     isTable:true,
     formatter: dateFormatter,
     sortTableDefault:1000,
@@ -1184,10 +1184,13 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isDetail: true,
   },
   {
-    label: '供应商创建日期',
+    label: '供应商创建时间',
-    field: 'supplierDate',
+    field: 'requestTime',
     sort: 'custom',
-    
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
@@ -1465,19 +1468,6 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isSearch: false,
     isDetail: true,
   },
-  {
-    label: '创建时间',
-    field: 'createTime',
-    formatter: dateFormatter,
-    sortTableDefault:1000,
-    detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
-    isForm: false,
-    isTable: false,
-    isSearch: false,
-    isDetail: true,
-  },
 
 ]))
 
@@ -1957,8 +1947,8 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
  
     //仅是主列表页面的筛选搜索条件
   {
-    label: '创建时间',
+    label: '供应商创建时间',
-    field: 'createTime',
+    field: 'requestTime',
     sort: 'custom',
     isDetail:false,
     isTable: false,
@@ -2003,8 +1993,8 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     hiddenInMain:true,
   },
   {
-    label: '创建时间',
+    label: '供应商创建时间',
-    field: 'createTime',
+    field: 'requestTime',
     hiddenInMain:true,
     isTable: false,
     table: {

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

@@ -658,28 +658,28 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   
-  {
+  // {
-    label: '申请时间',
+  //   label: '申请时间',
-    field: 'requestTime',
+  //   field: 'requestTime',
-    formatter: dateFormatter,
+  //   formatter: dateFormatter,
-    detail: {
+  //   detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
+  //   },
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 180
+  //     width: 180
-    },
+  //   },
-    isTable:false,
+  //   isTable:false,
-    isForm:false,
+  //   isForm:false,
-    form: {
+  //   form: {
-      component: 'DatePicker',
+  //     component: 'DatePicker',
-      componentProps: {
+  //     componentProps: {
-        type: 'datetime',
+  //       type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+  //       dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
+  //       valueFormat: 'x',
-      }
+  //     }
-    },
+  //   },
-  },
+  // },
   {
     label: '部门',
     field: 'departmentCode',
@@ -731,8 +731,8 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     isForm: false,
   },
   {
-    label: '创建时间',
+    label: '供应商创建时间',
-    field: 'createTime',
+    field: 'requestTime',
     isTable:true,
     formatter: dateFormatter,
     sortTableDefault:1000,
@@ -1200,10 +1200,13 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isDetail: true,
   },
   {
-    label: '供应商创建日期',
+    label: '供应商创建时间',
-    field: 'supplierDate',
+    field: 'requestTime',
     sort: 'custom',
-    
+    formatter: dateFormatter,
+    detail: {
+      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+    },
     sortTableDefault: 6,
     isForm: false,
     isTable: false,
@@ -1481,19 +1484,19 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive<CrudSche
     isSearch: false,
     isDetail: true,
   },
-  {
+  // {
-    label: '创建时间',
+  //   label: '创建时间',
-    field: 'createTime',
+  //   field: 'createTime',
-    formatter: dateFormatter,
+  //   formatter: dateFormatter,
-    sortTableDefault:1000,
+  //   sortTableDefault:1000,
-    detail: {
+  //   detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+  //     dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
+  //   },
-    isForm: false,
+  //   isForm: false,
-    isTable: false,
+  //   isTable: false,
-    isSearch: false,
+  //   isSearch: false,
-    isDetail: true,
+  //   isDetail: true,
-  },
+  // },
 
 ]))
 const singlePriceFormart = (row, column, cellValue) => {