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

src/api/system/operatelog.js

@@ -5,7 +5,8 @@ export function listOperateLog(query) {
   return request({
     url: '/system/operate-log/page',
     method: 'get',
-    params: query
+    params: query,
+    timeout: 5*6000,
   })
 }
 
@@ -15,6 +16,8 @@ export function exportOperateLog(query) {
     url: '/system/operate-log/export',
     method: 'get',
     params: query,
+    timeout: 5*6000,
+
     responseType: 'blob'
   })
 }

src/views/ecw/order/prepayDeal.vue

@@ -576,8 +576,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
+            // 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)
@@ -670,10 +670,10 @@
       },
       //新增异常处理结果切换
       handlerResultChange(){
-        if(this.orderExceptionData.orderExceptionType=='goods_add_exception'){
-          this.productId1 = this.handlerParams.productId
-          this.productId2 = this.handlerParams.productId
-        }
+        // if(this.orderExceptionData.orderExceptionType=='goods_add_exception'){
+        //   this.productId1 = this.handlerParams.productId
+        //   this.productId2 = this.handlerParams.productId
+        // }
       },
       submitForm(){
           if(!this.handlerParams.orderExceptionHandlerResult){
@@ -691,8 +691,13 @@
             this.$redirect('/product/product-list?prodId=' + this.handlerParams.productId)
             return
           }
-          if(this.productId1){
-            this.handlerParams.productId = this.productId1
+          if(this.orderExceptionData.orderExceptionType=='goods_add_exception'&&this.handlerParams.orderExceptionHandlerResult=='goods_exists'){
+            if(this.productId1){
+              this.handlerParams.productId = this.productId1
+            }else{
+              this.$modal.msgError(this.$t('请选择产品'));
+              return
+            }
           }
           handlerExceptionByExceptionId(this.handlerParams).then(res=>{
               this.$modal.msgSuccess(this.$t('提交成功'));