大部分是异常的bug

src/components/Selector/index.vue

@@ -29,7 +29,8 @@ export default {
         multiple: Boolean,
         clearable: Boolean,
         defaultable: Boolean, // 没有值的时候是否选择第一项
-        disabled: Boolean
+        disabled: Boolean,
+        test: String
     },
     computed:{
         optionsFormated(){
@@ -53,9 +54,15 @@ export default {
         },
         optionsFormated(){
             this.setDefault()
+        },
+        test(val, old){
+            console.warn('test变化', val, old)
         }
     },
     created(){
+        if(this.test == 'allPriceUnit'){
+            console.log('allPriceUnit selector', this.value, this.defaultable)
+        }
         this.valueSync = this.value
         this.setDefault()
     },

src/views/ecw/order/components/MergeDetail.vue

@@ -11,12 +11,12 @@
             <!-- <el-table-column label="已到箱数/总箱数">
                 <template slot-scope="{row}">/{{row.sumNum}}/{{row.sumNum}}</template>
             </el-table-column> -->
-            <el-table-column :label="$t('下单统计')">
+            <el-table-column :label="$t('填单统计')">
                 <template slot-scope="{row}">
                     {{row.costVO.totalNum}}{{$t('箱')}}<br/>{{row.costVO.totalVolume}}m³<br/>{{row.costVO.totalWeight}}kg
                 </template>
             </el-table-column>
-            <el-table-column :label="$t('入仓你统计')">
+            <el-table-column :label="$t('入仓统计')">
                 <template slot-scope="{row}">
                     {{row.sumNum}}{{$t('箱')}}<br/>{{row.sumVolume}}m³<br/>{{row.sumWeight}}kg
                 </template>

src/views/ecw/order/components/PrepayExceptionDetail.vue

@@ -75,6 +75,11 @@
                     </el-form-item>
                 </el-col>
             </el-row>
+            <el-row>
+                <el-form-item :label="$t('备注')+':'">
+                    {{orderFee.notes}}
+                </el-form-item>
+            </el-row>
         </el-form>
     </div>
 </template>

src/views/ecw/order/pending.vue

@@ -68,12 +68,18 @@
               <span v-if="scope.row.orderExceptionDescVO">{{$l(scope.row.orderExceptionDescVO, 'desc')}}</span>
             </template>
         </el-table-column>
-        <el-table-column :label="$t('金额')" align="center" scope="orderExceptionAmount" />
-       <el-table-column :label="$t('状态')" align="center">
+        <el-table-column :label="$t('金额')" align="center" scope="orderExceptionAmount">
+          <template slot-scope="{row}">
+            {{row.orderExceptionAmount}}
+            {{currencyMap[row.orderExceptionAmountCurrencyId]}}
+            </template>
+        </el-table-column>
+        </el-table-column>
+        <el-table-column :label="$t('状态')" align="center">
           <template slot-scope="scope">
               <dict-tag :type="DICT_TYPE.ORDER_EXCEPTION_STATUS" :value="scope.row.orderExceptionStatus" />
             </template>
-          </el-table-column>
+        </el-table-column>
         <el-table-column :label="$t('附件')" align="center">
           <template slot-scope="scope">
             <div class="filelist">
@@ -81,6 +87,13 @@
             </div>
           </template>
         </el-table-column>
+        <el-table-column :label="$t('备注')" align="center">
+          <template slot-scope="{row}">
+            <el-tooltip class="item" effect="dark" :content="row.orderExceptionNotes" placement="top-start">
+              <div class="clamp3">{{row.orderExceptionNotes}}</div>
+            </el-tooltip>
+          </template>
+        </el-table-column>
         <el-table-column :label="$t('处理人')" align="center" prop="userName" />
         <el-table-column :label="$t('处理时间')" align="center">
           <template slot-scope="scope">
@@ -103,7 +116,7 @@
 
 <script>
 import {getExceptionListByOrderId} from "@/api/ecw/orderException"
-import {DICT_TYPE} from  '@/utils/dict'
+import { getCurrencyList } from '@/api/ecw/currency'
 import {getOrder} from '@/api/ecw/order'
 import FilePreview from '@/components/FilePreview'
 import {getProduct} from '@/api/ecw/product'
@@ -125,9 +138,20 @@ export default {
       timers:"", //时间戳
       FilePreAll:[], // 预览数组
       TragetPic:{},
+      currencyList:[]
     };
   },
