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

src/api/ecw/boxSeaAir.js

+import request from "@/utils/request";
+
+/**
+ * 二程起飞
+ *
+ * @export
+ * @param {*} data
+ * @return {*}
+ */
+ export function takeoffCreate(data) {
+    if (data.id) {
+      return request({
+        url: "/ecw/box-takeoff/update",
+        method: "put",
+        data,
+      });
+    }
+    return request({
+      url: "/ecw/box-takeoff/create",
+      method: "post",
+      data,
+    });
+  }
+
+  /**
+ * 二程到港
+ *
+ * @export
+ * @param {*} data
+ * @return {*}
+ */
+ export function arrivalCreate(data) {
+    if (data.id) {
+      return request({
+        url: "/ecw/box-arrival-air/update",
+        method: "put",
+        data,
+      });
+    }
+    return request({
+      url: "/ecw/box-arrival-air/create",
+      method: "post",
+      data,
+    });
+  }
\ No newline at end of file

src/i18n/index.js

@@ -11,6 +11,7 @@ const i18n = new VueI18n({
         'zh_CN': require('./languages/zh_CN.json')
     }
 })
+window.i18n = i18n
 console.log({i18n})
 /*
 用法
@@ -19,7 +20,7 @@ $l(item, 'title')   => item.titleZh
 $l(null, 'title')   => titleZh
 $l()                => Zh
 */
-Vue.prototype.$l = (object, field = '') => {
+Vue.prototype.$l = i18n.l = (object, field = '') => {
     let prefix = i18n.locale.split('_')[0]
     let append = prefix.charAt(0).toUpperCase() + prefix.toLowerCase().substr(1)
     if(typeof object == 'string'){

src/layout/components/Navbar.vue

@@ -10,7 +10,7 @@
         <el-badge :value="matterNum !== 0 ? matterNum : '' " class="right-menu-item badge">
          <div @click="$router.push('/task/todo')" style="font-size: 28px; color: #cccccc;cursor: pointer;" class="el-icon-postcard"></div>
         </el-badge>
-
+        
         <el-badge :value="notMessage !== 0 ? notMessage : '' " class="right-menu-item badge">
          <el-image style="width: 22px;height: 20px;cursor: pointer;" :src="unreadMessage" @click="notRead"></el-image>
         </el-badge>
@@ -40,8 +40,10 @@
       <dict-selector :type="DICT_TYPE.SYSTEM_LOCALE" v-model="lang" defaultable class="right-menu-item select-nav" />
 
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
-        <div class="avatar-wrapper">
-          <img :src="avatar" class="user-avatar">
+        
+        <div class="avatar-wrapper flex-center">
+          {{$store.getters.name}}
+          <img :src="avatar" class="user-avatar ml-10">
           <i class="el-icon-caret-bottom" />
         </div>
         <el-dropdown-menu slot="dropdown">

src/router/index.js

@@ -406,6 +406,28 @@ export const constantRoutes = [
       }
     ]
   },
+  {
+    path: '/boxSeaAir',
+    component: Layout,
+    hidden: true,
+    redirect: 'noredirect',
+    children: [
+      {
+        path: 'query/:shipmentId(\\d+)',
+        component: (resolve) => import('@/views/ecw/box/query'),
+        props: true,
+        name: 'shippingDetail',
+        meta: {title: '出货详情', icon: '', activeMenu: '/shipment/boxDetail'}
+      },
+      {
+        path: 'shippingSeaAir/:shipmentId(\\d+)',
+        component: (resolve) => import('@/views/ecw/box/shippingSeaAir/shippingSeaAir'),
+        props: true,
+        name: 'shippingSeaAir',
+        meta: {title: '海空联运出货操作', icon: '', activeMenu: '/shipment/boxSeaAir'}
+      }
+    ]
+  },
 ]
 
 // 防止连续点击多次路由报错

src/store/modules/user.js

@@ -109,7 +109,7 @@ const user = {
                 user: {
                   id: '',
                   avatar: '',
-                  userName: ''
+                  nickname: ''
                 }
               }
             }
@@ -125,7 +125,7 @@ const user = {
             commit('SET_ROLES', ['ROLE_DEFAULT'])
           }
           commit('SET_ID', user.id)
