bugs

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

@@ -72,7 +72,7 @@
     </el-form>
     
 
-    <div v-if="!form.applyStatus">
+    <div v-if="form.applyStatus != 1">
       <el-button type="primary" @click="handleSubmit">提交</el-button>
     </div>
     <div v-else>

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

@@ -55,7 +55,7 @@
     </el-form>
     <div class="page-title">审批流程</div>
     <work-flow xmlkey="sheet_sale" v-model="ccIdArr" />
-    <div v-if="!form.applyStatus">
+    <div v-if="form.applyStatus != 1">
       <el-button type="primary" @click="handleSubmit">提交</el-button>
     </div>
     <div v-else>

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

@@ -106,6 +106,7 @@ import {createPick, getReleaseInfo} from '@/api/ecw/orderCargoControl'
 import AreaCodeSelector from '@/components/AreaCodeSelector'
 import SendSmsCode from '@/views/ecw/order/components/SendSmsCode'
 import NeedKnow from '@/components/NeedKnow'
+import Decimal from 'decimal.js'
 export default {
     props:{
         orderId: [String, Number]
@@ -125,6 +126,12 @@ export default {
             agreement: false, // 是否同意协议
         }
     },
+    watch:{
+      'formData.pickNum'(pickNum){
+        this.$set(this.formData, 'pickVolume', Decimal(this.detail.sumVolume).mul(pickNum).div(this.detail.sumNum).toFixed(2))
+        this.$set(this.formData, 'pickWeight', Decimal(this.detail.sumWeight).mul(pickNum).div(this.detail.sumNum).toFixed(2))
+      }
+    },
     computed:{
         rules(){
           return {
@@ -161,8 +168,8 @@ export default {
             })
         },
         closeDialog(){
-            this.show = false
-            this.$emit('close');
+          this.show = false
+          this.$emit('close')
         },
         submit(){
           this.$refs.form.validate(valid => {

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

@@ -137,6 +137,9 @@ export default {
         loadData(){
           getReleaseInfo(this.orderId).then(res => this.detail = res.data)
           seasoningCondimentsSelect({orderId: this.orderId}).then(res => {
+            res.data.forEach(item => {
+              item.releaseNum = item.sumNum - item.releaseNum
+            })
             this.orders = res.data
           })
         },

src/views/ecw/order/detail.vue

@@ -74,10 +74,10 @@
               {{order.sumQuantity}}{{$t('个')}} 
             </el-descriptions-item>
             <el-descriptions-item :label="$t('收款数据')">
-              {{order.entryNum}}{{$t('箱')}}
-              {{order.entryWeight}}Kg
-              {{order.entryVolume}}m³
-              {{order.entryQuantity}}{{$t('个')}}
+              {{order.sumNum}}{{$t('箱')}}
+              {{order.vweight}}Kg
+              {{order.wvolume}}m³
+              {{order.sumQuantity}}{{$t('个')}}
             </el-descriptions-item>
             <el-descriptions-item :label="$t('入仓类型')">
               <dict-tag :type="DICT_TYPE.ECW_WAREHOUSING_TYPE" :value="order.warehouseType" />

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

@@ -22,18 +22,18 @@
       <el-row v-if="!orderItem.charging">
         <el-col :span="12">
           <el-form-item :label="$t('运费')">
-            {{form.oneSeaFreight}} {{ currencyMap[orderItem.seaFreightCurrency] }} / {{ unitMap[orderItem.seaFreightVolume] }}
+            {{orderItem.oneSeaFreight}} {{ currencyMap[orderItem.seaFreightCurrency] }} / {{ unitMap[orderItem.seaFreightVolume] }}
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item :label="$t('清关费')">
-            {{form.oneClearanceFreight}} {{ currencyMap[form.clearanceFreightCurrency] }} / {{ unitMap[form.clearanceFreightVolume] }}
+            {{orderItem.oneClearanceFreight}} {{ currencyMap[orderItem.clearanceFreightCurrency] }} / {{ unitMap[orderItem.clearanceFreightVolume] }}
           </el-form-item>
         </el-col>
       </el-row>
       
       <el-form-item :label="$t('全包价')" v-if="orderItem.charging">
-        {{orderItem.oneSeaFreight}} {{ currencyMap[form.freightCurrency] }} / {{ unitMap[orderItem.seaFreightVolume] }}
+        {{orderItem.oneSeaFreight}} {{ currencyMap[orderItem.seaFreightCurrency] }} / {{ unitMap[orderItem.seaFreightVolume] }}
       </el-form-item>
 
       <el-form-item :label="$t('佣金类型')" prop="commissionType">
@@ -49,7 +49,7 @@
       <!-- 明佣+暗佣才显示 -->
       <el-form-item label="暗佣佣金" v-if="form.commissionType == 3">
         <el-input v-model.number="form.shadeCommissionAmount" placeholder="" class="w-100"></el-input>
-        {{ currencyMap[form.freightCurrency] }} / {{ unitMap[form.freightVolume] }}
+        {{ currencyMap[orderItem.seaFreightCurrency] }} / {{ unitMap[orderItem.seaFreightVolume] }}
       </el-form-item>
 
       <!-- 无佣金不显示 -->
@@ -58,7 +58,7 @@
 
         <!-- 明佣+暗佣显示 -->
         <div v-if="form.commissionType == 3">
-          {{$t('成本价')}}：{{form.freight}} {{ currencyMap[form.freightCurrency] }} / {{ unitMap[form.freightVolume] }}
+          {{$t('成本价')}}：{{Decimal(form.freight).minus(form.shadeCommissionAmount)}} {{ currencyMap[form.freightCurrency] }} / {{ unitMap[form.freightVolume] }}
         </div>
         
         <!-- 暗佣显示 -->
@@ -70,14 +70,14 @@
           <el-link type="primary" @click.native="$router.push('/customer/customerCommission?customerId=' + customerId)">{{$t('去设置')}}</el-link>
         </div>
 
-        <div  v-if="form.commissionType == 1 || form.commissionType == 3">{{$t('销售价')}}：{{form.freight + form.shadeCommissionAmount + form.lightCommissionAmount }} {{ currencyMap[form.freightCurrency] }} / {{ unitMap[form.freightVolume] }}</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 == 3">{{$t('实际佣金返点')}}：{{form.shadeCommissionAmount + form.lightCommissionAmount }} {{ currencyMap[form.freightCurrency] }} / {{ unitMap[form.freightVolume] }}</div>
       </div>
       
     </el-form>
     <div class="page-title">审批流程</div>
     <work-flow xmlkey="commission_config" v-model="ccIdArr" />
-    <div v-if="!form.applyStatus">
+    <div v-if="form.applyStatus != 1">
       <el-button type="primary" @click="handleSubmit">提交</el-button>
     </div>
     <div v-else>
@@ -96,6 +96,7 @@ import { getCurrencyList } from '@/api/ecw/currency'
 import { getProductType } from '@/api/ecw/productType'
 import WorkFlow from '@/components/WorkFlow'
 import {getDarkReturnCommission} from '@/api/ecw/customerCommission'
+import Decimal from 'decimal.js'
 
 export default {
   name: "OrderSpecialCommission",
@@ -158,6 +159,9 @@ export default {
     }
   },
   methods: {
+    Decimal(n){
+      return new Decimal(n)
+    },
     handleSubmit(){
       this.$refs.form.validate().then(res => {
         createOrderSpecial(Object.assign({}, this.form, {applyType: this.applyType})).then(res => {

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

@@ -57,7 +57,7 @@
     </el-form>
     <div class="page-title">审批流程</div>
     <work-flow xmlkey="special_apply" v-model="ccIdArr" />
-    <div v-if="!form.applyStatus">
+    <div v-if="form.applyStatus != 1">
       <el-button type="primary" @click="handleSubmit">提交</el-button>
     </div>
     <div v-else>

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

-<template>
-  <div class="app-container">
-    <!-- 搜索工作栏 -->
-    <el-card>
-        <div slot="header" class="card-title">{{$t('申请泡货优惠')}}-{{queryParams.orderNo||''}}</div>
-        <el-form :model="queryParams" ref="queryForms" size="small" :inline="true"  label-width="120px" class="card">
-          <el-row >
-              <el-form-item :label="$t('原泡货标准:')" label-width="150px">
-                  <span>{{queryParams.orgVWeight}}kg/cbm</span>
-              </el-form-item>
-          </el-row>
-          <el-row :span="8" >
-             <el-form-item :label="$t('现泡货申请标准:')" size="medium" label-width="150px" required>
-               <el-input style="width: 100px;"  type="text" v-model="queryParams.vweight"  />
-                <span style="margin-left: 10px;">kg/cbm</span>
-             </el-form-item>
-          </el-row>
-          <el-row :span="8">
-             <el-form-item :label="$t('备注:')" size="medium" label-width="150px">
-               <el-input style="width: 500px;"  type="textarea" v-model="queryParams.remarks"  />
-             </el-form-item>
-          </el-row>
-        </el-form>
-    </el-card>
-    <work-flow xmlkey="heavy_goods_discount" v-model="selectedUsers" style="margin-top: 20px;"></work-flow>
-    <div slot="footer" class="card footer_btn">
-        <el-button v-if="queryParams.applyStatus==0" type="primary" @click="submitForm">{{$t('提交')}}</el-button>
-        <el-button v-if="queryParams.applyStatus==0" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('取消')}}</el-button>
-       <el-button v-if="queryParams.applyStatus==1" type="primary" @click="$router.push(`/bpm/process-instance/detail?id=`+queryParams.formId)">{{$t('审核中')}}</el-button>
-       <el-button v-if="queryParams.applyStatus==1" plain type="primary" @click="dialogVisible = true">{{$t('取消审核')}}</el-button>
-       <el-button v-if="queryParams.applyStatus==1" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('返回')}}</el-button>
-    </div>
-    <el-dialog
-      :title="$t('提示')"
-      :visible.sync="dialogVisible"
-      width="30%">
-      <span class="cancel_notice">{{$t('申请泡货优惠正在审核中，你确定取消申请泡货优惠吗？')}}</span>
-      <div class="cancel_content">
-        <span>{{$t('取消原因')}}：</span>
-        <el-input v-model="reason" :placeholder="$t('请输入取消原因')"></el-input>
-      </div>
-
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible = false">{{$t('取消')}}</el-button>
-        <el-button type="primary" @click="cancelSplit">{{$t('确定')}}</el-button>
-      </span>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import {getDictData, getDictDatas,DICT_TYPE} from '@/utils/dict'
-import WorkFlow from '@/components/WorkFlow'
-import {getOrderSpecial,createOrderSpecial,cancelOrderSpecial} from '@/api/ecw/order'
-
-export default {
-  name: "specialLight",
-  components: {
-    WorkFlow
-  },
-  props: {
-    orderId: [String, Number]
-  },
-  data() {
-    return {
-      reason:'',
-      dialogVisible:false,
-      loading:false,
-      queryParams:{
-        orderId:7,
-        lang:0
-      },
-      selectedUsers:[],
-      orderData:{},
-    };
-  },
-  created() {
-    if (this.orderId) {
-      this.queryParams.orderId = this.orderId
-      this.getOrderSpecialData()
-    }
-    // this.getList()
-  },
-  computed:{
-    getDictData(){
-        return (type, value) => getDictData(type, value) || {}
-    },
-    getDictDatas(){
-        return getDictDatas
-    }
-  },
-  methods: {
-   getOrderSpecialData(){
-     getOrderSpecial(this.queryParams.orderId,5).then(r => {
-       this.queryParams = r.data
-     })
-   },
-    submitForm(){
-      this.queryParams.applyType = 5
-      this.queryParams.ccIds = this.selectedUsers.join(',')
-     createOrderSpecial(this.queryParams).then(r => {
-        this.$message.success(r.msg || this.$t('提交成功'))
-        this.$store.dispatch('tagsView/delCurrentView')
-      })
-    },
-    cancelSplit(){
-      let that = this
-      if(!that.reason){
-        that.$message.error(this.$t("请输入取消原因"));
-        return
-      }
-       cancelOrderSpecial(that.queryParams.orderApprovalId,{reason:that.reason}).then(res=>{
-          that.$message.success(this.$t("取消成功"));
-          that.$store.dispatch('tagsView/delCurrentView')
-        })
-    },
-
-  }
-}
-</script>
-<style scoped>
-  .card-title{
-      font-size: 18px;
-      font-weight: bold;
-       margin-top: 10px;
-  }
-  .card-info{
-    font-size: 16px;
-  }
-  .card{
-    margin-top: 20px;
-  }
-  .btn-header{
-    width: 90%;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin: 20px 0;
-  }
-  .red{
-    color:#ff3430;
-    font-size: 15px;
-  }
-  .footer_btn{
-    padding-bottom: 60px;
-  }
-  .cancel_notice{
-    font-size: 16px;
-    font-weight: 600;
-  }
-  .cancel_content{
-    display: flex;
-    align-items: center;
-    padding-top: 20px;
-  }
-  .cancel_content span{
-    width: 100px;
-  }
-</style>

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

-<template>
-  <div class="app-container">
-    <!-- 搜索工作栏 -->
-    <el-card>
-        <div slot="header" class="card-title">{{$t('申请重货优惠')}}-{{queryParams.orderNo||''}}</div>
-        <el-form :model="queryParams" ref="queryForms" size="small" :inline="true"  label-width="120px" class="card">
-          <el-row >
-              <el-form-item :label="$t('原重货标准:')" label-width="150px">
-                  <span>{{queryParams.orgWVolume}}kg/cbm</span>
-              </el-form-item>
-          </el-row>
-          <el-row :span="8" >
-             <el-form-item :label="$t('现重货申请标准:')" size="medium" label-width="150px" required>
-               <el-input style="width: 100px;"  type="text" v-model="queryParams.wvolume"  />
-                <span style="margin-left: 10px;">kg/cbm</span>
-             </el-form-item>
-          </el-row>
-          <el-row :span="8">
-             <el-form-item :label="$t('备注:')" size="medium" label-width="150px">
-               <el-input style="width: 500px;"  type="textarea" v-model="queryParams.remarks"  />
-             </el-form-item>
-          </el-row>
-        </el-form>
-    </el-card>
-    <work-flow xmlkey="heavy_goods_discount" v-model="selectedUsers" style="margin-top: 20px;"></work-flow>
-    <div slot="footer" class="card footer_btn">
-        <el-button type="primary" v-if="queryParams.applyStatus==0" @click="submitForm">{{$t('提交')}}</el-button>
-        <el-button plain type="primary" v-if="queryParams.applyStatus==0" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('取消')}}</el-button>
-        <el-button v-if="queryParams.applyStatus==1" type="primary" @click="$router.push(`/bpm/process-instance/detail?id=`+queryParams.formId)">{{$t('审核中')}}</el-button>
-        <el-button v-if="queryParams.applyStatus==1" plain type="primary" @click="dialogVisible = true">{{$t('取消审核')}}</el-button>
-        <el-button v-if="queryParams.applyStatus==1" plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('返回')}}</el-button>
-    </div>
-    <el-dialog
-      :title="$t('提示')"
-      :visible.sync="dialogVisible"
-      width="30%">
-      <span class="cancel_notice">{{$t('申请重货优惠正在审核中，你确定取消申请重货优惠吗？')}}</span>
-      <div class="cancel_content">
-        <span>{{$t('取消原因')}}：</span>
-        <el-input v-model="reason" :placeholder="$t('请输入取消原因')"></el-input>
-      </div>
-
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogVisible = false">{{$t('取消')}}</el-button>
-        <el-button type="primary" @click="cancelSplit">{{$t('确定')}}</el-button>
-      </span>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import {getDictData, getDictDatas,DICT_TYPE} from '@/utils/dict'
-import WorkFlow from '@/components/WorkFlow'
-import {getOrderSpecial,createOrderSpecial,cancelOrderSpecial} from '@/api/ecw/order'
-
-export default {
-  name: "specialWeight",
-  components: {
-    WorkFlow
-  },
-  props: {
-    orderId: [String, Number]
-  },
-  data() {
-    return {
-      reason:'',
-      dialogVisible:false,
-      loading:false,
-      queryParams:{
-        orderId:7,
-        lang:0
-      },
-      selectedUsers:[],
-      orderData:{}
-    };
-  },
-  created() {
-    if (this.orderId) {
-      this.queryParams.orderId = this.orderId
-      this.getOrderSpecialData()
-    }
-    // this.getList()
-  },
-  computed:{
-    getDictData(){
-        return (type, value) => getDictData(type, value) || {}
-    },
-    getDictDatas(){
-        return getDictDatas
-    }
-  },
-  methods: {
-    /** 查询列表 */
-   getOrderSpecialData(){
-     getOrderSpecial(this.queryParams.orderId,'4').then(r => {
-       this.queryParams = r.data
-     })
-   },
-    submitForm(){
-      this.queryParams.applyType = 4
-       this.queryParams.ccIds = this.selectedUsers.join(',')
-      createOrderSpecial(this.queryParams).then(r => {
-        this.$message.success(r.msg || this.$t('提交成功'))
-        this.$store.dispatch('tagsView/delCurrentView')
-      })
-    },
-    cancelSplit(){
-      let that = this
-      if(!that.reason){
-        that.$message.error(this.$t("请输入取消原因"));
-        return
-      }
-       cancelOrderSpecial(that.queryParams.orderApprovalId,{reason:that.reason}).then(res=>{
-          that.$message.success(this.$t("取消成功"));
-          that.$store.dispatch('tagsView/delCurrentView')
-        })
-    },
-
-  }
-}
-</script>
-<style scoped>
-  .card-title{
-      font-size: 18px;
-      font-weight: bold;
-       margin-top: 10px;
-  }
-  .card-info{
-    font-size: 16px;
-  }
-  .card{
-    margin-top: 20px;
-  }
-  .btn-header{
-    width: 90%;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin: 20px 0;
-  }
-  .red{
-    color:#ff3430;
-    font-size: 15px;
-  }
-  .footer_btn{
-    padding-bottom: 60px;
-  }
-  .cancel_notice{
-    font-size: 16px;
-    font-weight: 600;
-  }
-  .cancel_content{
-    display: flex;
-    align-items: center;
-    padding-top: 20px;
-  }
-  .cancel_content span{
-    width: 100px;
-  }
-</style>

src/views/ecw/productPrice/edit.vue

@@ -68,7 +68,7 @@
           </span>
         </div>
         <el-form-item :label="$t('单价模式')" prop="priceType">
-          <dict-selector :type="DICT_TYPE.ECW_PRICE_TYPE" v-model="form.priceType" form-type="radio" defaultable />
+          <dict-selector :type="DICT_TYPE.ECW_PRICE_TYPE" v-model="form.priceType" form-type="radio" formatter="number" defaultable />
         </el-form-item>
         <!--阶梯订单-->
         <template v-if="form.stepPrice==1" >
@@ -474,6 +474,10 @@ export default {
         // 添加的提交
         data.productId = this.product.id;
         data.lineChannelList = this.selectedRoutes
+
+        if((this.form.priceType == 0 && !this.form.transportPrice) || (this.form.priceType == 1 && !this.form.allPrice)){
+          return this.$message.error('运费/全包价不能为0')
+        }
         createProductPrice(data).then(response => {
           this.$modal.msgSuccess(this.$t("请求成功"));
           this.$router.replace('/product/product-price?' + (new URLSearchParams(this.$route.query)).toString())

src/views/ecw/supplier/edit.vue

@@ -48,7 +48,7 @@
       
       <div>
         <el-form-item :label="$t('供应商类别')" prop="companyType">
-          <dict-selector v-model="formData.companyType" type="company_type" multiple />
+          <dict-selector v-model="formData.companyTypeArr" type="company_type" multiple />
         </el-form-item>
         <el-form-item :label="$t('合作类型')" prop="cooperationType">
           <dict-selector v-model="formData.cooperationType" type="cooperation_type" />
@@ -93,7 +93,7 @@
               <el-form-item
                 class="mb-0 mr-0"
                 :prop="`contactList.${scope.$index}.name`"
-                :rules="{required: true, message: $t('不能为空'), trigger: 'blur'}"
+                :rules="{required: true, message: $t('联系人名称不能为空'), trigger: 'blur'}"
               >
                 <el-input v-model="scope.row.name"></el-input>
               </el-form-item>
@@ -104,7 +104,7 @@
               <el-form-item
                 class="mb-0 mr-0"
                 :prop="`contactList.${scope.$index}.phone`"
-                :rules="{required: true, message: $t('不能为空'), trigger: 'blur'}"
+                :rules="{required: true, message: $t('联系人电话不能为空'), trigger: 'blur'}"
               >
                 <el-input v-model="scope.row.phone"></el-input>
               </el-form-item>
@@ -132,7 +132,7 @@
               <el-form-item
                 class="mb-0 mr-0"
                 :prop="`bankList.${scope.$index}.accountName`"
-                :rules="{required: true, message: $t('不能为空'), trigger: 'blur'}"
+                :rules="{required: true, message: $t('银行账户名称不能为空'), trigger: 'blur'}"
               >
                 <el-input v-model="scope.row.accountName" placeholder=""></el-input>
               </el-form-item>
@@ -143,7 +143,7 @@
               <el-form-item
                 class="mb-0 mr-0"
                 :prop="`bankList.${scope.$index}.currency`"
-                :rules="{required: true, message: $t('不能为空'), trigger: 'blur'}"
+                :rules="{required: true, message: $t('币别不能为空'), trigger: 'blur'}"
               >
                 <selector :options="currencyList" v-model="scope.row.currency" value-field="id" :label-field="'title' + $l()"></selector>
               </el-form-item>
@@ -154,7 +154,7 @@
               <el-form-item
                 class="mb-0 mr-0"
                 :prop="`bankList.${scope.$index}.bankName`"
-                :rules="{required: true, message: $t('不能为空'), trigger: 'blur'}"
+                :rules="{required: true, message: $t('银行名称不能为空'), trigger: 'blur'}"
               >
                 <el-input v-model="scope.row.bankName"></el-input>
               </el-form-item>
@@ -165,7 +165,7 @@
               <el-form-item
                 class="mb-0 mr-0"
                 :prop="`bankList.${scope.$index}.bankAccount`"
-                :rules="{required: true, message: $t('不能为空'), trigger: 'blur'}"
+                :rules="{required: true, message: $t('银行账户不能为空'), trigger: 'blur'}"
               >
                 <el-input v-model="scope.row.bankAccount"></el-input>
               </el-form-item>
@@ -226,7 +226,7 @@ export default {
         address: "",
         remark: undefined,
         field110: undefined,
-        companyType: [],
+        companyTypeArr: [],
         cooperationType: undefined,
         license: null,
         contract: null,
@@ -280,6 +280,9 @@ export default {
                   this.cityList = item.children || []
               }
           })
+      },
+      'formData.companyTypeArr'(val){
+        this.$set(this.formData, 'companyType', val.join(","))
       }
   },
   created() {
@@ -338,9 +341,9 @@ export default {
       this.$set(this.formData, type, val)
     },
     submitForm() {
-      this.$refs["elForm"].validate(valid => {
+      this.$refs["elForm"].validate((valid, errors) => {
         if (!valid) {
-          return;
+          return this.$showFormValidateErrors(errors)
         }
         let data = Object.assign({}, this.formData)