无跟进客户经理

src/views/ecw/financial/creatCollection.vue

@@ -10,7 +10,7 @@
       <el-card>
         <div v-if="id" slot="header" class="card-title">{{ $t('修改收款单') }}</div>
         <div v-else slot="header" class="card-title">{{ $t('新增收款单') }}</div>
-        <!-- <el-descriptions :column="3" border> -->
+        <!-- <el-descriptions :column="3" border>-->
           <!-- <el-descriptions-item > -->
             <el-form-item
               :label="$t('客户')"

src/views/ecw/order/prepayDeal.vue

@@ -195,7 +195,49 @@
           </el-table-column>
         <el-table-column :label="$t('货值')" prop="worth" />
       </el-table>
-
+<!-- 未分配客户经理 -->
+	 <div v-if="orderExceptionData.orderExceptionType=='not_customer_service_exception'">
+     <el-row :gutter="20">
+        <el-col :span="8" v-if="orderData.consignorVO">
+          <el-descriptions class="margin-top" border :title="$t('发货人')" :column="1" :labelStyle="{width:'150px'}">
+            <el-descriptions-item :label="$t('发货人')">{{orderData.consignorVO.name}}</el-descriptions-item>
+            <el-descriptions-item :label="$t('发货人电话')">
+              +{{orderData.consignorVO.countryCode}} {{orderData.consignorVO.phone}}
+            </el-descriptions-item>
+            <el-descriptions-item :label="$t('发货人邮箱')">{{orderData.consignorVO.email}}</el-descriptions-item>
+            <el-descriptions-item :label="$t('发货人公司名称')">
+              {{orderData.consignorVO.company}}
+            </el-descriptions-item>
+          </el-descriptions>
+        </el-col>
+        <el-col :span="16" v-if="orderData.consigneeVO">
+          <el-descriptions class="margin-top" border :title="$t('收货人')" :column="2" :labelStyle="{width:'150px'}">
+            <el-descriptions-item :label="$t('收货人')">{{orderData.consigneeVO.name}}</el-descriptions-item>
+            <el-descriptions-item :label="$t('收货人电话')">
+              +{{orderData.consigneeVO.countryCode}} {{orderData.consigneeVO.phone}}
+            </el-descriptions-item>
+            <el-descriptions-item :label="$t('收货人邮箱')">{{orderData.consigneeVO.email}}</el-descriptions-item>
+            <el-descriptions-item :label="$t('收货人公司名称')">
+              {{orderData.consigneeVO.company}}
+            </el-descriptions-item>
+            <el-descriptions-item :label="$t('收货方式')">
+              <dict-tag :type="DICT_TYPE.ECW_HARVEST_METHOD" :value="orderData.consigneeVO.harvestMethod" />
+            </el-descriptions-item>
+            <el-descriptions-item :label="$t('收货地区')">
+              {{region}}
+            </el-descriptions-item>
+            <el-descriptions-item :label="$t('收货地址')">
+              {{orderData.consigneeVO.address}}
+            </el-descriptions-item>
+          </el-descriptions>
+        </el-col>
+      </el-row>
+      <div class="link-text">
+        <router-link :to="{path: '/customer/query/'+orderData.customerId}" class="link-type">
+          <span>{{$t('归属客户')}}:{{ customerData.name||'' }} </span><span>{{$t('客户编号')}}:{{ customerData.number||'' }}</span>
+        </router-link>
+      </div>
+    </div>
       <el-form :model="handlerParams" ref="queryForms" size="small" :inline="true"  label-width="120px" class="card">
         <el-row v-if="orderExceptionData.orderExceptionType=='order_pay_exception'">
           <el-form-item :label="$t('订单总金额')+':'">
@@ -282,17 +324,24 @@
               </el-select>
             </el-form-item>
         </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-row v-else-if="orderExceptionData.orderExceptionType!='order_miss_exception'&&orderExceptionData.orderExceptionType!='not_customer_service_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>
                 <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>
               </el-select>
-
             </el-form-item>
         </el-row>
-
+      <el-row v-else-if="orderExceptionData.orderExceptionType=='not_customer_service_exception'">
+        <el-form-item  :label="$t('移交客户经理')+':'" required>
+          <el-select v-model="handlerParams.orderExceptionHandlerResult" :placeholder="$t('请选择')" clearable>
+            <template v-for="dict in getDictDatas(orderExceptionData.orderExceptionType+'_result')">
+              <el-option :disabled="orderFee && orderFee.result && orderFee.result.indexOf(dict.value) ==-1" :key="dict.value" :label="$l(dict, 'label')" :value="dict.value"/>
+            </template>
+          </el-select>
+        </el-form-item>
+      </el-row>
         <!-- 代收货款 时需要填写代收金额 -->
         <el-row v-if="handlerParams.orderExceptionHandlerResult == 'cod'" >
           <el-form-item :label="$t('代收金额')+':'" size="medium" required>
@@ -314,7 +363,7 @@
               </el-select>
           </el-form-item>
         </el-row>
-        <el-row :span="8">
+        <el-row :span="8" v-if="orderExceptionData.orderExceptionType!='not_customer_service_exception'">
           <el-form-item :label="$t('备注')+':'" size="medium">
             <el-input style="width: 500px;"  type="textarea" v-model="handlerParams.orderExceptionHandlerRemark"  />
           </el-form-item>
@@ -394,6 +443,7 @@
   import WorkFlow from '@/components/WorkFlow'
   import {listByIds} from '@/api/ecw/region'
   import {cancelProcessInstance} from '@/api/bpm/processInstance'
+  import {getCustomer} from '@/api/ecw/customer'
   export default {
     name: "PrepayDeal",
     components: {
@@ -428,7 +478,8 @@
         timers:"", //时间戳
         FilePreAll:[], // 预览数组
         TragetPic:{},
-        region:''
+        region:'',
+        customerData:{}//归属客户
       };
     },
     created() {
@@ -491,7 +542,7 @@
           that.orderExceptionData = response.data;
           // that.orderExceptionData.orderExceptionType = 'order_other_exception'
           // that.orderExceptionData.orderExceptionType = 'order_miss_exception'
-          // that.orderExceptionData.orderExceptionType = 'order_pay_exception'
+           // that.orderExceptionData.orderExceptionType = 'not_customer_service_exception'
           that.loading = false;
           that.orderId = response.data.orderId
           that.getOrderData()
@@ -515,8 +566,16 @@
       getOrderData(){
         getOrder(this.orderId).then(response => {
           this.orderData = response.data
+          if(response.data.customerId){
+            this.getCustomerData(response.data.customerId)
+          }
         });
       },
+      getCustomerData(id){
+        getCustomer(id).then(res=>{
+          this.customerData = res.data
+        })
+      },
       getOrderFeeByIdData(){
         getOrderFeeById({id:this.orderId}).then(response => {
           this.orderFee = response.data
@@ -636,6 +695,7 @@
   .link-text span{
     font-size:16px;
     font-weight:600;
+    margin-right:20px;
   }
   .card-title{
       font-size: 18px;