From 27cd6f1118c634c1636f02f65ceed2aeac45b5cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Wed, 28 Feb 2024 16:26:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3=E6=8B=86?=
 =?UTF-8?q?=E5=88=86=E5=BE=97=E7=BB=86=E8=8A=82=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../selection/StandardSelectionModal.vue      | 24 ++++-----
 .../documentComparison/DocumentComparison.vue | 51 +++++++++++--------
 .../modules/ImportSplitResultModal.vue        | 25 ++++-----
 .../modules/splitIsInStorage.vue              | 20 ++++++--
 4 files changed, 72 insertions(+), 48 deletions(-)

diff --git a/jero-web/src/components/selection/StandardSelectionModal.vue b/jero-web/src/components/selection/StandardSelectionModal.vue
index 29011e6..a87daa6 100644
--- a/jero-web/src/components/selection/StandardSelectionModal.vue
+++ b/jero-web/src/components/selection/StandardSelectionModal.vue
@@ -227,18 +227,18 @@ export default {
         query.source = this.canSelectedSource.join(',')
       }
       // this.selectedRowKeys = []
-      this.loading = true
-      getStandardList(query).then((res) => {
-        if (res.success) {
-          this.dataList = res.result.records
-          this.ipagination.total = res.result.total
-          this.selectedRowKeys = this.value ? this.value.split(',') : []
-        } else {
-          this.dataList = []
-        }
-      }).finally(() => {
-        this.loading = false
-      })
+      // this.loading = true
+      // getStandardList(query).then((res) => {
+      //   if (res.success) {
+      //     this.dataList = res.result.records
+      //     this.ipagination.total = res.result.total
+      //     this.selectedRowKeys = this.value ? this.value.split(',') : []
+      //   } else {
+      //     this.dataList = []
+      //   }
+      // }).finally(() => {
+      //   this.loading = false
+      // })
     },
     searchQuery () {
       this.replacePage(1)
diff --git a/jero-web/src/views/documentTool/documentComparison/DocumentComparison.vue b/jero-web/src/views/documentTool/documentComparison/DocumentComparison.vue
index efddb0c..addc8a5 100644
--- a/jero-web/src/views/documentTool/documentComparison/DocumentComparison.vue
+++ b/jero-web/src/views/documentTool/documentComparison/DocumentComparison.vue
@@ -18,14 +18,14 @@
             </a-form-item>
           </a-col>
           <!--发布情况-->
-          <a-col :md="6" :sm="8">
-            <a-form-item :label="$t('docTool.comparison.releaseSituation')" :labelCol="{span: 6}" :wrapperCol="{span: 14}">
-              <j-dict-select-tag v-model="queryParam.releaseState"
-                                 :placeholder="$t('pleaseSelect')+$t('docTool.comparison.releaseSituation')"
-                                 type="select"
-                                 :triggerChange="false" dictCode="release_state" />
-            </a-form-item>
-          </a-col>
+<!--          <a-col :md="6" :sm="8">-->
+<!--            <a-form-item :label="$t('docTool.comparison.releaseSituation')" :labelCol="{span: 6}" :wrapperCol="{span: 14}">-->
+<!--              <j-dict-select-tag v-model="queryParam.releaseState"-->
+<!--                                 :placeholder="$t('pleaseSelect')+$t('docTool.comparison.releaseSituation')"-->
+<!--                                 type="select"-->
+<!--                                 :triggerChange="false" dictCode="release_state" />-->
+<!--            </a-form-item>-->
+<!--          </a-col>-->
           <div style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
             <a-button type="primary" @click="searchQuery" icon="search">
               {{ $t('query') }}
@@ -163,6 +163,17 @@ export default {
           width: 150,
           dataIndex: 'compareTypeShow'
         },
+        {
+          title: '比对状态',
+          width: 150,
+          dataIndex: 'compareStatus'
+        },
+        {
+          title: '比对时间',
+          width: 150,
+          dataIndex: 'createTime'
+        },
+
         // 发布情况
         // {
         //   title: this.$t('docTool.comparison.releaseSituation'),
@@ -176,11 +187,11 @@ export default {
         //   dataIndex: 'createNameNo'
         // },
         // 备注
-        {
-          title: this.$t('remarks'),
-          width: 270,
-          dataIndex: 'remark'
-        },
+        // {
+        //   title: this.$t('remarks'),
+        //   width: 270,
+        //   dataIndex: 'remark'
+        // },
         // 操作
         {
           title: this.$t('operation'),
@@ -212,13 +223,13 @@ export default {
         //   }
         // },
         // 编辑
-        {
-          text: this.$t('edit'),
-          clickEvent: 'edit',
-          show: (record) => {
-            return !(record.compareType === 'item')
-          }
-        },
+        // {
+        //   text: this.$t('edit'),
+        //   clickEvent: 'edit',
+        //   show: (record) => {
+        //     return !(record.compareType === 'item')
+        //   }
+        // },
         // 删除
         {
           text: this.$t('delete'),
diff --git a/jero-web/src/views/documentTool/documentSplit/modules/ImportSplitResultModal.vue b/jero-web/src/views/documentTool/documentSplit/modules/ImportSplitResultModal.vue
index 4933e4a..fa89baa 100644
--- a/jero-web/src/views/documentTool/documentSplit/modules/ImportSplitResultModal.vue
+++ b/jero-web/src/views/documentTool/documentSplit/modules/ImportSplitResultModal.vue
@@ -15,17 +15,17 @@
       <a-form :form="form">
         <!--标准号-->
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardSelect.standardNumber')">
-          <a-input :placeholder="$t('pleaseEnter') + $t('standardSelect.standardName')"
-                   @change="event => event.target.value = event.target.value.trim()"
-                   :maxLength="100"
-                   v-decorator="['serialNumber', validatorRules.serialNumber]" />
-<!--          <standard-selection :placeholder="$t('pleaseSelect') + $t('standardSelect.standardNumber')"-->
-<!--                              type="radio"-->
-<!--                              @nameChange="handleStandardNumberChange"-->
-<!--                              :select-only="true"-->
-<!--                              :can-selected-source="[StandardSource.DOMESTIC.value, StandardSource.ENTERPRISE.value]"-->
-<!--                              class="readonly-input"-->
-<!--                              v-decorator="['serialNumber', validatorRules.serialNumber]" />-->
+<!--          <a-input :placeholder="$t('pleaseEnter') + $t('standardSelect.standardName')"-->
+<!--                   @change="event => event.target.value = event.target.value.trim()"-->
+<!--                   :maxLength="100"-->
+<!--                   v-decorator="['serialNumber', validatorRules.serialNumber]" />-->
+          <standard-selection :placeholder="$t('pleaseSelect') + $t('standardSelect.standardNumber')"
+                              type="radio"
+                              @nameChange="handleStandardNumberChange"
+                              :select-only="false"
+                              :can-selected-source="[StandardSource.DOMESTIC.value, StandardSource.ENTERPRISE.value]"
+                              class="readonly-input"
+                              v-decorator="['serialNumber', validatorRules.serialNumber]" />
         </a-form-item>
         <!--标准名称-->
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardSelect.standardName')">
@@ -74,13 +74,14 @@
 
 <script>
 import { importSplitResult } from '@api/documentToolApi'
+import StandardSelection from '../../../../components/selection/StandardSelection.vue'
 import { getFileInfo } from '@api/api'
 import { downloadFile } from '@api/manage'
 import { StandardSource } from '../../../../enums/commonEnums'
 
 export default {
   name: 'ImportSplitResultModal',
-  components: { },
+  components: { StandardSelection },
   data () {
     return {
       StandardSource,
diff --git a/jero-web/src/views/documentTool/documentSplit/modules/splitIsInStorage.vue b/jero-web/src/views/documentTool/documentSplit/modules/splitIsInStorage.vue
index 290cdf2..3ee1f02 100644
--- a/jero-web/src/views/documentTool/documentSplit/modules/splitIsInStorage.vue
+++ b/jero-web/src/views/documentTool/documentSplit/modules/splitIsInStorage.vue
@@ -15,10 +15,17 @@
       <a-form :form="form">
         <!--标准号-->
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardSelect.standardNumber')">
-          <a-input :placeholder="$t('pleaseEnter') + $t('standardSelect.standardNumber')"
-                   @change="event => event.target.value = event.target.value.trim()"
-                   :maxLength="100"
-                   v-decorator="['serialNumber', validatorRules.serialNumber]" />
+<!--          <a-input :placeholder="$t('pleaseEnter') + $t('standardSelect.standardNumber')"-->
+<!--                   @change="event => event.target.value = event.target.value.trim()"-->
+<!--                   :maxLength="100"-->
+<!--                   v-decorator="['serialNumber', validatorRules.serialNumber]" />-->
+          <standard-selection :placeholder="$t('pleaseSelect') + $t('standardSelect.standardNumber')"
+                              type="radio"
+                              @nameChange="handleStandardNumberChange"
+                              :select-only="false"
+                              :can-selected-source="[StandardSource.DOMESTIC.value, StandardSource.ENTERPRISE.value]"
+                              class="readonly-input"
+                              v-decorator="['serialNumber', validatorRules.serialNumber]" />
         </a-form-item>
         <!--标准名称-->
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('standardSelect.standardName')">
@@ -68,11 +75,13 @@
 <script>
 import { importSplitResult , addDocSplit} from '@api/documentToolApi'
 import { getFileInfo } from '@api/api'
+import StandardSelection from '../../../../components/selection/StandardSelection.vue'
 import { downloadFile } from '@api/manage'
 import { StandardSource } from '../../../../enums/commonEnums'
 
 export default {
   name: 'splitIsInStorage',
+  components: { StandardSelection },
   data () {
     return {
       StandardSource,
@@ -114,6 +123,9 @@ export default {
     }
   },
   methods: {
+    handleStandardNumberChange (name) {
+      this.form.setFieldsValue({ title: name })
+    },
     open () {
       this.visible = true
     },