修改WMS新需求

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

@@ -533,26 +533,26 @@ export const UnplannedissueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
+  // {
-    label: '直接生成记录',
+  //   label: '直接生成记录',
-    field: 'directCreateRecord',
+  //   field: 'directCreateRecord',
-    dictType: DICT_TYPE.TRUE_FALSE,
+  //   dictType: DICT_TYPE.TRUE_FALSE,
-    dictClass: 'string',
+  //   dictClass: 'string',
-    isForm: true,
+  //   isForm: true,
-    isTable: false,
+  //   isTable: false,
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    form: {
+  //   form: {
-      component: 'Switch',
+  //     component: 'Switch',
-      value: 'FALSE',//HL-6130原来走的接口配置，和喜婷确认不走接口了，只是页面写死默认值为关闭
+  //     value: 'FALSE',//HL-6130原来走的接口配置，和喜婷确认不走接口了，只是页面写死默认值为关闭
-      componentProps: {
+  //     componentProps: {
-        inactiveValue: 'FALSE',
+  //       inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
+  //       activeValue: 'TRUE'
-      }
+  //     }
-    }
+  //   }
-  },
+  // },
   {
     label: '创建时间',
     field: 'createTime',

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

@@ -114,7 +114,7 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
   },
   {
-    label: '领用原因代码',
+    label: '预算科目',
     field: 'reasonCodeRequisition',
     sort: 'custom',
     table: {
@@ -122,9 +122,9 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     tableForm: {
       isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择成领用原因代码',
+      searchListPlaceholder: '请选择成预算科目',
       searchField: 'code',
-      searchTitle: '领用原因代码',
+      searchTitle: '预算科目',
       searchAllSchemas: SubjectAccount.allSchemas,
       searchPage: SubjectAccountApi.getSubjectAccountPage,
       searchCondition: [{
@@ -144,7 +144,7 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择成本中心代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '领用原因代码', // 查询弹窗标题
+        searchTitle: '预算科目', // 查询弹窗标题
         searchAllSchemas: SubjectAccount.allSchemas, // 查询弹窗所需类
         searchPage: SubjectAccountApi.getSubjectAccountPage, // 查询弹窗所需分页方法
         searchCondition: [{
@@ -171,7 +171,7 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择QAD项目信息',
       searchField: 'projectCode',
-      searchTitle: '领用原因代码',
+      searchTitle: '预算科目',
       searchAllSchemas: QadProject.allSchemas,
       searchPage: QadProjectApi.getQadProjectPage
     },
@@ -181,7 +181,7 @@ export const UnplannedreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择QAD项目信息', // 输入框占位文本
         searchField: 'projectCode', // 查询弹窗赋值字段
-        searchTitle: '领用原因代码', // 查询弹窗标题
+        searchTitle: '预算科目', // 查询弹窗标题
         searchAllSchemas: QadProject.allSchemas, // 查询弹窗所需类
         searchPage: QadProjectApi.getQadProjectPage, // 查询弹窗所需分页方法
         searchCondition: [{

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

@@ -189,7 +189,7 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
   },
   {
-    label: '领用原因代码',
+    label: '预算科目',
     field: 'reasonCodeRequisition',
     sort: 'custom',
     table: {
@@ -197,9 +197,9 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     },
     tableForm: {
       isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择成领用原因代码',
+      searchListPlaceholder: '请选择成预算科目',
       searchField: 'code',
-      searchTitle: '领用原因代码',
+      searchTitle: '预算科目',
       searchAllSchemas: SubjectAccount.allSchemas,
       searchPage: SubjectAccountApi.getSubjectAccountPage,
       searchCondition: [{
@@ -219,7 +219,7 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择成本中心代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '领用原因代码', // 查询弹窗标题
+        searchTitle: '预算科目', // 查询弹窗标题
         searchAllSchemas: SubjectAccount.allSchemas, // 查询弹窗所需类
         searchPage: SubjectAccountApi.getSubjectAccountPage, // 查询弹窗所需分页方法
         searchCondition: [{
@@ -246,7 +246,7 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择QAD项目信息',
       searchField: 'projectCode',
-      searchTitle: '领用原因代码',
+      searchTitle: '预算科目',
       searchAllSchemas: QadProject.allSchemas,
       searchPage: QadProjectApi.getQadProjectPage
     },
@@ -256,7 +256,7 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择QAD项目信息', // 输入框占位文本
         searchField: 'projectCode', // 查询弹窗赋值字段
-        searchTitle: '领用原因代码', // 查询弹窗标题
+        searchTitle: '预算科目', // 查询弹窗标题
         searchAllSchemas: QadProject.allSchemas, // 查询弹窗所需类
         searchPage: QadProjectApi.getQadProjectPage, // 查询弹窗所需分页方法
         searchCondition: [{

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

@@ -196,7 +196,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     },
   },
   {
-    label: '领用原因代码',
+    label: '预算科目',
     field: 'reasonCodeRequisition',
     sort: 'custom',
     table: {
@@ -205,9 +205,9 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     tableForm: {
       enterSearch: true,
       isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择成领用原因代码',
+      searchListPlaceholder: '请选择成预算科目',
       searchField: 'code',
-      searchTitle: '领用原因代码',
+      searchTitle: '预算科目',
       searchAllSchemas: SubjectAccount.allSchemas,
       searchPage: SubjectAccountApi.getSubjectAccountPage,
       searchCondition: [{
@@ -238,7 +238,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择成本中心代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '领用原因代码', // 查询弹窗标题
+        searchTitle: '预算科目', // 查询弹窗标题
         searchAllSchemas: SubjectAccount.allSchemas, // 查询弹窗所需类
         searchPage: SubjectAccountApi.getSubjectAccountPage, // 查询弹窗所需分页方法
         searchCondition: [{
@@ -276,7 +276,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
       isInpuFocusShow: true, // 开启查询弹窗
       searchListPlaceholder: '请选择QAD项目信息',
       searchField: ' ',
-      searchTitle: '领用原因代码',
+      searchTitle: '预算科目',
       searchAllSchemas: QadProject.allSchemas,
       searchPage: QadProjectApi.getQadProjectPage,
       verificationParams: [{
@@ -295,7 +295,7 @@ export const UnplannedreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择QAD项目信息', // 输入框占位文本
         searchField: 'projectCode', // 查询弹窗赋值字段
-        searchTitle: '领用原因代码', // 查询弹窗标题
+        searchTitle: '预算科目', // 查询弹窗标题
         searchAllSchemas: QadProject.allSchemas, // 查询弹窗所需类
         searchPage: QadProjectApi.getQadProjectPage, // 查询弹窗所需分页方法
         searchCondition: [{
@@ -665,7 +665,7 @@ export const UnplannedreceiptRequestMainRules = reactive({
     { required: false, message: '请输入项目代码', trigger: 'blur' }
   ],
   reasonCodeRequisition: [
-    { required: true, message: '请输入领用原因代码', trigger: 'blur' }
+    { required: true, message: '请输入预算科目', trigger: 'blur' }
   ],
   autoCommit: [
     { required: true, message: '请选择是否自动提交', trigger: 'change' }

src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@@ -816,6 +816,31 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
     sortTableDefault:13,
   },
+  {
+    label: '供应商发货数量',
+    field: 'supplierQty',
+    sort: 'custom',
+    isTable: true,
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    },
+    sortTableDefault:13,
+  },
+  {
+    label: '供应商计量单位',
+    field: 'supplierUom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:13,
+  },
   {
     label: '包装规格',
     field: 'packUnit',

src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@@ -806,6 +806,31 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
     sortTableDefault:13,
   },
+  {
+    label: '供应商发货数量',
+    field: 'supplierQty',
+    sort: 'custom',
+    isTable: true,
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    },
+    sortTableDefault:13,
+  },
+  {
+    label: '供应商计量单位',
+    field: 'supplierUom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:13,
+  },
   {
     label: '包装规格',
     field: 'packUnit',

src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@@ -808,6 +808,31 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
     sortTableDefault:13,
   },
+  {
+    label: '供应商发货数量',
+    field: 'supplierQty',
+    sort: 'custom',
+    isTable: true,
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    },
+    sortTableDefault:13,
+  },
+  {
+    label: '供应商计量单位',
+    field: 'supplierUom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:13,
+  },
   {
     label: '包装规格',
     field: 'packUnit',

src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@@ -806,6 +806,31 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
     sortTableDefault:13,
   },
+  {
+    label: '供应商发货数量',
+    field: 'supplierQty',
+    sort: 'custom',
+    isTable: true,
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    },
+    sortTableDefault:13,
+  },
+  {
+    label: '供应商计量单位',
+    field: 'supplierUom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:13,
+  },
   {
     label: '包装规格',
     field: 'packUnit',

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@@ -819,6 +819,31 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
     sortTableDefault:13,
   },
+  {
+    label: '供应商发货数量',
+    field: 'supplierQty',
+    sort: 'custom',
+    isTable: true,
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    },
+    sortTableDefault:13,
+  },
+  {
+    label: '供应商计量单位',
+    field: 'supplierUom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:13,
+  },
   {
     label: '包装规格',
     field: 'packUnit',
@@ -846,32 +871,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     isForm:false,
     sortTableDefault:16,
   },
-  {
+ 
-    label: '供应商发货数量',
-    field: 'supplierQty',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      component: 'InputNumber',
-    },
-    sortTableDefault:24,
-    hiddenInMain:true
-  },
-  {
-    label: '供应商计量单位',
-    field: 'supplierUom',
-    dictType: DICT_TYPE.UOM,
-    dictClass: 'string',
-    isTable: true,
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    sortTableDefault:24,
-    hiddenInMain:true
-  },
 
   {
     label: '库存状态',

src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@@ -818,6 +818,31 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     },
     sortTableDefault:13,
   },
+  {
+    label: '供应商发货数量',
+    field: 'supplierQty',
+    sort: 'custom',
+    isTable: true,
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+    },
+    sortTableDefault:13,
+  },
+  {
+    label: '供应商计量单位',
+    field: 'supplierUom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:13,
+  },
   {
     label: '包装规格',
     field: 'packUnit',