695593266@qq.com 6 дней назад
Родитель
Сommit
609d09e14a

+ 9 - 0
src/components/selectionDialog/processRoute.vue

@@ -142,6 +142,12 @@
       };
     },
 
+    computed: {
+      clientEnvironmentId() {
+        return this.$store.state.user.info.clientEnvironmentId;
+      }
+    },
+
     watch: {},
     methods: {
       open(item) {
@@ -154,6 +160,9 @@
 
       /* 表格数据源 */
       datasource({ page, limit, where, order }) {
+        if (this.clientEnvironmentId == 9) {
+          where.approvalStatus = 2;
+        }
         return routeList({
           pageNum: page,
           size: limit,

+ 21 - 1
src/views/entrust/components/goodsDetail.vue

@@ -66,6 +66,7 @@
 
 <script>
   import {
+    pleaseEntrustAllGoodsDetail,
     pleaseEntrustGoodsDetail,
     pleaseEntrustSaveDetail,
     pleaseTReceiveGoods
@@ -214,7 +215,7 @@
         await pleaseEntrustGoodsDetail({
           id,
           detailType
-        }).then((res) => {
+        }).then(async (res) => {
           this.goodsList = [];
           res.data.forEach((item) => {
             if (this.type == 'receipt' && this.itemData.sendStatus != 4) {
@@ -222,6 +223,25 @@
             }
             this.goodsList.push(this.deepCopy(item));
           });
+
+          if (
+            this.type != 'receipt' &&
+            this.type != 'detail' &&
+            !this.goodsList.length
+          ) {
+            await this.getPreDetail(id);
+          }
+        });
+      },
+
+      async getPreDetail(id) {
+        await pleaseEntrustAllGoodsDetail({
+          id
+        }).then((res) => {
+          this.goodsList = [];
+          res.data.forEach((item) => {
+            this.goodsList.push(this.deepCopy(item));
+          });
         });
       },