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

src/api/aftersales/aftersalesWorkOrder.js

@@ -334,11 +334,11 @@ export const $_modifyData = (data) => {
 }
 
 // 查询配送信息
-export const $_shippingInformation = (data) => {
+export const $_shippingInformation = (params) => {
   return request({
-    url: '/api/logpm-aftersales/aftersalesWorkOrder/deliveryList/shippingInformation',
+    url: '/api/logpm-distribution/deliveryList/shippingInformation',
-    method: 'post',
+    method: 'get',
-    data
+    params
   })
 }
 

src/views/aftersales/aftersalesWorkOrderAdd.vue

@@ -152,24 +152,63 @@
           v-model="Indexform.trainNumber"
           placeholder="请输入车次号(干线卸车环节)"
           clearable
+          @change="DeliveryTrainnumber"
         />
       </el-form-item>
       <!-- 必填 -->
-      <el-form-item label="一级品">
+
-        <el-input v-model="Indexform.first" placeholder="请输入一级品类" clearable />
+      <el-form-item
+        label="配送司机"
+        v-if="
+          groundlineSet ||
+          groundlineType == 3 ||
+          groundlineType == 4 ||
+          groundlineType == 8 ||
+          groundlineType == 5 ||
+          groundlineType == 7 ||
+          groundlineType == 8
+        "
+      >
+        <el-select
+          v-model="Indexform.deliveryDriver"
+          filterable
+          default-first-option
+          :reserve-keyword="false"
+          placeholder="请输入配送司机"
+        >
+          <el-option
+            v-for="item in DeliveryDriver"
+            :key="item.value"
+            :label="item.driverName"
+            :value="item.id"
+          />
+        </el-select>
       </el-form-item>
       <!-- 必填 -->
-      <el-form-item label="二级品">
-        <el-input v-model="Indexform.secondary" placeholder="请输入二级品类" clearable />
-      </el-form-item>
 
-      <el-form-item label="车辆路线" v-if="groundlineSet || groundlineType == 3">
+      <el-form-item
-        <el-input
+        label="配送时间"
-          v-model="Indexform.vehicleRoute"
+        v-if="
-          placeholder="请输入车辆路线车次号(通过车次号自动带出车辆路线)"
+          groundlineSet ||
-          clearable
+          groundlineType == 3 ||
+          groundlineType == 4 ||
+          groundlineType == 8 ||
+          groundlineType == 5 ||
+          groundlineType == 7 ||
+          groundlineType == 8
+        "
+      >
+        <el-date-picker
+          v-model="Indexform.deliveryTime"
+          type="datetime"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          placeholder="请选择配送时间"
         />
       </el-form-item>
+      <el-form-item label="车辆路线" v-if="groundlineSet || groundlineType == 3">
+        <el-input v-model="Indexform.vehicleRoute" placeholder="请输入车辆路线车次号" clearable />
+      </el-form-item>
 
       <el-form-item label="发货时间">
         <el-date-picker
@@ -203,25 +242,8 @@
         />
       </el-form-item>
 
-      <el-form-item
+      <el-form-item label="二级品">
-        label="配送时间"
+        <el-input v-model="Indexform.secondary" placeholder="请输入二级品类" clearable />
-        v-if="
-          groundlineSet ||
-          groundlineType == 3 ||
-          groundlineType == 4 ||
-          groundlineType == 8 ||
-          groundlineType == 5 ||
-          groundlineType == 7 ||
-          groundlineType == 8
-        "
-      >
-        <el-date-picker
-          v-model="Indexform.deliveryTime"
-          type="datetime"
-          format="YYYY-MM-DD HH:mm:ss"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          placeholder="请选择配送时间"
-        />
       </el-form-item>
 
       <el-form-item
@@ -243,33 +265,11 @@
       <!-- <el-form-item label="钉钉流程号">
         <el-input v-model="Indexform.processNumber" placeholder="请输入钉钉流程号" />
       </el-form-item> -->
-      <el-form-item
+
-        label="配送司机"
+      <el-form-item label="一级品">
-        v-if="
+        <el-input v-model="Indexform.first" placeholder="请输入一级品类" clearable />
-          groundlineSet ||
-          groundlineType == 3 ||
-          groundlineType == 4 ||
-          groundlineType == 8 ||
-          groundlineType == 5 ||
-          groundlineType == 7 ||
-          groundlineType == 8
-        "
-      >
-        <el-select
-          v-model="Indexform.deliveryDriver"
-          filterable
-          default-first-option
-          :reserve-keyword="false"
-          placeholder="请输入配送司机"
-        >
-          <el-option
-            v-for="item in DeliveryDriver"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
       </el-form-item>
+
       <!-- 必填 -->
       <el-form-item label="异常问题描述">
         <el-input v-model="Indexform.problemDescription" placeholder="请输入异常问题" clearable />
@@ -591,34 +591,21 @@ const FangAddList = ref([
 ]);
 // 提货责任方
 const responsible = ref([
-  // {
-  //   value: '1',
-  //   label: '工厂',
-  // },
-  // {
-  //   value: '2',
-  //   label: '外包搬运',
-  // },
-  // {
-  //   value: '3',
-  //   label: '物流',
-  // },
-]);
-
-const DeliveryDriver = ref([
-  {
-    value: '0',
-    label: '兰溪',
-  },
   {
     value: '1',
-    label: '李华',
+    label: '工厂',
   },
   {
     value: '2',
-    label: '唐飞',
+    label: '外包搬运',
+  },
+  {
+    value: '3',
+    label: '物流',
   },
 ]);
+
+const DeliveryDriver = ref([]);
 // 图片列表
 const fileList = ref([]);
 // 字典公共函数
@@ -697,6 +684,7 @@ const ResponsiblePartychange = (val, index) => {
   });
 };
 const onLoad = () => {
+  DeliveryTrainnumber();//获取司机
   console.log($route.query.id, '页面初始化');
   routerState.value = $route.query.routerState;
   updateDictionary(IndexException.value, 'pc_work_order'); //异常类型
@@ -731,16 +719,28 @@ const DiscoveringNodesChange = val => {
   } else {
     groundlineSet.value = true; //展示所有搜索框
   }
+};
+
+// 车次号自动带出时间司机
+function DeliveryTrainnumber  () {
+
+    let data = {
+      trainNumber: Indexform.value.trainNumber,
+    };
+    $_shippingInformation(data).then(res => {
+      // DeliveryDriver;
+      // Indexform.deliveryDriver;
+
+      console.log(res, '查询返回值');
+      DeliveryDriver.value = res.data.data.records;//获取到的信息
+      // 如果是精确搜索自动带入日期
+      if(res.data.data.records.length ==1){
+           Indexform.value.deliveryTime = res.data.data.records[0].taskTime; //配送时间
+           Indexform.value.deliveryDriver = res.data.data.records[0].id; //配送人
+      }
+
+    });
 
-  // if(val==1){
-  //   let data={
-       
-  //   }
-  //   $_shippingInformation(data).then(res=>{
-  //     console.log(res,'获取运单信息');
-  //   })
-    
-  // }
 };
 
 // 照片
