From e0a2262fc4dbb17350be360b4994363a7748dd6a Mon Sep 17 00:00:00 2001
From: caoyang <caoyang@syxysoft.com>
Date: Wed, 30 Mar 2022 00:15:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E5=88=86=E8=AF=A6=E6=83=85=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/SplitUpload/index.vue |  6 ++--
 .../splitting/modules/SplitAddForm.vue        | 36 ++++++++++++-------
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/jero-web/src/components/SplitUpload/index.vue b/jero-web/src/components/SplitUpload/index.vue
index 67e56a7e0..6ebedd2ba 100644
--- a/jero-web/src/components/SplitUpload/index.vue
+++ b/jero-web/src/components/SplitUpload/index.vue
@@ -31,7 +31,7 @@
 
   export default {
     name: 'file',
-    props: ['disableds', 'disabled', 'thisFileUploadUrl', 'readonly', 'thisFileType','accept','title','listType','splitVisible'],
+    props: ['disableds', 'disabled', 'thisFileUploadUrl', 'readonly', 'thisFileType','title','listType','splitVisible'],
     data() {
       return {
         visible: false,
@@ -42,7 +42,8 @@
         myfileList: [],
         isLoding: false,
         headers:'',
-        previewImage:{}
+        previewImage:{},
+        accept:'image/*'
       }
     },
     created() {
@@ -148,6 +149,7 @@
                 }
               })
               this.$emit('uploadSuccess', this.fileList,fileList)
+              console.log('uplossss',this.fileList,fileList)
               if (this.myfileList.length > 0) {
                 this.$message.destroy()
                 this.$message.success(`${info.file.name} `+this.$t('uploadSuccessful'))
diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue
index 7b6d25da7..f30e2f576 100644
--- a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue
+++ b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue
@@ -291,11 +291,11 @@
                       <div class="row-left">
                         <a-textarea v-if="item.type==='TEXT'" v-model="item.itemContent" :placeholder="$t('pleaseEnter')+$t('content')" auto-size />
                         <img v-if="item.type==='IMG'" :src="item.itemContent" alt="" @click="preImg(item)">
-                        <div v-if="item.type==='TABLE'" v-html="item.content" class="item-table"></div>
+                        <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 @click="splitDelete">{{$t('delete')}}</a-button>
+                        <a-button @click="splitDelete(item,index)">{{$t('delete')}}</a-button>
                       </div>
                     </div>
                   </a-row>
@@ -335,12 +335,12 @@
                 </div>
                 <div class="title-num" v-if="selectedNum">
                   <span class="title-num-add">{{$t('addQuantity')}}</span>
-                  <a-input-number class="title-num-edit" :min="1" v-model="textNumber" :placeholder="$t('enterQuantity')"  :formatter="limitNumber" :parser="limitNumber"></a-input-number>
+                  <a-input-number class="title-num-edit" :min="1" v-model="textNumber" :placeholder="$t('enterQuantity')" :formatter="limitNumber" :parser="limitNumber" ></a-input-number>
                 </div>
               </div>
             </a-modal>
 <!--            上传图片弹框-->
-            <split-upload v-if="splitVisible" ref="uploadFile2" :disabled="disabled" :accept="accept" :title="titleImg" :listType='listType' :splitVisible="splitVisible" @uploadSuccess="uploadSuccess"></split-upload>
+            <split-upload v-if="splitVisible" ref="uploadFile2" :disabled="disabled" :title="titleImg" :listType='listType' :splitVisible="splitVisible" @uploadSuccess="uploadSuccess1"></split-upload>
 <!--            输入表格行数列数-->
 
             <a-modal
@@ -353,10 +353,10 @@
             >
               <a-form :form="form" :label-col="{ span: 8 }" :wrapper-col="{ span: 14 }">
                 <a-form-item :label="$t('numberRows')">
-                  <a-input-number v-model="rowCount" :min="1" :max="99999"  :placeholder="$t('pleaseEnter')+$t('numberRows')" :formatter="limitNumber" :parser="limitNumber" />
+                  <a-input-number v-model="rowCount" :min="1" :max="99999"  :placeholder="$t('pleaseEnter')+$t('numberRows')" :formatter="limitNumber" :parser="limitNumber" style="width: 100%"  />
                 </a-form-item>
                 <a-form-item :label="$t('numberColumns')">
-                  <a-input-number v-model="colCount" :min="1" :max="99999"  :placeholder="$t('pleaseEnter')+$t('numberColumns')" :formatter="limitNumber" :parser="limitNumber" />
+                  <a-input-number v-model="colCount" :min="1" :max="99999"  :placeholder="$t('pleaseEnter')+$t('numberColumns')" :formatter="limitNumber" :parser="limitNumber" style="width: 100%" />
                 </a-form-item>
               </a-form>
             </a-modal>
@@ -556,6 +556,7 @@
         loading:false,
         token:Vue.ls.get(ACCESS_TOKEN),
         submitFlag:false,
+        deleteIds:[]
       }
     },
     props:{
@@ -637,8 +638,17 @@
         }
       },
       //删除按钮
-      splitDelete(){
+      splitDelete(item,index){
+        console.log('itme',item,this.contentList)
+        if(item.id){
+          this.deleteIds.push(item.id)
+        }
 
+        for(let i=index;i<this.contentList.length-1;i++){
+          this.contentList[index]=this.contentList[index+1]
+        }
+        this.contentList.pop()
+        console.log('this.content',this.contentList)
       },
       //保存
       splitSave(){
@@ -669,7 +679,7 @@
               // params.menuId=this.menuId
               params.itemValEOList=this.contentList
               // console.log('paramsformInline',params)
-
+              params.delItemIds=this.deleteIds.join(',')
               axios({
                 url: url,
                 method: 'post',
@@ -744,7 +754,7 @@
           this.tableColVisible=true
 
         }
-        console.log('conteend',this.contentList)
+
       },
       handleCancel(){
         this.addConVisible=false
@@ -754,7 +764,8 @@
 
       },
       //上传文件
-      uploadSuccess(data,imgs) {
+      uploadSuccess1(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]
@@ -764,11 +775,12 @@
             this.contentList[++this.addIndex]={
               id:'',
               type:'IMG',
-              itemContent:item.thumbUrl
+              itemContent:item.url
             }
           })
         }
         this.splitVisible=false
+        console.log('conteend',this.contentList)
       },
       //点击图片预览
       preImg(item){
@@ -828,7 +840,7 @@
           this.contentList[this.addIndex+1]= {
             id:'',
             type:'TABLE',
-            content:tableStr
+            itemContent:tableStr
           }
           this.$nextTick(() => {
             this.$refs.ueditor.setContent(this.ueContent)