bug修改

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

@@ -222,12 +222,12 @@
       //删除
       deleteDetail(val){
         this.$confirm({
-          content: '确认删除？',
+          content: this.$t('confirmDeletion'),
           onOk() {
             deleteAction(``, { id: val.id }).then((res) => {
               if (res.success) {
                 this.$message.success(res.message)
-                if(this.tableData&&this.tableData.length==1){
+                if(this.tableData&&this.tableData.length==1&&this.queryParams.pageNo!=1){
                   this.queryParams.pageNo=this.queryParams.pageNo-1
                 }
                 this.loadData()
@@ -270,7 +270,19 @@
       },
       //回传至文档库
       backDocument(val){
-
+        this.$confirm({
+          content: this.$t('backDocument'),
+          onOk() {
+            deleteAction(``, { id: val.id }).then((res) => {
+              if (res.success) {
+                this.$message.success(res.message)
+                this.loadData()
+              } else {
+                this.$message.warning(res.message)
+              }
+            })
+          }
+        })
       },
       //查看
       detail(val){

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

@@ -89,7 +89,7 @@
                 </div>
               </div>
               <div class="split-detail-table">
-                <a-table bordered :data-source="tableData" :columns="columns" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :pagination="false" :loading="loading" class="tag-con-table">
+                <a-table bordered :data-source="tableData" :columns="columns" rowKey="id" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :pagination="false" :loading="loading" class="tag-con-table">
                   <template slot="action" slot-scope="text, record">
                     <a class="action-edit" href="javascript:;" @click="onEdit(record)">{{$t('edit')}}</a>
                     <a class="action-delete" href="javascript:;" @click="onCancel(record)">{{$t('delete')}}</a>
@@ -110,18 +110,22 @@
               </div>
             </div>
           </div>
-          <splitAddForm v-if="addVisible" :addVisible="addVisible" @closeVisible="closeVisible"></splitAddForm>
+          <splitAddForm v-if="addVisible" :addVisible="addVisible"  @closeVisible="closeVisible"></splitAddForm>
+          <upload ref="uploadSplit" @uploadSuccess="uploadSuccess"></upload>
         </div>
       </a-card>
     </div>
 </template>
 
 <script>
+  import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
+  import upload from '@/components/uploadFile/file.vue'
   import splitAddForm from './splitAddForm'
   export default {
     name: 'splitDetail',
     components:{
-      splitAddForm
+      splitAddForm,
+      upload
     },
     data() {
       return {
@@ -170,7 +174,7 @@
             ],
           }
         ],
-        selecIds:'',
+        selecIds:[],
         loading:false,
         columns: [
           {
@@ -213,7 +217,9 @@
             width: 120
           }
         ],
-        addVisible:false
+        addVisible:false,
+        attId:'',
+
       }
     },
     mounted() {
@@ -293,22 +299,22 @@
         }
         this.loadData()
       },
-      //删除
+      //复制按钮
       handleCopyManage(record){
         let params={
           id:record.id
         }
         this.$confirm({
-          title: '确认删除?',
+          title: this.$t('ConfirmReplication'),
           content: '',
           onOk:
             async () => {
               deleteAction(``,params).then(res=> {
                 if(res.success){
-                  this.$message.success(res.message)
+                  this.$message.success(this.$t('OperationSuccessful'))
                   this.loadData()
                 }else{
-                  this.$message.warning(res.message)
+                  this.$message.warning(this.$t('operationFailed'))
                 }
               })
             },
@@ -324,7 +330,17 @@
       },
       //导入
       handleImportManage(){
-
+        this.$refs.uploadSplit.visible=true
+      },
+      //上传成功
+      uploadSuccess(data){
+        let attIdList = []
+        if(data && data.length > 0){
+          data.forEach(item => {
+            attIdList.push(item.id || data.name)
+          })
+          this.attId = attIdList.join(',')
+        }
       },
       //导出
       handleExportManage(){
@@ -332,7 +348,7 @@
       },
       //模板下载
       handleDownManage(){
-
+        // downloadFile('', fileName, { fileName: val.docRealName })
       },
       //合并条款
       handleMergeManage(){
@@ -344,11 +360,32 @@
       },
       //批量删除
       handleBatCancel(){
-
+        let params={
+          id:this.selecIds.join(',')
+        }
+        this.$confirm({
+          title: this.$t('ConfirmBatchDeletion'),
+          content: '',
+          onOk:
+            async () => {
+              deleteAction(``,params).then(res=> {
+                if(res.success){
+                  this.$message.success(this.$t('OperationSuccessful'))
+                  if(this.selecIds.length==this.tableData.length&&this.queryParams.pageNo!=1){
+                    this.queryParams.pageNo=this.queryParams.pageNo-1
+                  }
+                  this.loadData()
+                }else{
+                  this.$message.warning(this.$t('operationFailed'))
+                }
+              })
+            },
+          onCancel() {},
+        });
       },
       //编辑
       onEdit(val){
-
+        this.addVisible=true
       },
       //删除
       onCancel(val){
@@ -357,13 +394,7 @@
       //选择框
       onSelectChange(selectedRowKeys,rows) {
         this.selectedRowKeys = selectedRowKeys;
-        let ids=[]
+        this.selecIds=selectedRowKeys
-        if(rows && rows.length>0){
-          rows.forEach(item=>{
-            ids.push(item.id)
-          })
-        }
-        this.selecIds=ids.join(',')
       },
       //点击页数
       onChangePage(page,pageSize){

jero-web/src/views/documentManage/tags/dialog/OnlCgformTagForm.vue

@@ -36,8 +36,6 @@
           <a-col :span="24">
             <a-form-model-item :label="$t('AttributeType')" prop="fieldShowType" >
               <j-dict-select-tag type="list" v-model="form.fieldShowType" dictCode="field_show_type" :placeholder="$t('PleaseSelectAttributeType')" />
-<!--              <j-dict-select-tag type="list" v-if="type=='input'" v-model="form.fieldShowType" dictCode="sys_dict_item,item_text,item_value,dict_id='1493098515761917954' and (item_text = '输入框（字符串）' or item_text = '输入框（数字）' or item_text = '单日期选择' or item_text = '多日期选择' or item_text = '文件' or item_text = '文本框' or item_text='标准选择' or item_text = '输入框（链接）'  or item_text = '人员选择') " placeholder="请选择属性类型" />-->
-<!--              <j-dict-select-tag type="list" v-if="type=='select'" v-model="form.fieldShowType" dictCode="sys_dict_item,item_text,item_value,dict_id='1493098515761917954' and (item_text = '单选下拉框' or item_text = '多选下拉框' or item_text = '树形结构')" placeholder="请选择属性类型" />-->
             </a-form-model-item>
           </a-col>
           <a-col :span="24" v-if="isTagContent">
@@ -65,8 +63,6 @@
               <j-dict-select-tag type="list" v-model="form.fieldMustInput" dictCode="yn" :placeholder="$t('selectWhetherRequired')" />
             </a-form-model-item>
           </a-col>
-
-
           <p class="tag-info">{{$t('DocumentLibraryModuleDisplay')}}</p>
           <a-divider dashed />
           <a-col :span="24">
@@ -85,7 +81,7 @@
 <!--              <j-dict-select-tag type="list" v-model="form.showArea" dictCode="" placeholder="请选择展示区域" />-->
             </a-form-model-item>
           </a-col>
-          <a-col :span="24">
+          <a-col :span="24" v-if="isSearch">
             <a-form-model-item :label="$t('Search')" prop="isQuery">
               <j-dict-select-tag type="list" v-model="form.isQuery" dictCode="yn" :placeholder="$t('SelectWhetherToSearch')" />
             </a-form-model-item>
@@ -230,6 +226,8 @@
         contentOption1:[],
         contentOption2:[],
         isTagContent:false,
+        isSearch:true,
+
       }
     },
     watch:{
@@ -241,8 +239,11 @@
         }else if(val==3||val==4){
           this.contentOption=[...this.contentOption1]
           this.isTagContent=true
+        }else if(val==7) {
+          this.isSearch=false
         }else{
           this.isTagContent=false
+          this.isSearch=true
         }
       },
       contentOption(){

jero-web/src/views/documentManage/tags/dialog/areaManage.vue

@@ -196,7 +196,7 @@
         })
       },
       onSelectChange(selectedRowKeys) {
-        console.log('selectedRowKeys changed: ', selectedRowKeys);
+        // console.log('selectedRowKeys changed: ', selectedRowKeys);
         this.selectedRowKeys = selectedRowKeys;
       },
       handleTableChange(){
@@ -267,7 +267,9 @@
               deleteAction(`tag/onlCgformArea/delete`, { id: val }).then((res) => {
                 if (res.success) {
                   this.$message.success(this.$t('OperationSuccessful'));
-                  this.queryParams.pageNo=1
+                  if(this.areaTable.length==1&&this.queryParams.pageNo!=1){
+                    this.queryParams.pageNo=this.queryParams.pageNo-1
+                  }
                   this.loadData()
                 }else{
                   this.$message.warning(this.$t('operationFailed'));

jero-web/src/views/documentManage/tags/dialog/dicList.vue

@@ -23,7 +23,7 @@
           </div>
         </div>
         <div class="dic-list-table">
-          <list-table v-if="dictVal=='list'&&dataFlag" :tableData="tableData" @editDict="editDict" @deleteDict="deleteDict" :total="total" @selected="selectedKeys" @ok="ok"></list-table>
+          <list-table v-if="dictVal=='list'&&dataFlag" :tableData="tableData" @editDict="editDict" @deleteDict="deleteDict" :total="total" @selected="selectedKeys"  @ok="ok"></list-table>
           <tree-table v-if="dictVal=='tree'&&dataFlag" :tabletreeData="tabletreeData" :record="record" @editDict="editTreeDict" @selectedKeys="selectedKeys" @ok="ok" :total="total"></tree-table>
         </div>
         <a-modal class="dict-module" v-model="newVisible" :title="title" :ok-text="$t('preservation')" :cancel-text="$t('cancel')" @ok="hideModal" @cancel="cancelModel" v-if="newVisible">
@@ -257,7 +257,6 @@
       },
       //保存
       hideModal(){
-
           this.$refs.ruleForm.validate(valid => {
             if (valid) {
             if(this.dictVal=='list') {
@@ -289,7 +288,6 @@
                 })
               }
             } else if (this.dictVal == 'tree') {
-              console.log('tree1111')
               let params = {
                 ...this.form,
                 sysDictId: this.record.id
@@ -393,11 +391,12 @@
                 if(this.dictVal=='list'){
                   deleteAction(`sys/dictItem/logicDeleteBatch`, params).then(res => {
                     if(res.success){
-                      if(this.ids.length==this.tableData.length&&this.queryParams.pageNo!=1){
+                      this.$message.success(this.$t('OperationSuccessful'))
+                      if(this.selectedIds.length==this.tableData.length&&this.queryParams.pageNo!=1){
                         this.queryParams.pageNo=this.queryParams.pageNo-1
                       }
                       this.loadData()
-                      this.$message.success(this.$t('OperationSuccessful'))
+
                     }else{
                       this.$message.warning(this.$t('operationFailed'))
                     }

jero-web/src/views/documentManage/tags/dialog/listTable.vue

@@ -27,7 +27,7 @@
     name: 'listTable',
     props:{
       tableData:Array,
-      total:Number
+      total:Number,
     },
     data(){
       return{
@@ -96,7 +96,6 @@
         this.$emit('deleteDict',val.id,true)
       },
       onSelectChange(selectedRowKeys) {
-        console.log('selectedRowKeys changed: ', selectedRowKeys);
         this.selectedRowKeys = selectedRowKeys;
         this.$emit('selected',this.selectedRowKeys)
       },

jero-web/src/views/documentManage/tags/tabs/tagItem.vue

@@ -287,13 +287,13 @@
                 if (res.success) {
                   if (this.key == 1) {
                     this.$message.success(this.$t('OperationSuccessful'))
-                    if(this.tableData&&this.tableData.length==1){
+                    if(this.tableData&&this.tableData.length==1&&this.queryParam.pageNo!=1){
                       this.queryParam.pageNo=this.queryParam.pageNo-1
                     }
                     this.loadData(1)
                   } else if (this.key == 2) {
                     this.$message.success(this.$t('OperationSuccessful'))
-                    if(this.tableData&&this.tableData.length==1){
+                    if(this.tableData&&this.tableData.length==1&&this.queryParam.pageNo!=1){
                       this.queryParam.pageNo=this.queryParam.pageNo-1
                     }
                     this.loadData(0)