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

public/static/plugins/ueditor/ueditor.config.js

@@ -106,7 +106,7 @@
 
         //,fullscreen : false //是否开启初始化时即全屏，默认关闭
 
-        //,imagePopup:true      //图片操作的浮层开关，默认打开
+        ,imagePopup:true      //图片操作的浮层开关，默认打开
 
         //,autoSyncData:true //自动同步编辑器要提交的数据
         //,emotionLocalization:false //是否开启表情本地化，默认关闭。若要开启请确保emotion文件夹下包含官网提供的images表情文件夹
@@ -297,7 +297,7 @@
         //,toolbarTopOffset:400
 
         //设置远程图片是否抓取到本地保存
-        //,catchRemoteImageEnable: true //设置是否抓取远程图片
+        ,catchRemoteImageEnable: true //设置是否抓取远程图片
 
         //pageBreakTag
         //分页标识符,默认是_ueditor_page_break_tag_

src/api/ecw/batchSingleApplication.js

@@ -33,6 +33,14 @@ export function orderWarehouseInDelete(data){
     data:data,
   })
 }
+//获取退仓审批详情
+export function getRollbackApprovalInfo(params){
+  return request({
+    url:'/order/order-warehouse-in/get-rollback-approval-info',
+    method:'get',
+    params
+     })
+    }
 //通过bpmFormId 获得仓库审核单详情
  export function warehouseApprovalGetByFormId(params){
   return request({

src/api/ecw/customer.js

@@ -166,7 +166,7 @@ export function getBrankByCustomer(data){
 //
 export function levelLogPage(params){
   return request({
-    url:'/customer/level-log/page',
+    url:'/customer/detail/infoList/levelLogPage',
     method:'get',
     params
   })
@@ -174,7 +174,31 @@ export function levelLogPage(params){
 //获取信用等级日志列表
 export function customerCreditLogPage(params){
   return  request({
-    url:'/customer/credit-log/page',
+    url:'/customer/detail/infoList/creditLogPage',
+    method:'get',
+    params
+  })
+}
+//客户详情订单分页
+export function infoListOrderPage(params){
+  return request({
+    url:'/customer/detail/infoList/orderPage',
+    method:'get',
+    params
+  })
+}
+//客户详情 --- 报价
+export  function infoListOfferPage(params){
+  return request({
+    url:'/customer/detail/infoList/offerPage',
+    method:'get',
+    params
+  })
+}
+//客户数据
+export function orderStatistics(params){
+  return request({
+    url:'/customer/detail/infoList/orderStatistics',
     method:'get',
     params
   })

src/api/ecw/order.js

@@ -171,6 +171,16 @@ export function orderWarehouseInUpdateApply(data){
     data
   })
 }
+
+// 入仓修改箱号
+export function orderWarehouseInUpdateLabel(data){
+  return request({
+    url: '/order/order-warehouse-in/update-label',
+    method: 'post',
+    data
+  })
+}
+
 // 获取入仓修改审批单详情-审批使用
 export function getWarehouseUpdateApprovalInfo(id) {
   return request({
@@ -429,3 +439,19 @@ export function orderSpecialNeedGet(params){
     params
   })
 }
+//取消调仓
+  export function cancelAdjust(data){
+  return request({
+    url:'/order/order-warehouse-in/cancel-adjust',
+    method:'post',
+    data
+  })
+  }
+//取消订单费用申请
+ export function feeApplicationCancel(data){
+   return request({
+     url:'/order/fee-application/cancel',
+     method:'delete',
+     data
+   })
+ }

src/api/ecw/productBrank.js

@@ -10,6 +10,15 @@ export function createProductBrank(data) {
 }
 
 // 更新品牌
+export function updateProductBrank(data) {
+  return request({
+    url: '/ecw/product-brank/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 修改品牌默认收费模式
 export function changeFeeModel(data) {
   return request({
     url: '/ecw/product-brank/changeFeeMode',

src/api/member/user.js

@@ -36,11 +36,11 @@ export function getUser(id) {
 }
 
 // 获得用户分页
-export function getUserPage(query) {
+export function getUserPage(params) {
   return request({
     url: '/member/user/page',
     method: 'get',
-    params: query
+    params: params
   })
 }
 
@@ -104,8 +104,8 @@ export function memberUserAuditIdCard(query) {
 export function memberUserAuditEnterprise(query) {
   return request({
     url: '/member/user/audit-enterprise',
-    method: 'get',
-    params: query,
+    method: 'put',
+    data: query,
   })
 }
 
@@ -143,3 +143,11 @@ export function userCreateAuditEnterprise(data){
     data:data,
   })
 }
+//新增用户
+export function createAuditIdCard(data){
+  return request({
+    url:'/member/user/create-audit-idcard',
+    method:'put',
+    data
+  })
+}

src/api/system/needKnow.js

@@ -60,3 +60,13 @@ export function exportNeedKnowExcel(query) {
     responseType: 'blob'
   })
 }
+
+// 下载需知
+export function download(query) {
+  return request({
+    url: '/system/need-know/download',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/components/ChooseContactDialog/index.vue

@@ -2,7 +2,7 @@
     <el-dialog title="选择联系人" visible :before-close="closeDialog" :close-on-click-modal="false">
       <div class="header mb-10 flex-center">
         <div class="flex-center">关键字：</div>
-        <el-input v-model="form.searchKey" placeholder="" class="w-200"></el-input>
+        <el-input v-model="form.searchKey" clearable class="w-200"></el-input>
         <el-button type="primary" class="ml-10" @click="handleQuery">搜索</el-button>
       </div>
       <div class="list">
@@ -18,7 +18,7 @@
                 </div>
                 <div class="line">
                     <div class="label">邮箱：</div>
-                    <div class="value">{{item.emial}}</div>
+                    <div class="value">{{item.email}}</div>
                 </div>
                 <div class="line">
                     <div class="label">公司：</div>

src/components/NeedKnow/index.vue

@@ -5,9 +5,10 @@
     </div>
 </template>
 <script>
-import {getNeedKnowByKey} from '@/api/system/needKnow'
+import {getNeedKnowByKey, download} from '@/api/system/needKnow'
 import html2canvas from 'html2canvas'
 import FileSaver from 'file-saver'
+import saveFie from '@/plugins/download'
 export default {
     props:{
         keyname: String
@@ -23,6 +24,11 @@ export default {
         })
     },
     methods:{
+        downloadPdf(){
+            download({id: this.detail.id}).then(res => {
+                this.$download.pdf(res, '入仓须知.pdf')
+            })
+        },
         download(){
             // 直接保存图片
             let l = this.$loading()

src/main.js

@@ -108,11 +108,30 @@ import '@/styles/index.scss'
 Vue.use(Element, {
   size: Cookies.get('size') || 'medium' // set element-ui default size
 })
+// 重定向路由（关闭当前标签）
 Vue.prototype.$redirect = (path) =>{
    let currentView = router.history.current
    router.replace(path)
    store.dispatch("tagsView/delView", currentView)
 }
+window.ElementUI = Element
+
+// 显示表单错误信息
+Vue.prototype.$showFormValidateErrors = (errors) => {
+   let vm = new Vue()
+   let createElement = vm.$createElement
+   let fieldList = Object.values(errors)
+   Element.Notification({
+         title: '表单错误',
+         type: 'warning',
+         duration: 3000,
+         message: createElement('div', fieldList.map(function (errorList) {
+            return createElement('div', errorList.map((item) => {
+               return createElement('div', item.message)
+            }))
+          }))
+   })
+}
 
 Vue.config.productionTip = false
 

src/plugins/download.js

@@ -24,6 +24,11 @@ export default {
     this.download0(data, fileName, 'text/markdown');
   },
 
+  // 下载pdf
+  pdf(data, fileName){
+    this.download0(data, fileName, 'application/pdf');
+  },
+
   download0(data, fileName, mineType) {
     // 创建 blob
     let blob = new Blob([data], {type: mineType});

src/plugins/tab.js

@@ -32,7 +32,11 @@ export default {
   // 关闭指定tab页签
   closePage(obj) {
     if (obj === undefined) {
-      return store.dispatch('tagsView/delView', router.currentRoute).then(({ lastPath }) => {
+      return store.dispatch('tagsView/delView', router.currentRoute).then(({ visitedViews }) => {
+        let lastPath = '/'
+        if (visitedViews.length > 0){
+          lastPath = visitedViews[visitedViews.length - 1]
+        }
         return router.push(lastPath || '/');
       });
     }

src/router/index.js

@@ -252,6 +252,13 @@ export const constantRoutes = [
         name: 'customerEdit',
         meta: {title: '编辑客户', icon: '', activeMenu: '/customer/customer'}
       },
+      {
+        path: 'add-edit/:customerId(\\d+)',
+        component: (resolve) => import('@/views/ecw/customer/edit'),
+        props: true,
+        name: 'customerEdit',
+        meta: {title: '新建客户', icon: '', activeMenu: '/customer/customer'}
+      },
       {
         path: 'query/:customerId(\\d+)',
         component: (resolve) => import('@/views/ecw/customer/query'),

src/views/ecw/box/shippingSea/nodePage/cabinet/startPacking.vue

@@ -317,7 +317,7 @@ export default {
     /** 表格订单号点击 */
     orderClick(row) {
       orderTagList({ orderId: row.orderId }).then((res) => {
-        const { data = [] } = res;
+        const { data = {} } = res;
         this.orderList = [];
         // 取最长的list
         let dataLength = data.loadList.length;

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

@@ -74,6 +74,7 @@ export default {
     };
   },
   created() {
+    this.getBoxInfo();
     // 仓库
     getWarehouseList().then((r) => {
       this.warehouseList = r.data;
@@ -99,9 +100,6 @@ export default {
       this.allUsers = data.list ?? [];
     });
   },
-  activated() {
-    this.getBoxInfo();
-  },
   methods: {
     /* 获取仓库 */
     importCityName(id) {

src/views/ecw/customer/edit.vue

@@ -33,7 +33,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="客户类别" prop="type">
-                <dict-selector :type="DICT_TYPE.CUSTOMER_TYPE" form-type="select" multiple v-model="form.type"></dict-selector>
+                <dict-selector :type="DICT_TYPE.CUSTOMER_TYPE" form-type="checkbox" multiple v-model="form.type"></dict-selector>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -412,7 +412,7 @@ import {getTradeCityList} from "@/api/ecw/region"
 import {getWarehouseList} from "@/api/ecw/warehouse"
 import CustomerLineTable from '@/components/CustomerLineTable'
 import {getCustomerSelect} from "@/api/ecw/customer"
-import {listServiceUser} from "@/api/system/user"
+import {listServiceUser, listSimpleUsers} from "@/api/system/user"
 import { getZhongPaoBest, getZhongPaoPage } from '@/api/ecw/zhongPao'
 import { getCustomerContactsListByCustomer } from '@/api/ecw/customerContacts'
 import { getCountryListAll } from '@/api/ecw/country'
@@ -456,7 +456,7 @@ export default {
     getCustomerSelect().then(r => {
       this.customerSelect = r.data
     })
-    listServiceUser().then(r => {
+    listSimpleUsers().then(r => {
       this.serviceUserList = r.data
     })
     getCountryListAll().then(r => {

src/views/ecw/customer/index.vue

@@ -23,8 +23,8 @@
       </el-form-item>
       <el-form-item label="客户经理" prop="customerService">
         <el-select v-model="queryParams.customerService" placeholder="请选择客户经理" clearable size="small">
-          <el-option v-for="dict in getDictDatas(DICT_TYPE.COMMON_STATUS)"
-                       :key="dict.value" :label="dict.label" :value="dict.value"/>
+          <el-option v-for="dict in customerServiceList"
+                       :key="dict.id" :label="dict.nickname" :value="dict.id"/>
         </el-select>
       </el-form-item>
       <el-form-item label="客户状态" prop="status">
@@ -209,8 +209,8 @@
           <el-col :span="12">
             <el-form-item label="客户经理" prop="customerService">
               <el-select v-model="form.customerService" placeholder="请选择客户经理">
-                <el-option v-for="dict in getDictDatas(DICT_TYPE.COMMON_STATUS)"
-                           :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
+                <el-option v-for="dict in customerServiceList"
+                           :key="dict.id" :label="dict.nickname" :value="dict.id" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -535,7 +535,6 @@ export default {
     //   this.nodeList = r.data
     // })
     listServiceUser().then(r=>{
-      console.log(r,'客服');
       this.customerServiceList = r.data;
     })
     getCountryListAll().then(r => {
@@ -627,7 +626,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.$router.push('/customer/edit/0')
+      this.$router.push('/customer/add-edit/0')
       // this.reset();
       // this.open = true;
       // this.title = "添加客户";

src/views/ecw/customerConfirm/index.vue

@@ -23,8 +23,8 @@
       </el-form-item>
       <el-form-item label="客户经理" prop="customerService">
         <el-select v-model="queryParams.customerService" placeholder="请选择客户经理" clearable size="small">
-          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
-                       :key="dict.value" :label="dict.label" :value="dict.value"/>
+          <el-option v-for="dict in serviceStaffOptions"
+                       :key="dict.id" :label="dict.nickname" :value="dict.id"/>
         </el-select>
       </el-form-item>
       <el-form-item label="客户状态" prop="status">
@@ -195,8 +195,8 @@
 
           <el-form-item label="客户经理" prop="customerService">
             <el-select v-model="form.customerService" placeholder="请选择客户经理">
-              <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
-                         :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
+              <el-option v-for="dict in serviceStaffOptions"
+                         :key="dict.id" :label="dict.nickname" :value="dict.id" />
             </el-select>
           </el-form-item>
         </el-col>

src/views/ecw/customerToBeAssigned/index.vue

@@ -24,8 +24,8 @@
       </el-form-item>
       <el-form-item label="客户经理" prop="customerService">
         <el-select v-model="queryParams.customerService" placeholder="请选择客户经理" clearable size="small">
-          <el-option v-for="dict in getDictDatas(DICT_TYPE.COMMON_STATUS)"
-                     :key="dict.value" :label="dict.label" :value="dict.value"/>
+          <el-option v-for="dict in customerServiceList"
+                     :key="dict.id" :label="dict.nickname" :value="dict.id"/>
         </el-select>
       </el-form-item>
       <el-form-item label="客户状态" prop="status">
@@ -271,7 +271,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.$router.push('/customer/edit/0')
+      this.$router.push('/customer/add-edit/0')
       // this.reset();
       // this.open = true;
       // this.title = "添加客户";

src/views/ecw/myCustomerService/index.vue

@@ -244,7 +244,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.$router.push('/customer/edit/0')
+      this.$router.push('/customer/add-edit/0')
       // this.reset();
       // this.open = true;
       // this.title = "添加客户";

src/views/ecw/oceanCustomer/index.vue

@@ -24,8 +24,8 @@
       </el-form-item>
       <el-form-item label="客户经理" prop="customerService">
         <el-select v-model="queryParams.customerService" placeholder="请选择客户经理" clearable size="small">
-          <el-option v-for="dict in getDictDatas(DICT_TYPE.COMMON_STATUS)"
-                     :key="dict.value" :label="dict.label" :value="dict.value"/>
+          <el-option v-for="dict in customerServiceList"
+                     :key="dict.id" :label="dict.nickname" :value="dict.id"/>
         </el-select>
       </el-form-item>
       <el-form-item label="客户状态" prop="status">
@@ -278,7 +278,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.$router.push('/customer/edit/0')
+      this.$router.push('/customer/add-edit/0')
       // this.reset();
       // this.open = true;
       // this.title = "添加客户";

src/views/ecw/offer/result.vue

@@ -25,7 +25,7 @@
       </template>
 
       <el-form-item>
-        <el-button type="primary" @click="submitForm">{{form.result==1?"确定并新增草稿订单":"提交"}}</el-button>
+        <el-button type="primary" @click="submitForm">{{form.result==1? $t("确定并新增草稿订单") : $t("提交")}}</el-button>
         <el-button @click="$router.back()">返 回</el-button>
       </el-form-item>
     </el-form>
@@ -86,8 +86,12 @@ export default {
           return;
         }
         let data = Object.assign({}, this.form)
-        updateOfferResult(data).then((response) => {
-          this.$modal.msgSuccess("修改成功");
+        updateOfferResult(data).then(response => {
+          this.$modal.msgSuccess(this.$t("赢单成功"));
+          if(response.data > 0){
+            this.$redirect('../order/edit?id=' + response.data)
+            return
+          }
           this.$router.back();
         });
       });

src/views/ecw/offer/special.vue

@@ -11,7 +11,7 @@
               <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="offer.transportId" />
             </el-descriptions-item>
             <el-descriptions-item :label="$t('出货渠道')">
-              // TODO
+              {{channel ? $l(channel, 'name') : '/'}}
             </el-descriptions-item>
             
             <el-descriptions-item :label="$t('创建时间')">{{offer.createTime}}</el-descriptions-item>
@@ -47,25 +47,25 @@
         <el-table-column
           :label="$t('原价')">
           <template v-slot="{row}">
-            运费：{{ row.originalSeaFreight }} {{ currencyMap[row.seaFreightCurrency] }}/{{ unitMap[row.seaFreightVolume] }}
+            {{$t('运费')}}：{{ row.originalSeaFreight }} {{ currencyMap[row.seaFreightCurrency] }}/{{ unitMap[row.seaFreightVolume] }}
             <br>
-            清关费：{{ row.originalClearanceFreight }} {{ currencyMap[row.clearanceFreightCurrency] }}/{{ unitMap[row.clearanceFreightVolume] }}
+            {{$t('清关费')}}：{{ row.oneClearanceFreight }} {{ currencyMap[row.clearanceFreightCurrency] }}/{{ unitMap[row.clearanceFreightVolume] }}
           </template>
         </el-table-column>
         <el-table-column
           label="成本价">
           <template v-slot="{row}">
-            运费：{{ row.seaFreight }} {{ currencyMap[row.seaFreightCurrency] }}/{{ unitMap[row.seaFreightVolume] }}
+            {{$t('运费')}}：{{ row.seaFreight }} {{ currencyMap[row.seaFreightCurrency] }}/{{ unitMap[row.seaFreightVolume] }}
             <br>
-            清关费：{{ row.clearanceFreight }} {{ currencyMap[row.clearanceFreightCurrency] }}/{{ unitMap[row.clearanceFreightVolume] }}
+            {{$t('清关费')}}：{{ row.oneClearanceFreight }} {{ currencyMap[row.clearanceFreightCurrency] }}/{{ unitMap[row.clearanceFreightVolume] }}
           </template>
         </el-table-column>
         <el-table-column
-          label="销售价">
+          :label="$t('销售价')">
           <template v-slot="{row}">
-            运费：{{ row.seaFreight }} {{ currencyMap[row.seaFreightCurrency] }}/{{ unitMap[row.seaFreightVolume] }}
+            {{$t('运费')}}：{{ row.saleSeaFreight }} {{ currencyMap[row.seaFreightCurrency] }}/{{ unitMap[row.seaFreightVolume] }}
             <br>
-            清关费：{{ row.clearanceFreight }} {{ currencyMap[row.clearanceFreightCurrency] }}/{{ unitMap[row.clearanceFreightVolume] }}
+            {{$t('清关费')}}：{{ row.oneClearanceFreight }} {{ currencyMap[row.clearanceFreightCurrency] }}/{{ unitMap[row.clearanceFreightVolume] }}
           </template>
         </el-table-column>
         <el-table-column
@@ -96,6 +96,7 @@ import {getCurrencyList} from "@/api/ecw/currency"
 import {getProductAttrList} from "@/api/ecw/productAttr"
 import { parseTime } from '@/utils/ruoyi'
 import {listByIds} from '@/api/ecw/region'
+import {getChannel} from '@/api/ecw/channel'
 export default {
   name: "OfferSpecial",
   components: {
@@ -128,7 +129,8 @@ export default {
       currencyList:[],
       productAttrList:[],
       objective: null,
-      departure: null
+      departure: null,
+      channel: null, // 渠道信息
     };
   },
   watch:{
@@ -147,6 +149,13 @@ export default {
         this.loading = false
         this.offer = response.data
         this.getCity()
+        this.getChannel()
+      })
+    },
+    getChannel(){
+      if(!this.offer.channelId) return 
+      getChannel(this.offer.channelId).then(res => {
+        this.channel = res.data
       })
     },
     getCity(){
@@ -171,14 +180,14 @@ export default {
     currencyMap(){
       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
     }

src/views/ecw/order/associatedOrder.vue

@@ -43,7 +43,7 @@
           {{row.orderBackVO.costVO.totalVolume}}m³
         </div>
          <div>
-          {{row.orderBackVO.costVO.totalWorth}}KG
+          {{row.orderBackVO.costVO.totalWeight}}KG
         </div>
        </template>
      </el-table-column>

src/views/ecw/order/cargoControl.vue

@@ -78,7 +78,11 @@
         </template>
       </el-table-column>
       <el-table-column :label="$t('唛头')" align="center" prop="marks" />
-      <el-table-column :label="$t('箱数')" align="center" prop="sumNum" />
+      <el-table-column :label="$t('箱数')" align="center" prop="sumNum" >
+        <template v-slot="{row}">
+          {{row.inWarehouseState > 1 ? row.sumNum : row.totalNum}}
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('已放箱数')" align="center" prop="sumWeight">
         <template slot-scope="{row}">{{row.releaseNum}}</template>
       </el-table-column>

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

@@ -5,7 +5,7 @@
             <div id="myproa">
                 <p style="padding-bottom:10px;font-size:16px;">
                     {{$t('订单号')}}：{{detail.orderNo}}
-                    &nbsp;&nbsp;&nbsp;{{$t('发货人电话')}}：{{detail.name}} {{detail.phone}}
+                    &nbsp;&nbsp;&nbsp;{{$t('发货人电话')}}：{{detail.consignorVO.countryCode}} {{detail.consignorVO.phone}}
                     &nbsp;&nbsp;&nbsp;{{$t('提货地点')}}：{{objective.titleZh}}
                     <img :src="qrcode" style="margin-left: 10px;width:17mm;vertical-align:middle" />
                 </p>
@@ -33,7 +33,7 @@
                                 </label>
                             </td>
                             <td style="text-align:center;padding:0 0px;border:1px dashed #ccc;">
-                                {{item.marks}}
+                                {{detail.marks}}
                             </td>
                             <td style="text-align:center;padding:0 0px;border:1px dashed #ccc;">
                                 {{item.prodTitleZh}}<br/>{{item.prodTitleEn}}

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

@@ -11,18 +11,17 @@
         <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="details.transportId"></dict-tag>
       </el-descriptions-item>
       <el-descriptions-item label="出货渠道">
-        {{details.channelId}}123
        <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="details.channelId"></dict-tag>
       </el-descriptions-item>
       <el-descriptions-item label="始发地">{{ details.logisticsInfoDto ? details.logisticsInfoDto.startTitleZh :''}}</el-descriptions-item>
       <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.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.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/specialNeeds.vue

@@ -3,6 +3,7 @@
   <el-dialog :before-close="()=>{$emit('update:show',false)
   }" center width="80%"  :visible.sync="show">
     <div class="content">
+      <h1>{{orderNo}} 特需</h1>
       <el-form label-width="180px" label-position="left">
         <el-form-item label="特殊要求">
           <el-checkbox-group v-model="advanceType">
@@ -40,6 +41,7 @@ export default {
     orderId:{
       type:[String,Number],
     },
+    orderNo:[String,Number],
     show:Boolean,
   },
   computed:{

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

@@ -54,32 +54,23 @@
     </el-table-column>
     <el-table-column label="始发仓" prop="startWarehouseName"></el-table-column>
     <el-table-column label="目的地" prop="objectiveName"></el-table-column>
-    <el-table-column
-    label="发货人">
+    <el-table-column label="发货人">
       <template v-slot="{row}">
         <p>
           {{row.consignorName}}
         </p>
         <p>
-          {{row.consignorPhone}}
+         {{row.consignorCountryCode}}  {{row.consignorPhone}}
         </p>
       </template>
   </el-table-column>
-    <
-    <el-table-column
-      header-align="center"
-      align="center"
-      prop="columnProp"
-      label="columnLabel"
-    >
-    </el-table-column>
-      label="收货人">
-      <template v-slot="{row}">
+      <el-table-column label="收货人">
+    <template v-slot="{row}">
         <p>
           {{row.consigneeName}}
         </p>
         <p>
-          {{row.consigneePhone}}
+          {{row.consigneeCountryCode}} {{row.consigneePhone}}
         </p>
       </template>
     </el-table-column>
@@ -123,8 +114,8 @@
       申请说明
     </p>
     <div >
-      从【{{selectWarehouse(FeeDetails.details && FeeDetails.details.warehouseInId ? FeeDetails.details.warehouseInId : '' )}}】 调到
-        【{{selectWarehouse(FeeDetails.details && FeeDetails.details.warehouseOutId ? FeeDetails.details.warehouseOutId : '' )}}】
+      从 【{{selectWarehouse(FeeDetails.details && FeeDetails.details.warehouseOutId ? FeeDetails.details.warehouseOutId : '' )}}】 调到
+      【{{selectWarehouse(FeeDetails.details && FeeDetails.details.warehouseInId ? FeeDetails.details.warehouseInId : '' )}}】
     </div>
   </div>
   <div v-if="type === 2">
@@ -226,7 +217,7 @@ export default {
           warehouseApprovalGetByFormId({formId:this.processInstanceID}).then( r => {
             this.FeeDetails = r.data
             this.FeeDetails.details = JSON.parse(r.data.details)
-            getOrderPage({orderIdList:r.data.adjustActualOrderIds}).then(res=>{
+              getOrderPage({orderIdList:r.data.adjustActualOrderIds}).then(res=>{
               this.list = res.data.list
             })
 

src/views/ecw/order/create.vue

+<script>
+// 对edit组件复用并更名，防止keepalive缓存数据
+import edit from './edit.vue'
+edit.name = 'OrderCreate'
+export default edit
+</script>
\ No newline at end of file

src/views/ecw/order/edit.vue

@@ -360,12 +360,11 @@
                 </div>
             </div>
             <div>
-                <el-form-item :label="$t('预计送货日期')" prop="deliveryDate" class="ml-20">
+                <el-form-item :label="$t('预计送货日期')" prop="deliveryDate">
                     <el-date-picker v-model="form.deliveryDate" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
                 </el-form-item>
             </div>
             <div>
-                
                 <el-form-item :label="$t('收货方式')" prop="harvestMethod" class="ml-20">
                     <dict-selector :type="DICT_TYPE.ECW_HARVEST_METHOD" v-model="form.harvestMethod" :filter="item => item.value == 1 || homeDeliveryService" defaultable />
                 </el-form-item>
@@ -407,30 +406,39 @@
                     <el-button type="primary" slot="append" @click="getOrderCourierNumber">{{$t('生成单号')}}</el-button>
                 </el-input>
             </el-form-item>
-            <br/>
-            <el-form-item :label="$t('是否双清')" v-if="[2,3,4].indexOf(+form.transportId) > -1">
-                <dict-selector v-model="form.doubleClear" form-type="radio" :type="DICT_TYPE.ECW_DOUBLE_CLEAR" />
-            </el-form-item>
-            <el-form-item :label="$t('航空公司')" v-if="[3,4].indexOf(+form.transportId) > -1">
-                <!--待查询备选数据-->
-                <el-select placeholder="" v-model="form.airlineCompany">
-                </el-select>
-            </el-form-item>
-            
-            <el-form-item :label="$t('船公司')" v-if="[2].indexOf(+form.transportId) > -1">
-                <el-select placeholder="" v-model="form.shippingCompany">
-                </el-select>
-            </el-form-item>
 
-            <el-form-item :label="$t('清关证书')" v-if="[2,3,4].indexOf(+form.transportId) > -1">
-                <dict-selector v-model="form.customsClearCert"  form-type="radio" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" fomatter="bool" />
-            </el-form-item>
-            <el-form-item label="清关证书备注" v-if="[2,3,4].indexOf(+form.transportId) > -1">
-                <el-input v-model="form.remarks" ></el-input>
-            </el-form-item>
-            <el-form-item label="是否拆包" v-if="[3,4].indexOf(+form.transportId) > -1">
-                <dict-selector v-model="form.isUnpack"  form-type="radio" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" fomatter="bool" />
-            </el-form-item>
+            <div v-if="[2,3,4].indexOf(+form.transportId) > -1">
+                <el-form-item :label="$t('是否双清')">
+                    <dict-selector v-model="form.doubleClear" form-type="radio" :type="DICT_TYPE.ECW_DOUBLE_CLEAR" />
+                </el-form-item>
+            </div>
+            
+            <div v-if="[3,4].indexOf(+form.transportId) > -1">
+                <el-form-item :label="$t('航空公司')">
+                    <!--待查询备选数据-->
+                    <el-select placeholder="" v-model="form.airlineCompany">
+                    </el-select>
+                </el-form-item>
+            </div>
+            <div  v-if="[2].indexOf(+form.transportId) > -1">
+                <el-form-item :label="$t('船公司')">
+                    <el-select placeholder="" v-model="form.shippingCompany">
+                    </el-select>
+                </el-form-item>
+            </div>
+            <div v-if="[2,3,4].indexOf(+form.transportId) > -1"> 
+                <el-form-item :label="$t('清关证书')">
+                    <dict-selector v-model="form.customsClearCert"  form-type="radio" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" fomatter="bool" />
+                </el-form-item>
+                <el-form-item label="清关证书备注" >
+                    <el-input v-model="form.remarks" ></el-input>
+                </el-form-item>
+            </div>
+            <div v-if="[3,4].indexOf(+form.transportId) > -1">
+                <el-form-item label="是否拆包">
+                    <dict-selector v-model="form.isUnpack"  form-type="radio" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" fomatter="bool" />
+                </el-form-item>
+            </div>
             <div class="form-section">
                 <el-form-item :label="$t('单票立刻转运')" v-if="[3,4].indexOf(+form.transportId) > -1">
                     <dict-selector v-model="form.isSingleTicketTransport"  form-type="radio" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" fomatter="bool" />
@@ -513,6 +521,8 @@ import ChooseContactDialog from '@/components/ChooseContactDialog'
 import QuickCreateCustomer from '@/components/QuickCreateCustomer'
 import {calculationPrice} from '@/api/ecw/product'
 
+// 缓存默认的表单数据
+let defaultFormData = null
 
 export default {
   name: "EcwOrderEdit",
@@ -716,6 +726,8 @@ export default {
     }
   },
   created() {
+    defaultFormData = Object.assign({}, this.form)
+
     this.couponTypeList = this.getDictDatas(this.DICT_TYPE.ECW_COUPON_TYPE)
     this.couponTypeList.forEach(item => {
         this.$set(this.selectedCoupons, item.value, null)
@@ -935,6 +947,11 @@ export default {
         // 添加的提交
         createOrder(data).then(response => {
           this.$modal.msgSuccess(this.$t("新增成功"));
+
+          // 重置数据
+          this.form = {...defaultFormData}
+          this.$refs.form.clearValidate()
+
           this.$redirect('success?orderId=' + response.data)
         });
       });

src/views/ecw/order/feeApplication.vue

@@ -62,7 +62,9 @@
         <work-flow xmlkey="free_apply" v-model="selectedUsers"  />
       </div>
       <div style="text-align: center;margin-top: 20px;">
-        <el-button style="margin-right: 30px;" @click="submit">提交</el-button>
+        <el-button v-if="!IsExamine" style="margin-right: 30px;" @click="submit">提交</el-button>
+        <el-button v-if="IsExamine" style="margin-right: 30px;" @click="examineFn">审核中</el-button>
+        <el-button v-if="IsExamine" style="margin-right: 30px;" @click="cancel">取消审核</el-button>
         <el-button>取消</el-button>
       </div>
     </div>
@@ -71,7 +73,13 @@
 </template>
 
 <script>
-import {getOrder, feeApplicationCreate, ApplicationListByOrderId, applicationUpdate} from "@/api/ecw/order";
+import {
+  getOrder,
+  feeApplicationCreate,
+  ApplicationListByOrderId,
+  applicationUpdate,
+  feeApplicationListByOrderId, feeApplicationCancel
+} from "@/api/ecw/order";
 import { getDictDatas, DICT_TYPE } from '@/utils/dict';
 import Template from "@/views/cms/template";
 import workFlow from "@/components/WorkFlow";
@@ -108,6 +116,9 @@ export default {
       return (row)=>{
         return this.list.findIndex(e => e.id = row.id)
       }
+    },
+    IsExamine(){
+      return this.list.some(e => e.status === 1)
     }
   },
   methods:{
@@ -163,8 +174,28 @@ export default {
     },
     modify(row){
       this.isModifyIf = true;
-      this.$set(this.isModify, this.list.findIndex(e => e.id = row.id), false )
+       this.$set(this.isModify, this.list.findIndex(e => e.id = row.id), false )
+    },
+    examineFn(){
+     let item =  this.list.find(e => e.status === 1);
+      this.$router.push({path:'/bpm/process-instance/detail',query:{id:item.bpmProcessId}})
     },
+    cancel(){
+      this.$prompt('请输入取消原因', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+      }).then(({ value }) => {
+        let item =  this.list.find(e => e.status === 1);
+        feeApplicationCancel({huifu:value,bpmProcessId:item.bpmProcessId}).then(r => {
+          this.$message({
+            type: 'success',
+            message:'取消成功'
+          });
+          this.$emit('update:dialogVisible',false)
+        })
+      }).catch(() => {
+      });
+    }
   },
   watch:{
     dialogVisible(val){

src/views/ecw/order/index.vue

@@ -22,7 +22,7 @@
       </el-form-item>
       <el-form-item :label="$t('始发地')" prop="startWarehouseId">
         <el-select v-model="queryParams.startWarehouseId" :placeholder="$t('请选择始发地')">
-          <el-option v-for="item in expoerCityList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
+          <el-option v-for="item in exportCityList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('目的地')" prop="destWarehouseId">
@@ -173,7 +173,7 @@
               <el-button v-if="scope.row.status == 88" size="mini" type="text" icon="el-icon-delete" @click="oprateOrder(scope.row.orderId, 'recoveryOrder')">{{$t('恢复订单')}}</el-button>
 
               <el-button type="text"  size="mini" @click="feeApplicationBol = true; orderId = scope.row.orderId">{{$t('费用申请')}}</el-button>
-              <el-button type="text"  size="mini" @click="orderId = scope.row.orderId;isShow = true" >{{$t('特需')}}</el-button>
+              <el-button type="text"  size="mini" @click="orderId = scope.row.orderId;orderNo = scope.row.orderNo;isShow = true" >{{$t('特需')}}</el-button>
               <el-button type="text"  size="mini" @click="$router.push(`/order/associated-order/${scope.row.orderId}`)" >{{$t('关联')}}</el-button>
               <el-button type="text"  size="mini" @click="$router.push(`/order/mutex-order/${scope.row.orderId}`)" >{{$t('互斥')}}</el-button>
               <el-button size="mini" type="text" icon="el-icon-edit" @click="$router.push('/order/special/' + scope.row.orderId)"
@@ -209,9 +209,9 @@
                 v-hasPermi="['ecw:order:update']">{{$t('入仓')}}</el-button>
               <el-button size="mini" type="text" icon="el-icon-edit" @click="show = true;orderId = scope.row.orderId; "
                 v-hasPermi="['ecw:order:update']">{{$t('退仓')}}</el-button>
-              <el-button type="text"  size="mini" @click="orderId = scope.row.orderId;warehouseBol=true;">{{$t('调仓')}}</el-button>
-              <el-button type="text"  size="mini" @click="$router.push({path:'/order/transfer-warehousing/' + scope.row.orderId + '/'  + 1 })" >{{$t('调拨出仓')}}</el-button>
-              <el-button type="text"  size="mini" @click="$router.push({path:'/order/transfer-to-warehouse/' + scope.row.orderId + '/'  + 2 })" >{{$t('调拨到仓')}}</el-button>
+              <el-button type="text" :disabled="!(scope.row.status === 5 && (scope.row.inWarehouseState === 215 ||scope.row.inWarehouseState === 0))"  size="mini" @click="orderId = scope.row.orderId;warehouseBol=true;">{{$t('调仓')}}</el-button>
+              <el-button type="text" :disabled="!(scope.row.status === 8 && scope.row.inWarehouseState === 213)"  size="mini" @click="$router.push({path:'/order/transfer-warehousing/' + scope.row.orderId + '/'  + 1 })" >{{$t('调拨出仓')}}</el-button>
+              <el-button type="text" :disabled="!(scope.row.status === 8 && scope.row.inWarehouseState === 214)"  size="mini" @click="$router.push({path:'/order/transfer-to-warehouse/' + scope.row.orderId + '/'  + 2 })" >{{$t('调拨到仓')}}</el-button>
             </div>
 
           </el-popover>
@@ -373,7 +373,7 @@ export default {
     };
   },
   computed: {
-    expoerCityList() {
+    exportCityList() {
       return this.tradeCityList.filter(item => item.type == 2)
     },
     importCityList() {

src/views/ecw/order/mutexOrder.vue

@@ -43,7 +43,7 @@
             {{row.orderBackVO.costVO.totalVolume}}m³
           </div>
           <div>
-            {{row.orderBackVO.costVO.totalWorth}}KG
+            {{row.orderBackVO.costVO.totalWeight}}KG
           </div>
           </template>
       </el-table-column>

src/views/ecw/order/notMutexOrder.vue

@@ -33,7 +33,7 @@
             {{row.costVO.totalVolume}}m³
           </div>
           <div>
-            {{row.costVO.totalWorth}}KG
+            {{row.costVO.totalWeight}}KG
           </div>
         </template>
       </el-table-column>

src/views/ecw/order/success.vue

@@ -31,7 +31,7 @@
             <!-- <img :src="noticeUrl" id="noticeImg" /> -->
             <need-know keyname="warehousing" ref="needKnow" />
             <div style="text-align:center">
-                <el-button type="primary" @click="$refs.needKnow.download()">{{$t('下载')}}</el-button>
+                <el-button type="primary" @click="$refs.needKnow.downloadPdf()">{{$t('下载')}}</el-button>
             </div>
         </el-dialog>
     </div>

src/views/ecw/order/transferWarehousing.vue

 <template>
   <div style="padding: 0 20px">
-    <h1>调拨出仓</h1>
+    <h1>{{type == 1 ? '调拨出仓' :'调拨到仓'}}</h1>
     <el-divider content-position="left">
       订单信息
     </el-divider>
@@ -123,7 +123,7 @@
       <el-button v-if="type == 1" size="medium" @click="cancellationOfOrder">取消调仓</el-button>
       <el-button size="medium" @click="$tab.closeOpenPage({path:'/order/order'})">返回</el-button>
     </div>
-    <warehouse-location ref="area" :city-id="warehouseDetails.warehouseInShi"  :visible.sync="areaVisible" v-model="params.orderLocationCreateReqVOList" :warehouse-id="warehouseDetails.warehouseInId" :order-id="Number(orderId)"></warehouse-location>
+    <warehouse-location ref="area" :city-id="warehouseInShi"  :visible.sync="areaVisible" v-model="params.orderLocationCreateReqVOList" :warehouse-id="warehouseDetails.warehouseInId" :order-id="Number(orderId)"></warehouse-location>
     <el-dialog :title="'订单转异'" center :visible.sync="escapeBol">
       <el-form label-position="top" label-width="200">
         <el-form-item label="原因类型">
@@ -147,6 +147,7 @@
 <script>
 import ordeDetailsForm from "@/views/ecw/order/components/ordeDetailsForm";
 import {
+  cancelAdjust,
   getAdjustInfo,
   getOrder, listByOrderId,
   orderWarehouseInGetAdjustInfo,
@@ -198,7 +199,7 @@ export default {
         descZh:'',
         exceptionUrls:[]
       },
-      warehouseInShi:'',
+      warehouseInShi:0,
       expressList:[],
       storageSpaceList:[],
       applyStatus:{}
@@ -282,7 +283,7 @@ export default {
           })
         }
       })
-      this.warehouseInShi = this.warehouseDetails.warehouseInShi
+      this.warehouseInShi = this.warehouseDetails.warehouseInShi || ''
       this.params.phone = this.warehouseDetails.phone || '';
       this.params.logisticsNo = this.warehouseDetails.logisticsNo;
       this.params.id = this.warehouseDetails.id;
@@ -335,11 +336,17 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
       }).then(({ value }) => {
-        warehouseApprovalCancel(this.applyStatus.orderWarehouseApprovalBackVO.id,value) .then(r => {
-          if(r.data){
-            this.$message.success('取消调仓成功')
+        cancelAdjust({
+          orderId: this.orderId,
+          reason: value,
+        }).then(r => {
+          console.log(r,'r');
+          if(r.code === 0){
+            this.$message({
+              type: 'info',
+              message: '取消调仓成功'
+            });
             this.$tab.closeOpenPage({path:'/order/order'})
-
           }
         })
       }).catch(() => {
@@ -348,7 +355,7 @@ export default {
           message: '取消成功'
         });
       });
-    }
+    },
   },
 }
 </script>

src/views/ecw/order/warehousing/components/editDialog.vue

 <template>
   <div>
     <el-dialog
-      :title="(edit ? '入仓修改' : (warehousing.orderWarehouseInBackItemDoList.length > 0 ? '入仓补充' : '入仓操作')) + '-货物入仓'"
+      :title="(edit ? '入仓修改' : (warehousing.orderWarehouseInBackItemDoList.length > 0 ? '入仓补充' : '入仓操作')) + ' - ' + warehousing.orderNo"
       :visible.sync="opened"
       width="1080px"
     >
@@ -11,7 +11,7 @@
             <el-descriptions-item label="中文品名">{{ warehousing.prodTitleZh }}</el-descriptions-item>
             <el-descriptions-item label="英文品名">{{ warehousing.prodTitleEn }}</el-descriptions-item>
             <el-descriptions-item label="品牌">
-              <span v-if="warehousing.orderWarehouseInBackItemDoList && warehousing.orderWarehouseInBackItemDoList.length">{{ form.brand ? brand : '无' }}</span>
+              <span v-if="false">{{ form.brand ? brand : '无' }}</span>
               <el-select
                 v-else v-model="form.brand"
                 placeholder="可修改"
@@ -29,16 +29,22 @@
             <el-descriptions-item label="是否备案">{{ isBeian }}</el-descriptions-item>
             <el-descriptions-item label="收费模式">{{ feeType }}</el-descriptions-item>
             <el-descriptions-item label="填单参数">
-              箱数：{{ warehousing.num }}<br>
-              体积：{{ warehousing.volume }}m³<br>
-              重量：{{ warehousing.weight }}Kg
+              箱数：
+              <el-input size="mini" v-if="edit" v-model="warehousing.num" style="display: inline-block;width: 100px"></el-input>
+              <span v-else>{{ warehousing.num }}</span><br>
+              体积：
+              <el-input size="mini" v-if="edit" v-model="warehousing.volume" style="display: inline-block;width: 100px"></el-input>
+              <span v-else>{{ warehousing.volume }}</span>m³<br>
+              重量：
+              <el-input size="mini" v-if="edit" v-model="warehousing.weight" style="display: inline-block;width: 100px"></el-input>
+              <span v-else>{{ warehousing.weight }}</span>Kg
             </el-descriptions-item>
           </el-descriptions>
           <el-form ref="form" :model="form" label-width="80px" style="margin-top: 20px">
             <el-form-item label="材质">
               <dict-selector :type="DICT_TYPE.ECW_PRODUCT_MATERIAL" v-model="form.material"></dict-selector>
             </el-form-item>
-            <el-form-item label="入仓时间">
+            <el-form-item label="入仓时间" v-if="!edit">
               <el-date-picker v-model="form.inTime" type="datetime" placeholder="请选择入仓时间" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
             </el-form-item>
           </el-form>
@@ -56,7 +62,7 @@
                 <el-table-column label="箱数" width="150px">
                   <template v-slot="{r,c,$index}">
                     <el-form-item :rules="tableFormRules.cartonsNum" :prop="$index + '.cartonsNum'">
-                      <span v-if="tableData[$index].id">
+                      <span v-if="tableData[$index].id && !edit">
                         {{ tableData[$index].cartonsNum }}
                         {{ getDictDataLabel(DICT_TYPE.ECW_PACKAGE_TYPE, tableData[$index].unit) }}
                       </span>
@@ -69,31 +75,31 @@
                 <el-table-column label="包装类型" width="100px">
                   <template v-slot="{r,c,$index}">
                     <el-form-item>
-                      <span v-if="tableData[$index].id">{{ getDictDataLabel(DICT_TYPE.ECW_PACKAGE_TYPE, tableData[$index].unit) }}</span>
+                      <span v-if="tableData[$index].id && !edit">{{ getDictDataLabel(DICT_TYPE.ECW_PACKAGE_TYPE, tableData[$index].unit) }}</span>
                       <dict-selector v-else :type="DICT_TYPE.ECW_PACKAGE_TYPE" v-model="tableData[$index].unit"></dict-selector>
                     </el-form-item>
                   </template>
                 </el-table-column>
                 <el-table-column label="长(cm)">
                   <template v-slot="{r,c,$index}">
-                    <el-form-item :rules="tableFormRules.boxGauge1" :prop="$index + '.boxGauge1'">
-                      <span v-if="tableData[$index].id">{{ tableData[$index].boxGauge ? tableData[$index].boxGauge.split('*')[0] : '' }}</span>
+                    <el-form-item :rules="tableFormRules.boxGauge1" :prop="!tableData[$index].id && $index + '.boxGauge1'">
+                      <span v-if="tableData[$index].id && !edit">{{ tableData[$index].boxGauge ? tableData[$index].boxGauge.split('*')[0] : '' }}</span>
                       <el-input v-else v-model.number="tableData[$index].boxGauge1" placeholder="" @blur="handleVolume($index)"></el-input>
                     </el-form-item>
                   </template>
                 </el-table-column>
                 <el-table-column label="宽(cm)">
                   <template v-slot="{r,c,$index}">
-                    <el-form-item :rules="tableFormRules.boxGauge2" :prop="$index + '.boxGauge2'">
-                      <span v-if="tableData[$index].id">{{ tableData[$index].boxGauge ? tableData[$index].boxGauge.split('*')[1] : '' }}</span>
+                    <el-form-item :rules="tableFormRules.boxGauge2" :prop="!tableData[$index].id && $index + '.boxGauge2'">
+                      <span v-if="tableData[$index].id && !edit">{{ tableData[$index].boxGauge ? tableData[$index].boxGauge.split('*')[1] : '' }}</span>
                       <el-input v-else v-model.number="tableData[$index].boxGauge2" placeholder="" @blur="handleVolume($index)"></el-input>
                     </el-form-item>
                   </template>
                 </el-table-column>
                 <el-table-column label="高(cm)">
                   <template v-slot="{r,c,$index}">
-                    <el-form-item :rules="tableFormRules.boxGauge3" :prop="$index + '.boxGauge3'">
-                      <span v-if="tableData[$index].id">{{ tableData[$index].boxGauge ? tableData[$index].boxGauge.split('*')[2] : '' }}</span>
+                    <el-form-item :rules="tableFormRules.boxGauge3" :prop="!tableData[$index].id && $index + '.boxGauge3'">
+                      <span v-if="tableData[$index].id && !edit">{{ tableData[$index].boxGauge ? tableData[$index].boxGauge.split('*')[2] : '' }}</span>
                       <el-input v-else v-model.number="tableData[$index].boxGauge3" placeholder="" @blur="handleVolume($index)"></el-input>
                     </el-form-item>
                   </template>
@@ -101,7 +107,7 @@
                 <el-table-column label="体积(m³)">
                   <template v-slot="{r,c,$index}">
                     <el-form-item :rules="tableFormRules.volume" :prop="$index + '.volume'">
-                      <span v-if="tableData[$index].id">{{ tableData[$index].volume }}</span>
+                      <span v-if="tableData[$index].id && !edit">{{ tableData[$index].volume }}</span>
                       <el-input v-else v-model.number="tableData[$index].volume" placeholder=""></el-input>
                     </el-form-item>
                   </template>
@@ -109,7 +115,7 @@
                 <el-table-column label="重量(Kg)">
                   <template v-slot="{r,c,$index}">
                     <el-form-item :rules="tableFormRules.weight" :prop="$index + '.weight'">
-                      <span v-if="tableData[$index].id">{{ tableData[$index].weight }}</span>
+                      <span v-if="tableData[$index].id && !edit">{{ tableData[$index].weight }}</span>
                       <el-input v-else v-model.number="tableData[$index].weight" placeholder=""></el-input>
                     </el-form-item>
                   </template>
@@ -117,7 +123,7 @@
                 <el-table-column label="数量" width="130px">
                   <template v-slot="{r,c,$index}">
                     <el-form-item :rules="tableFormRules.quantityAll" :prop="$index + '.quantityAll'">
-                      <span v-if="tableData[$index].id">{{ tableData[$index].quantityAll }}</span>
+                      <span v-if="tableData[$index].id && !edit">{{ tableData[$index].quantityAll }}</span>
                       <el-input v-else v-model.number="tableData[$index].quantityAll" placeholder="">
                         <template slot="append">个</template>
                       </el-input>
@@ -127,7 +133,7 @@
                 <el-table-column label="快递单号">
                   <template v-slot="{r,c,$index}">
                     <el-form-item>
-                      <span v-if="tableData[$index].id">{{ tableData[$index].expressNo }}</span>
+                      <span v-if="tableData[$index].id && !edit">{{ tableData[$index].expressNo }}</span>
                       <el-input v-else v-model="tableData[$index].expressNo" placeholder=""></el-input>
                     </el-form-item>
                   </template>
@@ -588,7 +594,13 @@ export default {
       return this.brandList.find(e => e.id === this.form1.brand) || ''
     },
     tableData() {
-      return [...this.warehousing.orderWarehouseInBackItemDoList, ...this.form.orderWarehouseInItemDoList]
+      if (!this.edit){
+        return [...this.warehousing.orderWarehouseInBackItemDoList, ...this.form.orderWarehouseInItemDoList]
+      }
+
+      // 入仓修改的时候
+      this.form.orderWarehouseInItemDoList = this.warehousing.orderWarehouseInBackItemDoList
+      return this.form.orderWarehouseInItemDoList
     },
     tableData1() {
       return this.form1.orderWarehouseInItemDoList
@@ -638,7 +650,7 @@ export default {
           return brand.titleZh
         }
       }
-      return ''
+      return '0'
     }
   }
 }

src/views/ecw/order/warehousing/index.vue

@@ -86,8 +86,8 @@
     </el-table>
 
     <h2 v-if="orderSpecialNeeds.length > 0">特殊需求</h2>
-    <el-form ref="form" :model="form" label-width="120px" style="max-width: 500px;">
-      <el-form-item :label="item.label" v-for="(item, index) in orderSpecialNeeds" :key="item.value">
+    <el-form ref="form" :model="form" label-width="120px">
+      <el-form-item :label="item.label" v-for="(item, index) in orderSpecialNeeds" :key="item.value" style="width: 400px">
         <el-input v-model="form.orderSpecialNeedReceivableReqVoList[index].receivableMoney" :placeholder="'请输入' + item.label">
           <el-select v-model="form.orderSpecialNeedReceivableReqVoList[index].receivableMoneyCurrency" placeholder="请选择" slot="append" style="width: 100px">
             <el-option
@@ -125,6 +125,20 @@
         <el-button @click="escapeBol = true;" type="primary">转异</el-button>
         <el-button type="primary" @click="finishVisible = true">完成入仓</el-button>
       </div>
+
+      <template v-if="order.status === 5">
+        <h2>标枪箱号</h2>
+
+        <div v-for="(item, index) in label.orderLabelDtoList" :key="index" style="margin-bottom: 10px">
+          <el-input-number v-model="item.start" controls-position="right"></el-input-number> -
+          <el-input-number v-model="item.end" controls-position="right"></el-input-number>
+          <el-button icon="el-icon-minus" circle v-show="index !== 0" @click="label.orderLabelDtoList.splice(index, 1)" style="margin-left: 10px"></el-button>
+          <el-button icon="el-icon-plus" circle @click="handleLabelAdd(index)"></el-button>
+        </div>
+        <div style="text-align: center">
+          <el-button type="primary" @click="handleLabelSubmit">修改箱号</el-button>
+        </div>
+      </template>
     </el-form>
 
     <warehouse-area-dialog ref="area" :visible.sync="areaVisible" v-model="form.orderLocationCreateReqVOList"
@@ -176,7 +190,7 @@ import {
   getOrder,
   getOrderWarehouseIn,
   getSpecialListByOrderId, listByOrderId,
-  orderWarehouseInFinish,
+  orderWarehouseInFinish, orderWarehouseInUpdateLabel,
   rollbackDelete
 } from '@/api/ecw/order'
 import orderBaseInfo from "@/components/OrderBaseInfo"
@@ -238,10 +252,36 @@ export default {
       isShowPrintTag: false,
       isShowPrint: false,
       escapeBol:false,
+
+      label: {
+        "orderId": 0,
+        "orderLabelDtoList": [
+          {
+            "end": 0,
+            "start": 0
+          }
+        ]
+      }
     }
   },
 
   methods: {
+    handleLabelSubmit(){
+      orderWarehouseInUpdateLabel({
+        ...this.label,
+        orderId: this.orderId
+      }).then(r => {
+        if (r.code === 0){
+
+        }
+      })
+    },
+    handleLabelAdd(index){
+      this.label.orderLabelDtoList.splice(index + 1, 0, {
+        "end": '',
+        "start": ''
+      })
+    },
     getTowSum(){
       let sumVolume = 0
       let sumWeight = 0

src/views/ecw/order/withdrawal.vue

@@ -20,7 +20,9 @@
         <work-flow xmlkey="retired_warehouse" v-model="params.copyUserId"  />
       </div>
       <div>
-        <el-button @click="submit" type="primary" style="margin-right: 20px;">确定退仓</el-button>
+        <el-button v-if="isExamine" @click="submit" type="primary" style="margin-right: 20px;">确定退仓</el-button>
+        <el-button v-if="!isExamine" @click="$router.push({query:{id:details.formId},path:'/bpm/process-instance/detail'})" type="primary" style="margin-right: 20px;">审核中</el-button>
+        <el-button  v-if="!isExamine" type="primary" style="margin-right: 20px;" @click="cancellationOfOrder">取消审核</el-button>
         <el-button @click="$parent.show = false;">不，再考虑考虑</el-button>
       </div>
     </div>
@@ -28,8 +30,12 @@
 </template>
 <!--退仓-->
 <script>
-import {getOrder} from "@/api/ecw/order";
-import {orderWarehouseInDelete} from "@/api/ecw/batchSingleApplication";
+import {cancelAdjust, getOrder} from "@/api/ecw/order";
+import {
+  getRollbackApprovalInfo,
+  orderWarehouseInDelete,
+  warehouseApprovalCancel
+} from "@/api/ecw/batchSingleApplication";
 import workFlow from "@/components/WorkFlow";
 
 export default {
@@ -48,12 +54,25 @@ export default {
         orderId:undefined,
         orderNo:undefined,
         reason:'',
-        copyUserId:[]
+        copyUserId:[],
       },
+      isExamine:true,
+      details:{},
+
+
     }
   },
   created() {
     getOrder(this.orderId).then(r => this.orderDetails = r.data);
+    getRollbackApprovalInfo({orderId:this.orderId}).then(r => {
+      console.log(r)
+      if(r.data.status === 1){
+          this.details = r.data;
+          this.isExamine = false;
+          this.params.reason = JSON.parse(this.details.details).reason
+      }
+
+    })
   },
   methods:{
     submit(){
@@ -66,6 +85,26 @@ export default {
          this.$parent.show = false
        }
       })
+    },
+    cancellationOfOrder(){
+      this.$prompt('请输入取消审核原因', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+      }).then(({ value }) => {
+        warehouseApprovalCancel(this.details.id,value) .then(r => {
+          if(r.data){
+            this.$message.success('取消成功')
+            this.params = {}
+            this.$parent.show = false
+
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '取消成功'
+        });
+      });
     }
   }
 }

src/views/ecw/product/index.vue

@@ -15,11 +15,11 @@
         <el-input v-model="queryParams.titleZh" placeholder="请输入商品名称" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
 
-      <el-form-item label="商品类型" prop="typeId">
+      <!-- <el-form-item label="商品属性" prop="attrId">
         <el-select v-model="queryParams.typeId" placeholder="选择商品类型" clearable>
           <el-option v-for="type in typeList" :key="type.id" :label="type.titleZh" :value="type.id" />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
 
       <el-form-item label="商品特性" prop="attrId">
         <el-select v-model="queryParams.attrId" placeholder="选择商品特性" clearable>
@@ -27,7 +27,7 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item label="审核状态" prop="auditStatus">
+      <!-- <el-form-item label="审核状态" prop="auditStatus">
         <el-select v-model="queryParams.auditStatus" placeholder="选择审核状态" clearable>
           <el-option v-for="auditStatusItem in auditStatusDictDatas" :key="auditStatusItem.id" :label="auditStatusItem.label" :value="auditStatusItem.value" />
         </el-select>
@@ -37,7 +37,7 @@
         <el-select v-model="queryParams.status" placeholder="选择上架状态" clearable>
           <el-option v-for="statusItem in statusDictDatas" :key="statusItem.id" :label="statusItem.value == CommonStatusEnum.ENABLE ? '已上架' : '已下架'" :value="statusItem.value" />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
 
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@@ -70,11 +70,19 @@
       <el-table-column label="海关编码" align="center" prop="customsCode" />
       <el-table-column label="中文标题" align="center" prop="titleZh" />
       <el-table-column label="英文标题" align="center" prop="titleEn" />
-      <el-table-column label="商品特性" align="center" prop="attrId">
+      <el-table-column label="商品属性" align="center" prop="attrId">
         <template slot-scope="scope">
           <span>{{ getAttrName(scope.row.attrId) }}</span>
         </template>
       </el-table-column>
+      <!--商品特性-->
+      <el-table-column label="商品图片" align="center" prop="attrId">
+        <template slot-scope="scope">
+          <el-image :src="firstImg(scope.row.imgs)" style="width:50px; height:50px">
+            无
+          </el-image>
+        </template>
+      </el-table-column>
 
       <el-table-column prop="auditStatus" align="center" label="是否审核" width="120">
         <template slot-scope="scope">
@@ -86,9 +94,10 @@
 
       <el-table-column prop="status" align="center" label="状态" width="120">
         <template slot-scope="scope">
-          <el-select v-model="scope.row.status" @change="handleStatusChange(scope.row, 'status')">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status"/>
+          <!-- <el-select v-model="scope.row.status" @change="handleStatusChange(scope.row, 'status')">
             <el-option v-for="statusItem in statusDictDatas" :key="statusItem.id" :label="statusItem.value == CommonStatusEnum.ENABLE + '' ? '已上架' : '已下架'" :value="parseInt(statusItem.value)" />
-          </el-select>
+          </el-select> -->
         </template>
       </el-table-column>
 
@@ -123,16 +132,17 @@
         </el-form-item>
 
         <el-form-item label="商品图片" prop="img">
-          <el-col :span="8">
+          <image-upload v-model="form.imgs" />
+          <!-- <el-col :span="8">
             <el-input v-model="form.imgs" placeholder="请上传图片" disabled />
-          </el-col>
+          </el-col> -->
 
-          <el-upload action="#" :http-request="requestUpload" :show-file-list="false" :before-upload="beforeUpload">
+          <!-- <el-upload action="#" :http-request="requestUpload" :show-file-list="false" :before-upload="beforeUpload">
             <el-button size="small">
               上传图片
               <i class="el-icon-upload el-icon--right"></i>
             </el-button>
-          </el-upload>
+          </el-upload> -->
 
         </el-form-item>
 
@@ -206,10 +216,11 @@ import { getProductTypeList } from "@/api/ecw/productType";
 import { getDictDatas, DICT_TYPE } from '@/utils/dict';
 import { CommonStatusEnum, AuditStatusEnum } from '@/utils/constants';
 import { uploadFile } from "@/api/infra/file";
-
+import ImageUpload from '@/components/ImageUpload'
 export default {
   name: "ProductList",
   components: {
+    ImageUpload
   },
   data() {
     return {
@@ -309,6 +320,13 @@ export default {
         return productAttrArray.join(',');
       }
     },
+    firstImg(){
+      return imgString => {
+        if(!imgString || imgString == '') return imgString
+        let imgs = imgString.split(',')
+        return imgs.length ? imgs[0] : null
+      }
+    }
   },
 
 

src/views/system/internalMessage/index.vue

@@ -45,7 +45,7 @@
     <!-- 列表 -->
     <el-table v-loading="loading" :data="list">
       <el-table-column label="" align="center" prop="id" />
-<!--      <el-table-column label="来源" align="center" prop="fromId" />-->
+      <el-table-column label="来源" align="center" prop="fromId" />
       <el-table-column label="发送时间" align="center" prop="sendTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.sendTime) }}</span>
@@ -58,11 +58,11 @@
           <dict-tag :type="DICT_TYPE.INTERNAL_MESSAGE_TYPE" :value="scope.row.type" />
         </template>
       </el-table-column>
-<!--      <el-table-column label="创建时间" align="center" prop="createTime" width="180">-->
-<!--        <template slot-scope="scope">-->
-<!--          <span>{{ parseTime(scope.row.createTime) }}</span>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
@@ -79,9 +79,9 @@
     <!-- 对话框(添加 / 修改) -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-<!--        <el-form-item label="来源" prop="fromId">-->
-<!--         <el-input v-model="form.fromId" placeholder="请输入站内信来源" />-->
-<!--       </el-form-item>-->
+        <el-form-item label="来源" prop="fromId">
+         <el-input v-model="form.fromId" placeholder="请输入站内信来源" />
+       </el-form-item>
         <el-form-item label="发送时间" prop="sendTime">
           <el-date-picker clearable v-model="form.sendTime" type="date" value-format="yyyy-MM-dd" placeholder="选择发送时间" />
         </el-form-item>

src/views/system/needKnow/index.vue

@@ -95,10 +95,10 @@
           <el-input v-model="form.titleEn" placeholder="请输入标题英文" />
         </el-form-item>
         <el-form-item label="内容中文" prop="contentZh">
-          <editor  v-model="form.contentZh" :min-height="192" placeholder="请输入内容中文"/>
+          <ueditor  v-model="form.contentZh" :min-height="192" placeholder="请输入内容中文"/>
         </el-form-item>
         <el-form-item label="内容英语" prop="contentEn">
-          <editor  v-model="form.contentEn" :min-height="192" placeholder="plese entry english"/>
+          <ueditor  v-model="form.contentEn" :min-height="192" placeholder="plese entry english"/>
         </el-form-item>
         <el-form-item label="状态" prop="status">
           <el-radio-group v-model="form.status">
@@ -117,11 +117,11 @@
 
 <script>
 import { createNeedKnow, updateNeedKnow, deleteNeedKnow, getNeedKnow, getNeedKnowPage, exportNeedKnowExcel } from "@/api/system/needKnow";
-import Editor from '@/components/Editor';
+import Ueditor from '@/components/Ueditor'
 export default {
   name: "NeedKnow",
   components: {
-    Editor
+    Ueditor
   },
   data() {
     return {