修改全文对比得细节问题

jero-web/src/views/documentTool/documentSplit/DocumentSplit.vue

@@ -185,11 +185,11 @@ export default {
           width: 180
         },
         // 拆分状态
-        {
+        // {
-          dataIndex: 'splitStatus_dictText',
+        //   dataIndex: 'splitStatus_dictText',
-          title: this.$t('docTool.split.splitState'),
+        //   title: this.$t('docTool.split.splitState'),
-          width: 150
+        //   width: 150
-        },
+        // },
         // 编辑人
         // {
         //   dataIndex: 'author',

jero-web/src/views/documentTool/documentSplit/modules/ImportSplitResultModal.vue

@@ -36,10 +36,23 @@
         </a-form-item>
         <!--文本状态-->
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('docTool.comparison.textStatus')">
-          <a-input :placeholder="$t('pleaseEnter') + $t('docTool.comparison.textStatus')"
+<!--          <a-input :placeholder="$t('pleaseEnter') + $t('docTool.comparison.textStatus')"-->
-                   @change="event => event.target.value = event.target.value.trim()"
+<!--                   @change="event => event.target.value = event.target.value.trim()"-->
-                   :maxLength="50"
+<!--                   :maxLength="50"-->
-                   v-decorator="['fileType', validatorRules.fileType]" />
+<!--                   v-decorator="['fileType', validatorRules.fileType]" />-->
+          <a-select
+            :placeholder="$t('pleaseSelect') + $t('docTool.comparison.textStatus')"
+            v-decorator="['fileType', validatorRules.fileType]"
+            show-search
+            :filter-option="filterOption"
+          >
+            <a-select-option :value="undefined">请选择</a-select-option>
+            <a-select-option v-for="(item, key) in dictOptions" :key="key" :value="item.value">
+      <span style="display: inline-block;width: 100%" :title=" item.text || item.label ">
+        {{ item.text || item.label }}
+      </span>
+            </a-select-option>
+          </a-select>
 <!--          <j-dict-select-tag-->
 <!--            class="box-input"-->
 <!--            v-decorator="['fileType', validatorRules.fileType]"-->
@@ -85,6 +98,16 @@ export default {
   data () {
     return {
       StandardSource,
+      dictOptions: [
+        {
+          text: '发布稿',
+          value: '1'
+        },
+        {
+          text: '正文',
+          value: '2'
+        }
+      ],
       width: 600,
       visible: false,
       confirmLoading: false,
@@ -123,6 +146,10 @@ export default {
     }
   },
   methods: {
+    filterOption (input, option) {
+      const text = option.componentOptions.children[0].text || option.componentOptions.children[0].data.attrs.title
+      return text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+    },
     open () {
       this.visible = true
     },

jero-web/src/views/documentTool/documentSplit/modules/splitIsInStorage.vue

@@ -39,10 +39,23 @@
         </a-form-item>
         <!--文本状态-->
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('docTool.comparison.textStatus')">
-          <a-input :placeholder="$t('pleaseEnter') + $t('docTool.comparison.textStatus')"
+<!--          <a-input :placeholder="$t('pleaseEnter') + $t('docTool.comparison.textStatus')"-->
-                   @change="event => event.target.value = event.target.value.trim()"
+<!--                   @change="event => event.target.value = event.target.value.trim()"-->
-                   :maxLength="50"
+<!--                   :maxLength="50"-->
-                   v-decorator="['fileType', validatorRules.fileType]" />
+<!--                   v-decorator="['fileType', validatorRules.fileType]" />-->
+          <a-select
+            :placeholder="$t('pleaseSelect') + $t('docTool.comparison.textStatus')"
+            v-decorator="['fileType', validatorRules.fileType]"
+            show-search
+            :filter-option="filterOption"
+          >
+            <a-select-option :value="undefined">请选择</a-select-option>
+            <a-select-option v-for="(item, key) in dictOptions" :key="key" :value="item.value">
+      <span style="display: inline-block;width: 100%" :title=" item.text || item.label ">
+        {{ item.text || item.label }}
+      </span>
+            </a-select-option>
+          </a-select>
 <!--          <j-dict-select-tag-->
 <!--            class="box-input"-->
 <!--            v-decorator="['fileType', validatorRules.fileType]"-->
@@ -89,6 +102,16 @@ export default {
       visible: false,
       confirmLoading: false,
       form: this.$form.createForm(this),
+      dictOptions: [
+        {
+          text: '发布稿',
+          value: '1'
+        },
+        {
+          text: '正文',
+          value: '2'
+        }
+      ],
       labelCol: {
         xs: { span: 24 },
         sm: { span: 6 }
@@ -123,6 +146,10 @@ export default {
     }
   },
   methods: {
+    filterOption (input, option) {
+      const text = option.componentOptions.children[0].text || option.componentOptions.children[0].data.attrs.title
+      return text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+    },
     handleStandardNumberChange (name) {
       this.form.setFieldsValue({ title: name })
     },

jero-web/src/views/onlyoffice/index.vue

@@ -21,7 +21,21 @@ export default {
   methods: {
     fileClick () {
       getAction('/onlyOffice/saveEditFile', { model: 'model_qb' }).then((res) => {
-
+        if (res.success) {
+          getAction('/onlyOffice/processEditFile', { id: res.result.id }).then((val) => {
+            if (val.id) {
+              const oldFileName = '比亚迪企业标准'
+              const nowTime = new Date().getTime()
+              window.open('http://127.0.0.1:8080' + '/editor?fileId=' + val.id + '&pid=' + val.pid +
+                '&taskIds=' + val.taskId + '&editType=' + val.editType + '&oldFileName=' + oldFileName +
+                '&fileType=' + 'docx' + '&attId=' + val.id + '&fileUrl=' + val.downLoadUrl +
+                '&key=' + val.id + nowTime + '&filePath=' + val.editFilePath + '&fileName=' + val.fileName +
+                '&userId=' + val.userId + '&userName=' + val.userName + '&isEdit=123')
+            }
+          })
+        } else {
+          this.$message.warning('获取文件失败')
+        }
       })
     }
   }