|
|
@@ -3,9 +3,10 @@
|
|
|
<div class="table-page-search-wrapper">
|
|
|
<a-form layout="inline" @keyup.enter.native="searchQuery">
|
|
|
<a-row :gutter="24">
|
|
|
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
|
|
|
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
|
|
|
<a-form-item label="委托单位名称">
|
|
|
- <j-search-select-tag placeholder="请选择委托单位名称" :dictOptions="weituoClientList" @change="handlewcChange"/>
|
|
|
+ <!-- <j-search-select-tag placeholder="请选择委托单位名称" :dictOptions="weituoClientList" @change="handlewcChange"/> -->
|
|
|
+ <j-search-select-tag placeholder="请选择委托单位名称" v-model="queryParam.weituoClient" :dictOptions="weituoClientList"/>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
<!-- <a-col :xl="7" :lg="7" :md="8" :sm="24"> -->
|
|
|
@@ -22,21 +23,29 @@
|
|
|
>
|
|
|
</a-select> -->
|
|
|
<!-- </a-col> -->
|
|
|
- <a-col :xl="5" :lg="7" :md="8" :sm="24">
|
|
|
- <a-date-picker :show-time="{ format: 'HH:mm:ss' }" format="YYYY-MM-DD HH:mm:ss" v-model:value="queryParam.startTime" placeholder="请输入开始时间"/>
|
|
|
- </a-col>
|
|
|
- <a-col :xl="5" :lg="7" :md="8" :sm="24">
|
|
|
- <a-date-picker format="YYYY-MM-DD HH:mm:ss" v-model:value="queryParam.endTime" placeholder="请输入结束时间"/>
|
|
|
+ <a-col :xl="10" :lg="11" :md="12" :sm="24">
|
|
|
+ <a-form-item label="选择时间">
|
|
|
+ <!-- <j-date :show-time="{ format: 'HH:mm:ss' }" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间" class="query-group-cust" v-model="queryParam.startTime"></j-date>
|
|
|
+ <span class="query-group-split-cust"></span>
|
|
|
+ <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" class="query-group-cust" v-model="queryParam.endTime"></j-date> -->
|
|
|
+ <a-date-picker :show-time="{ format: 'HH:mm:ss' }" class="query-group-cust" format="YYYY-MM-DD HH:mm:ss" v-model="queryParam.startTime" placeholder="请输入开始时间"/>
|
|
|
+ <span class="query-group-split-cust"></span>
|
|
|
+ <a-date-picker format="YYYY-MM-DD HH:mm:ss" class="query-group-cust" v-model="queryParam.endTime" placeholder="请输入结束时间"/>
|
|
|
+ </a-form-item>
|
|
|
+ <!-- <a-date-picker :show-time="{ format: 'HH:mm:ss' }" format="YYYY-MM-DD HH:mm:ss" v-model="queryParam.startTime" placeholder="请输入开始时间"/> -->
|
|
|
</a-col>
|
|
|
+ <!-- <a-col :xl="5" :lg="7" :md="8" :sm="24">
|
|
|
+ <a-date-picker format="YYYY-MM-DD HH:mm:ss" v-model="queryParam.endTime" placeholder="请输入结束时间"/>
|
|
|
+ </a-col> -->
|
|
|
|
|
|
<a-col :xl="6" :lg="7" :md="8" :sm="24">
|
|
|
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
|
|
|
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
|
|
|
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
|
|
|
- <a @click="handleToggleSearch" style="margin-left: 8px">
|
|
|
+ <!-- <a @click="handleToggleSearch" style="margin-left: 8px">
|
|
|
{{ toggleSearchStatus ? '收起' : '展开' }}
|
|
|
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
|
|
|
- </a>
|
|
|
+ </a> -->
|
|
|
</span>
|
|
|
</a-col>
|
|
|
</a-row>
|
|
|
@@ -44,28 +53,28 @@
|
|
|
</div>
|
|
|
<!-- 查询区域-END -->
|
|
|
<!-- 操作按钮区域 -->
|
|
|
- <div class="table-operator">
|
|
|
- <!-- <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> -->
|
|
|
- <!-- <a-button type="primary" icon="download" @click="handleExportXls('委托样品')">导出</a-button>
|
|
|
+ <!-- <div class="table-operator">
|
|
|
+ <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
|
|
|
+ <a-button type="primary" icon="download" @click="handleExportXls('委托样品')">导出</a-button>
|
|
|
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
|
|
|
<a-button type="primary" icon="import">导入</a-button>
|
|
|
</a-upload> -->
|
|
|
<!-- 高级查询区域 -->
|
|
|
- <!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query> -->
|
|
|
+ <!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
|
|
|
<a-dropdown v-if="selectedRowKeys.length > 0">
|
|
|
<a-menu slot="overlay">
|
|
|
<a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
|
|
|
</a-menu>
|
|
|
<a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
|
|
|
</a-dropdown>
|
|
|
- </div>
|
|
|
+ </div> -->
|
|
|
|
|
|
<!-- table区域-begin -->
|
|
|
<div>
|
|
|
- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
|
|
|
+ <!-- <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
|
|
|
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
|
|
|
<a style="margin-left: 24px" @click="onClearSelected">清空</a>
|
|
|
- </div>
|
|
|
+ </div> -->
|
|
|
|
|
|
<a-table
|
|
|
ref="table"
|
|
|
@@ -77,7 +86,6 @@
|
|
|
:dataSource="dataSource"
|
|
|
:pagination="ipagination"
|
|
|
:loading="loading"
|
|
|
- :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
|
|
|
class="j-table-force-nowrap"
|
|
|
@change="handleTableChange">
|
|
|
|
|
|
@@ -104,7 +112,7 @@
|
|
|
<span slot="action" slot-scope="text, record">
|
|
|
<!-- <a @click="handleEdit(record)">编辑</a> -->
|
|
|
|
|
|
- <a-divider type="vertical" />
|
|
|
+ <!-- <a-divider type="vertical" /> -->
|
|
|
<a-dropdown>
|
|
|
<!-- <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
|
|
|
<a-menu slot="overlay"> -->
|
|
|
@@ -147,24 +155,23 @@
|
|
|
// 表头
|
|
|
columns: [
|
|
|
{
|
|
|
- title: '#',
|
|
|
- dataIndex: '',
|
|
|
- key:'rowIndex',
|
|
|
- width:60,
|
|
|
- align:"center",
|
|
|
- customRender:function (t,r,index) {
|
|
|
- return parseInt(index)+1;
|
|
|
- }
|
|
|
- },
|
|
|
- {
|
|
|
title:'委托单位名称',
|
|
|
align:"center",
|
|
|
- dataIndex: 'weituoClient'
|
|
|
- },
|
|
|
- {
|
|
|
- title:'委托单id',
|
|
|
- align:"center",
|
|
|
- dataIndex: 'weituoId'
|
|
|
+ dataIndex: 'weituoClient',
|
|
|
+ customRender: (value, row, index) => {
|
|
|
+ console.log(value, row, index);
|
|
|
+ const obj = {
|
|
|
+ children: value,
|
|
|
+ attrs: {},
|
|
|
+ };
|
|
|
+ if(index === 0){ // 第一行数据开始，跨行合并的长度为数据data的长度
|
|
|
+ obj.attrs.rowSpan = this.dataSource.length;
|
|
|
+ }
|
|
|
+ if (index >= 1) { // 从第一行往后的所有行表格均合并
|
|
|
+ obj.attrs.rowSpan = 0;
|
|
|
+ }
|
|
|
+ return obj;
|
|
|
+ }
|
|
|
},
|
|
|
{
|
|
|
title:'样品名称',
|
|
|
@@ -201,6 +208,11 @@
|
|
|
align:"center",
|
|
|
dataIndex:'beizhu'
|
|
|
},
|
|
|
+ {
|
|
|
+ title:'时间',
|
|
|
+ align:"center",
|
|
|
+ dataIndex:'createTime'
|
|
|
+ },
|
|
|
// {
|
|
|
// title:'生产厂家',
|
|
|
// align:"center",
|
|
|
@@ -216,7 +228,7 @@
|
|
|
dataIndex: 'action',
|
|
|
align:"center",
|
|
|
fixed:"right",
|
|
|
- width:120,
|
|
|
+ width:70,
|
|
|
scopedSlots: { customRender: 'action' }
|
|
|
}
|
|
|
],
|
|
|
@@ -256,25 +268,25 @@
|
|
|
|
|
|
},
|
|
|
|
|
|
- handlewcChange(data){
|
|
|
+ // handlewcChange(data){
|
|
|
|
|
|
- var weituoClient={weituoClient:data}
|
|
|
- getAction('/weituo/itdmWeituoInfo/weituoNoList', weituoClient).then((res) => {
|
|
|
- if (res.success) {
|
|
|
- console.log("xxxxxxxxxxxxxxxxxxx")
|
|
|
- console.log(res.result)
|
|
|
- this.weituoNoList = res.result.map(i=>{
|
|
|
- return { value: i.id, text: i.weituoNo}
|
|
|
- })
|
|
|
- console.log(this.weituoNoList)
|
|
|
- }
|
|
|
- })
|
|
|
+ // var weituoClient={weituoClient:data}
|
|
|
+ // getAction('/weituo/itdmWeituoInfo/weituoNoList', weituoClient).then((res) => {
|
|
|
+ // if (res.success) {
|
|
|
+ // console.log("xxxxxxxxxxxxxxxxxxx")
|
|
|
+ // console.log(res.result)
|
|
|
+ // this.weituoNoList = res.result.map(i=>{
|
|
|
+ // return { value: i.id, text: i.weituoNo}
|
|
|
+ // })
|
|
|
+ // console.log(this.weituoNoList)
|
|
|
+ // }
|
|
|
+ // })
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
- console.log(data)
|
|
|
- },
|
|
|
+ // console.log(data)
|
|
|
+ // },
|
|
|
initDictConfig(){
|
|
|
},
|
|
|
getSuperFieldList(){
|
wyh