财务等bug

src/views/ecw/financial/receiptDetail.vue

@@ -269,7 +269,7 @@
         </el-descriptions-item>
         <el-descriptions-item>
           <template slot="label">
-            {{ $t('已核销金额') }}（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />）
+            {{ $t('核销基准金额') }}（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />）
           </template>
           {{ verificationData.writtenOff.toFixed(6) }}
         </el-descriptions-item>
@@ -277,7 +277,7 @@
           <template slot="label">
             {{ $t('已核销比例') }}（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />）
           </template>
-          {{ parseFloat(verificationData.WriteOffProportion/100).toFixed(2) }}%
+          {{ verificationData.WriteOffProportion }}%
         </el-descriptions-item>
       </el-descriptions>
     </el-card>

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

@@ -55,7 +55,7 @@
         </el-form-item>
       </el-row>
       <el-row>
-        <el-form-item :label="$t('跟进业务')+':'">
+        <el-form-item :label="$t('客户经理')+':'">
          <el-select v-model="queryParams.salesmanId" :placeholder="$t('请选择跟进业务')" clearable>
           <el-option v-for="item in creatorData" :key="item.id" :label="item.nickname" :value="item.id"/>
           </el-select>

src/views/ecw/order/prepayDeal.vue

@@ -5,21 +5,21 @@
        <div class="card-title">{{$t('查看')}}</div>
        <el-button type="primary" icon="el-icon-arrow-left" @click="$store.dispatch('tagsView/delCurrentView')">返回</el-button>
      </div>
-     <el-form :model="orderData" ref="queryForm" size="small" :inline="true"  label-width="120px" class="card">
+     <el-form v-if="orderData" :model="orderData" ref="queryForm" size="small" :inline="true"  label-width="120px" class="card">
        <el-row>
           <el-form-item :label="$t('订单号')+':'">
-            {{orderData?orderData.orderNo:''}}
+            {{orderData.orderNo || ''}}
           </el-form-item>
        </el-row>
        <div v-if="orderExceptionData.orderExceptionType=='order_superfluous_box_exception'||orderExceptionData.orderExceptionType=='order_lack_box_exception'||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-form-item :label="$t('产品名称')+':'" >
-              {{shopData?shopData.prodTitleZh:''}}
+              {{shopData.prodTitleZh || ''}}
             </el-form-item>
          </el-row>
          <el-row>
             <el-form-item :label="$t('产品英文名称')+':'">
-              {{shopData?shopData.prodTitleEn:''}}
+              {{shopData.prodTitleEn || ''}}
             </el-form-item>
          </el-row>
        </div>
@@ -44,21 +44,21 @@
          </el-row>
          <el-row :span="12">
             <el-form-item :label="$t('异常描述')+':'">
-               {{orderExceptionData.orderExceptionDescVO?orderExceptionData.orderExceptionDescVO.descZh:'无'}}
+              <dict-tag :type="DICT_TYPE.ORDER_ERROR_TYPE" :value="orderExceptionData.orderExceptionType" />
+              <!-- {{orderExceptionData.orderExceptionDescVO?orderExceptionData.orderExceptionDescVO.descZh:'无'}} -->
             </el-form-item>
             <el-button v-if="orderExceptionData.orderExceptionType=='order_pay_exception'" type="primary" plain icon="el-icon-plus" style="margin-left: 200px;"  @click="handleAdd">新增收款单</el-button>
          </el-row>
+         <el-row v-if="orderExceptionData.orderExceptionDetails">
+            <el-form-item :label="$t('详细内容')+':'">
+              <span>{{orderExceptionData.orderExceptionDetails}}</span>
+            </el-form-item>
+         </el-row>
          <el-row v-if="orderExceptionData.orderExceptionType=='order_pay_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>
          </el-row>
