Merge remote-tracking branch 'origin/master'

Houjie

3 天以前 3c5205d857446563b3f89ae7432d76ba6d945a69

 src/views/base/ShiftGroupManager.vue

@@ -7,7 +7,13 @@
          <!-- 搜索区域 -->
          <a-form layout="inline" @keyup.enter.native="searchQuery">
            <a-row :gutter="24">
              <a-col :md="6" :sm="8">
              <a-col :xl="6" :lg="7" :md="8" :sm="24">
                <a-form-item label="产线">
                  <j-dict-select-tag placeholder="请选择产线" v-model="queryParam.factoryId"
                                     dictCode="base_factory,factory_name,id,del_flag=0 and factory_category='3'"></j-dict-select-tag>
                </a-form-item>
              </a-col>
              <a-col :xl="6" :lg="7" :md="8" :sm="24">
                <a-form-item label="班组名称" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                  <a-input placeholder="" v-model="queryParam.groupName"></a-input>
                </a-form-item>
@@ -89,7 +95,7 @@
              <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
            <a-col :md="9" :sm="24">
             <a-button type="primary" @click="searchQuery2" icon="search" style="margin-left: 21px">查询</a-button>
              <a-button type="primary" @click="searchReset2" icon="reload" style="margin-left: 8px">重置</a-button>
              <a-button type="info" @click="searchReset2" icon="reload" style="margin-left: 8px">重置</a-button>

            </a-col>
          </span>
@@ -170,7 +176,7 @@
        queryParam2: {},
        dataSource1: [],
        dataSource2: [],
        ipagination1: {
        ipagination: {
          current: 1,
          pageSize: 10,
          pageSizeOptions: ['10', '20', '30'],
@@ -192,9 +198,9 @@
          showSizeChanger: true,
          total: 0
        },
        isorter1: {
          column: 'createTime',
          order: 'desc'
        isorter: {
          column: 'groupCode',
          order: 'asc'
        },
        isorter2: {
          column: 'createTime',