Merge branch '标准拆分译文变更'

src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTable.vue

@@ -36,9 +36,9 @@
       :pagination="ipagination"
       :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
       @change="handleTableChange">
-      <!--条文内容-->
-      <template slot="item_content" slot-scope="{text, record}">
-        <div class="table-text" style="cursor: pointer" v-if="text || text === 0" @click="showContent('item_content', text,record)">
+      <!--条文内容、译文-->
+      <template slot="htmlContent" slot-scope="{text, record}">
+        <div class="table-text" style="cursor: pointer" v-if="text || text === 0" @click="showContent(text, record)">
           {{ text && text !== 'null' ? text.replace(/<.*?>/ig, ' ') : '' }}
         </div>
         <div class="table-text" v-else>{{ global.emptyLine }}</div>
@@ -160,7 +160,7 @@ export default {
           align: 'center',
           width: 180,
           dataIndex: 'itemContent',
-          scopedSlots: { customRender: 'item_content' }
+          scopedSlots: { customRender: 'htmlContent' }
         }
       ],
       // 操作列
@@ -193,7 +193,7 @@ export default {
           align: 'center',
           width: 180,
           dataIndex: 'translation',
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: { customRender: 'htmlContent' }
         },
         { // 是否与上一版相同
           title: this.$t('workCenter.standardInterpretationProcess.sameAsPreviousVersion'),
@@ -855,10 +855,9 @@ export default {
     },
     /**
      * 显示条款内容、条文解读弹框
-     * @param fieldName
      * @param val
      */
-    showContent (fieldName, val) {
+    showContent (val) {
       this.$refs.splitClauseDetail.open(val)
     },
     /**

src/views/workCenter/standardInterpretationProcess/modules/InterpretationClauseTableModal.vue

@@ -14,13 +14,13 @@
       <a-spin :spinning="confirmLoading">
         <a-form :form="form" :label-col="labelCol" :wrapper-col="wrapperCol">
           <!--译文-->
-          <a-form-item :label="$t('workCenter.standardInterpretationProcess.translation')" :colon="false">
-            <a-textarea :placeholder="$t('pleaseEnter') + $t('workCenter.standardInterpretationProcess.translation')"
-                        :maxLength="500"
-                        :rows="4"
-                        :disabled="disabled"
-                        v-decorator="['translation']" />
-          </a-form-item>
+          <!--<a-form-item :label="$t('workCenter.standardInterpretationProcess.translation')" :colon="false">-->
+          <!--  <a-textarea :placeholder="$t('pleaseEnter') + $t('workCenter.standardInterpretationProcess.translation')"-->
+          <!--              :maxLength="500"-->
+          <!--              :rows="4"-->
+          <!--              :disabled="disabled"-->
+          <!--              v-decorator="['translation']" />-->
+          <!--</a-form-item>-->
           <!--是否与上一版相同-->
           <a-form-item :label="$t('workCenter.standardInterpretationProcess.sameAsPreviousVersion')" :colon="false">
             <j-dict-select-tag dict-code="yn"