From 314a0aa9e62221ad9bb42f008fe462be1e147a92 Mon Sep 17 00:00:00 2001
From: caoyang <caoyang@syxysoft.com>
Date: Fri, 1 Apr 2022 00:00:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=8B=86=E5=88=86=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C?=
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 +
 jero-web/src/components/OcrAddForm/index.vue  |   2 +-
 jero-web/src/components/OcrUpload/index.vue   |   8 +-
 jero-web/src/components/SplitUpload/index.vue |  19 +--
 .../splitting/modules/ImportResult.vue        | 125 +++++++++++-------
 6 files changed, 89 insertions(+), 67 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index d3afd036e..9533d09d6 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -569,5 +569,6 @@ module.exports = {
   searchContent:'Search content',
   viewFile:'view file',
   fileFormatIncorrect:'the file format is incorrect',
+  pleaseUploadFile:'please upload the file',
 
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index bae2b8d6a..211b3d30b 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -573,6 +573,7 @@ module.exports = {
   searchContent:'搜索内容',
   viewFile:'查看文件',
   fileFormatIncorrect:'文件格式不正确',
+  pleaseUploadFile:'请上传文件',
 
 
 }
\ No newline at end of file
diff --git a/jero-web/src/components/OcrAddForm/index.vue b/jero-web/src/components/OcrAddForm/index.vue
index c713eca92..97f240046 100644
--- a/jero-web/src/components/OcrAddForm/index.vue
+++ b/jero-web/src/components/OcrAddForm/index.vue
@@ -169,7 +169,7 @@
                 <span class="title-text-text">{{item.db_field_txt}}</span>
               </div>
               <a-form-model-item class="itemModel" :prop="item.db_field_name">
-                <uploadFile ref="uploadFile" :accept="accept" :disabled="disabled" @uploadSuccess="uploadSuccess"></uploadFile>
+                <uploadFile ref="uploadFile" :accept="accept" :disabled="disabled" :module="'ocr'" @uploadSuccess="uploadSuccess"></uploadFile>
 <!--                <a-button type="primary" class="button-text"-->
 <!--                          @click="clickButtonToUpload(item.db_field_name)">-->
 <!--                  {{ (formInline[item.db_field_name] === 'null' || formInline[item.db_field_name] === '' ||-->
diff --git a/jero-web/src/components/OcrUpload/index.vue b/jero-web/src/components/OcrUpload/index.vue
index 215445ffe..296ebc680 100644
--- a/jero-web/src/components/OcrUpload/index.vue
+++ b/jero-web/src/components/OcrUpload/index.vue
@@ -15,7 +15,8 @@
         :remove='remove'
         @change="handleChange">
 <!--        <p><a-icon style="font-size: 67px;color: #c0c4cc;" type="cloud-upload" /></p>-->
-        <a-button  type="primary" ghost class="ant-upload-text" style="font-size: 14px;line-height: 30px">{{$t('clickUpload')}}</a-button>
+        <a-button  type="primary" v-if="module=='ocr'" ghost class="ant-upload-text" style="font-size: 14px;line-height: 30px">{{$t('clickUpload')}}</a-button>
+        <a-button  type="primary" v-if="module=='split'" class="ant-upload-text" style="font-size: 14px;line-height: 30px">{{$t('clickUpload')}}</a-button>
       </a-upload>
 <!--    </a-modal>-->
   </div>
@@ -26,7 +27,7 @@
   import { ACCESS_TOKEN } from "@/store/mutation-types"
   export default {
     name: 'ocrUpload',
-    props:['disableds','disabled','thisFileUploadUrl','readonly','thisFileType','accept','title','listType'],
+    props:['disableds','disabled','thisFileUploadUrl','readonly','thisFileType','accept','title','listType','module'],
     data(){
       return{
         visible:false,
@@ -48,6 +49,7 @@
     },
     methods:{
       beforeUpload(file,fileList) {
+        console.log('file',this.accept)
         if(this.myfileList&&this.myfileList.length>=1){
           this.$message.warning('只能上传一个文件')
           return false
@@ -67,7 +69,7 @@
       },
       handleChange(info) {
         // console.log('info',info)
-        let { file } = info;
+        let { file,fileList } = info;
         const status = info.file.status;
         info.fileList.forEach((val,index)=>{
           if(val.response && !val.response.result){
diff --git a/jero-web/src/components/SplitUpload/index.vue b/jero-web/src/components/SplitUpload/index.vue
index a10aa88ad..41d39919d 100644
--- a/jero-web/src/components/SplitUpload/index.vue
+++ b/jero-web/src/components/SplitUpload/index.vue
@@ -71,21 +71,14 @@
       beforeUpload(file) {
         let fileFlag=false
         console.log('accept',this.accept,file)
-        // if(this.accept.indexOf(',')!=-1){
-        //   let fileTypes=this.accept.split(',')
-        //   fileTypes.forEach(item=>{
-        //     if(item==file.type){
-        //       fileFlag=true
-        //     }
-        //   })
-        // }else{
-        //   let fileTypes=this.accept.split('/')
-        //   let fileNowTypes=file.type.split('/')
-        //   fileFlag=fileTypes[0]==fileTypes[0]?true:false
-        // }
+
+          let fileTypes=this.accept.split('/')
+          let fileNowTypes=file.type.split('/')
+          fileFlag=fileTypes[0]==fileTypes[0]?true:false
+
 
         // console.log('filetype',fileFlag)
-        if(fileFlag){
+        if(!fileFlag){
           this.$message.warning(this.$t('fileFormatIncorrect'))
           this.fileTypeSatus = false
         }else{
diff --git a/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue b/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue
index 0bbea9361..2fa24904a 100644
--- a/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue
+++ b/jero-web/src/views/documentManage/splitting/modules/ImportResult.vue
@@ -34,33 +34,33 @@
             :wrapper-col="wrapperCol"
           >
             <a-form-model-item ref="file" :label="$t('splitFile')" prop="file">
-              {{form.file}}
-              <a-button type="primary" class="button-text"
-                        @click="fileUpload()">
+                        <split-upload ref="uploadFile" :accept="accept" :disabled="disabled" :module="'split'" @uploadSuccess="uploadSuccess"></split-upload>
+<!--              <a-button type="primary" class="button-text"-->
+<!--                        @click="fileUpload()">-->
 
-                {{ (form.file === 'null' || form.file === '' ||
-                form.file == null) ? $t('upload1') : $t('viewUploadedFiles')
-                }}
-              </a-button>
+<!--                {{ (form.file === 'null' || form.file === '' ||-->
+<!--                form.file == null) ? $t('upload1') : $t('viewUploadedFiles')-->
+<!--                }}-->
+<!--              </a-button>-->
             </a-form-model-item>
           </a-form-model>
         <a-button class="file-down" type="primary" @click="downLoad">{{$t('templateDownload')}}</a-button>
       </div>
       <div class="imports-footer">
         <div class="imports-footer-wrap">
-<!--          <uploadFile ref="uploadFile" :accept="accept" :disabled="disabled" @uploadSuccess="uploadSuccess"></uploadFile>-->
+
           <a-button class="imports-btn imports-chai" type="primary" @click="handleSubmit">{{$t('preservation')}}</a-button>
           <a-button class="imports-btn" type="primary" @click="cancleImports">{{$t('cancel')}}</a-button>
         </div>
       </div>
-      <split-upload  ref="uploadFile" :disabled="disabled" :title="upload1" :accept="accept" @uploadSuccess="uploadSuccess"></split-upload>
+<!--      <split-upload  ref="uploadFile" :disabled="disabled" :title="upload1" :accept="accept" @uploadSuccess="uploadSuccess"></split-upload>-->
     </a-drawer>
   </div>
 </template>
 
 <script>
   import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
-  import SplitUpload from '@/components/SplitUpload/index'
+  import SplitUpload from '@/components/OcrUpload/index'
   import search from '@/components/search/index'
   import TableData from '@/components/SplitTable/DocTable'
   import axios from 'axios'
@@ -123,7 +123,7 @@
         form:{},
         rules:{
           file:[
-            { required: true, message: this.$t('noFile'), trigger: 'change' },
+            { required: true, message: this.$t('pleaseUploadFile'), trigger: 'blur' },
           ],
         },
         spinning:false,   //loading标识
@@ -139,6 +139,7 @@
         accept:'application/zip',
         rows:[],
         token:Vue.ls.get(ACCESS_TOKEN),
+        flag:false,  //提交表单标识
       }
     },
     props:{
@@ -209,9 +210,11 @@
       uploadSuccess(data) {
         // console.log('updata',data)
         let attIdList = []
-        data.map(item => {
-          attIdList.push(item.id || data.name)
-        })
+        if(data && data.length>0) {
+          data.map(item => {
+            attIdList.push(item.id || data.name)
+          })
+        }
         // /** 赋值给当前对应的表单文件 */
         this.form.file = attIdList.join(',')
         // console.log('this.form.file',this.form.file)
@@ -223,47 +226,69 @@
       },
       //保存
       handleSubmit(){
-        console.log('seleced',this.selectedRowKeys,this.rows)
-        if(!this.rows){
+        // console.log('seleced',this.selectedRowKeys,this.rows)
+        if(this.rows.length===0){
           this.$message.warning(this.$t('PleaseSelectData'))
         }else if(this.rows&&this.rows.length>1){
           this.$message.warning(this.$t('OnlyOneSelected'))
         }else if(this.rows&&this.rows.length===1){
-          let params={
-            connectId:this.rows[0].connect_id,
-            fileId:this.form.file,
-            fileName:this.rows[0].file_name,
-            fileType:this.rows[0].text_info,
-            serialNumber:this.rows[0].serial_number,
-            title:this.rows[0].title
-          }
-          let formData = new FormData()
-          Object.keys(params).forEach((key) => {
-            console.log('key',key,params[key])
-            formData.append(key, params[key]);
-          });
-          console.log('formData',params,formData.getAll)
-          axios({
-            url: '/jero-boot/split/sarFileSplitItems/importSplitResult',
-            method: 'post',
-            data:formData,
-            // data: params,
-            // transformRequest: [function (data) {
-            //   // Do whatever you want to transform the data
-            //   let ret = ''
-            //   for (let it in data) {
-            //     ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
-            //   }
-            //   return ret
-            // }],
-            headers: {
-              'Content-Type': 'multipart/form-data',
-              // 'Content-Type': 'application/x-www-form-urlencoded',
-              'X-Access-Token':this.token
-            }
-          }).then(res => {
-            if (res.data.success) {
+          this.$refs.ruleForm.validate(valid=>{
+            if(valid){
+              this.flag=true
+              if(this.flag){
+                let params={
+                  connectId:this.rows[0].connect_id,
+                  splitFileId:this.form.file,
+                  fileName:this.rows[0].file_name,
+                  serialNumber:this.rows[0].serial_number,
+                  title:this.rows[0].title,
 
+                }
+                if(this.rows[0].text_info=='发布稿(必读)'){
+                  params.fileType='1'
+                }else if(this.rows[0].text_info=='增补件(必读)'){
+                  params.fileType='2'
+                }else if(this.rows[0].text_info=='报批稿'){
+                  params.fileType='3'
+                }else if(this.rows[0].text_info=='征求意见稿'){
+                  params.fileType='4'
+                }else if(this.rows[0].text_info=='测试程序'){
+                  params.fileType='5'
+                }else if(this.rows[0].text_info=='相关资料'){
+                  params.fileType='6'
+                }
+                let formData = new FormData()
+                Object.keys(params).forEach((key) => {
+                  console.log('key',key,params[key])
+                  formData.append(key, params[key]);
+                });
+                console.log('formData',params,formData.getAll)
+                axios({
+                  url: '/jero-boot/split/sarFileSplitItems/importSplitResult',
+                  method: 'post',
+                  data:formData,
+                  // data: params,
+                  // transformRequest: [function (data) {
+                  //   // Do whatever you want to transform the data
+                  //   let ret = ''
+                  //   for (let it in data) {
+                  //     ret += encodeURIComponent(it) + '=' + encodeURIComponent(data[it]) + '&'
+                  //   }
+                  //   return ret
+                  // }],
+                  headers: {
+                    'Content-Type': 'multipart/form-data',
+                    // 'Content-Type': 'application/x-www-form-urlencoded',
+                    'X-Access-Token':this.token
+                  }
+                }).then(res => {
+                  if (res.data.success) {
+
+                  }
+                }).finally(()=>[
+                  this.flag=false
+                ])
+              }
             }
           })
         }