-          commit('SET_NAME', user.userName)
+          commit('SET_NAME', user.nickname)
           commit('SET_AVATAR', avatar)
           resolve(res)
         }).catch(error => {

src/utils/dict.js

@@ -4,6 +4,7 @@
  * 数据字典工具类
  */
 import store from '@/store'
+import i18n from '@/i18n'
 
 export const DICT_TYPE = {
   USER_TYPE: 'user_type',
@@ -256,7 +257,7 @@ export function getDictData(dictType, value) {
 
 export function getDictDataLabel(dictType, value) {
   const dict = getDictData(dictType, value);
-  return dict ? dict.label : '';
+  return dict ? i18n.l(dict, 'label') : '';
 }
 
 export class getDictDataL {

src/views/bpm/processInstance/detail.vue

@@ -158,10 +158,22 @@ export default {
         return false
       }
       const map = {
+        // 报价单特价审核，原来配置的组件名
         "special-discount": {
-          component: 'special-detail',
+          component: 'SpecialDetail',
           id: this.processInstance.businessKey,
-          readonly: true
+          type: 1
+        },
+        // 报价单特价审核，符合命名规则的组件名
+        offer_special: {
+          component: 'SpecialDetail',
+          id: this.processInstance.businessKey,
+          type: 1
+        },
+        offer_commission: {
+          component: 'SpecialDetail',
+          id: this.processInstance.businessKey,
+          type: 2
         },
         free_apply: {
           component: "warehouseDetails",

src/views/ecw/box/editSeaAirForm.vue

+<template>
+  <div class="shippingSea-dialog">
+    <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+
+        <el-form-item label="运输方式" prop="transportType">
+          <el-radio-group v-model="form.transportType">
+            <el-radio v-for="dict in transportTypes" :key="dict.value" :label="dict.value">{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+
+        <el-form-item label="出货渠道" prop="shippingChannelId">
+          <el-select v-model="form.shippingChannelId" placeholder="请选择出货渠道">
+            <el-option v-for="item in channelList" :label="item.nameZh" :value="item.channelId" :key="item.channelId"></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="柜型" prop="cabinetId">
+          <el-select v-model="form.cabinetId" placeholder="请选择柜型">
+            <el-option v-for="item in cabinetList" :label="item.name" :value="item.id" :key="item.id"></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="始发地" prop="startWarehouseId">
+          <el-select v-model="form.startWarehouseId" placeholder="请选择始发地">
+            <el-option v-for="item in exportWarehouseList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="目的地" prop="destWarehouseId">
+          <el-select v-model="form.destWarehouseId" placeholder="请选择目的地">
+            <el-option v-for="item in importWarehouseList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
+          </el-select>
+        </el-form-item>
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+  </div>
+</template>
+
+<script>
+import { createbox, updatebox } from "@/api/ecw/box";
+import { getChannelList } from '@/api/ecw/channel'
+
+export default {
+  name: "editForm",
+  inheritAttrs: false,
+  props: {
+    transportTypes: Array,
+    warehouseList: Array,
+    cabinetList: Array,
+    shipmentObj: Object,
+  },
+  created() {
+    this.form = { ...this.shipmentObj };
+    this.getChannelList()
+  },
+  data() {
+    return {
+      // 表单参数
+      form: { transportType: '4' },
+      channelList: [],
+      // 表单校验
+      rules: {
+        shippingChannelId: [
+          { required: true, message: '出货渠道不能为空', trigger: 'blur' }
+        ],
+        cabinetId: [
+          { required: true, message: '柜型不能为空', trigger: 'blur' }
+        ],
+        startWarehouseId: [
+          { required: true, message: '始发地不能为空', trigger: 'blur' }
+        ],
+        destWarehouseId: [
+          { required: true, message: '目的地不能为空', trigger: 'blur' }
+        ]
+      }
+    };
+  },
+  methods: {
+    getChannelList() {
+      getChannelList().then((res) => (this.channelList = res.data))
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs['form'].validate((valid) => {
+        if (!valid) {
+          return
+        }
+
+        this.form.transportType = 4
+
+        // 修改的提交
+        if (this.form.id != null) {
+          updatebox(this.form).then((response) => {
+            this.$modal.msgSuccess('修改成功')
+            this.open = false
+            this.getList()
+          })
+          return
+        }
+        // 添加的提交
+        createbox(this.form).then((response) => {
+          this.$modal.msgSuccess('新增成功')
+          this.open = false
+          this.getList()
+        })
+      })
+    },
+    /** 取消按钮 */
+    cancel() {
+      this.$emit("closeDialog");
+    },
+  },
+  computed: {
+    exportWarehouseList() {
+      return this.warehouseList.filter(
+        (item) => item.tradeType == "2" || item.type == "3"
+      );
+    },
+    importWarehouseList() {
+      return this.warehouseList.filter(
+        (item) => item.tradeType == "1" || item.type == "3"
+      );
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+// 海运操作统一弹窗样式
+.shippingSea-dialog {
+  // 页面内元素弹窗form控件宽度设置
+  .el-form-item__content {
+    > div:not(.el-input-number) {
+      width: 100%;
+    }
+  }
+  .operate-button {
+    text-align: center;
+  }
+  .two-element-formItem {
+    display: flex;
+    > :last-child {
+      width: 100%;
+      margin-left: 10px;
+    }
+  }
+  .two-element {
+    .el-form-item__content {
+      display: flex;
+      > :last-child {
+        margin-left: 10px;
+      }
+    }
+  }
+}
+</style>

src/views/ecw/box/shippingSea/nodePage/twoWayArrival.vue

+<template>
+  <div>
+    <el-form ref="twoWayArrivalForm" :rules="rules" :model="twoWayArrivalObj" label-width="120px">
+      <el-form-item label="预计到达时间" prop="estTime">
+        <el-date-picker type="datetime" placeholder="请选择日期" v-model="twoWayArrivalObj.estTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+      </el-form-item>
+      <el-form-item label="实际到达时间" prop="actTime">
+        <el-date-picker type="datetime" placeholder="请选择日期" v-model="twoWayArrivalObj.actTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+      </el-form-item>
+      <el-form-item label="实际二程时间" prop="actSecondTime">
+        <el-date-picker type="datetime" placeholder="请选择日期" v-model="twoWayArrivalObj.actSecondTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+      </el-form-item>
+    </el-form>
+
+    <el-row class="operate-button">
+      <el-button type="primary" @click="onSubmit(1)">保存</el-button>
+      <el-button type="success" @click="onSubmit(2)">提交</el-button>
+      <el-button @click="cancel">关闭</el-button>
+      <el-button type="primary" @click="exceptionReg">异常登记</el-button>
+    </el-row>
+
+    <!-- 对话框 -->
+    <el-dialog custom-class="shipping-dialog" title="异常登记" :visible.sync="dialogVisible" width="700px" :modal-append-to-body=false append-to-body destroy-on-close>
+      <regError @closeDialog="dialogVisible = false" v-bind="$attrs" />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import regError from "../../regError";
+import { arrivalCreate } from "@/api/ecw/boxSeaAir";
+import { formatDateStr, serviceMsg } from "../utils";
+
+/**
+ * 起飞
+ */
+export default {
+  name: "twoWayArrival",
+  inheritAttrs: false,
+  components: {
+    regError,
+  },
+  data() {
+    return {
+      // 清关对象
+      twoWayArrivalObj: {},
+      // 校验
+      rules: {
+        actTime: [{ required: true, message: "必填", trigger: "blur" }]
+      },
+      // 弹窗配置
+      dialogVisible: false,
+      // 提示消息
+      showMsg: false,
+    };
+  },
+  created() {
+    const voName = this.$attrs.currNode.voName;
+    let oldData = { ...this.$attrs.shipmentObj[voName] };
+    oldData = formatDateStr(oldData, ["actTime"], "YYYY-MM-DD HH:mm:ss");
+    oldData = formatDateStr(oldData, ["actSecondTime"], "YYYY-MM-DD HH:mm:ss");
+    oldData = formatDateStr(oldData, ["estTime"], "YYYY-MM-DD HH:mm:ss");
+    this.twoWayArrivalObj = oldData;
+  },
+  watch: {
+  },
+  methods: {
+    // 异常登记
+    exceptionReg() {
+      this.dialogVisible = true;
+    },
+    /** 提交 */
+    onSubmit(operateType) {
+      this.$refs["twoWayArrivalForm"].validate((valid) => {
+        if (valid) {
+          arrivalCreate({
+            ...this.twoWayArrivalObj,
+            shipmentId: this.$attrs.shipmentObj.id,
+            operateType,
+          }).then((res) => {
+            serviceMsg(res, this).then(() => {
+              this.cancel("submit");
+            });
+          });
+        }
+      });
+    },
+    /** 取消 */
+    cancel(type) {
+      this.$emit("closeDialog", type);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.message-area {
+  margin: 0;
+  color: red;
+}
+</style>

src/views/ecw/box/shippingSea/nodePage/twoWayTakeoff.vue

+<template>
+  <div>
+    <el-form ref="twoWayTakeoffForm" :rules="rules" :model="twoWayTakeoffObj" label-width="120px">
+      <el-form-item label="预计头程时间" prop="estHeadTime">
+        <el-date-picker type="datetime" placeholder="请选择日期" v-model="twoWayTakeoffObj.estHeadTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+      </el-form-item>
+      <el-form-item label="实际头程时间" prop="actHeadTime">
+        <el-date-picker type="datetime" placeholder="请选择日期" v-model="twoWayTakeoffObj.actHeadTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+      </el-form-item>
+      <el-form-item label="预计二程时间" prop="estSecondTime">
+        <el-date-picker type="datetime" placeholder="请选择日期" v-model="twoWayTakeoffObj.estSecondTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+      </el-form-item>
+    </el-form>
+
+    <el-row class="operate-button">
+      <el-button type="primary" @click="onSubmit(1)">保存</el-button>
+      <el-button type="success" @click="onSubmit(2)">提交</el-button>
+      <el-button @click="cancel">关闭</el-button>
+      <el-button type="primary" @click="exceptionReg">异常登记</el-button>
+    </el-row>
+
+    <!-- 对话框 -->
+    <el-dialog custom-class="shipping-dialog" title="异常登记" :visible.sync="dialogVisible" width="700px" :modal-append-to-body=false append-to-body destroy-on-close>
+      <regError @closeDialog="dialogVisible = false" v-bind="$attrs" />
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import regError from "../../regError";
+import { takeoffCreate } from "@/api/ecw/boxSeaAir";
+import { formatDateStr, serviceMsg } from "../utils";
+
+/**
+ * 起飞
+ */
+export default {
+  name: "twoWayTakeoff",
+  inheritAttrs: false,
+  components: {
+    regError,
+  },
+  data() {
+    return {
+      // 清关对象
+      twoWayTakeoffObj: {},
+      // 校验
+      rules: {
+        actHeadTime: [{ required: true, message: "必填", trigger: "blur" }],
+        estHeadTime: [{ required: true, message: "必填", trigger: "blur" }],
+        estSecondTime: [{ required: true, message: "必填", trigger: "blur" }],
+      },
+      // 弹窗配置
+      dialogVisible: false,
+      // 提示消息
+      showMsg: false,
+    };
+  },
+  created() {
+    const voName = this.$attrs.currNode.voName;
+    let oldData = { ...this.$attrs.shipmentObj[voName] };
+    oldData = formatDateStr(oldData, ["actHeadTime"], "YYYY-MM-DD HH:mm:ss");
+    oldData = formatDateStr(oldData, ["estHeadTime"], "YYYY-MM-DD HH:mm:ss");
+    oldData = formatDateStr(oldData, ["estSecondTime"], "YYYY-MM-DD HH:mm:ss");
+    this.twoWayTakeoffObj = oldData;
+  },
+  watch: {
+  },
+  methods: {
+    // 异常登记
+    exceptionReg() {
+      this.dialogVisible = true;
+    },
+    /** 提交 */
+    onSubmit(operateType) {
+      this.$refs["twoWayTakeoffForm"].validate((valid) => {
+        if (valid) {
+          takeoffCreate({
+            ...this.twoWayTakeoffObj,
+            shipmentId: this.$attrs.shipmentObj.id,
+            operateType,
+          }).then((res) => {
+            serviceMsg(res, this).then(() => {
+              this.cancel("submit");
+            });
+          });
+        }
+      });
+    },
+    /** 取消 */
+    cancel(type) {
+      this.$emit("closeDialog", type);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.message-area {
+  margin: 0;
+  color: red;
+}
+</style>

src/views/ecw/box/shippingSea/seaProcess.vue

@@ -40,6 +40,8 @@ import blCopyWidget from "./nodePage/blCopy.vue";
 import clrDocumentWidget from "./nodePage/clrDocument.vue";
 import arrivalWidget from "./nodePage/arrival.vue";
 import cusClearanceWidget from "./nodePage/cusClearance.vue";
+import twoWayTakeoffWidget from "./nodePage/twoWayTakeoff.vue";
+import twoWayArrivalWidget from "./nodePage/twoWayArrival.vue";
 import unloadingWidget from "./nodePage/unloading/index.vue";
 import settlementWidget from "./nodePage/settlement.vue";
 import reviewWidget from "./nodePage/review.vue";
@@ -66,6 +68,8 @@ export default {
     clrDocumentWidget,
     arrivalWidget,
     cusClearanceWidget,
+    twoWayTakeoffWidget,
+    twoWayArrivalWidget,
     unloadingWidget,
     settlementWidget,
     reviewWidget,

src/views/ecw/box/shippingSeaAir/shippingSeaAir.vue

+<template>
+  <div>
+    <el-row type="flex" style="margin-top: 15px; margin-bottom: 15px" justify="center">
+      <el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="19">
+        <div style="display: flex; justify-content: space-between;align-items: flex-end;">
+          <h2>海空联运出货操作</h2>
+        </div>
+
+        <!-- 信息 -->
+        <el-card style="margin-top: 15px">
+          <el-descriptions :column="5" border>
+            <el-descriptions-item label="自编号">{{shipmentObj.selfNo}}</el-descriptions-item>
+            <el-descriptions-item label="出货渠道">
+              {{ channelName(shipmentObj.shippingChannelId) }}
+            </el-descriptions-item>
+            <el-descriptions-item label="始发地">
+              {{importCityName(shipmentObj.startWarehouseId)}}
+            </el-descriptions-item>
+            <el-descriptions-item label="目的地">
+              {{importCityName(shipmentObj.destWarehouseId)}}
+            </el-descriptions-item>
+            <el-descriptions-item label="状态">
+              {{statusLabel}}
+            </el-descriptions-item>
+          </el-descriptions>
+        </el-card>
+
+        <!-- 海运流程图 -->
+        <seaProcess :seaBaseData="seaAirBaseData" :shipmentObj="shipmentObj" :allSupplier="allSupplier" :allDocks="allDocks" :allUsers="allUsers" :warehouseList="warehouseList" @getBoxInfo="getBoxInfo" />
+
+        <!-- 海运步骤图 -->
+        <seaStepDetail :seaBaseData="seaAirBaseData" :shipmentObj="shipmentObj" :allSupplier="allSupplier" :allDocks="allDocks" :allUsers="allUsers" :warehouseList="warehouseList" />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script>
+import seaProcess from "../shippingSea/seaProcess.vue";
+import seaStepDetail from "../shippingSea/seaStepDetail.vue";
+import { getbox } from "@/api/ecw/box";
+import { getWarehouseList } from "@/api/ecw/warehouse";
+import { getSupplierPage } from "@/api/ecw/supplier";
+import { getChannelList } from '@/api/ecw/channel';
+import { getDockPage } from "@/api/ecw/dock";
+import { listUser } from "@/api/system/user";
+import { getSeaStatus, getStatusName, seaAirBaseData } from "../shippingSea/utils";
+import {arrryToKeyedObjectBy} from '@/utils/index'
+
+/**
+ * 海运操作主页面
+ */
+export default {
+  name: "shippingSea",
+  components: {
+    seaProcess,
+    seaStepDetail,
+  },
+  props: {
+    shipmentId: String,
+  },
+  data() {
+    return {
+      shipmentObj: {},
+      warehouseList: [],
+      // 供应商
+      allSupplier: [],
+      // 码头
+      allDocks: [],
+      // 用户
+      allUsers: [],
+      // 流程图节点
+      seaAirBaseData: seaAirBaseData(),
+      // 状态
+      statusLabel: "",
+      channelList:[] , // 渠道
+    };
+  },
+  computed: {
+    // 渠道用id做键值
+    keyedChannel(){
+      return arrryToKeyedObjectBy(this.channelList, 'channelId')
+    },
+    // 根据渠道id获取渠道名
+    channelName(){
+      return id => {
+        return this.keyedChannel[id] ? this.keyedChannel[id].nameZh : null
+      }
+    },
+  },
+  created() {
+    this.getBoxInfo();
+    // 仓库
+    getWarehouseList().then((r) => {
+      this.warehouseList = r.data;
+    });
+    // 供应商
+    getSupplierPage({ pageNo: "1", pageSize: "10000" }).then((res) => {
+      const { data } = res;
+      this.allSupplier = data.list.map((item) => {
+        if (item.companyType) {
+          item.companyTypes = item.companyType.split(",");
+        }
+        return item;
+      });
+    });
+    // 码头
+    getDockPage({ pageNo: "1", pageSize: "10000" }).then((res) => {
+      const { data } = res;
+      this.allDocks = data.list;
+    });
+    // 用户
+    listUser({ pageNo: "1", pageSize: "10000" }).then((res) => {
+      const { data } = res;
+      this.allUsers = data.list ?? [];
+    });
+    getChannelList().then(res => this.channelList = res.data)
+  },
+  methods: {
+    /* 获取仓库 */
+    importCityName(id) {
+      var arr = this.warehouseList.filter((item) => item.id == id);
+      return arr.length > 0 ? arr[0].titleZh : "无";
+    },
+    // 出货
+    getBoxInfo() {
+      getbox(this.shipmentId).then((res) => {
+        const { data } = res;
+        this.shipmentObj = data ?? {};
+      });
+    },
+  },
+  watch: {
+    /* 监听发货对象 */
+    shipmentObj(val) {
+      this.statusLabel = getStatusName(getSeaStatus(val));
+    },
+  },
+};
+</script>
+
+<style lang="scss">
+// 海运操作统一弹窗样式
+.shipping-dialog {
+  .el-dialog__body {
+    height: calc(100% - 54px);
+    > :first-child {
+      height: 100%;
+    }
+  }
+  // 页面内元素弹窗form控件宽度设置
+  .el-form-item__content {
+    > div:not(.el-input-number) {
+      width: 100%;
+    }
+  }
+  .operate-button {
+    padding-top: 10px;
+    text-align: center;
+  }
+  .two-element {
+    .el-form-item__content {
+      display: flex;
+      > :last-child {
+        margin-left: 10px;
+      }
+    }
+  }
+}
+</style>

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

 <template>
   <el-dialog visible :close-on-click-modal="false" :before-close="closeDialog" :title="$t('佣金规则申请')">
-    <el-form ref="form" :model="form" label-width="80px" :rules="rules">
+    <el-form ref="form" :model="form" label-width="80px" :rules="rules" :disabled="!!form.applyStatus">
       <el-form-item :label="$t('商品类型')">
-        <span>{{ getProductAttrNameById(form.productType) }}</span>
+        <span>{{ getProductTypeNameById(form.productType) }}</span>
       </el-form-item>
       <el-form-item :label="$t('商品名称')">
         <span>{{ form.prodTitleZh }}</span>
@@ -66,9 +66,10 @@
         <div  v-if="form.commissionType == 1 || form.commissionType == 3">销售价：{{form.orgSeaFreight + form.shadeCommissionAmount + form.lightCommissionAmount }} {{ currentMap[form.orgSeaFreightCurrency] }} / {{ unitMap[form.orgSeaFreightVolume] }}</div>
         <div v-if="form.commissionType == 3">实际佣金返点：{{form.shadeCommissionAmount + form.lightCommissionAmount }} {{ currentMap[form.orgSeaFreightCurrency] }} / {{ unitMap[form.orgSeaFreightVolume] }}</div>
       </div>
+      <div class="page-title">审批流程</div>
+      <work-flow xmlkey="sheet_sale" v-model="ccIdArr" />
     </el-form>
-    <div class="page-title">审批流程</div>
-    <work-flow xmlkey="sheet_sale" v-model="ccIdArr" />
+    
 
     <div v-if="!form.applyStatus">
       <el-button type="primary" @click="handleSubmit">提交</el-button>
@@ -88,7 +89,7 @@ import DictSelector from "@/components/DictSelector"
 import {getUnitList} from "@/api/ecw/unit"
 import {getChannelList} from "@/api/ecw/channel"
 import { getCurrencyList } from '@/api/ecw/currency'
-import { getProductAttrList } from '@/api/ecw/productAttr'
+import { getProductTypeList } from '@/api/ecw/productType'
 import WorkFlow from '@/components/WorkFlow'
 import {getDarkReturnCommission} from '@/api/ecw/customerCommission'
 export default {
@@ -109,7 +110,7 @@ export default {
     getUnitList().then(res => this.unitList = res.data)
     getChannelList().then(res => this.channelList = res.data)
     getCurrencyList().then(res => this.currencyList = res.data)
-    getProductAttrList().then(res => this.productAttrList = res.data)
+    getProductTypeList().then(res => this.productTypeList = res.data)
 
   },
   data() {
@@ -119,7 +120,7 @@ export default {
       unitList:[],
       channelList:[],
       currencyList:[],
-      productAttrList:[],
+      productTypeList:[],
       ccIdArr: [],
       form: {
         type: 2
@@ -157,9 +158,12 @@ export default {
     ccIdArr(){
       this.$set(this.form, 'ccIds', this.ccIdArr.join(','))
     },
-    'form.commissionType'(val){
-      this.$set(this.form, 'lightCommissionAmount', 0)
-      this.$set(this.form, 'shadeCommissionAmount', 0)
+    'form.commissionType'(val, old){
+      if(typeof old !='undefined' && old != val){
+        this.$set(this.form, 'lightCommissionAmount', 0)
+        this.$set(this.form, 'shadeCommissionAmount', 0)
+      }
+      
       
       // 暗佣需要查询暗佣设置
       if(val == 2){
@@ -185,8 +189,8 @@ export default {
         this.form = r.data
       })
     },
-    getProductAttrNameById(id){
-      return this.productAttrList.find(e => e.id === id)?.attrName || ''
+    getProductTypeNameById(id){
+      return this.$l(this.productTypeList.find(e => e.id === id), 'title')
     },
     closeDialog(){
       this.$emit('close')
@@ -199,7 +203,7 @@ export default {
           darkUnit: this.form.orgSeaFreightVolume,
           departureId: this.offer.departureId,
           objectiveId: this.offer.objectiveId,
-          productAttr: 3, //this.offerProd.prodAttrIds,
+          productAttr: this.offerProd.prodAttrIds.split(',').filter(item => item && item != ''),
           productType: this.offerProd.productType,
           transportId: this.offer.transportId,
           type: 2, // 暗佣

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

 <template>
-  <el-descriptions border :column="1">
-    <el-descriptions-item label="商品类型">{{ form.productType }}</el-descriptions-item>
+  <el-descriptions border :column="3" v-if="offer">
+    <el-descriptions-item label="报价单号">{{offer.number}}</el-descriptions-item>
+    <el-descriptions-item label="运输方式">
+        <dict-tag :type="DICT_TYPE.TRANSPORT_TYPE" :value="offer.transportId" />
+    </el-descriptions-item>
+    <el-descriptions-item label="出货方式">
+        {{ channel ? $l(channel, 'name') : '/' }}
+    </el-descriptions-item>
+    <el-descriptions-item label="报价单状态">
+        <dict-tag :type="DICT_TYPE.ECW_OFFER_STATUS" :value="offer.status" />
+    </el-descriptions-item>
+    <el-descriptions-item label="唛头">{{offer.marks}}</el-descriptions-item>
+    <el-descriptions-item label="始发仓">{{form.departureName}}</el-descriptions-item>
+    <el-descriptions-item label="目的仓">{{form.objectiveName}}</el-descriptions-item>
+    <el-descriptions-item label="申请原因" :span="3" v-if="type == 2">
+      <div class="item">
+        商品：{{$l(form, 'prodTitle')}}
+      </div>
+      <div class="item">
+        佣金规则：{{$t('从【{oldType}】改为【{newType}】', {
+          oldType: getDictDataLabel(DICT_TYPE.COMMISSION_TYPE, offer.commissionType) ,
+          newType: getDictDataLabel(DICT_TYPE.COMMISSION_TYPE, form.commissionType),
+        })}}
+      </div>
+      
+      <div>
+        原运费：{{form.seaFreight + currentMap[form.orgSeaFreightCurrency] + '/' + unitMap[form.orgSeaFreightVolume]}}
+      </div>
+      <div>
+        新运费：{{newSeaFreight + currentMap[form.orgSeaFreightCurrency] + '/' + unitMap[form.orgSeaFreightVolume]}}
+      </div>
+      <div>
+        成本价：{{form.orgSeaFreight + currentMap[form.orgSeaFreightCurrency] + '/' + unitMap[form.orgSeaFreightVolume]}}
+      </div>
+      <div>
+        明佣：{{ form.lightCommissionAmount + currentMap[form.orgSeaFreightCurrency] + '/' + unitMap[form.orgSeaFreightVolume]}}
+      </div>
+      <div>
+        暗佣：{{form.shadeCommissionAmount + currentMap[form.orgSeaFreightCurrency] + '/' + unitMap[form.orgSeaFreightVolume]}}
+      </div>
+    </el-descriptions-item>
+    <el-descriptions-item label="申请原因" :span="3" v-if="type == 1">
+      <div class="item">
+        商品：{{$l(form, 'prodTitle')}}
+      </div>
+      
+      <div>
+        原运费：{{form.orgSeaFreight + currentMap[form.seaFreight] + '/' + unitMap[form.seaFreight]}}，
+        原清关费：{{form.orgClearanceFreight + currentMap[form.clearanceFreightCurrency] + '/' + unitMap[form.clearanceFreightVolume]}}
+      </div>
+      <div>
+        新运费：{{seaFreight + currentMap[form.orgSeaFreightCurrency] + '/' + unitMap[form.orgSeaFreightVolume]}}，
+        新清关费：{{form.clearanceFreight + currentMap[form.clearanceFreightCurrency] + '/' + unitMap[form.clearanceFreightVolume]}}
+      </div>
+      
+    </el-descriptions-item>
+    <!-- 
+    
+    <el-descriptions-item label="商品类型">{{ $l(productType, 'title') }}</el-descriptions-item>
     <el-descriptions-item label="商品名称">{{ form.prodTitleZh }}</el-descriptions-item>
     <el-descriptions-item label="英文名称">{{ form.prodTitleEn }}</el-descriptions-item>
     <el-descriptions-item label="线路">
-      {{ `【${getDictDataLabel(DICT_TYPE.TRANSPORT_TYPE, form.transportId)}】${ getChannelNameById(form.channelId) }从【${form.departureName}】发往【${form.objectiveName}】`}}
+      【<dict-tag :type="DICT_TYPE.TRANSPORT_TYPE" :value="form.transportId" />】
+      <template v-if="channel">
+        【{{ $l(channel, 'name') }}】
+        
+      </template>
+      {{$t("从【{start}】发往【{dest}】", { start: form.departureName, dest: form.objectiveName })}}
     </el-descriptions-item>
-    <el-descriptions-item label="是否预付">{{ form.isPayAdvance === 0 ? '是' : '否' }}</el-descriptions-item>
-    <el-descriptions-item label="旧运费">{{ form.orgSeaFreight }} {{ currentMap[form.orgSeaFreightCurrency] }}/{{ unitMap[form.orgSeaFreightVolume] }}</el-descriptions-item>
+    <el-descriptions-item label="是否预付">
+      <dict-tag :type="DICT_TYPE.ECW_PAY_ADVANCE" :value="form.isPayAdvance" />
+    </el-descriptions-item> -->
+    <!-- <el-descriptions-item label="旧运费">{{ form.orgSeaFreight }} {{ currentMap[form.orgSeaFreightCurrency] }}/{{ unitMap[form.orgSeaFreightVolume] }}</el-descriptions-item>
     <el-descriptions-item label="旧清关费">{{ form.orgClearanceFreight }} {{ currentMap[form.orgClearanceFreightCurrency] }}/{{ unitMap[form.orgClearanceFreightVolume] }}</el-descriptions-item>
     <el-descriptions-item label="新运费">{{ form.seaFreight }} {{ currentMap[form.seaFreightCurrency] }}/{{ unitMap[form.seaFreightVolume] }}</el-descriptions-item>
-    <el-descriptions-item label="新清关费">{{ form.clearanceFreight }} {{ currentMap[form.clearanceFreightCurrency] }}/{{ unitMap[form.clearanceFreightVolume] }}</el-descriptions-item>
+    <el-descriptions-item label="新清关费">{{ form.clearanceFreight }} {{ currentMap[form.clearanceFreightCurrency] }}/{{ unitMap[form.clearanceFreightVolume] }}</el-descriptions-item> -->
   </el-descriptions>
 </template>
 
 <script>
-import {createOfferSpecial, getOfferSpecial, getOfferSpecialByApproveId} from "@/api/ecw/offer"
-import {DICT_TYPE, getDictDataLabel} from "@/utils/dict"
+import {getOfferSpecialByApproveId, getOffer} from "@/api/ecw/offer"
 import {getUnitList} from "@/api/ecw/unit"
-import {getChannelList} from "@/api/ecw/channel"
+import {getChannel} from "@/api/ecw/channel"
 import { getCurrencyList } from '@/api/ecw/currency'
-import { getProductAttrList } from '@/api/ecw/productAttr'
-
+import {getProductType} from '@/api/ecw/productType'
+import Decimal from 'decimal.js'
 export default {
-  name: "specialDetail",
+  name: "SpecialDetail",
   props: {
-    offerProdId: Number,
     id: [String, Number],
-    readonly: {
-      type: Boolean,
-      default: false
-    }
+    type: Number, // 类型，1特价，2佣金
   },
   created() {
     // 从流程查看详情
@@ -38,84 +97,60 @@ export default {
       this.getOfferSpecialByApproveId()
 
     getUnitList().then(res => this.unitList = res.data)
-    getChannelList().then(res => this.channelList = res.data)
     getCurrencyList().then(res => this.currencyList = res.data)
-    getProductAttrList().then(res => this.productAttrList = res.data)
 
   },
   data() {
     return {
-      getDictDataLabel,
-      DICT_TYPE,
       unitList:[],
       channelList:[],
       currencyList:[],
-      productAttrList:[],
-      ccIdArr: [],
-      form: {
-        type: 1
-      },
-      rules:{
-        seaFreight      : {required: true, message: '运费不能为空'},
-        clearanceFreight: {required: true, message: '清关费不能为空'}
-      }
-    }
-  },
-  watch:{
-    ccIdArr(){
-      this.$set(this.form, 'ccIds', this.ccIdArr.join(','))
-    }
-  },
-  methods: {
-    handleSubmit(){
-      this.$refs.form.validate().then(res => {
-              console.log(this.form.type)
-
-        createOfferSpecial(Object.assign({}, this.form, {type: 1})).then(res => {
-          this.$message.success(r.msg || '提交成功')
-        })
-      })
-    },
-    getOfferSpecial(){
-      getOfferSpecial(this.offerProdId, {type: 1}).then(r => {
-        this.form = r.data
-      })
-    },
-    getOfferSpecialByApproveId(){
-      getOfferSpecialByApproveId(this.id).then(r => {
-        this.form = r.data
-      })
-    },
-    getProductAttrNameById(id){
-      return this.productAttrList.find(e => e.id === id)?.attrName || ''
+      productType: null,
+      channel: null,
+      offer: null,
+      form:{}
     }
   },
   computed: {
-    // 根据渠道id显示渠道名
-    getChannelNameById(){
-      return channelId => {
-        const s = this.channelList.find(item => item.channelId == channelId) ?. nameZh
-        return s ? '【' + s + '】' : ''
-      }
-    },
     currentMap(){
       let map = {}
       this.currencyList.forEach(item => {
-        map[item.id] = item.titleZh
+        map[item.id] = this.$l(item, 'title')
       })
       return map
     },
     unitMap(){
       let map = {}
       this.unitList.forEach(item => {
-        map[item.id] = item.titleZh
+        map[item.id] = this.$l(item, 'title')
       })
       return map
+    },
+    // 新运费
+    newSeaFreight(){
+      return Decimal(this.form.seaFreight).plus(this.form.shadeCommissionAmount).plus(this.form.lightCommissionAmount)
+    }
+  },
+  methods: {
+    getOfferSpecialByApproveId(){
+      getOfferSpecialByApproveId(this.id).then(r => {
+        this.form = r.data
+        getOffer(this.form.offerId).then(res => {
+          this.offer = res.data
+        })
+        if(this.form.productType){
+          getProductType(this.form.productType).then(res => {
+            this.productType = res.data
+          })
+        }
+        if(this.form.channelId){
+          getChannel(this.form.channelId).then(res => {
+            this.channel = res.data
+          })
+        }
+      })
     }
-  }
+  },
+  
 }
-</script>
-
+</script>
\ No newline at end of file
-<style scoped>
-
-</style>

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

@@ -2,7 +2,7 @@
   <el-dialog visible :close-on-click-modal="false" :before-close="closeDialog" :title="$t('优惠申请')">
     <el-form ref="form" :model="form" label-width="80px" :rules="rules">
       <el-form-item :label="$t('商品类型')">
-        <span>{{ getProductAttrNameById(form.productType) }}</span>
+        <span>{{ getProductTypeNameById(form.productType) }}</span>
       </el-form-item>
       <el-form-item :label="$t('商品名称')">
         <span>{{ form.prodTitleZh }}</span>
@@ -73,7 +73,7 @@ import DictSelector from "@/components/DictSelector"
 import {getUnitList} from "@/api/ecw/unit"
 import {getChannelList} from "@/api/ecw/channel"
 import { getCurrencyList } from '@/api/ecw/currency'
-import { getProductAttrList } from '@/api/ecw/productAttr'
+import { getProductTypeList } from '@/api/ecw/productType'
 import WorkFlow from '@/components/WorkFlow'
 export default {
   name: "specialDiscount",
@@ -92,7 +92,7 @@ export default {
     getUnitList().then(res => this.unitList = res.data)
     getChannelList().then(res => this.channelList = res.data)
     getCurrencyList().then(res => this.currencyList = res.data)
-    getProductAttrList().then(res => this.productAttrList = res.data)
+    getProductTypeList().then(res => this.productTypeList = res.data)
 
   },
   data() {
@@ -102,7 +102,7 @@ export default {
       unitList:[],
       channelList:[],
       currencyList:[],
-      productAttrList:[],
+      productTypeList:[],
       ccIdArr: [],
       form: {
         type: 1
@@ -132,8 +132,8 @@ export default {
         this.form = r.data
       })
     },
-    getProductAttrNameById(id){
-      return this.productAttrList.find(e => e.id === id)?.attrName || ''
+    getProductTypeNameById(id){
+      return this.$l(this.productTypeList.find(e => e.id === id), 'title')
     },
     closeDialog(){
       this.$emit('close')

src/views/ecw/offer/index.vue

@@ -126,7 +126,7 @@
               <el-dropdown-item @click.native="$router.push('edit?id=' + scope.row.offerId)"                                   v-if="[1,2,3,7].indexOf(scope.row.status) > -1"        v-hasPermi="['ecw:offer:update']">{{$t('编辑')}}</el-dropdown-item>
               <el-dropdown-item @click.native="$router.push('logList?offerId=' + scope.row.offerId)"                           v-if="[1,3,7].indexOf(scope.row.status) > -1"          v-hasPermi="['ecw:offer:update']">{{$t('跟进')}}</el-dropdown-item>
               <el-dropdown-item @click.native="$router.push(`result?offerId=${scope.row.offerId}&number=${scope.row.number}`)" v-if="[3,7].indexOf(scope.row.status) > -1"            v-hasPermi="['ecw:offer:update']">{{$t('结果')}}</el-dropdown-item>
-              <el-dropdown-item @click.native="$router.push('/offer/special?offerId=' + scope.row.offerId)"                    v-if="[3,7].indexOf(scope.row.status) > -1"            v-hasPermi="['ecw:offer:update']">{{$t('特价')}}</el-dropdown-item>
+              <el-dropdown-item @click.native="$router.push('/offer/special?offerId=' + scope.row.offerId)"                    v-if="[1,3,7].indexOf(scope.row.status) > -1"            v-hasPermi="['ecw:offer:update']">{{$t('特价')}}</el-dropdown-item>
               <el-dropdown-item @click.native="cancel(scope.row.offerId)"                                                      v-if="[1,3,7].indexOf(scope.row.status) > -1"          v-hasPermi="['ecw:offer:update']">{{$t('取消')}}</el-dropdown-item>
               <el-dropdown-item @click.native="recovery(scope.row.offerId)"                                                    v-if="[0].indexOf(scope.row.status) > -1"              v-hasPermi="['ecw:offer:update']">{{$t('恢复')}}</el-dropdown-item>
               <el-dropdown-item @click.native="deleteOffer(scope.row.offerId)"                                                 v-if="[0,1,2,3,4,5,6,7].indexOf(scope.row.status) > -1"  v-hasPermi="['ecw:offer:delete']">{{$t('删除')}}</el-dropdown-item>

src/views/ecw/order/addAssociatedOrder.vue

@@ -5,7 +5,7 @@
     <el-form inline label-width="85px" label-position="left">
       <el-form-item label="订单号">
         <div class="content">
-          <el-input v-model="relateOrderId"></el-input>
+            <el-input v-model.trim="params.relateOrderNo"></el-input>
         </div>
       </el-form-item>
       <el-form-item>
@@ -49,6 +49,8 @@
         </template>
       </el-table-column>
     </el-table>
+    <pagination v-show="total > 0" :total="total" :page.sync="params.page" :limit.sync="params.rows"
+                @pagination="getUnassociatedOrder" />
     <el-row style="margin-top: 40px">
       <el-col>
         <el-button type="primary" @click="batchJoin(multipleSelection.map(e => e.orderId))"
@@ -78,9 +80,13 @@ export default {
   data() {
     return {
       orderDetails: {},
-      relateOrderId: '',
       list: [],
       multipleSelection: [],
+      params:{
+        page:1,
+        rows:10
+      },
+      total:0
     }
   },
   created() {
@@ -96,11 +102,12 @@ export default {
   methods: {
     getUnassociatedOrder() {
       getUnGuanlianOrderByOrderId({
-        orderId: this.orderId,
-        relateOrderId: this.relateOrderId ? this.relateOrderId : 0
+          orderId: this.orderId,
+         ...this.params
       }).then(r => {
         if (r.code === 0) {
-          this.list = r.data
+          this.list = r.data.list;
+          this.total = r.data.total;
         }
       })
     },

src/views/ecw/order/associatedOrder.vue

@@ -8,7 +8,7 @@
   <el-divider></el-divider>
   <el-form inline label-width="100px">
     <el-form-item label="订单号"><div class="content">
-      <el-input v-model="params.relateOrderId"></el-input>
+      <el-input v-model.trim="params.relateOrderNo"></el-input>
     </div></el-form-item>
     <el-form-item><div class="content">
       <el-button @click="getList">查询</el-button>
@@ -59,7 +59,7 @@
      </el-table-column>
      <el-table-column label="操作人" prop="creator">
        <template v-slot="{row}">
-         {{userList.find( i => row.creator == i.id).nickname}}
+         {{(userList.find( i => row.creator == i.id) || {}).nickname}}
        </template>
      </el-table-column>
      <el-table-column label="操作时间">
@@ -75,6 +75,8 @@
        </template>
      </el-table-column>
    </el-table>
+  <pagination v-show="total > 0" :total="total" :page.sync="params.page" :limit.sync="params.rows"
+              @pagination="getList" />
 </div>
 </template>
 
@@ -114,13 +116,16 @@ export default {
       orderDetails:{},
       params:{
         orderId:undefined,
-        relateOrderId:undefined
+        relateOrderNo:undefined,
+        page:1,
+        rows:10
       },
       list:[],
       DICT_TYPE,
       getDictDatas,
       multipleSelection:[],
-      userList:[]
+      userList:[],
+      total:0,
     }
   },
   created() {
@@ -137,7 +142,8 @@ export default {
     getList(){
       guanlianList(this.params).then(r => {
         if(r.code === 0){
-          this.list = r.data
+          this.list = r.data.list;
+          this.total = r.data.total;
         }
       })
     },

src/views/ecw/order/batchSingleApplication.vue

@@ -55,7 +55,7 @@
                   {{ row.consignorName }}
                 </p>
                 <p>
-                  {{row.consignorPhone}}
+                  +{{row.consignorCountryCode}}{{row.consignorPhone}}
                 </p>
               </div>
             </div>
@@ -68,7 +68,7 @@
                 {{ row.consigneeName }}
               </p>
               <p>
-                {{ row.consigneePhone}}
+               +{{row.consigneeCountryCode}}{{ row.consigneePhone}}
               </p>
             </div>
           </template>

src/views/ecw/order/cargoControl.vue

@@ -116,13 +116,13 @@
           <template v-if="scope.row.cargoControlStatus == 2">
             <el-button type="text"  size="mini" @click="toDetail(scope.row)" >{{$t('修改')}}</el-button>
             <el-button type="text"  size="mini" @click="toDetail(scope.row)" >{{$t('取消')}}</el-button>
-            <el-button type="text"  size="mini" @click="review(scope.row)" >{{$t('放货复核')}}</el-button>
+            <el-button type="text"  size="mini" @click="review(scope.row)" v-if="scope.row.isToReview">{{$t('放货复核')}}</el-button>
           </template>
           <!--已完成放货-->
           <template v-if="scope.row.cargoControlStatus == 1">
             <el-button type="text"  size="mini" @click="toDetail(scope.row)" >{{$t('查看')}}</el-button>
             <el-button type="text"  size="mini" @click="showTransferCargoOrderId=scope.row.orderId" >{{$t('调货')}}</el-button>
-            <el-button type="text"  size="mini" @click="showFallbackOrder=scope.row">{{$t('反复核')}}</el-button>
+            <el-button type="text"  size="mini" @click="showFallbackOrder=scope.row" v-if="scope.row.isReleaseAfterGoods">{{$t('反复核')}}</el-button>
           </template>
 
           <!-- <el-button type="text"  size="mini" >取消</el-button>

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

@@ -13,7 +13,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('收货人电话')" prop="field103">
-              {{info.consigneePhone}}
+             +{{info.consigneeCountryCode}} {{info.consigneePhone}}
             </el-form-item>
           </el-col>
         </el-row>
@@ -34,7 +34,7 @@
         </el-form-item>
 
          <el-form-item :label="$t('控货手机号')" prop="field106">
-            {{info.phone}}
+            +{{info.countryCode}} {{info.phone}}
         </el-form-item>
         <el-form-item :label="$t('手机验证码')" prop="field106">
             <el-input v-model="formData.code" placeholder="" style="width: 100px; margin-right:10px"></el-input>

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

@@ -47,13 +47,15 @@
             <el-input v-model="formData.consigneeEmail" :placeholder="$t('请输入收货人邮箱')" clearable class="w-150" ></el-input>
           </el-form-item>
         </div>
-        <el-table :data="[formData]" border>
+        <el-table :data="[formData]" border class="release-table">
           <el-table-column :label="$t('控货箱数')">
               {{detail.sumNum}}
           </el-table-column>
           <el-table-column :label="$t('放货箱数')">
             <template slot-scope="{row}">
-              <el-input type="number" v-model.number="row.pickNum" placeholder="" clearable></el-input>
+              <el-form-item prop="pickNum" label-width="0" class="mb-0">
+                <el-input type="number" v-model.number="row.pickNum" placeholder="" clearable></el-input>
+              </el-form-item>
             </template>
           </el-table-column>
           <el-table-column :label="$t('体积') + '(m³)'">
@@ -73,7 +75,7 @@
           </el-table-column>
         </el-table>
         <el-form-item :label="$t('控货手机号')" prop="field117" style="margin-top:20px">
-          <el-input :value="detail.phone" readonly :placeholder="$t('请输入控货手机号')" >
+          <el-input :value="'+' + detail.dialCode + detail.phone" readonly :placeholder="$t('请输入控货手机号')" >
           </el-input>
         </el-form-item>
         <el-form-item :label="$t('手机验证码')" prop="code">
@@ -120,14 +122,22 @@ export default {
               "pickWeight": 0,
               "remarks": "",
             },
-            rules:{
-              consigneeName: {required: true, message: this.$t('请填写收货人')},
-              code: {required: true, message: '请填写验证码'}
-            },
             agreement: false, // 是否同意协议
         }
     },
     computed:{
+        rules(){
+          return {
+            consigneeName: {required: true, message: this.$t('请填写收货人')},
+            code: {required: true, message: '请填写验证码'},
+            pickNum: {
+              type: 'number',
+              max: this.detail.sumNum - this.detail.releaseNum,
+              message: "不能超过剩余箱数",
+              trigger: 'change'
+            }
+          }
+        },
         title(){
             let t = this.$t('放货')
             if(this.detail){
@@ -159,7 +169,6 @@ export default {
             if(!valid){
               return false
             }
-            console.log('submit')
             createPick(Object.assign({orderId: this.orderId}, this.formData)).then(res => {
               this.$message.success(res.msg || this.$t('操作成功'))
               this.show = false
@@ -186,4 +195,7 @@ export default {
     margin-right:10px;
   }
 }
+::v-deep .release-table .el-form-item__error{
+    position: static;
+}
 </style>
\ No newline at end of file

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

@@ -17,11 +17,11 @@
       <el-descriptions-item label="目的地">{{details.logisticsInfoDto ? details.logisticsInfoDto.destTitleZh : ''}}</el-descriptions-item>
       <el-descriptions-item  label="发货人姓名">{{details.consignorVO ? details.consignorVO.name : ''}}</el-descriptions-item>
       <el-descriptions-item  label="发货人公司">{{details.consignorVO ? details.consignorVO.company : ''}}</el-descriptions-item>
-      <el-descriptions-item  label="发货人电话">{{details.consignorVO ? details.consignorVO.countryCode : ''}} {{details.consignorVO ? details.consignorVO.phone : ''}}</el-descriptions-item>
+      <el-descriptions-item  label="发货人电话">+{{details.consignorVO ? details.consignorVO.countryCode : ''}} {{details.consignorVO ? details.consignorVO.phone : ''}}</el-descriptions-item>
       <el-descriptions-item></el-descriptions-item>
       <el-descriptions-item  label="收货人姓名">{{details.consigneeVO ? details.consigneeVO.name :''}}</el-descriptions-item>
       <el-descriptions-item  label="收货人公司">{{details.consigneeVO ? details.consigneeVO.company :''}}</el-descriptions-item>
-      <el-descriptions-item  label="收货人电话">{{details.consigneeVO ? details.consigneeVO.countryCode :''}} {{details.consigneeVO ? details.consigneeVO.phone :''}}</el-descriptions-item>
+      <el-descriptions-item  label="收货人电话"> +{{details.consigneeVO ? details.consigneeVO.countryCode :''}} {{details.consigneeVO ? details.consigneeVO.phone :''}}</el-descriptions-item>
       <el-descriptions-item></el-descriptions-item>
     </el-descriptions>
   </div>

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

@@ -59,8 +59,8 @@
         <p>
           {{row.consignorName}}
         </p>
-        <p>
-         {{row.consignorCountryCode}}  {{row.consignorPhone}}
+        <p style="white-space: nowrap">
+         +{{row.consignorCountryCode}}  {{row.consignorPhone}}
         </p>
       </template>
   </el-table-column>
@@ -69,8 +69,8 @@
         <p>
           {{row.consigneeName}}
         </p>
-        <p>
-          {{row.consigneeCountryCode}} {{row.consigneePhone}}
+        <p style="white-space: nowrap">
+          +{{row.consigneeCountryCode}} {{row.consigneePhone}}
         </p>
       </template>
     </el-table-column>

src/views/ecw/order/edit.vue

@@ -988,6 +988,9 @@ export default {
             prodConditionParamList: this.getProductListWithDefaultValue()
         }).then(res => {
             this.$set(this, 'fee', res.data.costDto)
+            this.form.orderItemVOList.map((item, index) => {
+                this.$set(item, 'fee', res.data.prodCostDtoList[index] || null)
+            })
         }).finally(() => {
             this.calculating = false
         })

src/views/ecw/order/mutexOrder.vue

@@ -8,7 +8,7 @@
     <el-divider></el-divider>
     <el-form inline label-width="100px">
       <el-form-item label="订单号"><div class="content">
-        <el-input v-model="params.relateOrderId"></el-input>
+        <el-input v-model.trim="params.relateOrderNo"></el-input>
       </div></el-form-item>
       <el-form-item><div class="content">
         <el-button @click="getList">查询</el-button>
@@ -75,6 +75,8 @@
         </template>
       </el-table-column>
     </el-table>
+    <pagination v-show="total > 0" :total="total" :page.sync="params.page" :limit.sync="params.rows"
+                @pagination="getList" />
   </div>
 </template>
 
@@ -104,8 +106,10 @@ export default {
       orderDetails:{},
       params:{
         orderId:undefined,
-        mutualOrderId:undefined
+        page:1,
+        rows:10,
       },
+      total:0,
       list:[],
       DICT_TYPE,
       getDictDatas,
@@ -127,7 +131,8 @@ export default {
     getList(){
       guanlianList(this.params).then(r => {
         if(r.code === 0){
-          this.list = r.data
+          this.list = r.data.list;
+          this.total = r.data.total;
         }
       })
     },

src/views/ecw/order/notMutexOrder.vue

@@ -5,7 +5,7 @@
     <el-form inline label-width="85px" label-position="left">
       <el-form-item label="订单号">
         <div class="content">
-          <el-input v-model="mutualOrderId"></el-input>
+          <el-input v-model.trim="params.relateOrderNo"></el-input>
         </div>
       </el-form-item>
       <el-form-item>
@@ -53,6 +53,8 @@
         </template>
       </el-table-column>
     </el-table>
+    <pagination v-show="total > 0" :total="total" :page.sync="params.page" :limit.sync="params.rows"
+                @pagination="getUnassociatedOrder" />
     <el-row style="margin-top: 40px">
       <el-col>
         <el-button type="primary" @click="batchJoin(multipleSelection.map(e => e.orderId))"
@@ -85,6 +87,11 @@ export default {
       mutualOrderId: '',
       list: [],
       multipleSelection: [],
+      total:0,
+      params:{
+        page:1,
+        rows:10,
+      }
     }
   },
   created() {
@@ -101,11 +108,11 @@ export default {
     getUnassociatedOrder() {
       getUnGuanlianOrderByOrderId({
         orderId: this.orderId,
-        mutualOrderId: this.mutualOrderId ? this.mutualOrderId : 0
+        ...this.params,
       }).then(r => {
         if (r.code === 0) {
-          this.list = r.data
-          console.log(this.list[0])
+          this.list = r.data.list;
+          this.total = r.data.total;
         }
       })
     },

src/views/member/user/index.vue

@@ -38,12 +38,16 @@
       <el-table-column label="真实姓名" align="center" prop="identityName" />
       <el-table-column label="区号">
         <template v-slot:default = 'scope'>
-          {{scope.row.areaCode ? `${scope.row.areaCode}`:''}}
+          +{{scope.row.areaCode ? `${scope.row.areaCode}`:''}}
         </template>
       </el-table-column>
       <el-table-column label="手机号" show-overflow-tooltip align="center" prop="mobile" >
      </el-table-column>
-      <el-table-column label="成交" align="center" prop="" show-overflow-tooltip />
+      <el-table-column label="成交" align="center" prop="customerStatus" show-overflow-tooltip >
+        <template v-slot="{row}">
+          {{row.customerStatus === 3 ? '成交' : '非成交'}}
+        </template>
+      </el-table-column>
       <el-table-column label="认证" align="center" :formatter="authentication" />
       <el-table-column label="状态" align="center" prop="status" >
         <template slot-scope="scope">

src/views/member/user/underReview.vue

@@ -36,12 +36,16 @@
       <el-table-column label="真实姓名" align="center" prop="identityName" />
       <el-table-column label="区号">
         <template v-slot:default = 'scope'>
-          {{scope.row.areaCode ? `${scope.row.areaCode}`:''}}
+          +{{scope.row.areaCode ? `${scope.row.areaCode}`:''}}
         </template>
       </el-table-column>
       <el-table-column label="手机号" show-overflow-tooltip align="center" prop="mobile" >
       </el-table-column>
-      <el-table-column label="成交" align="center" prop="" show-overflow-tooltip />
+      <el-table-column label="成交" align="center" prop="" show-overflow-tooltip >
+        <template v-slot="{row}">
+          {{row.customerStatus === 3 ? '成交' : '非成交'}}
+        </template>
+      </el-table-column>
       <el-table-column label="认证" align="center" :formatter="authentication" />
       <el-table-column label="状态" align="center" prop="status" >
         <template slot-scope="scope">