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

src/page/index/top/index.vue

@@ -104,7 +104,7 @@ import {
   getclearWarehouseCache,
   getMyCurrentWarehouse,
 } from '@/api/work/work';
-
+import { AddressClosed } from '@/utils/util';
 export default {
   components: {
     topLock,
@@ -137,6 +137,7 @@ export default {
   filters: {},
 
   created() {
+  
     getMyCurrentWarehouse().then(res => {
       if (res.data.data == null) {
         console.log('当前没有数据');
@@ -149,18 +150,8 @@ export default {
       }else{
         this.dataName   = res.data.data.name;//仓库名字
       }
-      // localStorage.setItem('my_data', JSON.stringify(res.data.data))
     });
 
-    // let warehouseName = localStorage.getItem('WarehouseName');
-    // // let modifiedName = warehouseName.replace(/"/g, '');
-    // if (warehouseName == 'undefined') {
-    //   this.dataName = '';
-    //   console.log('当前暂时没有参数', this.dataName);
-    // } else {
-    //   this.dataName = warehouseName;
-    //   console.log(this.dataName, '当前参数存在值');
-    // }
   },
   computed: {
     ...mapGetters([
@@ -218,6 +209,8 @@ export default {
           this.$message({ message: res.data.msg, type: 'error' });
         }
       }
+      this.$store.commit('DEL_TAG_CURRENT');
+      this.$store.commit('DEL_TAG_OTHER');
     },
     warehouseChange(val) {
       console.log(val);

src/store/modules/tags.js

@@ -17,6 +17,7 @@ const navs = {
       state.tagList.push(action);
       setStore({ name: 'tagList', content: state.tagList });
     },
+    // 关闭指定标签
     DEL_TAG: (state, action) => {
       state.tagList = state.tagList.filter(item => {
         return item.fullPath !== action.fullPath;
@@ -27,6 +28,7 @@ const navs = {
       state.tagList = tagList;
       setStore({ name: 'tagList', content: state.tagList });
     },
+    // 关闭除了当前页面的所有页面
     DEL_TAG_OTHER: state => {
       state.tagList = state.tagList.filter(item => {
         console.log("关闭其他111state.tag.fullPath, website.fistPage.path",state.tag.fullPath, website.fistPage.path,item);
@@ -35,6 +37,7 @@ const navs = {
       console.log("2222state.tagList",state.tagList);
       setStore({ name: 'tagList', content: state.tagList });
     },
+    // 关闭当前页面
     DEL_TAG_CURRENT: state => {
       state.tagList = state.tagList.filter(item => {
         console.log("state.tag.fullPath, website.fistPage.path",state.tag.fullPath, website.fistPage.path,item);

src/views/distribution/deliverylist/distributionDeliveryListedt.vue

@@ -1706,6 +1706,17 @@ export default {
           sortable: true,
           head: false,
         },
+        {
+          prop: 'signingUser',
+          label: '签收人',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
         {
           prop: 'signingTime',
           label: '签收扫描时间',

src/views/distribution/reservation/reservationAddFrom.vue

@@ -381,7 +381,9 @@
 
       <!-- 库存品信息 -->
       <template v-if="stockListShow">
-        <el-dialog v-model="stockListShow" class="stockListShow" title="库存品信息" width="100%">
+        <el-dialog v-model="stockListShow" class="stockListShow" title="库存品信息" width="90%">
+          <div  v-loading="Inventoryloading"
+            element-loading-text="正在拼命加载中..."> 
           <!--                :before-close="handleClose"-->
           <!--          <el-form :inline="true" :model="query">-->
           <!--            <el-form-item label="商场名称:">-->
@@ -439,6 +441,7 @@
             </el-button>
             <el-button icon="el-icon-circle-close" @click="stockListShow = false">返 回</el-button>
           </el-form-item>
+        </div>
         </el-dialog>
       </template>
 
@@ -570,6 +573,7 @@ import { setNodeHeight, removeZeroWidth } from '@/utils/util.js';
 export default {
   data() {
     return {
+      Inventoryloading:true,//库存品加载
       packageQuery: {},
       orderRow: {},
       columnList: [
@@ -2099,7 +2103,9 @@ export default {
         return true;
       }
     },
-    handleAddInventory() {
+    handleAddInventory() { 
+      this.loading = true;
+      this.Inventoryloading=true;//开启加载效果
       let page = this.page;
       let params = {};
       this.query.serviceType = '2';
@@ -2135,14 +2141,15 @@ export default {
           }
           this.loading = false;
           this.selectionClear();
+         
           this.stockListShow = true;
-
           this.$nextTick(() => {
             const _node = document.querySelector('.stockListShow .maboxhi');
             _node.style.transition = 'all 0.3s';
             setNodeHeight(_node, '500px');
 
             this.setTableHeight();
+            this.Inventoryloading=false;//关闭加载效果
           });
         }
       );
@@ -3275,4 +3282,5 @@ input[type='number'] {
 .footer-container {
   height: 60px;
 }
+
 </style>

src/views/distribution/signfor/distributionSignfortreat.vue

@@ -202,7 +202,6 @@
                 slotProps.scope.row.sijiSigningStatus == '司机已签收' &&
                 slotProps.scope.row.wenyuanSigningStatus == '文员待审核'
               " -->
-
               <el-text
                 v-if="
                   slotProps.scope.row.sijiSigningStatus == '司机已签收' &&
@@ -1430,7 +1429,12 @@ export default {
           //   width: '100px'
           // },
 
-
+          {
+            label: '包件状态',
+            prop: 'orderPackageStatusName',
+            search: true,
+            width: '100px',
+          },
           {
             label: '冻结状态',
             prop: 'orderPackageFreezeStatusName',
@@ -1461,12 +1465,6 @@ export default {
             search: true,
             width: '100px',
           },
-          {
-            label: '签收状态',
-            prop: 'orderPackageStatusName',
-            search: true,
-            width: '100px',
-          },
           // {
           //   label: '配送计划状态',
           //   prop: 'orderPackageDeliveryStatus',

src/views/distribution/turndelivery/deliveryDiscuss.vue

@@ -2417,7 +2417,9 @@ const search = () => {
 };
 // 顶部搜索功能
 const SoInput = () => {
-if(!wrapLoading){
+  console.log('点击了搜索功能');
+  
+if(!wrapLoading.value){
   if (kind.value) {
     OrderSelection(0, parameter.value);
   } else {
@@ -2426,13 +2428,10 @@ if(!wrapLoading){
 }else{
   PackageFn()
 }
-
-
-
 };
 // 顶部清空搜索
 const SoEmpty = () => {
-  if(!wrapLoading){
+  if(!wrapLoading.value){
     parameter.value = {};
   if (kind.value) {
     OrderSelection(0);

vite.config.js

@@ -23,7 +23,7 @@ export default ({ mode, command }) => {
           // 新zyc
           // target: 'http://192.168.6.116:8777',
           // target: 'http://192.168.6.122:8777',
-          target: 'http://192.168.10.25:13000',
+          target: 'http://192.168.10.57:13000',
           // target: 'http://192.168.10.25:2888',
           // target: 'http://192.168.6.148:9777',//CYZ
           // target: 'http://192.168.10.57:13000',