From 1ca2b4206b62c12a3498980f6e3a42795f8f9775 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 14:49: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

---
 jero-web/src/common/lang/en-us.js             |  1 +
 jero-web/src/common/lang/zh-cn.js             |  1 +
 .../documentSplit/DocumentSplit.vue           | 60 +++++++++-------
 .../documentSplit/DocumentSplitDetail.vue     | 70 +++++++++----------
 .../documentSplit/modules/SplitText.vue       | 28 ++++----
 .../modules/splitIsInStorage.vue              | 46 +++++++++---
 6 files changed, 121 insertions(+), 85 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index f94aee9..f796ac8 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -426,6 +426,7 @@ module.exports = {
       clauseLabel: 'Clause label',
       splitResultFile: 'Split result file',
       splitImportResultTip: 'Upload the split result file in accordance with the relevant format requirements, please ',
+      splitImportResultWord: 'Upload the split file in accordance with the relevant format requirements, please ',
       clickToView: 'click to view',
       gotIt: 'Got It',
       formatRequirement: 'Format requirement',
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index cf93f72..9af0cec 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -436,6 +436,7 @@ module.exports = {
       clauseLabel: '条文标签',
       splitResultFile: '拆分结果文件',
       splitImportResultTip: '上传拆分结果文件需遵循相关格式要求，具体要求请',
+      splitImportResultWord: '上传拆分文档需遵循相关格式要求，具体要求请',
       clickToView: '点击查看',
       gotIt: '知道了',
       formatRequirement: '格式要求',
diff --git a/jero-web/src/views/documentTool/documentSplit/DocumentSplit.vue b/jero-web/src/views/documentTool/documentSplit/DocumentSplit.vue
index 8e6718c..dcf6938 100644
--- a/jero-web/src/views/documentTool/documentSplit/DocumentSplit.vue
+++ b/jero-web/src/views/documentTool/documentSplit/DocumentSplit.vue
@@ -11,23 +11,23 @@
             </a-form-item>
           </a-col>
           <!--拆分状态-->
-          <a-col :md="6" :sm="12">
-            <a-form-item :label="$t('docTool.split.splitState')">
-              <j-dict-select-tag
-                class="box-input"
-                v-model="queryParam.splitStatus"
-                :placeholder="$t('pleaseSelect') + $t('docTool.split.splitState')"
-                :type="'select'"
-                :triggerChange="false"
-                dictCode="split_status" />
-            </a-form-item>
-          </a-col>
+<!--          <a-col :md="6" :sm="12">-->
+<!--            <a-form-item :label="$t('docTool.split.splitState')">-->
+<!--              <j-dict-select-tag-->
+<!--                class="box-input"-->
+<!--                v-model="queryParam.splitStatus"-->
+<!--                :placeholder="$t('pleaseSelect') + $t('docTool.split.splitState')"-->
+<!--                :type="'select'"-->
+<!--                :triggerChange="false"-->
+<!--                dictCode="split_status" />-->
+<!--            </a-form-item>-->
+<!--          </a-col>-->
           <!--编辑人-->
-          <a-col :md="6" :sm="12">
-            <a-form-item :label="$t('docTool.split.editor')">
-              <a-input :placeholder="$t('pleaseEnter') + $t('docTool.split.editor')" v-model="queryParam.author"></a-input>
-            </a-form-item>
-          </a-col>
+<!--          <a-col :md="6" :sm="12">-->
+<!--            <a-form-item :label="$t('docTool.split.editor')">-->
+<!--              <a-input :placeholder="$t('pleaseEnter') + $t('docTool.split.editor')" v-model="queryParam.author"></a-input>-->
+<!--            </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" style="margin-left: 8px">
               {{ $t('query') }}
@@ -39,9 +39,13 @@
     </div>
     <div class="table-operator">
       <!--拆分已入库文本-->
-      <a-button icon="plus" type="primary" @click="handleModule">
+      <a-button icon="plus" type="primary" @click="splitTextClick">
         {{ $t('docTool.split.splitText') }}
       </a-button>
+      <!--拆分上传文本-->
+      <a-button icon="plus" type="primary" @click="handleModule">
+        拆分上传文本
+      </a-button>
       <!--导入拆分结果-->
       <a-button icon="download" type="primary" ghost @click="handleExport">
         {{ $t('docTool.split.importResults') }}
@@ -81,9 +85,10 @@
       </j-table>
     </div>
 
-    <!--拆分已入库文本弹框-->
+    <!--拆分上传文本-->
     <split-is-in-storage ref="splitIsInStorageRef" @ok="modalFormOk"/>
-<!--    <split-text ref="splitText" @ok="modalFormOk" />-->
+    <!--拆分已入库文本弹框-->
+    <split-text ref="splitText" @ok="modalFormOk" />
     <!--导入拆分结果-->
     <import-split-result-modal ref="importResultModal" @ok="modalFormOk" />
     <!--更改权限-->
@@ -94,7 +99,7 @@
 <script>
 import '../../../assets/less/common.less'
 import JTable from '../../../components/jero/JTable.vue'
-// import SplitText from './modules/SplitText.vue'
+import SplitText from './modules/SplitText.vue'
 import { JeroListMixin } from '@/mixins/JeroListMixin'
 import { releaseSplitStandard, changePermission, withdraw } from '@api/documentToolApi'
 import ImportSplitResultModal from './modules/ImportSplitResultModal.vue'
@@ -104,7 +109,7 @@ import { SplitStatus, StandardSource } from '@/enums/commonEnums'
 
 export default {
   name: 'DocumentSplit',
-  components: { JTable, ImportSplitResultModal, UserSelectModal, splitIsInStorage},
+  components: { JTable, ImportSplitResultModal, UserSelectModal, splitIsInStorage, SplitText },
   mixins: [JeroListMixin],
   computed: {},
   data () {
@@ -186,11 +191,11 @@ export default {
           width: 150
         },
         // 编辑人
-        {
-          dataIndex: 'author',
-          title: this.$t('docTool.split.editor'),
-          width: 150
-        },
+        // {
+        //   dataIndex: 'author',
+        //   title: this.$t('docTool.split.editor'),
+        //   width: 150
+        // },
         // 拆分时间
         {
           dataIndex: 'createTime',
@@ -224,6 +229,9 @@ export default {
     handleModule () {
       this.$refs.splitIsInStorageRef.open()
     },
+    splitTextClick () {
+      this.$refs.splitText.open()
+    },
     // 导入拆分结果
     handleExport () {
       this.$refs.importResultModal.open()
diff --git a/jero-web/src/views/documentTool/documentSplit/DocumentSplitDetail.vue b/jero-web/src/views/documentTool/documentSplit/DocumentSplitDetail.vue
index f9e172b..b332dad 100644
--- a/jero-web/src/views/documentTool/documentSplit/DocumentSplitDetail.vue
+++ b/jero-web/src/views/documentTool/documentSplit/DocumentSplitDetail.vue
@@ -66,41 +66,41 @@
       <!--表格部分-->
       <div class="page-right-box">
         <div class="table-page-search-wrapper">
-          <a-form layout="inline" @keyup.enter.native="searchQuery(queryParam)">
-            <a-row :gutter="24">
-              <a-col :md="6"
-                     :sm="12"
-                     style="line-height: 48px">
-                   <a-form-item :label="$t('docTool.split.clauseNo')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                        <a-input :placeholder="$t('pleaseEnter') + $t('docTool.split.clauseNo') "
-                            v-model="queryParam.item_num"></a-input>
-                   </a-form-item>
-              </a-col>
-              <a-col :md="6"
-                     :sm="12"
-                     style="line-height: 48px">
-                <a-form-item :label="$t('docTool.split.clauseName')" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input :placeholder="$t('pleaseEnter') + $t('docTool.split.clauseName') "
-                           v-model="queryParam.item_title"></a-input>
-                </a-form-item>
-              </a-col>
-              <a-col :md="6"
-                     :sm="12"
-                     style="line-height: 48px">
-                <a-form-item :label="$t('docTool.split.clauseContent') " :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-input :placeholder="$t('pleaseEnter')+$t('docTool.split.clauseContent')"
-                           v-model="queryParam.item_content"></a-input>
-                </a-form-item>
-              </a-col>
-              <div style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
-                <a-button icon="search" type="primary" @click="searchQuery(queryParam)" style="margin-left: 8px">
-                  {{$t('query')}}
-                </a-button>
-                <a-button icon="reload" type="primary" ghost style="margin-left: 8px"
-                          @click="searchReset">{{ $t('reset') }}</a-button>
-              </div>
-            </a-row>
-          </a-form>
+<!--          <a-form layout="inline" @keyup.enter.native="searchQuery(queryParam)">-->
+<!--            <a-row :gutter="24">-->
+<!--              <a-col :md="6"-->
+<!--                     :sm="12"-->
+<!--                     style="line-height: 48px">-->
+<!--                   <a-form-item :label="$t('docTool.split.clauseNo')" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+<!--                        <a-input :placeholder="$t('pleaseEnter') + $t('docTool.split.clauseNo') "-->
+<!--                            v-model="queryParam.item_num"></a-input>-->
+<!--                   </a-form-item>-->
+<!--              </a-col>-->
+<!--              <a-col :md="6"-->
+<!--                     :sm="12"-->
+<!--                     style="line-height: 48px">-->
+<!--                <a-form-item :label="$t('docTool.split.clauseName')" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+<!--                  <a-input :placeholder="$t('pleaseEnter') + $t('docTool.split.clauseName') "-->
+<!--                           v-model="queryParam.item_title"></a-input>-->
+<!--                </a-form-item>-->
+<!--              </a-col>-->
+<!--              <a-col :md="6"-->
+<!--                     :sm="12"-->
+<!--                     style="line-height: 48px">-->
+<!--                <a-form-item :label="$t('docTool.split.clauseContent') " :labelCol="labelCol" :wrapperCol="wrapperCol">-->
+<!--                  <a-input :placeholder="$t('pleaseEnter')+$t('docTool.split.clauseContent')"-->
+<!--                           v-model="queryParam.item_content"></a-input>-->
+<!--                </a-form-item>-->
+<!--              </a-col>-->
+<!--              <div style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">-->
+<!--                <a-button icon="search" type="primary" @click="searchQuery(queryParam)" style="margin-left: 8px">-->
+<!--                  {{$t('query')}}-->
+<!--                </a-button>-->
+<!--                <a-button icon="reload" type="primary" ghost style="margin-left: 8px"-->
+<!--                          @click="searchReset">{{ $t('reset') }}</a-button>-->
+<!--              </div>-->
+<!--            </a-row>-->
+<!--          </a-form>-->
         </div>
         <!--操作按钮-->
         <div class="table-operator">
diff --git a/jero-web/src/views/documentTool/documentSplit/modules/SplitText.vue b/jero-web/src/views/documentTool/documentSplit/modules/SplitText.vue
index 9e36831..b5c12c6 100644
--- a/jero-web/src/views/documentTool/documentSplit/modules/SplitText.vue
+++ b/jero-web/src/views/documentTool/documentSplit/modules/SplitText.vue
@@ -11,17 +11,17 @@
         <a-form layout="inline" @keyup.enter.native="searchQuery" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-row :gutter="24">
             <!--来源-->
-            <a-col :md="8" :sm="12">
-              <a-form-item :label="$t('standardSelect.source')">
-                <j-dict-select-tag
-                  class="box-input"
-                  v-model="queryParam.origin"
-                  :placeholder="$t('pleaseSelect') + $t('standardSelect.source')"
-                  :type="'select'"
-                  :triggerChange="false"
-                  :dictCode="'split_standard_source'" />
-              </a-form-item>
-            </a-col>
+<!--            <a-col :md="8" :sm="12">-->
+<!--              <a-form-item :label="$t('standardSelect.source')">-->
+<!--                <j-dict-select-tag-->
+<!--                  class="box-input"-->
+<!--                  v-model="queryParam.origin"-->
+<!--                  :placeholder="$t('pleaseSelect') + $t('standardSelect.source')"-->
+<!--                  :type="'select'"-->
+<!--                  :triggerChange="false"-->
+<!--                  :dictCode="'split_standard_source'" />-->
+<!--              </a-form-item>-->
+<!--            </a-col>-->
             <!--标准号-->
             <a-col :md="8" :sm="12">
               <a-form-item :label="$t('standardSelect.standardNumber')">
@@ -127,8 +127,9 @@ export default {
           width: 150
         }
       ],
+      //laws/DocumentTool/documentSplit/querySplitFileInfoByPage
       url: {
-        list: '/laws/DocumentTool/documentSplit/querySplitFileInfoByPage', // 表格数据
+        list: '', // 表格数据
       },
       type: 'pdfdoc',
       operationList: [],
@@ -141,7 +142,7 @@ export default {
     open () {
       this.visible = true
       this.queryParam = {}
-      this.loadData(1)
+      // this.loadData(1)
     },
     // 抽屉关闭
     onClose () {
@@ -162,7 +163,6 @@ export default {
         return
       }
       const file = this.selectionRows[0]
-      console.log(file)
       if (file.fileName) {
         const name = file.fileName.split('.')
         const nameSuffix = name[name.length - 1]
diff --git a/jero-web/src/views/documentTool/documentSplit/modules/splitIsInStorage.vue b/jero-web/src/views/documentTool/documentSplit/modules/splitIsInStorage.vue
index 54fc901..290cdf2 100644
--- a/jero-web/src/views/documentTool/documentSplit/modules/splitIsInStorage.vue
+++ b/jero-web/src/views/documentTool/documentSplit/modules/splitIsInStorage.vue
@@ -1,6 +1,6 @@
 <template>
   <j-modal
-    :title="$t('docTool.split.splitText')"
+    :title="'拆分上传文本'"
     :width="width"
     :visible="visible"
     switchFullscreen
@@ -27,6 +27,9 @@
                    :maxLength="50"
                    v-decorator="['title', validatorRules.title]" />
         </a-form-item>
+        <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="'拆分文档类型'">
+          企标文件
+        </a-form-item>
         <!--文本状态-->
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('docTool.comparison.textStatus')">
           <a-input :placeholder="$t('pleaseEnter') + $t('docTool.comparison.textStatus')"
@@ -53,11 +56,11 @@
         </a-form-item>
       </a-form>
 
-<!--      <div class="tip">-->
-<!--        <a-icon type="exclamation-circle" class="tip-icon" />-->
-<!--        <span>{{ $t('docTool.split.splitImportResultTip') }}</span>-->
-<!--        <span class="tip-click" @click="showTips">{{ $t('docTool.split.clickToView') }}</span>-->
-<!--      </div>-->
+      <div class="tip">
+        <a-icon type="exclamation-circle" class="tip-icon" />
+        <span>{{ $t('docTool.split.splitImportResultWord') }}</span>
+        <span class="tip-click" @click="showTips">{{ $t('docTool.split.clickToView') }}</span>
+      </div>
     </a-spin>
   </j-modal>
 </template>
@@ -150,12 +153,22 @@ export default {
         cancelText: this.$t('docTool.split.gotIt'),
         title: this.$t('docTool.split.formatRequirement'),
         content: (h) => {
-          const contentArr = [this.$t('docTool.split.formatRequirementContentOne'), this.$t('docTool.split.formatRequirementContentTwo'), this.$t('docTool.split.formatRequirementContentThree'), this.$t('docTool.split.formatRequirementContentFour')]
+          const contentArr = ['(标题要求如下，不可省略且必须为正文格式，内容无规定)', '1 范围', '2 规范性引用文件', '3 术语与定义',
+            '4、5、6...', '(注)', '1.Word版本必须是2007以上', '2.文档序号从4开始拆分，且序号必须为连续，例如4.1，4.2，4.3']
           const contentDomArr = []
-          for (const content of contentArr) {
-            console.log(content)
-            contentDomArr.push(h('div', {}, content))
+          for (let i = 0; i < contentArr.length; i++) {
+            if (i === 1 || i === 2 || i === 3 || i === 4) {
+              contentDomArr.push(h('div', { class: 'textClass' }, contentArr[i]))
+            } else if (i === 5) {
+              contentDomArr.push(h('div', { class: 'textClassRed' }, contentArr[i]))
+            } else {
+              contentDomArr.push(h('div', { }, contentArr[i]))
+            }
           }
+          // for (const content of contentArr) {
+          //   console.log(content)
+          //   contentDomArr.push(h('div', {}, content))
+          // }
           return contentDomArr
         }
       })
@@ -204,3 +217,16 @@ export default {
     }
   }
 </style>
+<style>
+  .textClass{
+    color: rgba(0, 0, 0, 0.65);
+    font-weight: 600;
+    font-size: 16px;
+    margin-top: 6px;
+  }
+  .textClassRed{
+    color: red;
+    font-size: 14px;
+    margin-top: 6px;
+  }
+</style>