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

src/views/ecw/offer/specialDiscount.vue

@@ -6,54 +6,45 @@
          <div slot="header" class="clearfix" v-if="!readonly">
            <span>优惠申请</span>
          </div>
-         <el-form ref="form" :model="form" label-width="80px">
+         <el-form v-if="!readonly" ref="form" :model="form" label-width="80px">
            <el-form-item label="商品类型">
-             <el-input v-model="form.productType" readonly></el-input>
+             <span>{{ getProductAttrNameById(form.productType) }}</span>
            </el-form-item>
            <el-form-item label="商品名称">
-             <el-input v-model="form.prodTitleZh" readonly></el-input>
+             <span>{{ form.prodTitleZh }}</span>
            </el-form-item>
            <el-form-item label="英文名称">
-             <el-input v-model="form.prodTitleEn" readonly></el-input>
+             <span>{{ form.prodTitleEn }}</span>
            </el-form-item>
-           <el-form-item label="选择线路">
+           <el-form-item label="线路">
              {{ `【${getDictDataLabel(DICT_TYPE.TRANSPORT_TYPE, form.transportId)}】${ getChannelNameById(form.channelId) }从【${form.departureName}】发往【${form.objectiveName}】`}}
            </el-form-item>
            <el-form-item label="是否预付">
-             <el-radio-group v-model="form.isPayAdvance" disabled>
-               <el-radio :label="0">是</el-radio>
-               <el-radio :label="1">否</el-radio>
-             </el-radio-group>
+             {{ form.isPayAdvance === 0 ? '是' : '否' }}
            </el-form-item>
            <el-form-item label="旧运费">
              <el-input v-model="form.orgSeaFreight" readonly>
-               <dict-selector
-                 slot="prepend"
-                 v-model="form.orgSeaFreightCurrency"
-                 :type="DICT_TYPE.COMMISSION_CURRENCY_TYPE"
-                 style="width: 100px"
-                 disabled
-               ></dict-selector>
-               <el-select v-model="form.orgSeaFreightVolume" placeholder="请选择" slot="append" style="width: 100px" disabled>
+               <div slot="prepend" style="width: 60px">{{ currentMap[form.orgSeaFreightCurrency] }}</div>
+               <div slot="append" style="width: 60px">{{ unitMap[form.orgSeaFreightVolume] }}</div>
+             </el-input>
+           </el-form-item>
+           <el-form-item label="旧清关费">
+             <el-input v-model="form.orgClearanceFreight" readonly>
+               <div slot="prepend" style="width: 60px">{{ currentMap[form.orgClearanceFreightCurrency] }}</div>
+               <div slot="append" style="width: 60px">{{ unitMap[form.orgClearanceFreightVolume] }}</div>
+             </el-input>
+           </el-form-item>
+           <el-form-item label="新运费" required>
+             <el-input v-model.number="form.seaFreight">
+               <el-select v-model="form.seaFreightCurrency" placeholder="请选择" slot="prepend" style="width: 100px">
                  <el-option
-                   v-for="item in unitList"
+                   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.orgClearanceFreight" readonly>
-               <dict-selector
-                 slot="prepend"
-                 v-model="form.orgClearanceFreightCurrency"
-                 :type="DICT_TYPE.COMMISSION_CURRENCY_TYPE"
-                 style="width: 100px"
-                 disabled
-               ></dict-selector>
-               <el-select v-model="form.orgClearanceFreightVolume" placeholder="请选择" slot="append" style="width: 100px" disabled>
+               <el-select v-model="form.seaFreightVolume" placeholder="请选择" slot="append" style="width: 100px">
                  <el-option
                    v-for="item in unitList"
                    :key="item.id"
@@ -63,35 +54,17 @@
                </el-select>
              </el-input>
            </el-form-item>
-           <el-form-item label="新运费" required>
-             <el-input v-model.number="form.seaFreight" :readonly="readonly">
-               <dict-selector
-                 slot="prepend"
-                 v-model="form.seaFreightCurrency"
-                 :type="DICT_TYPE.COMMISSION_CURRENCY_TYPE"
-                 style="width: 100px"
-                 :disabled="readonly"
-               ></dict-selector>
-               <el-select v-model="form.seaFreightVolume" placeholder="请选择" slot="append" style="width: 100px" :disabled="readonly">
+           <el-form-item label="新清关费" required>
+             <el-input v-model.number="form.clearanceFreight">
+               <el-select v-model="form.clearanceFreightCurrency" placeholder="请选择" slot="prepend" style="width: 100px">
                  <el-option
