From 2cca6ef32f7d1415aa23147bc900d8537f8ad53b Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Thu, 19 Sep 2024 17:27:11 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E5=B8=82=E5=9C=BA=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E8=B0=83=E6=95=B4=E6=B8=85=E5=8D=95=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E9=A1=BA=E5=BA=8F=EF=BC=8C=E4=B8=8B=E4=B8=80=E6=AD=A5?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=AF=BC=E5=85=A5=E6=B2=A1=E5=B8=A6=E5=85=A5?=
 =?UTF-8?q?id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MarketRegulationsDetailPage.vue           | 76 +++++++++----------
 .../MarketRegulationsFormPage.vue             | 29 +++----
 .../modules/MarketRegulationsModal.vue        | 24 +++---
 3 files changed, 65 insertions(+), 64 deletions(-)

diff --git a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsDetailPage.vue b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsDetailPage.vue
index f32ba85..348532e 100644
--- a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsDetailPage.vue
+++ b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsDetailPage.vue
@@ -164,6 +164,25 @@ export default {
             return parseInt(index) + 1
           }
         },
+        { // 类型
+          title: this.$t('standardRegulationLibrary.marketListField.type'),
+          align: 'center',
+          width: 180,
+          dataIndex: 'type_dictText',
+          customRender: (text, row, index) => {
+            return {
+              children: <a-tooltip overlay-class-name="tooltip-style">
+                <template slot={'title'}>{text || text === 0 ? text : Vue.prototype.global.emptyLine}</template>
+                <div class="table-text">{text || text === 0 ? text : Vue.prototype.global.emptyLine}</div>
+              </a-tooltip>,
+              attrs: {
+                // 合并行 含col字段则合并，其他的必须设置为0！！
+                rowSpan: row.typeCol ? row.typeCol : 0
+              }
+            }
+          }
+          // scopedSlots: { customRender: 'dictText' }
+        },
         { // 标准编号
           title: this.$t('standardNumber'),
           align: 'center',
@@ -221,25 +240,6 @@ export default {
           }
           // scopedSlots: { customRender: 'text' }
         },
-        { // 新生产车实施日期
-          title: this.$t('standardRegulationLibrary.marketListField.newProductionVehicleImplementationDate'),
-          align: 'center',
-          width: 180,
-          dataIndex: 'newProductImplDate',
-          customRender: (text, row, index) => {
-            return {
-              children: <a-tooltip overlay-class-name="tooltip-style">
-                <template slot={'title'}>{text || text === 0 ? text : Vue.prototype.global.emptyLine}</template>
-                <div class="table-text">{text || text === 0 ? text : Vue.prototype.global.emptyLine}</div>
-              </a-tooltip>,
-              attrs: {
-                // 合并行 含col字段则合并，其他的必须设置为0！！
-                rowSpan: row.newProductImplDateCol ? row.newProductImplDateCol : 0
-              }
-            }
-          }
-          // scopedSlots: { customRender: 'text' }
-        },
         { // 新认证车实施日期
           title: this.$t('standardRegulationLibrary.marketListField.newCertifiedVehicleImplementationDate'),
           align: 'center',
@@ -259,6 +259,25 @@ export default {
           }
           // scopedSlots: { customRender: 'text' }
         },
+        { // 新生产车实施日期
+          title: this.$t('standardRegulationLibrary.marketListField.newProductionVehicleImplementationDate'),
+          align: 'center',
+          width: 180,
+          dataIndex: 'newProductImplDate',
+          customRender: (text, row, index) => {
+            return {
+              children: <a-tooltip overlay-class-name="tooltip-style">
+                <template slot={'title'}>{text || text === 0 ? text : Vue.prototype.global.emptyLine}</template>
+                <div class="table-text">{text || text === 0 ? text : Vue.prototype.global.emptyLine}</div>
+              </a-tooltip>,
+              attrs: {
+                // 合并行 含col字段则合并，其他的必须设置为0！！
+                rowSpan: row.newProductImplDateCol ? row.newProductImplDateCol : 0
+              }
+            }
+          }
+          // scopedSlots: { customRender: 'text' }
+        },
         { // 注册日期
           title: this.$t('standardRegulationLibrary.marketListField.dateOfRegistration'),
           align: 'center',
@@ -354,25 +373,6 @@ export default {
           }
           // scopedSlots: { customRender: 'text' }
         },
-        { // 类型
-          title: this.$t('standardRegulationLibrary.marketListField.type'),
-          align: 'center',
-          width: 180,
-          dataIndex: 'type_dictText',
-          customRender: (text, row, index) => {
-            return {
-              children: <a-tooltip overlay-class-name="tooltip-style">
-                <template slot={'title'}>{text || text === 0 ? text : Vue.prototype.global.emptyLine}</template>
-                <div class="table-text">{text || text === 0 ? text : Vue.prototype.global.emptyLine}</div>
-              </a-tooltip>,
-              attrs: {
-                // 合并行 含col字段则合并，其他的必须设置为0！！
-                rowSpan: row.typeCol ? row.typeCol : 0
-              }
-            }
-          }
-          // scopedSlots: { customRender: 'dictText' }
-        },
         { // 动力类型
           title: this.$t('standardRegulationLibrary.marketListField.dynamicType'),
           align: 'center',
diff --git a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue
index 8d8d445..c591a88 100644
--- a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue
+++ b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue
@@ -330,6 +330,13 @@ export default {
             return parseInt(index) + 1
           }
         },
