成本部分修改

src/components/Finance/Cost.vue

@@ -37,9 +37,10 @@
                             <el-input v-model="AGroupCostParameter.tax" placeholder="税率"></el-input>
                         </el-form-item>
                         <el-form-item label="货币:">
-                            <el-select v-model="AGroupCostParameter.currency" placeholder="请选择">
-                                <el-option v-for="item in currencyOption" :key="item.value" :label="item.label"
-                                    :value="item.value">
+                            <el-select v-model="AGroupCostParameter.currency" @change="changeCurrency"
+                                placeholder="请选择">
+                                <el-option v-for="item in currencyOption" :key="item.currencyId"
+                                    :label="item.currencyCode" :value="item.currencyId">
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -817,22 +818,7 @@ export default {
             tableData: [], //列表数据
             options: [],
             diid: '',
-            currencyOption: [{
-                value: 'CNY',
-                label: 'CNY'
-            }, {
-                value: 'CAD',
-                label: 'CAD'
-            }, {
-                value: 'EGP',
-                label: 'EGP'
-            }, {
-                value: 'EUR',
-                label: 'EUR'
-            }, {
-                value: 'USD',
-                label: 'USD'
-            }],
+            currencyOption: [],
             currencyValueL: 'CNY',
             formInline: {
                 user: '',
@@ -2028,7 +2014,7 @@ export default {
                 {
                     "diid": 0,
                     "cbType": "Top",
-                    "cbValues": ['DAY', 'ITIN', 'VA', 'VF', 'VRD', 'T/G S', 'DATE'] //"string"
+                    "cbValues": ['DAY', 'DATE', 'ITIN', 'VA', 'VT', 'VF', 'VRD', 'T/G S', 'T/G WH', 'C/F M', 'L', 'D', 'SGR', 'SUITE', 'ACCO N', 'T/V', 'EF', 'B/R/F', 'TE', 'DRV T', 'P/C'] //"string"
                 },
                 {
                     "diid": 0,
@@ -2578,9 +2564,11 @@ export default {
             }).then(resp => {
                 //console.log(resp.data.data, '------------------------------------');
                 if (resp.data.code == 200) {
+
                     that.options = resp.data.data.groupList;
                     that.grouptitleinfo = resp.data.data.groupInfo.data;
                     that.diid = that.grouptitleinfo.id;
+                    that.QueryRate();
 
                     for (var i = 0; i < that.CheckBoxListSelect.length; i++) {
                         that.CheckBoxListSelect[i].diid = that.diid;
@@ -2604,7 +2592,7 @@ export default {
                             {
                                 "diid": that.diid,
                                 "cbType": "Top",
-                                "cbValues": ['DAY', 'ITIN', 'VA', 'VF', 'VRD', 'T/G S', 'DATE'] //"string"
+                                "cbValues": ['DAY', 'DATE', 'ITIN', 'VA', 'VT', 'VF', 'VRD', 'T/G S', 'T/G WH', 'C/F M', 'L', 'D', 'SGR', 'SUITE', 'ACCO N', 'T/V', 'EF', 'B/R/F', 'TE', 'DRV T', 'P/C'] //"string"
                             },
                             {
                                 "diid": that.diid,
@@ -2675,6 +2663,13 @@ export default {
                         var acostvalue = resp.data.data.groupCostParameter.filter(x => x.costType == 'A')[0];
                         if (acostvalue != undefined) {
                             that.AGroupCostParameter = acostvalue;
+                            var result = Number(that.AGroupCostParameter.currency);
+                            if(isNaN(result)){
+
+                            }else{
+                                that.AGroupCostParameter.currency = result;
+                            }
+                            
                         } else {
                             that.AGroupCostParameter = {
                                 "id": 0,
@@ -3101,6 +3096,7 @@ export default {
                         };
                     });
 
+                    this.AGroupCostParameter.currency = this.AGroupCostParameter.currency.toString();
                     this.AGroupCostParameter.diId = this.diid;
                     this.BGroupCostParameter.diId = this.diid;
 
@@ -3144,6 +3140,13 @@ export default {
                             this.$message.error('保存失败！' + resp.data.msg);
                             resolve(false);
                         }
+
+                        var result  = Number(that.AGroupCostParameter.currency);
+                        if(isNaN(result)){
+
+                        }else{
+                            that.AGroupCostParameter.currency = result;
+                        }
                     })
 
                 } else {
@@ -4191,6 +4194,18 @@ export default {
                 return;
             }
 
+            var resultCurr = Number(this.AGroupCostParameter.currency);
+            if(isNaN(resultCurr)){
+                resultCurr = this.AGroupCostParameter.currency;
+            }else{
+                for (let index = 0; index < this.currencyOption.length; index++) {
+                    if (this.currencyOption[index].currencyId == resultCurr) {
+                        resultCurr = this.currencyOption[index].currencyCode;
+                    }
+                }
+
+            }
+
             var data = {
                 diid: this.diid,
                 costType: this.costTypevalue,
@@ -4198,7 +4213,7 @@ export default {
                     groupNumber: Number(this.grouptitleinfo.visitPNumber),
                     teamName: group[0].groupName,
                     tax: this.AGroupCostParameter.tax,
-                    currency: this.AGroupCostParameter.currency,
+                    currency: resultCurr,
                     rate: this.AGroupCostParameter.rate
                 },
                 leftInfo: {
@@ -4698,6 +4713,39 @@ export default {
             var row = this.tableData[this.rowIndex];
             var Price = this.dialogSelectObject.price;
             row['ef'] = Price.toFixed(2);
+        },
+        QueryRate() {
+            var url = "/api/Business/PostGroupTeamRateByDiIdAndCTableId"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + that.token
+                },
+                data: {
+                    "portType": 1,
+                    "diId": this.diid,
+                    "cTable": 85
+                }
+            }).then(function (res) {
+                if (res.data.code == 200) {
+                    //汇率
+                    console.log("汇率--", res.data.data);
+                    that.currencyOption = res.data.data.teamRates;
+                }
+            })
+
+
+        },
+        changeCurrency(data) {
+            console.log('data', data);
+            for (let index = 0; index < this.currencyOption.length; index++) {
+                if (this.currencyOption[index].currencyId == data) {
+                    this.AGroupCostParameter.rate = this.currencyOption[index].rate;
+                    break;
+                }
+            }
         }
     },
     mounted() {

src/components/MCR/MarketCustomerResourcesHome.vue

@@ -49,7 +49,7 @@
                 </div>
                 <!-- textbox框 -->
                 <div style="display: flex;margin-top: 10px;position: relative;">
-                    <div style="width: 30%;">
+                    <div style="width: 31%;">
                         <el-input v-model="inputLXR" placeholder="联系人"></el-input>
                     </div>
                     &nbsp;
@@ -57,7 +57,7 @@
                         <el-input v-model="inputDQ" placeholder="地区"></el-input>
                     </div>
                     &nbsp;
-                    <div style="width: 30%;">
+                    <div style="width: 29.59%;">
                         <el-input v-model="inputDW" placeholder="单位"></el-input>
                     </div>
                     &nbsp;