-                   v-for="item in unitList"
+                   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="新清关费" required>
-             <el-input v-model.number="form.clearanceFreight" :readonly="readonly">
-               <dict-selector
-                 slot="prepend"
-                 v-model="form.clearanceFreightCurrency"
-                 :type="DICT_TYPE.COMMISSION_CURRENCY_TYPE"
-                 style="width: 100px"
-                 :disabled="readonly"
-               ></dict-selector>
-               <el-select v-model="form.clearanceFreightVolume" placeholder="请选择" slot="append" style="width: 100px" :disabled="readonly">
+               <el-select v-model="form.clearanceFreightVolume" placeholder="请选择" slot="append" style="width: 100px">
                  <el-option
                    v-for="item in unitList"
                    :key="item.id"
@@ -105,6 +78,20 @@
          <div v-if="!readonly">
            <el-button type="primary" @click="handleSubmit">提交</el-button>
          </div>
+
+         <el-descriptions border v-if="readonly" :column="1">
+           <el-descriptions-item label="商品类型">{{ form.productType }}</el-descriptions-item>
+           <el-descriptions-item label="商品名称">{{ form.prodTitleZh }}</el-descriptions-item>
+           <el-descriptions-item label="英文名称">{{ form.prodTitleEn }}</el-descriptions-item>
+           <el-descriptions-item label="线路">
+             {{ `【${getDictDataLabel(DICT_TYPE.TRANSPORT_TYPE, form.transportId)}】${ getChannelNameById(form.channelId) }从【${form.departureName}】发往【${form.objectiveName}】`}}
+           </el-descriptions-item>
+           <el-descriptions-item label="是否预付">{{ form.isPayAdvance === 0 ? '是' : '否' }}</el-descriptions-item>
+           <el-descriptions-item label="旧运费">{{ form.orgSeaFreight }} {{ currentMap[form.orgSeaFreightCurrency] }}/{{ unitMap[form.orgSeaFreightVolume] }}</el-descriptions-item>
+           <el-descriptions-item label="旧清关费">{{ form.orgClearanceFreight }} {{ currentMap[form.orgClearanceFreightCurrency] }}/{{ unitMap[form.orgClearanceFreightVolume] }}</el-descriptions-item>
+           <el-descriptions-item label="新运费">{{ form.seaFreight }} {{ currentMap[form.seaFreightCurrency] }}/{{ unitMap[form.seaFreightVolume] }}</el-descriptions-item>
+           <el-descriptions-item label="新清关费">{{ form.clearanceFreight }} {{ currentMap[form.clearanceFreightCurrency] }}/{{ unitMap[form.clearanceFreightVolume] }}</el-descriptions-item>
+         </el-descriptions>
        </el-card>
      </el-col>
     </el-row>
@@ -117,6 +104,8 @@ import {DICT_TYPE, getDictDataLabel} from "@/utils/dict"
 import DictSelector from "@/components/DictSelector"
 import {getUnitList} from "@/api/ecw/unit"
 import {getChannelList} from "@/api/ecw/channel"
+import { getCurrencyList } from '@/api/ecw/currency'
+import { getProductAttrList } from '@/api/ecw/productAttr'
 
 export default {
   name: "specialDiscount",
@@ -150,6 +139,8 @@ export default {
 
     getUnitList().then(res => this.unitList = res.data)
     getChannelList().then(res => this.channelList = res.data)
+    getCurrencyList().then(res => this.currencyList = res.data)
+    getProductAttrList().then(res => this.productAttrList = res.data)
 
   },
   data() {
@@ -158,6 +149,8 @@ export default {
       DICT_TYPE,
       unitList:[],
       channelList:[],
+      currencyList:[],
+      productAttrList:[],
       form: {
         "applyResult": "",
         "applyStatus": 0,
@@ -224,6 +217,9 @@ export default {
       getOfferSpecialByApproveId(this.id).then(r => {
         this.form = r.data
       })
+    },
+    getProductAttrNameById(id){
+      return this.productAttrList.find(e => e.id === id)?.attrName || ''
     }
   },
   computed: {
@@ -234,6 +230,20 @@ export default {
         return s ? '【' + s + '】' : ''
       }
     },
+    currentMap(){
+      let map = {}
+      this.currencyList.forEach(item => {
+        map[item.id] = item.titleZh
+      })
+      return map
+    },
+    unitMap(){
+      let map = {}
+      this.unitList.forEach(item => {
+        map[item.id] = item.titleZh
+      })
+      return map
+    }
   }
 }
 </script>