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

src/api/ecw/order.js

@@ -111,6 +111,14 @@ export  function specialNeedCreate(data){
     data:data,
   })
 }
+// 创建特殊
+export function getSpecialListByOrderId(orderId){
+  return request({
+    url: 'ecw/order-special-need/getListByOrderId',
+    method: 'get',
+    params: {orderId},
+  })
+}
 // 删除特需
  export function orderSpecialNeed(params){
   return request({

src/components/OrderBaseInfo/index.vue

@@ -3,17 +3,19 @@
     <el-descriptions border v-if="order.orderId">
       <el-descriptions-item label="唛头">{{ order.marks }}</el-descriptions-item>
       <el-descriptions-item label="已到箱数">{{ order.sumNum }}</el-descriptions-item>
-      <el-descriptions-item label="订单状态">{{ order.status }}</el-descriptions-item>
+      <el-descriptions-item label="订单状态"><dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="order.status" /></el-descriptions-item>
       <el-descriptions-item label="送货时间">todo</el-descriptions-item>
-      <el-descriptions-item label="运输方式">{{ order.logisticsInfoDto.transportId }}</el-descriptions-item>
+      <el-descriptions-item label="运输方式">
+        <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="order.logisticsInfoDto.transportId"></dict-tag>
+      </el-descriptions-item>
       <el-descriptions-item label="始发地">{{ order.logisticsInfoDto.startWarehouseId }}</el-descriptions-item>
       <el-descriptions-item label="目的地">{{ order.logisticsInfoDto.destWarehouseId }}</el-descriptions-item>
-      <el-descriptions-item label="发货人姓名">{{ order.consignorVO.name }}</el-descriptions-item>
-      <el-descriptions-item label="发货人公司">{{ order.consignorVO.company }}</el-descriptions-item>
-      <el-descriptions-item label="发货人电话">{{ order.consignorVO.phone }}</el-descriptions-item>
-      <el-descriptions-item label="收货人姓名">{{ order.consigneeVO.name }}</el-descriptions-item>
-      <el-descriptions-item label="收货人公司">{{ order.consigneeVO.company }}</el-descriptions-item>
-      <el-descriptions-item label="收货人电话">{{ order.consigneeVO.phone }}</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.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.warehouseType }}</el-descriptions-item>
       <el-descriptions-item label="订单号">{{ order.orderNo }}</el-descriptions-item>
     </el-descriptions>
@@ -21,10 +23,18 @@
 </template>
 
 <script>
+import {DICT_TYPE} from "@/utils/dict"
+
 export default {
   name: "orderBaseInfo",
   props: {
     order: Object
+  },
+
+  data () {
+    return {
+      DICT_TYPE
+    }
   }
 }
 </script>

src/utils/dict.js

@@ -147,6 +147,7 @@ export const DICT_TYPE = {
   ORDER_ERROR_TYPE:'order_error_type',//订单异常类型
   ORDER_EXCEPTION_STATUS:'order_exception_status',//异常订单状态
   PAYMENT_TYPE:'payment_type',//收款类型
+  WAREHOUSE_IN_STATUS: 'warehouse_in_status', // 入仓状态
 
   ECASH_INIT:'ecash_init', //e-cash
   FEE_TYPE:'receivable_fee_type',

src/views/ecw/deptTarget/index.vue

@@ -49,7 +49,7 @@
       </el-table-column>
       <el-table-column label="时间范围" align="center" prop="targetPeriodName">
         <template slot-scope="scope">
-          <span>{{scope.row.startTime}}~{{scope.row.endTime}}</span>
+          <span>{{dateFormat(scope.row.startTime)}}~{{dateFormat(scope.row.endTime)}}</span>
         </template>
       </el-table-column>
       <el-table-column label="部门人数" align="center" prop="deptEmpCount"/>
@@ -126,6 +126,7 @@
 import { createDeptTarget, updateDeptTarget, deleteDeptTarget, getDeptTarget, getDeptTargetPage, exportDeptTargetExcel,getCreateInitData } from "@/api/ecw/deptTarget";
 import { listSimpleDepts } from "@/api/system/dept";
 import { getChannelList } from '@/api/ecw/channel';
+import dayjs from "dayjs";
 
 export default {
   name: "DeptTarget",
@@ -210,6 +211,11 @@ export default {
 
           })
       });
