修改禅道已知bug

jero-web/src/components/SplitTable/DocTable.vue

@@ -106,7 +106,7 @@
       }
     },
     mounted() {
-      eventBUs.$on('searchQuery', search => {
+      eventBUs.$on('searchQueryOne', search => {
         Object.keys(search).forEach(res => {
           if (search[res] instanceof Array) {
             search[res] = search[res].join(',')
@@ -116,7 +116,7 @@
         this.getData()
         this.getTableList()
       })
-      eventBUs.$on('searchReset', target => {
+      eventBUs.$on('searchResetOne', target => {
         this.searchParmes = {}
         this.selectedRowKeys = []
         this.getData()
@@ -126,8 +126,8 @@
       this.getTableList()
     },
     beforeDestroy(){
-      eventBUs.$off('searchQuery')
+      eventBUs.$off('searchQueryOne')
-      eventBUs.$off('searchReset')
+      eventBUs.$off('searchResetOne')
     },
     methods: {
 

jero-web/src/components/searchalonetext/index.vue

@@ -179,11 +179,11 @@ export default {
   },
   methods: {
     searchQuery() {
-      eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(this.queryParam)))
+      eventBUs.$emit('searchQueryOne', JSON.parse(JSON.stringify(this.queryParam)))
     },
     searchReset() {
       this.queryParam = {}
-      eventBUs.$emit('searchQuery', JSON.parse(JSON.stringify(this.queryParam)))
+      eventBUs.$emit('searchQueryOne', JSON.parse(JSON.stringify(this.queryParam)))
     },
     getSeach() {
       let params = {

jero-web/src/views/businessSupport/problemKnowledgeBase/components/countryCardRelease.vue

@@ -96,10 +96,10 @@
                   {{!record.releaseStatus || record.releaseStatus == 'Draft' ? $t('release') :$t('withdraw')}}
                  </a>
                 <a class="text-operation"
-                   v-if="record.createBy == userInfoQuery.username && record.releaseStatus == 'Draft'"
+                   v-if="record.releaseStatus == 'Draft'"
                    @click="edit(record)">{{$t('edit')}}</a>
                 <a class="text-operation"
-                   v-if="record.createBy == userInfoQuery.username && record.releaseStatus == 'Draft'"
+                   v-if="record.releaseStatus == 'Draft'"
                    @click="deleteData(record)">{{$t('delete')}}</a>
                 </span>
             </a-table>
@@ -279,8 +279,7 @@
               let idList = []
               let selectedRowKeysRecord = JSON.parse(JSON.stringify(_this.selectedRowKeysRecord))
               for (let i = 0; i < selectedRowKeysRecord.length; i++) {
-                if (selectedRowKeysRecord[i].createBy == _this.userInfo().username &&
+                if (selectedRowKeysRecord[i].releaseStatus == 'Draft') {
-                  selectedRowKeysRecord[i].releaseStatus == 'Draft') {
                   idList.push(selectedRowKeysRecord[i].id)
                 }
               }

jero-web/src/views/documentManage/splitting/index.vue

@@ -67,39 +67,39 @@
         columns: [
           {
             title: this.$t('standard'),
-            align: "center",
+            align: 'center',
-            dataIndex: 'serialNumber',
+            dataIndex: 'serialNumber'
           },
           {
             title: this.$t('title'),
-            align: "center",
+            align: 'center',
-            dataIndex: 'title',
+            dataIndex: 'title'
           },
           {
             title: this.$t('TextStatus'),
-            align: "center",
+            align: 'center',
-            dataIndex: 'fileType_dictText',
+            dataIndex: 'fileType_dictText'
           },
           {
             title: this.$t('fileName'),
-            align: "center",
+            align: 'center',
             dataIndex: 'fileName'
           },
           {
             title: this.$t('splitTime'),
-            align: "center",
+            align: 'center',
             dataIndex: 'createTime'
           },
           {
             title: this.$t('splitResult'),
-            align: "center",
+            align: 'center',
             dataIndex: 'splitResult_dictText'
           },
           {
             title: this.$t('operation'),
             dataIndex: 'action',
             scopedSlots: { customRender: 'action' },
-            align: "center",
+            align: 'center',
             width: 170
           }
         ],
@@ -120,7 +120,7 @@
         url: {
           tableHeader: 'split/sarFileSplitInfo/getHeader', //表格头部字段
           seachList: 'split/sarFileSplitInfo/queryCondition',   //搜索字段
-          tableList: 'split/sarFileSplitInfo/page',         //表格数据
+          tableList: 'split/sarFileSplitInfo/page'         //表格数据
           // getAddForm: 'ocr/ocrRecord/getForm',   // 表单的字段
           // addInfo: 'ocr/OcrRestful/addOcrRecord',      //新增
         },
@@ -129,12 +129,10 @@
           pageSize: 10
         },
         token: Vue.ls.get(ACCESS_TOKEN),
-        serialnumber: '',
+        serialnumber: ''
       }
     },
-    props:{
+    props: {},
-
-    },
     created() {
 
     },
@@ -220,8 +218,7 @@
               }
 
           })
-        }
+        } else {
-        else{
           this.$message.warning(this.$t('selectLeastOne'))
         }
       },
@@ -248,7 +245,7 @@
         })
       },
       sVisible(val) {
-        this.splitVisible=val
+        this.splitVisible = false
       },
       iVisible(val) {
         this.importsVisible = val
@@ -283,8 +280,7 @@
         this.$confirm({
           content: this.$t('backDocument'),
           onOk:
-              async () =>
+            async () => {
-              {
               let params = {
                 id: val.id,
                 fileName: val.fileName,
@@ -321,7 +317,7 @@
             createBy: val.createBy
           }
         })
-      },
+      }
 
     }
   }
