From 38d6912081f2e251496a2e4b627dd09a453ea6b3 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Thu, 19 Sep 2024 17:58:42 +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=E6=B8=85=E5=8D=95=E5=88=97=E8=A1=A8=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E9=A1=BA=E5=BA=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MarketRegulationsDetailPage.vue           | 154 +++++++++---------
 .../MarketRegulationsFormPage.vue             |  56 +++----
 .../modules/MarketRegulationsModal.vue        |  52 +++---
 3 files changed, 131 insertions(+), 131 deletions(-)

diff --git a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsDetailPage.vue b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsDetailPage.vue
index 348532e..bf9c06f 100644
--- a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsDetailPage.vue
+++ b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsDetailPage.vue
@@ -202,7 +202,7 @@ export default {
           }
           // scopedSlots: { customRender: 'toDetail' }
         },
-        { // 标准编号
+        { // 标准名称
           title: this.$t('standardName'),
           align: 'center',
           width: 180,
@@ -240,6 +240,82 @@ export default {
           }
           // scopedSlots: { customRender: 'text' }
         },
+        { // 主控部门
+          title: this.$t('standardRegulationLibrary.marketListField.mainControlDepartment'),
+          align: 'center',
+          width: 180,
+          dataIndex: 'mainDept_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.mainDeptCol ? row.mainDeptCol : 0
+              }
+            }
+          }
+          // scopedSlots: { customRender: 'text' }
+        },
+        { // 主控部门专业模块
+          title: this.$t('standardRegulationLibrary.marketListField.masterControlDepartmentProfessionalModule'),
+          align: 'center',
+          width: 180,
+          dataIndex: 'mainDeptProfMode_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.mainDeptProfModeCol ? row.mainDeptProfModeCol : 0
+              }
+            }
+          }
+          // scopedSlots: { customRender: 'dictText' }
+        },
+        { // 关联部门
+          title: this.$t('standardRegulationLibrary.marketListField.relatedDepartment'),
+          align: 'center',
+          width: 180,
+          dataIndex: 'associateDept_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.associateDeptCol ? row.associateDeptCol : 0
+              }
+            }
+          }
+          // scopedSlots: { customRender: 'text' }
+        },
+        { // 关联部门专业模块
+          title: this.$t('standardRegulationLibrary.marketListField.associateDepartmentSpecializedModules'),
+          align: 'center',
+          width: 180,
+          dataIndex: 'associateDeptProfMode_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.associateDeptProfModeCol ? row.associateDeptProfModeCol : 0
+              }
+            }
+          }
+          // scopedSlots: { customRender: 'dictText' }
+        },
         { // 新认证车实施日期
           title: this.$t('standardRegulationLibrary.marketListField.newCertifiedVehicleImplementationDate'),
           align: 'center',
@@ -392,82 +468,6 @@ export default {
           }
           // scopedSlots: { customRender: 'dictText' }
         },
