特价优惠与折扣相关业务改动

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

@@ -17,16 +17,24 @@
       <el-form-item :label="$t('是否预付')">
         <dict-tag :type="DICT_TYPE.ECW_YESNO" :value="orderItem.isPayAdvance" />
       </el-form-item>
+      <el-form-item :label="$t('单价模式')">
+        <dict-selector
+          :type="DICT_TYPE.ECW_PRICE_TYPE"
+          v-model="orderItem.charging"
+          form-type="radio"
+          formatter="number"
+        />
+      </el-form-item>
 
-      <el-row v-if="!orderItem.charging">
+      <el-row v-if="!orderItem.orgCharging">
         <el-col :span="12">
           <el-form-item :label="$t('旧运费')">
-            {{form.orgFreight}} {{ currentMap[form.freightCurrency] }} / {{ unitMap[form.freightVolume] }}
+            {{form.orgFreight}} {{ currentMap[form.orgFreightCurrency] }} / {{ unitMap[form.freightVolume] }}
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item :label="$t('旧清关费')">
-            {{form.orgClearanceFreight}} {{ currentMap[form.clearanceFreightCurrency] }} / {{ unitMap[form.clearanceFreightVolume] }}
+            {{form.orgClearanceFreight}} {{ currentMap[form.orgClearanceFreightCurrency] }} / {{ unitMap[form.clearanceFreightVolume] }}
           </el-form-item>
         </el-col>
       </el-row>
@@ -34,23 +42,29 @@
         <el-col :span="12">
           <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] }}
+            <!--货币-->
+            <selector v-model="form.freightCurrency" :options="currencyList" :label-field="$l('title')" value-field="id" defaultable class="w-100 ml-10" />
+              / {{ unitMap[form.freightVolume] }}
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item :label="$t('新清关费')" style="width: 400px" prop="clearanceFreight">
             <el-input v-model="form.clearanceFreight" type="number" class="w-100" />
-            {{ currentMap[form.clearanceFreightCurrency] }} / {{ unitMap[form.clearanceFreightVolume] }}
+            <!--货币-->
+            <selector v-model="form.clearanceFreightCurrency" :options="currencyList" :label-field="$l('title')" value-field="id" defaultable class="w-100 ml-10" />
+              / {{ unitMap[form.clearanceFreightVolume] }}
           </el-form-item>
         </el-col>
       </el-row>
 
-      <el-form-item :label="$t('旧全包价')" v-if="orderItem.charging">
-        {{form.orgFreight}} {{ currentMap[form.freightCurrency] }} / {{ unitMap[form.freightVolume] }}
+      <el-form-item :label="$t('旧全包价')" v-if="orderItem.orgCharging">
+        {{form.orgFreight}} {{ currentMap[form.orgFreightCurrency] }} / {{ unitMap[form.freightVolume] }}
       </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] }}
+        <!--货币-->
+        <selector v-model="form.freightCurrency" :options="currencyList" :label-field="$l('title')" value-field="id" defaultable class="w-100 ml-10" />
+         / {{ unitMap[form.freightVolume] }}
       </el-form-item>
 
     </el-form>
@@ -77,6 +91,8 @@ import { getCurrencyList } from '@/api/ecw/currency'
 import { getProductType } from '@/api/ecw/productType'
 import {cancelProcessInstance} from '@/api/bpm/processInstance'
 import WorkFlow from '@/components/WorkFlow'