-<!--         <el-row :span="12">
-            <el-form-item label="详细内容:">
-               {{orderData.totalMoney||'无'}}
-            </el-form-item>
-            <el-button v-if="orderExceptionData.orderExceptionStatus==3" type="primary" plain icon="el-icon-plus" style="margin-left: 200px;"  @click="handleAdd">新增收款单</el-button>
-         </el-row> -->
        </div>
      </el-form>
       <el-table v-if="orderExceptionData.orderExceptionType=='order_pay_exception'" v-loading="loading" border :data="preException">
@@ -89,17 +89,7 @@
                     {{ currencyMap[row.currencyId] }}
               </template>
             </el-table-column>
-      <!--      <el-table-column label="总金额美元" align="center" prop="totalAmount">
-              <template slot-scope="{row}">
-                   {{row.totalAmount}}({{row.exchangeRate}})
-              </template>
-            </el-table-column>
-            <el-table-column label="总金额RMB" align="center" prop="totalAmount">
-             <template slot-scope="{row}">
-                   {{row.totalAmount}}({{row.exchangeRate}})
-              </template>
-            </el-table-column>
-            <el-table-column label="实收金额" prop="volume" /> -->
+              
             <el-table-column :label="$t('付款人')">
               <template slot-scope="scope">
                <span>{{scope.row.consigneeName}}({{$t('收货人')}})</span>
@@ -111,7 +101,7 @@
                 </template>
               </el-table-column>
           </el-table>
-          <el-table v-if="orderExceptionData.orderExceptionType=='order_doc_exception'||orderExceptionData.orderExceptionType=='order_consignor_exception'||orderExceptionData.orderExceptionType=='order_other_exception'" v-loading="loading" border :data="orderData.orderItemVOList">
+          <el-table v-if="['order_doc_exception', 'order_consignor_exception', 'order_other_exception'].indexOf(orderExceptionData.orderExceptionType) > -1" v-loading="loading" border :data="orderData.orderItemVOList">
                 <el-table-column :label="$t('序号')" align="center" prop="id" type="index">
                    <template slot-scope="scope">
                        <span>{{scope.$index + 1}}</span>
@@ -202,7 +192,13 @@
                   </el-form-item>
                   </el-col>
               </el-row>
-              <el-row>
+              <el-row :span="8" v-if="orderExceptionData.orderExceptionType=='order_doc_exception'">
+                <el-form-item :label="$t('报关资料')+':'" size="medium">
+                  <file-upload v-model="handlerParams.fileList" :value="orderExceptionData.file" ></file-upload>
+                </el-form-item>
+              </el-row>
+              <!--预付异常的备选需要根据接口数据过滤-->
+              <el-row v-if="orderExceptionData.orderExceptionType=='order_pay_exception'">
                   <el-form-item :label="$t('处理结果')+':'" required>
                     <el-select v-model="handlerParams.orderExceptionHandlerResult" placeholder="请选择" clearable>
                       <template v-for="dict in getDictDatas(orderExceptionData.orderExceptionType+'_result')">
@@ -211,32 +207,83 @@
                     </el-select>
                   </el-form-item>
               </el-row>
-              
-              <el-row :span="8">
+              <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="请选择" clearable>
+                      <template v-for="dict in getDictDatas(orderExceptionData.orderExceptionType+'_result')">
+                        <el-option :key="dict.value" :label="$l(dict, 'label')" :value="dict.value"/>
+                      </template>
+                    </el-select>
+                  </el-form-item>
+              </el-row>
+              <el-row :span="8" v-if="orderExceptionData.orderExceptionType=='order_pick_up_exception'&&handlerParams.orderExceptionHandlerResult=='cost_required'">
+                <el-form-item :label="$t('送货费用')+':'" size="medium">
+                  <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 :span="8" v-if="orderExceptionData.orderExceptionType!='order_lack_box_exception'&&orderExceptionData.orderExceptionType!='order_miss_exception'&&orderExceptionData.orderExceptionType!='order_superfluous_goods_exception'&&orderExceptionData.orderExceptionType!='order_in_water_exception'&&orderExceptionData.orderExceptionType!='order_damage_exception'&&orderExceptionData.orderExceptionType!='order_other_exception'&&orderExceptionData.orderExceptionType!='order_lack_box_exception'">
                 <el-form-item :label="$t('备注')+':'" size="medium">
                   <el-input style="width: 500px;"  type="textarea" v-model="handlerParams.orderExceptionHandlerRemark"  />
                 </el-form-item>
               </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-form-item :label="$t('状态')+':'">
