新增提交通知刷新页面

1 year ago · 7d5f59178a
7 changed files with 1590 additions and 1538 deletions
--- a/src/store/index.js
+++ b/src/store/index.js
@ -4,6 +4,7 @@ import common from './modules/common';
 import tags from './modules/tags';
 import logs from './modules/logs';
 import dict from './modules/dict';
+import isRefresh from './modules/isRefresh';
 import getters from './getters';

 const store = createStore({
@ -13,6 +14,7 @@ const store = createStore({
    logs,
    tags,
    dict,
+    isRefresh,
  },
  getters,
 });
--- a/src/store/modules/isRefresh.js
+++ b/src/store/modules/isRefresh.js
@ -0,0 +1,28 @@
+import { setStore, getStore } from 'utils/store';
+
+const refresh = {
+  state: {
+    refreshObj: {},
+  },
+  mutations: {
+    /**
+     * 新增跟踪刷新项
+     * @param {*} state
+     * @param {string} payload 页面名称
+     */
+    ADD_REFRESHITEM: (state, payload) => {
+      state.refreshObj[payload] = false;
+    },
+
+    /**
+     * 修改刷新项状态
+     * @param {*} state
+     * @param {string} payload title - 页面名称, status - 是否刷新状态
+     */
+    EDIT_REFRESHITEM: (state, payload) => {
+      state.refreshObj[payload.title] = payload.status || false;
+    },
+  },
+};
+
+export default refresh;
--- a/src/views/distribution/reservation/reservation.vue
+++ b/src/views/distribution/reservation/reservation.vue
@ -1643,6 +1643,22 @@ export default {
      this.initPage();
    },
  },
+  activated() {
+    console.log('activated');
+    console.log('this.$store :>> ', this.$store);
+    if (this.$store.state.isRefresh.refreshObj.reservation) {
+      // 清空挑单夹中的数据
+      this.pickerClipData.splice(0);
+
+      // 重新请求数据
+      this.initPage();
+
+      this.$store.commit('EDIT_REFRESHITEM', { title: 'reservation', status: false });
+    }
+  },
+  deactivated() {
+    console.log('unactivated');
+  },
 };
 </script>
 <style lang="scss" scoped>
--- a/src/views/distribution/reservation/reservationAddFrom.vue
+++ b/src/views/distribution/reservation/reservationAddFrom.vue
@ -1,8 +1,6 @@
 <template>
-  <basic-container   >
-    <div class="avue-crud"
-    v-loading="reservationloading"
-    element-loading-text="正在处理中...">
+  <basic-container>
+    <div class="avue-crud" v-loading="reservationloading" element-loading-text="正在处理中...">
      <el-form
        ref="form"
        :model="form"
@ -384,66 +382,67 @@
      <!-- 库存品信息 -->
      <template v-if="stockListShow">
        <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="商场名称:">-->
