品番拉动修改

src/views/wms/basicDataManage/itemPull/itemPull.data.ts

@@ -4,16 +4,50 @@ import * as SupplierApi from '@/api/wms/supplier'
 import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
 import * as ItembasicApi from '@/api/wms/itembasic'
 import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+import * as AreaApi from '@/api/wms/areabasic'
+import { Area } from '@/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data'
 
 // 表单校验
 export const ItemPullRules = reactive({
-  itemCode: [required],
+  defaultErpLocationCode: [required],
   replenishType: [required],
   pullType: [required]
 })
 
 export const ItemPull = useCrudSchemas(
   reactive<CrudSchema[]>([
+    {
+      label: 'ERP默认收货库位',
+      field: 'defaultErpLocationCode',
+      sort: 'custom',
+      table: {
+        width: 150,
+        fixed: 'left'
+      },
+      form: {
+        // labelMessage: '信息提示说明！！！',
+        componentProps: {
+          multiple: true,
+          enterSearch: true,
+          isSearchList: true, // 开启查询弹窗
+          searchListPlaceholder: '请选择ERP默认收货库位', // 输入框占位文本
+          searchField: 'code', // 查询弹窗赋值字段
+          searchTitle: '库区信息', // 查询弹窗标题
+          searchAllSchemas: Area.allSchemas, // 查询弹窗所需类
+          searchPage: AreaApi.getAreaPage, // 查询弹窗所需分页方法
+          verificationParams: [
+            {
+              key: 'code',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        }
+      }
+    },
     {
       label: '品番',
       field: 'itemCode',
@@ -21,7 +55,7 @@ export const ItemPull = useCrudSchemas(
       isSearch: true,
       table: {
         width: 180,
-        fixed: 'left'
+        
       },
       form: {
         // labelMessage: '信息提示说明！！！',
@@ -104,7 +138,6 @@ export const ItemPull = useCrudSchemas(
       isSearch: true,
       table: {
         width: 150,
-        fixed: 'left'
       },
       form: {
         // labelMessage: '信息提示说明！！！',

src/views/wms/basicDataManage/supplierManage/modelDeliTime/index.vue

@@ -142,7 +142,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
         let tfk = JSON.parse(JSON.stringify(tableFormKeys))
         tfk['code'] = item['code']
         tfk['shift'] = item['shift']
-        tfk['beginTime'] = item['begeinTime']
+        tfk['beginTime'] = item['beginTime']
         tableData.value.push(tfk)
       })
     }
@@ -389,17 +389,34 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
   detailRef.value.openDetail(row, titleName, titleValue, 'basicSupplierAddrDeliTimeDetail')
 }
 
+/** 删除按钮操作 */
+// const handleDelete = async (id: number) => {
+//   try {
+//     // 删除的二次确认
+//     await message.delConfirm()
+//     // 发起删除
+//     await ModelDeliTimeDetailApi.deleteSupplierAddrDeliTimeDetail(id)
+//     message.success(t('common.delSuccess'))
+//     // 刷新列表
+//     await getList()
+//   } catch {}
+// }
+
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
   try {
     // 删除的二次确认
     await message.delConfirm()
+    tableObject.loading = true
     // 发起删除
     await ModelDeliTimeDetailApi.deleteSupplierAddrDeliTimeDetail(id)
     message.success(t('common.delSuccess'))
+    tableObject.loading = false
      // 刷新列表
     await getList()
-  } catch {}
+  } catch {}finally{
+      tableObject.loading = false
+    }
 }
 
 /** 导出按钮操作 */

src/views/wms/basicDataManage/supplierManage/modelDeliTime/modelDeliTime.data.ts

@@ -1,5 +1,4 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
 import * as SupplierApi from '@/api/wms/supplier'
 // import {Supplier} from '@/basicDataManage/supplierManage/supplier/supplier.data'
 import { Supplier } from '../supplier/supplier.data'
@@ -7,59 +6,62 @@ import { DeliTimeWms } from '../DeliTimeWms/deliTimeWms.data'
 import * as DeliTimeWmsApi from '@/api/wms/deliTimeWms'
 import { fa } from 'element-plus/es/locale'
 import * as modelDeliTimeApi from '@/api/wms/modelDeliTime'
-
+import { dateFormatter, dateFormatterHHMMSS } from '@/utils/formatTime'
 
 // 表单校验
 export const ModelDeliTimeDetailRules = reactive({
   modelShow: [required],
   yearAndMonthShow: [required],
-  delayDeli: [required],
+  delayDeli: [required]
 })
 
 function getMonthArr() {
-  let dateArr = [];
-  let year = new Date().getFullYear();
-  let month = new Date().getMonth();
+  let dateArr = []
+  let year = new Date().getFullYear()
+  let month = new Date().getMonth()
   const n = 12
   if (n < month) {
     //1.n<month的情况
     for (let i = month - n + 1; i <= month; i++) {
-      let m1 = i < 10 ? "0" + i : i;
+      let m1 = i < 10 ? '0' + i : i
       dateArr.push({
         label: year + '-' + m1,
         value: year + '-' + m1
-      });
+      })
     }
   } else {
     //2.n>month的情况
-    for (let i = (12 - (n - month) + 1); i <= 12; i++) {
-      let m1 = i < 10 ? "0" + i : i;
+    for (let i = 12 - (n - month) + 1; i <= 12; i++) {
+      let m1 = i < 10 ? '0' + i : i
       dateArr.push({
         label: year + '-' + m1,
         value: year + '-' + m1
-      });
+      })
     }
     for (let i = 1; i <= month; i++) {
-      let m1 = i < 10 ? "0" + i : i;
+      let m1 = i < 10 ? '0' + i : i
       dateArr.push({
-        label: (parseFloat(year) + 1) + '-' + m1,
-        value: (parseFloat(year) + 1) + '-' + m1,
-      });
+        label: parseFloat(year) + 1 + '-' + m1,
+        value: parseFloat(year) + 1 + '-' + m1
+      })
     }
   }
