Merge branch 'dev-20210607' into 'release'

查看商品,code review:bo.dang

See merge request com.pica.cloud.education.frontend/pica.cloud.web-education-admin!265

src/views/freight/freight-config.vue

@@ -126,8 +126,8 @@
         <el-table-column prop="goodIds" label="商品ID" min-width="100" align="center">
           <template slot-scope="scope">
             <div v-for="(item, index) in scope.row.goodIds" :key="index" style="text-align: center;margin: 0 auto;padding: 0;">
-            <div v-if="index != scope.row.goodIds.length - 1" style="cursor: pointer;color: #449284;float: left;display: inline-block;" @click="viewGoods(item)">{{item}}、</div>
-            <div v-else-if="index == scope.row.goodIds.length - 1" style="cursor: pointer;color: #449284;float: left;display: inline-block;" @click="viewGoods(item)">{{item}}</div>
+            <div v-if="index != scope.row.goodIds.length - 1" style="cursor: pointer;color: #449284;float: left;display: inline-block;" @click="viewGoods(item, scope.row)">{{item}}、</div>
+            <div v-else-if="index == scope.row.goodIds.length - 1" style="cursor: pointer;color: #449284;float: left;display: inline-block;" @click="viewGoods(item,scope.row)">{{item}}</div>
             </div>
           </template>
         </el-table-column>
@@ -320,7 +320,8 @@ export default {
         intro:'',
         introId:'',
         storeExpressIntervalReqList:[],
-        storeId:''
+        storeId:'',
+        tradeGoods:''
       },
       rowIndex:'',
       addRules:{
@@ -482,9 +483,17 @@ export default {
     },
 
     // 查看商品详情
-    viewGoods(row){
+    viewGoods(item,row){
+
+      let goodsType = "";
+      for(let i=0; i < row.tradeGoods.length; i++){
+        if(item == row.tradeGoods[i].id){
+          goodsType = row.tradeGoods[i].goodsType;
+          break;
+        }
+      }
       // url = `/create-good?id=${row.goodsId}&storeId=${this.searchForm.storeId}&goodsType=${goodsType}&commissionFlag=${this.commissionFlag}`
-      let url = `/create-good?id=${row}&storeId=${this.storeId}&goodsType=5&commissionFlag=2`
+      let url = `/create-good?id=${item}&storeId=${this.storeId}&goodsType=${goodsType}&commissionFlag=2`
     // this.$store.dispatch('goodsManage/changeGoodsInfo', {...row});
     this.$router.push({
       path: url
@@ -586,7 +595,8 @@ export default {
                   number:res.data.goodConditionDtoList[i].goodExpressConditionConfig.number,
                   numberText:res.data.goodConditionDtoList[i].goodExpressConditionConfig.number/100,
                   intro:res.data.goodConditionDtoList[i].goodExpressConditionConfig.intro,
-                  introId:res.data.goodConditionDtoList[i].goodExpressConditionConfig.id
+                  introId:res.data.goodConditionDtoList[i].goodExpressConditionConfig.id,
+                   tradeGoods: res.data.goodConditionDtoList[i].tradeGoods
                 });
             }
             else {
@@ -597,7 +607,8 @@ export default {
                   number:res.data.goodConditionDtoList[i].goodExpressConditionConfig.number,
                   numberText:res.data.goodConditionDtoList[i].goodExpressConditionConfig.number,
                   intro:res.data.goodConditionDtoList[i].goodExpressConditionConfig.intro,
-                  introId:res.data.goodConditionDtoList[i].goodExpressConditionConfig.id
+                  introId:res.data.goodConditionDtoList[i].goodExpressConditionConfig.id,
+                   tradeGoods: res.data.goodConditionDtoList[i].tradeGoods
                 });
             }
 
@@ -635,6 +646,7 @@ export default {
                   value: `${item.goodsId} ${item.goodsName}`,
                   id: item.goodsId,
                   name: item.goodsName,
+                  goodsType: item.goodsType
                 }
               })
               // console.log('新数组',newList)
@@ -712,7 +724,9 @@ export default {
               }
               vm.resultForm.goodConditionReqList[i].intro = vm.goodCondition.intro;
               vm.resultForm.goodConditionReqList[i].introId = vm.goodCondition.introId;
-              addFlag = false;
+              vm.resultForm.goodConditionReqList[i].tradeGoods = vm.setTradeGoods(vm.goodCondition.goodIds);
+
+                addFlag = false;
               break;
             }
             if(i == vm.resultForm.goodConditionReqList.length - 1){
@@ -741,7 +755,8 @@ export default {
           number:vm.goodCondition.number * 100,
           numberText:vm.goodCondition.number,
           intro:vm.goodCondition.intro,
-          introId:vm.goodCondition.introId
+          introId:vm.goodCondition.introId,
+          tradeGoods: vm.setTradeGoods(vm.goodCondition.goodIds)
         });
       }
       else {
@@ -751,10 +766,29 @@ export default {
           number:vm.goodCondition.number,
           numberText:vm.goodCondition.number,
           intro:vm.goodCondition.intro,
-          introId:vm.goodCondition.introId
+          introId:vm.goodCondition.introId,
+          tradeGoods: vm.setTradeGoods(vm.goodCondition.goodIds)
         });
       }
 
+    },
+
+    setTradeGoods(goodIds){
+      let tradeGoods = [];
+      if(goodIds.length > 0){
+        for(let i=0; i < goodIds.length; i++){
+          for(let j=0; j < vm.nameList.length; j++){
+               if(goodIds[i] == vm.nameList[j].id){
+                 tradeGoods.push({
+                   id:vm.nameList[j].id,
+                   goodsType: vm.nameList[j].goodsType
+                 })
+               }
+          }
+        }
+      }
+      return tradeGoods;
+
     }
 
   },