订单转义

src/utils/dict.js

@@ -164,8 +164,9 @@ export const DICT_TYPE = {
   ORDER_COD_EXCEPTION_RESULT:'order_cod_exception_result',//代收货款异常处理结果
   ORDER_OTHER_EXCEPTION_RESULT:'order_other_exception_result',//其它异常处理结果
   ORDER_BULKY_CARGO_EXCEPTION_RESULT:'order_bulky_cargo_exception_result',//泡货异常处理结果
-  NEED_KNOW_TYPE:'need_know_type',//须知类型
-  NEED_KNOW_STATUS:'need_know_status',//须知状态
+  NEED_KNOW_TYPE:'need_know_type',//需知类型
+  NEED_KNOW_STATUS:'need_know_status',//需知状态
+  MANUAL_EXCEPTION_TYPE:'manual_exception_type',
 
 
   ECASH_INIT:'ecash_init', //e-cash

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

@@ -87,7 +87,7 @@
       </el-form-item>
 
       <div style="text-align: center;margin-top: 15px">
-        <el-button type="primary">转异</el-button>
+        <el-button @click="escapeBol = true;" type="primary">转异</el-button>
         <el-button type="primary" @click="finishVisible = true">完成入仓</el-button>
       </div>
     </el-form>
@@ -110,7 +110,23 @@
         <el-button type="primary" @click="handleSubmit()">确 定</el-button>
       </div>
     </el-dialog>
-
+    <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>
+        </el-form-item>
+        <el-form-item label="附件">
+          <image-upload v-model="form.exceptionUrls"></image-upload>
+        </el-form-item>
+        <el-form-item label="详细信息">
+          <el-input v-model="form.descZh" type="textarea"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button  type="primary" @click="handleSubmit">转义完成并入仓</el-button>
+        <el-button @click="escapeBol = 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" />
@@ -132,7 +148,7 @@ import editDialog from '@/views/ecw/order/warehousing/components/editDialog'
 import {DICT_TYPE} from "@/utils/dict"
 import PrintTag from "@/views/ecw/order/components/PrintTag"
 import PrintWarehouseReceipt from "@/views/ecw/order/components/PrintWarehouseReceipt"
-
+import imageUpload from "@/components/ImageUpload";
 export default {
   name: "Warehousing",
 
@@ -141,7 +157,8 @@ export default {
     WarehouseAreaDialog,
     editDialog,
     PrintTag,
-    PrintWarehouseReceipt
+    PrintWarehouseReceipt,
+    imageUpload
   },
 
   mounted() {
@@ -163,7 +180,10 @@ export default {
       warehousingVisible: false,
       form: {
         orderSpecialNeedReceivableReqVoList: [],
-        orderLocationCreateReqVOList: []
+        orderLocationCreateReqVOList: [],
+        exceptionUrls:[],
+        descZh:'',
+        manualExceptionType:'',
       },
       currencyList:[],
       order: {},
@@ -172,18 +192,26 @@ export default {
       specialList: [],
       warehousing: undefined,
       isShowPrintTag: false,
-      isShowPrint: false
+      isShowPrint: false,
+      escapeBol:false,
     }
   },
 
   methods: {
     handleSubmit() {
-      orderWarehouseInFinish({
+      let p = {
         orderSpecialNeedReceivableReqVoList: this.form.orderSpecialNeedReceivableReqVoList,
         "orderLocationCreateReqVOList": this.form.orderLocationCreateReqVOList,
         "orderId": this.order.orderId
-      }).then(r => {
+      }
+       if(this.escapeBol){
+         p.exceptionUrls = this.form.exceptionUrls.split(',');
+         p.descZh = this.form.descZh;
+         p.manualExceptionType = this.form.manualExceptionType
+       }
+      orderWarehouseInFinish(p).then(r => {
         if (r.data) {
+          this.escapeBol = false;
           this.$confirm(
             '该订单已成功入仓，是否打印？',
             '货物已入仓',
@@ -210,7 +238,6 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        console.log(item)
         rollbackApply({
           "orderId": item.orderId,
           "orderNo": item.orderNo,