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

src/utils/dict.js

@@ -198,6 +198,7 @@ export const DICT_TYPE = {
   BOX_SHIPPING_PRICE_UNIT: 'shipping_price_unit', // 金额单位
   BOX_SHIPPING_TICKET_EXCEPTION: 'shipping_ticket_exception', // 票异常
   BOX_SHIPPING_PROCESS: 'shipping_process', // 海运出货流程
+  BOX_SEA_AIR: 'shipping_process_sea_air', // 海空联运流程流程
   BOX_SHIPPING_BRAND_TYPE: 'shipping_brand_type', // 出货品牌类型
   BOX_SHIPPING_NOTICE_TYPE: 'shipping_notice_type', // 出货通知类型
   BOX_ORDER_SHIPMENT_STATE: 'order_shipment_state'

src/views/ecw/box/costForm.vue

@@ -3,9 +3,12 @@
     <el-form ref="costForm" :model="costObj" :rules="rules" label-width="80px">
 
       <el-form-item :label="$t('操作步骤')" prop="opStepType">
-        <el-select v-model="costObj.opStepType" :placeholder="$t('请选择操作步骤')">
+        <el-select v-if="flag=='sea'" v-model="costObj.opStepType" :placeholder="$t('请选择操作步骤')">
           <el-option v-for="type in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_PROCESS)" :key="type.value" :label="$l(type, 'label')" :value="type.value"></el-option>
         </el-select>
+        <el-select v-if="flag=='seaAir'" v-model="costObj.opStepType" :placeholder="$t('请选择操作步骤')">
+          <el-option v-for="type in this.getDictDatas(DICT_TYPE.BOX_SEA_AIR)" :key="type.value" :label="$l(type, 'label')" :value="type.value"></el-option>
+        </el-select>
       </el-form-item>
 
       <el-form-item :label="$t('费用类型')" prop="costType">
@@ -67,6 +70,7 @@ export default {
         price: [{ required: true, message: this.$t("金额不能为空"), trigger: "blur" }],
         priceUnit: [{ required: true, message: this.$t("金额单位不能为空"), trigger: "blur" }]
       },
+      flag: 'sea'
     };
   },
   created() {
@@ -80,6 +84,9 @@ export default {
     getCurrencyList().then((res) => {
       this.currencyList = res.data ?? [];
     });
+    if(this.$attrs.shipmentObj.bosType == 'seaAir'){
+      this.flag = 'seaAir';
+    }
   },
   methods: {
     submit() {

src/views/ecw/box/indexSeaAir.vue

@@ -621,6 +621,7 @@ export default {
       }
       if (["editLadingBill", "cost", "error"].includes(command)) {
         this.currRow = row;
+        this.currRow.bosType = 'seaAir'
         this.$set(this.dialogCfg, "dialogType", command);
         this.$set(this.dialogCfg, "width", "600px");
         this.$set(this.dialogCfg, "open", true);

src/views/ecw/box/ladingBill/index.vue

@@ -158,6 +158,9 @@ export default {
       if (type === "query") {
         this.getBillList();
       }
+      if(type === 'close'){
+        this.$emit("closeDialog");
+      }
     },
     handleCommand(type, row) {
       switch (type) {

src/views/ecw/box/ladingBill/makeLadingBill.vue

@@ -201,6 +201,7 @@ export default {
       this.$emit("closeDialog", type);
     },
     jumpReviewDetail() {
+      this.close('close')
       const { bpmProcessId } = this.currData;
       toReviewDetail.apply(this, [bpmProcessId]);
     },
@@ -249,6 +250,6 @@ export default {
   ::v-deep .el-dialog__body{
     padding-top: 0;
   }
-  
+
 }
 </style>

src/views/ecw/box/regError.vue

@@ -2,9 +2,12 @@
   <div class="shippingSea-dialog">
     <el-form ref="errorForm" :model="errorObj" label-width="140px">
       <el-form-item :label="$t('操作步骤')">
-        <el-select v-model="errorObj.opStep" :placeholder="$t('请选择操作步骤')">
+        <el-select v-if="flag=='sea'" v-model="errorObj.opStep" :placeholder="$t('请选择操作步骤')">
           <el-option v-for="type in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_PROCESS)" :key="type.value" :label="$l(type, 'label')" :value="type.value"></el-option>
         </el-select>
+        <el-select v-if="flag=='seaAir'" v-model="errorObj.opStep" :placeholder="$t('请选择操作步骤')">
+          <el-option v-for="type in this.getDictDatas(DICT_TYPE.BOX_SEA_AIR)" :key="type.value" :label="$l(type, 'label')" :value="type.value"></el-option>
+        </el-select>
       </el-form-item>
       <el-form-item :label="$t('票异常')">
         <el-select v-model="errorObj.billAbnId" :placeholder="$t('请选择票异常')">
@@ -63,11 +66,15 @@ export default {
           label: this.$t("否"),
         },
       ],
+      flag: 'sea'
     };
   },
   created() {
     const { currNode } = this.$attrs;
     this.errorObj = { opStep: currNode?.dataKey ?? undefined };
+    if(this.$attrs.shipmentObj.bosType == 'seaAir'){
+      this.flag = 'seaAir';
+    }
   },
   methods: {
     /** 提交 */

src/views/ecw/financial/creatCollection.vue

@@ -124,20 +124,22 @@
           </el-table-column>
           <el-table-column :label="$t('单价金额')" align="center" prop="unitPrice">
             <template slot-scope="scope">
-              <span>{{ scope.row.unitPrice }}</span>
-              <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
+              <span>{{ scope.row.unitPrice }}{{getCurrencyLabel(scope.row.currencyId)}}</span>
+              <!-- <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" /> -->
             </template>
           </el-table-column>
           <el-table-column :label="$t('总金额')" align="center" prop="totalAmount">
             <template slot-scope="scope">
-              <span>{{ scope.row.totalAmount }}</span>
-              <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
+              <span>{{ scope.row.totalAmount }}{{getCurrencyLabel(scope.row.currencyId)}}</span>
+			  
+              <!-- <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" /> -->
             </template>
           </el-table-column>
           <el-table-column :label="$t('优惠金额')" align="center">
             <template slot-scope="scope">
              <span> {{ scope.row.discountTotal ? `${scope.row.discountTotal}`:0}}</span>
-              <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
+              {{getCurrencyLabel(scope.row.currencyId)}}
+			  <!-- <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" /> -->
               <span v-if="scope.row.discountTotal">{{scope.row.discountRemark?('('+scope.row.discountRemark+')'): '' }}</span>
             </template>
           </el-table-column>
@@ -169,7 +171,8 @@
               :label="$t('核销基准币种')+':'"
               style="margin-bottom: 0;margin-top: 20px;"
             >
-             <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />
+			{{getCurrencyLabel(showCurrencyId)}}
+             <!-- <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" /> -->
             </el-form-item>
 <!--          </el-descriptions-item>
           <el-descriptions-item :label="$t('核销基准币种')">
@@ -264,7 +267,7 @@
         <el-table :data="form.receiptAccountList" border :key="form.receiptAccountList.length">
           <el-table-column :label="$t('应收币种')" align="center">
             <template slot-scope="scope">
-              <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
+				{{getCurrencyLabel(scope.row.currencyId)}}
             </template>
           </el-table-column>
           <el-table-column :label="$t('应收金额')" align="center" prop="receivableAmount">
@@ -274,7 +277,7 @@
           </el-table-column>
           <el-table-column align="center" width="220">
             <template #header>
-              {{ $t('核销基准币种') }}（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />）{{ $t('汇率') }}
+              {{ $t('核销基准币种') }}（{{getCurrencyLabel(showCurrencyId)}}）{{ $t('汇率') }}
             </template>
             <template slot-scope="scope">
               <template v-if="scope.row.type !== 'total'">
@@ -290,13 +293,13 @@
                 </el-form-item>
               </template>
               <template v-else>
-                {{ $t('应收总金额') }}（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />）
+                {{ $t('应收总金额') }}（	{{getCurrencyLabel(showCurrencyId)}}）
               </template>
             </template>
           </el-table-column>
           <el-table-column align="center" prop="writeOffAmount">
             <template #header>
-              {{ $t('核销基准金额') }}（<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="showCurrencyId" />）
+              {{ $t('核销基准金额') }}（	{{getCurrencyLabel(showCurrencyId)}}）
             </template>
           </el-table-column>
           <el-table-column :label="$t('期望收款账户')" align="center">
@@ -343,11 +346,6 @@
                   :value="item.id"
                 />
               </el-select>
-<!--                <dict-selector
-                  :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT"
-                  v-model="scope.row.collectionCurrencyId"
-                  @change="val => currencyIdChange(val, scope.row, scope.$index)"
-                /> -->
               </el-form-item>
             </template>
           </el-table-column>
@@ -556,14 +554,14 @@
           <!-- <el-table-column label="单价美元" align="center" prop="unitPrice" /> -->
           <el-table-column :label="$t('单价')" align="center" prop="unitPrice">
             <template slot-scope="scope">
-              <span>{{ scope.row.unitPrice }}</span>
-              <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
+              <span>{{ scope.row.unitPrice }}{{getCurrencyLabel(scope.row.currencyId)}}</span>
+              <!-- <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" /> -->
             </template>
           </el-table-column>
           <el-table-column :label="$t('总金额')" align="center" prop="totalAmount">
             <template slot-scope="scope">
-              <span>{{ scope.row.totalAmount }}</span>
-              <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
+              <span>{{ scope.row.totalAmount }}{{getCurrencyLabel(scope.row.currencyId)}}</span>
+              <!-- <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" /> -->
             </template>
           </el-table-column>
         </el-table>
@@ -610,32 +608,31 @@
           </el-table-column>
           <el-table-column :label="$t('单价金额')" align="center" prop="unitPrice">
             <template slot-scope="scope">
-              <span>{{ scope.row.unitPrice }}</span>
-              <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
+              <span>{{ scope.row.unitPrice }}{{getCurrencyLabel(scope.row.currencyId)}}</span>
+              <!-- <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" /> -->
             </template>
           </el-table-column>
           <el-table-column :label="$t('总金额')" align="center" prop="totalAmount">
             <template slot-scope="scope">
-              <span>{{ scope.row.totalAmount }}</span>
-              <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
+              <span>{{ scope.row.totalAmount }}{{getCurrencyLabel(scope.row.currencyId)}}</span>
+              <!-- <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" /> -->
             </template>
           </el-table-column>
         </el-table>
         <el-form-item :label="$t('总金额')">
-          {{ selectListRow.totalAmount }}
-          <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="selectListRow.currencyId" />
+          {{ selectListRow.totalAmount }}{{getCurrencyLabel(sselectListRow.currencyId)}}
         </el-form-item>
         <el-form-item :label="$t('优惠金额')">
           <el-input v-model="discountForm.discountTotal" type="number" min="0" :max="selectListRow.totalAmount" @input="checkDiscount" style="width: 300px" ></el-input>
-          &nbsp;&nbsp;
-          <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="selectListRow.currencyId" />
+          &nbsp;&nbsp;{{getCurrencyLabel(sselectListRow.currencyId)}}
+        
         </el-form-item>
         <el-form-item :label="$t('优惠原因')">
           <el-input v-model="discountForm.discountRemark" type="textarea" style="width: 300px"></el-input>
         </el-form-item>
         <el-form-item :label="$t('优惠后')">
           {{ (selectListRow.totalAmount - (discountForm.discountTotal || 0)).toFixed(2)}}
-          <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="selectListRow.currencyId" />
+		  {{getCurrencyLabel(sselectListRow.currencyId)}}
         </el-form-item>
         <el-form-item v-if="opnotice" :label="$t('操作人')">
           {{ discountForm.author }}
@@ -849,6 +846,11 @@ export default {
     }
   },
   methods: {
+	  getCurrencyLabel(id){
+	    var label = this.currencyList.filter(item=>item.id == id)
+	    if(label.length>0) return label[0].titleZh
+	    return ''
+	  },
     checkDiscount(e){
       if(e>this.selectListRow.totalAmount){
         this.discountForm.discountTotal = this.selectListRow.totalAmount

src/views/ecw/financial/creatPayment.vue

@@ -181,7 +181,8 @@
         <el-table-column :label="$t('应付金额')" align="center" prop="totalAmount" />
         <el-table-column :label="$t('币种')" align="center" prop="currencyId">
           <template slot-scope="scope">
-            <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
+			  {{getCurrencyLabel(scope.row.currencyId)}}
+            <!-- <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" /> -->
           </template>
         </el-table-column>
         <el-table-column :label="$t('汇率')" align="center" prop="exchangeRate">
@@ -386,8 +387,8 @@
           </el-table-column>
           <el-table-column :label="$t('金额')" align="center" prop="totalAmount">
             <template slot-scope="scope">
-              <span>{{ scope.row.totalAmount }}</span>
-              <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
+              <span>{{ scope.row.totalAmount }}{{getCurrencyLabel(scope.row.currencyId)}}</span>
+              <!-- <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" /> -->
             </template>
           </el-table-column>
         </el-table>
@@ -523,6 +524,11 @@ export default {
     },
   },
   methods: {
+	  getCurrencyLabel(id){
+	    var label = this.currencyList.filter(item=>item.id == id)
+	    if(label.length>0) return label[0].titleZh
+	    return ''
+	  },
     getList() {
       this.loading = true;
       // 处理查询参数

src/views/ecw/financial/openInvoice.vue

@@ -67,26 +67,26 @@
           </el-table-column>
           <el-table-column :label="$t('单价金额')" align="center" prop="unitPrice">
           <template slot-scope="scope">
-            <span>{{ scope.row.unitPrice }}</span>
-            <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
+            <span>{{ scope.row.unitPrice }}{{getCurrencyLabel(scope.row.currencyId)}}</span>
+            <!-- <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" /> -->
           </template>
         </el-table-column>
         <el-table-column :label="$t('总金额')" align="center" prop="totalAmount">
           <template slot-scope="scope">
-            <span>{{ scope.row.totalAmount }}</span>
-            <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
+            <span>{{ scope.row.totalAmount }}{{getCurrencyLabel(scope.row.currencyId)}}</span>
+            <!-- <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" /> -->
           </template>
         </el-table-column>
           <el-table-column :label="$t('税额')" align="center" prop="tax">
             <template slot-scope="scope">
-              <span>{{ scope.row.tax }}</span>
-              <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
+              <span>{{ scope.row.tax }}{{getCurrencyLabel(scope.row.currencyId)}}</span>
+              <!-- <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" /> -->
             </template>
           </el-table-column>
           <el-table-column :label="$t('价税合计')" align="center" prop="taxAndTotalAmount">
             <template slot-scope="scope">
-              <span>{{ scope.row.taxAndTotalAmount }}</span>
-              <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
+              <span>{{ scope.row.taxAndTotalAmount }}{{getCurrencyLabel(scope.row.currencyId)}}</span>
+              <!-- <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" /> -->
             </template>
           </el-table-column>
         </el-table>
@@ -113,6 +113,7 @@ import { DICT_TYPE } from "@/utils/dict";
 import { getReceiptInvoicing, getInvoicingItem, updateReceiptInvoicing } from "@/api/ecw/financial";
 import NP from 'number-precision'
 
+
 export default {
   name: "OpenInvoice",
   components: {},
@@ -121,7 +122,12 @@ export default {
       loading: false,
       invoiceData: {},
       id: 0,
-      list: []
+      list: [],
+	  params:{
+	       page:1,
+	       rows:20,
+	   },
+	  currencyList:[]
     };
   },
   created() {
@@ -129,8 +135,14 @@ export default {
       this.id = this.$route.query.id;
       this.getData();
     }
+	 getCurrencyPage(this.params).then(res => this.currencyList = res.data.list)
   },
   methods: {
+	  getCurrencyLabel(id){
+	    var label = this.currencyList.filter(item=>item.id == id)
+	    if(label.length>0) return label[0].titleZh
+	    return ''
+	  },
     async getData() {
       this.loading = true;
       await getReceiptInvoicing(this.id).then((res) => {

src/views/ecw/financial/payable.vue

@@ -203,7 +203,7 @@
           </el-form-item>
           <el-form-item label="" label-width="0px">
             <el-select v-model="costObj.currencyId" :placeholder="$t('请选择单位')">
-              <el-option v-for="item in this.getDictDatas(DICT_TYPE.BOX_SHIPPING_PRICE_UNIT)" :key="item.value" :label="item.label" :value="item.value"></el-option>
+              <el-option v-for="item in currencyList" :key="item.id" :label="item.titleZh" :value="item.id"></el-option>
             </el-select>
           </el-form-item>
         </el-row>

src/views/ecw/financial/paymentDetail.vue

@@ -154,7 +154,8 @@
         <el-table-column :label="$t('应付金额')" align="center" prop="totalAmount" />
         <el-table-column :label="$t('币种')" align="center" prop="currencyId">
           <template slot-scope="scope">
-            <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
+			  {{getCurrencyLabel(scope.row.currencyId)}}
+            <!-- <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" /> -->
           </template>
         </el-table-column>
         <el-table-column :label="$t('汇率')" align="center" prop="exchangeRate" />
@@ -326,6 +327,11 @@ export default {
     },
   },
   methods: {
+	  getCurrencyLabel(id){
+	    var label = this.currencyList.filter(item=>item.id == id)
+	    if(label.length>0) return label[0].titleZh
+	    return ''
+	  },
     getList() {
       this.loading = true;
       // 处理查询参数

src/views/ecw/financial/paymentExamine.vue

@@ -49,7 +49,8 @@
         <el-table-column :label="$t('应付金额')" align="center" prop="totalAmount" />
         <el-table-column :label="$t('币种')" align="center" prop="currencyId">
           <template slot-scope="scope">
-            <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
+			  {{getCurrencyLabel(scope.row.currencyId)}}
+            <!-- <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" /> -->
           </template>
         </el-table-column>
         <el-table-column :label="$t('汇率')" align="center" prop="exchangeRate">
@@ -88,6 +89,7 @@
 <script>
 import { getBankAccountPage } from "@/api/ecw/bankAccount";
 import { listSimpleDepts } from "@/api/system/dept";
+import { getCurrencyPage } from "@/api/ecw/currency";
 import { getPaymentInfoByIds, getPaymentItem, paymentVerify } from "@/api/ecw/financial"
 export default {
   name: "CreatPayment",
@@ -105,13 +107,16 @@ export default {
         page: 1,
         rows: 20,
       },
+	  currencyList:[],
       deptData: [],
       deptArr: [],
       notes: ''
     };
   },
   created() {
+	  getCurrencyPage(this.params).then(res => this.currencyList = res.data.list)
     let that = this;
+	
     if (that.$route.query.id && that.$route.query.id !== '0') {
       this.id = this.$route.query.id;
       getPaymentInfoByIds({ id: this.id }).then(res => {
@@ -146,6 +151,11 @@ export default {
     });
   },
   methods: {
+	  getCurrencyLabel(id){
+	    var label = this.currencyList.filter(item=>item.id == id)
+	    if(label.length>0) return label[0].titleZh
+	    return ''
+	  },
     getSummaries(param) {
       const { columns, data } = param;
       const sums = new Array(columns.length).map(v => '');

src/views/ecw/financial/printPaymentVoucher.vue

@@ -50,8 +50,8 @@
                 :value="item.feeType"
               ></dict-tag>
             </td>
-            <td>
-              <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="item.currencyId" />
+            <td>{{getCurrencyLabel(item.currencyId)}}
+              <!-- <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="item.currencyId" /> -->
             </td>
             <td>{{ item.exchangeRate }}</td>
             <td>{{ item.invoiceNumber }}</td>
@@ -88,6 +88,7 @@
   import { listSimpleDepts } from "@/api/system/dept"
   // import { getReceipt} from "@/api/ecw/receipt";
   import { getPaymentInfoByIds, getPaymentItem } from "@/api/ecw/financial"
+  import { getCurrencyPage } from "@/api/ecw/currency";
   import lodop from '@/utils/lodop'
 
   export default {
@@ -110,7 +111,8 @@
          },
         //  deptData:[],
         //  deptArr:[],
-         id:0
+         id:0,
+		  currencyList:[]
       }
     },
     created() {
@@ -119,6 +121,7 @@
         that.id = that.$route.query.id
         that.getCollectionData()
       }
+	  getCurrencyPage(this.params).then(res => this.currencyList = res.data.list)
       userList('salesman').then(res =>that.creatorData = res.data)
       getBankAccountPage(that.params).then(res =>that.bankData = res.data.list)
       // listSimpleDepts().then(res =>{
@@ -142,6 +145,11 @@
       // })
     },
     methods: {
+		getCurrencyLabel(id){
+		  var label = this.currencyList.filter(item=>item.id == id)
+		  if(label.length>0) return label[0].titleZh
+		  return ''
+		},
       getCollectionData(){
         let that = this
         getPaymentInfoByIds({id:that.id}).then(res =>{

src/views/ecw/financial/printVoucher.vue

@@ -40,17 +40,17 @@
             <td>{{ item.titleZh }}</td>
             <td><dict-tag :value="item.feeType" :type="DICT_TYPE.FEE_TYPE"></dict-tag></td>
             <td> {{item.totalAmount}}</td>
-            <td><dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="item.currencyId" /></td>
+            <td>{{getCurrencyLabel(item.currencyId)}}</td>
             <td>{{ item.discountTotal||0 }}</td>
           </tr>
           <tr v-for="(items, indexs) in receiptAccountList" :key="indexs">
-            <td><dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="items.currencyId" />{{$t('应收合计')}}</td>
+            <td>{{getCurrencyLabel(items.currencyId)}}{{$t('应收合计')}}</td>
             <td ><span v-if="items.discountTotal>0">{{ `${items.receivableAmount - items.discountTotal }(${items.receivableAmount} - ${items.discountTotal})` }}</span>
             <span v-else>{{ `${items.receivableAmount - items.discountTotal }` }}</span>
             </td>
             <td>{{$t('汇率')}}</td>
             <td>{{ items.collectionRate}}</td>
-            <td>{{$t('收款金额')}}(<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="items.collectionCurrencyId" />)</td>
+            <td>{{$t('收款金额')}}({{getCurrencyLabel(items.collectionCurrencyId)}})</td>
             <td colspan="3">{{ items.collectionAmount}}</td>
           </tr>
         </table>
@@ -64,7 +64,7 @@
             <p style="margin: 0;word-break: break-all;">A/C NO：{{bankTiem.accountNo}}</p>
           </div>
           <div style="padding:6px 0;width: 87.5%;text-align: center;">
-            <p style="margin: 0;">{{$t('实收')}}<dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="bankTiem.currencyId" />：{{bankTiem.amount}}¥</p>
+            <p style="margin: 0;">{{$t('实收')}}{{getCurrencyLabel(bankTiem.currencyId)}}：{{bankTiem.amount}}¥</p>
             <!-- <p style="margin: 0;">未收：¥{{bankTiem.noReceipt}}</p> -->
           </div>
         </div>
@@ -95,6 +95,7 @@
   import lodop from '@/utils/lodop'
   import NP from 'number-precision'
   import {getOrder} from '@/api/ecw/order'
+  import { getCurrencyPage } from "@/api/ecw/currency";
   import { getReceiptInfoByIds, getInvoicingItem,getReceiptAccountList,getReceivableItem} from "@/api/ecw/financial";
 
   export default {
@@ -121,13 +122,15 @@
          id:0,
          orderData:{},
          detailed:[],
-         date:''
+         date:'',
+		 currencyList:[]
       }
     },
     async created() {
       let that = this
       // listSimpleUsers().then(res =>that.creatorData = res.data)
       // getBankAccountPage(that.params).then(res =>that.bankData = res.data.list)
+	  await getCurrencyPage(this.params).then(res => this.currencyList = res.data.list)
       await listSimpleDepts().then(res =>{
         res.data.forEach((item)=>{
           if(item.parentId==0){
@@ -204,6 +207,11 @@
 
     },
     methods: {
+		getCurrencyLabel(id){
+		  var label = this.currencyList.filter(item=>item.id == id)
+		  if(label.length>0) return label[0].titleZh
+		  return ''
+		},
       getList() {
         getReceivableItem({ id: this.id }).then(res => {
           this.detailed = res.data

src/views/ecw/financial/receivable.vue

@@ -216,14 +216,14 @@
       </el-table-column>
       <el-table-column :label="$t('单价')" align="center" prop="unitPrice">
         <template slot-scope="scope">
-          <span>{{ scope.row.unitPrice }}</span>
-          <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
+          <span>{{ scope.row.unitPrice }}{{getCurrencyLabel(scope.row.currencyId)}}</span>
+          <!-- <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" /> -->
         </template>
       </el-table-column>
       <el-table-column :label="$t('总金额')" align="center" prop="totalAmount">
         <template slot-scope="scope">
-          <span>{{ scope.row.totalAmount }}</span>
-          <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" />
+          <span>{{ scope.row.totalAmount }}{{getCurrencyLabel(scope.row.currencyId)}}</span>
+          <!-- <dict-tag :type="DICT_TYPE.BOX_SHIPPING_PRICE_UNIT" :value="scope.row.currencyId" /> -->
         </template>
       </el-table-column>
       <el-table-column
@@ -255,6 +255,7 @@ import { DICT_TYPE } from "@/utils/dict";
 import CustomerSelector from "@/components/CustomerSelector";
 import { getTradeCityList } from "@/api/ecw/region";
 import { getReceivableList } from "@/api/ecw/financial";
+import { getCurrencyPage } from "@/api/ecw/currency";
 
 export default {
   name: "Receivable",
@@ -280,10 +281,16 @@ export default {
         rows: 20,
       },
       tradeCityList: [],
+	  params: {
+	    page: 1,
+	    rows: 20,
+	  },
+	  currencyList:[]
     };
   },
   created() {
     let that = this;
+	getCurrencyPage(this.params).then(res => this.currencyList = res.data.list)
     userList("salesman").then((res) => (that.creatorData = res.data));
     getTradeCityList().then((res) => (that.tradeCityList = res.data));
     this.getList();
@@ -297,6 +304,11 @@ export default {
     },
   },
   methods: {
+	  getCurrencyLabel(id){
+	    var label = this.currencyList.filter(item=>item.id == id)
+	    if(label.length>0) return label[0].titleZh
+	    return ''
+	  },
     /** 查询列表 */
     getList() {
       this.loading = true;

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

@@ -6,7 +6,7 @@
             <el-descriptions-item :label="$t('运输方式')">
                 <dict-tag class="mr-10" :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="order.transportId" />
             </el-descriptions-item>
-            <el-descriptions-item :label="$t('出货方式')">
+            <el-descriptions-item :label="$t('出货渠道')">
                 {{channel ? channel.nameZh : '/'}}
             </el-descriptions-item>
             <el-descriptions-item :label="$t('订单状态')">
@@ -19,7 +19,7 @@
             <el-descriptions-item :label="$t('目的仓')" :span="2">
                 {{order.logisticsInfoDto.destAddressZh}}
             </el-descriptions-item>
-            
+
             <!-- 优惠申请 -->
             <el-descriptions-item :label="$t('申请理由')" v-if="type == 1 || type == 2" :span="4">
                 <div class="bold">
@@ -62,7 +62,7 @@
                         newType: getDictDataLabel(DICT_TYPE.COMMISSION_TYPE, detail.commissionType),
                         })}}
                     </div>
-                    
+
                     <div>
                         {{$t('原运费')}}：{{detail.orgFreight}}{{currencyMap[detail.freightCurrency]}} / {{unitMap[detail.freightVolume]}}
                     </div>
@@ -90,7 +90,7 @@ import {getChannel} from '@/api/ecw/channel'
 import {getUnitList} from "@/api/ecw/unit"
 import { getCurrencyList } from '@/api/ecw/currency'
 import Decimal from 'decimal.js'
-/* 
+/*
 type含义
 优惠申请	1
 管理优惠	2
@@ -187,7 +187,7 @@ export default {
             getChannel(this.order.channelId).then(res => {
                 this.channel = res.data
             })
-        },/* 
+        },/*
         getBillOfLandingInProcessing(){
             getBillOfLandingInProcessing({orderId: this.detail.orderId}).then(res => {
                 console.log(res)
@@ -207,4 +207,4 @@ export default {
 .bold{
     font-weight: bold;
 }
-</style>
\ No newline at end of file
+</style>

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

@@ -12,7 +12,17 @@
          <span style="margin: 0 8px;">{{$t('到')}}</span>
           <el-date-picker clearable v-model="queryParams.endCreateTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" :placeholder="$t('请选择结束日期')" />
         </el-form-item>
-        <el-form-item :label="$t('始发地')+':'">
+        <el-form-item :label="$t('始发仓')" prop="startWarehouseId">
+          <el-select v-model="queryParams.startWarehouseId" :placeholder="$t('请选择始发仓')" clearable>
+            <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 importWarehouseList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
+          </el-select>
+        </el-form-item>
+<!--        <el-form-item :label="$t('始发地')+':'">
             <el-select v-model="queryParams.originId" :placeholder="$t('请选择始发地')" clearable>
                 <el-option v-for="item in expoerCityList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
             </el-select>
@@ -21,7 +31,7 @@
             <el-select v-model="queryParams.destinationId" :placeholder="$t('请选择目的地')" clearable>
              <el-option v-for="item in importCityList" :label="$l(item, 'title')" :value="item.id" :key="item.id" ></el-option>
             </el-select>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item :label="$t('运输方式')+':'" >
             <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :clearable="true" v-model="queryParams.transportId" />
         </el-form-item>
@@ -155,6 +165,7 @@ import {DICT_TYPE} from  '@/utils/dict'
 import {listServiceUser} from "@/api/system/user"
 import CustomerSelector from '@/components/CustomerSelector'
 import ProductSelector from '@/components/ProductSelector'
+import {getWarehouseList} from '@/api/ecw/warehouse'
 
 export default {
   name: "EcwOrderException",
@@ -179,6 +190,7 @@ export default {
         rows: 10
       },
        tradeCityList:[],
+       warehouseList:[],
     };
   },
   activated(){
@@ -186,10 +198,12 @@ export default {
   },
   created() {
     this.getList();
-    getTradeCityList().then(res => this.tradeCityList = res.data)
+    
+    // getTradeCityList().then(res => this.tradeCityList = res.data)
     listServiceUser().then(r => {
       this.creatorData = r.data
     })
+     getWarehouseList().then(res => this.warehouseList = res.data)
     // userList('salesman').then(res =>this.creatorData = res.data)
   },
   computed:{
@@ -199,7 +213,13 @@ export default {
     importCityList(){
         return this.tradeCityList.filter(item => item.type == 1)
     },
-
+    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)
+    },
   },
   methods: {
     /** 查询列表 */

src/views/ecw/order/prepayDeal.vue

@@ -272,8 +272,8 @@
             <!-- <el-select v-model="handlerParams.currency"  clearable>
               <el-option  v-for="dict in getDictDatas('shipping_price_unit') "
                       :key="dict.value" :label="dict.label" :value="dict.value"/>
-            </el-select> -->
-            <dict-tag type="shipping_price_unit" v-model="handlerParams.currency" class="w-100 ml-10"  />
+            </el-select> -->{{getCurrencyLabel(handlerParams.currency)}}
+            <!-- <dict-tag type="shipping_price_unit" v-model="handlerParams.currency" class="w-100 ml-10"  /> -->
           </el-form-item>
         </el-row>
 
@@ -281,9 +281,9 @@
           <el-form-item :label="$t('送货费用')+':'" size="medium">
             <el-input style="width: 100px;"  type="text" v-model="handlerParams.amount"  />
             <el-select v-model="handlerParams.currency" style="width: 100px;margin-left: 10px;" clearable>
-            <el-option  v-for="dict in getDictDatas('shipping_price_unit') "
-                        :key="dict.value" :label="dict.label" :value="dict.value"/>
-            </el-select>
+              <el-option  v-for="dict in currencyList "
+                        :key="dict.id" :label="dict.titleZh" :value="dict.id"/>
+              </el-select>
           </el-form-item>
         </el-row>
         <el-row :span="8" v-if="orderExceptionData.orderExceptionType!='order_lack_box_exception'&&orderExceptionData.orderExceptionType!='order_miss_exception'&&orderExceptionData.orderExceptionType!='order_superfluous_goods_exception'&&orderExceptionData.orderExceptionType!='order_in_water_exception'&&orderExceptionData.orderExceptionType!='order_damage_exception'&&orderExceptionData.orderExceptionType!='order_other_exception'&&orderExceptionData.orderExceptionType!='order_lack_box_exception'">
@@ -430,6 +430,11 @@
     },
     methods: {
       /** 查询列表 */
+	  getCurrencyLabel(id){
+	    var label = this.currencyList.filter(item=>item.id == id)
+	    if(label.length>0) return label[0].titleZh
+	    return ''
+	  },
       getList() {
         let that = this
         that.loading = true;