+        { // 类型
+          title: this.$t('standardRegulationLibrary.marketListField.type'),
+          align: 'center',
+          width: 180,
+          dataIndex: 'type_dictText',
+          scopedSlots: { customRender: 'dictText' }
+        },
         { // 标准编号
           title: this.$t('standardNumber'),
           align: 'center',
@@ -351,13 +358,6 @@ export default {
           dataIndex: 'standardEnglishName',
           scopedSlots: { customRender: 'text' }
         },
-        { // 新生产车实施日期
-          title: this.$t('standardRegulationLibrary.marketListField.newProductionVehicleImplementationDate'),
-          align: 'center',
-          width: 180,
-          dataIndex: 'newProductImplDate',
-          scopedSlots: { customRender: 'text' }
-        },
         { // 新认证车实施日期
           title: this.$t('standardRegulationLibrary.marketListField.newCertifiedVehicleImplementationDate'),
           align: 'center',
@@ -365,6 +365,13 @@ export default {
           dataIndex: 'newAuthImplDate',
           scopedSlots: { customRender: 'text' }
         },
+        { // 新生产车实施日期
+          title: this.$t('standardRegulationLibrary.marketListField.newProductionVehicleImplementationDate'),
+          align: 'center',
+          width: 180,
+          dataIndex: 'newProductImplDate',
+          scopedSlots: { customRender: 'text' }
+        },
         { // 注册日期
           title: this.$t('standardRegulationLibrary.marketListField.dateOfRegistration'),
           align: 'center',
@@ -400,13 +407,6 @@ export default {
           dataIndex: 'certifyTheDeliverables',
           scopedSlots: { customRender: 'text' }
         },
-        { // 类型
-          title: this.$t('standardRegulationLibrary.marketListField.type'),
-          align: 'center',
-          width: 180,
-          dataIndex: 'type_dictText',
-          scopedSlots: { customRender: 'dictText' }
-        },
         { // 动力类型
           title: this.$t('standardRegulationLibrary.marketListField.dynamicType'),
           align: 'center',
@@ -643,6 +643,7 @@ export default {
                 // this.model = Object.assign({}, values)
                 this.model.id = res.message
                 this.filters.manifestId = this.model.id
+                this.importData.manifestId = this.model.id
               }
               // 更新清单编号
               this.initData(this.model.id)
diff --git a/src/views/standardRegulationLibrary/marketRegulationsList/modules/MarketRegulationsModal.vue b/src/views/standardRegulationLibrary/marketRegulationsList/modules/MarketRegulationsModal.vue
index 54f1f68..7b2b63b 100644
--- a/src/views/standardRegulationLibrary/marketRegulationsList/modules/MarketRegulationsModal.vue
+++ b/src/views/standardRegulationLibrary/marketRegulationsList/modules/MarketRegulationsModal.vue
@@ -13,6 +13,13 @@
     <div class="custom-drawer-style-scroll">
       <a-spin :spinning="confirmLoading" style="width: 100%;height:100%">
         <a-form :form="form">
+          <!--   类型  -->
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardRegulationLibrary.marketListField.type')">
+            <j-dict-select-tag :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.marketListField.type')"
+                               disabled
+                               dict-code="type"
+                               v-decorator.trim="[ 'type', validatorRules.type ]" />
+          </a-form-item>
           <!--   标准编号  -->
           <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardNumber')">
             <standard-selection :placeholder="$t('pleaseSelect') + $t('standardNumber')"
@@ -34,12 +41,11 @@
                      disabled
                      v-decorator.trim="[ 'standardEnglishName', validatorRules.standardEnglishName ]" />
           </a-form-item>
-          <!--   类型  -->
-          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardRegulationLibrary.marketListField.type')">
-            <j-dict-select-tag :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.marketListField.type')"
-                               disabled
-                               dict-code="type"
-                               v-decorator.trim="[ 'type', validatorRules.type ]" />
+          <!--   新认证车实施日期  -->
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardRegulationLibrary.marketListField.newCertifiedVehicleImplementationDate')">
+            <j-multiple-date-picker :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.marketListField.newCertifiedVehicleImplementationDate')"
+                                    field-name="newAuthImplDate"
+                                    v-decorator.trim="[ 'newAuthImplDate', validatorRules.newAuthImplDate ]" />
           </a-form-item>
           <!--   新生产车实施日期  -->
           <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardRegulationLibrary.marketListField.newProductionVehicleImplementationDate')">
@@ -47,12 +53,6 @@
                                     field-name="newProductImplDate"
                                     v-decorator.trim="[ 'newProductImplDate', validatorRules.newProductImplDate ]" />
           </a-form-item>
-          <!--   新认证车实施日期  -->
-          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardRegulationLibrary.marketListField.newCertifiedVehicleImplementationDate')">
-            <j-multiple-date-picker :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.marketListField.newCertifiedVehicleImplementationDate')"
-                                    field-name="newAuthImplDate"
-                                    v-decorator.trim="[ 'newAuthImplDate', validatorRules.newAuthImplDate ]" />
-          </a-form-item>
           <!--   注册日期  -->
           <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardRegulationLibrary.marketListField.dateOfRegistration')">
             <j-multiple-date-picker :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.marketListField.dateOfRegistration')"