更新拆单

package.json

@@ -50,6 +50,7 @@
     "file-saver": "2.0.5",
     "fuse.js": "6.4.3",
     "highlight.js": "9.18.5",
+    "html2canvas": "^1.4.1",
     "js-beautify": "1.13.0",
     "js-cookie": "3.0.1",
     "jsencrypt": "3.0.0-rc.1",
@@ -69,6 +70,7 @@
     "vue-ueditor-wrap": "^2.5.6",
     "vuedraggable": "2.24.3",
     "vuex": "3.6.0",
+    "xlsx": "^0.18.5",
     "xml-js": "^1.6.11"
   },
   "devDependencies": {

src/App.vue

@@ -31,25 +31,38 @@ export default  {
     margin-right:10px;
   }
 }
-.ml-10{
-  margin-left: 10px;
+.flex{
+  display: flex;
 }
-.mr-10{
-  margin-right: 10px;
+.flex-1{
+  flex: 1;
 }
-.mb-10{
-  margin-bottom: 10px;
+.center{
+  align-content: center;
+  text-align: center;
 }
-.mt-10{
-  margin-top: 10px;
+.flex-center{
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
-.w-100{
-  width: 100px;
-}
-.w-150{
-  width: 150px;
-}
-.w-200{
-  width: 200px;
+$sizes: 10,20,30,50,100,150,200,500,800,1000;
+@for $i from 1 through length($sizes){
+  $item: nth($sizes, $i);
+  .ml-#{$item}{
+    margin-left: #{$item}px;
+  }
+  .mr-#{$item}{
+    margin-right: #{$item}px;
+  }
+  .mb-#{$item}{
+    margin-bottom: #{$item}px;
+  }
+  .mt-#{$item}{
+    margin-top: #{$item}px;
+  }
+  .w-#{$item}{
+    width: #{$item}px;
+  }
 }
 </style>

src/api/ecw/batchSingleApplication.js

@@ -56,3 +56,20 @@ export function warehouseApprovalGetById(params){
     params,
   })
 }
+//调仓-查看状态
+export function adjustApplyStatus(params){
+  return request({
+    url:'/order/order-warehouse-in/adjust-apply-status',
+    method:'get',
+    params
+  })
+
+}
+//调仓-撤销
+export function cancelAdjustApply(data){
+  return request({
+    url:'/order/order-warehouse-in/cancel-adjust-apply',
+     method:'post',
+      data
+  })
+}

src/api/ecw/order.js

@@ -163,6 +163,15 @@ export function orderWarehouseIn(data){
   })
 }
 
+// 入仓
+export function orderWarehouseInUpdateApply(data){
+  return request({
+    url: '/order/order-warehouse-in/update-apply',
+    method: 'put',
+    data
+  })
+}
+
 // 入仓完成
 export function orderWarehouseInFinish(data){
   return request({

src/api/ecw/orderCargoControl.js

@@ -25,4 +25,21 @@ export function create(data){
       method: 'post',
       data
     })
+}
+
+// 创建订单控货人放货记录
+export function createPick(data){
+  return request({
+    url: '/ecw/order-cargo-control-pick/create',
+    method: 'post',
+    data
+  })
+}
+
+//获得控货订单放货编辑详情
+export function getRleaseInfo(orderId){
+  return request({
+    url:'/ecw/order-cargo-control/release/info/' + orderId,
+    method:'get'
+  })
 }
\ No newline at end of file

src/api/system/needKnow.js

@@ -34,6 +34,14 @@ export function getNeedKnow(id) {
   })
 }
 
