conflict

src/views/myTrade/purchaseAndSaleContract/salesContract/components/Basic.vue

@@ -83,14 +83,14 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="起运港" prop="portDeparture">
+      <el-form-item label="起运港（英文）" prop="portDeparture">
         <el-input
           v-model="ruleForm.portDeparture"
           :disabled="disabled"
           placeholder="请输入起运港"
         />
       </el-form-item>
-      <el-form-item label="目的港" prop="portDestination">
+      <el-form-item label="目的港（英文）" prop="portDestination">
         <el-input
           v-model="ruleForm.portDestination"
           :disabled="disabled"
@@ -114,7 +114,7 @@
       <el-form-item v-if="ruleForm.templateType === 'N'" label="签署日期" prop="signDate">
         <el-date-picker v-model="ruleForm.signDate" value-format="yyyy-MM-dd" type="date" placeholder="选择签署日期" style="width: 100%;" />
       </el-form-item>
-      <el-form-item label="成交汇率 (美元)" prop="exchangeRate">
+      <el-form-item label="成交汇率 (美元)" prop="exchangeRate" :rules="[{ required: ruleForm.exportType === 'proxy_export' && enterpriseInfo.proxyDistrictCode === 'CN_MAINLAND', message: '请输入成交汇率', trigger: 'blur' }]">
         <el-input
           v-model="ruleForm.exchangeRate"
           placeholder="请输入成交汇率 (美元)"
@@ -190,9 +190,6 @@ export default {
         ],
         signDate: [
           { required: true, message: '请选择签署日期', trigger: 'blur' }
-        ],
-        exchangeRate: [
-          { required: true, message: '请输入成交汇率', trigger: 'blur' }
         ]
       },
       platformList: [], // 代理商
@@ -201,7 +198,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'constant'
+      'constant', 'enterpriseInfo'
     ])
   },
   watch: {

src/views/myTrade/purchaseAndSaleContract/salesContract/components/Terms.vue

@@ -84,11 +84,11 @@
           placeholder="请输入开户行"
         />
       </el-form-item>
-      <el-form-item label="银行名称" prop="bankNane">
+      <el-form-item label="银行名称" prop="bankName">
         <el-input
-          v-model="ruleForm.bankNane"
+          v-model="ruleForm.bankName"
           :disabled="disabled"
-          placeholder="请输入开户行"
+          placeholder="请输入银行名称"
         />
       </el-form-item>
       <el-form-item label="Swift Code" prop="swiftCode">
@@ -170,6 +170,7 @@ export default {
         accountName: '',
         accountNumber: '',
         openingBank: '',
+        bankName: '',
         swiftCode: '',
         remark: '',
         bankNane: ''
@@ -193,6 +194,9 @@ export default {
         openingBank: [
           { required: true, message: `请输入开户行`, trigger: 'blur' }
         ],
+        bankName: [
+          { required: true, message: `请输入银行名称`, trigger: 'blur' }
+        ],
         swiftCode: [
           { required: true, validator: validateSwiftCode, trigger: 'blur' }
         ],
@@ -371,6 +375,7 @@ export default {
             accountName,
             accountNumber,
             openingBank,
+            bankName,
             swiftCode,
             remark,
             titleInfo,
@@ -384,6 +389,7 @@ export default {
             accountName,
             accountNumber,
             openingBank,
+            bankName,
             swiftCode,
             remark,
             bankNane