修复几个bug和提单显示异常

src/components/PdfViewer/index.vue

@@ -10,7 +10,7 @@ const pdfViewerPath = '/static/plugins/pdfviewer/'
 const ID_Prefix = 'pdfviewer-canvas'
 export default {
     props:{
-        url: [String, Object]
+        url: [String, Object, ArrayBuffer]
     },
     data(){
         return {
@@ -48,12 +48,17 @@ export default {
             // The workerSrc property shall be specified.
             //
             let pdfjsLib = window.pdfjsLib
-            pdfjsLib.GlobalWorkerOptions.workerSrc = pdfViewerPath + '/js/pdf.worker.js';
-
+            pdfjsLib.GlobalWorkerOptions.workerSrc = pdfViewerPath + 'js/pdf.worker.js';
+            /* pdfjsLib.GlobalWorkerOptions.useWorkerFetch = true
+            pdfjsLib.GlobalWorkerOptions.cMapUrl = pdfViewerPath + 'cmaps/' */
             //
             // Asynchronous download PDF
             //
-            const loadingTask = pdfjsLib.getDocument(this.url);
+            const loadingTask = pdfjsLib.getDocument({
+                data: this.url,
+                useWorkerFetch: true,
+                cMapUrl: pdfViewerPath + 'cmaps/'
+            });
             (async () => {
                 const pdf = await loadingTask.promise;
                 window.pdf2 = pdf

src/components/ProductsSelector/index.vue

@@ -56,7 +56,7 @@ export default {
       pages: 1,
       queryParams: {
         pageNo: 1,
-        pageSize: 100000,
+        pageSize: 500,
         attrId: null,
         titleZh: null,
         typeId: null

src/components/UserSelector/index.vue

@@ -33,8 +33,8 @@ export default {
     },
     watch:{
         index(val){
-            this.$emit('input', val !== null ? this.list[val].id : null)
-            this.$emit('change', val !== null ? this.list[val]: null)
+            this.$emit('input', val !== null && val !== undefined && val != '' ? this.list[val].id : null)
+            this.$emit('change', val !== null && val !== undefined && val != '' ? this.list[val]: null)
         },
         value(val){
             this.resetIndex()

src/views/bpm/processInstance/index.vue

@@ -53,7 +53,7 @@
       </el-table-column>
       <el-table-column label="当前审批任务" align="center" prop="tasks">
         <template slot-scope="scope">
-          <el-button v-for="task in scope.row.tasks" type="text" @click="handleFormDetail(task.id)">
+          <el-button v-for="(task, taskIndex) in scope.row.tasks" type="text" @click="handleFormDetail(task.id)" :key="taskIndex">
             <span>{{ task.name }}</span>
           </el-button>
         </template>
@@ -78,7 +78,7 @@
           <span>{{ parseTime(scope.row.endTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button type="text" size="small" icon="el-icon-delete" v-if="scope.row.result === 1"
                      v-hasPermi="['bpm:process-instance:cancel']" @click="handleCancel(scope.row)">取消</el-button>

src/views/bpm/task/copy.vue

@@ -39,7 +39,7 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
+      <el-table-column :label="$t('操作')" align="center" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleAudit(scope.row)"
                      v-hasPermi="['bpm:task:query']">详情

src/views/bpm/task/done.vue

@@ -5,24 +5,20 @@
       <el-form-item :label="$t('任务名称')" prop="name">
         <el-input v-model="queryParams.name" :placeholder="$t('请输入任务名称')" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item :label="$t('流程编号')" prop="name">
-        <!--// TODO 缺少查询字段-->
-<!--        <el-input v-model="queryParams.no" :placeholder="$t('请输入流程编号')" clearable @keyup.enter.native="handleQuery"/>-->
+      <!-- <el-form-item :label="$t('流程编号')" prop="name">
         缺少字段
-      </el-form-item>
-      <el-form-item :label="$t('流程分类')" prop="name">
-        <!--// TODO 缺少查询字段-->
-<!--        <el-input v-model="queryParams.no" :placeholder="$t('请输入流程编号')" clearable @keyup.enter.native="handleQuery"/>-->
+      </el-form-item> -->
+      <!-- <el-form-item :label="$t('流程分类')" prop="name">
         缺少字段
-      </el-form-item>
+      </el-form-item> -->
 
       <el-form-item :label="$t('提交时间')">
         <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
                         type="daterange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" />
       </el-form-item>
-      <el-form-item :label="$t('业务编号')" prop="name">
+      <!-- <el-form-item :label="$t('业务编号')" prop="name">
          缺少字段
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
@@ -33,21 +29,20 @@
     <el-table v-loading="loading" :data="list">
       <el-table-column :label="$t('任务编号')" align="center" prop="id" width="320" fixed />
       <el-table-column :label="$t('任务名称')" align="center" prop="processInstance.name" width="200" />
-      <el-table-column :label="$t('业务编号')" align="center" prop="" width="200" >
+      <!-- <el-table-column :label="$t('业务编号')" align="center" prop="" width="200" >
         缺少字段
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column :label="$t('流程分类')" align="center" prop="category" width="200" />
       <el-table-column :label="$t('当前审批节点')" align="center" prop="name" width="200" />
-      <el-table-column :label="$t('状态')" align="center" prop="" width="200" >
+      <!-- <el-table-column :label="$t('状态')" align="center" prop="" width="200" >
         缺少字段
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column :label="$t('流程发起人')" align="center" prop="processInstance.startUserNickname" width="120" />
       <el-table-column :label="$t('结果')" align="center" prop="result">
         <template slot-scope="scope">
           <dict-tag :type="DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT" :value="scope.row.result"/>
         </template>
       </el-table-column>
-<!--      <el-table-column :label="$t('审批意见')" align="center" prop="comment" width="200" />-->
       <el-table-column :label="$t('提交时间')" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -58,11 +53,6 @@
           <span>{{ parseTime(scope.row.endTime) }}</span>
         </template>
       </el-table-column>
-<!--      <el-table-column :label="$t('耗时')" align="center" prop="durationInMillis" width="180">
-        <template slot-scope="scope">
-          <span>{{ getDateStar(scope.row.durationInMillis) }}</span>
-        </template>
-      </el-table-column>-->
       <el-table-column :label="$t('操作')" align="center" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleAudit(scope.row)"

src/views/bpm/task/todo.vue

@@ -5,9 +5,9 @@
       <el-form-item :label="$t('流程名')" prop="name">
         <el-input v-model="queryParams.name" :placeholder="$t('请输入流程名')" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="编号" prop="name">
+      <!-- <el-form-item label="编号" prop="name">
         缺少字段
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item :label="$t('流程分类')" prop="category">
         <el-select v-model="queryParams.category" :placeholder="$t('请选择流程分类')" clearable>
           <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BPM_MODEL_CATEGORY)"
@@ -49,20 +49,20 @@
         </template>
       </el-table-column>
 
-      <el-table-column :label="$t('结果')" align="center" prop="processInstance.startUserNickname">
+      <!-- <el-table-column :label="$t('结果')" align="center" prop="processInstance.startUserNickname">
           缺少字段
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column :label="$t('提交时间')" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('结束时间')" align="center" prop="createTime" width="180">
+      <!-- <el-table-column :label="$t('结束时间')" align="center" prop="createTime" width="180">
         <template slot-scope="scope">
           缺少字段
         </template>
-      </el-table-column>
-      <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
+      </el-table-column> -->
+      <el-table-column :label="$t('操作')" align="center" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleAudit(scope.row)"
                      v-hasPermi="['bpm:task:update']">{{$t('审批')}}

src/views/ecw/coupon/edit.vue

@@ -56,7 +56,7 @@
 				<div class="fee-item" v-for="(item, index) in fee[1]" :key="index">
 					<template v-if="[1,2,3,4,5].indexOf(form.type) > -1">
 						满
-              <el-input v-model="item.fullAmount" style="width:100px" />
+						<el-input v-model="item.fullAmount" type="number" style="width:100px" />
 						<!-- <el-select v-model="item.fullCurrencyId" style="width:100px" >
 							<el-option v-for="item in currencyList" :key="item.id" :label="item.titleZh" :value="item.id" />
 						</el-select> -->
@@ -74,8 +74,8 @@
 						<span v-if="[4].indexOf(form.type) > -1">%</span>
 					</template>
 					<template v-if="form.type==7">
-              > <el-input v-model="item.startAmount" style="width:100px" />
-              ≤ <el-input v-model="item.endAmount" style="width:100px" />
+						> <el-input v-model="item.startAmount" type="number" style="width:100px" />
+						≤ <el-input v-model="item.endAmount" type="number" style="width:100px" />
 						<selector v-model="item.startAndEndCurrencyId" :options="currencyList" label-field="titleZh" value-field="id" defaultable style="width:100px" />
 						价格
 					</template>
@@ -91,14 +91,13 @@
 					<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>
-
 			</el-form-item>
 
 			<el-form-item label="清关费" v-if="[2,3,4,5,6,7].indexOf(form.type) > -1">
 				<div class="fee-item" v-for="(item, index) in fee[2]" :key="index">
 					<template v-if="[1,2,3,4,5].indexOf(form.type) > -1">
 						满
-                  <el-input v-model="item.fullAmount" style="width:100px" />
+						<el-input v-model="item.fullAmount" type="number" style="width:100px" />
 						<selector v-if="[2,4,5].indexOf(form.type) > -1" v-model="item.fullCurrencyId" :options="currencyList" label-field="titleZh" value-field="id" defaultable style="width:100px" />
 						<selector v-if="form.type == 3" v-model="item.prodUnit" :options="unitList" label-field="titleZh" value-field="id" defaultable style="width:100px" />
 
@@ -113,8 +112,8 @@
 						<span v-if="[4].indexOf(form.type) > -1">%</span>
 					</template>
 					<template v-if="form.type==7">
-                  > <el-input v-model="item.startAmount" style="width:100px" />
-                  ≤ <el-input v-model="item.endAmount" style="width:100px" />
+						> <el-input v-model="item.startAmount" type="number" style="width:100px" />
+						≤ <el-input v-model="item.endAmount" type="number" style="width:100px" />
 						<Selector v-model="item.startAndEndCurrencyId" :options="currencyList" label-field="titleZh" value-field="id" defaultable style="width:100px" />
 						价格
 					</template>
@@ -195,11 +194,11 @@
 				prop="orderAttr"
                 v-if="form.type != 1"
 			>
-				<dict-selector form-type="checkbox" :type="DICT_TYPE.ECW_ORDER_ATTR" v-model="form.orderAttr" multiple />
+				<dict-selector form-type="checkbox" :type="DICT_TYPE.ECW_ORDER_ATTR" v-model="form.orderAttrArr" multiple />
 			</el-form-item>
-            <el-form-item label="是否发送站内信" prop="isSiteContent">
+            <!-- <el-form-item label="是否发送站内信" prop="isSiteContent">
 				<dict-selector formatter="bool" form-type="radio" :type="DICT_TYPE.ECW_YESNO" v-model="form.isSiteContent" :formater="Boolean" />
-			</el-form-item>
+			</el-form-item> -->
             <el-form-item label="中文内容" prop="contentZh" :rules='[{required: true, message: "不能为空"}]'>
 				<editor v-model="form.contentZh" :min-height="192" />
 			</el-form-item>
@@ -211,21 +210,21 @@
 				prop="brand"
                 v-if="form.type != 1"
 			>
-                <dict-selector form-type="checkbox" :type="DICT_TYPE.BRAND_REG_TYPE" v-model="form.brand" multiple />
+                <dict-selector form-type="checkbox" :type="DICT_TYPE.BRAND_REG_TYPE" v-model="form.brandArr" multiple />
 			</el-form-item>
             <el-form-item
 				label="是否控货"
 				prop="isCargoControl"
                 v-if="form.type != 1"
 			>
-                <dict-selector form-type="checkbox" :type="DICT_TYPE.ECW_YESNO" v-model="form.isCargoControl" multiple />
+                <dict-selector form-type="checkbox" :type="DICT_TYPE.ECW_YESNO" v-model="form.isCargoControlArr" multiple />
 			</el-form-item>
             <el-form-item
 				label="单证报关"
 				prop="documentDeclaration"
                 v-if="form.type != 1"
 			>
-                <dict-selector form-type="checkbox" :type="DICT_TYPE.ECW_CUSTOMS_TYPE" v-model="form.documentDeclaration" multiple />
+                <dict-selector form-type="checkbox" :type="DICT_TYPE.ECW_CUSTOMS_TYPE" v-model="form.documentDeclarationArr" multiple />
 			</el-form-item>
 
             <el-form-item>
@@ -353,10 +352,10 @@ export default {
           this.getCouponSelect()
 
           // 非优惠券给默认数据
-          this.$set(this.form, 'documentDeclaration', ["1"])
-          this.$set(this.form, 'isCargoControl', ["0"])
-          this.$set(this.form, 'orderAttr', ["2","3","1"])
-          this.$set(this.form, 'brand', ["0","1"])
+          this.$set(this.form, 'documentDeclarationArr', ["1"])
+          this.$set(this.form, 'isCargoControlArr', ["0"])
+          this.$set(this.form, 'orderAttrArr', ["2","3","1"])
+          this.$set(this.form, 'brandArr', ["0","1"])
         }
       },
       'form.isSimilarSuperposition'(val){
@@ -369,6 +368,18 @@ export default {
           })
           this.couponIds = keepIds
         }
+      },
+	  'form.orderAttrArr'(v){
+		this.$set(this.form, 'orderAttr', v.join(','))
+	  },
+	  'form.brandArr'(v){
+		this.$set(this.form, 'brand', v.join(','))
+	  },
+	  'form.isCargoControlArr'(v){
+		this.$set(this.form, 'isCargoControl', v.join(','))
+	  },
+	  'form.documentDeclarationArr'(v){
+		this.$set(this.form, 'documentDeclaration', v.join(','))
 	  }
     },
 	created() {
@@ -479,14 +490,14 @@ export default {
 				if (data.couponId != null) {
 					updateCoupon(data).then((response) => {
 						this.$modal.msgSuccess("修改成功");
-						this.$router.back();
+						this.$redirect("index");
 					});
 					return;
 				}
 				// 添加的提交
 				createCoupon(data).then((response) => {
 					this.$modal.msgSuccess("新增成功");
-					this.$router.back();
+					this.$redirect("index");
 				});
 			});
 		},

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

@@ -21,7 +21,7 @@
             </el-descriptions-item>
             
             <!-- 优惠申请 -->
-            <el-descriptions-item :label="$t('申请理由')" v-if="type == 1" :span="4">
+            <el-descriptions-item :label="$t('申请理由')" v-if="type == 1 || type == 2" :span="4">
                 <div class="bold">
                     <div>
                         {{$t('原运费')}}：{{detail.orgFreight}} {{ currencyMap[detail.freightCurrency] }} / {{ unitMap[detail.freightVolume] }}，
@@ -34,6 +34,20 @@
                 </div>
             </el-descriptions-item>
 
+            <!-- 管理折扣 -->
+            <!-- <el-descriptions-item :label="$t('申请理由')" v-if="type == 2" :span="4">
+                <div class="bold">
+                    <div>
+                        {{$t('原运费')}}：{{detail.orgFreight}} {{ currencyMap[detail.freightCurrency] }} / {{ unitMap[detail.freightVolume] }}，
+                        {{$t('新运费')}}：{{detail.freight}} {{ currencyMap[detail.freightCurrency] }} / {{ unitMap[detail.freightVolume] }}
+                    </div>
+                    <div>
+                        {{$t('原清关费')}}：{{detail.orgClearanceFreight}} {{ currencyMap[detail.clearanceFreightCurrency] }} / {{ unitMap[detail.clearanceFreightVolume] }}，
+                        {{$t('新清关费')}}：{{detail.clearanceFreight}} {{ currencyMap[detail.clearanceFreightCurrency] }} / {{ unitMap[detail.clearanceFreightVolume] }}
+                    </div>
+                </div>
+            </el-descriptions-item> -->
+
             <!-- 佣金设置 -->
             <el-descriptions-item :label="$t('申请理由')" v-if="type == 3" :span="4">
                 <div class="bold">

src/views/ecw/order/detail.vue

@@ -228,7 +228,7 @@
     </el-card>
 
     <print-warehouse-receipt v-if="showWarehouseReceipt" :order-id="order.orderId" @close="showWarehouseReceipt=false" />
-    <print-lading-bill v-if="showLadingBill" :order-id="order.tidanNo" :transport-type="order.transportId" @close="showLadingBill=false" />
+    <print-lading-bill v-if="showLadingBill" :order-id="order.orderId" :transport-type="order.transportId" @close="showLadingBill=false" />
   </div>
 </template>
 

src/views/ecw/order/index.vue

@@ -18,21 +18,28 @@
       </el-form-item>
       <el-form-item label="">
         <dict-selector :type="DICT_TYPE.ECW_BEGINTIME_TYPE_ENDTIME" v-model="dateFilterType" defaultable style="width: 150px; margin-right: 5px" />
-        <el-date-picker v-model="dateFilter" type="daterange" range-separator="-"  :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+        <el-date-picker v-model="dateFilter"
+          type="daterange" range-separator="-" 
+          :start-placeholder="$t('开始日期')"
+          :end-placeholder="$t('结束日期')"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          @change="handleQuery"
+          >
+          </el-date-picker>
       </el-form-item>
-      <el-form-item :label="$t('始发地')" prop="startWarehouseId">
-        <el-select v-model="queryParams.startWarehouseId" :placeholder="$t('请选择始发地')" clearable>
-          <el-option v-for="item in exportCityList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
+      <el-form-item :label="$t('始发仓')" prop="startWarehouseId">
+        <el-select v-model="queryParams.startWarehouseId" :placeholder="$t('请选择始发仓')" clearable @change="handleQuery">
+          <el-option v-for="item in exportWarehouseList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('目的地')" prop="destWarehouseId">
-        <el-select v-model="queryParams.destWarehouseId" :placeholder="$t('请选择目的地')" clearable>
-          <el-option v-for="item in importCityList" :label="item.titleZh" :value="item.id" :key="item.id"></el-option>
+      <el-form-item :label="$t('目的仓')" prop="destWarehouseId">
+        <el-select v-model="queryParams.destWarehouseId" :placeholder="$t('请选择目的仓')" clearable @change="handleQuery">
+          <el-option v-for="item in importWarehouseList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
         </el-select>
       </el-form-item>
 
       <el-form-item :label="$t('运输方式')" prop="transportId" v-if="!transportId">
-        <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model.number="queryParams.transportId" clearable/>
+        <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model.number="queryParams.transportId" clearable @change="handleQuery"/>
       </el-form-item>
 
       <!-- <el-form-item label="商品分类" prop="goodsType">
@@ -58,19 +65,18 @@
         <dict-selector :type="DICT_TYPE.ECW_WAREHOUSING_TYPE" v-model="queryParams.warehousingType"  clearable/>
       </el-form-item>
       <el-form-item :label="$t('客户经理')" >
-        <user-selector v-model="queryParams.salesmanId" />
+        <user-selector v-model="queryParams.salesmanId" clearable @change="handleQuery"/>
       </el-form-item>
       <el-form-item :label="$t('订单状态')" prop="status">
         <dict-selector :type="DICT_TYPE.ORDER_STATUS" v-model="queryParams.status"
           @keyup.enter.native="handleQuery" clearable />
       </el-form-item>
       <el-form-item :label="$t('报关方式')" prop="customsType">
-        <dict-selector :type="DICT_TYPE.ECW_CUSTOMS_TYPE" v-model="queryParams.customsType" clearable
-          @keyup.enter.native="handleQuery" />
+        <dict-selector :type="DICT_TYPE.ECW_CUSTOMS_TYPE" v-model="queryParams.customsType" clearable @change="handleQuery" />
       </el-form-item>
       <el-form-item :label="$t('是否齐货')" >
         <!--// 字段存疑-->
-        <dict-selector v-model="queryParams.isNeat" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" fomatter="bool"  clearable/>
+        <dict-selector v-model="queryParams.isNeat" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" fomatter="bool"  clearable @change="handleQuery"/>
       </el-form-item>
       <!-- <el-form-item label="重货比" prop="weightRatio">
         <el-input style="width: 100px;" v-model="molecule" placeholder="" clearable @change="moleculeChange"
@@ -80,8 +86,7 @@
           @keyup.enter.native="handleQuery" />
       </el-form-item> -->
       <el-form-item :label="$t('备案属性')" prop="productRecord">
-        <dict-selector :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" v-model="queryParams.productRecord" clearable
-          @keyup.enter.native="handleQuery" />
+        <dict-selector :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" v-model="queryParams.productRecord" clearable @change="handleQuery" />
       </el-form-item>
       <el-form-item :label="$t('快递单号')" prop="number">
         <el-input v-model="queryParams.number" :placeholder="$t('快递单号')" clearable @keyup.enter.native="handleQuery" />
@@ -138,15 +143,15 @@
           <template v-else>{{row.sumVolume}}m³ /{{row.sumWeight}}Kg</template>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('始发仓')" align="center" prop="departureName">
+      <el-table-column :label="$t('始发仓')" align="center" prop="startWarehouseName">
         <template slot-scope="{row}">
-          {{row.departureName}}
+          {{row.startWarehouseName}}
           <template v-if="row.isExternalWarehouse">({{$t('外部仓')}})</template>
         </template>
       </el-table-column>
       <el-table-column :label="$t('运输方式/目的地')" align="center" prop="transportId">
         <template slot-scope="{row}">
-          <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="row.transportId" /> / {{row.objectiveName}}
+          <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="row.transportId" /> / {{row.dstWarehouseName}}
         </template>
       </el-table-column>
       <el-table-column :label="$t('控货')" align="center" prop="transportId">
@@ -280,8 +285,11 @@
 
                 <!-- 退仓 -->
                 <template v-if="
-                    include(scope.row.inWarehouseState, [201, 202, 207, 202, 209, 210, 202, 211, 212, 202, 213, 214, 215, 216]) &&
+                    (
+                      include(scope.row.inWarehouseState, [202, 210, 211, 213, 214, 215, 216]) &&
                       exclude(scope.row.abnormalState, [1])
+                    ) ||
+                    include(scope.row.status, [16])
                   ">
                   <el-dropdown-item @click.native="show = true;orderId = scope.row.orderId; " v-hasPermi="['ecw:order:update']">{{$t('退仓')}}</el-dropdown-item>
                 </template>
@@ -289,7 +297,8 @@
 
                 <!-- 调仓 -->
                 <template v-if="
-                    include(scope.row.inWarehouseState, [201, 202, 202, 210, 202, 211, 202, 213, 215, 216])
+                    include(scope.row.inWarehouseState, [202, 207, 209, 210, 202, 211, 212, 215, 216, 218]) ||
+                    (include(scope.row.status, [16]) && exclude(scope.row.inWarehouseState, [213,214]))
                   ">
                   <el-dropdown-item @click.native="orderId = scope.row.orderId;warehouseBol=true;" >{{$t('调仓')}}</el-dropdown-item>
                 </template>
@@ -398,6 +407,7 @@ import BatchSingleApplication from "@/views/ecw/order/batchSingleApplication";
 import FeeApplication from "@/views/ecw/order/feeApplication";
 import MergeLog from '@/views/ecw/order/components/MergeLog'
 import PickupLog from './components/PickupLog'
+import {getWarehouseList} from '@/api/ecw/warehouse'
 export default {
   name: "Order",
   components: {
@@ -438,7 +448,8 @@ export default {
         page: 1,
         rows: 10
       },
-      tradeCityList: [],
+      warehouseList:[],
+      // tradeCityList: [],
       productAttrList: [],  // 商品属性
       molecule: '', //重货比分子
       denominator: '', //重货比分母
@@ -464,12 +475,19 @@ export default {
     };
   },
   computed: {
-    exportCityList() {
+    exportWarehouseList(){
+      /* tradeType 1 进口，2出口，3进出口 */
+      return this.warehouseList.filter(item => item.tradeType == 2 || item.tradeType == 3)
+    },
+    importWarehouseList(){
+      return this.warehouseList.filter(item => item.tradeType == 1 || item.tradeType == 3)
+    },
+    /* exportCityList() {
       return this.tradeCityList.filter(item => item.type == 2)
     },
     importCityList() {
       return this.tradeCityList.filter(item => item.type == 1)
-    },
+    }, */
     combinedQueryParams(){
         let timeParams = {}
         if(this.dateFilterType && this.dateFilter){
@@ -500,7 +518,8 @@ export default {
     this.getTransportFromRoute()
     this.getList();
     getProductAttrList().then(res => this.productAttrList = res.data)
-    getTradeCityList().then(res => this.tradeCityList = res.data)
+    // getTradeCityList().then(res => this.tradeCityList = res.data)
+    getWarehouseList().then(res => this.warehouseList = res.data)
   },
   methods: {
     // 提取路径中的运输方式

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

@@ -33,8 +33,8 @@
       </el-row>
       <el-row v-if="!orderItem.charging">
         <el-col :span="12">
-          <el-form-item :label="$t('新运费')" style="width: 400px" prop="seaFreight">
-            <el-input v-model="form.seaFreight" type="number" class="w-100" />
+          <el-form-item :label="$t('新运费')" style="width: 400px" prop="freight">
+            <el-input v-model="form.freight" type="number" class="w-100" />
             {{ currentMap[form.freightCurrency] }} / {{ unitMap[form.freightVolume] }}
           </el-form-item>
         </el-col>

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

 <template>
   <el-dialog visible :close-on-click-modal="false" :before-close="closeDialog" :title="$t('管理折扣')">
-    <el-form ref="form" :model="form" label-width="80px" :rules="rules">
+    <el-form ref="form" :model="form" label-width="120px" :rules="rules">
       
-      
-      <el-form-item :label="$t('旧全包价')" v-if="orderItem.charging">
-        {{form.freight}} {{ currentMap[form.freightCurrency] }} / {{ unitMap[form.freightVolume] }}
+      <!-- 海运是重货，空运是泡货 -->
+      <template v-if="order.transportId === 1 || order.transportId === 2">
+        <el-form-item :label="$t('原重货标准')">
+          {{form.orgWVolume}} kg/cbm
         </el-form-item>
-      <el-form-item :label="$t('新全包价')" style="width: 400px" prop="clearanceFreight"  v-if="orderItem.charging">
-        <el-input v-model="form.freight" type="number" class="w-100" />
-        {{ currentMap[form.freightCurrency] }} / {{ unitMap[form.freightVolume] }}
+        <el-form-item :label="$t('现重货标准')" style="width: 400px" prop="clearanceFreight">
+          <el-input v-model="form.WVolume" type="number" class="w-100" /> kg/cbm
         </el-form-item>
-      
+      </template>
+      <template v-else>
+        <el-form-item :label="$t('原泡货标准')">
+          {{form.orgWVolume}} kg
+        </el-form-item>
+        <el-form-item :label="$t('现泡货标准')" style="width: 400px" prop="clearanceFreight">
+          <el-input v-model="form.VWeight" type="number" class="w-100" /> kg
+        </el-form-item>
+      </template>
     </el-form>
     <div class="page-title">审批流程</div>
     <work-flow xmlkey="special_apply" v-model="ccIdArr" />

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

@@ -204,6 +204,7 @@ export default {
     },
     onDiscountSuccess(){
       this.showDiscountItem = null
+      this.showAllowanceItem = null
       this.getOrder()
     },
     onCommissionSuccess(){