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

src/api/wms/demandforecastingMain/index.ts

@@ -50,7 +50,13 @@ export const deleteDemandforecastingMain = async (id: number) => {
 
 // 导出要货预测主 Excel
 export const exportDemandforecastingMain = async (params) => {
-  return await request.download({ url: `/wms/demandforecasting-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/demandforecasting-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/demandforecasting-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板

src/views/wms/basicDataManage/orderManage/shift/shift.data.ts

@@ -32,28 +32,28 @@ export const Shift = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: true,
     formatter: dateFormatter,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'HH:mm:ss'
     },
-    sort: 'custom',
+    sort: 'custom', 
     table: {
-      width: 180
+      width: 180,
     },
     form: {
-      component: 'DatePicker',
+      component: 'TimePicker',
       componentProps: {
         style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'time',
+        dateFormat: 'HH:mm:ss',
         valueFormat: 'x',
       }
     },
     isSearch: true,
     search: {
       show: true,
-      component: 'DatePicker',
+      component: 'TimePicker',
       componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
+        valueFormat: 'HH:mm:ss',
+        type: 'timeSelect',
       }
     }
   },
@@ -63,28 +63,28 @@ export const Shift = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: true,
     formatter: dateFormatter,
     detail: {
-      dateFormat: 'YYYY-MM-DD HH:mm:ss'
+      dateFormat: 'HH:mm:ss',
     },
     sort: 'custom',
     table: {
       width: 180
     },
     form: {
-      component: 'DatePicker',
+      component: 'TimePicker',
       componentProps: {
         style: {width:'100%'},
-        type: 'datetime',
-        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'time',
+        dateFormat: 'HH:mm:ss',
         valueFormat: 'x',
       }
     },
     isSearch: true,
     search: {
       show: true,
-      component: 'DatePicker',
+      component: 'TimePicker',
       componentProps: {
-        valueFormat: 'YYYY-MM-DD HH:mm:ss',
-        type: 'daterange',
+        valueFormat: 'HH:mm:ss',
+        type: 'timeSelect',
       }
     }
   },

src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts

@@ -251,6 +251,20 @@ export const DemandforecastingMainRules = reactive({
  * @returns {Array} 要货预测子表
  */
 export const DemandforecastingDetail = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '单据号',
+    field: 'number',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    form: {
+      componentProps: {
+        disbaled: true
+      }
+    }
+  },
   {
     label: '预测时间类型',
     field: 'predictTimeType',
@@ -387,20 +401,6 @@ export const DemandforecastingDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }]
     }
   },
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTableForm: false,
-    form: {
-      componentProps: {
-        disbaled: true
-      }
-    }
-  },
   {
     label: '物料代码',
     field: 'itemCode',

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue

@@ -153,8 +153,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
         row['itemCode'] = val[0]['itemCode']
         row['poLine'] = val[0]['poLine']
         row['uom'] = val[0]['uom']
+        row['planQty'] = val[0]['planQty']
       }
-      
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts

@@ -853,10 +853,33 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       width: 150
     },
     tableForm: {
-      type: 'Select'
+      type: 'Select',
+      disabled: true,
+    }
+  },
+  {
+    label: '计划数量数量',
+    field: 'planQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm:false,
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled:true,
+        min: 1,
+        precision: 6
+      }
+    },
+    tableForm: {
+      disabled:true,
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
     }
   },
-
   {
     label: '数量',
     field: 'qty',
@@ -877,7 +900,6 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       precision: 6
     }
   },
-
   {
     label: '备注',
     field: 'remark',