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

src/views/ecw/financial/creatCollection.vue

@@ -1100,8 +1100,7 @@ export default {
       delete params.receivableDetail
       if (this.list && this.list.length > 0) {
         params.receivableVOList = this.list
-      }
-      if (params.receivableVOList.length === 0) {
+      }else{
         this.$modal.msgError("请添加未收客户款项");
         return
       }
@@ -1144,6 +1143,7 @@ export default {
         if (valid) {
           this.saveBtnLoading = true
           if (this.id && this.id !== '0') {
+            if(params.state==0) params.state = 1
             updateReceipt(params).then(res => {
               this.$modal.msgSuccess("修改成功");
               this.$router.back();

src/views/ecw/order/prepayDeal.vue

@@ -209,19 +209,36 @@
             </el-row>
 
             <div v-if="orderExceptionData.orderExceptionType=='order_miss_exception'||orderExceptionData.orderExceptionType=='order_superfluous_goods_exception'||orderExceptionData.orderExceptionType=='order_in_water_exception'||orderExceptionData.orderExceptionType=='order_damage_exception'">
-              <el-row>
+<!--              <el-row>
                  <el-form-item :label="$t('详细内容:')">
                     {{orderExceptionData.orderExceptionDetails||'无'}}
                  </el-form-item>
-              </el-row>
+              </el-row> -->
               <el-row >
                  <el-form-item :label="$t('状态:')">
                       <el-radio v-model="handlerParams.orderExceptionStatus" label="1">{{$t('处理中')}}</el-radio>
                       <el-radio v-model="handlerParams.orderExceptionStatus" label="2">{{$t('已处理')}}</el-radio>
                  </el-form-item>
+              </el-row>
+               <el-row>
+                <el-form-item :label="$t('处理结果:')" required v-if="handlerParams.orderExceptionStatus==2">
+                  <el-select v-model="handlerParams.orderExceptionHandlerResult" placeholder="请选择" clearable>
+                  <el-option  v-for="dict in getDictDatas(orderExceptionData.orderExceptionType+'_result')"
+                             :key="dict.value" :label="dict.label" :value="dict.value"/>
+                  </el-select>
+                </el-form-item>
+              </el-row>
+               <el-row>
+                <el-form-item :label="$t('赔付金额:')" size="medium" required v-if="handlerParams.orderExceptionStatus==2">
+                  <el-input style="width: 100px;"  type="text" v-model="handlerParams.amount"  />
+                  <el-select v-model="handlerParams.currency" style="width: 100px;margin-left: 10px;" clearable>
+                  <el-option  v-for="dict in getDictDatas('shipping_price_unit') "
+                             :key="dict.value" :label="dict.label" :value="dict.value"/>
+                  </el-select>
+                </el-form-item>
               </el-row>
               <el-row>
-                 <el-form-item :label="$t('查明原因:')" required>
+                 <el-form-item :label="$t('查明原因:')" required v-if="handlerParams.orderExceptionStatus==1">
                     <el-select v-model="handlerParams.orderExceptionHandlerResult" clearable>
                     <el-option  v-for="dict in getDictDatas(orderExceptionData.orderExceptionType+'_result')"
                                :key="dict.value" :label="dict.label" :value="dict.value"/>
@@ -300,7 +317,7 @@
         getExceptionById(that.orderExceptionId).then(response => {
           that.orderExceptionData = response.data;
           // that.orderExceptionData.orderExceptionType = 'order_other_exception'
-          // that.orderExceptionData.orderExceptionType = 'order_pick_up_exception'
+          that.orderExceptionData.orderExceptionType = 'order_miss_exception'
           // that.orderExceptionData.orderExceptionType = 'order_pay_exception'
           that.loading = false;
           that.orderId = response.data.orderId