-          <!--              <el-input-->
-          <!--                v-model="query.marketName"-->
-          <!--                :disabled="Boolean(marketName)"-->
-          <!--                placeholder="请输入商场名称"-->
-          <!--              ></el-input>-->
-          <!--            </el-form-item>-->
-          <!--            <el-form-item label="物料名称:">-->
-          <!--              <el-input v-model="query.descriptionGoods" placeholder="请输入物料名称"></el-input>-->
-          <!--            </el-form-item>-->
-          <!--            <el-form-item label="商场编码:">-->
-          <!--              <el-input v-model="query.marketCode" placeholder="请输入商场编码"></el-input>-->
-          <!--            </el-form-item>-->
-          <!--            <el-form-item label="订单自编号:">-->
-          <!--              <el-input v-model="query.orderCode" placeholder="请输入订单自编号"></el-input>-->
-          <!--            </el-form-item>-->
-          <!--            <el-form-item label="品牌:">-->
-          <!--              <el-input v-model="query.brand" placeholder="请输入品牌"></el-input>-->
-          <!--            </el-form-item>-->
-          <!--            &lt;!&ndash; 查询按钮 &ndash;&gt;-->
-          <!--            <el-form-item>-->
-          <!--              <el-button type="primary" icon="el-icon-search" @click="handleAddInventory"-->
-          <!--                >搜 索-->
-          <!--              </el-button>-->
-          <!--              <el-button icon="el-icon-delete" @click="stockListSearchReset()">清 空</el-button>-->
-          <!--            </el-form-item>-->
-          <!--          </el-form>-->
-          <tablecmt
-            :columnList="inventoryInfocolumnList"
-            :tableData="inventoryInfo"
-            :checkselect="inventorySelectList"
-            :loading="loading"
-            @inputTxt="inputscInventory"
-            @selectCheck="searchStockList"
-            @selection="selectionInventoryChange"
-            ref="multipleTable"
-          >
-            <!--            @selection="selectionChange"-->
-
-            <template #default="slotProps">
-              <el-text
-                type="primary"
-                link
-                icon="el-icon-edit"
-                @click="removeStockList(slotProps.scope.row)"
-                >移除
-              </el-text>
-            </template>
-          </tablecmt>
-          <el-form-item style="margin-left: 45%; margin-top: 5px">
-            <el-button type="primary" icon="el-icon-circle-close" @click="onSubmitInventory"
-              >提交(库存品)
-            </el-button>
-            <el-button icon="el-icon-circle-close" @click="stockListShow = false">返 回</el-button>
-          </el-form-item>
-        </div>
+          <div v-loading="Inventoryloading" element-loading-text="正在拼命加载中...">
+            <!--                :before-close="handleClose"-->
+            <!--          <el-form :inline="true" :model="query">-->
+            <!--            <el-form-item label="商场名称:">-->
+            <!--              <el-input-->
+            <!--                v-model="query.marketName"-->
+            <!--                :disabled="Boolean(marketName)"-->
+            <!--                placeholder="请输入商场名称"-->
+            <!--              ></el-input>-->
+            <!--            </el-form-item>-->
+            <!--            <el-form-item label="物料名称:">-->
+            <!--              <el-input v-model="query.descriptionGoods" placeholder="请输入物料名称"></el-input>-->
+            <!--            </el-form-item>-->
+            <!--            <el-form-item label="商场编码:">-->
+            <!--              <el-input v-model="query.marketCode" placeholder="请输入商场编码"></el-input>-->
+            <!--            </el-form-item>-->
+            <!--            <el-form-item label="订单自编号:">-->
+            <!--              <el-input v-model="query.orderCode" placeholder="请输入订单自编号"></el-input>-->
+            <!--            </el-form-item>-->
+            <!--            <el-form-item label="品牌:">-->
+            <!--              <el-input v-model="query.brand" placeholder="请输入品牌"></el-input>-->
+            <!--            </el-form-item>-->
+            <!--            &lt;!&ndash; 查询按钮 &ndash;&gt;-->
+            <!--            <el-form-item>-->
+            <!--              <el-button type="primary" icon="el-icon-search" @click="handleAddInventory"-->
+            <!--                >搜 索-->
+            <!--              </el-button>-->
+            <!--              <el-button icon="el-icon-delete" @click="stockListSearchReset()">清 空</el-button>-->
+            <!--            </el-form-item>-->
+            <!--          </el-form>-->
+            <tablecmt
+              :columnList="inventoryInfocolumnList"
+              :tableData="inventoryInfo"
+              :checkselect="inventorySelectList"
+              :loading="loading"
+              @inputTxt="inputscInventory"
+              @selectCheck="searchStockList"
+              @selection="selectionInventoryChange"
+              ref="multipleTable"
+            >
+              <!--            @selection="selectionChange"-->
+
+              <template #default="slotProps">
+                <el-text
+                  type="primary"
+                  link
+                  icon="el-icon-edit"
+                  @click="removeStockList(slotProps.scope.row)"
+                  >移除
+                </el-text>
+              </template>
+            </tablecmt>
+            <el-form-item style="margin-left: 45%; margin-top: 5px">
+              <el-button type="primary" icon="el-icon-circle-close" @click="onSubmitInventory"
+                >提交(库存品)
+              </el-button>
+              <el-button icon="el-icon-circle-close" @click="stockListShow = false"
+                >返 回</el-button
+              >
+            </el-form-item>
+          </div>
        </el-dialog>
      </template>