-        { // 主控部门
-          title: this.$t('standardRegulationLibrary.marketListField.mainControlDepartment'),
-          align: 'center',
-          width: 180,
-          dataIndex: 'mainDept_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.mainDeptCol ? row.mainDeptCol : 0
-              }
-            }
-          }
-          // scopedSlots: { customRender: 'text' }
-        },
-        { // 主控部门专业模块
-          title: this.$t('standardRegulationLibrary.marketListField.masterControlDepartmentProfessionalModule'),
-          align: 'center',
-          width: 180,
-          dataIndex: 'mainDeptProfMode_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.mainDeptProfModeCol ? row.mainDeptProfModeCol : 0
-              }
-            }
-          }
-          // scopedSlots: { customRender: 'dictText' }
-        },
-        { // 关联部门
-          title: this.$t('standardRegulationLibrary.marketListField.relatedDepartment'),
-          align: 'center',
-          width: 180,
-          dataIndex: 'associateDept_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.associateDeptCol ? row.associateDeptCol : 0
-              }
-            }
-          }
-          // scopedSlots: { customRender: 'text' }
-        },
-        { // 关联部门专业模块
-          title: this.$t('standardRegulationLibrary.marketListField.associateDepartmentSpecializedModules'),
-          align: 'center',
-          width: 180,
-          dataIndex: 'associateDeptProfMode_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.associateDeptProfModeCol ? row.associateDeptProfModeCol : 0
-              }
-            }
-          }
-          // scopedSlots: { customRender: 'dictText' }
-        },
         { // 批量限制
           title: this.$t('standardRegulationLibrary.marketListField.batchRestriction'),
           align: 'center',
diff --git a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue
index c591a88..30409a9 100644
--- a/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue
+++ b/src/views/standardRegulationLibrary/marketRegulationsList/MarketRegulationsFormPage.vue
@@ -358,6 +358,34 @@ export default {
           dataIndex: 'standardEnglishName',
           scopedSlots: { customRender: 'text' }
         },
+        { // 主控部门
+          title: this.$t('standardRegulationLibrary.marketListField.mainControlDepartment'),
+          align: 'center',
+          width: 180,
+          dataIndex: 'mainDept_dictText',
+          scopedSlots: { customRender: 'text' }
+        },
+        { // 主控部门专业模块
+          title: this.$t('standardRegulationLibrary.marketListField.masterControlDepartmentProfessionalModule'),
+          align: 'center',
+          width: 180,
+          dataIndex: 'mainDeptProfMode_dictText',
+          scopedSlots: { customRender: 'dictText' }
+        },
+        { // 关联部门
+          title: this.$t('standardRegulationLibrary.marketListField.relatedDepartment'),
+          align: 'center',
+          width: 180,
+          dataIndex: 'associateDept_dictText',
+          scopedSlots: { customRender: 'text' }
+        },
+        { // 关联部门专业模块
+          title: this.$t('standardRegulationLibrary.marketListField.associateDepartmentSpecializedModules'),
+          align: 'center',
+          width: 180,
+          dataIndex: 'associateDeptProfMode_dictText',
+          scopedSlots: { customRender: 'dictText' }
+        },
         { // 新认证车实施日期
           title: this.$t('standardRegulationLibrary.marketListField.newCertifiedVehicleImplementationDate'),
           align: 'center',
@@ -414,34 +442,6 @@ export default {
           dataIndex: 'dynamicType_dictText',
           scopedSlots: { customRender: 'dictText' }
         },
-        { // 主控部门
-          title: this.$t('standardRegulationLibrary.marketListField.mainControlDepartment'),
-          align: 'center',
-          width: 180,
-          dataIndex: 'mainDept_dictText',
-          scopedSlots: { customRender: 'text' }
-        },
-        { // 主控部门专业模块
-          title: this.$t('standardRegulationLibrary.marketListField.masterControlDepartmentProfessionalModule'),
-          align: 'center',
-          width: 180,
-          dataIndex: 'mainDeptProfMode_dictText',
-          scopedSlots: { customRender: 'dictText' }
-        },
-        { // 关联部门
-          title: this.$t('standardRegulationLibrary.marketListField.relatedDepartment'),
-          align: 'center',
-          width: 180,
-          dataIndex: 'associateDept_dictText',
-          scopedSlots: { customRender: 'text' }
-        },
-        { // 关联部门专业模块
-          title: this.$t('standardRegulationLibrary.marketListField.associateDepartmentSpecializedModules'),
-          align: 'center',
-          width: 180,
-          dataIndex: 'associateDeptProfMode_dictText',
-          scopedSlots: { customRender: 'dictText' }
-        },
         { // 批量限制
           title: this.$t('standardRegulationLibrary.marketListField.batchRestriction'),
           align: 'center',
diff --git a/src/views/standardRegulationLibrary/marketRegulationsList/modules/MarketRegulationsModal.vue b/src/views/standardRegulationLibrary/marketRegulationsList/modules/MarketRegulationsModal.vue
index 7b2b63b..35aa385 100644
--- a/src/views/standardRegulationLibrary/marketRegulationsList/modules/MarketRegulationsModal.vue
+++ b/src/views/standardRegulationLibrary/marketRegulationsList/modules/MarketRegulationsModal.vue
@@ -41,6 +41,32 @@
                      disabled
                      v-decorator.trim="[ 'standardEnglishName', validatorRules.standardEnglishName ]" />
           </a-form-item>
+          <!--   主控部门  -->
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardRegulationLibrary.marketListField.mainControlDepartment')">
+            <j-select-depart :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.marketListField.mainControlDepartment')"
+                             :backDepart="true"
+                             :multi="true"
+                             v-decorator.trim="[ 'mainDept', validatorRules.mainDept ]" />
+          </a-form-item>
+          <!--   主控部门专业模块  -->
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardRegulationLibrary.marketListField.masterControlDepartmentProfessionalModule')">
+            <j-multi-select-tag :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.marketListField.masterControlDepartmentProfessionalModule')"
+                                dict-code="professional_module"
+                                v-decorator.trim="[ 'mainDeptProfMode', validatorRules.mainDeptProfMode ]" />
+          </a-form-item>
+          <!--   关联部门  -->
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardRegulationLibrary.marketListField.relatedDepartment')">
+            <j-select-depart :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.marketListField.relatedDepartment')"
+                             :backDepart="true"
+                             :multi="true"
+                             v-decorator.trim="[ 'associateDept', validatorRules.associateDept ]" />
+          </a-form-item>
+          <!--   关联部门专业模块  -->
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardRegulationLibrary.marketListField.associateDepartmentSpecializedModules')">
+            <j-multi-select-tag :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.marketListField.associateDepartmentSpecializedModules')"
+                                dict-code="professional_module"
+                                v-decorator.trim="[ 'associateDeptProfMode', validatorRules.associateDeptProfMode ]" />
+          </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')"
@@ -81,32 +107,6 @@
                      :maxLength="500"
                      v-decorator.trim="[ 'certifyTheDeliverables', validatorRules.certifyTheDeliverables ]" />
           </a-form-item>
-          <!--   主控部门  -->
-          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardRegulationLibrary.marketListField.mainControlDepartment')">
-            <j-select-depart :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.marketListField.mainControlDepartment')"
-                             :backDepart="true"
-                             :multi="true"
-                             v-decorator.trim="[ 'mainDept', validatorRules.mainDept ]" />
-          </a-form-item>
-          <!--   主控部门专业模块  -->
-          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardRegulationLibrary.marketListField.masterControlDepartmentProfessionalModule')">
-            <j-multi-select-tag :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.marketListField.masterControlDepartmentProfessionalModule')"
-                                dict-code="professional_module"
-                                v-decorator.trim="[ 'mainDeptProfMode', validatorRules.mainDeptProfMode ]" />
-          </a-form-item>
-          <!--   关联部门  -->
-          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardRegulationLibrary.marketListField.relatedDepartment')">
-            <j-select-depart :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.marketListField.relatedDepartment')"
-                             :backDepart="true"
-                             :multi="true"
-                             v-decorator.trim="[ 'associateDept', validatorRules.associateDept ]" />
-          </a-form-item>
-          <!--   关联部门专业模块  -->
-          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardRegulationLibrary.marketListField.associateDepartmentSpecializedModules')">
-            <j-multi-select-tag :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.marketListField.associateDepartmentSpecializedModules')"
-                                dict-code="professional_module"
-                                v-decorator.trim="[ 'associateDeptProfMode', validatorRules.associateDeptProfMode ]" />
-          </a-form-item>
           <!--   适用车型  -->
           <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardRegulationLibrary.marketListField.applicableVehicleType')">
             <j-multi-select-tag :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.marketListField.applicableVehicleType')"