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

src/utils/dict.js

@@ -12,6 +12,7 @@ export const DICT_TYPE = {
   AUDIT_STATUS: 'audit_status',
   ADVANCE_STATUS: 'advance_status',
   BOX_SHIPMENT_STATUS: 'box_shipment_status',
+  BOX_SEA_AIR_SHIPMENT_STATUS: 'shipment_sea_air_state',
 
   // ========== SYSTEM 模块 ==========
   SYSTEM_USER_SEX: 'system_user_sex',

src/views/ecw/box/indexSeaAir.vue

@@ -100,7 +100,7 @@
           size="small"
         >
           <el-option
-            v-for="dict in this.getDictDatas(DICT_TYPE.BOX_ORDER_SHIPMENT_STATE)"
+            v-for="dict in this.getDictDatas(DICT_TYPE.BOX_SEA_AIR_SHIPMENT_STATUS)"
             :key="dict.value"
             :label="$l(dict, 'label')"
             :value="dict.value"

src/views/ecw/coupon/index.vue

@@ -161,6 +161,8 @@
       </el-table-column>
       <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row, true)"
+                     v-hasPermi="['ecw:coupon:update']">查看</el-button>
           <el-button v-if="scope.row.status != 1" size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                      v-hasPermi="['ecw:coupon:update']">编辑</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleCopy(scope.row)"
@@ -277,9 +279,13 @@ export default {
       return this.$router.push('edit')
     },
     /** 修改按钮操作 */
-    handleUpdate(row) {
+    handleUpdate(row, readonly) {
       const couponId = row.couponId;
-      return this.$router.push('edit?id=' + couponId)
+      let url = 'edit?id=' + couponId
+      if(readonly){
+        url += '&readonly=1'
+      }
+      return this.$router.push(url)
     },
     handleCopy(row){
       this.$router.push('edit?action=copy&id=' + row.couponId)

src/views/ecw/deptTarget/index.vue

@@ -106,11 +106,15 @@
           </el-select> -->
           <dict-selector :type="DICT_TYPE.TARGET_TYPE" v-model="form.targetType" :placeholder="$t('请选择目标类型')" />
         </el-form-item>
-        <el-form-item :label="$t('计算周期')" prop="targetPeriodName">
-          <el-select v-model="form.targetPeriodName" :placeholder="$t('请选择计算周期')" @change="setTime">
-            <el-option v-for="item in targetPeriod" :label="item.name" :value="item.name" :key="item.name"></el-option>
-          </el-select>
-        </el-form-item>
+        <div class="flex">
+          <el-form-item :label="$t('计算周期')" prop="startTime">
+            <el-date-picker v-model="form.startTime" placeholder="" value-format="yyyy-MM-dd HH:mm:ss" class="w-150"></el-date-picker>
+          </el-form-item>
+          <div class="ml-10 mr-10 flex flex-center" style="margin-bottom:22px">-</div>
+          <el-form-item prop="endTime" label-width="0">
+            <el-date-picker v-model="form.endTime" placeholder="" value-format="yyyy-MM-dd HH:mm:ss" class="w-150"></el-date-picker>
+          </el-form-item>
+        </div>
         <el-form-item :label="$t('运输方式')" prop="transportType">
           <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="form.transportType" formatter="number" @change="showChannel"/>
         </el-form-item>
@@ -147,6 +151,7 @@
     import {listSimpleDepts} from "@/api/system/dept";
     import {getChannelList} from '@/api/ecw/channel';
     import dayjs from "dayjs";
+import { parseTime } from '@/utils/ruoyi';
 
     export default {
         name: "DeptTarget",
@@ -213,6 +218,8 @@
                     targetPeriodName: [{required: true, message: this.$t("计算周期不能为空"), trigger: "change"}],
                     transportType: [{required: true, message: this.$t("运输方式不能为空"), trigger: "change"}],
                     cubeNum: [{required: true, message: this.$t("立方数不能为空"), trigger: "blur"}],
+                    startTime: [{required: true, message: this.$t("起始时间不能为空"), trigger: "change"}],
+                    endTime: [{required: true, message: this.$t("截止时间不能为空"), trigger: "change"}],
                 }
             };
         },
@@ -372,6 +379,10 @@
                     } else {
                         this.targetPeriod = this.yearList;
                     }
+
+                    this.form.startTime = parseTime(this.form.startTime)
+                    this.form.endTime = parseTime(this.form.endTime)
+
                     this.open = true;
                     this.title = this.$t("修改部门业绩目标设置");
                 });

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

