v1.7新增功能

src/views/ecw/order/prepayDeal.vue

@@ -11,7 +11,7 @@
             {{orderData.orderNo || ''}}
           </el-form-item>
        </el-row>
-       <div v-if="shopData">
+       <div v-if="shopData&&orderExceptionData.orderExceptionType!='goods_add_exception'">
          <el-row>
             <el-form-item :label="$t('产品名称')+':'" >
               {{shopData.prodTitleZh || ''}}
@@ -96,7 +96,7 @@
             <span>{{orderExceptionData.orderExceptionDetails}}</span>
           </el-form-item>
         </el-row>
-        <el-row v-if="orderExceptionData.orderExceptionType=='order_pay_exception'">
+        <el-row v-if="orderExceptionData.orderExceptionType=='order_pay_exception'||orderExceptionData.orderExceptionType=='goods_add_exception'">
           <el-form-item :label="$t('收费参数')+':'">
             <span>{{orderData.sumNum||0}}{{$t('箱')}} {{orderData.wvolume||0}}m³  {{orderData.vweight||0}}Kg  {{orderData.sumQuantity||0}}{{$t('个')}}</span>
           </el-form-item>
@@ -333,6 +333,46 @@
               </el-select>
             </el-form-item>
         </el-row>
+        <!-- v1.7新增商品异常 -->
+        <div v-show="shopData&&orderExceptionData.orderExceptionType=='goods_add_exception'&&handlerParams.orderExceptionHandlerResult=='goods_exists'">
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item :label="$t('新增品名中文')+':'" >
+                {{shopData.prodTitleZh || ''}}
+              </el-form-item>
+            </el-col>
+               <el-form-item label="中文品名"
+                   :rules="{
+                       required: true, message: $t('请选择产品'), trigger: 'blur'
+                   }"
+                   class="mb-0 mr-0"
+               >
+                  <product-selector
+                   @hook:mounted="onTableMounted"
+                   v-model="handlerParams.productId"
+                   />
+               </el-form-item>
+          </el-row>
+          <el-row :gutter="24">
+            <el-col :span="6">
+              <el-form-item :label="$t('新增品名英文')+':'">
+                {{shopData.prodTitleEn || ''}}
+              </el-form-item>
+            </el-col>
+            <el-form-item label="英文品名"
+                 :rules="{
+                     required: true, message: $t('请选择产品'), trigger: 'blur'
+                 }"
+                 class="mb-0 mr-0"
+             >
+                <product-selector
+                lang="En"
+                 @hook:mounted="onTableMounted"
+                 v-model="handlerParams.productId"
+                 />
+             </el-form-item>
+          </el-row>
+        </div>
       <el-row v-if="orderExceptionData.orderExceptionType=='not_customer_service_exception'&&handlerParams.orderExceptionHandlerResult=='allocate'">
         <el-form-item  :label="$t('移交客户经理')+':'" required>
           <el-select v-model="handlerParams.customerService" :placeholder="$t('请选择客户经理')" clearable>
@@ -362,7 +402,7 @@
               </el-select>
           </el-form-item>
         </el-row>
-        <el-row :span="8" v-if="orderExceptionData.orderExceptionType!='not_customer_service_exception'">
+        <el-row :span="8" v-if="orderExceptionData.orderExceptionType!='not_customer_service_exception'&&orderExceptionData.orderExceptionType!='goods_add_exception'">
           <el-form-item :label="$t('备注')+':'" size="medium">
             <el-input style="width: 500px;"  type="textarea" v-model="handlerParams.orderExceptionHandlerRemark"  />
           </el-form-item>
@@ -444,10 +484,11 @@
   import {listServiceUser} from "@/api/system/user";
   import {cancelProcessInstance} from '@/api/bpm/processInstance'
   import {getCustomer} from '@/api/ecw/customer'
+  import ProductSelector from '@/components/ProductSelector'
   export default {
     name: "PrepayDeal",
     components: {
-      FileUpload, WorkFlow,FilePreview
+      FileUpload, WorkFlow,FilePreview,ProductSelector
     },
     data() {
       return {
@@ -528,11 +569,18 @@
       },
       shopData(){
         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
+          }
+
           return this.orderData.orderItemVOList.find(item => item.orderItemId == this.orderExceptionData.orderItemId)
         }
       }
     },
     methods: {
+      onTableMounted(e){
+          // console.warn('onTableMounted', e)
+      },
       /** 查询列表 */
 	  getCurrencyLabel(id){
 	    var label = this.currencyList.filter(item=>item.id == id)
@@ -547,6 +595,7 @@
           // that.orderExceptionData.orderExceptionType = 'order_other_exception'
           // that.orderExceptionData.orderExceptionType = 'order_miss_exception'
            // that.orderExceptionData.orderExceptionType = 'not_customer_service_exception'
+           // that.orderExceptionData.orderExceptionType = 'goods_add_exception'
           that.loading = false;
           that.orderId = response.data.orderId
           that.getOrderData()
@@ -627,6 +676,9 @@
 
           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)
+              }
               this.$redirect('/order/pending?id=' + this.orderData.orderId)
           })
       },
@@ -731,4 +783,7 @@
   .filelist span{
     color: #1E98D7;
   }
+  .red{
+      color: red;
+  }
 </style>

src/views/ecw/product/index.vue

@@ -375,6 +375,12 @@ export default {
     this.getList()
   },
   created() {
+    console.log(111)
+    //新增商品异常跳转商品修改
+    if(this.$route.query.prodId){
+        console.log(this.$route.query.prodId)
+        this.handleUpdate({id:this.$route.query.prodId})
+    }
     let typeId = this.$route.query.typeId;
     if (typeId) {
       this.queryParams.typeId = parseInt(typeId);
@@ -382,6 +388,7 @@ export default {
     this.getAttrList();
     this.getTypeList();
     this.getList();
+
   },
   methods: {
     /** 获取产品属性列表 */
@@ -487,6 +494,7 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       // this.reset();
+      console.log(row);
       const id = row.id;
       getProduct(id).then(response => {
         this.form = {...response.data,couponIds:[]};