@@ -337,6 +333,7 @@
       margin-bottom: 20px;
 
     }
+
     .splitting-table {
       .action-margin {
         margin-right: 10px;
@@ -344,6 +341,7 @@
 
     }
   }
+
   .splitting-table {
     .page {
       margin-top: 20px;
@@ -360,6 +358,7 @@
         display: flex;
       }
     }
+
     .ant-col-sm-8 {
       min-width: 300px;
     }

jero-web/src/views/documentManage/splitting/modules/ImportResult.vue

@@ -18,7 +18,8 @@
         <div class="operator-text">
           <!--          <a-icon type="copy" />-->
           <!--          拆分文件-->
-          <split-upload ref="uploadFile" :accept="accept" :disabled="disabled" :module="'split'" @uploadSuccess="uploadSuccess"></split-upload>
+          <split-upload ref="uploadFile" :accept="accept" :disabled="disabled" :module="'split'"
+                        @uploadSuccess="uploadSuccess"></split-upload>
         </div>
         <div class="operator-text" @click="downLoad" v-has="'split:sarFileSplitItems:template'">
           <a-icon type="download"/>
@@ -38,8 +39,12 @@
 
       <div class="imports-footer" style='display: flex;justify-content: flex-end'>
         <div class="imports-footer-wrap">
-          <a-button class="imports-btn" style='background-color: #f5222d;border: none;margin-right: 15px' type="primary" @click="cancleImports">{{$t('cancel')}}</a-button>
+          <a-button class="imports-btn" style='background-color: #f5222d;border: none;margin-right: 15px' type="primary"
-          <a-button class="imports-btn imports-sub" type="primary" @click="handleSubmit" v-has="'split:sarFileSplitItems:importSplitResult'">{{$t('submit')}}</a-button>
+                    @click="cancleImports">{{$t('cancel')}}
+          </a-button>
+          <a-button class="imports-btn imports-sub" type="primary" @click="handleSubmit"
+                    v-has="'split:sarFileSplitItems:importSplitResult'">{{$t('submit')}}
+          </a-button>
         </div>
       </div>
       <a-modal
@@ -52,6 +57,7 @@
         <div class="err-value" v-html="errValue"></div>
         <!--        <span class="err-value">{{errValue}}</span>-->
       </a-modal>
+      <JLoading :loading="loading">{{$t('Submitting')}}</JLoading>
       <!--      <split-upload  ref="uploadFile" :disabled="disabled" :title="upload1" :accept="accept" @uploadSuccess="uploadSuccess"></split-upload>-->
     </a-drawer>
   </div>
@@ -66,6 +72,7 @@
   import { ACCESS_TOKEN } from '@/store/mutation-types'
   import eventBUs from '../../../../common/event'
   import Vue from 'vue'
