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

src/api/ecw/futureBox.js

+import request from '@/utils/request'
+
+// 创建预定舱计划
+export function createFutureBox(data) {
+  return request({
+    url: '/ecw/future-box/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新预定舱计划
+export function updateFutureBox(data) {
+  return request({
+    url: '/ecw/future-box/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除预定舱计划
+export function deleteFutureBox(id) {
+  return request({
+    url: '/ecw/future-box/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得预定舱计划
+export function getFutureBox(id) {
+  return request({
+    url: '/ecw/future-box/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得预定舱计划分页
+export function getFutureBoxPage(query) {
+  return request({
+    url: '/ecw/future-box/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出预定舱计划 Excel
+export function exportFutureBoxExcel(query) {
+  return request({
+    url: '/ecw/future-box/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/views/ecw/order/transferWarehousing.vue

@@ -332,7 +332,7 @@ export default {
       return ['合计：',text,text2]
     },
     cancellationOfOrder(){
-      this.$prompt('请输入审核调仓原因', '提示', {
+      this.$prompt('请输入取消调仓原因', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
       }).then(({ value }) => {

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

@@ -106,8 +106,8 @@
           <span slot="append">m³</span>
         </el-input>
       </el-form-item>
-      <el-form-item label="总方数量" style="width: 300px">
-        <el-input v-model="form.sumWeight" placeholder="请输入总数量">
+      <el-form-item label="总重量" style="width: 300px">
+        <el-input v-model="form.sumWeight" placeholder="请输入总重量">
           <span slot="append">kg</span>
         </el-input>
       </el-form-item>