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

src/api/wms/customerStatementDetail/index.ts

@@ -129,6 +129,6 @@ export const updateAdjustmentAmount = async (id: number, masterId: number, amoun
 }
 
 // 客户对账单直接创建开票申请查询子分页数据
-export const pageInvoice = async (params) => {
+export const pageInvoice = async (id: number) => {
-  return await request.get({ url: `/wms/customer-statement-detail/pageInvoice`, params })
+  return await request.get({ url: `/wms/customer-statement-detail/pageInvoice?masterId=`+ id })
 }

src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue

@@ -223,9 +223,6 @@
                 <el-input-number
                   v-model="formData.configuration.MinQty"
                   :min="0"
-                  :max="
-                    formData.configuration.MaxQty != -1 ? formData.configuration.MaxQty : Infinity
-                  "
                   controls-position="right"
                 />
               </el-form-item>
@@ -243,9 +240,6 @@
                 <el-input-number
                   v-model="formData.configuration.SafetyQty"
                   :min="0"
-                  :max="
-                    formData.configuration.MaxQty != -1 ? formData.configuration.MaxQty : Infinity
-                  "
                   controls-position="right"
                 />
               </el-form-item>
@@ -263,9 +257,6 @@
                 <el-input-number
                   v-model="formData.configuration.FeedQty"
                   :min="0"
-                  :max="
-                    formData.configuration.MaxQty != -1 ? formData.configuration.MaxQty : Infinity
-                  "
                   controls-position="right"
                 />
               </el-form-item>
@@ -862,6 +853,7 @@ const searchTableSuccess = (formField, searchField, val, type, row) => {
   }
   
 }