+
   export default {
     name: 'import',
     components: {
@@ -77,6 +84,7 @@
       return {
         labelCol: { span: 4 },
         wrapperCol: { span: 18 },
+        loading: false,
         visible: false,
         contentVisible: true,
         disabled: false,
@@ -91,46 +99,46 @@
           {
             title: this.$t('standard'),
             key: 'standNumber',
-            align:"center",
+            align: 'center',
             dataIndex: 'standNumber',
-            ellipsis: true,
+            ellipsis: true
           },
           {
             title: this.$t('title'),
             key: 'standName',
-            align:"center",
+            align: 'center',
             dataIndex: 'standName',
-            ellipsis: true,
+            ellipsis: true
           },
           {
             title: this.$t('fileName'),
             key: 'fileName',
-            align:"center",
+            align: 'center',
             dataIndex: 'fileName',
-            ellipsis: true,
+            ellipsis: true
           },
           {
             title: this.$t('TextStatus'),
             key: 'fileType_dictText',
-            align:"center",
+            align: 'center',
             dataIndex: 'fileType_dictText',
-            ellipsis: true,
+            ellipsis: true
-          },
+          }
 
         ],
         file: '',
         form: {},
         rules: {
           file: [
-            { required: true, message: this.$t('pleaseUploadFile'), trigger: 'change' },
+            { required: true, message: this.$t('pleaseUploadFile'), trigger: 'change' }
-          ],
+          ]
         },
         spinning: false,   //loading标识
         type: 'pdfdoc',
         url: {
           tableHeader: 'document/bussDocumentLibraryEO/getHeaderOrConditionForSplitResult',      //表格头部字段
           seachList: 'document/bussDocumentLibraryEO/getHeaderOrConditionForSplitResult',   //搜索字段
-          tableList: 'split/sarFileSplitInfo/splitResultPageInfo',         //表格数据
+          tableList: 'split/sarFileSplitInfo/splitResultPageInfo'         //表格数据
         },
         OperationList: [],
         upload1: this.$t('upload1'),
@@ -142,7 +150,7 @@
         cut: '',
         preErrVisible: false,
         errValue: '',
-        titleItem: '', // 错误标题
+        titleItem: '' // 错误标题
       }
     },
     props: {
@@ -151,7 +159,7 @@
     watch: {
       'form.file'(val) {
         // console.log('val111',val)
-      },
+      }
 
     },
     mounted() {
@@ -171,9 +179,7 @@
       //获取列表数据
       loadData() {
         this.spinning = true
-        let params={
+        let params = {}
-
-        }
         getAction(``, params).then(res => {
 
         }).finally(() => {
@@ -184,7 +190,7 @@
         // console.log('visible', val);
       },
       onClose() {
-        this.visible = false;
+        this.visible = false
         this.$emit('visible', false)
       },
       onSelectChange(keys, rows) {
@@ -255,15 +261,15 @@
             fileName: this.rows[0].file_name,
             serialNumber: this.rows[0].serial_number,
             title: this.rows[0].title,
-            titleEn:this.rows[0].title_en,
+            titleEn: this.rows[0].title_en
           }
           params.fileType = this.rows[0].text_info_id
           params.cut = this.cut
           let formData = new FormData()
           Object.keys(params).forEach((key) => {
             // console.log('key',key,params[key])
-            formData.append(key, params[key]);
+            formData.append(key, params[key])
-          });
+          })
           // console.log('formData',params,formData.getAll)
           if (this.form.file) {
             // this.$refs.ruleForm.validate(valid => {
@@ -271,6 +277,7 @@
 
             if (!this.flag) {
               this.flag = true
+              this.loading = true
               axios({
                 url: '/jero-boot/split/sarFileSplitItems/importSplitResult',
                 method: 'post',
@@ -284,21 +291,24 @@
                 if (res.data.success) {
                   this.$message.success(this.$t('OperationSuccessful'))
                   eventBUs.$emit('searchGetData')
-                      this.visible = false;
+                  this.visible = false
+                  this.loading = false
                   this.$emit('visible', false)
                 } else {
+                  this.loading = false
                   // this.$message.warning(res.data.message)
                   if (res.data.code == 1) {
-                        this.$message.error(res.data.message);
+                    this.$message.error(res.data.message)
                   } else {
                     this.titleItem = '失败'
                     this.preErrVisible = true
                     this.errValue = res.data.message
                   }
                 }
-                  }).finally(() => [
+              }).finally(() => {
                 this.flag = false
-                  ])
+                this.loading = false
+              })
             }
             //   }
             // })
