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

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

@@ -174,10 +174,10 @@ const isShowMainButton = (row,val) => {
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
-    // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
-    // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
+    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
-    // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
-    // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+    defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
   ]
 }
 
@@ -185,39 +185,40 @@ const butttondata = (row) => {
 const buttonTableClick = async (val, row) => {
    if (val == 'mainJobExe') { // 执行
     let aaa = {
-    "id": "1809200001805505477",
+    "id": "1809190002130023685",
-    "requestNumber": "REQ1820231206-0001",
+    "requestNumber": "REQ1720231222-0004",
-    "deliverRecordNumber": "JOB2420231206-0005",
+    "deliverPlanNumber": "DP20231222-0004",
-    "deliverPlanNumber": "DP20231205-0002",
+    "customerDeliverNumber": "CUST20231222-00000005",
     "customerCode": "CF",
     "customerDockCode": "CFCKYT",
-    "receiptDock": null,
+    "deliverDock": null,
-    "carrierCode": "cys-001",
+    "carrierCode": null,
-    "transferMode": "LOAD",
+    "transferMode": null,
-    "vehiclePlateNumber": "车牌号",
+    "vehiclePlateNumber": null,
     "fromWarehouseCode": null,
-    "toWarehouseCode": null,
+    "toWarehouseCode": "CFCK",
-    "requestTime": 1701826510000,
+    "requestTime": 1703207798000,
-    "requestDueTime": 1704470400000,
+    "requestDueTime": 1703952000000,
     "status": "2",
     "expiredTime": null,
-    "updateTime": 1701827786000,
+    "updateTime": 1703207917000,
-    "updater": "1",
+    "updater": "超级管理员",
     "jobStageStatus": null,
     "priority": null,
     "priorityincrement": null,
-    "departmentCode": "研发部门",
+    "departmentCode": "100",
     "acceptUserId": "1",
-    "acceptTime": 1701742448000,
+    "acceptTime": 1703207934000,
     "completeUserId": null,
     "completeTime": null,
     "fromLocationTypes": "FG",
     "toLocationTypes": "CUST",
-    "number": "JOB2420231205-0001",
+    "number": "JOB2420231222-0006",
     "businessType": "DeliverJob",
-    "remark": "主表备注",
+    "remark": "",
-    "createTime": 1701740969000,
+    "createTime": 1703207917000,
-    "creator": "1",
+    "creator": "超级管理员",
+    "ruleUserId": null,
     "fromAreaCodes": "采购在途库",
     "toAreaCodes": "采购在途库",
     "fromDockCode": null,
@@ -231,31 +232,35 @@ const buttonTableClick = async (val, row) => {
     "allowPartialComplete": "TRUE",
     "allowModifyBatch": "FALSE",
     "allowModifyPackingNumber": "FALSE",
+    "inInventoryStatuses": "OK",
+    "outInventoryStatuses": "OK",
+    "concurrencyStamp": 1,
     "subList": [{
-    "id": "1809190001245559377",
+    "id": "1809190001245559379",
     "soNumber": null,
     "soLine": null,
     "packingNumber": null,
-    "batch": "20231130",
+    "batch": "20230808",
     "inventoryStatus": "OK",
     "ownerCode": null,
     "containerNumber": null,
-    "fromLocationCode": "Loc_testCF",
+    "fromLocationCode": "L-R-001-001-1-01",
     "toLocationCode": "CUST",
     "itemCode": "testCF",
     "itemName": "陈放测试物品",
     "itemDesc1": "测试用",
     "itemDesc2": "测试用",
     "projectCode": "5",
-    "qty": 1,
+    "qty": 5,
     "uom": "EA",
-    "number": "JOB2420231205-0001",
+    "number": "JOB2420231222-0006",
-    "remark": "子表备注",
+    "remark": "",
-    "createTime": 1701740970000,
+    "createTime": 1703207917000,
-    "creator": "1",
+    "creator": "超级管理员",
     "toPackingNumber": null,
     "toContainerNumber": null,
     "toBatch": null,
+    "handleQty": null,
     "toInventoryStatus": null,
         recordList: [{
             handleQty: 10,

src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts

@@ -455,7 +455,7 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
     },
     tableForm: {
       disabled: true,
-      type: 'Select'
+      type: 'Select'  
     },
   },
   {