YT-1651WMS26.便次修改

src/locales/en-US.ts

@@ -1024,7 +1024,7 @@ export default {
     审批通过:'Approve',
     要货预测主:'Demand forecast master data',
     要货预测主导入模版:'Demand forecast master data leads into the template',
-    创建供应商发货申请:'Create a supplier shipping request',
+    创建发货申请:'Create a shipping request',
     '是否重新打开所选中数据？':'Do you want to reopen the selected data?',
     '请先上传自检报告!':'Please upload the self-test report first!',
     '提交审批成功!':'Submitted for approval!',

src/locales/zh-CN.ts

@@ -1029,7 +1029,7 @@ export default {
     审批通过:'审批通过',
     要货预测主:'要货预测主',
     要货预测主导入模版:'要货预测主导入模版',
-    创建供应商发货申请:'创建供应商发货申请',
+    创建发货申请:'创建发货申请',
     '是否重新打开所选中数据？':'是否重新打开所选中数据？',
     '请先上传自检报告!':'请先上传自检报告!',
     '提交审批成功!':'提交审批成功!',

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

@@ -470,7 +470,7 @@ const isShowMainButton1 = (row, val) => {
       defaultButtons.mainListEditBtn({ hide: isShowMainButton1(row, ['1','3','5']), hasPermi: 'wms:purchase-plan-main:edit' }), // 编辑
       // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchase-plan-main:delete'}), // 删除
       {
-        label: t('ts.创建供应商发货申请'),
+        label: t('ts.创建发货申请'),
         name: 'supplierdeliver',
         hide: isShowMainButton(row, ['4']),
         type: 'primary',
@@ -506,6 +506,7 @@ const isShowMainButton1 = (row, val) => {
     } else if (val == 'supplierdeliver') { // 创建供应商发货申请
       supplierdeliverFormRef.value.openFormByCreate({
         number:row.number, //要货单号
+        deliNo:row.deliNo, //便次
         poNumber:row.poNumber, //采购订单号
         supplierCode:row.supplierCode, //供应商代码 
         endTime:row.endTime, //结束时间

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

@@ -8,7 +8,7 @@ import { PurchaseDetail, PurchaseMain } from '../purchaseMain/purchaseMain.data'
 import { getPurchaseDetailPagePoNumber } from '@/api/wms/purchaseDetail'
 import * as ItembasicApi from '@/api/wms/itembasic'
 import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
-import { validatePositiveNumber0 } from "@/utils/validator";
+import { validatePositiveNumber0, validateInteger } from "@/utils/validator";
 const { t } = useI18n() // 国际化
 
 /**
@@ -340,14 +340,18 @@ export const PurchasePlanMain = useCrudSchemas(
       label: '便次',
       field: 'deliNo',
       sort: 'custom',
-      isTable: false,
-      isForm: false,
       sortTableDefault: 13,
       table: {
         width: 150
       },
+      form: {
+        component: 'InputNumber',
+        componentProps: {
+          min: 1,
+        },
+      }
     },
-  
+
  
     {
       label: '预测版本',
@@ -577,7 +581,11 @@ export const PurchasePlanMainRules = reactive({
   status: [{ required: true, message: '请选择状态', trigger: 'change' }],
   number: [{ required: true, message: '请输入单据号', trigger: 'blur' }],
   businessType: [{ required: true, message: '请输入业务类型', trigger: 'blur' }],
-  remark: [{ max: 50, message: '不得超过50个字符', trigger: 'blur' }]
+  remark: [{ max: 50, message: '不得超过50个字符', trigger: 'blur' }],
+  deliNo: [
+    { required: true, message: '请输入便次', trigger: 'blur' },
+    { validator: validateInteger, message: '请输入正确的正整数', trigger: ['change', 'blur'] },
+  ],
 })
 
 /**
@@ -954,8 +962,6 @@ export const PurchasePlanDetail = useCrudSchemas(
       table: {
         width: 150
       },
-
-      hiddenInMain: true,
       isTableForm: false,
       isForm: false,
       isTable: true,

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

@@ -32,6 +32,21 @@ export const SupplierdeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180
     },
   },
+  {
+    label: '便次',
+    field: 'deliNo',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        disabled: true
+      },
+    },
+  },
   {
     label: '申请单号',
     field: 'requestNumber',

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

@@ -109,6 +109,7 @@ const openFormByCreate = async ( data ) => {
     setV['supplierCode'] = data['supplierCode'] // 供应商代码
     setV['poNumber'] = data['poNumber'] //采购订单
     setV['ppNumber'] = data['number'] // 要货单号
+    setV['deliNo'] = data['deliNo'] // 要货单号
     searchPage: SupplierApi.getSupplierPage
     //新增--选择完要货计划，自动展示明细
     getSearchTableData(data['number'],'ppNumber','number',0)
@@ -254,6 +255,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
         //新增--选择完要货计划，自动展示明细
         
         setV['poNumber'] = val[0]['poNumber'] //采购订单
+        setV['deliNo'] = val[0]['deliNo']
         getSearchTableData(val[0]['number'],formField,searchField,0)
 
         // 设置计划到货时间

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

@@ -220,6 +220,26 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
       sortDetailDefault: 4,
     }
   },
+  {
+    label: '便次',
+    field: 'deliNo',
+    sort: 'custom',
+    sortTableDefault: 4,
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        disabled: true
+      },
+    },
+    detail: {
+      sortDetailDefault: 4,
+    }
+  },
+
   {
     label: '要求到货时间',
     field: 'arriveTime',
@@ -1337,6 +1357,9 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       width:150
     },
     sortTableDefault: 10000,
+    isTableForm: false,
+    hiddenInMain: true,
+    
     form: {
       component: 'Switch',
       value: 'TRUE',