+                    <el-radio-group v-model="handlerParams.orderExceptionStatus" @change="changeExceptionStatus">
+                        <el-radio  label="1">{{$t('处理中')}}</el-radio>
+                        <el-radio  label="2">{{$t('已处理')}}</el-radio>
+                      </el-radio-group>
+                  </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+'_don_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 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"/>
+                      </el-select>
+                  </el-form-item>
+                </el-row>
+              </div>
             </el-form>
           </el-card>
-
-          <!-- 只有不需要预付才需要审核 -->
-          <template v-if="showWorkFlow">
-            <div class="page-title">审批流程</div>
-            <work-flow xmlkey="commission_config" v-model="handlerParams.ccIds" />
-          </template>
           <div slot="footer" class="dialog-footer">
-            <!-- 审核中显示 -->
             <template v-if="orderExceptionData.bpmStatus == 1">
               <el-button type="primary" @click="$router.push(`/bpm/process-instance/detail?id=`+orderExceptionData.bpmId)">{{$t('审核中')}}</el-button>
               <el-button plain type="primary" @click="dialogVisible = true">{{$t('取消审核')}}</el-button>
               <el-button plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('返回')}}</el-button>
             </template>
-            <div v-else>
+            <template v-else>
+              <div v-if="orderExceptionData.orderExceptionType!='order_pay_exception'">
                 <el-button  type="primary" @click="submitForm">{{$t('提交')}}</el-button>
                 <el-button plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('取消')}}</el-button>
-             <!--  <el-button  type="primary" @click="submitForm">{{$t('转交')}}</el-button> 接口尚缺失 -->
               </div>
+              <div v-if="orderExceptionData.orderExceptionType=='order_pay_exception'&&!orderExceptionData.bpmId">
+                <el-button  type="primary" @click="submitForm">{{$t('提交')}}</el-button>
+                <el-button plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('取消')}}</el-button>
+              </div>
+            </template>
           </div>
   </div>
 </template>
@@ -248,11 +295,11 @@
   import { getCurrencyList } from '@/api/ecw/currency'
   import {getExceptionById,handlerExceptionByExceptionId,getOrderItemById,getOrderFeeById} from "@/api/ecw/orderException"
   import {getFirstReceivableListByOrderId} from '@/api/ecw/financial'
-  import WorkFlow from '@/components/WorkFlow'
+
   export default {
     name: "PrepayDeal",
     components: {
-      FileUpload, WorkFlow
+      FileUpload
     },
     data() {
       return {
@@ -270,7 +317,7 @@
           orderExceptionStatus:"1",
           orderExceptionHandlerResult:''
         },
-        shopData:{},
+        
         //发货/收货人信息
         consigneeData:[],
         routerList:[],
@@ -278,7 +325,6 @@
         preException:[],
         orderFee:[],
         currencyList:[],
-        showWorkFlow: false, // 是否显示工作流
       };
     },
     created() {
@@ -290,13 +336,6 @@
       }
        getCurrencyList().then(res => this.currencyList = res.data)
     },
-    watch:{
-      'handlerParams.orderExceptionHandlerResult'(val){
-        if(val == 'no_pay'){
-          this.showWorkFlow = true
-        }
-      }
-    },
     computed: {
       currencyMap(){
         let map = {}
@@ -305,6 +344,11 @@
         })
         return map
       },
+      shopData(){
+        if(this.orderExceptionData.orderItemId && this.orderData && this.orderData.orderItemVOList){
+          return this.orderData.orderItemVOList.find(item => item.orderItemId == this.orderExceptionData.orderItemId)
+        }
+      }
     },
     methods: {
       /** 查询列表 */