物流配送修改

src/views/logisticsManagement/components/returnDialog.vue

@@ -5,6 +5,8 @@
         <el-radio-group v-model="form.bindType" @change="typeChange">
           <el-radio value="bind">送料</el-radio>
           <el-radio value="unbind">叫料</el-radio>
+
+          <el-radio value="intoStock">回库</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item label="箱条码">
@@ -15,7 +17,13 @@
           placeholder="请扫描箱条码"
         />
       </el-form-item>
-      <el-form-item label="起点站点" prop="stationCode" v-if="form.bindType == 'bind'" required>
+      <el-form-item
+        label="起点站点"
+        prop="stationCode"
+        v-if="form.bindType == 'bind' || form.bindType == 'intoStock'"
+        required
+        :rules="[{ required: true, message: '请扫描起点站点', trigger: 'change' }]"
+      >
         <el-input
           v-model="form.stationCode"
           @keyup.enter.native="changeCode"
@@ -23,20 +31,13 @@
           placeholder="请扫描箱条码"
         />
       </el-form-item>
-      <el-form-item label="起点站点" v-if="form.bindType == 'unbind'" required>
+      <el-form-item
+        label="起点站点"
+        v-if="form.bindType == 'unbind'"
+        required
+        :rules="[{ required: true, message: '请选择起点站点码', trigger: 'change' }]"
+      >
         <el-input v-model="form.regionIndex" disabled placeholder="蓝色周转盒放置区" clearable />
-        <!-- <el-select
-          v-model="form.regionIndex"
-          placeholder="请选择站点区域"
-          @change="val => regionDataStartChange(val)"
-        >
-          <el-option
-            v-for="(item, index) in regionDataStart"
-            :key="index"
-            :label="item.stationRegion"
-            :value="item.stationRegion"
-          ></el-option>
-        </el-select> -->
         <el-select
           v-model="form.regionCode"
           placeholder="请选择站点码"
@@ -51,15 +52,22 @@
             :value="item"
           ></el-option>
         </el-select>
-        <el-tag type="danger" v-if="regionStartCode.length<=0">暂无可配送物料</el-tag>
+        <el-tag type="danger" v-if="regionStartCode.length <= 0">暂无可配送物料</el-tag>
       </el-form-item>
-      <el-form-item label="终点站点" prop="endLocationId" v-if="form.bindType == 'bind'" required>
+      <el-form-item
+        label="终点站点"
+        prop="endLocationId"
+        v-if="form.bindType == 'bind'"
+        required
+        :rules="[{ required: true, message: '请选择终点站点', trigger: 'change' }]"
+      >
         <el-select
           v-model="form.endLocationId"
           placeholder="请选择作业中心"
           filterable
           @change="endLocationChange"
           clearable
+          :disabled="form.bindType == 'intoStock' ? true : false"
         >
           <el-option
             v-for="item in workCenterOptions"
@@ -74,12 +82,23 @@
           filterable
           style="margin-top: 5px"
           clearable
+          :disabled="form.bindType == 'intoStock' ? true : false"
         >
           <el-option v-for="item in regionData" :key="item" :label="item" :value="item" />
         </el-select>
       </el-form-item>
-      <el-form-item label="终点站点" prop="endStationCode" v-if="form.bindType == 'unbind'" required>
-        <el-input v-model="form.endStationCode" placeholder="请扫描箱条码" clearable/>
+      <el-form-item
+        label="终点站点"
+        prop="endStationCode"
+        v-if="form.bindType == 'unbind'"
+        required
+        :rules="[{ required: true, message: '请扫描终点站点', trigger: 'change' }]"
+      >
+        <el-input v-model="form.endStationCode" placeholder="请扫描箱条码" clearable />
+      </el-form-item>
+      <el-form-item label="终点站点" prop="endStationCode" v-if="form.bindType == 'intoStock'">
+        输送线终点
+        <!-- <el-input v-model="form.endStationCode" placeholder="请扫描箱条码" clearable disabled/> -->
       </el-form-item>
     </el-form>
 
@@ -145,6 +164,15 @@ export default {
       if (this.form.bindType == 'unbind') {
         this.getStationRegionList();
       }
+      if (this.form.bindType == 'intoStock') {
+        // this.form.endLocationId = ''
+        // 获取输送线终点 作业中心id
+        const selected = this.workCenterOptions.find(item => item.wcName == '输送线终点');
+        console.log(989898989, Object.keys(selected).length > 0);
+        if (Object.keys(selected).length > 0) {
+          this.form.endLocationId = selected.id;
+        }
+      }
     },
     regionDataStartChange(val) {
       const selected = this.regionDataStart.find(
@@ -162,7 +190,9 @@ export default {
       getStationRegionList().then(res => {
         this.regionDataStart = res.data.data;
         // 查找“蓝色周转盒放置区”
-        const targetRegion = this.regionDataStart.find(item => item.stationRegion == '蓝色周转盒放置区');
+        const targetRegion = this.regionDataStart.find(
+          item => item.stationRegion == '蓝色周转盒放置区'
+        );
 
         if (targetRegion) {
           // 默认选中该区域
@@ -216,8 +246,9 @@ export default {
           else if (this.form.bindType === 'unbind') {
             params.startStationCode = this.form.regionCode;
             params.endStationCode = this.form.endStationCode;
+          } else if (this.form.bindType === 'intoStock') {
+            params.startStationCode = this.form.stationCode;
           }
-          console.log(9898989898989, params);
 
           boxBinding(params)
             .then(res => {

src/views/logisticsManagement/logisticsDistribution.vue

@@ -148,14 +148,14 @@ export default {
             hide: true,
              searchOrder: 20,
           },
-          {
-            label: '起点-作业中心',
-            prop: 'startWcName',
-            search: false,
-            sortable: true,
-            span: 12,
-            width: 120,
-          },
+          // {
+          //   label: '起点-作业中心',
+          //   prop: 'startWcName',
+          //   search: false,
+          //   sortable: true,
+          //   span: 12,
+          //   width: 120,
+          // },
           {
             label: '起点-区域',
             prop: 'startStationRegion',