修复部分bug

src/views/reportformsOption/AllTrunklineConfig.vue

@@ -241,7 +241,7 @@ const details = reactive<any>({
       prop: 'departureWarehouseId',
       type: 'select',
       checkarr: [],
-      disabled: true,
+      disabled: false,
     },
 
     {
@@ -249,7 +249,7 @@ const details = reactive<any>({
       prop: 'destinationWarehouseId',
       type: 'select',
       checkarr: [],
-      disabled: true,
+      disabled: false,
     },
 
     {

src/views/reportformsOption/CheckWaybillConfig.vue

@@ -237,8 +237,16 @@ const details = reactive<any>({
   fullscreenObj: {},
   addFormOption: [
     {
-      label: '仓库',
-      prop: 'warehouseId',
+      label: '目的仓',
+      prop: 'destinationWarehouseId',
+      type: 'select',
+      checkarr: [],
+      disabled: true,
+    },
+
+    {
+      label: '品牌',
+      prop: 'brand',
       type: 'select',
       checkarr: [],
       disabled: true,
@@ -261,10 +269,14 @@ const details = reactive<any>({
   initForm: {
     /** 品牌 */
     brand: '全部',
-    /** 仓库 */
-    warehouseName: '',
-    /** 仓库id */
-    warehouseId: '全部',
+    /** 发站仓 */
+    departureWarehouseName: '',
+    /** 发站仓id */
+    departureWarehouseId: '全部',
+    /** 目的仓 */
+    destinationWarehouseName: '',
+    /** 目的仓id */
+    destinationWarehouseId: '全部',
     /** 时效(小时) */
     hoursTime: 0,
   },
@@ -452,16 +464,25 @@ const handleSubmitAdd = async () => {
     for (let i = 0; i < details.warehouseOption.length; i++) {
       const value = details.warehouseOption[i];
 
-      if (submitData.warehouseId === value.dictKey) {
-        submitData.warehouseName = value.dictValue;
+      if (submitData.departureWarehouseId === value.dictKey) {
+        submitData.departureWarehouseName = value.dictValue;
+      }
+
+      if (submitData.destinationWarehouseId === value.dictKey) {
+        submitData.destinationWarehouseName = value.dictValue;
       }
     }
 
-    if (submitData.warehouseId === '全部') {
-      submitData.warehouseId = '';
-      submitData.warehouseName = '全部';
+    if (submitData.departureWarehouseId === '全部') {
+      submitData.departureWarehouseId = '';
+      submitData.departureWarehouseName = '全部';
     }
 
+    if (submitData.destinationWarehouseId === '全部') {
+      submitData.destinationWarehouseId = '';
+      submitData.destinationWarehouseName = '全部';
+    }
+    
     details.popUpShow.add = false;
     const res = await postAddCheckWaybillConfig(submitData);
 

src/views/reportformsOption/DespatchConfig.vue

@@ -237,13 +237,21 @@ const details = reactive<any>({
   fullscreenObj: {},
   addFormOption: [
     {
-      label: '仓库',
-      prop: 'warehouseId',
+      label: '始发仓',
+      prop: 'departureWarehouseId',
       type: 'select',
       checkarr: [],
       disabled: true,
     },
 
+    {
+      label: '目的仓',
+      prop: 'destinationWarehouseId',
+      type: 'select',
+      checkarr: [],
+      disabled: true,
+    },
+    
     {
       label: '品牌',
       prop: 'brand',
@@ -261,10 +269,14 @@ const details = reactive<any>({
   initForm: {
     /** 品牌 */
     brand: '全部',
-    /** 仓库 */
-    warehouseName: '',
-    /** 仓库id */
-    warehouseId: '全部',
+    /** 发站仓 */
+    departureWarehouseName: '',
+    /** 发站仓id */
+    departureWarehouseId: '全部',
+    /** 目的仓 */
+    destinationWarehouseName: '',
+    /** 目的仓id */
+    destinationWarehouseId: '全部',
     /** 时效(小时) */
     hoursTime: 0,
   },
@@ -452,14 +464,23 @@ const handleSubmitAdd = async () => {
     for (let i = 0; i < details.warehouseOption.length; i++) {
       const value = details.warehouseOption[i];
 
-      if (submitData.warehouseId === value.dictKey) {
-        submitData.warehouseName = value.dictValue;
+      if (submitData.departureWarehouseId === value.dictKey) {
+        submitData.departureWarehouseName = value.dictValue;
       }
+
+      if (submitData.destinationWarehouseId === value.dictKey) {
+        submitData.destinationWarehouseName = value.dictValue;
+      }
+    }
+
+    if (submitData.departureWarehouseId === '全部') {
+      submitData.departureWarehouseId = '';
+      submitData.departureWarehouseName = '全部';
     }
 
-    if (submitData.warehouseId === '全部') {
-      submitData.warehouseId = '';
-      submitData.warehouseName = '全部';
+    if (submitData.destinationWarehouseId === '全部') {
+      submitData.destinationWarehouseId = '';
+      submitData.destinationWarehouseName = '全部';
     }
 
     details.popUpShow.add = false;