拆分详情表格增加编辑

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

@@ -315,7 +315,10 @@
       detailClick(val){
         this.$router.push({
           path:'/docManage/splitting/splitDetail',
-          query: { infoId:val.id }
+          query: {
+            infoId:val.id,
+            infoNumber:val.serialNumber
+          }
         })
       },
 

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

@@ -93,7 +93,6 @@
                               </div>
                               <a-form-model-item class="itemModel" :prop="item.db_field_name">
                                 <a-date-picker class="box-input"
-                                               :placeholder="$t('PleaseSelect')+item.db_field_txt"
                                                @change="dateChange(item)"
                                                format="YYYY-MM-DD"
                                                v-model="formInline[item.db_field_name]"
@@ -251,12 +250,13 @@
                   <a-row :gutter="24" class="split-content" id="split-content" v-for="(item, index) in contentList" :key="index">
                     <div class="split-row">
                       <div class="row-left">
-                        <a-textarea v-if="item.type==='TEXT'" v-model="item.itemContent" :placeholder="$t('pleaseEnter')+$t('content')" auto-size />
+                        <a-textarea v-if="item.type==='TEXT'" v-model="item.itemContent" :placeholder="$t('pleaseEnter')+$t('content')" />
                         <img v-if="item.type==='IMG'" :src="item.thumbUrl?item.thumbUrl:item.itemContent" alt="" @click="preImg(item)">
                         <div v-if="item.type==='TABLE'" v-html="item.itemContent" class="item-table"></div>
                       </div>
                       <div class="row-right">
                         <a-button class="row-btn-add" @click="splitAdd(index)">{{$t('Add')}}</a-button>
+                        <a-button class="row-btn-edit" @click="splitEdit(index,item)" v-if="item.type=='TABLE'">{{$t('edit')}}</a-button>
                         <a-button @click="splitDelete(item,index)">{{$t('delete')}}</a-button>
                       </div>
                     </div>
@@ -541,6 +541,7 @@
           ]
         },
         numberFlag:false,
+        itemVal:{}
       }
     },
     props:{
@@ -572,10 +573,10 @@
         type:String,
         default:''
       },
-      itemVal:{
-        type:Object,
-        default:{}
-      }
+      // itemVal:{
+      //   type:Object,
+      //   default:{}
+      // }
     },
     watch:{
       selected(val){
@@ -635,6 +636,14 @@
           this.addIndex=val
         }
       },
+      //编辑按钮
+      splitEdit(index,item){
+        this.tableVisible=true
+        this.$nextTick(() => {
+          this.$refs.ueditor.setContent(item.itemContent)
+        })
+        console.log('ineciem',index,item)
+      },
       //删除按钮
       splitDelete(item,index){
         // console.log('itme',item,this.contentList)
@@ -663,6 +672,7 @@
               } else {
                 url = this.url.addInfo
               }
+
               let params = JSON.parse(JSON.stringify(this.formInline))
 
               Object.keys(params).forEach(res => {
@@ -671,12 +681,19 @@
                 }
               })
 
-              if(JSON.stringify(this.itemVal)=="{}"){
                 params.info_id=this.infoId
                 params.menu_id=this.menuId
-              }
-              // params.menuId=this.menuId
-              params.itemValEOList=this.contentList
+
+              let contentList=JSON.parse(JSON.stringify(this.contentList))
+              contentList.forEach((item,index)=>{
+                if(item.type==='IMG'){
+                  // console.log('img',item)
+                  this.$delete(item,'thumbUrl')
+                  // contentList[index]= { ...item }
+                }
+              })
+              // console.log('contentList',contentList)
+              params.itemValEOList=contentList
               // console.log('paramsformInline',params)
               params.delItemIds=this.deleteIds.join(',')
               axios({
@@ -767,7 +784,7 @@
       },
       //上传文件
       uploadSuccess1(data,imgs) {
-        console.log('dataimg',data,imgs)
+        // console.log('dataimg',data,imgs)
         let lengthImg=imgs.length
         for(let i = this.contentList.length;i>this.addIndex;i--){
           this.contentList[i+lengthImg-1]=this.contentList[i-1]
@@ -803,6 +820,8 @@
           type:'TABLE',
           itemContent:this.ueContent
         }
+        // this.uEditorChange()
+        // console.log('this.contentList',this.contentList)
       },
       //表格取消按钮
       handleCancelTable(){
@@ -816,6 +835,7 @@
           type:'TABLE',
           itemContent:val
         }
+        this.ueContent=val
 
       },
       //取消行数列数按钮