@@ -31,7 +31,7 @@
         {{form.orgSeaFreight}} {{ currencyMap[form.seaFreightCurrency] }} / {{ unitMap[form.seaFreightVolume] }}
       </el-form-item>
       <el-form-item :label="$t('佣金类型')" prop="commissionType">
-        <dict-selector :type="DICT_TYPE.COMMISSION_TYPE" v-model="form.commissionType" form-type="radio" />
+        <dict-selector :type="DICT_TYPE.COMMISSION_TYPE" v-model="form.commissionType" form-type="radio" formatter="number" />
       </el-form-item>
 
       <!-- 明佣或者明佣+暗佣才显示 -->
@@ -73,7 +73,7 @@
     
 
     <div v-if="form.applyStatus != 1">
-      <el-button type="primary" @click="handleSubmit">提交</el-button>
+      <el-button type="primary" @click="handleSubmit" :disabled="!submitable">提交</el-button>
     </div>
     <div v-else>
       <el-button type="primary" @click="$router.push('/bpm/process-instance/detail?id=' + form.formId)">
@@ -133,6 +133,20 @@ export default {
     }
   },
   computed: {
+    // 是否可以提交
+    submitable(){
+      let submitable = false;
+      [
+        ['orgLightCommissionAmount', 'lightCommissionAmount'],
+        ['orgShadeCommissionAmount', 'shadeCommissionAmount'],
+        ['commissionType', 'orgCommissionType']
+      ].forEach(item => {
+        if(this.form[item[0]] != this.form[item[1]]){
+          submitable = true
+        }
+      })
+      return submitable
+    },
     // 根据渠道id显示渠道名
     getChannelNameById(){
       return channelId => {

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

@@ -56,7 +56,7 @@
     <div class="page-title">审批流程</div>
     <work-flow xmlkey="sheet_sale" v-model="ccIdArr" />
     <div v-if="form.applyStatus != 1">
-      <el-button type="primary" @click="handleSubmit">提交</el-button>
+      <el-button type="primary" @click="handleSubmit" :disabled="!submitable">提交</el-button>
     </div>
     <div v-else>
       <el-button type="primary" @click="$router.push('/bpm/process-instance/detail?id=' + form.formId)">
@@ -107,6 +107,7 @@ export default {
       form: {
         type: 1
       },
+      orignal: {}, // 原始数据，用来判断是否做了修改
       rules:{
         seaFreight      : {required: true, message: '运费不能为空'},
         clearanceFreight: {required: true, message: '清关费不能为空'}
@@ -130,6 +131,7 @@ export default {
     getOfferSpecial(){
       getOfferSpecial(this.offerProdId, {type: 1}).then(r => {
         this.form = r.data
+        this.orignal = r.data
       })
     },
     getProductTypeNameById(id){
@@ -140,6 +142,19 @@ export default {
     }
   },
   computed: {
+    // 是否可以提交
+    submitable(){
+      let submitable = false;
+      [
+        ['orgClearanceFreight', 'clearanceFreight'],
+        ['orgSeaFreight', 'seaFreight']
+      ].forEach(item => {
+        if(this.form[item[0]] != this.form[item[1]]){
+          submitable = true
+        }
+      })
+      return submitable
+    },
     // 根据渠道id显示渠道名
     getChannelNameById(){
       return channelId => {

src/views/ecw/order/detail.vue

@@ -89,6 +89,7 @@
         </el-descriptions-item>
         <el-descriptions-item :label="$t('代收货款')">
           <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="order.isCollection" />
+          <template v-if="order.isCollection == 1">({{order.collectionProxy}}{{currencyMap[order.collectionProxyCurrency]}})</template>
         </el-descriptions-item>
         <el-descriptions-item :label="$t('集运仓库')">
           {{order.isExternalWarehouse ? $t('外部仓') : $t('自有仓') }}

src/views/ecw/order/edit.vue

@@ -733,8 +733,11 @@ export default {
         if(!router) return
         this.$set(this.form, 'departureId', router.startCityId)
         this.$set(this.form, 'objectiveId', router.destCityId)
+
+        this.calculationPrice()
     },
     'form.packageTypeArr'(val){
+        console.log('packageType', val, val.length)
         this.$set(this.form, 'packageType', val ? val.join(',') : '')
     },
     'form.isExternalWarehouse'(isExternalWarehouse){
@@ -787,12 +790,12 @@ export default {
   methods: {
     getOrder(){
         getUpdateInfo(this.$route.query.id).then(res => {
-            this.form = res.data
+            this.form = {...res.data}
 
-            this.form.orderItemVOList.forEach(item => {
-                item.prodAttrArr = item.prodAttrIds.split(',').filter(item => item != '')
-            })
+            this.form.orderItemVOList = [];
+            
             this.form.type = this.form.type ? this.form.type.split(',').filter(item => item != '') : []
+            this.form.packageTypeArr = this.form.packageType ? this.form.packageType.split(',').filter(item => item != '') : []
             this.$set(this.form, 'consignorCompany',        res.data.consignorVO.company)
             this.$set(this.form, 'consignorContactsId',     res.data.consignorVO.customerContactsId)
             this.$set(this.form, 'consignorCountryCode',    res.data.consignorVO.countryCode.replace('+', ''))
@@ -818,7 +821,12 @@ export default {
             }
 
             // 如果已完成入仓，则需要监听必填内容，发生更改后需要填写审批表单
-            this.$nextTick(res => {
+            this.$nextTick(() => {
+                res.data.orderItemVOList.forEach(item => {
+                    item.prodAttrArr = item.prodAttrIds.split(',').filter(item => item != '').map(attrId => +attrId)
+                    this.form.orderItemVOList.push({...item})
+                })
+                
                 if(this.inWarehouse){
                     Object.keys(this.rules).forEach(field => {
                         console.log("watch", field)
@@ -908,7 +916,9 @@ export default {
     onProductChange(row, product){
         console.log(product)
         // row.goodsType = product ? product.typeId : null
-        row.prodAttrArr = !product ? [] : product.attrId.split(',').filter(item => item !== '').map(item => +item)
+        if(product.id != row.prodId){
+            row.prodAttrArr = !product ? [] : product.attrId.split(',').filter(item => item !== '').map(item => +item)
+        }
         row.prodTitleEn = product.titleEn
         row.prodTitleZh = product.titleZh
         this.calculationPrice()
@@ -972,8 +982,8 @@ export default {
         if(this.form.harvestMethod == 2){
             if(!this.form.country || !this.form.province || !this.form.city){
                 return this.$notify({
-                    title: '提示',
-                    message: "收货地区填写不完整",
+                    title: this.$t('提示'),
+                    message: this.$t("收货地区填写不完整"),
                     type: 'warning'
                 });
             }

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

@@ -78,7 +78,7 @@
     <div class="page-title">审批流程</div>
     <work-flow xmlkey="commission_config" v-model="ccIdArr" />
     <div v-if="form.applyStatus != 1">
-      <el-button type="primary" @click="handleSubmit">提交</el-button>
+      <el-button type="primary" @click="handleSubmit" :disabled="!submitable">提交</el-button>
     </div>
     <div v-else>
       <el-button type="primary" @click="$router.push('/bpm/process-instance/detail?id=' + form.formId)">
@@ -199,6 +199,20 @@ export default {
     }
   },
   computed: {
+    // 是否可以提交
+    submitable(){
+      let submitable = false;
+      [
+        ['orgLightCommissionAmount', 'lightCommissionAmount'],
+        ['orgShadeCommissionAmount', 'shadeCommissionAmount'],
+        ['commissionType', 'orgCommissionType']
+      ].forEach(item => {
+        if(this.form[item[0]] != this.form[item[1]]){
+          submitable = true
+        }
+      })
+      return submitable
+    },
     // 根据渠道id显示渠道名
     getChannelNameById(){
       return channelId => {

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

@@ -58,7 +58,7 @@
     <div class="page-title">审批流程</div>
     <work-flow xmlkey="special_apply" v-model="ccIdArr" />
     <div v-if="form.applyStatus != 1">
-      <el-button type="primary" @click="handleSubmit">提交</el-button>
+      <el-button type="primary" @click="handleSubmit" :disabled="!submitable">提交</el-button>
     </div>
     <div v-else>
       <el-button type="primary" @click="$router.push('/bpm/process-instance/detail?id=' + form.formId)">
@@ -148,6 +148,19 @@ export default {
     }
   },
   computed: {
+    // 是否可以提交
+    submitable(){
+      let submitable = false;
+      [
+        ['orgClearanceFreight', 'clearanceFreight'],
+        ['orgFreight', 'freight']
+      ].forEach(item => {
+        if(this.form[item[0]] != this.form[item[1]]){
+          submitable = true
+        }
+      })
+      return submitable
+    },
     // 根据渠道id显示渠道名
     getChannelNameById(){
       return channelId => {