修复部分bug

src/option/distribution/arteryDistrilbutionBillLadingList.js

@@ -181,6 +181,7 @@ export const columnList = [
     checkarr: [],
     fixed: false,
     sortable: true,
+    isshowSummary: true,
   },
   {
     prop: 'remark',
@@ -211,6 +212,7 @@ export const columnList = [
     checkarr: [],
     fixed: false,
     sortable: true,
+    isshowSummary: true,
   },
   {
     prop: 'totalNum',
@@ -221,6 +223,7 @@ export const columnList = [
     checkarr: [],
     fixed: false,
     sortable: true,
+    isshowSummary: true,
   },
   {
     prop: 'planNum',
@@ -231,6 +234,7 @@ export const columnList = [
     checkarr: [],
     fixed: false,
     sortable: true,
+    isshowSummary: true,
   },
   {
     prop: 'totalWeight',
@@ -241,6 +245,7 @@ export const columnList = [
     checkarr: [],
     fixed: false,
     sortable: true,
+    isshowSummary: true,
   },
   {
     prop: 'planWeight',
@@ -262,6 +267,7 @@ export const columnList = [
     checkarr: [],
     fixed: false,
     sortable: false,
+    isshowSummary: true,
   },
   {
     prop: 'planVolume',
@@ -273,6 +279,7 @@ export const columnList = [
     fixed: false,
     sortable: true,
     isshowSummary: true,
+    isshowSummary: true,
   },
   {
     prop: 'createUserName',

src/views/distribution/artery/VehicleArrivalManagement.vue

@@ -284,7 +284,8 @@
               v-if="
                 permissionObj.VehicleArrivalManagement_edit &&
                 Mydata.id === slotProps.scope.row.nowWarehouseId &&
-                Number(slotProps.scope.row.loadStatus) === 20
+                (Number(slotProps.scope.row.loadStatus) === 20 ||
+                  Number(slotProps.scope.row.loadStatus) === 40)
               "
               @click="handleEditStowage(slotProps.scope)"
               >编辑

src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue

@@ -677,6 +677,11 @@ export default {
 
       if (this.selectionList.length > 1) return this.$message.error('暂时只支持单条数据操作');
 
+      const _data = this.selectionList[0];
+
+      if (Number(_data.billladingStatus) !== 1)
+        return this.$message.warning('提货任务状态不是未开始，无法编辑');
+
       this.$router.push({
         path: '/distribution/inventory/addArteryDistrilbutionBillLadingList',
         query: {

src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue

@@ -76,7 +76,7 @@
                 v-if="permissionObj.arteryDistrilbutionBillLadingListDetails_confirmEdit"
                 icon="CircleCheckFilled"
                 type="primary"
-                @click="handleEditSubmit()"
+                @click="() => handleEditSubmit()"
               >
                 确认修改
               </el-button>

src/views/distribution/inventory/delivery/distributionStockArticle.vue

@@ -398,7 +398,8 @@
         </avue-form>
       </el-dialog>
 
-      <MyPrint v-model="popUpShow.printVisited" :html="html" :title="'配送单'"> </MyPrint>
+      <MyPrint v-model="popUpShow.printVisited" :html="html" type="titlePrint" :title="'配送单'">
+      </MyPrint>
     </div>
   </basic-container>
   <edittablehead
@@ -422,7 +423,7 @@ import {
   getCollectt,
 } from '@/api/distribution/distributionStockArticle';
 import { getListOwn } from '@/api/distribution/distributionParcelList';
-import { addCallDelivery ,$_updateBatchClient} from '@/api/distribution/distrilbutionCallDelivery';
+import { addCallDelivery, $_updateBatchClient } from '@/api/distribution/distrilbutionCallDelivery';
 import { addClient } from '@/api/distribution/distributionClientMessage';
 import { addService } from '@/api/distribution/distributionServiceLog';
 import option from '@/option/distribution/distributionStockArticle';
@@ -435,7 +436,7 @@ import { getToken } from '@/utils/auth';
 import { downloadXls, getObjType, handleClearTableQuery } from '@/utils/util';
 import { columnList } from '@/option/distribution/distributionStockArticleSelf';
 import { deepClone, setNodeHeight, hanleTextLineFeed } from '@/utils/util.js';
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus';
 const _newCol = deepClone(columnList);
 
 export default {
@@ -834,51 +835,51 @@ export default {
           });
         });
     },
-     // 修改收货单位
-     Modifyreceivingunit(){
+    // 修改收货单位
+    Modifyreceivingunit() {
       if (!this.selectionList.length) {
         this.$message.warning('请勾选要修改的数据');
         return;
       }
-    ElMessageBox.prompt('请输入要修改的收货单位', '修改收货单位', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    inputPattern: /^\S+$/,
-    inputErrorMessage: '收货单位不能为空',
-  })
-    .then( ({ value }) => {
-      console.log(value,'填写的参数');
-      let data={
-        entityList:[]
-      }
-      console.log(this.selectionList,'this.selectionList');
-        // this.selectionList.forEach(item,index=>{
-        //   console.log(item,'item');
-        //   data['entityList'].push({
-        //     id:item.id,
-        //     consigneeUnit:value,
-        //     mallName:value,
-        //   })
-        // })
-      data['entityList']=  this.selectionList.map(item=>{
-          return{
-            id:item.id,
-            consigneeUnit:value,
-            mallName:value,
-          }
-        })
-      $_updateBatchClient(data).then(res=>{
-        console.log(res,'修改成功');
-        if(res.data.code ==200){
-          ElMessage({
-          message: res.data.msg,
-          type: 'success',
-         })
-          this.onLoad(this.page);
-        }
+      ElMessageBox.prompt('请输入要修改的收货单位', '修改收货单位', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputPattern: /^\S+$/,
+        inputErrorMessage: '收货单位不能为空',
       })
-    })
-    .catch(() => {})
+        .then(({ value }) => {
+          console.log(value, '填写的参数');
+          let data = {
+            entityList: [],
+          };
+          console.log(this.selectionList, 'this.selectionList');
+          // this.selectionList.forEach(item,index=>{
+          //   console.log(item,'item');
+          //   data['entityList'].push({
+          //     id:item.id,
+          //     consigneeUnit:value,
+          //     mallName:value,
+          //   })
+          // })
+          data['entityList'] = this.selectionList.map(item => {
+            return {
+              id: item.id,
+              consigneeUnit: value,
+              mallName: value,
+            };
+          });
+          $_updateBatchClient(data).then(res => {
+            console.log(res, '修改成功');
+            if (res.data.code == 200) {
+              ElMessage({
+                message: res.data.msg,
+                type: 'success',
+              });
+              this.onLoad(this.page);
+            }
+          });
+        })
+        .catch(() => {});
     },
     //确定通知提货按钮
     callFordelivery(inde) {

src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue

@@ -400,7 +400,8 @@
       </el-dialog>
     </div>
 
-    <MyPrint v-model="popUpShow.printVisited" :html="html" :title="'配送单'"> </MyPrint>
+    <MyPrint v-model="popUpShow.printVisited" :html="html" type="titlePrint" :title="'配送单'">
+    </MyPrint>
   </basic-container>
   <edittablehead
     @closce="showdrawer"

src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue

@@ -392,7 +392,7 @@
       </el-dialog>
     </div>
 
-    <MyPrint v-model="popUpShow.printVisited" :html="html" :title="'配送单'"> </MyPrint>
+    <MyPrint v-model="popUpShow.printVisited" :html="html" type="titlePrint"> </MyPrint>
   </basic-container>
   <edittablehead
     @closce="showdrawer"
@@ -415,14 +415,14 @@ import {
   getCollectt,
 } from '@/api/distribution/distributionStockArticle';
 import { getListOwn } from '@/api/distribution/distributionParcelList';
-import { addCallDelivery,$_updateBatchClient } from '@/api/distribution/distrilbutionCallDelivery';
+import { addCallDelivery, $_updateBatchClient } from '@/api/distribution/distrilbutionCallDelivery';
 import { addClient } from '@/api/distribution/distributionClientMessage';
 import { addService } from '@/api/distribution/distributionServiceLog';
 import { mapGetters } from 'vuex';
 import { getDictionaryBiz } from '@/api/system/dict';
 import dayjs from 'dayjs';
 import { columnList } from '@/option/distribution/distributionStockArticleSelf';
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessage, ElMessageBox } from 'element-plus';
 import {
   deepClone,
   setNodeHeight,
@@ -632,50 +632,50 @@ export default {
       this.onLoad(this.page);
     },
     // 修改收货单位
-    Modifyreceivingunit(){
+    Modifyreceivingunit() {
       if (!this.selectionList.length) {
         this.$message.warning('请勾选要修改的数据');
         return;
       }
-    ElMessageBox.prompt('请输入要修改的收货单位', '修改收货单位', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    inputPattern: /^\S+$/,
-    inputErrorMessage: '收货单位不能为空',
-  })
-    .then( ({ value }) => {
-      console.log(value,'填写的参数');
-      let data={
-        entityList:[]
-      }
-      console.log(this.selectionList,'this.selectionList');
-        // this.selectionList.forEach(item,index=>{
-        //   console.log(item,'item');
-        //   data['entityList'].push({
-        //     id:item.id,
-        //     consigneeUnit:value,
-        //     mallName:value,
-        //   })
-        // })
-      data['entityList']=  this.selectionList.map(item=>{
-          return{
-            id:item.id,
-            consigneeUnit:value,
-            mallName:value,
-          }
-        })
-      $_updateBatchClient(data).then(res=>{
-        console.log(res,'修改成功');
-        if(res.data.code ==200){
-          ElMessage({
-          message: res.data.msg,
-          type: 'success',
-         })
-          this.onLoad(this.page);
-        }
+      ElMessageBox.prompt('请输入要修改的收货单位', '修改收货单位', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        inputPattern: /^\S+$/,
+        inputErrorMessage: '收货单位不能为空',
       })
-    })
-    .catch(() => {})
+        .then(({ value }) => {
+          console.log(value, '填写的参数');
+          let data = {
+            entityList: [],
+          };
+          console.log(this.selectionList, 'this.selectionList');
+          // this.selectionList.forEach(item,index=>{
+          //   console.log(item,'item');
+          //   data['entityList'].push({
+          //     id:item.id,
+          //     consigneeUnit:value,
+          //     mallName:value,
+          //   })
+          // })
+          data['entityList'] = this.selectionList.map(item => {
+            return {
+              id: item.id,
+              consigneeUnit: value,
+              mallName: value,
+            };
+          });
+          $_updateBatchClient(data).then(res => {
+            console.log(res, '修改成功');
+            if (res.data.code == 200) {
+              ElMessage({
+                message: res.data.msg,
+                type: 'success',
+              });
+              this.onLoad(this.page);
+            }
+          });
+        })
+        .catch(() => {});
     },
 
     handleMoke() {

src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue

@@ -529,7 +529,8 @@
           </span>
         </template>
       </el-dialog>-->
-      <MyPrint v-model="popUpShow.printVisited" :html="html" :title="'配送单'"> </MyPrint>
+      <MyPrint v-model="popUpShow.printVisited" :html="html" type="titlePrint" >
+      </MyPrint>
     </div>
   </basic-container>
   <edittablehead