-  return dateArr;
+  return dateArr
 }
 
-export const ModelList = useCrudSchemas(reactive<CrudSchema[]>([
+export const ModelList = useCrudSchemas(
+  reactive<CrudSchema[]>([
     {
       label: '受入号',
       field: 'model',
       sort: 'custom',
-    isSearch: true,
-  },
-]))
+      isSearch: true
+    }
+  ])
+)
 
-export const ModelDeliTime = useCrudSchemas(reactive<CrudSchema[]>([
+export const ModelDeliTime = useCrudSchemas(
+  reactive<CrudSchema[]>([
     // {
     //   label: '供应商代码',
     //   field: 'supplierCode',
@@ -141,7 +143,7 @@ export const ModelDeliTime = useCrudSchemas(reactive<CrudSchema[]>([
               key: 'available',
               value: 'TRUE',
               isMainValue: false
-          },
+            }
           ],
           verificationParams: [
             {
@@ -178,7 +180,7 @@ export const ModelDeliTime = useCrudSchemas(reactive<CrudSchema[]>([
           multiple: true,
           collapseTags: true,
           collapseTagsTooltip: true,
-        maxCollapseTags:"2",
+          maxCollapseTags: '2',
           optionsAlias: {
             labelField: 'label',
             valueField: 'value'
@@ -198,9 +200,9 @@ export const ModelDeliTime = useCrudSchemas(reactive<CrudSchema[]>([
         component: 'DatePicker',
         componentProps: {
           type: 'month',
-        valueFormat: 'YYYY-MM',
+          valueFormat: 'YYYY-MM'
+        }
       }
-    },
     },
     {
       label: '延迟便次',
@@ -213,7 +215,7 @@ export const ModelDeliTime = useCrudSchemas(reactive<CrudSchema[]>([
           min: 0,
           precision: 0
         }
-    },
+      }
     },
     {
       label: '班次',
@@ -221,13 +223,13 @@ export const ModelDeliTime = useCrudSchemas(reactive<CrudSchema[]>([
       sort: 'custom',
       isForm: false,
       dictType: DICT_TYPE.DELISHIF,
-    dictClass: 'string',
+      dictClass: 'string'
     },
     {
       label: '编号',
       field: 'code',
       sort: 'custom',
-    isForm: false,
+      isForm: false
     },
     {
       label: '创建时间',
@@ -245,7 +247,7 @@ export const ModelDeliTime = useCrudSchemas(reactive<CrudSchema[]>([
       isForm: false,
       detail: {
         dateFormat: 'YYYY-MM-DD HH:mm:ss'
-    },
+      }
     },
     {
       label: '操作',
@@ -257,11 +259,11 @@ export const ModelDeliTime = useCrudSchemas(reactive<CrudSchema[]>([
         fixed: 'right'
       }
     }
-]))
-
+  ])
+)
 
-
-export const ModelDeliTimeDetail = useCrudSchemas(reactive<CrudSchema[]>([
+export const ModelDeliTimeDetail = useCrudSchemas(
+  reactive<CrudSchema[]>([
     {
       label: '编号',
       field: 'code',
@@ -276,24 +278,27 @@ export const ModelDeliTimeDetail = useCrudSchemas(reactive<CrudSchema[]>([
         searchTitle: '便次时间配置', // 查询弹窗标题
         searchAllSchemas: DeliTimeWms.allSchemas, // 查询弹窗所需类
         searchPage: DeliTimeWmsApi.getDeliTimePage, // 查询弹窗所需分页方法
-      searchCondition: [{
+        searchCondition: [
+          {
             key: 'available',
             value: 'TRUE',
             action: '==',
             isSearch: true,
             isMainValue: false
-      },
+          }
         ],
         verificationPage: DeliTimeWmsApi.getDeliTimePage, // tableForm下方输入框校验失去焦点之后是否正确的方法
         // isShowTableFormSearch: true, //tableForm下方是否出现输入框
-      verificationParams: [{
+        verificationParams: [
+          {
             key: 'itemCode',
             action: '==',
             value: '',
             isMainValue: false,
             isSearch: true,
-        isFormModel: true,
-      }], // 失去焦点校验参数
+            isFormModel: true
+          }
+        ] // 失去焦点校验参数
       },
       form: {
         // labelMessage: '信息提示说明！！！',
@@ -311,7 +316,7 @@ export const ModelDeliTimeDetail = useCrudSchemas(reactive<CrudSchema[]>([
               key: 'available',
               value: 'TRUE',
               isMainValue: false
-          },
+            }
           ],
           verificationParams: [
             {
@@ -338,6 +343,39 @@ export const ModelDeliTimeDetail = useCrudSchemas(reactive<CrudSchema[]>([
         type: 'Select'
       }
     },
+    {
+      label: '开始时间',
+      field: 'beginTime',
+      sort: 'custom',
+      formatter: dateFormatterHHMMSS,
+      isSearch: true,
+      search: {
+        component: 'TimePicker',
+        componentProps: {
+          type: 'time',
+          dateFormat: 'HH:mm:ss',
+          valueFormat: 'YYYY-MM-DD HH:mm:ss'
+        }
+      },
+      form: {
+        component: 'TimePicker',
+        componentProps: {
+          disabled: true,
+          type: 'time',
+          dateFormat: 'HH:mm:ss',
+          valueFormat: 'x'
+        }
+      },
+      tableForm: {
+        disabled: true,
+        type:'FormDateTime',
+        format:'HH:mm:ss',
+        valueFormat: 'x'
+      },
+      detail: {
+        dateFormat: 'HH:mm:ss'
+      }
+    },
     {
       label: '操作',
       field: 'action',
@@ -359,4 +397,5 @@ export const ModelDeliTimeDetail = useCrudSchemas(reactive<CrudSchema[]>([
     //     formatter: dateFormatter,
     //   }
     // },
-]))
+  ])
+)