@@ -333,13 +343,14 @@
       },
       handleErrCancel() {
         this.preErrVisible = false
-      },
+      }
     }
   }
 </script>
 
 <style lang="less" scoped>
   @import '~@assets/less/common.less';
+
   .imports-table-content {
     .imports-header {
       margin-bottom: 20px;
@@ -353,19 +364,23 @@
       text-align: right;
     }
   }
+
   .imports-files {
     position: relative;
     margin: 20px 0;
+
     .file-down {
       position: absolute;
       left: 320px;
       top: 5px;
     }
   }
+
   .imports-footer {
     .imports-footer-wrap {
       margin: 20px 0;
       text-align: center;
+
       .imports-sub {
         margin-right: 20px;
       }
@@ -381,12 +396,14 @@
     }
 
   }
+
   .imports-table-drawer {
     .table-operator {
       display: flex;
       justify-content: end;
       text-align: right;
       margin-bottom: 20px;
+
       span {
         color: #040B29;
       }

jero-web/src/views/documentManage/splitting/modules/SplitText.vue

@@ -5,7 +5,6 @@
       :title="$t('SplitText')"
       placement="right"
       :visible="visible"
-        :after-visible-change="afterVisibleChange"
       @close="onClose"
       width="1100"
     >
@@ -21,7 +20,8 @@
 
           <div class="operator-select-type">
             <span class="operator-file-type"><i class="operator-i">*</i>{{$t('fileType')}}</span>
-              <a-select v-model="fileGroup" style='min-width: 295px' :placeholder="$t('selectFileType')" class="file-type-select">
+            <a-select v-model="fileGroup" style='min-width: 295px' :placeholder="$t('selectFileType')"
+                      class="file-type-select">
               <a-select-option value="GSO" key="GSO" :title="$t('GSO')">
                 {{$t('GSO')}}
               </a-select-option>
@@ -65,10 +65,15 @@
       </div>
       <div class="split-footer" style='display: flex;justify-content: flex-end'>
         <div class="split-footer-wrap">
-            <a-button class="split-btn" type="primary" @click="cancelSplit" style='background-color: #f5222d;border: none;margin-right: 15px'>{{$t('cancel')}}</a-button>
+          <a-button class="split-btn" type="primary" @click="cancelSplit"
-            <a-button class="split-btn split-chai" type="primary" @click="submitSplit" v-has="'split:sarFileSplitInfo:add'">{{$t('submit')}}</a-button>
+                    style='background-color: #f5222d;border: none;margin-right: 15px'>{{$t('cancel')}}
+          </a-button>
+          <a-button class="split-btn split-chai" type="primary" @click="submitSplit"
+                    v-has="'split:sarFileSplitInfo:add'">{{$t('submit')}}
+          </a-button>
         </div>
       </div>
+      <JLoading :loading="loading">{{$t('Submitting')}}</JLoading>
     </a-drawer>
   </div>
 </template>
@@ -87,11 +92,12 @@
     name: 'split',
     components: {
       SearchAlone,
-      TableData,
+      TableData
     },
     data() {
       return {
         visible: false,
+        loading: false,
         fileGroup: '',
         tableSource: [],  //列表数据
         selectedRowKeys: [],
@@ -104,37 +110,37 @@
           {
             title: this.$t('standard'),
             key: 'standNumber',
-            align:"center",
+            align: 'center',
             dataIndex: 'standNumber',
-            ellipsis: true,
+            ellipsis: true
           },
           {
             title: this.$t('title'),
             key: 'standName',
-            align:"center",
+            align: 'center',
             dataIndex: 'standName',
-            ellipsis: true,
+            ellipsis: true
           },
           {
             title: this.$t('fileName'),
             key: 'fileName',
-            align:"center",
+            align: 'center',
             dataIndex: 'fileName',
-            ellipsis: true,
+            ellipsis: true
           },
           {
             title: this.$t('TextStatus'),
             key: 'fileType_dictText',
-            align:"center",
+            align: 'center',
             dataIndex: 'fileType_dictText',
-            ellipsis: true,
+            ellipsis: true
-          },
+          }
         ],
         spinning: false,  //loading标识
         url: {
           tableHeader: 'document/bussDocumentLibraryEO/getHeaderOrConditionForSplitResult',  //表格头部字段
           seachList: 'document/bussDocumentLibraryEO/getHeaderOrConditionForSplitResult',   //搜索字段
-          tableList: 'split/sarFileSplitInfo/splitFilePageInfo',         //表格数据
+          tableList: 'split/sarFileSplitInfo/splitFilePageInfo'         //表格数据
         },
         type: 'pdfdoc',
         OperationList: [],
@@ -147,7 +153,7 @@
       splitVisible: {
         type: Boolean,
         default: false
-      },
+      }
 
     },
     mounted() {
@@ -159,9 +165,7 @@
       //获取列表数据
       loadData() {
         this.spinning = true
-        let params={
+        let params = {}
-
-        }
         getAction(``, params).then(res => {
 
         }).finally(() => {
@@ -169,10 +173,10 @@
         })
       },
       afterVisibleChange(val) {
-        console.log('visible', val);
+        console.log('visible', val)
       },
       onClose() {
-        this.visible = false;
+        this.visible = false
         this.$emit('visible', false)
       },
       onSelectChange(keys, rows) {
@@ -205,6 +209,7 @@
         this.loadData()
       },
       cancelSplit() {
+        this.visible = false
         this.$emit('visible', false)
       },
       //拆分
@@ -235,16 +240,20 @@
 
                 if (!this.submitFlag) {
                   this.submitFlag = true
+                  this.loading = true
                   postAction(`split/sarFileSplitInfo/add`, params).then(res => {
                     if (res.success) {
                       this.$message.success(this.$t('OperationSuccessful'))
                       eventBUs.$emit('searchGetData')
-                      this.visible = false;
+                      this.visible = false
+                      this.loading = false
                       this.$emit('visible', false)
                     } else {
+                      this.loading = false
                       this.$message.warning(res.message)
                     }
                   }).finally(() => {
+                    this.loading = false
                     this.submitFlag = false
 
                   })
@@ -268,18 +277,21 @@
 
                 if (!this.submitFlag) {
                   this.submitFlag = true
+                  this.loading = true
                   postAction(`split/sarFileSplitInfo/add`, params).then(res => {
                     if (res.success) {
                       this.$message.success(this.$t('OperationSuccessful'))
-                      eventBUs.$emit('searchReset')
+                      eventBUs.$emit('searchGetData')
-                      this.visible = false;
+                      this.visible = false
+                      this.loading = false
                       this.$emit('visible', false)
                     } else {
+                      this.loading = false
                       this.$message.warning(res.message)
                     }
                   }).finally(() => {
                     this.submitFlag = false
-
+                    this.loading = false
                   })
                   this.$emit('exportVisible', true)
                 }
@@ -291,7 +303,6 @@
         }
       }
     }
-
   }
 </script>
 
@@ -299,6 +310,7 @@
   .split-table-content {
     .split-header {
       margin-bottom: 20px;
+
       .split-item {
         display: flex;
       }
@@ -312,18 +324,22 @@
       text-align: right;
     }
   }
+
   .split-footer {
     .split-footer-wrap {
       margin: 20px 0;
       text-align: center;
+
       .split-chai {
         margin-right: 20px;
       }
     }
   }
+
   .operator-select {
     margin-bottom: 20px;
     /*margin-left: 60px;*/
+
     .operator-file-type {
       /*width: 100px;*/
       min-width: 110px;
@@ -331,6 +347,7 @@
       line-height: 32px;
       display: inline-block;
       margin-right: 16px;
+
       .operator-i {
         display: inline-block;
         width: 10px;
@@ -340,9 +357,11 @@
         color: #f5222d;
       }
     }
+
     .operator-select-type {
       display: flex;
       justify-content: start;
+
       .file-type-select {
         min-width: 120px;
 
@@ -359,9 +378,11 @@
       }
     }
   }
+
   .operator-select-type {
     .ant-select-selection {
       height: 38px;
+
       .ant-select-selection__rendered {
         height: 38px;
         line-height: 38px;