+import {DICT_TYPE} from "@/utils/dict";
+import selector from "@/components/Selector/index.vue";
 
 export default {
   name: "OrderSpecialDiscount",
@@ -89,6 +105,7 @@ export default {
     }
   },
   components: {
+    selector,
     WorkFlow
   },
   created() {
@@ -109,6 +126,7 @@ export default {
   },
   data() {
     return {
+      DICT_TYPE,
       // applyType: 1, // 1是优惠申请2是管理折扣3是佣金设置4是重货优惠5是泡货优惠
       unitList:[],
       // channelList:[],

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

@@ -40,23 +40,43 @@
         </el-table-column>
        <el-table-column :label="$t('旧费用')" align="center">
           <template v-slot="{row}">
-            <div v-if="!row.charging">
-              <div>{{$t('旧运费')}}:{{row.orgFreight}} {{ currentMap[row.freightCurrency] }} / {{ unitMap[row.freightVolume] }}</div>
-              <div>{{$t('旧清关费')}}:{{row.orgClearanceFreight}} {{ currentMap[row.clearanceFreightCurrency] }} / {{ unitMap[row.clearanceFreightVolume] }}</div>
+            <div v-if="!row.orgCharging">
+              <div>{{$t('旧运费')}}:{{row.orgFreight}} {{ currentMap[row.orgFreightCurrency] }} / {{ unitMap[row.freightVolume] }}</div>
+              <div>{{$t('旧清关费')}}:{{row.orgClearanceFreight}} {{ currentMap[row.orgClearanceFreightCurrency] }} / {{ unitMap[row.clearanceFreightVolume] }}</div>
             </div>
             <div v-else>
-              {{$t('旧全包价')}}:{{row.orgFreight}} {{ currentMap[row.freightCurrency] }} / {{ unitMap[row.freightVolume] }}
+              {{$t('旧全包价')}}:{{row.orgFreight}} {{ currentMap[row.orgFreightCurrency] }} / {{ unitMap[row.freightVolume] }}
             </div>
           </template>
         </el-table-column>
-       <el-table-column :label="$t('新费用')" align="center" width="300px">
+
+        <el-table-column :label="$t('单价模式')" align="left">
+          <template v-slot="{row}">
+            <dict-selector
+              :type="DICT_TYPE.ECW_PRICE_TYPE"
+              v-model="row.charging"
+              form-type="radio"
+              formatter="number"
+            />
+          </template>
+        </el-table-column>
+       <el-table-column :label="$t('新费用')" align="center" width="400px">
           <template v-slot="{row}">
             <div v-if="!row.charging">
-              <div>{{$t('新运费')}}: <el-input v-model="row.freight" type="number" class="w-100" /> {{ currentMap[row.freightCurrency] }} / {{ unitMap[row.freightVolume] }}</div>
-              <div>{{$t('新清关费')}}: <el-input v-model="row.clearanceFreight" type="number" class="w-100" /> {{ currentMap[row.clearanceFreightCurrency] }} / {{ unitMap[row.clearanceFreightVolume] }}</div>
+              <div>{{$t('新运费')}}: <el-input v-model="row.freight" type="number" class="w-100" />
+                <!--货币-->
+                <selector v-model="row.freightCurrency" :options="currencyList" :label-field="$l('title')" value-field="id" defaultable class="w-100 ml-10" />
+                / {{ unitMap[row.freightVolume] }}</div>
+              <div>{{$t('新清关费')}}: <el-input v-model="row.clearanceFreight" type="number" class="w-100" />
+                <!--货币-->
+                <selector v-model="row.clearanceFreightCurrency" :options="currencyList" :label-field="$l('title')" value-field="id" defaultable class="w-100 ml-10" />
+                / {{ unitMap[row.clearanceFreightVolume] }}</div>
             </div>
             <div v-else>
-              {{$t('新全包价')}}: <el-input v-model="row.freight" type="number" class="w-100" />{{ currentMap[row.freightCurrency] }} / {{ unitMap[row.freightVolume] }}
+              {{$t('新全包价')}}: <el-input v-model="row.freight" type="number" class="w-100" />
+              <!--货币-->
+              <selector v-model="row.freightCurrency" :options="currencyList" :label-field="$l('title')" value-field="id" defaultable class="w-100 ml-10" />
+                / {{ unitMap[row.freightVolume] }}
             </div>
           </template>
         </el-table-column>
@@ -85,6 +105,7 @@ import { getCurrencyList } from '@/api/ecw/currency'
 import { getProductType } from '@/api/ecw/productType'
 import {cancelProcessInstance} from '@/api/bpm/processInstance'
 import WorkFlow from '@/components/WorkFlow'
+import selector from "@/components/Selector/index.vue";
 
 export default {
   name: "OrderSpecialDiscount",
@@ -97,6 +118,7 @@ export default {
     }
   },
   components: {
+    selector,
     WorkFlow
   },
   created() {