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

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

@@ -111,12 +111,12 @@
     }
   }
 
-  // 根据状态返回该按钮是否显示
-  const isShowPublishedButton = (row, val) => {
+  const isShowDecisionButton = (row) => {
+    console.log(row.isPublished)
     if(row.useDecision) {
       return row.isPublished
     } else {
-      return true
+      return false
     }
   }
 
@@ -124,9 +124,9 @@
   const butttondata = (row) => {
     return [
       // defaultButtons.mainListOrderCOMPLETEBtn({ hide: isShowMainButton(row, ['INCOMPLETE']) }), // 完成
-      defaultButtons.mainApplyDecisionBtn({ hide: row.isPublished, hasPermi:'qms:inspection-recode-main:edit'}), // 使用决策
+      defaultButtons.mainApplyDecisionBtn({ hide: isShowDecisionButton(row), hasPermi:'qms:inspection-recode-main:edit'}), // 使用决策
       // defaultButtons.mainListDeleteBtn(null), // 删除
-      defaultButtons.mainListOrderPubBtn({ hide: isShowPublishedButton(row,'pub'), hasPermi:'qms:inspection-recode-main:pub'}), // 发布
+      defaultButtons.mainListOrderPubBtn({ hide: row.isPublished, hasPermi:'qms:inspection-recode-main:pub'}), // 发布
       defaultButtons.mainListPackageBtn(null), // 包装
     ]
   }

src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts

@@ -73,15 +73,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
+    isForm: false,
   },
   {
     label: '截止时间',
@@ -97,15 +89,7 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
-    form: {
-      component: 'DatePicker',
-      componentProps: {
-        style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        valueFormat: 'x',
-      }
-    },
+    isForm: false,
   },
   {
     label: '领用原因',
@@ -407,6 +391,25 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择包装号',
+      searchField: 'packingNumber',
+      searchTitle: '库存余额信息',
+      searchAllSchemas: Balance.allSchemas,
+      searchPage: BalanceApi.getBalancePageSpare
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择包装号',
+        searchField: 'packingNumber',
+        searchTitle: '库存余额信息',
+        searchAllSchemas: Balance.allSchemas,
+        searchPage: BalanceApi.getBalancePageSpare
+      }
+    }
   },
   {
     label: '物料名称',
@@ -453,25 +456,6 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
-    tableForm:{
-      isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择包装号',
-      searchField: 'packingNumber',
-      searchTitle: '库存余额信息',
-      searchAllSchemas: Balance.allSchemas,
-      searchPage: BalanceApi.getBalancePageSpare
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择包装号',
-        searchField: 'packingNumber',
-        searchTitle: '库存余额信息',
-        searchAllSchemas: Balance.allSchemas,
-        searchPage: BalanceApi.getBalancePageSpare
-      }
-    }
   },
   {
     label: '器具号',

src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts

@@ -413,6 +413,25 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择包装号',
+      searchField: 'packingNumber',
+      searchTitle: '库存余额信息',
+      searchAllSchemas: Balance.allSchemas,
+      searchPage: BalanceApi.getBalancePageSpare
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择包装号',
+        searchField: 'packingNumber',
+        searchTitle: '库存余额信息',
+        searchAllSchemas: Balance.allSchemas,
+        searchPage: BalanceApi.getBalancePageSpare
+      }
+    }
   },
   {
     label: '物料名称',
@@ -459,25 +478,6 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
-    tableForm:{
-      isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择包装号',
-      searchField: 'packingNumber',
-      searchTitle: '库存余额信息',
-      searchAllSchemas: Balance.allSchemas,
-      searchPage: BalanceApi.getBalancePage
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择包装号',
-        searchField: 'packingNumber',
-        searchTitle: '库存余额信息',
-        searchAllSchemas: Balance.allSchemas,
-        searchPage: BalanceApi.getBalancePage
-      }
-    }
   },
   {
     label: '器具号',