@@ -989,6 +1009,7 @@
       edit(item) {
         this.visible=true
         this.type = 'edit'
+        this.itemVal=item
         // this.getForm(() => {
         //   this.formInline=item
         // })
@@ -996,7 +1017,7 @@
           getAction(this.url.getDocumentInfo, { id: item.id }).then((res) => {
             if (res.success) {
               this.formInline = res.result
-              console.log('form11111',this.formInline)
+              // console.log('form11111',this.formInline)
             }
           })
 
@@ -1006,6 +1027,7 @@
         this.getForm()
         this.visible=true
         this.formInline = {}
+        this.contentList=[]
         this.type = 'add'
 
       },
@@ -1104,7 +1126,7 @@
         .row-right{
           min-width: 150px;
           margin-left: 20px;
-          .row-btn-add{
+          .row-btn-add, .row-btn-edit{
             margin-right: 20px;
           }
         }
@@ -1182,7 +1204,10 @@
           table.word-table {
             width: 100%;
             height: 100%;
-
+            .wordImg{
+              width:40px;
+              height: auto;
+            }
           }
         }
       }

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

@@ -8,7 +8,7 @@
               <a-tree
                 v-if="gData.length>0"
                 :selected-keys="selectedKeys"
-                :expanded-keys="expandedKeys"
+                :expanded-keys.sync="expandedKeys"
                 :auto-expand-parent="autoExpandParent"
                 :defaultExpandAll="true"
                 :tree-data="gData"
@@ -16,24 +16,42 @@
                 @rightClick="rightClick"
                 @select="onSelect"
               >
-                <template slot="title" slot-scope="{ title }">
-                  <span v-if="title.indexOf(searchValue) > -1" :title="title">
+<!--                @rightClick="rightClick"-->
+                <template #title="{ key: treeKey, title, record }">
+                  <a-dropdown :trigger="['contextmenu']">
+<!--                    <span>{{ title }}</span>-->
+                    <span v-if="title.indexOf(searchValue) > -1" :title="title">
                     {{ title.substr(0, title.indexOf(searchValue)) }}<span style="color: #f50">{{ searchValue }}</span>{{ title.substr(title.indexOf(searchValue) + searchValue.length) }}
                   </span>
-                  <span v-else :title="title">{{ title }}</span>
+                    <span v-else :title="title">{{ title }}</span>
+                    <template #overlay>
+                      <a-menu @click="({ key: menuKey }) => onContextMenuClick(treeKey, menuKey, record)">
+                        <a-menu-item key="1" @click="orgAdd">{{$t('newNode')}}</a-menu-item>
+                        <a-menu-item key="2" @click="orgEdit">{{$t('modifyNode')}}</a-menu-item>
+                        <a-menu-item key="3" @click="orgDelete" v-if="deleteNode" >{{$t('deleteNode')}}</a-menu-item>
+                      </a-menu>
+                    </template>
+                  </a-dropdown>
                 </template>
+
+<!--                <template slot="title" slot-scope="{ title }">-->
+<!--                  <span v-if="title.indexOf(searchValue) > -1" :title="title">-->
+<!--                    {{ title.substr(0, title.indexOf(searchValue)) }}<span style="color: #f50">{{ searchValue }}</span>{{ title.substr(title.indexOf(searchValue) + searchValue.length) }}-->
+<!--                  </span>-->
+<!--                  <span v-else :title="title">{{ title }}</span>-->
+<!--                </template>-->
               </a-tree>
-              <div v-if="NodeTreeItem" :style="tmpStyle" >
-                <div class="menu-item" @click="orgAdd">
-                  {{$t('newNode')}}
-                </div>
-                <div class="menu-item" @click="orgEdit">
-                  {{$t('modifyNode')}}
-                </div>
-                <div class="menu-item menu-bottom" @click="orgDelete" v-if="NodeTreeItem">
-                  {{$t('deleteNode')}}
-                </div>
-              </div>
+<!--              <div v-if="NodeTreeItem" :style="tmpStyle" >-->
+<!--                <div class="menu-item" @click="orgAdd">-->
+<!--                  {{$t('newNode')}}-->
+<!--                </div>-->
+<!--                <div class="menu-item" @click="orgEdit">-->
+<!--                  {{$t('modifyNode')}}-->
+<!--                </div>-->
+<!--                <div class="menu-item menu-bottom" @click="orgDelete" v-if="NodeTreeItem">-->
+<!--                  {{$t('deleteNode')}}-->
+<!--                </div>-->
+<!--              </div>-->
             </div>
           </div>
           <div class="split-detail-right">
@@ -86,7 +104,7 @@
                   :OperationList="OperationList"
                   :infoId="$route.query.infoId"
                   :menuId="menuId"
-                  showAction
+                  :showAction="true"
                   @onSelectChange="onSelectChange"
                   @deleteClick="deleteClick"
                   @editClick="editClick"
@@ -154,7 +172,7 @@
               :ids="ids">
             </split-bat-form>
           </a-modal>
