Merge branch 'release' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into release

src/api/ecw/customerContacts.js

@@ -71,9 +71,13 @@ export function exportCustomerContactsExcel(query) {
 
 // 根据客户ID获得联系人列表
 export function getCustomerContactsListByCustomer(query) {
-  return request({
-    url: '/ecw/customer-contacts/list-by-customer',
-    method: 'get',
-    params: query
-  })
+  if(query.customerId){
+    return request({
+      url: '/ecw/customer-contacts/list-by-customer',
+      method: 'get',
+      params: query
+    })
+  }else {
+    return Promise.resolve()
+  }
 }

src/components/AreaCodeSelector/index.vue

@@ -21,7 +21,7 @@ export default {
             this.$emit('input', this.valueSync.replace('+', ''))
         },
         value(){
-            if(this.value)this.valueSync = this.value
+            this.valueSync = this.value
         }
     },
     created(){
@@ -39,4 +39,4 @@ export default {
 
     }
 }
-</script>
\ No newline at end of file
+</script>

src/components/CustomerFollow/index.vue

@@ -171,7 +171,7 @@ export default {
       this.customerFollow.form.bizId = this.id
     })
     listServiceUser().then(r => {
-      console.log( r.data,'r.data跟进业务')
+      // console.log( r.data,'r.data跟进业务')
       this.serviceUserList = r.data
     })
     this.getCustomerFollowList()

src/utils/dict.js

