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

src/api/ecw/customer.js

@@ -10,7 +10,14 @@ export function createCustomer(data) {
     data: data
   })
 }
-
+//完善客户
+export function fillupCustomeInfo(data){
+  return request({
+    url:'/ecw/customer/fillup-customer-info',
+    method:'put',
+    data
+  })
+}
 // 更新客户
 export function updateCustomer(data) {
   return request({

src/layout/components/Navbar.vue

@@ -87,9 +87,9 @@ export default {
     }
   },
   created() {
+    this.updateMessage()
     setInterval(() => {
-    this.$store.dispatch('getNotMessage');
-    this.$store.dispatch('getToDoList');
+    this.updateMessage()
     }, 10000)
   },
   components: {
@@ -139,7 +139,10 @@ export default {
     }
   },
   methods: {
-
+    updateMessage(){
+      this.$store.dispatch('getNotMessage');
+      this.$store.dispatch('getToDoList');
+    },
     toggleSideBar() {
       this.$store.dispatch('app/toggleSideBar')
     },

src/router/index.js

@@ -270,6 +270,12 @@ export const constantRoutes = [
         props: true,
         name: 'customerEdit',
         meta: {title: '新建客户', icon: ''}
+      },{
+        path: 'perfect/:customerId(\\d+)',
+        component: (resolve) => import('@/views/ecw/customer/edit'),
+        props: true,
+        name: 'perfect',
+        meta: {title: '完善客户', icon: ''}
       },
       {
         path: 'query/:customerId(\\d+)',

src/views/ecw/customer/edit.vue

@@ -411,7 +411,7 @@ import {
   getCustomerPage, memberUserList,
   updateCustomer,
   userMemberUserList,
-  getCustomerLines
+  getCustomerLines, fillupCustomeInfo
 } from '@/api/ecw/customer'
 import {getNodeList} from "@/api/ecw/node"
 import { getProductTypeList } from '@/api/ecw/productType'
@@ -673,7 +673,14 @@ export default {
             this.form.customerContacts.forEach(e => {
               e.customerId = this.customerId
             })
-
+             if(this.$route.name === 'perfect'){
+               fillupCustomeInfo(form).then(r => {
+                 this.$modal.msgSuccess(this.$t('修改成功'));
+                 this.open = false;
+                 const obj = { path: "/customer/customer" };
+                 this.$tab.closeOpenPage(obj);
+               })
+             }else {
                updateCustomer(form).then(response => {
                  this.$modal.msgSuccess(this.$t('修改成功'));
                  this.open = false;
@@ -681,6 +688,8 @@ export default {
                  const obj = { path: "/customer/customer" };
                  this.$tab.closeOpenPage(obj);
                })
+             }
+
             return;
           }
           // 添加的提交

src/views/ecw/customerConfirm/index.vue

@@ -517,7 +517,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id;
-      this.$router.push('/customer/edit/'+id);
+      this.$router.push('/customer/perfect/'+id);
       // getCustomer(id).then(response => {
       //   this.form = response.data;
       //   this.open = true;

src/views/ecw/financial/payable.vue

@@ -112,6 +112,7 @@
             <dict-selector
               :type="DICT_TYPE.FEE_TYPE"
               v-model="queryParams.feeType"
+              clearable
             ></dict-selector>
           </el-form-item>
           <el-form-item>

src/views/ecw/financial/receiptDetail.vue

@@ -250,7 +250,7 @@
     </el-card>
     <el-card class="card hexiaoCard">
       <el-descriptions :column="3" border>
-        <el-descriptions-item :label="$t('已核销总金额')">
+        <el-descriptions-item :label="$t('已核销实收总金额')">
           <!-- <el-tag>{{ verificationData.usCount.toFixed(6) }}{{$t('美元')}}</el-tag>
           <el-tag>{{ verificationData.rmbCount.toFixed(6) }}{{$t('人民币')}}</el-tag>
           <el-tag>{{ verificationData.nairaCount.toFixed(6) }}{{$t('奈拉')}}</el-tag> -->
@@ -265,13 +265,13 @@
         </el-descriptions-item>
         <el-descriptions-item>
           <template slot="label">
-            {{ $t('核销基准金额') }}（{{getCurrencyLabel(showCurrencyId)}}）
+            {{ $t('已核销基准币种总金额') }}（{{getCurrencyLabel(showCurrencyId)}}）
           </template>
           {{ writeOffAmount}}
         </el-descriptions-item>
         <el-descriptions-item>
           <template slot="label">
-            {{ $t('已核销比例') }}（{{getCurrencyLabel(showCurrencyId)}}）
+            {{ $t('已核销比例\n（已核销基准币种总金额/应收总金额）') }}（{{getCurrencyLabel(showCurrencyId)}}）
           </template>
           {{ WriteOffProportion }}%
         </el-descriptions-item>

src/views/ecw/offer/components/Commossion.vue

@@ -79,6 +79,8 @@
       <el-button type="primary" @click="$router.push('/bpm/process-instance/detail?id=' + form.formId)">
         <dict-tag :type="DICT_TYPE.APPLY_STATUS" :value="form.applyStatus" />
       </el-button>
+      <el-button type="primary" @click="cancelAudit">取消审核</el-button>
+      <el-button type="default" @click="closeDialog">返回</el-button>
     </div>
   </el-dialog>
 </template>
@@ -93,6 +95,8 @@ import { getCurrencyList } from '@/api/ecw/currency'
 import { getProductTypeList } from '@/api/ecw/productType'
 import WorkFlow from '@/components/WorkFlow'
 import {getDarkReturnCommission} from '@/api/ecw/customerCommission'
+import {cancelProcessInstance} from '@/api/bpm/processInstance'
+const TYPE = 3
 export default {
   name: "Commossion",
   props: {
@@ -124,7 +128,7 @@ export default {
       productTypeList:[],
       ccIdArr: [],
       form: {
-        type: 2
+        type: TYPE
       },
       rules:{
         commissionType      : {required: true, message: '请选择佣金类型'},
@@ -193,14 +197,14 @@ export default {
         createOfferSpecial(Object.assign({
           clearanceFreight: this.form.orgClearanceFreight,
           seaFreight: this.form.orgSeaFreight
-        }, this.form, {type: 2})).then(res => {
+        }, this.form, {type: TYPE})).then(res => {
           this.$message.success(this.$t('提交成功'))
           this.$emit('success')
         })
       })
     },
     getOfferSpecial(){
-      getOfferSpecial(this.offerProd.offerProdId, {type: 2}).then(r => {
+      getOfferSpecial(this.offerProd.offerProdId, {type: TYPE}).then(r => {
         this.form = r.data
       })
     },
@@ -221,11 +225,25 @@ export default {
           productAttr: this.offerProd.prodAttrIds.split(',').filter(item => item && item != ''),
           productType: this.offerProd.productType,
           transportId: this.offer.transportId,
-          type: 2, // 暗佣
+          type: 2, 
         }).then(res => {
           this.darkCommission = res.data?.darkCommission
         })
-    }
+    },
+    cancelAudit(){
+      this.$prompt(this.$t('请输入取消原因？'), this.$t("取消审批"), {
+        type: 'warning',
+        confirmButtonText: this.$t("确定"),
+        cancelButtonText: this.$t("取消"),
+        inputPattern: /^[\s\S]*.*[^\s][\s\S]*$/, // 判断非空，且非空格
+        inputErrorMessage: this.$t("取消原因不能为空"),
+      }).then(({ value }) => {
+        return cancelProcessInstance(this.form.formId, value);
+      }).then(() => {
+        this.$modal.msgSuccess(this.$t("取消成功"));
+        this.closeDialog()
+      })
+    },
   }
 }
 </script>

src/views/ecw/offer/components/SpecialDiscount.vue

@@ -62,6 +62,8 @@
       <el-button type="primary" @click="$router.push('/bpm/process-instance/detail?id=' + form.formId)">
         <dict-tag :type="DICT_TYPE.APPLY_STATUS" :value="form.applyStatus" />
       </el-button>
+      <el-button type="primary" @click="cancelAudit">取消审核</el-button>
+      <el-button type="default" @click="closeDialog">返回</el-button>
     </div>
   </el-dialog>
 </template>
@@ -75,6 +77,8 @@ import {getChannelList} from "@/api/ecw/channel"
 import { getCurrencyList } from '@/api/ecw/currency'
 import { getProductTypeList } from '@/api/ecw/productType'
 import WorkFlow from '@/components/WorkFlow'
+import {cancelProcessInstance} from '@/api/bpm/processInstance'
+
 export default {
   name: "specialDiscount",
   props: {
@@ -139,7 +143,21 @@ export default {
     },
     closeDialog(){
       this.$emit('close')
-    }
+    },
+    cancelAudit(){
+      this.$prompt(this.$t('请输入取消原因？'), this.$t("取消审批"), {
+        type: 'warning',
+        confirmButtonText: this.$t("确定"),
+        cancelButtonText: this.$t("取消"),
+        inputPattern: /^[\s\S]*.*[^\s][\s\S]*$/, // 判断非空，且非空格
+        inputErrorMessage: this.$t("取消原因不能为空"),
+      }).then(({ value }) => {
+        return cancelProcessInstance(this.form.formId, value);
+      }).then(() => {
+        this.$modal.msgSuccess(this.$t("取消成功"));
+        this.closeDialog()
+      })
+    },
   },
   computed: {
     // 是否可以提交

src/views/ecw/order/addAssociatedOrder.vue

@@ -31,7 +31,7 @@
             {{row.costVO.totalVolume}}m³
             {{row.costVO.totalWeight}}kg
           </div> <div  v-else>
-            箱数：{{row.sumQuantity}}
+            箱数：{{row.sumNum}}
             {{row.sumVolume}}m³
             {{row.sumWeight}}kg
           </div>
@@ -45,7 +45,6 @@
       <el-table-column :label="$t('状态')">
         <template v-slot:default="scope">
           <dict-tag :value="scope.row.status" :type="DICT_TYPE.ORDER_STATUS"></dict-tag>
-          {{scope.row.status}}
         </template>
       </el-table-column>
       <el-table-column :label="$t('操作')">

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

@@ -2,7 +2,7 @@
 <template>
     <div v-if="order">
         <el-descriptions :column="3">
-            <el-descriptions-item label="订单号">{{detail.orderNo}}</el-descriptions-item>
+            <el-descriptions-item label="订单号">{{order.orderNo}}</el-descriptions-item>
             <el-descriptions-item label="运输方式">
                 <dict-tag :type="DICT_TYPE.TRANSPORT_TYPE" :value="order.transportId" />
             </el-descriptions-item>
@@ -28,7 +28,7 @@
             
             <!-- 调货 -->
             <el-descriptions-item label="申请原因" v-if="applyType == 9">
-                {{detail.reason}}
+                {{$l(detail, 'reason')}}
             </el-descriptions-item>
 
             <!-- 取消放货 -->

src/views/ecw/order/index.vue

@@ -238,7 +238,7 @@
                 </template>
 
                 <!-- 合单，拆单 -->
-                <template v-if=" (scope.row.status < 12 || (scope.row.status == 12 && scope.row.shipmentState == 314)) && !scope.row.abnormalState">
+                <template v-if=" (scope.row.status < 12 || (scope.row.status == 12 && scope.row.shipmentState == 314)) && !scope.row.abnormalState && scope.row.status">
                   <el-dropdown-item @click.native="$router.push(`/order/singleApply?orderNo=${scope.row.orderNo}`)" >{{$t('合单申请')}}</el-dropdown-item>
                   <el-dropdown-item @click.native="$router.push(`/order/splitApply?orderId=${scope.row.orderId}`)"  >{{$t('拆单申请')}}</el-dropdown-item>
                 </template>

src/views/ecw/order/special/Commission.vue

@@ -58,7 +58,7 @@
 
         <!-- 明佣+暗佣显示 -->
         <div v-if="form.commissionType == 3">
-          {{$t('成本价')}}：{{Decimal(form.freight).minus(form.shadeCommissionAmount)}} {{ currencyMap[form.freightCurrency] }} / {{ unitMap[form.freightVolume] }}
+          {{$t('成本价')}}：{{Decimal(form.freight || orderItem.oneSeaFreight).minus(form.shadeCommissionAmount)}} {{ currencyMap[form.freightCurrency] }} / {{ unitMap[form.freightVolume] }}
         </div>
         
         <!-- 暗佣显示 -->
@@ -70,7 +70,7 @@
           <el-link type="primary" @click.native="$router.push('/customer/customerCommission?customerId=' + order.customerId)">{{$t('去设置')}}</el-link>
         </div>
 
-        <div  v-if="form.commissionType == 1 || form.commissionType == 3">{{$t('销售价')}}：{{Decimal(form.freight).plus(form.lightCommissionAmount) }} {{ currencyMap[form.freightCurrency] }} / {{ unitMap[form.freightVolume] }}</div>
+        <div  v-if="form.commissionType == 1 || form.commissionType == 3">{{$t('销售价')}}：{{Decimal(form.freight || orderItem.oneSeaFreight).plus(form.lightCommissionAmount) }} {{ currencyMap[form.freightCurrency] }} / {{ unitMap[form.freightVolume] }}</div>
         <div v-if="form.commissionType == 3">{{$t('实际佣金返点')}}：{{form.shadeCommissionAmount + form.lightCommissionAmount }} {{ currencyMap[form.freightCurrency] }} / {{ unitMap[form.freightVolume] }}</div>
       </div>
       
@@ -84,6 +84,8 @@
       <el-button type="primary" @click="$router.push('/bpm/process-instance/detail?id=' + form.formId)">
         <dict-tag :type="DICT_TYPE.APPLY_STATUS" :value="form.applyStatus" />
       </el-button>
+      <el-button type="primary" @click="cancelAudit">取消审核</el-button>
+      <el-button type="default" @click="closeDialog">返回</el-button>
     </div>
   </el-dialog>
 </template>
@@ -97,7 +99,7 @@ import { getProductType } from '@/api/ecw/productType'
 import WorkFlow from '@/components/WorkFlow'
 import {getDarkReturnCommission} from '@/api/ecw/customerCommission'
 import Decimal from 'decimal.js'
-
+import {cancelProcessInstance} from '@/api/bpm/processInstance'
 export default {
   name: "OrderSpecialCommission",
   props: {
@@ -160,6 +162,7 @@ export default {
   },
   methods: {
     Decimal(n){
+      if(!n) return Decimal
       return new Decimal(n)
     },
     handleSubmit(){
@@ -196,7 +199,21 @@ export default {
         }).then(res => {
           this.darkCommission = res.data?.darkCommission
         })
-    }
+    },
+    cancelAudit(){
+      this.$prompt(this.$t('请输入取消原因？'), this.$t("取消审批"), {
+        type: 'warning',
+        confirmButtonText: this.$t("确定"),
+        cancelButtonText: this.$t("取消"),
+        inputPattern: /^[\s\S]*.*[^\s][\s\S]*$/, // 判断非空，且非空格
+        inputErrorMessage: this.$t("取消原因不能为空"),
+      }).then(({ value }) => {
+        return cancelProcessInstance(this.form.formId, value);
+      }).then(() => {
+        this.$modal.msgSuccess(this.$t("取消成功"));
+        this.closeDialog()
+      })
+    },
   },
   computed: {
     // 是否可以提交

src/views/ecw/order/special/Discount.vue

@@ -64,6 +64,8 @@
       <el-button type="primary" @click="$router.push('/bpm/process-instance/detail?id=' + form.formId)">
         <dict-tag :type="DICT_TYPE.APPLY_STATUS" :value="form.applyStatus" />
       </el-button>
+      <el-button type="primary" @click="cancelAudit">取消审核</el-button>
+      <el-button type="default" @click="closeDialog">返回</el-button>
     </div>
   </el-dialog>
 </template>
@@ -74,7 +76,9 @@ import {getUnitList} from "@/api/ecw/unit"
 import {getChannel, getChannelList} from "@/api/ecw/channel"
 import { getCurrencyList } from '@/api/ecw/currency'
 import { getProductType } from '@/api/ecw/productType'
+import {cancelProcessInstance} from '@/api/bpm/processInstance'
 import WorkFlow from '@/components/WorkFlow'
+
 export default {
   name: "OrderSpecialDiscount",
   props: {
@@ -114,7 +118,7 @@ export default {
       ccIdArr: [],
       form: { },
       rules:{
-        seaFreight      : {required: true, message: '运费不能为空'},
+        freight      : {required: true, message: '运费不能为空'},
         clearanceFreight: {required: true, message: '清关费不能为空'}
       },
       productType: null,
@@ -143,6 +147,20 @@ export default {
     /* getProductTypeNameById(id){
       return this.$l(this.productTypeList.find(e => e.id === id), 'title')
     }, */
+    cancelAudit(){
+      this.$prompt(this.$t('请输入取消原因？'), this.$t("取消审批"), {
+        type: 'warning',
+        confirmButtonText: this.$t("确定"),
+        cancelButtonText: this.$t("取消"),
+        inputPattern: /^[\s\S]*.*[^\s][\s\S]*$/, // 判断非空，且非空格
+        inputErrorMessage: this.$t("取消原因不能为空"),
+      }).then(({ value }) => {
+        return cancelProcessInstance(this.form.formId, value);
+      }).then(() => {
+        this.$modal.msgSuccess(this.$t("取消成功"));
+        this.closeDialog()
+      })
+    },
     closeDialog(){
       this.$emit('close')
     }
@@ -151,6 +169,9 @@ export default {
     // 是否可以提交
     submitable(){
       let submitable = false;
+      if(!this.form.freight || !this.form.clearanceFreight){
+        return false
+      }
       [
         ['orgClearanceFreight', 'clearanceFreight'],
         ['orgFreight', 'freight']

src/views/ecw/order/special/Preferential.vue

@@ -29,6 +29,9 @@
       <el-button type="primary" @click="$router.push('/bpm/process-instance/detail?id=' + form.formId)">
         <dict-tag :type="DICT_TYPE.APPLY_STATUS" :value="form.applyStatus" />
       </el-button>
+      
+      <el-button type="primary" @click="cancelAudit">取消审核</el-button>
+      <el-button type="default" @click="closeDialog">返回</el-button>
     </div>
   </el-dialog>
 </template>
@@ -40,6 +43,8 @@ import {getChannel, getChannelList} from "@/api/ecw/channel"
 import { getCurrencyList } from '@/api/ecw/currency'
 import { getProductType } from '@/api/ecw/productType'
 import WorkFlow from '@/components/WorkFlow'
+import {cancelProcessInstance} from '@/api/bpm/processInstance'
+
 export default {
   name: "OrderSpecialDiscount",
   props: {
@@ -93,7 +98,21 @@ export default {
     },
     closeDialog(){
       this.$emit('close')
-    }
+    },
+    cancelAudit(){
+      this.$prompt(this.$t('请输入取消原因？'), this.$t("取消审批"), {
+        type: 'warning',
+        confirmButtonText: this.$t("确定"),
+        cancelButtonText: this.$t("取消"),
+        inputPattern: /^[\s\S]*.*[^\s][\s\S]*$/, // 判断非空，且非空格
+        inputErrorMessage: this.$t("取消原因不能为空"),
+      }).then(({ value }) => {
+        return cancelProcessInstance(this.form.formId, value);
+      }).then(() => {
+        this.$modal.msgSuccess(this.$t("取消成功"));
+        this.closeDialog()
+      })
+    },
   }
 }
 </script>

src/views/ecw/order/transferWarehousing.vue

@@ -50,7 +50,7 @@
       {{$t('调仓明细')}}
     </el-divider>
     <el-table :data="warehouseList" v-if="type == 2">
-      <el-table-column :label="$t('调仓编号')" prop="id"></el-table-column>
+      <el-table-column :label="$t('调仓编号')" type="index" ></el-table-column>
       <el-table-column :label="$t('调出仓库')" prop="warehouseOutName" ></el-table-column>
       <el-table-column :label="$t('调入仓库')" prop="warehouseInName"></el-table-column>
       <el-table-column :label="$t('申请人')" prop="creatorName"></el-table-column>
@@ -332,7 +332,7 @@ export default {
       warehouseAdjustSendOut(this.exWarehouse).then(
         r => {
           if(r.code === 0){
-            this.$message.success(this.$t('调拨出仓成功'));
+            this.$message.success(this.$t('调拨出仓成功！'));
             this.$tab.closeOpenPage({path:'/order/order'})
           }
         }
@@ -341,7 +341,7 @@ export default {
     submit2(val){
       warehouseAdjustArrived(val ? this.toWarehouse : this.toWarehouseAbnormal).then(r => {
           if(r.code === 0){
-            this.$message.success(this.$t('调到仓成功'));
+            this.$message.success(this.$t('调拨到仓成功！'));
             this.$tab.closeOpenPage({path:'/order/order'})
           }
       })