-          <split-add-form ref="splitForm" v-if="addVisible" :addVisible="addVisible" :formTitle="formTitle" :flag="'4'" :url="url" :infoId="infoId" :menuId="menuId" :itemId="itemId" :itemVal="itemVal" @closeVisible="closeVisible" @sumber="sumber"></split-add-form>
+          <split-add-form ref="splitForm" v-if="addVisible" :addVisible="addVisible" :formTitle="formTitle" :flag="'4'" :url="url" :infoId="infoId" :menuId="menuId" :itemId="itemId"  @closeVisible="closeVisible" @sumber="sumber"></split-add-form>
 
         </div>
       </a-card>
@@ -171,6 +189,7 @@
   import upload from '@/components/SplitImport/index'
   import axios from 'axios'
   import { ACCESS_TOKEN } from '@/store/mutation-types'
+  import moment from 'moment'
   import eventBUs from '@/common/event'
   import Vue from 'vue'
   export default {
@@ -265,7 +284,14 @@
         token:Vue.ls.get(ACCESS_TOKEN),
         // upAccept:'.zip',  //导入文件类型
         uploadMenuId:'',
-        selectedKeys:[]
+        selectedKeys:[],
+        deleteNode:false,
+
+      }
+    },
+    watch:{
+      deleteNode(){
+
       }
     },
     mounted() {
@@ -375,7 +401,9 @@
       },
       //鼠标右键
       rightClick({event,node}){
-        console.log('eee',event,node)
+
+        this.deleteNode=node._props.dataRef.pid?true:false
+        // console.log('eee',event,node)
         // this.NodeTreeItemVisible=true
         const x =
           event.currentTarget.offsetLeft + event.currentTarget.clientWidth;
@@ -467,6 +495,9 @@
             }
         })
       },
+      onContextMenuClick(treeKey, menuKey,) {
+        // console.log(`treeKey: ${treeKey}, menuKey: ${menuKey}`);
+      },
       //清空按钮
       resetSearch(){
         this.menuId=''
@@ -489,9 +520,10 @@
           }
           this.$refs.ruleForm.validate(valid=>{
             if(valid){
-              this.flag=true
+
               // console.log('parms',this.params)
-              if(this.flag){
+              if(!this.flag){
+                this.flag=true
                 postAction(`split/sarFileSplitMenu/addMenu`,params).then(res=>{
                   if(res.success){
                     this.menuRightVisible=false
@@ -521,6 +553,7 @@
             info_id: this.infoId,
             ...this.form,
           }
+          if(!this.flag){
           this.flag=true
           // console.log('parms',params)
           putAction(`split/sarFileSplitMenu/updateMenu`,params).then(res=>{
@@ -536,6 +569,7 @@
             this.flag=false
             this.menuRightVisible=false
           })
+          }
         }
       },
       //获取列表数据
@@ -653,7 +687,7 @@
       },
       //上传成功
       uploadSuccess(data,status){
-        console.log('data111',data)
+        // console.log('data111',data)
         if(status==='success'){
           let queryParam={
             menu_id:this.menuId,
@@ -676,10 +710,11 @@
       },
       //导出
       handleExportManage(){
-        let name = this.$t('DocumentSplitting')+'.zip'
+        let dateName = moment(new Date()).format('YYYY-MM-DD HH-mm-ss')
+        let name = this.$route.query.infoNumber +' '+ dateName+'.zip'
         let query = {
           infoId:this.infoId,
-          exportName:'',
+          exportName:name,
           idList:this.selectedRowKeys.join(',')
         }
 
@@ -1037,6 +1072,9 @@
         width: 260px;
         padding-right: 20px;
         border-right: 1px solid #666666;
+        .split-detail-left-tree{
+          width: 240px;
+        }
         .menu-item{
           padding: 2px 8px;
           border: 1px solid #000000;
@@ -1119,6 +1157,10 @@
     .upload-split{
       .ant-upload{
         color:#040B29;
+        i.import{
+          display: inline-block;
+          margin-right: 4px;
+        }
       }
     }
   }
@@ -1143,4 +1185,10 @@
         }
       }
   }
+  .item-content-show{
+    .wordImg{
+      width: 40px;
+      height: auto;
+    }
+  }
 </style>

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

@@ -298,7 +298,7 @@
       //删除按钮
       deleteArea(val){
         this.$confirm({
-          title: this.$t('labelAreaDeleted'),
+          title: this.$t('confirmDeletion'),
           content: '',
           onOk:
             async () => {

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

@@ -326,7 +326,7 @@
       this.showFlowData();
     },
     mounted() {
-      console.log('disableEdit',this.disableEdit)
+      // console.log('disableEdit',this.disableEdit)
       this.loadContent()
       this.loadShowArea()
       // console.log('edit',this.submitEdit)