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

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

@@ -429,3 +429,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/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/components/CustomerFollow/index.vue

@@ -10,7 +10,7 @@
     >
       <el-table-column
         type="index"
-        label="#"
+        label="序号"
       >
       </el-table-column>
       <el-table-column
@@ -69,7 +69,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="跟进时间" required>
-              <el-date-picker v-model="customerFollow.form.followTime" type="datetime" placeholder="选择跟进时间"></el-date-picker>
+              <el-date-picker v-model="customerFollow.form.followTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择跟进时间"></el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -160,6 +160,7 @@ export default {
     this.resetCustomerFollowForm()
     if (!!this.customerId) getCustomerContactsListByCustomer({customerId: this.customerId}).then(r => {
       this.customerContactsList = r.data
+      this.customerFollow.form.customerId = this.customerId
     })
     listServiceUser().then(r => {
       this.serviceUserList = r.data

src/components/OrderBaseInfo/index.vue

@@ -4,7 +4,7 @@
       <el-descriptions-item label="唛头">{{ order.marks }}</el-descriptions-item>
       <el-descriptions-item label="已到箱数/总箱数">{{ order.sumNum }}/{{ order.costVO.totalNum }}</el-descriptions-item>
       <el-descriptions-item label="订单状态"><dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="order.status" :class="{red: order.status === 1, green: order.status === 5 || order.status === 2}" /></el-descriptions-item>
-      <el-descriptions-item label="送货时间">{{ order.consigneeVO && order.consigneeVO.deliveryDate || '' }}</el-descriptions-item>
+      <el-descriptions-item label="送货时间">{{ order.deliveryDate || '' }}</el-descriptions-item>
       <el-descriptions-item label="运输方式">
         <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="order.logisticsInfoDto.transportId"></dict-tag>
       </el-descriptions-item>
@@ -12,10 +12,10 @@
       <el-descriptions-item label="目的地">{{ order.logisticsInfoDto.destTitleZh || '' }}</el-descriptions-item>
       <el-descriptions-item label="发货人姓名">{{ order.consignorVO && order.consignorVO.name || ''}}</el-descriptions-item>
       <el-descriptions-item label="发货人公司">{{ order.consignorVO && order.consignorVO.company || '' }}</el-descriptions-item>
-      <el-descriptions-item label="发货人电话">{{ order.consignorVO && order.consignorVO.phone || '' }}</el-descriptions-item>
+      <el-descriptions-item label="发货人电话">{{ order.consignorVO && (order.consignorVO.countryCode + order.consignorVO.phone) || '' }}</el-descriptions-item>
       <el-descriptions-item label="收货人姓名">{{ order.consigneeVO && order.consigneeVO.name || ''}}</el-descriptions-item>
       <el-descriptions-item label="收货人公司">{{ order.consigneeVO && order.consigneeVO.company || '' }}</el-descriptions-item>
-      <el-descriptions-item label="收货人电话">{{ order.consigneeVO && order.consigneeVO.phone || '' }}</el-descriptions-item>
+      <el-descriptions-item label="收货人电话">{{ order.consigneeVO &&(order.consigneeVO.countryCode + order.consigneeVO.phone) || '' }}</el-descriptions-item>
       <el-descriptions-item label="入仓类型">{{ getDictDataLabel(DICT_TYPE.ECW_WAREHOUSING_TYPE, order.warehouseType) }}</el-descriptions-item>
       <el-descriptions-item label="订单号">{{ order.orderNo }}</el-descriptions-item>
     </el-descriptions>

src/views/ecw/box/indexSeaAir.vue

@@ -135,6 +135,12 @@
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
       <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>
@@ -221,7 +227,7 @@
         channelList:[],
         warehouseList: [],
         // 表单参数
-        form: {},
+        form: {transportType:"4"},
         // 表单校验
         rules: {
           shippingChannelId: [{ required: true, message: "出货渠道不能为空", trigger: "blur" }],
@@ -266,6 +272,9 @@
 
     },
     created() {
+      this.transportTypes = this.getDictDatas(
+      this.DICT_TYPE.ECW_TRANSPORT_TYPE
+    ).filter((item) => item.value == "4");
       getWarehouseList().then(res => this.warehouseList = res.data);
       getCabinetPage(null).then(response => {
         this.cabinetList = response.data.list;
@@ -305,7 +314,7 @@
           cabinetId: undefined,
           startWarehouseId: undefined,
           destWarehouseId: undefined,
-          transportType: undefined,
+          transportType: "4",
         };
         this.resetForm("form");
       },

src/views/ecw/customer/index.vue

@@ -683,6 +683,7 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       // 处理查询参数
+
       let params = {...this.queryParams};
       params.pageNo = undefined;
       params.pageSize = undefined;

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/exception/index.vue

@@ -9,17 +9,17 @@
              <el-option :label="$t('处理时间')" value="2"/>
           </el-select>
           <el-date-picker clearable v-model="queryParams.beginCreateTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" :placeholder="$t('请选择开始日期')" />
-         <span>{{$t('到')}}</span>
+         <span style="margin: 0 8px;">{{$t('到')}}</span>
           <el-date-picker clearable v-model="queryParams.endCreateTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" :placeholder="$t('请选择结束日期')" />
         </el-form-item>
         <el-form-item :label="$t('始发地:')">
             <el-select v-model="queryParams.originId" :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 expoerCityList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
             </el-select>
         </el-form-item>
         <el-form-item :label="$t('目的地:')" >
             <el-select v-model="queryParams.destinationId" :placeholder="$t('请选择目的地')">
-             <el-option v-for="item in importCityList" :label="item.titleZh" :value="item.id" :key="item.id" ></el-option>
+             <el-option v-for="item in importCityList" :label="$l(item, 'title')" :value="item.id" :key="item.id" ></el-option>
             </el-select>
         </el-form-item>
         <el-form-item :label="$t('运输方式:')" >

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:{
@@ -165,6 +176,26 @@ export default {
       this.isModifyIf = true;
        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/prepayDeal.vue

@@ -131,12 +131,12 @@
           <el-form :model="handlerParams" ref="queryForms" size="small" :inline="true"  label-width="120px" class="card">
             <el-row v-if="orderExceptionData.orderExceptionType=='order_pay_exception'">
                <el-form-item :label="$t('订单总金额:')">
-                  {{orderFee.totalAmount||0}}
+                  <span style="margin-left: 8px;" v-for="(item, key) of orderFee.totalAmountList">{{item}}{{key}}</span>
                </el-form-item>
             </el-row>
             <el-row v-if="orderExceptionData.orderExceptionType=='order_pay_exception'">
                <el-form-item :label="$t('应付预付金额:')">
-                  {{orderFee.totalPaymentAmount}}
+                  <span style="margin-left: 8px;" v-for="(item, key) of orderFee.totalPaymentAmount">{{item}}{{key}}</span>
                </el-form-item>
             </el-row>
             <el-row v-if="orderExceptionData.orderExceptionType=='order_pay_exception'">
@@ -186,7 +186,7 @@
                </el-form-item>
             </el-row>
             <el-row v-if="orderExceptionData.orderExceptionType!='order_miss_exception'&&orderExceptionData.orderExceptionType!='order_superfluous_goods_exception'&&orderExceptionData.orderExceptionType!='order_in_water_exception'&&orderExceptionData.orderExceptionType!='order_damage_exception'">
-                <el-form-item :label="$t('*处理结果:')" >
+                <el-form-item :label="$t('处理结果:')" required>
                   <el-select v-model="handlerParams.orderExceptionHandlerResult" placeholder="请选择">
                   <el-option  v-for="dict in getDictDatas(orderExceptionData.orderExceptionType+'_result')"
                              :key="dict.value" :label="dict.label" :value="dict.value"/>
@@ -216,12 +216,12 @@
               </el-row>
               <el-row >
                  <el-form-item :label="$t('状态:')">
-                      <el-radio v-model="handlerParams.orderExceptionStatus" label="1">处理中</el-radio>
-                      <el-radio v-model="handlerParams.orderExceptionStatus" label="2">已处理</el-radio>
+                      <el-radio v-model="handlerParams.orderExceptionStatus" label="1">{{$t('处理中')}}</el-radio>
+                      <el-radio v-model="handlerParams.orderExceptionStatus" label="2">{{$t('已处理')}}</el-radio>
                  </el-form-item>
               </el-row>
               <el-row>
-                 <el-form-item :label="$t('*查明原因:')">
+                 <el-form-item :label="$t('查明原因:')" required>
                     <el-select v-model="handlerParams.orderExceptionHandlerResult">
                     <el-option  v-for="dict in getDictDatas(orderExceptionData.orderExceptionType+'_result')"
                                :key="dict.value" :label="dict.label" :value="dict.value"/>
@@ -356,6 +356,7 @@
       submitForm(){
           if(!this.handlerParams.orderExceptionHandlerResult){
             this.$modal.msgError(this.$t('请选择处理结果'));
+            return
           }
           handlerExceptionByExceptionId(this.handlerParams).then(res=>{
               this.$modal.msgSuccess(this.$t('提交成功'));

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

@@ -35,7 +35,7 @@
              </el-input>
            </el-form-item>
            <el-form-item label="新运费" required style="width: 400px">
-             <el-input v-model="form.freight" type="number">
+             <el-input v-model="form.freight" type="number" class="input-with-select">
                <el-select v-model="form.freightCurrency" placeholder="请选择" slot="prepend" style="width: 100px">
                  <el-option
                    v-for="item in currencyList"
@@ -55,7 +55,7 @@
              </el-input>
            </el-form-item>
            <el-form-item label="新清关费" required style="width: 400px">
-             <el-input v-model="form.clearanceFreight" type="number">
+             <el-input v-model="form.clearanceFreight" type="number" class="input-with-select">
                <el-select v-model="form.clearanceFreightCurrency" placeholder="请选择" slot="prepend" style="width: 100px">
                  <el-option
                    v-for="item in currencyList"
@@ -286,6 +286,10 @@ export default {
 }
 </script>
 
-<style scoped>
-
+<style scoped lang="scss">
+::v-deep .input-with-select {
+  .el-input-group__prepend, .el-input-group__append {
+    background-color: #fff;
+  }
+}
 </style>

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

@@ -36,6 +36,7 @@
               体积：{{ row.warehouseInInfoVO.volume }}m³<br>
               重量：{{ row.warehouseInInfoVO.weight }}Kg
             </template>
+            <span v-else>展示没有入库信息</span>
           </template>
         </el-table-column>
         <el-table-column
@@ -87,9 +88,9 @@
       </el-table>
 
       <div style="text-align: center;margin-top: 80px">
-        <el-button type="primary" @click="toweight">申请重货优惠</el-button>
-        <el-button type="primary" @click="tolight" >申请泡货优惠</el-button>
-        <el-button type="primary">关闭窗口</el-button>
+        <el-button type="primary" @click="toweight" v-if="hasWarehouseInInfo && order.transportId === 1">申请重货优惠</el-button>
+        <el-button type="primary" @click="tolight" v-if="hasWarehouseInInfo && order.transportId === 2">申请泡货优惠</el-button>
+        <el-button type="primary" @click="$tab.closePage()">关闭窗口</el-button>
       </div>
     </el-card>
   </div>
@@ -133,6 +134,7 @@ export default {
       unitList:[],
       currencyList:[],
       productAttrList:[],
+      hasWarehouseInInfo: false
     };
   },
   created() {
@@ -150,6 +152,11 @@ export default {
       getOrder(this.orderId).then(response => {
         this.loading = false
         this.order = response.data
+        this.order.orderItemVOList.forEach(e => {
+          if (e.warehouseInInfoVO){
+            this.hasWarehouseInInfo = true
+          }
+        })
       })
     },
     toweight(){

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

@@ -10,7 +10,7 @@
               </el-form-item>
           </el-row>
           <el-row :span="8" >
-             <el-form-item :label="$t('*现泡货申请标准:')" size="medium" label-width="150px">
+             <el-form-item :label="$t('现泡货申请标准:')" size="medium" label-width="150px" required>
                <el-input style="width: 100px;"  type="text" v-model="queryParams.vweight"  />
                 <span style="margin-left: 10px;">kg/cbm</span>
              </el-form-item>

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

@@ -10,7 +10,7 @@
               </el-form-item>
           </el-row>
           <el-row :span="8" >
-             <el-form-item :label="$t('*现重货申请标准:')" size="medium" label-width="150px">
+             <el-form-item :label="$t('现重货申请标准:')" size="medium" label-width="150px" required>
                <el-input style="width: 100px;"  type="text" v-model="queryParams.wvolume"  />
                 <span style="margin-left: 10px;">kg/cbm</span>
              </el-form-item>

src/views/ecw/order/splitApply.vue

@@ -7,7 +7,7 @@
           <span class="card-title">{{$t('原单信息')}}</span>
           <div>
              <span v-if="orderData.abnormalState!=0" class="red">{{$t('异常无法拆单')}}</span>
-             <el-button v-else type="primary" @click="addSplit">{{$t('新建拆单')}} </el-button>
+             <el-button v-else type="primary" @click="addSplit" :disabled="orderData.inWarehouseState==207">{{$t('新建拆单')}} </el-button>
           </div>
         </div>
         <el-descriptions :column="4">
@@ -133,11 +133,11 @@
           </div>
           <div>
              <el-button v-if="index==0" disabled type="primary" @click="addShop(index)">{{$t('放入')}}</el-button>
-               <el-button v-if="index!=0" type="primary" @click="addShop(index)">{{$t('移出')}}</el-button>
+               <el-button v-if="index!=0" type="primary" @click="addShop(index)">{{$t('放入')}}</el-button>
               <el-button type="primary" plain @click="deleteSplit(item.id)">{{$t('删除')}}</el-button>
           </div>
         </div>
-        <el-table  border :data="item.orderSplitItemBackVOList">
+        <el-table v-if="item.orderSplitItemBackVOList"  border :data="item.orderSplitItemBackVOList">
           <el-table-column :label="$t('序号')" align="center" prop="id" type="index">
             <template slot-scope="scope">
                 <span>{{scope.$index + 1}}</span>
@@ -213,23 +213,23 @@
            <el-dialog :title="$t('放入品名')" :visible.sync="shopOpen" width="400px" append-to-body>
              <el-form ref="shopForm" :model="shopForm" :rules="shopRules" label-width="80px">
                <el-row>
-                 <el-form-item :label="$t('中文品名:')">
+                <el-form-item :label="$t('中文品名:')" v-if="splitData.length>0">
                    <el-select v-model="shopForm.prodTitleZh" :placeholder="$t('请选择中文品名')"  @change="changeProdTitleZh">
-                    <el-option v-for="item in orderData.orderItemVOList" :label="item.prodTitleZh" :value="item.prodTitleZh" :key="item.prodTitleZh" ></el-option>
+                    <el-option v-for="item in splitData[0].orderSplitItemBackVOList" :label="item.prodTitleZh" :value="item.prodTitleZh" :key="item.prodTitleZh" ></el-option>
                    </el-select>
                  </el-form-item>
                </el-row>
                <el-row>
-                 <el-form-item :label="$t('英文品名:')" >
+                <el-form-item :label="$t('英文品名:')" v-if="splitData.length>0">
                      <el-select v-model="shopForm.prodTitleEn" :placeholder="$t('请选择英文品名')"  @change="changeProdTitleEn">
-                      <el-option v-for="item in orderData.orderItemVOList" :label="item.prodTitleEn" :value="item.prodTitleEn" :key="item.prodTitleEn" ></el-option>
+                      <el-option v-for="item in splitData[0].orderSplitItemBackVOList" :label="item.prodTitleEn" :value="item.prodTitleEn" :key="item.prodTitleEn" ></el-option>
                      </el-select>
                  </el-form-item>
                  <el-form-item :label="$t('剩余箱数:')">
                     {{shopForm.sum||0}}
                  </el-form-item>
                  <el-form-item :label="$t('放入箱数:')">
-                    <el-input-number v-model="shopForm.num" controls-position="right"  :min="1" :max="shopForm.sum"></el-input-number>
+                    <el-input-number v-model="shopForm.num" controls-position="right"  :min="1" :max="shopForm.sum-1"></el-input-number>
                  </el-form-item>
                  <el-form-item :label="$t('备注信息:')">
                     <el-input v-model="shopForm.remarks"></el-input>
@@ -335,6 +335,7 @@ export default {
             const tds = document.querySelectorAll(
               "#table .el-table__footer-wrapper tr>td"
             );
+            console.log(tds)
             // colSpan合并列
             tds[1].colSpan = 5;
             tds[1].style.textAlign = "left";
@@ -453,14 +454,14 @@ export default {
     },
     changeProdTitleZh(){
         var list = []
-        list = this.orderData.orderItemVOList.filter(item=>item.prodTitleZh == this.shopForm.prodTitleZh)
+        list = this.splitData[0].orderSplitItemBackVOList.filter(item=>item.prodTitleZh == this.shopForm.prodTitleZh)
         this.shopForm.sum = list[0].num
         this.shopForm.orderItemId = list[0].orderItemId
         this.shopForm.prodTitleEn = list[0].prodTitleEn
     },
     changeProdTitleEn(){
         var list = []
-        list = this.orderData.orderItemVOList.filter(item=>item.prodTitleEn == this.shopForm.prodTitleEn)
+        list = this.splitData[0].orderSplitItemBackVOList.filter(item=>item.prodTitleEn == this.shopForm.prodTitleEn)
         this.shopForm.sum = list[0].num
         this.shopForm.prodTitleZh = list[0].prodTitleZh
     },
@@ -468,9 +469,11 @@ export default {
       let that = this
       if(!that.form.transportId){
         that.$message.error(this.$t("请选择运输方式"));
+        return
       }
       if(!that.form.destWarehouseId){
         that.$message.error(this.$t("请选择目的仓库"));
+        return
       }
       // if(!this.form.channelId){
       //   this.$modal.msgError("请选择出货渠道");
@@ -512,9 +515,9 @@ export default {
     },
     removeShop(id){
       let that = this
-      that.$confirm(this.$t('是否移除货物吗?')).then(function () {
+      that.$confirm(that.$t('是否移除货物吗?')).then(function () {
         deleteSplitItem(id).then(res=>{
-          that.$message.success(this.$t("移除成功"));
+          that.$message.success(that.$t("移除成功"));
            that.getList()
         })
       })
@@ -522,11 +525,11 @@ export default {
     cancelSplit(){
       let that = this
       if(!that.reason){
-        that.$message.error(this.$t("请输入取消原因"));
+        that.$message.error(that.$t("请输入取消原因"));
         return
       }
         cancelApply({orderId:that.queryParams.orderId,reason:that.reason}).then(res=>{
-          that.$message.success(this.$t("取消成功"));
+          that.$message.success(that.$t("取消成功"));
           that.$store.dispatch('tagsView/delCurrentView')
         })
     },
@@ -537,9 +540,9 @@ export default {
     /** 删除按钮操作 */
     deleteSplit(id) {
       let that = this
-      that.$confirm(this.$t('是否确认删除新拆的订单吗?')).then(function () {
+      that.$confirm(that.$t('是否确认删除新拆的订单吗?')).then(function () {
         deleteSplit(id).then(res=>{
-          that.$message.success(this.$t("删除成功"));
+          that.$message.success(that.$t("删除成功"));
            that.getList()
         })
       })

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>
@@ -147,6 +147,7 @@
 <script>
 import ordeDetailsForm from "@/views/ecw/order/components/ordeDetailsForm";
 import {
+  cancelAdjust,
   getAdjustInfo,
   getOrder, listByOrderId,
   orderWarehouseInGetAdjustInfo,
@@ -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/index.vue

@@ -21,15 +21,22 @@
       <el-table-column
         prop="prodTitleZh"
         label="品名">
+        <template v-slot="{row}">
+          {{ row.prodTitleZh }}<br>
+          {{ row.prodTitleEn }}
+        </template>
       </el-table-column>
       <el-table-column
         label="填单货物属性">
         <template v-slot="{row}">
+          <span v-if="row.isWarehouseInAdd">非填单货物信息</span>
+          <template v-else>
             品牌：{{ ['无牌', '有牌', '中性'][row.brandType] }}<br>
             箱数：{{ row.num }}<br>
             体积：{{ row.volume }}m³<br>
             重量：{{ row.weight }}Kg
           </template>
+        </template>
       </el-table-column>
       <el-table-column
         label="入库货物属性">
@@ -40,6 +47,7 @@
             体积：{{ row.warehouseInInfoVO.volume }}m³<br>
             重量：{{ row.warehouseInInfoVO.weight }}Kg
           </template>
+          <span v-else>暂无入仓信息</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -78,7 +86,7 @@
     </el-table>
 
     <h2 v-if="orderSpecialNeeds.length > 0">特殊需求</h2>
-    <el-form ref="form" :model="form" label-width="180px" style="max-width: 600px;">
+    <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-input v-model="form.orderSpecialNeedReceivableReqVoList[index].receivableMoney" :placeholder="'请输入' + item.label">
           <el-select v-model="form.orderSpecialNeedReceivableReqVoList[index].receivableMoneyCurrency" placeholder="请选择" slot="append" style="width: 100px">
@@ -92,6 +100,18 @@
         </el-input>
       </el-form-item>
 
+      <h2>订单数据</h2>
+      <el-form-item label="总方数" style="width: 300px">
+        <el-input v-model="form.sumVolume" placeholder="请输入总方数">
+          <span slot="append">m³</span>
+        </el-input>
+      </el-form-item>
+      <el-form-item label="总方数量" style="width: 300px">
+        <el-input v-model="form.sumWeight" placeholder="请输入总数量">
+          <span slot="append">kg</span>
+        </el-input>
+      </el-form-item>
+
       <el-card style="margin-top: 15px;">
         <div slot="header" class="clearfix">
           <span style="font-size: 18px">入仓影像</span>
@@ -144,19 +164,6 @@
       </span>
     </el-dialog>
 
-    <!--    <el-dialog-->
-    <!--      title="转异常单"-->
-    <!--      :visible.sync="dialogVisible"-->
-    <!--      width="30%"-->
-    <!--      :before-close="handleClose(done)"-->
-    <!--    >-->
-    <!--      <span>这是一段信息</span>-->
-    <!--      <span slot="footer" class="dialog-footer">-->
-    <!--       <el-button type="primary" @click="dialogVisible = false">确认并完成入仓</el-button>-->
-    <!--       <el-button @click="dialogVisible = false">取 消</el-button>-->
-    <!--     </span>-->
-    <!--    </el-dialog>-->
-
     <print-tag v-if="isShowPrintTag" :order-id="orderId" @close="isShowPrintTag = false"></print-tag>
 
     <print-warehouse-receipt v-if="isShowPrint" :order-id="orderId" @close="isShowPrint = false" />
@@ -197,7 +204,7 @@ export default {
   mounted() {
     if(this.$route.query.id){
       this.orderId = parseInt(this.$route.query.id || undefined)
-      getOrder(this.orderId).then(r => this.order = r.data)
+      this.getOrder()
       getOrderWarehouseIn(this.orderId).then(r => this.orderItemList = r.data.reverse())
       getSpecialListByOrderId(this.orderId).then(r => this.specialList = r.data)
       listByOrderId({ orderId: this.orderId }).then(r => this.form.orderLocationCreateReqVOList = r.data)
@@ -218,7 +225,9 @@ export default {
         exceptionUrls:[],
         descZh:'',
         manualExceptionType:'',
-        urls: []
+        urls: [],
+        sumVolume: '',
+        sumWeight: '',
       },
       currencyList:[],
       order: {},
@@ -233,14 +242,49 @@ export default {
   },
 
   methods: {
-    handleSubmit() {
+    getTowSum(){
+      let sumVolume = 0
+      let sumWeight = 0
+      this.order.orderItemVOList.forEach(e => {
+        if (e?.warehouseInInfoVO?.volume) sumVolume += e.warehouseInInfoVO.volume
+        if (e?.warehouseInInfoVO?.weight) sumWeight += e.warehouseInInfoVO.weight
+      })
+      this.form.sumVolume = sumVolume
+      this.form.sumWeight = sumWeight
+    },
+    getOrder(){
+      getOrder(this.orderId).then(r => {
+        this.order = r.data
+        this.getTowSum()
+      })
+    },
+    specialHas0(){
+      let result = false
+      this.form.orderSpecialNeedReceivableReqVoList.forEach(e => {
+        if (e.receivableMoney === '0' || e.receivableMoney === ''){
+          result = true
+        }
+      })
+      return result
+    },
+    async handleSubmit() {
+      if (this.specialHas0()) {
+        const confirm = await this.$confirm('有特需费用为0或未填写，请问是否继续？', '注意', {
+          confirmButtonText: '继续',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+        if (confirm !== 'confirm'){
+          return
+        }
+      }
       let p = {
         orderSpecialNeedReceivableReqVoList: this.form.orderSpecialNeedReceivableReqVoList,
         "orderLocationCreateReqVOList": this.form.orderLocationCreateReqVOList,
         "orderId": this.order.orderId,
         urls: this.form.urls
       }
-       if(this.escapeBol){
+      if (this.escapeBol) {
         p.exceptionUrls = this.form.exceptionUrls.split(',');
         p.descZh = this.form.descZh;
         p.manualExceptionType = this.form.manualExceptionType
@@ -248,6 +292,7 @@ export default {
       orderWarehouseInFinish(p).then(r => {
         if (r.code === 0) {
           this.escapeBol = false;
+          this.finishVisible = false
           this.$confirm(
             '该订单已成功入仓，是否打印？',
             '货物已入仓',
@@ -260,6 +305,7 @@ export default {
           }).catch(() => {
             // this.$store.dispatch('tagsView/delVisitedView')
             this.$message.success('入仓成功')
+            this.$tab.closePage()
           })
         }
       })
@@ -284,7 +330,7 @@ export default {
           });
 
           getOrderWarehouseIn(this.orderId).then(r => this.orderItemList = r.data.reverse())
-          getOrder(this.orderId).then(r => this.order = r.data)
+          this.getOrder()
         })
 
       }).catch(() => {
@@ -295,16 +341,16 @@ export default {
   watch: {
     warehousingVisible(val) {
       if (!val){
-        getOrder(this.orderId).then(r => this.order = r.data)
+        this.getOrder()
         getOrderWarehouseIn(this.orderId).then(r => this.orderItemList = r.data.reverse())
       }
     },
     orderSpecialNeeds(val){
       val.forEach(e => {
-        this.form.orderSpecialNeedReceivableReqVoList.push(    {
+        this.form.orderSpecialNeedReceivableReqVoList.push({
           "id": e.id,
-          "receivableMoney": '',
-          "receivableMoneyCurrency": 3
+          "receivableMoney": e.transFee || '',
+          "receivableMoneyCurrency": e.transCurrency || 3
         })
       })
     }

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/productBrank/BrandForm/index.vue

@@ -19,7 +19,7 @@
         </el-select>
       </el-form-item>
       <el-form-item :label="`商标${index + 1}商品`">
-        <el-select v-model="form.productIds" :placeholder="`请选择商标{index + 1}商品`" multiple filterable @change="updateValue">
+        <el-select v-model="form.productIds" :placeholder="`请选择商标${index + 1}商品`" multiple filterable @change="updateValue">
           <el-option
             v-for="item in getProductListByTypeId(form.productTypeId)"
             :key="item.id"

src/views/ecw/productBrank/Empower/index.vue

@@ -127,11 +127,11 @@
     <el-dialog
       title="添加"
       :visible.sync="addDialog.dialogVisible"
-      width="500px">
+      width="600px">
       <el-form ref="form" :model="addDialog.form" label-width="80px">
         <el-form-item label="客户名称">{{ addDialog.form.customerName }}</el-form-item>
         <el-form-item label="授权时间">
-          <el-date-picker
+ <!--         <el-date-picker
             v-model="addDialog.dateRange"
             @chang="handleDatePick"
             type="daterange"
@@ -139,7 +139,10 @@
             value-format="timestamp"
             start-placeholder="开始日期"
             end-placeholder="结束日期">
-          </el-date-picker>
+          </el-date-picker> -->
+        <el-date-picker clearable v-model="addDialog.form.startTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" :placeholder="$t('请选择开始日期')" />
+         <span style="margin: 0 8px;">到</span>
+          <el-date-picker clearable v-model="addDialog.form.endTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" :placeholder="$t('请选择结束日期')" />
         </el-form-item>
         <el-form-item label="收费模式">
           <dict-selector v-model="addDialog.form.feeScale" :type="DICT_TYPE.BRAND_CUSTOMER_CHARGING_MODEL"></dict-selector>
@@ -247,7 +250,7 @@ export default {
           "customerContactsId": 0,
           "customerId": 0,
           "endTime": "",
-          "feeScale": 1,
+          "feeScale": 0,
           "fileUrl": "",
           "productBrandId": null,
           "startTime": "",

src/views/system/internalMessage/index.vue

@@ -3,7 +3,7 @@
 
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-<!--      <el-form-item label="站内信来源" prop="fromId">-->
+<!--     <el-form-item label="来源" prop="fromId">-->
 <!--     <el-input v-model="queryParams.fromId" placeholder="请输入站内信来源" clearable @keyup.enter.native="handleQuery"/>-->
 <!--    </el-form-item>-->
       <el-form-item label="发送时间">
@@ -19,10 +19,10 @@
                        :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间">
-        <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
-                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
-      </el-form-item>
+<!--      <el-form-item label="创建时间">-->
+<!--        <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"-->
+<!--                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />-->
+<!--      </el-form-item>-->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
@@ -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)"
@@ -73,13 +73,13 @@
       </el-table-column>
     </el-table>
     <!-- 分页组件 -->
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.page" :limit.sync="queryParams.rows"
                 @pagination="getList"/>
 
     <!-- 对话框(添加 / 修改) -->
     <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="站内信来源ID" prop="fromId">-->
+<!--        <el-form-item label="来源" prop="fromId">-->
 <!--         <el-input v-model="form.fromId" placeholder="请输入站内信来源" />-->
 <!--       </el-form-item>-->
         <el-form-item label="发送时间" prop="sendTime">
@@ -135,8 +135,8 @@ export default {
       dateRangeCreateTime: [],
       // 查询参数
       queryParams: {
-        pageNo: 1,
-        pageSize: 10,
+        page: 1,
+        rows: 10,
         fromId: null,
         title: null,
         content: null,
@@ -249,8 +249,8 @@ export default {
     handleExport() {
       // 处理查询参数
       let params = {...this.queryParams};
-      params.pageNo = undefined;
-      params.pageSize = undefined;
+      params.page = undefined;
+      params.rows = undefined;
       this.addBeginAndEndTime(params, this.dateRangeSendTime, 'sendTime');
       this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
       // 执行导出

src/views/system/myInternalMessage/index.vue

@@ -3,7 +3,7 @@
 
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="站内信来源" prop="fromId">
+      <el-form-item label="来源" prop="fromId">
         <el-input v-model="queryParams.fromId" placeholder="请输入站内信来源" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item label="发送时间">
@@ -39,7 +39,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>

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 {