Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

src/views/basicdata/driverArtery/basicdataDriverArtery.vue

@@ -160,6 +160,7 @@ export default {
       search: false,
       query: {},
       columnList: deepClone(columnList),
+      dataType:[],
       data: [],
       drawerShow: false,
       page: {
@@ -256,14 +257,46 @@ export default {
                 break;
               }
             }
-
             // 仓库
             value.warehouseNames = value.warehouses.map(val => val.warehouseName).join(',');
           }
    
-          console.log('this.data :>> ', this.data);
+          if(!this.dataType.length){
+            let  BizData=[]
+            BizData = await getDictionaryBiz('basic_driverjob_type');
+            if(BizData.data.code ==200 && BizData.data.data.length){
+            this.dataType= await BizData.data.data.map(res=>{
+            return{
+              label:res.dictValue,
+              value:res.dictKey
+            }
+          })
+          }
+          }
+          this.data.forEach(items => {
+          let aValues;
+           // 检查 items.jobType 是否存在并且是字符串
+          if (typeof items.jobType === 'string') {
+          if (items.jobType.split(',').length > 1) {
+            // 如果 jobType 包含逗号，则分隔并处理
+          aValues = items.jobType.split(',').map(value => value.trim());
+          } else {
+           // 否则，直接作为单个值处理
+          aValues = [items.jobType.trim()];
+          }
+        } else {
+          // 如果 items.jobType 不是字符串，设置空数组
+          aValues = [];
+        }
+        // 根据 aValues 的值查找对应的 label
+        items.jobTypeName = this.dataType
+          .filter(item => aValues.includes(item.value)) // 过滤出匹配的项
+          .map(item => item.label) // 提取对应的 label
+          .join(','); // 用逗号连接所有的 label
+      });
+
     //查询车辆绑定情况
-          this.getVehiclede();
+          // this.getVehiclede();
         } catch (error) {
           console.log('error :>> ', error);
         } finally {
@@ -484,6 +517,7 @@ export default {
             }
             value.checkarr = _data;
           }
+
         }
         console.log('res :>> ', res);
       } catch (error) {

src/views/basicdata/driverArtery/basicdataDriverArteryAdd.vue

@@ -644,7 +644,7 @@ export default {
       this.form = {
         ..._data,
       };
-
+      this.form.jobType=  this.form.jobTypeString
       this.form.bindVehicles = _data.bindVehicles && _data.bindVehicles.split(',');
       this.form.warehouseIds = _data.warehouses.map(val => val.warehouseId);
       console.log('_data :>> ', _data);
@@ -657,6 +657,7 @@ export default {
         const submitData = { ...this.form };
         submitData.bindVehicles = this.form.bindVehicles && this.form.bindVehicles.join(',');
         submitData.phone = this.form.phone.trim();
+        submitData.jobType = submitData.jobType.join(',')
         
         const res = await add(submitData);
         const { code, msg } = res.data;
@@ -670,6 +671,7 @@ export default {
           type: 'warning',
         })
           .then(() => {
+            submitData.jobType=[]
             this.$refs.formRef.resetFields();
           })
           .catch(() => this.back());
@@ -687,7 +689,7 @@ export default {
         const submitData = { ...this.form };
         submitData.bindVehicles = this.form.bindVehicles && this.form.bindVehicles.join(',');
         submitData.phone = this.form.phone.trim();
-
+        submitData.jobType = submitData.jobType.join(',')
         const res = await update(submitData);
         const { code, msg } = res.data;
         if (code !== 200) return;

src/views/distribution/inventory/distributionStockArticleDetails.vue

@@ -1477,11 +1477,11 @@ export default {
       }
     },
   },
-  async activated() {
-    if (this.pageId !== this.$route.query.id) return;
-    await this.$nextTick();
-    this.$refs.tableNode.handleCheckSelect(this.selectionList);
-  },
+  // async activated() {
+  //   if (this.pageId !== this.$route.query.id) return;
+  //   await this.$nextTick();
+  //   this.$refs.tableNode.handleCheckSelect(this.selectionList);
+  // },
 };
 </script>
 

src/views/distribution/inventory/distributionStockListDetails.vue

@@ -1265,7 +1265,7 @@ export default {
       this.query.marketId = this.$route.query.marketId;
       this.query.materialId = this.$route.query.materialId;
       this.query.id = this.$route.query.id;
-
+      this.query.incomingBatch=this.$route.query.incomingBatch
       // getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
       //   const data = res.data.data;
       //   this.page.total = data.total;

src/views/mail/inventory/list.vue

@@ -874,6 +874,7 @@ export default {
         query: {
           id: row.row.id,
           name: row.row.descriptionGoods + ' — 明细',
+          incomingBatch:row.row.incomingBatch,
         },
       });
     },

src/views/mail/order/list.vue

@@ -1230,6 +1230,7 @@ export default {
         query: {
           id: row.row.id,
           name: '详情 - ' + row.row.orderCode,
+          isZero:row.row.isZero
         },
       });
     },