From 8cc3afa17f0334330adb7a327a3de0199383f05a Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Tue, 2 Jul 2024 11:30:16 +0800
Subject: [PATCH] =?UTF-8?q?[update=20=E9=80=89=E6=8B=A9=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6]=20=E6=9A=82=E6=97=B6=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/api.js                                |  4 +-
 .../MarketRegulationsListSelectionModal.vue   | 44 +++++++++----------
 2 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/src/api/api.js b/src/api/api.js
index 2a8615f..d3398ef 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -132,8 +132,8 @@ const getFileInfo = (params) => getAction('/sys/oss/file/queryById', params)
 // 标准选择框，分页查询标准数据
 const getStandardList = (params) => getAction('/laws/standard/common/getManyStandardSelectionBox', params)
 
-// 市场法规清单选择框，分页查询数据(无权限)
-const getMarketRegulationsList = (params) => getAction('', params)
+// 市场法规清单选择框，分页查询数据(无权限) TODO 暂时用列表接口
+const getMarketRegulationsList = (params) => getAction('/laws/marketStandard/page', params)
 
 // 内部工作组，左侧树查询
 const getWorkGroupTreeList = (params) => getAction('/sys/lawsWorkingGroup/list', params)
diff --git a/src/components/selection/MarketRegulationsListSelectionModal.vue b/src/components/selection/MarketRegulationsListSelectionModal.vue
index 60cc3f3..dcfccf5 100644
--- a/src/components/selection/MarketRegulationsListSelectionModal.vue
+++ b/src/components/selection/MarketRegulationsListSelectionModal.vue
@@ -17,7 +17,7 @@
               <a-form-item :label="$t('standardRegulationLibrary.marketRegulationsList.listNumber')">
                 <j-input
                   :placeholder="$t('pleaseEnter') + $t('standardRegulationLibrary.marketRegulationsList.listNumber')"
-                  v-model="queryParam.listNumber"></j-input>
+                  v-model="queryParam.manifestNo"></j-input>
               </a-form-item>
             </a-col>
 
@@ -26,7 +26,7 @@
               <a-form-item :label="$t('standardRegulationLibrary.marketRegulationsList.listName')">
                 <j-input
                   :placeholder="$t('pleaseEnter') + $t('standardRegulationLibrary.marketRegulationsList.listName')"
-                  v-model="queryParam.listName"></j-input>
+                  v-model="queryParam.manifestName"></j-input>
               </a-form-item>
             </a-col>
 
@@ -35,7 +35,7 @@
               <a-form-item :label="$t('standardRegulationLibrary.marketRegulationsList.countryRegion')">
                 <j-dict-select-tag
                   :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.marketRegulationsList.countryRegion')"
-                  v-model="queryParam.countryRegion"
+                  v-model="queryParam.country"
                   dict-code="market_state"></j-dict-select-tag>
               </a-form-item>
             </a-col>
@@ -45,7 +45,7 @@
               <a-form-item :label="$t('standardRegulationLibrary.marketRegulationsList.drivingPosition')">
                 <j-dict-select-tag
                   :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.marketRegulationsList.drivingPosition')"
-                  v-model="queryParam.drivingPosition"
+                  v-model="queryParam.drivePosition"
                   dict-code="driving_position"></j-dict-select-tag>
               </a-form-item>
             </a-col>
@@ -69,7 +69,7 @@
       </div>
       <a-table
         :columns="columns"
-        rowKey="standardNumber"
+        rowKey="id"
         :scroll="{x: 900}"
         :data-source="dataList"
         :pagination="ipagination"
@@ -87,9 +87,14 @@
         <template v-slot:toDetail="text, record">
           <a-tooltip overlay-class-name="tooltip-style">
             <template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
-            <a v-if="text" class="link-a" @click="handleGoDetail(record)">{{ text }}</a>
-            <div v-else class="table-text">{{ global.emptyLine }}</div>
+            <div class="table-text">{{ text || text === 0 ? text : global.emptyLine }}</div>
           </a-tooltip>
+          <!--TODO 暂时没有跳转，这边先正常显示-->
+          <!--<a-tooltip overlay-class-name="tooltip-style">-->
+          <!--  <template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>-->
+          <!--  <a v-if="text" class="link-a" @click="handleGoDetail(record)">{{ text }}</a>-->
+          <!--  <div v-else class="table-text">{{ global.emptyLine }}</div>-->
+          <!--</a-tooltip>-->
         </template>
 
       </a-table>
@@ -166,64 +171,57 @@ export default {
           title: this.$t('standardRegulationLibrary.marketRegulationsList.countryRegion'),
           align: 'center',
           width: 180,
-          dataIndex: 'countryRegion',
+          dataIndex: 'country_dictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 清单编号
           title: this.$t('standardRegulationLibrary.marketRegulationsList.listNumber'),
           align: 'center',
           width: 180,
-          dataIndex: 'listNumber',
+          dataIndex: 'manifestNo',
           scopedSlots: { customRender: 'toDetail' }
         },
-        { // 清单编号
+        { // 清单名称
           title: this.$t('standardRegulationLibrary.marketRegulationsList.listName'),
           align: 'center',
           width: 180,
-          dataIndex: 'listName',
+          dataIndex: 'manifestName',
           scopedSlots: { customRender: 'toDetail' }
         },
         { // 驾驶位置
           title: this.$t('standardRegulationLibrary.marketRegulationsList.drivingPosition'),
           align: 'center',
           width: 180,
-          dataIndex: 'drivingPosition',
+          dataIndex: 'drivePosition_dictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 清单版本
           title: this.$t('standardRegulationLibrary.marketRegulationsList.listVersion'),
           align: 'center',
           width: 180,
-          dataIndex: 'listVersion',
+          dataIndex: 'manifestVersion',
           scopedSlots: { customRender: 'text' }
         },
         { // 发布时间
           title: this.$t('standardRegulationLibrary.marketRegulationsList.releaseTime'),
           align: 'center',
           width: 180,
-          dataIndex: 'releaseTime',
+          dataIndex: 'releaseDate',
           scopedSlots: { customRender: 'text' }
         },
         { // 作者
           title: this.$t('standardRegulationLibrary.marketRegulationsList.author'),
           align: 'center',
           width: 180,
-          dataIndex: 'author',
+          dataIndex: 'author_dictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 清单状态
           title: this.$t('standardRegulationLibrary.marketRegulationsList.listState'),
           align: 'center',
           width: 180,
-          dataIndex: 'listState',
+          dataIndex: 'manifestStatus_dictText',
           scopedSlots: { customRender: 'text' }
-        },
-        {
-          title: this.$t('operation'),
-          scopedSlots: { customRender: 'action' },
-          align: 'center',
-          fixed: 'right',
-          width: 170
         }
       ],
       dataList: []