+// 根据key获得须知
+export function getNeedKnowByKey(key) {
+  return request({
+    url: '/system/need-know/getByKey?key=' + key,
+    method: 'get'
+  })
+}
+
 // 获得须知分页
 export function getNeedKnowPage(query) {
   return request({

src/components/AreaCodeSelector/index.vue

+<template>
+    <selector v-model="valueSync" :options="countryList" value-field="tel" key-field="id" :label-field="item => item.nameZh + item.tel" filterable clearable></selector>
+</template>
+<script>
+import {getCountryListAll} from '@/api/ecw/country'
+import selector from '@/components/Selector'
+export default {
+    components: {selector},
+    props: {
+        value: String,
+    },
+    data(){
+        return {
+            valueSync: '',
+            countryList:[]
+        }
+    },
+    watch:{
+        valueSync(){
+            this.$emit('input', this.valueSync)
+        },
+        value(){
+            if(this.value)this.valueSync = this.value
+        }
+    },
+    created(){
+        if(this.value){
+            this.valueSync = this.value
+        }
+        getCountryListAll().then(res => {
+          this.countryList = res.data
+        })
+    },
+    methods:{
+
+    }
+}
+</script>
\ No newline at end of file

src/components/AreaSelector/index.vue

@@ -3,10 +3,10 @@
         <el-select v-model="formData.country">
             <el-option v-for="(item) in treeList" :value="item.id" :label="item.titleZh" :key="item.id" />
         </el-select>
-        <el-select v-model="formData.province">
+        <el-select v-model="formData.province" class="ml-10">
             <el-option v-for="(item) in provinceList" :value="item.id" :label="item.titleZh" :key="item.id" />
         </el-select>
-        <el-select v-model="formData.city">
+        <el-select v-model="formData.city" class="ml-10">
             <el-option v-for="(item) in cityList" :value="item.id" :label="item.titleZh" :key="item.id" />
         </el-select>
     </div>

src/components/CustomerContactSelector/index.vue

@@ -22,7 +22,7 @@
     </div>
 </template>
 <script>
-import {getCustomerContactsSelect, getCustomerContacts} from '@/api/ecw/customerContacts'
+import {getCustomerContactsSelect, getCustomerContactsListByCustomer} from '@/api/ecw/customerContacts'
 import QuickCreate from '@/views/ecw/customer/components/quickCreate'
 
 export default {
@@ -82,11 +82,13 @@ export default {
         },
         onQuickCreateSuccess(id){
             this.showQuickCreate = false
-            getCustomerContactsSelect({ids: id}).then(res => {
+            getCustomerContactsListByCustomer({customerId: id}).then(res => {
                 if(!res.data || !res.data.length){
                     return this.$message.error('联系人信息获取失败')
                 }
-                this.list.unshift(res.data[0])
+                let data = res.data[0]
+                data.contactsName = data.name // 字段名跟getCustomerContactsSelect对齐
+                this.list.unshift(data)
                 this.index = 0
             })
         }

src/components/NeedKnow/index.vue

+<template>
+    <div class="need-know" :id="'need-know_' + keyname" v-if="detail">
+        <!-- <h2>{{detail.titleZh}}</h2> -->
+        <div class="body" v-html="detail.contentZh"></div>
+    </div>
+</template>
+<script>
+import {getNeedKnowByKey} from '@/api/system/needKnow'
+import html2canvas from 'html2canvas'
+import FileSaver from 'file-saver'
+export default {
+    props:{
+        keyname: String
+    },
+    data(){
+        return {
+            detail: null
+        }
+    },
+    created(){
+        getNeedKnowByKey(this.keyname).then(res => {
+            this.detail = res.data
+        })
+    },
+    methods:{
+        download(){
+            // 直接保存图片
+            let l = this.$loading()
+            html2canvas(document.querySelector("#need-know_" + this.keyname)).then(canvas => {
+                canvas.toBlob((blob) => {
+                    FileSaver.saveAs(blob, this.keyname + '.png')
+                })
+            }).finally(res => {
+                l.close()
+            });
+        },
+    }
+}
+</script>
+<style scoped>
+.body img{
+    max-width: 100%;
+}
+.need-know{
+    padding: 20px;
+}
+</style>
\ No newline at end of file

src/components/Selector/index.vue

 <template>
-    <el-select v-model="valueSync" :multiple="multiple" :disabled="disabled">
-        <el-option v-for="item in optionsFormated" :key="item.value" :label="item.label" :value="item.value" />
+    <el-select v-model="valueSync" :multiple="multiple" :disabled="disabled" :filterable="filterable">
+        <el-option v-for="item in optionsFormated" :key="item.key" :label="item.label" :value="item.value" />
     </el-select>
 </template>
 <script>
@@ -21,6 +21,11 @@ export default {
             type: String,
             default: 'value'
         },
+        keyField:{
+            type: String,
+            default: 'value'
+        },
+        filterable: Boolean,
         multiple: Boolean,
         clearable: Boolean,
         defaultable: Boolean, // 没有值的时候是否选择第一项
@@ -32,7 +37,8 @@ export default {
             this.options.forEach((item, index) => {
                 arr.push({
                     label: typeof this.labelField == 'string' ? item[this.labelField] : (this.labelField)(item, index),
-                    value: item[this.valueField]
+                    value: item[this.valueField],
+                    key: item[this.keyField]
                 })
             })
             return arr

src/views/bpm/processInstance/detail.vue

@@ -134,7 +134,7 @@ import {getActivityList} from "@/api/bpm/activity";
 import specialDiscount from "@/views/ecw/offer/specialDiscount"
 import warehouseDetails from "@/views/ecw/order/components/warehouseDetails";
 import shippingDetail from '@/views/ecw/box/shippingDetail'
-
+import SplitDetail from '@/views/ecw/order/components/SplitDetail'
 
 // 流程实例的详情页，可用于审批
 export default {
@@ -143,7 +143,8 @@ export default {
     Parser,
     specialDiscount,
     warehouseDetails,
-    shippingDetail
+    shippingDetail,
+    SplitDetail
   },
   computed:{
     matterNum(){
@@ -237,6 +238,10 @@ export default {
         shipment_preassemble: {
           component: "shippingDetail",
           processId: this.processInstance.businessKey,
+        },
+        split_order: {
+          component: "splitDetail",
+          id: this.processInstance.businessKey,
         }
       }
       return map[this.processInstance.processDefinition.formCustomViewPath]

src/views/ecw/box/shippingDetail.vue

@@ -170,8 +170,11 @@ export default {
     },
   },
   watch: {
-    processId(val) {
-      this.getApprovalDetail(val);
+    processId: {
+      immediate: true,
+      handler(val) {
+        this.getApprovalDetail(val);
+      },
     },
     boxBackVO(val) {
       // 柜型

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

@@ -79,8 +79,8 @@
               </el-table-column>
               <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
-                  <el-button type="text" size="small" @click="moveOut(scope.row)" v-if="!isUnderReview">移出</el-button>
-                  <!-- <el-button type="text" size="small" disabled>拆单</el-button> -->
+                  <el-button type="text" size="small" @click="moveOut(scope.row)" v-if="!isUnderReview && scope.row.installNum === 0">移出</el-button>
+                  <!-- <el-button type="text" size="small" v-if="isShowSplitOrder(scope.row)" @click="handlerSplitOrder(scope.row, 'splitOrder','拆单')">拆单</el-button> -->
                 </template>
               </el-table-column>
             </el-table>
@@ -162,7 +162,7 @@
         </el-row>
       </template>
       <!-- 批量装柜纠错（订单号） -->
-      <template v-if=" dialogConfig.type === 'correctionOrder' && dialogConfig.dialogVisible">
+      <template v-if="dialogConfig.type === 'correctionOrder' && dialogConfig.dialogVisible">
         <el-form ref="orderForm" :rules="rules" :model="orderObj" label-position="top">
           <el-form-item label="装柜纠错（订单号）" prop="orderNo">
             <el-input type="textarea" :rows="3" v-model="orderObj.orderNo" placeholder="请输入，多个以逗号分隔" clearable />
@@ -174,7 +174,7 @@
         </el-row>
       </template>
       <!-- 装柜批量输入 -->
-      <template v-if=" dialogConfig.type === 'batchInput' && dialogConfig.dialogVisible">
+      <template v-if="dialogConfig.type === 'batchInput' && dialogConfig.dialogVisible">
         <el-form ref="batchForm" :rules="rules" :model="batchObj" label-position="top">
           <el-form-item label="" prop="qrCode">
             <el-input type="textarea" :rows="3" v-model="batchObj.qrCode" placeholder="请输入，多个以逗号分隔" clearable />
@@ -185,6 +185,8 @@
           <el-button @click="closeDialog">取消</el-button>
         </el-row>
       </template>
+      <!-- 拆单 -->
+      <splitOrder v-if="dialogConfig.type === 'splitOrder' && dialogConfig.dialogVisible" :currRow="currRow" @closeDialog="closeDialog" />
     </el-dialog>
   </div>
 </template>
@@ -205,6 +207,7 @@ import {
   approvalCreate,
 } from "@/api/ecw/boxSea";
 import { getTotlContent, serviceMsg } from "../../utils";
+import splitOrder from "./splitOrder.vue";
 
 /**
  * 开始装柜
@@ -214,6 +217,7 @@ export default {
   inheritAttrs: false,
   components: {
     supplementOrder,
+    splitOrder,
   },
   props: {
     shipmentObj: Object,
@@ -259,6 +263,8 @@ export default {
         qrCode: [{ required: true, message: "必填", trigger: "change" }],
         orderNo: [{ required: true, message: "必填", trigger: "change" }],
       },
+      // 当前行
+      currRow: {},
     };
   },
   created() {
@@ -289,6 +295,11 @@ export default {
     handlerClick(type, title) {
       this.shwoDialog({ type, title });
     },
+    /* 拆单 */
+    handlerSplitOrder(row, type, title) {
+      this.currRow = row;
+      this.shwoDialog({ type, title });
+    },
     /** 表格订单号点击 */
     orderClick(row) {
       orderTagList({ orderId: row.orderId }).then((res) => {
@@ -340,6 +351,9 @@ export default {
           this.$set(this.dialogConfig, "fullscreen", false);
           this.modifyCabinetObj = {};
           break;
+        case "splitOrder":
+          this.$set(this.dialogConfig, "fullscreen", true);
+          break;
       }
       this.$set(this.dialogConfig, "dialogVisible", true);
     },
@@ -465,6 +479,13 @@ export default {
         serviceMsg(res, this);
       });
     },
+    /* 是否显示拆单 */
+    isShowSplitOrder(row) {
+      if (row.num > row.installNum) {
+        return true;
+      }
+      return false;
+    },
   },
   watch: {
     listData(val) {

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

@@ -277,26 +277,12 @@
     <el-row class="process-area" v-show="isAudit">
       <div class="process">
         <div>审批流程</div>
-        <div>流程图</div>
+        <work-flow xmlkey="shipment_preassemble" v-model="selectedUsers"></work-flow>
       </div>
-      <!-- <div class="copy-user">
-        <div>
-          <label class="el-form-item__label">抄送</label>
-          <userSelect v-model="copyUser" placeholder="请选择抄送人" :allUsers="this.$attrs.allUsers" size="small" multiple collapse-tags />
-        </div>
-        <div>
-          <label class="el-form-item__label">抄送人</label>
-          <div class="copyUser-tag">
-            <el-tag v-for="user in copyUsers" :key="user.id" closable @close="removeCopyUser(user)">
-              {{user.nickname}}
-            </el-tag>
-          </div>
-        </div>
-      </div> -->
       <div>
         <el-button type="primary" :disabled=true>审核中</el-button>
-        <el-button type="primary" @click="canclAudit">取消审核</el-button>
-        <el-button type="primary" @click="closeDialog">返回</el-button>
+        <el-button plain type="primary" @click="canclAudit">取消审核</el-button>
+        <el-button plain type="primary" @click="closeDialog">返回</el-button>
       </div>
     </el-row>
   </div>
@@ -317,6 +303,7 @@ import {
 import userSelect from "./common/userSelect.vue";
 import { formatDate, getTotlContent, serviceMsg } from "../utils";
 import dayjs from "dayjs";
+import WorkFlow from "@/components/WorkFlow";
 
 /**
  * 预装
@@ -324,7 +311,7 @@ import dayjs from "dayjs";
 export default {
   name: "preinstall",
   inheritAttrs: false,
-  components: { userSelect },
+  components: { userSelect, WorkFlow },
   data() {
     return {
       // 状态
@@ -364,10 +351,8 @@ export default {
       },
       // 出货信息
       shipmentObj: this.$attrs.shipmentObj,
-      // 抄送人
-      copyUser: undefined,
       // 抄送人数组
-      copyUsers: [],
+      selectedUsers: [],
     };
   },
   computed: {
@@ -594,10 +579,6 @@ export default {
           : rucangtime[1],
       };
     },
-    /* 删除抄送人 */
-    removeCopyUser(user) {
-      this.copyUser = this.copyUser.filter((id) => id !== user.id);
-    },
     /* 关闭弹框 */
     closeDialog() {
       this.$emit("closeDialog");
@@ -617,17 +598,6 @@ export default {
       });
     },
   },
-  watch: {
-    copyUser(val) {
-      const { allUsers } = this.$attrs;
-      let users = [];
-      for (const id of val) {
-        const user = allUsers.find((item) => item.id === id);
-        if (user) users.push(user);
-      }
-      this.copyUsers = users;
-    },
-  },
 };
 </script>
 
@@ -730,26 +700,6 @@ export default {
         font-weight: bolder;
         font-size: 16px;
       }
-      > :last-child {
-        height: 300px;
-      }
-    }
-    .copy-user {
-      margin-bottom: 15px;
-      > div {
-        display: flex;
-        align-items: center;
-      }
-      > :last-child {
-        .copyUser-tag {
-          display: flex;
-          flex-wrap: wrap;
-
-          > span {
-            margin-right: 10px;
-          }
-        }
-      }
     }
   }
 }

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

@@ -74,7 +74,6 @@ export default {
     seaBaseData: Array,
   },
   data() {
-    console.log(this.$store.state.user);
     return {
       // 弹窗配置
       dialogConfig: {
@@ -177,8 +176,17 @@ export default {
         let nodeIndex = 0;
         for (let j = 0; j < nodes.length; j++) {
           const node = nodes[j];
-          const { keyName, voName, status } = node;
-          if (!keyName) continue;
+          const { keyName, voName, status, type } = node;
+
+          if (!keyName && type === "agent") {
+            if (val[voName]) {
+              // 已完成agent节点
+              node.currStatus = "end";
+              ++nodeIndex;
+            }
+            continue;
+          }
+
           const { start, wait, end } = status;
 
           if (start.includes(val[keyName])) {
@@ -199,7 +207,7 @@ export default {
             ++nodeIndex;
           }
         }
-        // 如果相等标识改步骤已完成
+        // 如果相等标识该步骤已完成
         if (nodeIndex === nodes.length) {
           // 加1表示为已完成步骤后一步
           this.currIndex = i + 1;

src/views/ecw/coupon/edit.vue

@@ -88,7 +88,7 @@
                     <selector v-model="item.prodUnit" :options="unitList" label-field="titleZh" value-field="id" defaultable style="width:100px" />
                     </template>
 
-                    <el-button class="el-icon-plus" size="mini" type="primary" @click="fee[1].push({})" />
+                    <el-button class="el-icon-plus" size="mini" type="primary" @click="fee[1].push({type:1})" />
                     <el-button v-if="fee[1].length > 1" class="el-icon-minus" size="mini" type="danger" @click="fee[1].splice(index,1)" />
                 </div>
 
@@ -127,7 +127,7 @@
                     <selector v-model="item.prodUnit" :options="unitList" label-field="titleZh" value-field="id" defaultable style="width:100px" />
                     </template>
 
-                    <el-button class="el-icon-plus" size="mini" type="primary" @click="fee[2].push({})" />
+                    <el-button class="el-icon-plus" size="mini" type="primary" @click="fee[2].push({type:2})" />
                     <el-button v-if="fee[2].length > 1" class="el-icon-minus" size="mini" type="danger" @click="fee[2].splice(index,1)" />
                 </div>
 				
@@ -276,8 +276,8 @@ export default {
 			couponList: [], // 优惠券列表
 			couponIds:[],
 			fee:{
-				1: [{},{}], // 运费
-				2: [{},{}], // 清关费
+				1: [{type:1},{type:1}], // 运费
+				2: [{type:2},{type:2}], // 清关费
 				3: [{}] // 优惠券专用
 			}
 		};
@@ -428,7 +428,9 @@ export default {
 				if(!this.costType){
 					return this.$message('暂无费用设置')
 				}
-                let data = Object.assign({}, this.form, {discountDetailedVOs: this.fee[this.costType]})
+				// 非有优惠券需要把运费和清关费一起提交
+				let discountDetailedVOs = this.costType == 3 ? this.fee[3] : this.fee[1].concat(this.fee[2])
+                let data = Object.assign({}, this.form, {discountDetailedVOs})
                 // 开始时间必填
                 if(!data.startTime)data.startTime = '2022-01-01 00:00:00'
                 // status必填

src/views/ecw/customer/edit.vue

@@ -162,6 +162,11 @@
                 <el-input v-model="form.remarks" placeholder="请输入备注"/>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="是否显示提单价格" prop="remarks">
+              <el-switch  v-model="form.isShowTidanPrice"></el-switch>
+              </el-form-item>
+            </el-col>
             <el-col :span="24">
               <el-form-item label="到仓确认" prop="arrivalConfirm">
                 <el-switch v-model="form.arrivalConfirm" :active-value="0" :inactive-value="1" />
@@ -493,9 +498,6 @@ export default {
         if (!valid) {
           return;
         }
-        this.form.customerContacts.forEach(e => {
-          e.userid = e.userid.join(',')
-        })
         // 修改的提交
         if (this.form.id != null) {
           this.form.customerContacts.forEach(e => {
@@ -556,7 +558,8 @@ export default {
         remarks: undefined,
         arrivalConfirm: undefined,
         weightUnit: undefined,
-        createTime: undefined
+        createTime: undefined,
+        isShowTidanPrice:true,
       };
       this.resetForm("form");
     },

src/views/ecw/order/batchSingleApplication.vue

 <template>
   <el-dialog
-      :visible.sync="dialogVisible"
-        width="80%"
+    :visible.sync="dialogVisible"
+    width="80%"
     :before-close="()=>{
       $emit('update:dialogVisible',false)
     }">
@@ -11,31 +11,31 @@
         <el-table-column label="订单编号" prop="orderNo"></el-table-column>
         <el-table-column label="唛头" prop="marks"></el-table-column>
         <el-table-column label="已到箱数/总箱数">
-          <template v-slot = {row}>
-            {{row.sumQuantity || 0}}/{{row.totalNum}}
+          <template v-slot={row}>
+            {{ row.sumQuantity || 0 }}/{{ row.totalNum }}
           </template>
         </el-table-column>
         <el-table-column label="下单统计">
           <template v-slot="{row}">
             <div v-if="row.costVO">
-              箱数：{{row.costVO.totalNum}}
-              {{row.costVO.totalVolume}}m³
-              {{row.costVO.totalWeight}}kg
+              箱数：{{ row.costVO.totalNum }}
+              {{ row.costVO.totalVolume }}m³
+              {{ row.costVO.totalWeight }}kg
             </div>
           </template>
         </el-table-column>
         <el-table-column label="入仓统计" width="150">
           <template v-slot="{row}">
-            <div>总箱数：{{row.sumNum || 0}}</div>
-            <div>体积：{{row.sumVolume || 0}}CBM</div>
-            <div>重量：{{row.sumWeight || 0}}KG</div>
+            <div>总箱数：{{ row.sumNum || 0 }}</div>
+            <div>体积：{{ row.sumVolume || 0 }}CBM</div>
+            <div>重量：{{ row.sumWeight || 0 }}KG</div>
           </template>
         </el-table-column>
         <el-table-column label="入仓时间">
 
         </el-table-column>
         <el-table-column label="运输方式">
-          <template v-slot = {row}>
+          <template v-slot={row}>
             <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="row.transportId"></dict-tag>
           </template>
         </el-table-column>
@@ -49,7 +49,7 @@
             <div>
               <div>
                 <p>
-                  {{row.consignorName}}
+                  {{ row.consignorName }}
                 </p>
                 <p>
                 </p>
@@ -61,17 +61,17 @@
           <template v-slot="{row}">
             <div>
               <p>
-                {{row.consigneeName}}
+                {{ row.consigneeName }}
               </p>
               <p>
-                {{row.consigneePhone}}
+                {{ row.consigneePhone }}
               </p>
             </div>
           </template>
         </el-table-column>
         <el-table-column>
           <template v-slot="{row}">
-            <el-button  type="text" v-if="row.inWarehouseState === 10">
+            <el-button @click="canceLtiaoCang(row)" type="text" v-if="row.inWarehouseState === 10">
               取消调仓
             </el-button>
           </template>
@@ -79,11 +79,12 @@
       </el-table>
       <div style="display: flex;justify-content:center; margin-top: 20px">
         <div style="width: 200px; margin: 0 10px">
-          {{ list[0] && list[0].startWarehouseName ? list[0].startWarehouseName : ''  }}
+          {{ list[0] && list[0].startWarehouseName ? list[0].startWarehouseName : '' }}
         </div>
         <div style="width: 200px;">
           <el-select v-model="params.warehouseInId">
-            <el-option v-for="(item ,index) in availableWarehouse" :value="item.id" :label="item.titleZh" :key="index"></el-option>
+            <el-option v-for="(item ,index) in availableWarehouse" :value="item.id" :label="item.titleZh"
+                       :key="index"></el-option>
           </el-select>
         </div>
       </div>
@@ -92,11 +93,11 @@
         审批流程
       </h1>
       <div style="padding: 20px">
-        <work-flow xmlkey="warehouse_transfer" v-model="params.copyUserId"  />
+        <work-flow xmlkey="warehouse_transfer" v-model="params.copyUserId"/>
       </div>
       <div style="text-align: center">
-        <el-button style="margin-right: 50px"  v-if="adjustmentBol" >审核中</el-button>
-        <el-button v-else style="margin-right: 50px" @click="submit"  :disabled="isSubmit">提交申请</el-button>
+        <el-button style="margin-right: 50px" v-if="adjustmentBol">审核中</el-button>
+        <el-button v-else style="margin-right: 50px" @click="submit" :disabled="isSubmit">提交申请</el-button>
         <el-button @click="$emit('update:dialogVisible',false)">取消</el-button>
       </div>
       <!--    <warehouseDetails></warehouseDetails>-->
@@ -107,6 +108,7 @@
 <script>
 import {DICT_TYPE, getDictDatas} from "@/utils/dict";
 import {
+  adjustApplyStatus, cancelAdjustApply,
   ecwOrderList,
   orderWarehouseInAdjustApply,
   warehouseAdjustmentList,
@@ -116,87 +118,128 @@ import warehouseDetails from "@/views/ecw/order/components/warehouseDetails";
 import {getOrderPage} from "@/api/ecw/order";
 import workFlow from "@/components/WorkFlow";
 import Template from "@/views/cms/template";
+
 export default {
   name: "batchSingleApplication",
-  props:{
-    orderList:[String,Number],
-    dialogVisible:{
-      type:Boolean,
-      default:false,
+  props: {
+    orderList: [String, Number],
+    dialogVisible: {
+      type: Boolean,
+      default: false,
     }
   },
-  components:{
+  components: {
     Template,
     warehouseDetails,
     workFlow
   },
-  watch:{
-    dialogVisible(val){
-     if(val){
-       getOrderPage({orderIdList:this.orderList}).then(r =>{
-         this.list = r.data.list
-         warehouseAdjustmentList({id:this.list[0].startWarehouseId}).then( r =>  this.availableWarehouse = r.data)
-       })
-     }
+  watch: {
+    dialogVisible(val) {
+      if (val) {
+        this.getOrderListFn()
+      } else {
+        this.params = {
+          orderIds: undefined,
+          warehouseInId: undefined,
+          warehouseOutId: undefined,
+          copyUserId: [],
+        }
+      }
     }
   },
-  computed:{
-    isSubmit(){
+  computed: {
+    isSubmit() {
       let flag = true;
-       if(this.list.length === 1 &&  this.list[0].status === 5){
+      if (this.list.length === 1 && this.list[0].status === 5) {
         flag = false
-       }else {
-         let l = this.list.map(e => e.startWarehouseId)
-         if(this.list.every(e => e.status === 5) && [...new Set(l)].length === 1) flag = false
-       }
-       return flag;
+      } else {
+        let l = this.list.map(e => e.startWarehouseId)
+        if (this.list.every(e => e.status === 5) && [...new Set(l)].length === 1) flag = false
+      }
+      return flag;
     },
-    adjustmentBol(){
+    adjustmentBol() {
       return this.list.some(e => e.inWarehouseState === 10)
     }
   },
-  data(){
+  data() {
     return {
-      list:[],
-      selectedUsers:[],
-      availableWarehouse:[],
+      list: [],
+      selectedUsers: [],
+      availableWarehouse: [],
       DICT_TYPE,
-      departureWarehouse:undefined,
-      adjustment:undefined,
-      params:{
-        orderIds:undefined,
-        warehouseInId:undefined,
+      departureWarehouse: undefined,
+      adjustment: undefined,
+      params: {
+        orderIds: undefined,
+        warehouseInId: undefined,
         warehouseOutId: undefined,
-        copyUserId:[],
+        copyUserId: [],
       },
     }
   },
-  methods:{
-    submit(){
+  methods: {
+    getOrderListFn() {
+      getOrderPage({orderIdList: this.orderList}).then(r => {
+        this.list = r.data.list
+        warehouseAdjustmentList({id: this.list[0].startWarehouseId}).then(r => this.availableWarehouse = r.data)
+      })
+    },
+    submit() {
       let p = this.list.map(e => e.orderId).join(',');
       this.params.orderIds = p;
       this.params.warehouseOutId = this.list[0].startWarehouseId;
       this.params.orderNo = this.list[0].orderNo
-      orderWarehouseInAdjustApply(this.params).then( r=>{
-        if(r.code === 0){
-          this.$emit('update:dialogVisible',false)
+      orderWarehouseInAdjustApply(this.params).then(r => {
+        if (r.code === 0) {
+          this.$emit('update:dialogVisible', false)
           this.$message.success('调仓成功');
         }
       })
-    }
+    },
+    async canceLtiaoCang(row) {
+      let res = await adjustApplyStatus({orderId: row.orderId})
+      if (res.data.isBatch) {
+        this.$message.warning('批量提提交请耐心等待')
+      } else {
+        this.$prompt('请问您是否要取消调仓？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
+        }).then((val) => {
+          cancelAdjustApply({orderId: row.orderId, reason: val.value}).then(r => {
+            if (r.code === 0) {
+              this.$message({
+                type: 'success',
+                message: '取消调仓成功!'
+              });
+              this.getOrderListFn()
+            }
+          })
+
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消'
+          });
+        });
+      }
+    },
   }
 }
 </script>
 
 <style scoped lang="scss">
-.batch-single-application{
+.batch-single-application {
   padding: 20px;
   box-sizing: border-box;
- .title{
-   font-weight: 600;
-   text-align: left;
- }
+
+  .title {
+    font-weight: 600;
+    text-align: left;
+  }
 }
+
 .my-process-designer {
   height: calc(100vh - 200px);
 }

src/views/ecw/order/cargoControl.vue

@@ -4,7 +4,7 @@
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
       <el-form-item label="日期筛选">
-        <dict-selector :type="DICT_TYPE.ECW_BEGINTIME_TYPE_ENDTIME" v-model="dateFilterType" style="width: 150px; margin-right: 5px" />
+        <dict-selector defaultable :type="DICT_TYPE.ECW_BEGINTIME_TYPE_ENDTIME" v-model="dateFilterType" class="w-100 mr-10" />
         <el-date-picker v-model="dateFilter" type="daterange" range-separator="-"  start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
       </el-form-item>
       <el-form-item label="始发地" prop="startWarehouseId">
@@ -82,7 +82,7 @@
         <template slot-scope="{row}">{{row.totalNum}}</template>
       </el-table-column>
       <el-table-column label="已放箱数" align="center" prop="sumWeight">
-        <template slot-scope="{row}">// TODO</template>
+        <template slot-scope="{row}">{{row.releaseNum}}</template>
       </el-table-column>
       <el-table-column label="订单状态" align="center" prop="status">
         <template slot-scope="scope">
@@ -95,11 +95,11 @@
         </template>
       </el-table-column>
       <el-table-column label="放货人" align="center" prop="sumWeight">
-        <template slot-scope="{row}">// TODO</template>
+        <template slot-scope="{row}">{{row.cargoControlName}}</template>
       </el-table-column>
       <el-table-column label="控货状态" align="center" prop="transportId">
         <template slot-scope="{row}">
-          // TODO
+          <dict-tag :type="DICT_TYPE.CONTROL_GOODS_STATUS" :value="row.cargoControlStatus" />
         </template>
       </el-table-column>
       
@@ -110,8 +110,8 @@
           <el-button type="text"  size="mini" @click="showEditOrderId=scope.row.orderId" >修改</el-button>
           <el-button type="text"  size="mini" >取消</el-button>
           <el-button type="text"  size="mini" @click="review(scope.row)" >放货复核</el-button>
-          <el-button type="text"  size="mini" @click="$router.push('detail?id=' + scope.row.orderId)" >查看</el-button>
-          <el-button type="text"  size="mini" >调货</el-button>
+          <el-button type="text"  size="mini" @click="$router.push('cargo_control/detail?id=' + scope.row.orderId)" >查看</el-button>
+          <el-button type="text"  size="mini" @click="showTransferCargoOrderId=scope.row.orderId" >调货</el-button>
           <el-button type="text"  size="mini" >反复核</el-button>
           <el-button type="text"  size="mini" @click="showTransferOrder = scope.row" >控货权转移</el-button>
         </template>
@@ -124,6 +124,7 @@
     <transfer v-if="showTransferOrder" v-bind="showTransferOrder" @close="showTransferOrder=null" />
     <release  v-if="showReleaseOrderId"  :order-id="showReleaseOrderId"  @close="showReleaseOrderId=null" />
     <release  v-if="showEditOrderId"     :order-id="showEditOrderId"     @close="showEditOrderId=null" />
+    <transfer-cargo v-if="showTransferCargoOrderId"     :order-id="showTransferCargoOrderId"     @close="showTransferCargoOrderId=null" />
   </div>
 </template>
 
@@ -137,12 +138,13 @@ import Transfer from '@/views/ecw/order/components/Transfer'
 import Release from './components/Release'
 import CargoControlEdit from './components/CargoControlEdit'
 import { getCargoControlOrderPage } from "@/api/ecw/orderCargoControl"
+import TransferCargo from '@/views/ecw/order/components/TransferCargo'
 
 
 export default {
   name: "OrderCargonControl",
   components: {
-    CustomerSelector, ProductSelector, Selector, Transfer, Release,CargoControlEdit
+    CustomerSelector, ProductSelector, Selector, Transfer, Release,CargoControlEdit, TransferCargo
   },
   data() {
     return {
@@ -178,6 +180,7 @@ export default {
       showTransferOrder: null, // 控制权转移操作订单
       showReleaseOrderId: null, // 放货ID
       showEditOrderId: null, // 修改ID
+      showTransferCargoOrderId: null, // 调货ID
     };
   },
   computed: {

src/views/ecw/order/cargoControlDetail.vue

 <template>
-    <div  class="app-container">
+    <div  class="app-container" v-if="detail">
         <div class="page-title">控货订单</div>
         <el-form ref="elForm" :model="formData" :rules="rules" size="small" label-width="100px" >
             <el-row>
                 <el-col :span="6">
                 <el-form-item label="订单号" prop="field101">
-                    111
+                    {{detail.orderNo}}
                 </el-form-item>
                 </el-col>
                 <el-col :span="6">
                 <el-form-item label="总控货数" prop="field104">
-                    111
+                    {{detail.sumNum}}
                 </el-form-item>
                 </el-col>
                 <el-col :span="6">
                 <el-form-item label="体积" prop="field103">
-                    111 m³
+                    {{detail.sumVolume}} m³
                 </el-form-item>
                 </el-col>
                 <el-col :span="6">
                 <el-form-item label="重量" prop="field102">
-                    111 kg
+                    {{detail.sumWeight}} kg
                 </el-form-item>
                 </el-col>
                 <el-col :span="6">
                 <el-form-item label="可放货箱数" prop="field105">
-                    111
+                    {{detail.sumNum - detail.pickNum}}
                 </el-form-item>
                 </el-col>
                 <el-col :span="6">
                 <el-form-item label="已放货箱数" prop="field106">
-                    111
+                    {{detail.pickNum}}
                 </el-form-item>
                 </el-col>
             </el-row>
@@ -113,14 +113,20 @@
 </template>
 <script>
 import edit from './components/CargoControlEdit.vue'
+import {createPick, getRleaseInfo} from '@/api/ecw/orderCargoControl'
 export default {
     components: {edit},
     data(){
         return {
             showEdit: false,
-            formData:{}
+            detail: null,
+            formData:{},
+            rules: {}
         }
     },
+    created(){
+        getRleaseInfo(this.$route.query.id).then(res => this.detail = res.data)
+    },
     methods:{
         review(){
             this.$confirm('已核实放货信息，确认放货？')

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

@@ -50,7 +50,7 @@
 
 
       <div v-else>
-          <release-agreement />
+          <need-know keyname="control" />
           <div style="margin-top:30px">
               <el-button type="primary" @click="agreement=true">我同意</el-button>
               <el-button @click="closeDialog">关闭</el-button>
@@ -59,13 +59,13 @@
     </el-dialog>
 </template>
 <script>
-import ReleaseAgreement from "./ReleaseAgreement"
 import WorkFlow from '@/components/WorkFlow'
+import NeedKnow from '@/components/NeedKnow'
 export default {
     props:{
         orderId: [String, Number]
     },
-    components: {ReleaseAgreement, WorkFlow},
+    components: {NeedKnow, WorkFlow},
     data(){
         return {
             show: false,

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

 <template>
-    <el-dialog :title="title" visible :before-close="closeDialog" :close-on-click-modal="false">
-      <el-form v-if="agreement"  ref="elForm" :model="formData" :rules="rules" size="small" label-width="100px" >
+    <el-dialog :title="title" visible :before-close="closeDialog" :close-on-click-modal="false" width="1000px">
+      <el-form v-if="agreement"  ref="form" :model="formData" :rules="rules" size="small" label-width="100px" >
         <el-row>
           <el-col :span="6">
-            <el-form-item label="订单号" prop="field101">
-              {{detail.orderNO}}
+            <el-form-item label="订单号">
+              {{detail.orderNo}}
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="总箱数" prop="field104">
+            <el-form-item label="总箱数">
               {{detail.sumNum}}
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="体积" prop="field103">
+            <el-form-item label="体积">
               {{detail.sumVolume}}m³
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="重量" prop="field102">
+            <el-form-item label="重量">
               {{detail.sumWeight}}kg
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="总控货箱数" prop="field105">
-              // TODO
+            <el-form-item label="总控货箱数">
+              {{detail.sumNum}}
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="剩余放货箱数" prop="field106">
-              // TODO
+            <el-form-item label="剩余放货箱数">
+              {{detail.sumNum - detail.releaseNum	}}
             </el-form-item>
           </el-col>
         </el-row>
         <div class="title">请填写放货信息</div>
-        <el-row>
-            <el-col :span="8">
-              <el-form-item label="收货人" prop="field108">
-                <el-input v-model="formData.field108" placeholder="请输入收货人" clearable ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="收货人电话" prop="field109">
-                <el-input v-model="formData.field109" placeholder="请输入收货人电话" clearable></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="收货人邮箱" prop="field110">
-                <el-input v-model="formData.field110" placeholder="请输入收货人邮箱" clearable></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-table :data="[1]" border>
-            <el-table-column label="控货箱数">
-
-            </el-table-column>
-            <el-table-column label="放货箱数">
-              <el-input v-model="formData.field110" placeholder="请输入收货人邮箱" clearable></el-input>
-            </el-table-column>
-            <el-table-column label="体积（m³）">
-              <el-input v-model="formData.field110" placeholder="请输入收货人邮箱" clearable></el-input>
-            </el-table-column>
-            <el-table-column label="重量（kg）">
-              <el-input v-model="formData.field110" placeholder="请输入收货人邮箱" clearable></el-input>
-            </el-table-column>
-            <el-table-column label="备注">
-              <el-input v-model="formData.field110" placeholder="请输入收货人邮箱" clearable></el-input>
-            </el-table-column>
-          </el-table>
-          <el-form-item label="控货手机号" prop="field117" style="margin-top:20px">
-            <el-input v-model="formData.field117" placeholder="请输入控货手机号" clearable >
-            </el-input>
+        <div class="flex">
+          <el-form-item label="收货人" prop="consigneeName">
+            <el-input v-model="formData.consigneeName" placeholder="请输入收货人" clearable class="w-150" ></el-input>
           </el-form-item>
-          <el-form-item label="手机验证码" prop="field118">
-            <el-input v-model="formData.field118" placeholder="请输入手机验证码" clearable style="width:200px; margin-right:10px" ></el-input>
-            <el-button type="success">获取验证码</el-button>
+          <el-form-item label="收货人电话" prop="consigneePhone">
+            <!-- <el-input v-model="formData.field109" placeholder="区号" clearable class="w-150"></el-input> -->
+            <area-code-selector v-model="formData.consigneeCountryCode" class="w-150" />
+            <el-input v-model="formData.consigneePhone" placeholder="请输入收货人电话" clearable class="w-150 ml-10"></el-input>
           </el-form-item>
-          <el-form-item label="" prop="field117" style="margin-top:20px">
-            <el-button type="success">确认放货</el-button>
-            <el-button type="default" @click="closeDialog">关闭</el-button>
+          <el-form-item label="收货人邮箱" prop="consigneeEmail">
+            <el-input v-model="formData.consigneeEmail" placeholder="请输入收货人邮箱" clearable class="w-150" ></el-input>
           </el-form-item>
+        </div>
+        <el-table :data="[formData]" border>
+          <el-table-column label="控货箱数">
+              {{detail.sumNum}}
+          </el-table-column>
+          <el-table-column label="放货箱数">
+            <template slot-scope="{row}">
+              <el-input type="number" v-model.number="row.pickNum" placeholder="" clearable></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column label="体积（m³）">
+            <template slot-scope="{row}">
+              <el-input type="number" v-model.number="row.pickVolume" placeholder="" clearable></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column label="重量（kg）">
+            <template slot-scope="{row}">
+              <el-input type="number" v-model.number="row.pickWeight" placeholder="" clearable></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column label="备注">
+            <template slot-scope="{row}">
+              <el-input v-model="row.remarks" placeholder="" clearable></el-input>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-form-item label="控货手机号" prop="field117" style="margin-top:20px">
+          <el-input :value="detail.phone" readonly placeholder="请输入控货手机号" >
+          </el-input>
+        </el-form-item>
+        <el-form-item label="手机验证码" prop="code">
+          <el-input v-model="formData.code" placeholder="请输入手机验证码" clearable class="w-150 mr-10"></el-input>
+          <!-- <el-button type="success">获取验证码</el-button> -->
+          <send-sms-code :order-id="detail.orderId" scene="5" />
+        </el-form-item>
+        <el-form-item label="" style="margin-top:20px">
+          <el-button type="success" @click="submit">确认放货</el-button>
+          <el-button type="default" @click="closeDialog">关闭</el-button>
+        </el-form-item>
       </el-form>
 
       <div v-else>
-          <release-agreement />
+          <!-- <release-agreement /> -->
+          <need-know ref="needKnow" keyname="control" />
           <div style="margin-top:30px">
               <el-button type="primary" @click="agreement=true">我同意</el-button>
+              <!-- <el-button type="primary" @click="$refs.needKnow.download()">保存协议</el-button> -->
               <el-button @click="closeDialog">关闭</el-button>
           </div>
       </div>
     </el-dialog>
 </template>
 <script>
-import ReleaseAgreement from "./ReleaseAgreement"
 import {getOrder} from '@/api/ecw/order'
+import {createPick, getRleaseInfo} from '@/api/ecw/orderCargoControl'
+import AreaCodeSelector from '@/components/AreaCodeSelector'
+import SendSmsCode from '@/views/ecw/order/components/SendSmsCode'
+import NeedKnow from '@/components/NeedKnow'
 export default {
     props:{
         orderId: [String, Number]
     },
-    components: {ReleaseAgreement},
+    components: {AreaCodeSelector, SendSmsCode, NeedKnow},
     data(){
         return {
             show: false,
             detail: null,
-            formData:{},
+            formData:{
+              "pickNum": 0,
+              "pickQuantity": 0,
+              "pickVolume": 0,
+              "pickWeight": 0,
+              "remarks": "",
+            },
+            rules:{
+              consigneeName: {required: true, message: '请填写收货人'},
+              code: {required: true, message: '请填写验证码'}
+            },
             agreement: false, // 是否同意协议
         }
     },
@@ -122,13 +142,26 @@ export default {
     },
     methods:{
         loadData(){
-            getOrder(this.orderId).then(res => this.detail = res.data)
+            getRleaseInfo(this.orderId).then(res => this.detail = res.data)
         },
         closeDialog(){
             this.show = false
             this.$emit('close');
         },
-        
+        submit(){
+          this.$refs.form.validate(valid => {
+            if(!valid){
+              return false
+            }
+            console.log('submit')
+            createPick(this.formData).then(res => {
+              this.$message.success(res.msg || '操作成功')
+              this.closeDialog()
+            })
+          })
+          
+
+        }
     }
 }
 </script>

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

-<template>
-    <div>
-        <h2>《捷道控放货须知》</h2>
-        <pre>
-        请您仔细阅读我们的控货须知，如果您对此须知中有任何部分存在疑问，请联系我司售前客服，如您已下单表示您已清楚我司控放货流程及风险。
-        1. 关于控货与放货
-        1.1控货是指由发货人与我司约定在货物的国际运输过程中，我司作为第三方对该货物进行临时控制；非经发货人按约定程序授权，我司不解除对该货物的控制的行为；
-        1.2您在订舱时选择控货选项，在货物入仓后，系统将会自动生成入仓号，表示货物已经控货成功；
-        1.3同一入仓号所属的货物只能控货一次，若出现分批次放货的情形，则最多不得超过3次，且每次只能有一个提货人；
-        1.4货物运抵目的地之后捷道公司会对货物进行临时控制。一经向系统申请放货并获得系统确认，则表明我司已获得您的授权，我司将根据约定向提货单持有人放货；
-        1.5您应在货物抵达目的地后30个自然日内通知捷道公司放货。尼日利亚：超过30日的，您应向捷道公司支付相应的仓储费尼；超过30天每天收取20naira/CBM ，超过60天每天40naira/CBM ，超过90天每天60naira/CBM；加纳：超过15日，需支付每天$1/CBM，超过180个自然日捷道公司有权根据依照相关法律规定处理该临时控制的货物；
-        1.6放货方式：A：登陆我司后台www.groupage.cn点击放货，通过账号原始绑定手机获取验证码进行放货；B：联系我司客服进行放货，联系电话4009009962，上班时间周一至周六 9:00-18:00。
-
-        2. 免责声明
-        2.1接受控货并不表明捷道公司对您货物所有权瑕疵进行担保；
-        2.2捷道公司经授权放货不代表同意对买卖双方的货款结算进行担保；
-        2.3若系统后台注册信息与实际信息不一致，如绑定手机号码需要更改，请自行登录系统后台操作，我司不提供任何注册信息主动变更服务，因注册信息与实际不一致而造成的损失，由您自行承担。
-        </pre>
-    </div>
-    
-</template>
\ No newline at end of file

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

 <template>
-    <span @click="send">{{text}}</span>
+    <el-button @click="send" :disabled="leftTime > 0 && leftTime < 60">{{text}}</el-button>
 </template>
 <script>
 import {sendSmsCode} from '@/api/ecw/orderCargoControl'

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

+<!--拆单审核中的申请信息部分-->
+<template>
+    <div>拆单审核详情</div>
+</template>
+<script>
+export default {
+    props:{
+        id: [String, Number]
+    },
+    data(){
+        return {
+
+        }
+    },
+    created(){
+
+    }
+}
+</script>
\ No newline at end of file

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

 <template>
-    <el-dialog :title="title" visible :before-close="closeDialog" :close-on-click-modal="false">
+    <el-dialog :title="title" visible :before-close="closeDialog" :close-on-click-modal="false" width="800px">
         <div class="" v-if="agreement">
             <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="120px">
               <el-form-item label="原控货人">
@@ -13,11 +13,8 @@
                 <el-input v-model="form.name"></el-input>
               </el-form-item>
               <el-form-item label="新控货手机号" prop="phone">
-                <el-input v-model="form.phone" type="tel">
-                    <el-select slot="prepend" v-model="form.dialCode" placeholder="" style="width:200px">
-                      <el-option v-for="item in countryList" :key="item.id" :label="item.nameZh + item.tel" :value="item.tel.replace('+', '')"></el-option>
-                    </el-select>
-                </el-input>
+                <area-code-selector v-model="form.dialCodeSrc" />
+                <el-input v-model="form.phone" type="tel" class="ml-10 w-200" />
               </el-form-item>
               <el-form-item label="新控货人邮箱" prop="email">
                 <el-input v-model="form.email" type="email"></el-input>
@@ -33,7 +30,7 @@
             </el-form>
         </div>
         <div v-else>
-            <transfer-agreement />
+            <need-know ref="needKnow" keyname="controltransfer" />
             <div style="margin-top:30px">
                 <el-button type="primary" @click="agreement=true">我同意</el-button>
                 <el-button @click="closeDialog">关闭</el-button>
@@ -42,10 +39,11 @@
     </el-dialog>
 </template>
 <script>
-import TransferAgreement from "./TransferAgreement"
 import {getCountryListAll} from '@/api/ecw/country'
 import SendSmsCode from './SendSmsCode'
 import {create} from '@/api/ecw/orderCargoControl'
+import NeedKnow from '@/components/NeedKnow'
+import AreaCodeSelector from '@/components/AreaCodeSelector'
 export default {
     props:{
         orderId: [String, Number],
@@ -53,12 +51,15 @@ export default {
         cargoControlPhone: String,
         orderNo: String
     },
-    components: {TransferAgreement, SendSmsCode},
+    components: {SendSmsCode, NeedKnow, AreaCodeSelector},
     data(){
         return {
             show: false,
             // detail: null,
-            form:{},
+            form:{
+              dialCodeSrc: null,
+              dialCode: null
+            },
             agreement: false, // 是否同意协议
             countryList: [],
             rules:{
@@ -75,17 +76,20 @@ export default {
         }
     },
     watch:{
-      countryList(){
+      'form.dialCodeSrc'(){
+        this.form.dialCode = this.form.dialCodeSrc.replace('+', '')
+      }
+      /* countryList(){
         if(this.countryList.length){
           this.$set(this.form, 'dialCode', this.countryList[0].tel.replace('+', ''))
         }
-      }
+      } */
     },
     created(){
         this.show = true
-        getCountryListAll().then(res => {
+        /* getCountryListAll().then(res => {
           this.countryList = res.data
-        })
+        }) */
     },
     methods:{
         closeDialog(){

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

-<template>
-    <pre>
-        控货权转移须知
-
-        《控货权转移须知》
-
-        为了切实加强施工现场安全生产管理，依照《中华人民共和国安全生产法》、《中华人民共和国建筑法》、《中华人民共和国合同法》以及《建设工程安全生产管理条例》建设部《施工现场临时用电安全技术规范》（JGJ46-88）、《建筑施工安全检查标准》（JGJ59-99），双方本着平等、自愿的原则，签订本协议书。甲方和乙方均严格遵守本协议书规定的权力、责任和义务，确保施工现场的安全生产和施工现场临时用电的安全。
-
-        一、甲方的权利、责任和义务：
-
-        1、贯彻落实国家有关施工现场安全生产、文明施工的法规和管理规定，对乙方施工现场和区域进行全面的安全生产管理和监督检查并对施工现场临时用电进行安全检查与指导。
-
-        2、及时纠正乙方施工人员违章指挥和违章作业行为，并按照有关规定予以查处。对乙方施工区域内的重大安全事故隐患，应开具隐患通知单。
-
-        3、要求乙方提供施工现场《生产安全事故应急救援预案》。
-
-        4、建立健全施工现场各项安全生产管理制度。
-
-        5、对乙方的安全生产培训、劳动保护用品的使用和危险预知工作提出指导意见，并监督落实情况。
-
-        6、对乙方提出的安全生产要求积极提供帮助。
-
-        7、向乙方提供电源时，应与乙方办理交接验收手续。
-
-        8、按照有关临时用电标准对乙方的临时用电设备设施进行监督和检查。发现乙方在临时用电中存在隐患必须责成乙方以整改。并监督整改落实情况。
-
-        9、对乙方特种作业人员的名单、操作证复印件及培训记录进行存档备案。
-
-        二、乙方的权利、责任和义务：
-
-        1、遵守国家有关施工现场安全生产的法规和管理制度，建立健全安全生产责任制和安全生产管理制度。严格执行国家施工现场临时用电及机械设备使用有关技术规范和安全操作规程，对施工区域内自行管辖的临时用电负全面管理责任。
-
-        2、服从甲方安全生产管理。
-
-        3、乙方必须为施工作业人员参加人身意外保险。
-
-        4、乙方造成生产安全事故，导致人员伤亡时，由乙方承担事故责任和经济责任。
-
-        5、未经安全生产教育培训和无证人员，不得上岗作业。
-
-        三、协议内容：
-
-        （一）登高上架要求
-
-        1、施工采用的脚手架、安全网必须由专业人员搭设，由项目经理（工地负责人）组织技术部、安全部门的有关人员验收合格后，方可投入使用，应按类别逐项查验，并应有验收记录。
-
-        2、高空作业时，严禁立体交叉作业。水平作业时，各工位间必须有一定的距离，作业人员必须配备相应劳动保护用品如安全帽、安全带、防护眼镜、防护手套、防护工作服等，并应正确使用，施工作业现场周边设置相关安全标志牌，并设专人巡查。
-
-        3、进入施工现场的人员必须佩带安全帽。凡在2m以上高处作业人员，必须正确使用安全带，安全带应高挂低用。
-
-        4、工程施工前，除工程技术人员对施工作业人员进行书面安全技术交底，并履行签字手续外，必须各施工班组长向施工人员进行班组交底及履行签字手续。
-
-        5、特殊工程施工项目如；电气、易燃、易爆容器、管道等，必须持有效证件及上岗证的专业人员操作。
-
-        6、拆除施工现场，必须设有临时急救人员及药品或设立临时救助站。
-
-        7、严禁在工作前和工作中饮酒，不许穿高跟鞋、硬底鞋、拖鞋，应穿防滑鞋。
-
-        8、进入施工现场须服从领导和安检人员的指挥，遵守劳动纪律、严守岗位、不串岗，作业时思想要集中。
-
-        9、严禁随意拆除或损坏防护栏杆、拉杆、安全网、跳板、脚手板、支撑等防护设施。
-
-        10、面砖搬运、安装时应注意安全，防止因面砖翻倒而受伤。
-
-        11、各种材料加工时注意操作安全及施工用电，不得随便乱接乱拉电线。
-
-        12、施工现场各周边洞口，必须有符合安全规范要求的安全防护，若因施工作业场地要求而拆除的，操作完成后，立即恢复。
-
-        13、脚手架上禁止有探头板、飞跳板，脚手架上应满铺脚手板，脚手架上禁止堆放砂浆、砖块、面砖等物料。
-
-        14、不准从正在起吊、运吊中的物件下通过，以防突然事件，不准从高处往下跑、跳；不准在没有防护的外墙和外悬挑板等建筑物上行走；不准站在小推车等不稳定的物件上操作；不得攀登起重臂、绳索、脚手架、井字架和随同运料的吊盘和吊篮及吊装物上下；井架吊篮禁止乘人。
-
-        15、作业中不得往下投掷物件、碎砖、灰渣等，清理物料时应设溜槽或使用垃圾桶；手持工具和零星物料应随时放在工具袋中。
-
-        16、年龄未满18周岁者，患有心脏病、贫血、高血压、低血压、癫痫病及其他不适于高空作业的病症者严禁从事外墙施工作业。
-
-        17、遇到雷雨、大风等天气外墙施工应暂停作业。
-
-        18、手持电动工具使用前应进行检查，空载试验运转正常合格后方可使用，转移工作点应切断电源，潮湿场所严禁使用手持式电动工具。
-        19、作业前必须认真检
-    </pre>
-</template>
\ No newline at end of file

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

+<template>
+    <el-dialog title="调货" visible :before-close="closeDialog" :close-on-click-modal="false" width="800px">
+      <!--调货-->
+      <el-form ref="form" :model="formData" :rules="rules" size="small" label-width="150px" >
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="收货人">
+              {{detail.orderNo}}
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="收货人电话">
+              {{detail.sumNum}}
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="选择控货订单">
+              <el-select v-model="formData.order" placeholder="请选择控货中的订单" multiple>
+                <el-option :label="1" :value="1"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-table :data="[formData,formData]" border>
+          <el-table-column label="订单号">
+              {{detail.sumNum}}
+          </el-table-column>
+          <el-table-column label="目的地">
+            <template slot-scope="{row}">
+              <el-input type="number" v-model.number="row.pickNum" placeholder="" clearable></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column label="总控货数">
+            <template slot-scope="{row}">
+              <el-input type="number" v-model.number="row.pickNum" placeholder="" clearable></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column label="放货箱数">
+            <template slot-scope="{row}">
+              <el-input type="number" v-model.number="row.pickNum" placeholder="" clearable></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column label="体积（m³）">
+            <template slot-scope="{row}">
+              <el-input type="number" v-model.number="row.pickVolume" placeholder="" clearable></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column label="重量（kg）">
+            <template slot-scope="{row}">
+              <el-input type="number" v-model.number="row.pickWeight" placeholder="" clearable></el-input>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <el-form-item label="备注" prop="remarks" class="mt-10">
+          <el-input v-model="formData.remarks" clearable></el-input>
+        </el-form-item>
+        <el-form-item label="控货手机号" prop="field117" style="margin-top:20px">
+          {{detail.consigneeCountryCode}} {{detail.phone}}
+        </el-form-item>
+        <el-form-item label="手机验证码" prop="code">
+          <el-input v-model="formData.code" placeholder="请输入手机验证码" clearable class="w-150 mr-10"></el-input>
+          <send-sms-code :order-id="detail.orderId" scene="5" />
+        </el-form-item>
+        <el-form-item label="" style="margin-top:20px">
+          <el-button type="success" @click="submit">提交申请</el-button>
+          <el-button type="default" @click="closeDialog">关闭</el-button>
+        </el-form-item>
+      </el-form>
+
+    </el-dialog>
+</template>
+<script>
+import {createPick, getRleaseInfo} from '@/api/ecw/orderCargoControl'
+import AreaCodeSelector from '@/components/AreaCodeSelector'
+import SendSmsCode from '@/views/ecw/order/components/SendSmsCode'
+export default {
+    props:{
+        orderId: [String, Number]
+    },
+    components: {AreaCodeSelector, SendSmsCode},
+    data(){
+        return {
+            show: false,
+            detail: null,
+            formData:{
+              "pickNum": 0,
+              "pickQuantity": 0,
+              "pickVolume": 0,
+              "pickWeight": 0,
+              "remarks": "",
+            },
+            rules:{
+              consigneeName: {required: true, message: '请填写收货人'},
+              code: {required: true, message: '请填写验证码'}
+            },
+        }
+    },
+    created(){
+        this.show = true
+        this.loadData()
+    },
+    methods:{
+        loadData(){
+            getRleaseInfo(this.orderId).then(res => this.detail = res.data)
+        },
+        closeDialog(){
+            this.show = false
+            this.$emit('close');
+        },
+        submit(){
+          this.$refs.form.validate(valid => {
+            if(!valid){
+              return false
+            }
+            console.log('submit')
+            
+          })
+          
+
+        }
+    }
+}
+</script>
+<style lang="scss" scoped>
+.title{
+  font-size:16px;
+  margin:20px 0;
+  display:flex;
+  align-items:center;
+  &:before{
+    content: '';
+    width:5px;
+    height: 15px;
+    background:#666;
+    margin-right:10px;
+  }
+}
+</style>
\ No newline at end of file

src/views/ecw/order/index.vue

@@ -177,6 +177,8 @@
                      v-hasPermi="['ecw:order:update']">特价</el-button>
 
               <el-button type="text"  size="mini" @click="$router.push(`/order/release?orderId=${scope.row.orderId}`)">确认放货</el-button>
+              <el-button type="text"  size="mini" @click="$router.push(`/order/singleApply?orderNo=${scope.row.orderNo}`)">合单申请</el-button>
+              <el-button type="text"  size="mini" @click="$router.push(`/order/splitApply?orderId=${scope.row.orderId}`)">拆单申请</el-button>
             </div>
 
           </el-popover>

src/views/ecw/order/singleApply.vue

@@ -185,11 +185,9 @@ export default {
   },
   created() {
     if (this.$route.query.orderNo) {
-      this.queryParams.mergedOrderNo =this.$route.query.orderNo
-
+      this.queryParams.mergedOrderNo = this.$route.query.orderNo
     }
     this.getList()
-
     getTradeCityList().then(res => this.tradeCityList = res.data)
   },
   methods: {

src/views/ecw/order/success.vue

@@ -28,9 +28,10 @@
         </div>
 
         <el-dialog title="查看须知" :visible.sync="showNotice" width="700px">
-            <img :src="noticeUrl" id="noticeImg" />
+            <!-- <img :src="noticeUrl" id="noticeImg" /> -->
+            <need-know keyname="control" ref="needKnow" />
             <div style="text-align:center">
-                <el-button type="primary" @click="download">下载</el-button>
+                <el-button type="primary" @click="$refs.needKnow.download()">下载</el-button>
             </div>
         </el-dialog>
     </div>
@@ -39,12 +40,15 @@
 import {getOrder} from '@/api/ecw/order'
 import FileSaver from 'file-saver'
 import {dataURLtoBlob} from '@/utils/index'
+import NeedKnow from '@/components/NeedKnow'
+
 export default {
+    components: {NeedKnow},
     data(){
         return {
             order: null,
             showNotice: false,
-            noticeUrl: 'http://v4.groupage.cn/Public/images/notice.png'
+            // noticeUrl: 'http://v4.groupage.cn/Public/images/notice.png'
         }
     },
     created(){
@@ -57,7 +61,7 @@ export default {
                     this.order = res.data
                 })
         },
-        download(){
+        /* download(){
             let el = document.getElementById('noticeImg')
             this.downloadIamge(this.noticeUrl, 'ce')
         },
@@ -80,7 +84,7 @@ export default {
             }
             image.src = imgsrc
 
-        }
+        } */
     }
 }
 </script>

src/views/ecw/order/transferWarehousing.vue

@@ -75,11 +75,11 @@
       </el-table-column>
     </el-table>
     <el-descriptions style="margin-top: 20px" :column="4" border>
-      <el-descriptions-item label="集运仓库">{{ warehouseDetails.warehouseOutName }}</el-descriptions-item>
+      <el-descriptions-item label="集运仓库">{{ warehouseDetails && warehouseDetails.warehouseOutName  ?  warehouseDetails.warehouseOutName : '' }}</el-descriptions-item>
       <el-descriptions-item label="储位">
-         <div v-for="item in storageSpaceList"  style="display: flex;"><div>{{item.warehouseName}}</div><div>{{item.regionName}} 区</div></div>
+         <div v-for="item in storageSpaceList"  style="display: flex;"><div>{{item.warehouseName ? item.warehouseName : ''}}</div><div>{{item.warehouseName ? item.regionName :''}} 区</div></div>
       </el-descriptions-item>
-      <el-descriptions-item label="调拨目标仓">{{ warehouseDetails.warehouseInName }}</el-descriptions-item>
+      <el-descriptions-item label="调拨目标仓">{{ warehouseDetails && warehouseDetails.warehouseInName ? warehouseDetails.warehouseInName : '' }}</el-descriptions-item>
       <el-descriptions-item label="物流公司">
         <el-select v-model="params.logisticsCompany" >
           <el-option v-for="(item,index) in expressList " :key="index"  :value="item.id" :label="item.companyZh"></el-option>
@@ -208,7 +208,7 @@ export default {
           })
         }
       })
-      this.params.phone = this.warehouseDetails.phone;
+      this.params.phone = this.warehouseDetails.phone || '';
       this.params.logisticsNo = this.warehouseDetails.logisticsNo;
       this.params.id = this.warehouseDetails.id;
       this.params.deliveryDate = this.warehouseDetails.deliveryDate

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

@@ -25,7 +25,11 @@
           </el-select>
         </el-descriptions-item>
         <el-descriptions-item label="是否备案">{{ isBeian }}</el-descriptions-item>
-        <el-descriptions-item label="填单参数"></el-descriptions-item>
+        <el-descriptions-item label="填单参数">
+          箱数：{{ warehousing.num }}<br>
+          体积：{{ warehousing.volume }}m³<br>
+          重量：{{ warehousing.weight }}Kg
+        </el-descriptions-item>
       </el-descriptions>
       <el-form ref="form" :model="form" label-width="80px" style="margin-top: 20px">
         <el-form-item label="材质">
@@ -88,7 +92,7 @@
               <el-input v-else v-model.number="tableData[$index].weight" placeholder=""></el-input>
             </template>
           </el-table-column>
-          <el-table-column label="数量">
+          <el-table-column label="数量" width="130px">
             <template v-slot="{r,c,$index}">
               <span v-if="tableData[$index].id">{{ tableData[$index].quantityAll }}</span>
               <el-input v-else v-model.number="tableData[$index].quantityAll" placeholder="">
@@ -105,6 +109,13 @@
         </el-table>
       </el-card>
 
+
+      <div v-if="edit">
+        <h2>审批流程</h2>
+        <work-flow xmlkey="free_apply" v-model="selectedUsers"  />
+        <!--        <div>选择的用户：{{selectedUsers}}</div>-->
+      </div>
+
       <span slot="footer">
         <el-button @click="opened = false">关 闭</el-button>
         <el-button type="primary" @click="handleSubmit()">提 交</el-button>
@@ -116,15 +127,17 @@
 <script>
 import dictSelector from "@/components/DictSelector"
 import {DICT_TYPE, getDictDataLabel} from "@/utils/dict"
-import warehousing from "@/views/ecw/order/warehousing"
-import {orderWarehouseIn} from "@/api/ecw/order"
+import { orderWarehouseIn, orderWarehouseInUpdateApply } from '@/api/ecw/order'
 import {getProductBrankPage} from "@/api/ecw/productBrank"
+import WorkFlow from "@/components/WorkFlow"
+import elSelect from '@/components/render/slots/el-select'
 
 export default {
   name: 'editDialog',
 
   components: {
-    dictSelector
+    dictSelector,
+    WorkFlow
   },
 
   props: {
@@ -132,6 +145,11 @@ export default {
       type: Boolean,
       default: false
     },
+    // 入仓修改
+    edit: {
+      type: Boolean,
+      default: false
+    },
     warehousing: {
       type: Object,
       default: () => {
@@ -146,18 +164,25 @@ export default {
 
   mounted() {
     getProductBrankPage({pageSize: 100000}).then(r => {
-      this.brandList = r.data.list.map(e => {
-        if(e.id){
-          e.id = e.id.toString()
-        }
-        const boxGauge = e.boxGauge
-        if (boxGauge && boxGauge.length > 0) {
-          const boxGaugeList = boxGauge.split('*')
-          const [boxGauge1, boxGauge2, boxGauge3] = boxGaugeList
-          return {...e, boxGauge1, boxGauge2, boxGauge3}
-        }
-        return e
-      })
+      this.brandList = [
+        {
+          "titleZh":"无",
+          "titleEn":"",
+          "id":'0'
+        },
+        ...r.data.list.map(e => {
+          if(e.id){
+            e.id = e.id.toString()
+          }
+          const boxGauge = e.boxGauge
+          if (boxGauge && boxGauge.length > 0) {
+            const boxGaugeList = boxGauge.split('*')
+            const [boxGauge1, boxGauge2, boxGauge3] = boxGaugeList
+            return {...e, boxGauge1, boxGauge2, boxGauge3}
+          }
+          return e
+        })
+      ]
     })
   },
 
@@ -183,7 +208,9 @@ export default {
         "prodType": 0,
         "type": 0
       },
-      // orderItem: {}
+      // orderItem: {},
+
+      selectedUsers: undefined
     };
   },
 
@@ -218,27 +245,48 @@ export default {
       }
     },
     handleSubmit() {
-      const orderWarehouseInItemDoList = this.form.orderWarehouseInItemDoList.map(e => {
-        return {
-          ...e,
-          boxGauge: e.boxGauge1 + '*' + e.boxGauge2 + '*' + e.boxGauge3
-        }
-      })
-      return orderWarehouseIn({
-        ...this.form,
-        brandType: this.form.brand ? 1 : 0,
-        orderId: this.warehousing.orderId,
-        orderItemId: this.warehousing.orderItemId,
-        orderNo: this.warehousing.orderNo,
-        orderWarehouseInItemDoList
-      }).then(r => {
-        if (r.data){
-          this.$message.success('入仓成功')
-          this.handleClose()
-        }else {
-          this.$message.success('入仓失败')
-        }
-      })
+      const orderWarehouseInItemDoList = [
+        ...this.warehousing.orderWarehouseInBackItemDoList,
+        ...this.form.orderWarehouseInItemDoList.map(e => {
+          return {
+            ...e,
+            boxGauge: e.boxGauge1 + '*' + e.boxGauge2 + '*' + e.boxGauge3
+          }
+        })
+      ]
+      if (this.edit)
+        return orderWarehouseInUpdateApply({
+          ...this.form,
+          brandType: this.form.brand ? 1 : 0,
+          orderId: this.warehousing.orderId,
+          orderItemId: this.warehousing.orderItemId,
+          orderNo: this.warehousing.orderNo,
+          "orderWarehouseInUpdateItemDoList": orderWarehouseInItemDoList,
+          copyUserId: this.selectedUsers
+        }).then(r => {
+          if (r.data){
+            this.$message.success('入仓修改发起成功')
+            this.handleClose()
+          }else {
+            this.$message.success('入仓修改发起失败')
+          }
+        })
+      else
+        return orderWarehouseIn({
+          ...this.form,
+          brandType: this.form.brand ? 1 : 0,
+          orderId: this.warehousing.orderId,
+          orderItemId: this.warehousing.orderItemId,
+          orderNo: this.warehousing.orderNo,
+          orderWarehouseInItemDoList
+        }).then(r => {
+          if (r.data){
+            this.$message.success('入仓成功')
+            this.handleClose()
+          }else {
+            this.$message.success('入仓失败')
+          }
+        })
     },
     handleClose() {
       this.form.orderWarehouseInItemDoList = []

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

@@ -63,10 +63,13 @@
         prop="address"
         label="操作">
         <template v-slot="{ row, column, $index }">
-          <el-button v-if="orderItemList[$index] && orderItemList[$index].orderWarehouseInBackItemDoList && orderItemList[$index].orderWarehouseInBackItemDoList.length > 0" size="mini" type="text" @click="handleWarehousing($index)">追加</el-button>
-          <el-button v-else size="mini" type="text" @click="handleWarehousing($index)">入仓</el-button>
-          <el-button size="mini" type="text" @click="handleWarehousingReturn(row)">退仓</el-button>
           <el-button v-if="order.status === 5" size="mini" type="text" @click="handleWarehousing($index)">修改</el-button>
+          <template v-else>
+            <el-button v-if="orderItemList[$index] && orderItemList[$index].orderWarehouseInBackItemDoList && orderItemList[$index].orderWarehouseInBackItemDoList.length > 0" size="mini" type="text" @click="handleWarehousing($index)">追加</el-button>
+            <el-button v-else size="mini" type="text" @click="handleWarehousing($index)">入仓</el-button>
+            <el-button size="mini" type="text" @click="handleWarehousingReturn(row)">退仓</el-button>
+          </template>
+
         </template>
       </el-table-column>
     </el-table>
@@ -86,7 +89,16 @@
         </el-input>
       </el-form-item>
 
-      <div style="text-align: center;margin-top: 15px">
+      <el-card style="margin-top: 15px;">
+        <div slot="header" class="clearfix">
+          <span style="font-size: 18px">入仓影像</span>
+        </div>
+        <div>
+          <image-and-video-upload :fileSize="50" :isShowTip="true" v-model="form.urls" ></image-and-video-upload>
+        </div>
+      </el-card>
+
+      <div style="text-align: center;margin-top: 15px" v-if="order.status !== 5">
         <el-button @click="escapeBol = true;" type="primary">转异</el-button>
         <el-button type="primary" @click="finishVisible = true">完成入仓</el-button>
       </div>
@@ -94,7 +106,7 @@
 
     <warehouse-area-dialog ref="area" :visible.sync="areaVisible" v-model="form.orderLocationCreateReqVOList" :order-id="orderId"></warehouse-area-dialog>
 
-    <edit-dialog :visible.sync="warehousingVisible" :warehousing="warehousing"></edit-dialog>
+    <edit-dialog :visible.sync="warehousingVisible" :warehousing="warehousing" :edit="order.status === 5"></edit-dialog>
 
 <!--  完成入仓  -->
     <el-dialog
@@ -110,7 +122,7 @@
         <el-button type="primary" @click="handleSubmit()">确 定</el-button>
       </div>
     </el-dialog>
-    <el-dialog :title="order.orderNo + '转异常单'" center :visible.sync="escapeBol">
+    <el-dialog :title="order.orderNo + '订单转异'" center :visible.sync="escapeBol">
       <el-form label-position="top" label-width="200">
         <el-form-item label="原因类型">
           <dict-selector v-model="form.manualExceptionType" form-type="checkbox" :type="DICT_TYPE.MANUAL_EXCEPTION_TYPE" multiple ></dict-selector>
@@ -123,10 +135,24 @@
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button  type="primary" @click="handleSubmit">转义完成并入仓</el-button>
+        <el-button  type="primary" @click="handleSubmit">转异完成并入仓</el-button>
         <el-button @click="escapeBol = false">取消</el-button>
       </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" />
@@ -150,6 +176,7 @@ import PrintTag from "@/views/ecw/order/components/PrintTag"
 import PrintWarehouseReceipt from "@/views/ecw/order/components/PrintWarehouseReceipt"
 import imageUpload from "@/components/ImageUpload";
 import {parseTime} from "@/utils/ruoyi"
+import ImageAndVideoUpload from '@/components/ImageAndVideoUpload'
 export default {
   name: "Warehousing",
 
@@ -159,7 +186,8 @@ export default {
     editDialog,
     PrintTag,
     PrintWarehouseReceipt,
-    imageUpload
+    imageUpload,
+    ImageAndVideoUpload,
   },
 
   mounted() {
@@ -186,6 +214,7 @@ export default {
         exceptionUrls:[],
         descZh:'',
         manualExceptionType:'',
+        urls: []
       },
       currencyList:[],
       order: {},
@@ -204,7 +233,8 @@ export default {
       let p = {
         orderSpecialNeedReceivableReqVoList: this.form.orderSpecialNeedReceivableReqVoList,
         "orderLocationCreateReqVOList": this.form.orderLocationCreateReqVOList,
-        "orderId": this.order.orderId
+        "orderId": this.order.orderId,
+        urls: this.form.urls
       }
        if(this.escapeBol){
          p.exceptionUrls = this.form.exceptionUrls.split(',');

src/views/ecw/productPrice/index.vue

@@ -63,7 +63,7 @@
     <el-row :gutter="10" class="mb8">
       <!--全部路线吗没有新增入口，指定商品的路线价格才有添加路线-->
       <el-col :span="1.5" v-if="$route.query.product_id">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['ecw:product-price:create']">添加路线</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['ecw:product-price:create']">新建价格</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button  v-if="!$route.query.product_id" type="primary" plain icon="el-icon-setting" size="mini" @click="handleBatchEdit" :disabled="multiple">设置已选路线价格</el-button>

src/views/member/user/index.vue

@@ -4,7 +4,7 @@
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="关键字" prop="nickname">
-        <el-input v-model="queryParams.nickname" placeholder="搜索昵称、姓名、手机、Email" clearable @keyup.enter.native="handleQuery"/>
+        <el-input v-model="queryParams.searchKey" placeholder="搜索昵称、姓名、手机、Email" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item label="成交" prop="mobile">
         <el-select v-model="queryParams.isDeal">
@@ -84,7 +84,7 @@
       </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="保函/证书"
@@ -287,8 +287,8 @@ export default {
       dateRangeCreateTime: [],
       // 查询参数
       queryParams: {
-        pageNo: 1,
-        pageSize: 10,
+        page: 1,
+        rows: 10,
         isDeal:undefined,//	是否成交
         searchKey:undefined,//关键字
         auditStatus:undefined,//审核状态