Merge remote-tracking branch 'origin/dev' into dev

src/views/ecw/order/exception/index.vue

@@ -197,6 +197,7 @@
           <el-button v-else-if="scope.row.orderExceptionType=='order_bulky_cargo_exception'" v-hasPermi="['ecw:exception:bulkyCargo']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>
           <el-button v-else-if="scope.row.orderExceptionType=='order_pick_up_exception'" v-hasPermi="['ecw:exception:pickUp']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>
           <el-button v-else-if="scope.row.orderExceptionType=='not_customer_service_exception'" v-hasPermi="['ecw:exception:notCustomer']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>
+          <el-button v-else-if="scope.row.orderExceptionType=='goods_add_exception'" v-hasPermi="['ecw:exception:goodsAddException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>
         </template>
       </el-table-column>
     </el-table>

src/views/ecw/order/pending.vue

@@ -127,6 +127,7 @@
             <el-button v-else-if="scope.row.orderExceptionType=='order_bulky_cargo_exception'" v-hasPermi="['ecw:exception:bulkyCargo']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('处理')}}</el-button>
             <el-button v-else-if="scope.row.orderExceptionType=='order_pick_up_exception'" v-hasPermi="['ecw:exception:pickUp']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('处理')}}</el-button>
             <el-button v-else-if="scope.row.orderExceptionType=='not_customer_service_exception'" v-hasPermi="['ecw:exception:notCustomer']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('处理')}}</el-button>
+            <el-button v-else-if="scope.row.orderExceptionType=='goods_add_exception'" v-hasPermi="['ecw:exception:goodsAddException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('处理')}}</el-button>
           </template>
         </el-table-column>
       </el-table>

src/views/ecw/order/prepayDeal.vue

@@ -326,7 +326,7 @@
         </el-row>
         <el-row v-else-if="orderExceptionData.orderExceptionType!='order_miss_exception'&&orderExceptionData.orderExceptionType!='order_superfluous_goods_exception'&&orderExceptionData.orderExceptionType!='order_in_water_exception'&&orderExceptionData.orderExceptionType!='order_damage_exception'">
             <el-form-item :label="$t('处理结果')+':'" required>
-              <el-select v-model="handlerParams.orderExceptionHandlerResult" :placeholder="$t('请选择')" clearable>
+              <el-select v-model="handlerParams.orderExceptionHandlerResult" :placeholder="$t('请选择')" clearable @change="handlerResultChange">
                 <template v-for="dict in getDictDatas(orderExceptionData.orderExceptionType+'_result')">
                   <el-option :disabled="dict.value=='pending'"  :key="dict.value" :label="$l(dict, 'label')" :value="dict.value"/>
                 </template>
@@ -349,7 +349,8 @@
                >
                   <product-selector
                    @hook:mounted="onTableMounted"
-                   v-model="handlerParams.productId"
+                   v-model="productId2"
+                   @change = "onProductChange($event)"
                    />
                </el-form-item>
           </el-row>
@@ -367,8 +368,8 @@
              >
                 <product-selector
                 lang="En"
-                 @hook:mounted="onTableMounted"
-                 v-model="handlerParams.productId"
+                 v-model="productId1"
+                 @change = "onProductChange($event)"
                  />
              </el-form-item>
           </el-row>
@@ -522,6 +523,8 @@
         region:'',
         customerData:{},//归属客户
         customerServiceList:[],//客户经理
+        productId1:null,
+        productId2:null
       };
     },
     created() {
@@ -571,6 +574,8 @@
         if(this.orderExceptionData.orderItemId && this.orderData && this.orderData.orderItemVOList){
           if(this.orderExceptionData.orderExceptionType=='goods_add_exception'&&!this.handlerParams.productId){
             this.handlerParams.productId = this.orderData.orderItemVOList.find(item => item.orderItemId == this.orderExceptionData.orderItemId).prodId
+            this.productId1 = this.handlerParams.productId
+            this.productId2 = this.handlerParams.productId
           }
           console.log(this.orderData.orderItemVOList.find(item => item.orderItemId == this.orderExceptionData.orderItemId))
           return this.orderData.orderItemVOList.find(item => item.orderItemId == this.orderExceptionData.orderItemId)
@@ -661,6 +666,13 @@
               }
               return this.$t('无')
       },
+      //新增异常处理结果切换
+      handlerResultChange(){
+        if(this.orderExceptionData.orderExceptionType=='goods_add_exception'){
+          this.productId1 = this.handlerParams.productId
+          this.productId2 = this.handlerParams.productId
+        }
+      },
       submitForm(){
           if(!this.handlerParams.orderExceptionHandlerResult){
             this.$modal.msgError(this.$t('请选择处理结果'));
@@ -673,12 +685,15 @@
             // }
             this.handlerParams.files = Array.isArray(this.handlerParams.fileList) ? this.handlerParams.fileList.join(',') : this.handlerParams.fileList
           }
-
-          handlerExceptionByExceptionId(this.handlerParams).then(res=>{
-              this.$modal.msgSuccess(this.$t('提交成功'));
           if(this.orderExceptionData.orderExceptionType=='goods_add_exception'&&this.handlerParams.orderExceptionHandlerResult=='goods_absent'){
             this.$redirect('/product/product-list?prodId=' + this.handlerParams.productId)
+            return
+          }
+          if(this.productId1){
+            this.handlerParams.productId = this.productId1
           }
+          handlerExceptionByExceptionId(this.handlerParams).then(res=>{
+              this.$modal.msgSuccess(this.$t('提交成功'));
               this.$redirect('/order/pending?id=' + this.orderData.orderId)
           })
       },
@@ -740,6 +755,15 @@
         onClickClosePreview(val){
           this.IsPreview = val  // 由组件内部传入的关闭数据赋值关闭
         },
+        onProductChange(product){
+            if(!product){
+              this.productId1 = null
+              this.productId2 = null
+             return false
+            }
+              this.productId1 = product.id
+              this.productId2 = product.id
+        },
     }
   };
 </script>

src/views/ecw/product/index.vue

@@ -328,6 +328,7 @@ export default {
       packagingList: getDictDatas(DICT_TYPE.ECW_PACKAGING_TYPE),
       locationList: getDictDatas(DICT_TYPE.ECW_CONTAINER_LOCATION),
       preferentialList:[],
+      exceptionProductId:0//新增商品异常传的id
     };
   },
 
@@ -372,13 +373,18 @@ export default {
     if(this.$route.query.typeId != this.queryParams.typeId){
       this.queryParams.typeId = +this.$route.query.typeId || null
     }
+    //新增商品异常跳转商品修改
+    if(this.$route.query.prodId){
+      this.exceptionProductId = this.$route.query.prodId
+      this.handleUpdate({id:this.$route.query.prodId})
+    }
     this.getList()
   },
   created() {
     console.log(111)
     //新增商品异常跳转商品修改
     if(this.$route.query.prodId){
-        console.log(this.$route.query.prodId)
+      this.exceptionProductId = this.$route.query.prodId
       this.handleUpdate({id:this.$route.query.prodId})
     }
     let typeId = this.$route.query.typeId;
@@ -528,6 +534,9 @@ export default {
         this.form.attrId = this.form.attrArray.join(',');
         // 修改的提交
         if (this.form.id != null) {
+          if(this.exceptionProductId){
+            this.form.productId = this.exceptionProductId
+          }
           updateProduct(this.form).then(response => {
             this.$modal.msgSuccess(this.$t("修改成功"));
             this.open = false;