@@ -119,6 +119,7 @@ export const DICT_TYPE = {
   ECW_CUSTOMER_RESOURCE_TYPE: 'customer_resource_type', // 客户资源类型
   ECW_CUSTOMER_TRANSPORT_TYPE: 'customer_transport_type', // 客户出货渠道（跟运输方式相同，但是显示全部）
   ECW_ORDER_APPROVAL_TYPE: 'order_approval_type', // 订单相关审批类型
+  ECW_FEE_SOURCE: 'fee_source', // 费用来源
   //--------ecw---------
   CUSTOMER_STATUS: 'customer_status',
   CUSTOMER_SOURCE: 'customer_source',

src/views/chat.vue

 <template>
-    <iframe src="https://chat.groupage.cn/" class="iframe"></iframe>
+    <iframe :src="url" class="iframe"></iframe>
 </template>
 <style>
     .iframe{
@@ -8,3 +8,24 @@
         border: none;
     }
 </style>
+<script>
+import {getUserProfile} from "@/api/system/user";
+
+export default {
+  data() {
+    return {
+      username: ''
+    }
+  },
+  computed:{
+    url(){
+      return 'https://chatgpt.groupage.cn/#/' + this.username
+    }
+  },
+  created() {
+    getUserProfile().then(res => {
+      this.username = res.data.username
+    })
+  }
+}
+</script>

src/views/ecw/customer/edit.vue

@@ -587,9 +587,10 @@ export default {
     this.reset()
     // this.getUserMemberUserFn()
     if(this.customerId !== '0') {
+      let customerId = this.customerId
       // 编辑客户
       this.getCustomer(this.customerId).then(() => {
-        getCustomerContactsListByCustomer({customerId: this.customerId}).then(r => {
+        getCustomerContactsListByCustomer({customerId: customerId}).then(r => {
           this.form.customerContacts = r.data
           let list = this.form.customerContacts.map(item => item.userid);
           if(list.length >0){
@@ -604,16 +605,15 @@ export default {
          }
         })
 
-        // 打开重泡货开关
-        if(this.form.weightUnit){
-          this.showZhong = true
-        }
-        if(this.form.lightUnit){
-          this.showPao = true
-        }
-
+          // 打开重泡货开关
+          if(this.form.weightUnit){
+            this.showZhong = true
+          }
+          if(this.form.lightUnit){
+            this.showPao = true
+          }
         // 获取重泡货路线
-        getCustomerLines(this.customerId).then(res => {
+        getCustomerLines(customerId).then(res => {
           this.zhongLines = res.data.filter(item => item.zhongPaoType == 1)
           this.paoLines = res.data.filter(item => item.zhongPaoType == 2)
           if(this.zhongLines.length)this.showZhong1 = true

src/views/ecw/order/associatedOrder.vue

@@ -20,7 +20,7 @@
        {{$t('已加入关联订单列表')}}
      </h1>
        <div style="flex: 1;margin-left: 20px;">
-         <el-button :disabled="multipleSelection.length === 0" type="primary" @click="batchGuanlianOrderByOrderId(multipleSelection.map(e =>({orderId:orderId,relateOrderId:e.orderId})))" >{{$t('批量移出')}}</el-button>
+         <el-button :disabled="multipleSelection.length === 0" type="primary" @click="batchGuanlianOrderByOrderId(multipleSelection.map(e =>({orderId:e.orderId,relateOrderId:e.relateOrderId})))" >{{$t('批量移出')}}</el-button>
        </div>
      <div>
         <el-button type="primary" @click="$router.push(`/order/add-associated-order/${orderId}`)">{{$t('添加关联订单')}}</el-button>
@@ -69,7 +69,7 @@
      </el-table-column>
      <el-table-column :label="$t('操作')">
        <template v-slot:default='scope'>
-         <el-button type="text"  @click ="guanlianOrderByOrderId(scope.row.orderId)">
+         <el-button type="text"  @click ="guanlianOrderByOrderId({orderId:scope.row.orderId,relateOrderId:scope.row.relateOrderId})">
            {{$t('移出')}}
          </el-button>
        </template>
@@ -147,8 +147,8 @@ export default {
         }
       })
     },
-    guanlianOrderByOrderId(id){
-      deleteGuanlianOrderByOrderId({orderId:this.orderId,relateOrderId:id}).then(r =>{
+    guanlianOrderByOrderId(params){
+      deleteGuanlianOrderByOrderId(params).then(r =>{
         if(r.code === 0){
           this.getList()
           this.$message.success(this.$t('操作成功'));

src/views/ecw/order/detail.vue

@@ -250,7 +250,11 @@
         </el-tab-pane>
         <el-tab-pane :label="$t('费用明细')" name="four">
           <el-table :data="feeList">
-            <el-table-column :label="$t('订单号')" prop="orderNo"></el-table-column>
+            <el-table-column :label="$t('订单号')" prop="orderNo">
+              <template slot-scope="{row}">
+                {{row.orderNo}}
+              </template>
+            </el-table-column>
             <el-table-column :label="$t('运输方式')">
               <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="order.transportId" />
             </el-table-column>
@@ -269,6 +273,11 @@
                 {{$l(row, 'title')}}
               </template>
             </el-table-column>
+            <el-table-column :label="$t('费用来源')" prop="feeSource">
+              <template slot-scope="{row}">
+                <dict-tag :type="DICT_TYPE.ECW_FEE_SOURCE" :value="row.feeSource" />
+              </template>
+            </el-table-column>
             <el-table-column :label="$t('箱数')" prop="num">
               <template slot-scope="{row}">
                 {{row.num || '-'}}

src/views/ecw/order/edit.vue

@@ -552,7 +552,19 @@ import WorkFlow from '@/components/WorkFlow'
 import { getCustomer } from "@/api/ecw/customer";
 
 // 缓存默认的表单数据
-let defaultFormData = null
+let makeDefaultFormData = () => {
+  return {
+    status:0,
+    sendstatus:0,
+    isCargoControl: false,
+    isCollection: false,
+    type:[],
+    isExternalWarehouse: false,
+    externalWarehouseDtoList:[],
+    orderItemVOList:[],
+    drawee: 2
+  }
+}
 window.Decimal = Decimal
 
 export default {
@@ -592,17 +604,7 @@ export default {
       couponTypeList: [],
       fee: {}, // 费用
       // 表单参数
-      form: {
-        status:0,
-        sendstatus:0,
-        isCargoControl: false,
-        isCollection: false,
-        type:[],
-        isExternalWarehouse: false,
-        externalWarehouseDtoList:[],
-        orderItemVOList:[],
-        drawee: 2
-      },
+      form: makeDefaultFormData(),
       ccIdArr: [],
       // 表单校验
       labelStyle: 'width:120px',
@@ -888,7 +890,6 @@ export default {
     }
   },
   async created() {
-    defaultFormData = Object.assign({}, this.form)
 
     this.productAttrList = (await getProductAttrList()).data
     this.channelList = (await getChannelList()).data
@@ -1056,7 +1057,7 @@ export default {
     // 检查正整数
     checkPositiveInterge(row, field){
         console.log('checkPositiveInterge', field, row[field])
-        row[field] = row[field].replace(/[^\d]/g, '')
+        row[field] = row[field].toString().replace(/[^\d]/g, '')
     },
     onProductChange(row, product){
         console.log(product)
@@ -1103,6 +1104,8 @@ export default {
         if(this.form.transportId){
             params.transportType = this.form.transportId
         }
+        // 始发，目的和运输方式都没有的时候不获取
+        if(!params.startCityId && !params.destCityId && !params.transportType) return false
         getOpenedRouterList(params).then(res => this.routerList = res.data.filter(item => {
             return this.exportCityIds.indexOf(item.startCityId) > -1 && this.importCityIds.indexOf(item.destCityId) > -1
         }))
@@ -1194,10 +1197,15 @@ export default {
           this.$modal.msgSuccess(this.$t("新增成功"));
 
           // 重置数据
-          this.form = {...defaultFormData}
-          this.$refs.form.clearValidate()
+          this.form = {...makeDefaultFormData()}
+          this.routerList = []
+          this.addProduct()
+          this.$nextTick(() =>{
+            this.$refs.form.clearValidate()
+            this.$redirect('success?orderId=' + response.data)
+          })
+
 
-          this.$redirect('success?orderId=' + response.data)
         });
       });
     },