From 1b3b8e641c6d765d20fed41318c2006f6e156440 Mon Sep 17 00:00:00 2001
From: kilo <wan.ren@foxmail.com>
Date: Tue, 5 Sep 2023 16:04:36 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E9=85=8D=E9=80=81=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=88=97=E8=A1=A8=E5=AD=97=E6=AE=B5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distributionDeliveryListedt.vue           |  32 +++--
 .../reservation/reservationAddFrom.vue        |  14 +--
 .../turndelivery/deliveryDiscuss.vue          | 112 +++++++++---------
 3 files changed, 87 insertions(+), 71 deletions(-)

diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index e013fa17..a1e95430 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -505,9 +505,20 @@ export default {
           sortable: true,
           head: false,
         },
+        // {
+        //   prop: 'packageNub',
+        //   label: '配送件数',
+        //   type: 2,
+        //   values: '',
+        //   width: '150',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        //   head: false,
+        // },
         {
-          prop: 'packageNub',
-          label: '配送件数',
+          prop: 'reservationStockListNum',
+          label: '计划库存品数',
           type: 2,
           values: '',
           width: '150',
@@ -517,19 +528,18 @@ export default {
           head: false,
         },
         {
-          prop: 'reservationStockListNum',
-          label: '配送库存品数',
-          type: 2,
+          prop: 'reservationNum',
+          label: '计划包件数',
+          type: 1,
           values: '',
-          width: '150',
+          width: '180',
           checkarr: [],
           fixed: false,
           sortable: true,
-          head: false,
         },
         {
-          prop: 'reservationNum',
-          label: '计划件数',
+          prop: 'loadedNub',
+          label: '装车包件数',
           type: 1,
           values: '',
           width: '180',
@@ -538,8 +548,8 @@ export default {
           sortable: true,
         },
         {
-          prop: 'loadedNub',
-          label: '扫描件数',
+          prop: 'inventoryNub',
+          label: '装车库存品件数',
           type: 1,
           values: '',
           width: '180',
diff --git a/src/views/distribution/reservation/reservationAddFrom.vue b/src/views/distribution/reservation/reservationAddFrom.vue
index 65375e08..9355f872 100644
--- a/src/views/distribution/reservation/reservationAddFrom.vue
+++ b/src/views/distribution/reservation/reservationAddFrom.vue
@@ -195,13 +195,13 @@
             @selection="selectionChange"
           >
             <template #default="slotProps">
-              <el-text
-                      v-if="inventoryShow"
-                      type="primary"
-                      link
-                      icon="el-icon-edit"
-                      @click="showStockListEdit(slotProps.scope.row)"
-              >查看详情</el-text>
+<!--              <el-text-->
+<!--                      v-if="inventoryShow"-->
+<!--                      type="primary"-->
+<!--                      link-->
+<!--                      icon="el-icon-edit"-->
+<!--                      @click="showStockListEdit(slotProps.scope.row)"-->
+<!--              >查看详情</el-text>-->
 
               <el-text
                 type="primary"
diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue
index 3763f7f1..782491e5 100644
--- a/src/views/distribution/turndelivery/deliveryDiscuss.vue
+++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue
@@ -11,18 +11,20 @@
         <el-form ref="form" :model="driverForm" label-width="100px" style="margin: 3px">
             <el-row>
                 <el-col :span="6">
-                    <el-form-item label="车辆信息:" prop="vehicleIds">
+                    <el-form-item label="配送司机信息:" prop="goodsShelfId">
+                        <!--                        @change="changeSlaveDriver"-->
                         <el-select
-                                filterable
+                                v-model="deliveryDriver"
                                 multiple
-                                v-model="vehicleIds"
-                                placeholder="请选择车辆"
-                                @change="changeVehicle"
+                                filterable
+                                @change="changeDriver"
+
+                                placeholder="请选择司机"
                         >
                             <el-option
-                                    v-for="item in vehicleData"
+                                    v-for="item in driverData"
                                     :key="item.id"
-                                    :label="item.vehicleNub"
+                                    :label="item.name"
                                     :value="item.id"
                             >
                             </el-option>
@@ -30,26 +32,25 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                    <el-form-item label="配送司机信息:" prop="goodsShelfId">
-                        <!--                        @change="changeSlaveDriver"-->
+                    <el-form-item label="车辆信息:" prop="vehicleIds">
                         <el-select
-                                v-model="deliveryDriver"
-                                multiple
                                 filterable
-                                @change="changeDriver"
-
-                                placeholder="请选择司机"
+                                multiple
+                                v-model="vehicleIds"
+                                placeholder="请选择车辆"
+                                @change="changeVehicle"
                         >
                             <el-option
-                                    v-for="item in driverData"
+                                    v-for="item in vehicleData"
                                     :key="item.id"
-                                    :label="item.name"
+                                    :label="item.vehicleNub"
                                     :value="item.id"
                             >
                             </el-option>
                         </el-select>
                     </el-form-item>
                 </el-col>
+
                 <el-col :span="6">
           <span>
             <el-form-item label="主司机:" prop="forklift">
@@ -208,27 +209,27 @@
                 <el-row>
 
                 </el-row>
-<!--                <el-col :span="6">-->
-<!--                    <el-form-item label="配送方式:" prop="serveType" label-width="100px">-->
-<!--                        &lt;!&ndash;              <el-input v-model="form.serveType" clearable placeholder="请选择服务类型"/>&ndash;&gt;-->
-<!--                        <el-radio-group v-model="stockUpForm.deliveryWay" v-for="item in this.deliveryWayData">-->
-<!--                            <el-radio :label="item.dictKey" :value="item.dictKey"-->
-<!--                            >{{ item.dictValue }}&emsp;-->
-<!--                            </el-radio>-->
-<!--                        </el-radio-group>-->
-<!--                    </el-form-item>-->
-<!--                </el-col>-->
+                <!--                <el-col :span="6">-->
+                <!--                    <el-form-item label="配送方式:" prop="serveType" label-width="100px">-->
+                <!--                        &lt;!&ndash;              <el-input v-model="form.serveType" clearable placeholder="请选择服务类型"/>&ndash;&gt;-->
+                <!--                        <el-radio-group v-model="stockUpForm.deliveryWay" v-for="item in this.deliveryWayData">-->
+                <!--                            <el-radio :label="item.dictKey" :value="item.dictKey"-->
+                <!--                            >{{ item.dictValue }}&emsp;-->
+                <!--                            </el-radio>-->
+                <!--                        </el-radio-group>-->
+                <!--                    </el-form-item>-->
+                <!--                </el-col>-->
 
-<!--                <el-col :span="6">-->
-<!--                    <el-form-item label="服务类型:" prop="serveType" label-width="100px">-->
-<!--                        &lt;!&ndash;              <el-input v-model="form.serveType" clearable placeholder="请选择服务类型"/>&ndash;&gt;-->
-<!--                        <el-checkbox-group v-model="serveType" v-for="item in this.addvalueServeTypeData">-->
-<!--                            <el-checkbox :label="item.dictKey" :value="item.dictKey"-->
-<!--                            >{{ item.dictValue }}&emsp;-->
-<!--                            </el-checkbox>-->
-<!--                        </el-checkbox-group>-->
-<!--                    </el-form-item>-->
-<!--                </el-col>-->
+                <!--                <el-col :span="6">-->
+                <!--                    <el-form-item label="服务类型:" prop="serveType" label-width="100px">-->
+                <!--                        &lt;!&ndash;              <el-input v-model="form.serveType" clearable placeholder="请选择服务类型"/>&ndash;&gt;-->
+                <!--                        <el-checkbox-group v-model="serveType" v-for="item in this.addvalueServeTypeData">-->
+                <!--                            <el-checkbox :label="item.dictKey" :value="item.dictKey"-->
+                <!--                            >{{ item.dictValue }}&emsp;-->
+                <!--                            </el-checkbox>-->
+                <!--                        </el-checkbox-group>-->
+                <!--                    </el-form-item>-->
+                <!--                </el-col>-->
             </el-row>
 
 
@@ -239,11 +240,11 @@
                         </el-input>
                     </el-form-item>
                 </el-col>
-<!--                <el-col :span="8">-->
-<!--                    <el-form-item label="其他费用:" prop="collectFee" label-width="100px">-->
-<!--                        <el-input v-model="stockUpForm.otherFee" placeholder="请输入其他费用"/>-->
-<!--                    </el-form-item>-->
-<!--                </el-col>-->
+                <!--                <el-col :span="8">-->
+                <!--                    <el-form-item label="其他费用:" prop="collectFee" label-width="100px">-->
+                <!--                        <el-input v-model="stockUpForm.otherFee" placeholder="请输入其他费用"/>-->
+                <!--                    </el-form-item>-->
+                <!--                </el-col>-->
             </el-row>
         </el-form>
     </div>
@@ -768,7 +769,7 @@
       this.getFork();
       this.getTeam();
       this.getvehicleData();
-      this.getMasterDriverData();
+      this.getDriverData();
     },
     computed: {
       ...mapGetters(['permission']),
@@ -860,7 +861,7 @@
       },
 
       //查询司机信息
-      getMasterDriverData() {
+      getDriverData() {
         return new Promise((rv, rev) => {
           getDriverList(1, 10, '').then(res => {
             this.driverData = res.data.data.records;
@@ -1081,11 +1082,11 @@
           console.log('newDate1-------------->', newDate1.length);
           if (newDate1.length >= 1) {
             console.log('newDate1-------------->', newDate1);
-            newDate1.forEach(a=>{
+            newDate1.forEach(a => {
               this.orderData.push(a);
-            })
+            });
           }
-          console.log("this.orderData------------->",this.orderData);
+          console.log('this.orderData------------->', this.orderData);
         } else {
           this.orderData = this.stockArticleList;
         }
@@ -1261,7 +1262,7 @@
             stockup.stockupDate = this.stockUpForm.stockupDate;
           }
           if (this.stockUpForm.remarks) {
-            data.remarks  = this.stockUpForm.remarks;
+            data.remarks = this.stockUpForm.remarks;
           }
           if (this.stockUpForm.outboundDate) {
             stockup.outboundDate = this.stockUpForm.outboundDate;
@@ -1371,6 +1372,7 @@
         }
       },
       changeDriver(params) {
+        console.log("params---------->",params);
         this.driverList = params;
         let a = [];
         if (params) {
@@ -1379,6 +1381,10 @@
               if (p == item.id) {
                 a.push(item);
                 console.log(this.driverInfo);
+                //TODO 这里发送车辆的请求，如果有车辆信息则进行车牌号的填充
+
+                // console.log("------------>item",item);
+                // console.log("---------------->",this.vehicleData);
               }
             });
             if (params[0] === item.id) {
@@ -1647,13 +1653,13 @@
         this.query.typeService = 1;
         this.query.genre = '1';
         const page = arg;
-        let a =[];
-        if (this.orderData){
-          this.orderData.forEach(item=>{
-            a.push(item.id)
-          })
+        let a = [];
+        if (this.orderData) {
+          this.orderData.forEach(item => {
+            a.push(item.id);
+          });
         }
-        this.query.orderIds = a.join(",");
+        this.query.orderIds = a.join(',');
         selectStockArticleInfoList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
           console.log(res.data.data);
           const data = res.data.data;

From 99046e93b6d16b6c5581edb49986d967ccaf2490 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Tue, 5 Sep 2023 16:05:19 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E6=8F=90?=
 =?UTF-8?q?=E7=AD=BE=E6=94=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/inventory/distrilbutionBillLadingList.vue  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/distribution/inventory/distrilbutionBillLadingList.vue b/src/views/distribution/inventory/distrilbutionBillLadingList.vue
index 947104d5..a3dc7bbe 100644
--- a/src/views/distribution/inventory/distrilbutionBillLadingList.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLadingList.vue
@@ -78,7 +78,7 @@
           <div class="avue-crud__left">
            <!-- <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
             <el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>-->
-            <el-button type="primary" icon="el-icon-plus" @click="handleBillAdd">创建自提</el-button>
+<!--            <el-button type="primary" icon="el-icon-plus" @click="handleBillAdd">创建自提</el-button>-->
             <el-button type="primary" icon="el-icon-plus" @click="handleSign(null,2)">自提签收</el-button>
 
           </div>
@@ -914,6 +914,10 @@ export default {
     },
     //签收
     handleSign(row,num){
+      if(this.selectionList.length == 0){
+        this.$message.warning("至少选择一条数据！！");
+        return ;
+      }
      let a =  this.selectionList.find( i => i.conditions > 6);
       if(!!a){
         this.$message.warning("有已签收的数据，请勿重复签收！！");

From 96d2b146a6eb9feccdafcc1ab42a3eadd405c6ce Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <123456>
Date: Tue, 5 Sep 2023 16:05:57 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E9=83=A8=E9=97=A8=E5=92=8C=E8=A7=92=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/website.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/config/website.js b/src/config/website.js
index cf884c79..99e6d0f4 100644
--- a/src/config/website.js
+++ b/src/config/website.js
@@ -11,7 +11,7 @@ export default {
   tenantMode: true, // 是否开启租户模式
   tenantId: '000000', // 管理组租户编号
   captchaMode: false, // 是否开启验证码模式
-  switchMode: true, // 是否开启部门切换模式
+  switchMode: false, // 是否开启部门切换模式
   lockPage: '/lock',
   tokenTime: 3000,
   tokenHeader: 'Blade-Auth',