+      getCreateInitData().then(res=>{
+          this.monthList = res.data.month;
+          this.quarterList = res.data.quarter;
+          this.yearList = res.data.year;
+      });
       this.getChannelList();
     this.getList();
   },
@@ -217,6 +223,9 @@ export default {
       getChannelList(){
           getChannelList().then(res => this.channelList = res.data)
       },
+      dateFormat(val){
+          return dayjs(val).format("YYYY-MM-DD");
+      },
       changeList(val){
         if(val===1){
             this.form.targetPeriodName=undefined;
@@ -287,11 +296,6 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-        getCreateInitData().then(res=>{
-            this.monthList = res.data.month;
-            this.quarterList = res.data.quarter;
-            this.yearList = res.data.year;
-        })
       this.targetPeriod = this.monthList;
       this.reset();
       this.open = true;
@@ -303,6 +307,13 @@ export default {
       const id = row.id;
       getDeptTarget(id).then(response => {
         this.form = response.data;
+          if(response.data.targetType===1){
+              this.targetPeriod = this.monthList;
+          } else if (response.data.targetType ===2 ){
+              this.targetPeriod = this.quarterList;
+          } else{
+              this.targetPeriod = this.yearList;
+          }
         this.open = true;
         this.title = "修改部门业绩目标设置";
       });

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

@@ -6,17 +6,17 @@
     <div class="content">
       <el-form label-width="180px" label-position="left">
         <el-form-item label="特殊要求">
-         <dict-selector v-if="show" v-model="form.advanceType" formType="radio" :type="DICT_TYPE.ORDER_SPECIAL_NEEDS" ></dict-selector>
+         <dict-selector v-if="show" v-model="form.advanceType" multiple formType="checkbox" :type="DICT_TYPE.ORDER_SPECIAL_NEEDS" ></dict-selector>
         </el-form-item>
         <el-form-item label="特殊要求备注"><el-input  type="textarea" style="width: 300px;" v-model="form.todoDetail"></el-input></el-form-item>
-        <el-form-item label="内陆运费垫付预计金额" v-if="form.advanceType == 6">
+        <el-form-item label="内陆运费垫付预计金额" v-if="form.advanceType.indexOf('6') > -1">
           <el-input style="width: 300px;" v-model="form.transFee">
             <div style="width: 100px;" slot="append" >
               <dict-selector   v-model="form.transCurrency"  :type="DICT_TYPE.COMMISSION_CURRENCY_TYPE" ></dict-selector>
             </div>
           </el-input>
         </el-form-item>
-        <el-form-item label="付款类型" v-if="form.advanceType == 6">
+        <el-form-item label="付款类型" v-if="form.advanceType.indexOf('6') > -1">
          <div style="width: 300px;">
            <dict-selector v-model="form.payType"  :type="DICT_TYPE.PAYMENT_TYPE" ></dict-selector>
          </div>
@@ -55,7 +55,7 @@ export default {
   methods:{
     clearFrom(){
       this.form = {
-        advanceType:undefined,
+        advanceType:[],
         advanceWho: undefined,
         payType: undefined,
         todoDetail: undefined,

src/views/ecw/order/feeApplication.vue

@@ -137,7 +137,7 @@ export default {
         })
       }else {
         if(this.list[this.list.length - 1].status === 0){
-          feeApplicationCreate( {...this.list[this.list.length - 1],status:1,copyUserId:this.selectedUsers.join(',')}).then(r=>{
+          feeApplicationCreate( {...this.list[this.list.length - 1],status:1,copyUserId:this.selectedUsers}).then(r=>{
             if(r.code === 0){
               this.getOrderList();
               this.$message.success('添加成功');

src/views/ecw/order/index.vue

@@ -198,9 +198,10 @@
             <div style=" display:flex; flex-direction:column">
               <el-button size="mini" type="text" icon="el-icon-edit" @click="$router.push('/order/warehousing?id=' + scope.row.orderId)"
                 v-hasPermi="['ecw:order:update']">入仓</el-button>
-              <el-button size="mini" type="text" icon="el-icon-edit" @click= "$router.push(`/order/withdrawal/${scope.row.orderId}`)"
+              <el-button size="mini" type="text" icon="el-icon-edit" @click="show = true;orderId = scope.row.orderId; "
                 v-hasPermi="['ecw:order:update']">退仓</el-button>
               <el-button type="text" v-if="scope.row.status === 5"  size="mini" @click="$router.push({path:'/order/batch-single-application',query:{list:scope.row.orderId}})" >调仓</el-button>
+              <el-button type="text"  size="mini" @click="$router.push({path:'/order/transfer-warehousing/' + scope.row.orderId + '/'  + 1 })" >调拨出仓</el-button>
             </div>
 
           </el-popover>
@@ -235,6 +236,7 @@
     <print-warehouse-receipt v-if="printWarehouseReceiptOrderId !== null" :order-id="printWarehouseReceiptOrderId" @close="printWarehouseReceiptOrderId=null" />
     <print-lading-bill v-if="printLadingBillInfo !== null" v-bind="printLadingBillInfo" @close="printLadingBillInfo=null" />
     <batch-pickup v-if="showBatchPickup" @close="showBatchPickup=false"/>
+    <withdrawal v-if="show" :dialog-visible="show"  :orderId="orderId" ></withdrawal>
   </div>
 </template>
 
@@ -262,10 +264,11 @@ import PrintTag from './components/PrintTag'
 import PrintWarehouseReceipt from './components/PrintWarehouseReceipt'
 import PrintLadingBill from './components/PrintLadingBill'
 import BatchPickup from './components/BatchPickup'
+import withdrawal from "@/views/ecw/order/withdrawal";
 export default {
   name: "Order",
   components: {
-    CustomerSelector, ProductSelector, Selector,specialNeeds,PrintTag, PrintWarehouseReceipt, PrintLadingBill, BatchPickup
+    CustomerSelector, ProductSelector, Selector,specialNeeds,PrintTag, PrintWarehouseReceipt, PrintLadingBill, BatchPickup,withdrawal
   },
   props: {
     mine: Boolean
@@ -344,7 +347,9 @@ export default {
       orderId:undefined,
       /* DICT_TYPE,
       getDictDatas */
-      adjustmentList:[]
+      adjustmentList:[],
+      show:false,
+
     };
   },
   computed: {

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

@@ -50,30 +50,32 @@
             <template v-slot="{r,c,$index}">
               <span v-if="tableData[$index].id">{{ tableData[$index].cartonsNum }}</span>
               <el-input v-else v-model="tableData[$index].cartonsNum" placeholder=""></el-input>
-              <span>{{ getDictDataLabel(DICT_TYPE.ECW_PACKAGE_TYPE, tableData[$index].boxGauge) }}</span>
+              <span>{{ getDictDataLabel(DICT_TYPE.ECW_PACKAGE_TYPE, tableData[$index].unit) }}</span>
             </template>
           </el-table-column>
           <el-table-column label="包装类型">
             <template v-slot="{r,c,$index}">
-              <span v-if="tableData[$index].id">{{ getDictDataLabel(DICT_TYPE.ECW_PACKAGE_TYPE, tableData[$index].boxGauge) }}</span>
-<!--              <el-input v-else v-model="tableData[$index].boxGauge" placeholder=""></el-input>-->
-              <dict-selector v-else :type="DICT_TYPE.ECW_PACKAGE_TYPE" v-model="tableData[$index].boxGauge"></dict-selector>
+              <span v-if="tableData[$index].id">{{ getDictDataLabel(DICT_TYPE.ECW_PACKAGE_TYPE, tableData[$index].unit) }}</span>
+              <dict-selector v-else :type="DICT_TYPE.ECW_PACKAGE_TYPE" v-model="tableData[$index].unit"></dict-selector>
             </template>
           </el-table-column>
           <el-table-column label="长(cm)">
-<!--            <template v-slot="{r,c,$index}">-->
-<!--              <el-input v-model="tableData[$index].cartonsNum" placeholder=""></el-input>-->
-<!--            </template>-->
+            <template v-slot="{r,c,$index}">
+              <span v-if="tableData[$index].id">{{ tableData[$index].boxGauge ? tableData[$index].boxGauge.split('*')[0] : '' }}</span>
+              <el-input v-else v-model="tableData[$index].boxGauge1" placeholder=""></el-input>
+            </template>
           </el-table-column>
           <el-table-column label="宽(cm)">
-<!--            <template v-slot="{r,c,$index}">-->
-<!--              <el-input v-model="tableData[$index].cartonsNum" placeholder=""></el-input>-->
-<!--            </template>-->
+            <template v-slot="{r,c,$index}">
+              <span v-if="tableData[$index].id">{{ tableData[$index].boxGauge ? tableData[$index].boxGauge.split('*')[1] : '' }}</span>
+              <el-input v-else v-model="tableData[$index].boxGauge2" placeholder=""></el-input>
+            </template>
           </el-table-column>
           <el-table-column label="高(cm)">
-<!--            <template v-slot="{r,c,$index}">-->
-<!--              <el-input v-model="tableData[$index].cartonsNum" placeholder=""></el-input>-->
-<!--            </template>-->
+            <template v-slot="{r,c,$index}">
+              <span v-if="tableData[$index].id">{{ tableData[$index].boxGauge ? tableData[$index].boxGauge.split('*')[2] : '' }}</span>
+              <el-input v-else v-model="tableData[$index].boxGauge3" placeholder=""></el-input>
+            </template>
           </el-table-column>
           <el-table-column label="体积(m³)">
             <template v-slot="{r,c,$index}">
@@ -143,7 +145,15 @@ export default {
 
   mounted() {
     getProductBrankPage({pageSize: 100000}).then(r => {
-      this.brandList = r.data.list
+      this.brandList = r.data.list.map(e => {
+        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
+      })
     })
   },
 
@@ -203,27 +213,19 @@ export default {
       }
     },
     handleSubmit() {
-      // Promise.all(
-      //   this.form.orderWarehouseInItemDoList.map(e => {
-      //     return orderWarehouseIn({
-      //       ...e,
-      //       inTime: this.form.inTime,
-      //       material: this.form.material,
-      //       brandType: this.warehousing.brandType,
-      //       orderId: this.warehousing.orderId,
-      //       orderItemId: this.warehousing.orderItemId,
-      //       orderNo: this.warehousing.orderNo
-      //     })
-      //   })
-      // ).then(() => {
-      //   this.handleClose()
-      // })
+      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
+        orderNo: this.warehousing.orderNo,
+        orderWarehouseInItemDoList
       }).then(r => {
         if (r.data){
           this.$message.success('入仓成功')
@@ -242,7 +244,9 @@ export default {
     },
     handleAdd() {
       this.form.orderWarehouseInItemDoList.push({
-        "boxGauge": "",
+        "boxGauge1": "",
+        "boxGauge2": "",
+        "boxGauge3": "",
         "cartonsNum": "",
         "expressNo": "",
         "quantityAll": "",

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

@@ -40,8 +40,10 @@
         </template>
       </el-table-column>
       <el-table-column
-        prop="address"
+        prop="expressNo"
+        v-slot="{row}"
         label="快递单号">
+        {{ row.warehouseInInfoVO ? row.warehouseInInfoVO.expressNo : '' }}
       </el-table-column>
       <el-table-column
         prop="updateTime"
@@ -51,97 +53,27 @@
         </template>
       </el-table-column>
       <el-table-column
-        prop="address"
+        prop="diffType"
+        v-slot="{row}"
         label="状态">
+        <dict-tag :type="DICT_TYPE.WAREHOUSE_IN_STATUS" :value="row.warehouseInInfoVO.diffType" />
       </el-table-column>
       <el-table-column
         prop="address"
         label="操作">
         <template v-slot="{ row, column, $index }">
-          <el-button v-if="orderItemList[$index].orderWarehouseInBackItemDoList && orderItemList[$index].orderWarehouseInBackItemDoList.length > 0" size="mini" type="text" @click="handleWarehousing($index)">追加</el-button>
+          <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>
       </el-table-column>
     </el-table>
 
-    <h2>特殊需求</h2>
+    <h2 v-if="orderSpecialNeeds.length > 0">特殊需求</h2>
     <el-form ref="form" :model="form" label-width="180px" style="max-width: 600px;">
-      <el-form-item label="套编织袋费">
-        <el-input v-model="form.a" placeholder="请输入套编织袋费">
-          <el-select v-model="form.b" placeholder="请选择" slot="append" style="width: 100px">
-            <el-option
-              v-for="item in currencyList"
-              :key="item.id"
-              :label="item.titleZh"
-              :value="item.id">
-            </el-option>
-          </el-select>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="木架包装费">
-        <el-input v-model="form.a" placeholder="请输入木架包装费">
-          <el-select v-model="form.b" placeholder="请选择" slot="append" style="width: 100px">
-            <el-option
-              v-for="item in currencyList"
-              :key="item.id"
-              :label="item.titleZh"
-              :value="item.id">
-            </el-option>
-          </el-select>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="纸箱包装费">
-        <el-input v-model="form.a" placeholder="请输入纸箱包装费">
-          <el-select v-model="form.b" placeholder="请选择" slot="append" style="width: 100px">
-            <el-option
-              v-for="item in currencyList"
-              :key="item.id"
-              :label="item.titleZh"
-              :value="item.id">
-            </el-option>
-          </el-select>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="内陆运输费">
-        <el-input v-model="form.a" placeholder="请输入内陆运输费">
-          <el-select v-model="form.b" placeholder="请选择" slot="append" style="width: 100px">
-            <el-option
-              v-for="item in currencyList"
-              :key="item.id"
-              :label="item.titleZh"
-              :value="item.id">
-            </el-option>
-          </el-select>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="打包费">
-        <el-input v-model="form.a" placeholder="请输入打包费">
-          <el-select v-model="form.b" placeholder="请选择" slot="append" style="width: 100px">
-            <el-option
-              v-for="item in currencyList"
-              :key="item.id"
-              :label="item.titleZh"
-              :value="item.id">
-            </el-option>
-          </el-select>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="易碎标签">
-        <el-input v-model="form.a" placeholder="请输入易碎标签">
-          <el-select v-model="form.b" placeholder="请选择" slot="append" style="width: 100px">
-            <el-option
-              v-for="item in currencyList"
-              :key="item.id"
-              :label="item.titleZh"
-              :value="item.id">
-            </el-option>
-          </el-select>
-        </el-input>
-      </el-form-item>
-      <el-form-item label="其他费用">
-        <el-input v-model="form.a" placeholder="请输入其他费用">
-          <el-select v-model="form.b" placeholder="请选择" slot="append" style="width: 100px">
+      <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">
             <el-option
               v-for="item in currencyList"
               :key="item.id"
@@ -152,7 +84,7 @@
         </el-input>
       </el-form-item>
 
-      <div style="text-align: center">
+      <div style="text-align: center;margin-top: 15px">
         <el-button type="primary">转异</el-button>
         <el-button type="primary" @click="finishVisible = true">完成入仓</el-button>
       </div>
@@ -181,10 +113,17 @@
 
 <script>
 import {getCurrencyList} from "@/api/ecw/currency"
-import {getOrder, getOrderWarehouseIn, orderWarehouseInFinish, rollbackApply} from "@/api/ecw/order"
+import {
+  getOrder,
+  getOrderWarehouseIn,
+  getSpecialListByOrderId,
+  orderWarehouseInFinish,
+  rollbackApply
+} from "@/api/ecw/order"
 import orderBaseInfo from "@/components/OrderBaseInfo"
 import WarehouseAreaDialog from '@/components/WarehouseAreaDialog'
 import editDialog from '@/views/ecw/order/warehousing/components/editDialog'
+import {DICT_TYPE} from "@/utils/dict"
 
 export default {
   name: "Warehousing",
@@ -200,23 +139,25 @@ export default {
       this.orderId = this.$route.query.id
       getOrder(this.orderId).then(r => this.order = r.data)
       getOrderWarehouseIn(this.orderId).then(r => this.orderItemList = r.data)
+      getSpecialListByOrderId(this.orderId).then(r => this.specialList = r.data)
     }
     getCurrencyList().then(res => this.currencyList = res.data)
   },
 
   data() {
     return {
+      DICT_TYPE,
       areaVisible: false,
       finishVisible: false,
       locationName: '',
       warehousingVisible: false,
       form: {
-        a: '',
-        b: 3
+        orderSpecialNeedReceivableReqVoList: []
       },
       currencyList:[],
       order: {},
       orderItemList: [],
+      specialList: [],
       warehousing: undefined
     }
   },
@@ -224,6 +165,7 @@ export default {
   methods: {
     handleSubmit() {
       orderWarehouseInFinish({
+        orderSpecialNeedReceivableReqVoList: this.form.orderSpecialNeedReceivableReqVoList,
         "locationName": this.locationName,
         "orderId": this.order.orderId
       }).then(r => {
@@ -275,6 +217,31 @@ export default {
         getOrder(this.orderId).then(r => this.order = r.data)
         getOrderWarehouseIn(this.orderId).then(r => this.orderItemList = r.data)
       }
+    },
+    orderSpecialNeeds(val){
+      val.forEach(e => {
+        this.form.orderSpecialNeedReceivableReqVoList.push(    {
+          "id": e.id,
+          "receivableMoney": '',
+          "receivableMoneyCurrency": 3
+        })
+      })
+    }
+  },
+
+  computed: {
+    orderSpecialNeedsDict() {
+      return this.$store.state.dict.dictDatas.order_special_needs
+    },
+    orderSpecialNeeds(){
+      const result = []
+      this.specialList.forEach(e => {
+        const t = this.orderSpecialNeedsDict.find(f => f.value === e.advanceType)
+        if(t) {
+          result.push({...e, label: t.label})
+        }
+      })
+      return result
     }
   }
 }

src/views/ecw/order/withdrawal.vue

 <template>
+
+  <el-dialog
+    :visible.sync="dialogVisible"
+    :before-close="()=>{
+      $parent.show = false;
+    }"
+    width="80%">
     <div style="padding: 0 20px">
       <h1>申请退仓-{{orderDetails.orderNo}}</h1>
       <el-divider></el-divider>
@@ -14,21 +21,22 @@
       </div>
       <div>
         <el-button @click="submit" type="primary" style="margin-right: 20px;">确定退仓</el-button>
-      <el-button @click="$router.push('/order/order')">不，再考虑考虑</el-button>
+        <el-button @click="$parent.show = false;">不，再考虑考虑</el-button>
       </div>
     </div>
+  </el-dialog>
 </template>
 <!--退仓-->
 <script>
 import {getOrder} from "@/api/ecw/order";
 import {orderWarehouseInDelete} from "@/api/ecw/batchSingleApplication";
-import {getProcessDefinitionBpmnXMLByKey} from "@/api/bpm/definition";
 import workFlow from "@/components/WorkFlow";
 
 export default {
   name: "withdrawal",
   props:{
-    orderId:String
+    orderId:Number,
+    dialogVisible:Boolean
   },
   components:{
     workFlow
@@ -36,10 +44,6 @@ export default {
   data(){
     return {
       orderDetails:{},
-      bpmnXML: null,
-      bpmnControlForm: {
-        prefix: "activiti"
-      },
       params:{
         orderId:undefined,
         orderNo:undefined,
@@ -58,6 +62,8 @@ export default {
       orderWarehouseInDelete(this.params).then(r => {
        if(r.code === 0){
          this.$message.success('退仓成功');
+         this.params = {}
+         this.$parent.show = false
        }
       })
     }

src/views/ecw/productType/index.vue

@@ -41,7 +41,7 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" @click="typeProductList(scope.row)"
-                     v-hasPermi="['ecw:product:query']">产品列表</el-button>
+                     v-hasPermi="['ecw:product:query']">商品列表</el-button>
 
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                      v-hasPermi="['ecw:product-type:update']">修改</el-button>