@@ -802,6 +802,7 @@ const CompanyProportionInput = () => {
 const ConfirmForm = () => {
   //  提货责任方
 
+
   console.log(Indexform.value.businessMame, '提货责任方');
   let DataSubmit = {
     personResponsibleDTO: [],
@@ -830,15 +831,14 @@ const ConfirmForm = () => {
   }
 
   console.log(DataSubmit['decreaseImageEntityList'], '处理好的图片');
-
+  //司机信息处理  
-  //司机信息处理
   if (Indexform.value.deliveryDriver) {
-    Indexform.value.deliveryDriver = DeliveryDriver.value.find(
+    console.log(DeliveryDriver.value,'当前全部司机');
-      item => item.value == Indexform.value.deliveryDriver
+    console.log(Indexform.value.deliveryDriver,'选择的司机信息');
-    );
+    Indexform.value.deliveryDriver = DeliveryDriver.value.find( item => item.id == Indexform.value.deliveryDriver).driverName;
   }
-  Indexform.value.deliveryDriver = Indexform.value.deliveryDriver.label;
+  console.log(Indexform.value.deliveryDriver,'筛选出来的司机');
-  console.log(Indexform.value.deliveryDriver); // 输出李华
+
   let processorEntityList = [];
 
   //处理方信息处理
@@ -1100,7 +1100,7 @@ const Statistics = () => {
   });
 };
 
-// 查询包件信息自动回显 
+// 查询包件信息自动回显
 const ChangePackageInfo = (val, index) => {
   PackageInfo.value[index].orderCode = ''; //订单自编码
   PackageInfo.value[index].waybillNumber = ''; //运单号