拆分已入库文本修改

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

@@ -148,7 +148,7 @@
         OperationList:[],
         upload1:this.$t('upload1'),
         // accept:'application/vnd.openxmlformats-officedocument.wordprocessingml.document,application/msword',
-        accept:'application/zip',
+        accept:'application/x-zip-compressed',
         rows:[],
         token:Vue.ls.get(ACCESS_TOKEN),
         flag:false,  //提交表单标识
@@ -160,7 +160,7 @@
     },
     watch:{
       'form.file'(val){
-        console.log('val111',val)
+        // console.log('val111',val)
       },
 
     },

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

@@ -14,18 +14,13 @@
             <search :url="url" :flag="'condition'"></search>
           </div>
         </div>
-        <div class="split-table-detail">
+        <div class="table-operator operator-select">
-          <tableData
+          <div class="operator-text">
-            :flag="'header'"
+<!--            <a-icon type="download" />-->
-            :url="url"
+<!--            模板下载-->
-            :type="type"
+
-            :showAction="false"
+            <div  class="operator-select-type">
-            :OperationList="OperationList"
+              <span class="operator-file-type">文件类型：</span>
-            @onSelectChange="onSelectChange"
-          />
-        </div>
-        <div style="width: 100px">
-          文件类型：
               <a-select  v-model="fileGroup" style="width: 100px">
                 <a-select-option value="GSO" key="GSO">
                   GSO
@@ -47,6 +42,41 @@
                 </a-select-option>
               </a-select>
             </div>
+          </div>
+        </div>
+        <div class="split-table-detail">
+          <tableData
+            :flag="'header'"
+            :url="url"
+            :type="type"
+            :showAction="false"
+            :OperationList="OperationList"
+            @onSelectChange="onSelectChange"
+          />
+        </div>
+<!--        <div style="width: 100px">-->
+<!--          文件类型：-->
+<!--          <a-select  v-model="fileGroup" style="width: 100px">-->
+<!--            <a-select-option value="GSO" key="GSO">-->
+<!--              GSO-->
+<!--            </a-select-option>-->
+<!--            <a-select-option value="Korean" key="Korean">-->
+<!--              韩国-->
+<!--            </a-select-option>-->
+<!--            <a-select-option value="US" key="US">-->
+<!--              美国-->
+<!--            </a-select-option>-->
+<!--            <a-select-option value="EU" key="EU">-->
+<!--              欧洲-->
+<!--            </a-select-option>-->
+<!--            <a-select-option value="Japan" key="Japan">-->
+<!--              日本-->
+<!--            </a-select-option>-->
+<!--            <a-select-option value="CN" key="CN">-->
+<!--              中国-->
+<!--            </a-select-option>-->
+<!--          </a-select>-->
+<!--        </div>-->
         <div class="split-footer">
           <div class="split-footer-wrap">
             <a-button class="split-btn split-chai" type="primary" @click="submitSplit">{{$t('split')}}</a-button>
@@ -266,6 +296,19 @@
       }
     }
   }
+  .operator-select{
+    margin-bottom: 20px;
+    margin-left: 60px;
+    .operator-file-type{
+      /*width: 100px;*/
+      line-height: 32px;
+      display: inline-block;
+    }
+    .operator-select-type{
+      display: flex;
+      justify-content: start;
+    }
+  }
 
 </style>
 <style lang="less">