+
 </script>
 <style scoped lang="scss">
 .item {

src/views/wms/deliversettlementManage/deliver/deliverJobMain/deliverJobMain.data.ts

@@ -68,10 +68,11 @@ export const DeliverJobMain = useCrudSchemas(
     },
     {
       label: '发货类型',
-      field: 'deliverType',
+      field: 'businessType',
       sort: 'custom',
-      isSearch: true,
+      isSearch: false,
-      dictType: DICT_TYPE.DELIVER_TYPE,
+      isTable: true,
+      dictType: DICT_TYPE.DELIVER_METHOD,
       dictClass: 'string',
       table: {
         width: 150

src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts

@@ -108,10 +108,11 @@ export const DeliverRecordMain = useCrudSchemas(
     },
     {
       label: '发货类型',
-      field: 'deliverType',
+      field: 'businessType',
       sort: 'custom',
-      isSearch: true,
+      isSearch: false,
-      dictType: DICT_TYPE.DELIVER_TYPE,
+      isTable: true,
+      dictType: DICT_TYPE.DELIVER_METHOD,
       dictClass: 'string',
       table: {
         width: 150

src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts

@@ -196,17 +196,14 @@ export const DeliverRequestMain = useCrudSchemas(
     },
     {
       label: '发货类型',
-      field: 'deliverType',
+      field: 'businessType',
       sort: 'custom',
-      dictType: DICT_TYPE.DELIVER_TYPE,
+      isSearch: false,
+      isTable: true,
+      dictType: DICT_TYPE.DELIVER_METHOD,
       dictClass: 'string',
       table: {
         width: 150
-      },
-      form: {
-        componentProps: {
-          disabled: true
-        }
       }
     },
     {

src/views/wms/deliversettlementManage/ftSuppliesRecordMain/deliverRecordMain/index.vue

@@ -182,6 +182,11 @@ const basicFormRef = ref()
 const tableData = ref([])
 const openForm = (type: string, row?: any) => {
   tableData.value = []
+    DeliverRecordMain.allSchemas.formSchema.forEach(item=>{
+    if (item.field == 'businessType'){
+      item.componentProps.options = item.componentProps.options.filter(cur=>cur.value == 'SSProduct'||cur.value == 'ToyotaSupplies'||cur.value == 'SkylightCarpet')
+    }
+  })
   basicFormRef.value.open(type, row)
 }
 // 获取部门 用于详情 部门回显
@@ -309,4 +314,14 @@ onMounted(async () => {
   }
   getList()
 })
+onActivated(() => {
+  if (routeName.value == 'ToyotaSupplies') {
+    tableObject.params.businessType = 'ToyotaSupplies'
+  } else if (routeName.value == 'SSProduct') {
+    tableObject.params.businessType = 'SSProduct'
+  } else if (routeName.value == 'SkylightCarpet') {
+    tableObject.params.businessType = 'SkylightCarpet'
+  }
+  getList()
+})
 </script>

src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts

@@ -25,7 +25,7 @@ export const DeliverRecordMain = useCrudSchemas(
       table: {
         width: 180
       },
-      isSearch: true
+      isSearch: false
     },
     {
       label: '任务单号',
@@ -57,6 +57,18 @@ export const DeliverRecordMain = useCrudSchemas(
       isTable: true,
       isDetail: true
     },
+    {
+      label: '发货类型',
+      field: 'businessType',
+      sort: 'custom',
+      isSearch: false,
+      isTable: true,
+      dictType: DICT_TYPE.DELIVER_METHOD,
+      dictClass: 'string',
+      table: {
+        width: 150
+      }
+    },
     // {
     //   label: '客户发货单号',
     //   field: 'customerDeliverNumber',
@@ -111,18 +123,7 @@ export const DeliverRecordMain = useCrudSchemas(
       },
       isSearch: true
     },
-    {
+  
-      label: '发货类型',
-      field: 'deliverType',
-      sort: 'custom',
-      isSearch: false,
-      isTable: false,
-      dictType: DICT_TYPE.DELIVER_TYPE,
-      dictClass: 'string',
-      table: {
-        width: 150
-      }
-    },
     {
       label: '客户月台代码',
       field: 'customerDockCode',
@@ -538,6 +539,7 @@ export const DeliverRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch: true
   },
   {
     label: '物料名称',

src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/finishedShipmentMain.data.ts

@@ -61,6 +61,39 @@ export const FinishedShipmentMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true
   },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    isDetail:true,
+    isForm: false,
+    isTable:true,
+    sortTableDefault:10000
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    detail: {
+      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    },
+    isTable:true,
+    isForm: false,
+    table:{
+      width:180
+    },
+    sortTableDefault:10000
+
+  },
   {
     label: '操作',
     field: 'action',
@@ -131,6 +164,22 @@ export const FinishedShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '库位',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
   // {
   //   label: '发货数量',
   //   field: 'shipmentQuantity',

src/views/wms/deliversettlementManage/saleEstimate/finishedShipmentMain/index.vue

@@ -212,7 +212,7 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await FinishedShipmentMainApi.exportFinishedShipmentMain(tableObject.params)
+    const data = await FinishedShipmentDetailApi.exportFinishedShipmentDetail(tableObject.params)
     download.excel(data, '已发未结发货记录主.xlsx')
   } catch {
   } finally {

src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/index.vue

@@ -109,8 +109,8 @@ const { getList, setSearchParams } = tableMethods
 
 // 列表头部按钮
 const HeadButttondata = [
-  defaultButtons.defaultAddBtn({hasPermi:'wms:unfinished-shipment-main:create'}), // 新增
+  // defaultButtons.defaultAddBtn({hasPermi:'wms:unfinished-shipment-main:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:unfinished-shipment-main:import'}), // 导入
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:unfinished-shipment-main:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:unfinished-shipment-main:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
@@ -143,8 +143,8 @@ const buttonBaseClick = (val, item) => {
 
 // 列表-操作按钮
 const butttondata = [
-  defaultButtons.mainListEditBtn({hasPermi:'wms:unfinished-shipment-main:update'}), // 编辑
+  // defaultButtons.mainListEditBtn({hasPermi:'wms:unfinished-shipment-main:update'}), // 编辑
-  defaultButtons.mainListDeleteBtn({hasPermi:'wms:unfinished-shipment-main:delete'}), // 删除
+  // defaultButtons.mainListDeleteBtn({hasPermi:'wms:unfinished-shipment-main:delete'}), // 删除
 ]
 
 // 列表-操作按钮事件
@@ -213,7 +213,7 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await UnfinishedShipmentMainApi.exportUnfinishedShipmentMain(tableObject.params)
+    const data = await UnfinishedShipmentDetailApi.exportUnfinishedShipmentDetail(tableObject.params)
     download.excel(data, '已发未结发货记录主.xlsx')
   } catch {
   } finally {

src/views/wms/deliversettlementManage/saleEstimate/unfinishedShipmentMain/unfinishedShipmentMain.data.ts

@@ -53,6 +53,40 @@ export const UnfinishedShipmentMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true
   },
+  {
+    label: '创建者',
+    field: 'creator',
+    sort: 'custom',
+    isDetail:true,
+    isForm: false,
+    isTable:true,
+    sortTableDefault:10000
+
+  },
+  {
+    label: '创建时间',
+    field: 'createTime',
+    sort: 'custom',
+    formatter: dateFormatter,
+    search: {
+      component: 'DatePicker',
+      componentProps: {
+        valueFormat: 'YYYY-MM-DD HH:mm:ss',
+        type: 'daterange',
+        defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+      }
+    },
+    detail: {
+      dateFormat : 'YYYY-MM-DD HH:mm:ss'
+    },
+    isTable:true,
+    isForm: false,
+    table:{
+      width:180
+    },
+    sortTableDefault:10000
+
+  },
   {
     label: '操作',
     field: 'action',
@@ -123,6 +157,22 @@ export const UnfinishedShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '库位',
+    field: 'toLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150,
+    },
+  },
   {
     label: '发货数量',
     field: 'shipmentQuantity',

src/views/wms/deliversettlementManage/ssSuppliesRecordMain/deliverRecordMain/index.vue

@@ -182,6 +182,11 @@ const basicFormRef = ref()
 const tableData = ref([])
 const openForm = (type: string, row?: any) => {
   tableData.value = []
+  DeliverRecordMain.allSchemas.formSchema.forEach(item=>{
+    if (item.field == 'businessType'){
+      item.componentProps.options = item.componentProps.options.filter(cur=>cur.value == 'SSProduct'||cur.value == 'ToyotaSupplies'||cur.value == 'SkylightCarpet')
+    }
+  })
   basicFormRef.value.open(type, row)
 }
 
@@ -312,4 +317,14 @@ onMounted(async () => {
   }
   getList()
 })
+onActivated(() => {
+  if (routeName.value == 'ToyotaSupplies') {
+    tableObject.params.businessType = 'ToyotaSupplies'
+  } else if (routeName.value == 'SSProduct') {
+    tableObject.params.businessType = 'SSProduct'
+  } else if (routeName.value == 'SkylightCarpet') {
+    tableObject.params.businessType = 'SkylightCarpet'
+  }
+  getList()
+})
 </script>

src/views/wms/deliversettlementManage/tjdtSuppliesRecordMain/deliverRecordMain/index.vue

@@ -182,6 +182,11 @@ const basicFormRef = ref()
 const tableData = ref([])
 const openForm = (type: string, row?: any) => {
   tableData.value = []
+   DeliverRecordMain.allSchemas.formSchema.forEach(item=>{
+    if (item.field == 'businessType'){
+      item.componentProps.options = item.componentProps.options.filter(cur=>cur.value == 'SSProduct'||cur.value == 'ToyotaSupplies'||cur.value == 'SkylightCarpet')
+    }
+  })
   basicFormRef.value.open(type, row)
 }
 // 获取部门 用于详情 部门回显
@@ -309,4 +314,14 @@ onMounted(async () => {
   }
   getList()
 })
+onActivated(() => {
+  if (routeName.value == 'ToyotaSupplies') {
+    tableObject.params.businessType = 'ToyotaSupplies'
+  } else if (routeName.value == 'SSProduct') {
+    tableObject.params.businessType = 'SSProduct'
+  } else if (routeName.value == 'SkylightCarpet') {
+    tableObject.params.businessType = 'SkylightCarpet'
+  }
+  getList()
+})
 </script>

src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/unplannedreceiptJobMain.data.ts

@@ -591,7 +591,7 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '承接人',
-    field: 'acceptUserId',
+    field: 'acceptUserName',
     sort: 'custom',
     table: {
       width: 150
@@ -619,7 +619,7 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '完成人',
-    field: 'completeUserId',
+    field: 'completeUserName',
     sort: 'custom',
     table: {
       width: 150

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

@@ -518,7 +518,7 @@ export const PurchasePlanMain = useCrudSchemas(
       },
       isTable: false,
       isForm: false,
-      isDetail: false
+      isDetail: true
     },
     {
       label: '操作',