前端字段展示

src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts

@@ -51,8 +51,8 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     }
   },
   {
-    label: '发货申请单号',
-    field: 'deliverRequestNumber',
+    label: '发货记录单号',
+    field: 'deliverRecordNumber',
     sort: 'custom',
     table: {
       width: 150

src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts

@@ -3,7 +3,9 @@ import { dateFormatter } from '@/utils/formatTime'
 import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
 
 import * as DeliverRecordMainApi from '@/api/wms/deliverRecordMain'
+import * as DeliverPlanMainApi from '@/api/wms/deliverPlanMain'
 import { DeliverRecordMain } from '../../deliver/deliverRecordMain/deliverRecordMain.data'
+import { DeliverPlanMain } from '../../deliverplan/deliverPlanMain/deliverPlanMain.data'
 
 import * as SaleMainApi from '@/api/wms/saleMain'
 import * as SaleDetailApi from '@/api/wms/saleDetail'
@@ -95,6 +97,12 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isSearch: true,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
   },
   {
     label: '客户代码',

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

@@ -87,6 +87,7 @@ export const DeliverJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '运输方式',
     field: 'transferMode',
+    dictType: DICT_TYPE.TRANSFER_MODE,
     sort: 'custom',
     table: {
       width: 150

src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue

@@ -185,76 +185,76 @@ const butttondata = (row) => {
 const buttonTableClick = async (val, row) => {
    if (val == 'mainJobExe') { // 执行
     let aaa = {
-    "id": "1809190002130023675",
-    "requestNumber": "REQ1720231201-0002",
-    "deliverPlanNumber": "DP20231130-0001",
-    "customerDeliverNumber": null,
-    "customerCode": "CF",
-    "customerDockCode": "CFCKYT",
-    "deliverDock": null,
-    "carrierCode": "cys-001",
-    "transferMode": "",
-    "vehiclePlateNumber": "",
-    "fromWarehouseCode": null,
-    "toWarehouseCode": "CFCK",
-    "requestTime": 1701420156000,
-    "requestDueTime": 0,
-    "status": "1",
-    "expiredTime": null,
-    "updateTime": 1701420722000,
-    "updater": "1",
-    "jobStageStatus": null,
-    "priority": null,
-    "priorityincrement": null,
-    "departmentCode": "研发部门",
-    "acceptUserId": null,
-    "acceptTime": null,
-    "completeUserId": null,
-    "completeTime": null,
-    "fromLocationTypes": "FG",
-    "toLocationTypes": "CUST",
-    "number": "JOB2420231201-0018",
-    "businessType": "DeliverJob",
-    "remark": "测试用的！！！！！！",
-    "createTime": 1701420722000,
-    "creator": "1",
-    "ruleUserId": null,
-    "fromAreaCodes": "采购在途库",
-    "toAreaCodes": "采购在途库",
-    "fromDockCode": null,
-    "autoComplete": "FALSE",
-    "allowModifyLocation": "FALSE",
-    "allowModifyQty": "TRUE",
-    "allowBiggerQty": "TRUE",
-    "allowSmallerQty": "TRUE",
-    "allowModifyInventoryStatus": "TRUE",
-    "allowContinuousScanning": "TRUE",
-    "allowPartialComplete": "TRUE",
-    "allowModifyBatch": "FALSE",
-    "allowModifyPackingNumber": "FALSE",
-    "inInventoryStatuses": "OK",
-    "outInventoryStatuses": "OK",
-    "subList": [{
-      "id": "1809190001245559376",
-    "soNumber": "",
-    "soLine": "",
-    "packingNumber": null,
-    "batch": "20231130",
-    "inventoryStatus": "OK",
-    "ownerCode": null,
-    "containerNumber": null,
-    "fromLocationCode": "Loc_testCF",
-    "toLocationCode": "CUST",
-    "itemCode": "testCF",
-    "itemName": "陈放测试物品",
-    "itemDesc1": "测试用",
-    "itemDesc2": "测试用",
-    "projectCode": "5",
-    "qty": 1,
-    "uom": "EA",
-    "number": "JOB2420231201-0018",
-    "remark": "",
-    "createTime": 1701137234000,
+    "id": "1809190002130023676",
+    "requestNumber": "REQ1720231205-0001",
+    "deliverPlanNumber": "DP20231205-0002",
+    "customerDeliverNumber": "CUST20231205-00000001",
+    "customerCode": "CF",
+    "customerDockCode": "CFCKYT",
+    "deliverDock": null,
+    "carrierCode": "cys-001",
+    "transferMode": "LOAD",
+    "vehiclePlateNumber": "车牌号",
+    "fromWarehouseCode": null,
+    "toWarehouseCode": "CFCK",
+    "requestTime": 1701740774000,
+    "requestDueTime": 1704470400000,
+    "status": "2",
+    "expiredTime": null,
+    "updateTime": 1701740969000,
+    "updater": "1",
+    "jobStageStatus": null,
+    "priority": null,
+    "priorityincrement": null,
+    "departmentCode": "研发部门",
+    "acceptUserId": "1",
+    "acceptTime": 1701742448000,
+    "completeUserId": null,
+    "completeTime": null,
+    "fromLocationTypes": "FG",
+    "toLocationTypes": "CUST",
+    "number": "JOB2420231205-0001",
+    "businessType": "DeliverJob",
+    "remark": "主表备注",
+    "createTime": 1701740969000,
+    "creator": "1",
+    "ruleUserId": null,
+    "fromAreaCodes": "采购在途库",
+    "toAreaCodes": "采购在途库",
+    "fromDockCode": null,
+    "autoComplete": "FALSE",
+    "allowModifyLocation": "FALSE",
+    "allowModifyQty": "TRUE",
+    "allowBiggerQty": "TRUE",
+    "allowSmallerQty": "TRUE",
+    "allowModifyInventoryStatus": "TRUE",
+    "allowContinuousScanning": "TRUE",
+    "allowPartialComplete": "TRUE",
+    "allowModifyBatch": "FALSE",
+    "allowModifyPackingNumber": "FALSE",
+    "inInventoryStatuses": "OK",
+    "outInventoryStatuses": "OK",
+    "subList": [{
+    "id": "1809190001245559377",
+    "soNumber": null,
+    "soLine": null,
+    "packingNumber": null,
+    "batch": "20231130",
+    "inventoryStatus": "OK",
+    "ownerCode": null,
+    "containerNumber": null,
+    "fromLocationCode": "Loc_testCF",
+    "toLocationCode": "CUST",
+    "itemCode": "testCF",
+    "itemName": "陈放测试物品",
+    "itemDesc1": "测试用",
+    "itemDesc2": "测试用",
+    "projectCode": "5",
+    "qty": 1,
+    "uom": "EA",
+    "number": "JOB2420231205-0001",
+    "remark": "子表备注",
+    "createTime": 1701740970000,
     "creator": "1",
     "toPackingNumber": null,
     "toContainerNumber": null,
@@ -283,11 +283,11 @@ const buttonTableClick = async (val, row) => {
     handleHandle(aaa)
     console.log('列表-操作按钮事件-执行')
   } else if (val == 'mainJobAba') { // 放弃
-    console.log('列表-操作按钮事件-放弃')
+    DeliverJobMainApi.abandonDeliverJobMain(row.id)
   } else if (val == 'mainJobClo') { // 关闭
-    console.log('列表-操作按钮事件-关闭')
-  } else if (val == 'mainJobAcc') { // 承接
-    console.log('列表-操作按钮事件-承接')
+    DeliverJobMainApi.closeDeliverJobMain(row.id)
+  } else if (val == 'mainJobAcc') { // 执行
+    DeliverJobMainApi.executeDeliverJobMain(row.id)
   }
 }
 

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

@@ -90,6 +90,11 @@ export const DeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'available',
           value: 'TRUE',
           isMainValue: false
+        },
+        {
+          key: 'status',
+          value: '6',
+          isMainValue: false
         }]
       }
     }

src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue

@@ -31,6 +31,7 @@
         <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
           <span>{{ row.number }}</span>
         </el-button>
+        
       </template>
       <template #action="{ row }">
         <ButtonBase :Butttondata="butttondata(row)" @button-base-click="buttonTableClick($event,row)" />