Merge remote-tracking branch 'origin/master'

jero-web/src/config/router.config.js

@@ -32,7 +32,7 @@ export const constantRouterMap = [
       {
         path: '/documentTool/StandardSplitSheet',
         name: 'documentTool-StandardSplitSheet',
-        component: () => import(/* webpackChunkName: "user" */ '@/views/documentTool/documentSplit/DocumentSplit')
+        component: () => import(/* webpackChunkName: "user" */ '@/views/documentTool/documentSplit/StandardSplitSheet')
       },
       // 新旧拆分单对比
       // {

jero-web/src/mixins/ConfigurableTableMixin.js

@@ -124,7 +124,6 @@ export const ConfigurableTableMixin = {
       this.getTableHeaderFunc(params).then(res => {
         if (res.success) {
           this.columns = this.dealColumns(res.result || [])
-          console.log(this.columns)
           this.isTrue = false
           this.$nextTick(() => {
             this.isTrue = true

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

@@ -137,7 +137,7 @@ export default {
         // 查看
         {
           text: this.$t('view'),
-          clickEvent: 'handleDetail',
+          clickEvent: 'handleDetail'
         },
         // 编辑
         {

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

@@ -66,11 +66,38 @@
       <!--表格部分-->
       <div class="page-right-box">
         <div class="table-page-search-wrapper">
-          <search ref="searchRef"
-                  :url="url"
-                  :get-query-condition-func="getQueryConditionFunc"
-                  @search="searchQuery"
-                  @reset="searchReset" />
+          <a-form layout="inline" @keyup.enter.native="searchQuery">
+            <a-row :gutter="24">
+              <a-col :md="8"
+                     :sm="12"
+                     style="line-height: 48px">
+                   <a-form-item :label="'条款号'" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                        <a-input :placeholder="$t('pleaseEnter')+'条款号'"
+                            v-model="queryParam.clauseNo"></a-input>
+                   </a-form-item>
+              </a-col>
+              <a-col :md="8"
+                     :sm="12"
+                     style="line-height: 48px">
+                <a-form-item :label="'条款内容'" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-input :placeholder="$t('pleaseEnter')+'条款内容'"
+                           v-model="queryParam.clauseContent"></a-input>
+                </a-form-item>
+              </a-col>
+              <div style="float: right;overflow: hidden;margin-right: 11px" class="table-page-search-submitButtons">
+                <a-button icon="search" type="primary" @click="searchQuery" style="margin-left: 8px">
+                  {{$t('query')}}
+                </a-button>
+                <a-button icon="reload" type="primary" ghost style="margin-left: 8px"
+                          @click="searchReset">{{ $t('reset') }}</a-button>
+              </div>
+            </a-row>
+          </a-form>
+<!--          <search ref="searchRef"-->
+<!--                  :url="url"-->
+<!--                  :get-query-condition-func="getQueryConditionFunc"-->
+<!--                  @search="searchQuery"-->
+<!--                  @reset="searchReset" />-->
         </div>
         <!--操作按钮-->
         <div class="table-operator">
@@ -123,7 +150,6 @@
         </div>
         <div>
           <j-table
-            v-if="columns && columns.length > 0"
             :columns="columns"
             :dataSource="dataSource"
             :can-drag="true"
@@ -198,7 +224,6 @@ import {
   getClauseTreeData,
   copyClause
 } from '../../../api/documentToolApi.js'
-import Search from '../../../components/customField/Search.vue'
 import { isHasPermission } from '../../../utils/hasPermission.js'
 import SplitDetailBatchEditDrawer from './modules/SplitDetailBatchEditDrawer.vue'
 import { downFile, downloadFile, postAction } from '../../../api/manage'
@@ -211,12 +236,12 @@ export default {
     SplitAddForm,
     SplitClauseDetail,
     SplitDetailNodeAdd,
-    Search,
     SplitDetailBatchEditDrawer
   },
   mixins: [ConfigurableTableMixin],
   data () {
     return {
+      queryParam: {},
       data: [],
       loading: false, // 提交的加载
       treeLoading: false, // 树形区域的加载
@@ -237,7 +262,35 @@ export default {
       flag: '4', // 查询要用到
       operateSlotName: 'action',
       getQueryConditionFunc: getDocSplitSearch,
-      getTableHeaderFunc: getDocSplitTableHeader,
+      // getTableHeaderFunc: getDocSplitTableHeader,
+      columns: [
+        {
+          dataIndex: 'item_num',
+          title: '条款号',
+          align: 'center',
+          width: 150
+        },
+        {
+          dataIndex: 'item_name',
+          title: '条款名称',
+          align: 'center',
+          width: 150
+        },
+        {
+          dataIndex: 'item_content',
+          title: '条款内容',
+          align: 'center',
+          width: 150,
+          scopedSlots: { customRender: 'item_content' }
+        },
+        {
+          title: this.$t('operation'),
+          align: 'center',
+          width: 160,
+          fixed: 'right',
+          scopedSlots: { customRender: 'action' }
+        }
+      ],
       treeData: [],
       searchValue: '',
       selectedKeys: [],
@@ -272,7 +325,13 @@ export default {
       tableSlotField: ['item_content', 'interpretation_articles'],
       uploadData: {},
       isBackTitle: true,
-      expandedKeys: []
+      expandedKeys: [],
+      labelCol: {
+        span: 6
+      },
+      wrapperCol: {
+        span: 14
+      }
     }
   },
   computed: {
@@ -297,8 +356,8 @@ export default {
     }
   },
   mounted () {
-    this.operateColumn.scopedSlots.customRender = 'action'
-    this.showAction = this.$route.query.createBy === this.userInfo.id || this.administrators
+    // this.operateColumn.scopedSlots.customRender = 'action'
+    this.showAction = true
     this.infoId = this.$route.query.infoId
     this.filters = {
       menu_id: this.menuId,
@@ -354,7 +413,7 @@ export default {
     showContent (fieldName, val) {
       const title = (this.columns.find(tt => tt.dbFieldName === fieldName) || {}).dbFieldTxt
       if (title) {
-        this.$refs.splitClauseDetail.title = title
+        this.$refs.splitClauseDetail.title = titler
       }
       this.$refs.splitClauseDetail.open(val)
     },