From df196d504efa4b222c1955d993246f74eea1a065 Mon Sep 17 00:00:00 2001
From: fengchenchen <fengchenchen@syxysoft.com>
Date: Thu, 12 Sep 2024 14:26:03 +0800
Subject: [PATCH] =?UTF-8?q?[fix=20uat124]=20=E5=B8=82=E5=9C=BA=E6=B3=95?=
 =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95-=E6=96=B0=E5=A2=9E=E3=80=81?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=20=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E5=B8=82=E5=9C=BA=E6=B8=85=E5=8D=95+=E5=B8=82=E5=9C=BA?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E7=BC=96=E7=A0=81=E7=9A=84=E5=85=A8=E9=83=A8?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lang/standardRegulationLibrary/en-us.js   |  1 +
 .../lang/standardRegulationLibrary/zh-cn.js   |  1 +
 .../MarketRegulationsFormPage.vue             | 87 ++++++++++++++-----
 3 files changed, 67 insertions(+), 22 deletions(-)

diff --git a/src/common/lang/standardRegulationLibrary/en-us.js b/src/common/lang/standardRegulationLibrary/en-us.js
index c58fb05..4f0f5ba 100644
--- a/src/common/lang/standardRegulationLibrary/en-us.js
+++ b/src/common/lang/standardRegulationLibrary/en-us.js
@@ -71,6 +71,7 @@ module.exports = {
     releaseTime: 'Published Date',
     listState: 'Status',
     customName: 'Custom Name',
+    customNameLastText: '车型需满足标准法规清单',
     securityClass: 'Confidential Level',
     listDeclaration: 'Manifest Declaration',
     templateName: 'Market regulation list import template',
diff --git a/src/common/lang/standardRegulationLibrary/zh-cn.js b/src/common/lang/standardRegulationLibrary/zh-cn.js
index 634a48c..176e62d 100644
--- a/src/common/lang/standardRegulationLibrary/zh-cn.js
+++ b/src/common/lang/standardRegulationLibrary/zh-cn.js
@@ -71,6 +71,7 @@ module.exports = {
     releaseTime: '发布时间',
     listState: '清单状态',
     customName: '自定义名称',
+    customNameLastText: '车型需满足标准法规清单',
     securityClass: '密级',
     listDeclaration: '清单说明',
     templateName: '市场法规清单导入模板',
diff --git a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue
index 45e3ebf..a01f680 100644
--- a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue
+++ b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue
@@ -25,25 +25,32 @@
             </a-form-item>
           </a-col>
           <!--  清单编号英文缩写  -->
-          <a-col :span="12" v-if="isShowManifestNo">
-            <a-form-item :label="$t('standardRegulationLibrary.marketRegulationsList.listNumberEnglishPart')"
-                         :labelCol="labelCol"
-                         :wrapperCol="wrapperCol">
-              <a-input :placeholder="$t('pleaseEnter') + $t('standardRegulationLibrary.marketRegulationsList.listNumberEnglishPart')"
-                       :maxLength="192"
-                       v-decorator="['manifestNo', validatorRules.manifestNo]" />
-            </a-form-item>
-          </a-col>
+          <!--<template v-if="isShowManifestNo">-->
+          <a-form-item class="block-form-item" :label="$t('standardRegulationLibrary.marketRegulationsList.listNumber')"
+                       :labelCol="lineLabelCol"
+                       :wrapperCol="lineWrapperCol">
+            <!--固定的编码-->
+            <span>BZFG-</span>
+            <a-input :placeholder="$t('pleaseEnter') + $t('standardRegulationLibrary.marketRegulationsList.listNumberEnglishPart')"
+                     :maxLength="192"
+                     v-decorator="['manifestNo', validatorRules.manifestNo]" />
+            <!--后端生成的序号-->
+            <span>-{{model.columnNo}}</span>
+          </a-form-item>
+          <!--</template>-->
           <!--  自定义名称  -->
-          <a-col :span="12">
-            <a-form-item :label="$t('standardRegulationLibrary.marketRegulationsList.customName')"
-                         :labelCol="labelCol"
-                         :wrapperCol="wrapperCol">
-              <a-input :placeholder="$t('pleaseEnter') + $t('standardRegulationLibrary.marketRegulationsList.customName')"
-                       :maxLength="200"
-                       v-decorator="['customColumnName', validatorRules.customColumnName]" />
-            </a-form-item>
-          </a-col>
+          <!--<a-col :span="24">-->
+          <a-form-item class="block-form-item" :label="$t('standardRegulationLibrary.marketRegulationsList.listName')"
+                       :labelCol="lineLabelCol"
+                       :wrapperCol="lineWrapperCol">
+            <!--国家地区-->
+            <span>{{model.countryName}}</span>
+            <a-input :placeholder="$t('pleaseEnter') + $t('standardRegulationLibrary.marketRegulationsList.customName')"
+                     :maxLength="200"
+                     v-decorator="['customColumnName', validatorRules.customColumnName]" />
+            <span>{{ $t('standardRegulationLibrary.marketRegulationsList.customNameLastText') }}</span>
+          </a-form-item>
+          <!--</a-col>-->
           <!--  驾驶位置  -->
           <a-col :span="12">
             <a-form-item :labelCol="labelCol"
@@ -256,7 +263,7 @@ export default {
       SecurityClass,
       pageLoading: false,
       form: this.$form.createForm(this),
-      model: { manifest: {}, lists: [] },
+      model: { manifest: {}, lists: [], columnNo: 'XXX', countryName: '' },
       queryParam: {},
       countryOptions: [], // 国家下拉选择
       labelCol: {
@@ -512,17 +519,33 @@ export default {
       // const value = this.form.getFieldValue('country')
       console.log('--------value', value)
       const param = {}
-      param.country = value && value.length > 0 ? value.map(item => item.value).join(',') : ''
+      if (value && value.length > 0) {
+        param.country = value.map(item => item.value).join(',')
+        this.model.countryName = value.map(item => item.label).join('')
+      } else {
+        param.country = ''
+        this.model.countryName = ''
+      }
+
       marketRegulationGetListNumber(param).then(res => {
         if (res.success) {
+          const noText = res.message ? res.message.split(',')[0] : ''
           const result = {
-            manifestNo: res.message
+            manifestNo: noText
           }
           // 显示清单编号英文名称缩写
           this.isShowManifestNo = true
           this.$nextTick(() => {
             this.form.setFieldsValue(pick(result, 'manifestNo'))
           })
+
+        } else {
+          const result = {
+            manifestNo: ''
+          }
+          this.$nextTick(() => {
+            this.form.setFieldsValue(pick(result, 'manifestNo'))
+          })
         }
       })
     },
@@ -540,14 +563,22 @@ export default {
             this.model.country = this.model.country.split(',').map(item => {
               return { value: item }
             })
+            // 清单名称
+            this.model.countryName = this.model.country_dictText.split(',').join('')
           }
+          // 清单编号的转换
+          const manifestNoAll = this.model.manifestNo
           // 从清单编号截取英文缩写
-          this.model.manifestNo = this.model.manifestNo.split('-')[1]
+          this.model.manifestNo = manifestNoAll.split('-')[1]
+          // 清单标号 里面的序号
+          this.model.columnNo = manifestNoAll.split('-')[2]
+
           // 显示清单编号英文名称缩写
           this.isShowManifestNo = true
           this.$nextTick(() => {
             this.form.setFieldsValue(pick(this.model, 'country', 'manifestNo', 'customColumnName', 'drivePosition', 'securityLevel', 'manifestDesc', 'file'))
           })
+          this.$forceUpdate()
         }
       }).finally(() => {
         this.pageLoading = false
@@ -715,4 +746,16 @@ export default {
     z-index: 999;
   }
 }
+
+/deep/.block-form-item{
+  clear: both;
+  .ant-form-item-children {
+    display: flex;
+    align-items: center;
+    input {
+      flex: 1;
+      margin: 0 10px;
+    }
+  }
+}
 </style>