+  computed:{
+    currencyMap(){
+        let map = {}
+        this.currencyList.forEach(item => {
+          map[item.id] = this.$l(item, 'title')
+        })
+        return map
+      },
+  },
   created() {
+    getCurrencyList().then(res => this.currencyList = res.data)
     if(this.$route.query.id){
       this.orderId = this.$route.query.id
       this.getList()
@@ -253,4 +277,10 @@ export default {
   .card{
     margin-top: 20px;
   }
+  .clamp3{
+    overflow: hidden; 
+    display: -webkit-box; 
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 3; 
+  }
 </style>

src/views/ecw/order/prepayDeal.vue

@@ -42,7 +42,7 @@
               </el-form-item>
               <el-form-item :label="$t('代收金额')+':'" v-if="orderExceptionData.orderExceptionType == 'order_cod_exception'">
                 <template v-if="orderData && orderData.costVO">
-                  {{orderExceptionData.orderExceptionAmount}} {{currencyMap[orderExceptionData.orderExceptionCurrencyId]}}
+                  {{orderExceptionData.orderExceptionAmount}} {{currencyMap[orderExceptionData.orderExceptionAmountCurrencyId]}}
                 </template>
               </el-form-item>
           </el-row>
@@ -133,10 +133,9 @@
         </el-table-column>
 
         <el-table-column :label="$t('付款人')">
-          <template slot-scope="scope">
+          <template slot-scope="{row}">
             <span>
-              // TODO
-              <!-- <dict-tag :type="DICT_TYPE.DRAWEE" :value="order.drawee"></dict-tag> -->
+              <dict-tag :type="DICT_TYPE.DRAWEE" :value="row.paymentUser"></dict-tag>
             </span>
           </template>
         </el-table-column>
@@ -262,8 +261,22 @@
                   <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-if="handlerParams.orderExceptionHandlerResult == 'cod'" >
+          <el-form-item :label="$t('代收金额')+':'" size="medium" required>
+            <el-input class="w-100"  type="text" v-model="handlerParams.amount"  />
+            <!-- <el-select v-model="handlerParams.currency"  clearable>
+              <el-option  v-for="dict in getDictDatas('shipping_price_unit') "
+                      :key="dict.value" :label="dict.label" :value="dict.value"/>
+            </el-select> -->
+            <dict-tag type="shipping_price_unit" v-model="handlerParams.currency" class="w-100 ml-10"  />
+          </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"  />
@@ -394,6 +407,11 @@
         if(val == 'no_pay'){
           this.showWorkFlow = true
         }else this.showWorkFlow = false
+
+        // 如果是代收货款，则给默认单位
+        if(val == 'cod' && this.orderExceptionData.orderExceptionAmountCurrencyId){
+          this.$set(this.handlerParams, 'currency', this.orderExceptionData.orderExceptionAmountCurrencyId)
+        }
       }
     },
     computed: {

src/views/system/user/index.vue

@@ -156,7 +156,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="12" v-if="hasCustomerServicePost">
             <el-form-item  label="跟单客服">
               <el-select v-model="form.customerServiceId" placeholder="请选择">
                 <el-option v-for="dict in followUpList" :key="parseInt(dict.id)" :label="dict.nickname" :value="parseInt(dict.id)"/>
@@ -383,6 +383,18 @@ export default {
       }
     }
   },
+  computed:{
+    hasCustomerServicePost(){
+      if(!this.form.postIds) return false
+      let has = false
+      this.postOptions.forEach(item => {
+        if(this.form.postIds.indexOf(item.id) > -1 && item.code == 'customer service'){
+          has = true
+        }
+      })
+      return has
+    }
+  },
   created() {
     this.getList();
     this.getTreeselect();
@@ -444,6 +456,7 @@ export default {
     },
     // 节点单击事件
     handleNodeClick(data) {
+      this.queryParams.pageNo = 1
       this.queryParams.deptId = data.id;
       this.getList();
     },