3 Ревизии 8e57eb7adc ... ffab549643

Автор SHA1 Съобщение Дата
  xieyong ffab549643 fix(entrust): 更新发货条件,增加状态8的判断 преди 2 дни
  xieyong 39ba3ef213 fix(goodsDetail): 统一detailType为1,通过status是否传入来判断为收货逻辑 преди 2 дни
  xieyong 69a1db37d5 fix(beEntrusted): 修改表格列标签为“请托工厂” преди 2 дни

+ 3 - 0
src/views/beEntrusted/components/goodsDetail.vue

@@ -268,6 +268,9 @@
           id,
           detailType,
         }
+        if(this.type === 'send' || this.type === 'detail') {
+          obj.detailType = 1;
+        }
         if(this.type === 'detail'){
           obj.status = 2;
         }

+ 1 - 1
src/views/beEntrusted/index.vue

@@ -289,7 +289,7 @@
           },
           {
             prop: 'applyFactoriesName',
-            label: '所属工厂',
+            label: '请托工厂',
             align: 'center',
             width: 130,
             showOverflowTooltip: true

+ 10 - 3
src/views/entrust/components/goodsDetail.vue

@@ -240,11 +240,18 @@
       },
 
       async getDetail(id) {
-        const detailType = this.type == 'receipt' ? 2 : 1;
-        await pleaseEntrustGoodsDetail({
+        let detailType = this.type == 'receipt' ? 2 : 1;
+        const params = {
           id,
           detailType
-        }).then(async (res) => {
+        };
+        if(this.type === "detail" || this.type === "receipt") {
+          params.detailType = 1;
+        }
+        if(this.type === 'receipt') {
+          params.status = 2;
+        }
+        await pleaseEntrustGoodsDetail(params).then(async (res) => {
           this.goodsList = [];
           res.data.forEach((item) => {
             if (this.type == 'receipt' && this.itemData.sendStatus != 4) {

+ 1 - 1
src/views/entrust/index.vue

@@ -149,7 +149,7 @@
             @click="sendGoods(row, 'add')"
             v-if="
               row.approvalStatus == 2 &&
-              (row.sendStatus == 0 || !row.sendStatus || row.sendStatus == 5 || row.sendStatus == 7 || row.sendStatus == 9)
+              (row.sendStatus == 0 || !row.sendStatus || row.sendStatus == 5 || row.sendStatus == 7 || row.sendStatus == 8 || row.sendStatus == 9)
             "
           >
             发货