From 8a5bc88a1103ff7d9d95c1397c20b3a29d1f316a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= <zhaoxiaox0053@163.com>
Date: Mon, 25 Sep 2023 17:18:48 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=A0=87=E5=87=86=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/customField/AddForm.vue                 |  2 +-
 src/components/selection/StandardSelectionModal.vue    |  8 +++++---
 .../commonPage/modules/SubmitQuestionModal.vue         | 10 ----------
 .../domesticStandard/DomesticStandardList.vue          |  5 +++--
 .../overseasStandard/OverseasStandardList.vue          |  5 +++--
 5 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/components/customField/AddForm.vue b/src/components/customField/AddForm.vue
index 166d7ee6..c4562bb2 100644
--- a/src/components/customField/AddForm.vue
+++ b/src/components/customField/AddForm.vue
@@ -311,7 +311,7 @@ export default {
     },
     flag: {
       type: String,
-      default: ''
+      default: null
     },
     disabled: {
       type: Boolean,
diff --git a/src/components/selection/StandardSelectionModal.vue b/src/components/selection/StandardSelectionModal.vue
index bdb4ebbb..18e989d7 100644
--- a/src/components/selection/StandardSelectionModal.vue
+++ b/src/components/selection/StandardSelectionModal.vue
@@ -131,15 +131,17 @@ export default {
     open () {
       this.visible = true
       this.queryParam = {}
-      this.replacePage()
+      this.$nextTick(() => {
+        this.source ? this.queryParam.source = this.source : this.queryParam = {}
+        this.replacePage()
+      })
     },
     // 获取表格数据
     replacePage () {
       const query = {
         ...this.queryParam,
         pageNo: this.ipagination.current,
-        pageSize: this.ipagination.pageSize,
-        source: this.source
+        pageSize: this.ipagination.pageSize
       }
       this.selectedRowKeys = []
       this.loading = true
diff --git a/src/views/standardRegulationLibrary/commonPage/modules/SubmitQuestionModal.vue b/src/views/standardRegulationLibrary/commonPage/modules/SubmitQuestionModal.vue
index f998b721..78dc4b9b 100644
--- a/src/views/standardRegulationLibrary/commonPage/modules/SubmitQuestionModal.vue
+++ b/src/views/standardRegulationLibrary/commonPage/modules/SubmitQuestionModal.vue
@@ -37,16 +37,6 @@
                      v-decorator="['standardNumber', validatorRules.standardNumber]" />
           </a-form-item>
         </a-col>
-        <a-col :span="12">
-          <!--          问题发生时间-->
-          <a-form-item :label="$t('standardRegulationLibrary.standardDetail.problemOccurrenceTime')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-            <a-date-picker class="box-input"
-                           :placeholder="$t('pleaseSelect') + $t('standardRegulationLibrary.standardDetail.problemOccurrenceTime')"
-                           :getCalendarContainer="(trigger) => trigger.parentNode"
-                           v-decorator="['problemOccurrenceTime', validatorRules.problemOccurrenceTime]"
-                           style="width: 100%" />
-          </a-form-item>
-        </a-col>
         <a-col :span="12">
           <!--          回答人-->
           <a-form-item :label="$t('standardRegulationLibrary.standardDetail.respondent')" :labelCol="labelCol" :wrapperCol="wrapperCol">
diff --git a/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue b/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue
index e9e62293..7bbb3920 100644
--- a/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue
+++ b/src/views/standardRegulationLibrary/domesticStandard/DomesticStandardList.vue
@@ -197,7 +197,7 @@ import {
   collectionDomesticStandard,
   cancelCollectionDomesticStandard
 } from '../../../api/standardRegulationLibraryApi'
-import { StandardSystemTreeNodeType, YesOrNoEnum } from '../../../enums/commonEnums'
+import { StandardSource, StandardSystemTreeNodeType, YesOrNoEnum } from '../../../enums/commonEnums'
 import UserSelectModal from '../../../components/selection/UserSelectModal.vue'
 import DomesticSystemTreeModal from './modules/DomesticSystemTreeModal.vue'
 import SelectionDomesticStandardDrawer from './modules/SelectionDomesticStandardDrawer.vue'
@@ -246,7 +246,7 @@ export default {
         list: '/laws/standard/domestic/getCommonPage',
         delete: '/laws/standard/domestic/deleteByIdsAndModule',
         deleteBatch: '/laws/standard/domestic/deleteByIdsAndModule',
-        downTemplateUrl: '', // 下载模板
+        downTemplateUrl: '/laws/standard/domestic/templateDownload', // 下载模板
         exportXlsUrl: '/laws/standard/domestic/exportData', // 导出
         exportZipUrl: '/laws/standard/domestic/exportDataWithFile', // 带文件导出
         importExcelUrl: '' // 导入
@@ -567,6 +567,7 @@ export default {
       if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
         param.selections = this.selectedRowKeys.join(',')
       }
+      param.module = StandardSource.DOMESTIC.value
       console.log('导出参数', param)
       // 加一个大的提示
       const modalLoading = this.$info({
diff --git a/src/views/standardRegulationLibrary/overseasStandard/OverseasStandardList.vue b/src/views/standardRegulationLibrary/overseasStandard/OverseasStandardList.vue
index 0532ea3f..02dca213 100644
--- a/src/views/standardRegulationLibrary/overseasStandard/OverseasStandardList.vue
+++ b/src/views/standardRegulationLibrary/overseasStandard/OverseasStandardList.vue
@@ -196,7 +196,7 @@ import {
   configOverseasStandard,
   removeOverseasStandard
 } from '../../../api/standardRegulationLibraryApi'
-import { StandardSystemTreeNodeType, YesOrNoEnum } from '../../../enums/commonEnums'
+import { StandardSource, StandardSystemTreeNodeType, YesOrNoEnum } from '../../../enums/commonEnums'
 import UserSelectModal from '../../../components/selection/UserSelectModal.vue'
 import OverseasStandardModal from './modules/OverseasStandardModal.vue'
 import OverseasSystemTreeModal from './modules/OverseasSystemTreeModal.vue'
@@ -246,7 +246,7 @@ export default {
         list: '/laws/standard/overseas/getCommonPage',
         delete: '/laws/standard/overseas/deleteByIdsAndModule',
         deleteBatch: '/laws/standard/overseas/deleteByIdsAndModule',
-        downTemplateUrl: '', // 下载模板
+        downTemplateUrl: '/laws/standard/overseas/templateDownload', // 下载模板
         exportXlsUrl: '/laws/standard/overseas/exportData', // 导出
         exportZipUrl: '/laws/standard/overseas/exportDataWithFile', // 带文件导出
         importExcelUrl: '' // 导入
@@ -567,6 +567,7 @@ export default {
       if (this.selectedRowKeys && this.selectedRowKeys.length > 0) {
         param.selections = this.selectedRowKeys.join(',')
       }
+      param.module = StandardSource.OVERSEAS.value
       console.log('导出参数', param)
       // 加一个大的提示
       const modalLoading = this.$info({