@ -575,9 +574,9 @@ import { setNodeHeight, removeZeroWidth } from '@/utils/util.js';
 export default {
  data() {
    return {
-      Inventoryloading:true,//库存品加载
+      Inventoryloading: true, //库存品加载
      packageQuery: {},
-      reservationloading:false,
+      reservationloading: false,
      orderRow: {},
      columnList: [
        {
@ -2108,7 +2107,7 @@ export default {
    },
    handleAddInventory() {
      this.loading = true;
-      this.Inventoryloading=true;//开启加载效果
+      this.Inventoryloading = true; //开启加载效果
      let page = this.page;
      let params = {};
      this.query.serviceType = '2';
@ -2152,7 +2151,7 @@ export default {
            setNodeHeight(_node, '500px');

            this.setTableHeight();
-            this.Inventoryloading=false;//关闭加载效果
+            this.Inventoryloading = false; //关闭加载效果
          });
        }
      );
@ -2467,7 +2466,7 @@ export default {
      try {
        // 开启提交按钮loading
        this.loadingObj.submitBtnLoading = true;
-        this.reservationloading=true;//开启全屏加载
+        this.reservationloading = true; //开启全屏加载
        // 日期必填
        if (!this.form.reservationDate) {
          this.$message({
@ -2576,9 +2575,12 @@ export default {
      } catch (error) {
        console.log('error :>> ', error);
      } finally {
+        console.log('123123 :>> ', 123123);
+        this.$store.commit('EDIT_REFRESHITEM', { title: 'reservation', status: true });
+
        // 关闭提交按钮loading
        this.loadingObj.submitBtnLoading = false;
-        this.reservationloading=false;//关闭全屏加载
+        this.reservationloading = false; //关闭全屏加载
      }
    },
    inputsc() {},
@ -3288,5 +3290,4 @@ input[type='number'] {
 .footer-container {
  height: 60px;
 }
-
 </style>
--- a/src/views/distribution/reservation/reservationDetails.vue
+++ b/src/views/distribution/reservation/reservationDetails.vue
--- a/src/views/distribution/turndelivery/deliveryMarket.vue
+++ b/src/views/distribution/turndelivery/deliveryMarket.vue
@ -1357,7 +1357,7 @@ export default {
    },
    /** 返回上一页 */
    back() {
-      this.$router.push('/distribution/reservation/reservation');
+      this.$router.back();
      this.$store.commit('DEL_TAG_CURRENT');
    },
    // 提交(配送内容)
@ -1504,10 +1504,11 @@ export default {
            message: '操作成功!',
          });
          this.$store.commit('DEL_TAG_CURRENT');
-          this.$router.push({
-            path: '/distribution/deliverylist/distributionDeliveryListmar',
-            name: '配送市配列表',
-          });
+          this.back();
+          // this.$router.push({
+          //   path: '/distribution/deliverylist/distributionDeliveryListmar',
+          //   name: '配送市配列表',
+          // });
        } else {
          let updateDate = {};
          updateDate.reservationInfos = this.reservationData;
@ -1567,6 +1568,7 @@ export default {
      } catch (error) {
        console.log('error :>> ', error);
      } finally {
+        this.$store.commit('EDIT_REFRESHITEM', { title: 'reservation', status: true });
        this.loadingObj.submitBtnLoading = false;
      }
    },
@ -1580,10 +1582,11 @@ export default {
          type: 'success',
          message: '操作成功!',
        });
-        this.$router.push({
-          path: '/distribution/deliverylist/distributionDeliveryListmar',
-          name: '配送市配列表',
-        });
+        back();
+        // this.$router.push({
+        //   path: '/distribution/deliverylist/distributionDeliveryListmar',
+        //   name: '配送市配列表',
+        // });
      });
      this.dialogVisible = false;
    },
--- a/vite.config.js
+++ b/vite.config.js
@ -14,7 +14,7 @@ export default ({ mode, command }) => {
        '/api': {
          // target: 'http://192.168.10.126:8889',
          // hy
-          // target: 'http://192.168.10.48:13000',
+          target: 'http://192.168.10.48:13000',
          // lmy
          // target: 'http://192.168.10.123:8889',
          // target: 'http://192.168.10.101:8888',
@ -25,7 +25,7 @@ export default ({ mode, command }) => {
          // target: 'http://192.168.6.122:8777',
          // target: 'http://192.168.10.25:13000',
          // target: 'http://192.168.10.25:2888',
-          target: 'http://192.168.6.148:9777',//CYZ 
+          // target: 'http://192.168.6.161:9777', //CYZ
          // target: 'http://192.168.10.57:13000',
          // target: 'http://192.168.10.200:13000',
          // target: 'http://192.168.10.29:13000',