|
@@ -20,20 +20,20 @@
|
|
|
<!-- <a-input placeholder="请输入实绩试验类型" v-model="queryParam.shijiShiiyanType"></a-input>-->
|
|
|
<!-- </a-form-item>-->
|
|
|
<!-- </a-col>-->
|
|
|
- <a-col :xl="10" :lg="11" :md="12" :sm="24">
|
|
|
- <a-form-item label="任务日期">
|
|
|
- <j-date placeholder="请选择开始日期" class="query-group-cust" v-model="queryParam.workDate_begin"></j-date>
|
|
|
- <span class="query-group-split-cust"></span>
|
|
|
- <j-date placeholder="请选择结束日期" class="query-group-cust" v-model="queryParam.workDate_end"></j-date>
|
|
|
- </a-form-item>
|
|
|
- </a-col>
|
|
|
- <a-col :xl="10" :lg="11" :md="12" :sm="24">
|
|
|
- <a-form-item label="实绩任务日期">
|
|
|
- <j-date placeholder="请选择开始日期" class="query-group-cust" v-model="queryParam.shijiWorkDate_begin"></j-date>
|
|
|
- <span class="query-group-split-cust"></span>
|
|
|
- <j-date placeholder="请选择结束日期" class="query-group-cust" v-model="queryParam.shijiWorkDate_end"></j-date>
|
|
|
- </a-form-item>
|
|
|
- </a-col>
|
|
|
+<!-- <a-col :xl="10" :lg="11" :md="12" :sm="24">-->
|
|
|
+<!-- <a-form-item label="任务日期">-->
|
|
|
+<!-- <j-date placeholder="请选择开始日期" class="query-group-cust" v-model="queryParam.workDate_begin"></j-date>-->
|
|
|
+<!-- <span class="query-group-split-cust"></span>-->
|
|
|
+<!-- <j-date placeholder="请选择结束日期" class="query-group-cust" v-model="queryParam.workDate_end"></j-date>-->
|
|
|
+<!-- </a-form-item>-->
|
|
|
+<!-- </a-col>-->
|
|
|
+<!-- <a-col :xl="10" :lg="11" :md="12" :sm="24">-->
|
|
|
+<!-- <a-form-item label="实绩任务日期">-->
|
|
|
+<!-- <j-date placeholder="请选择开始日期" class="query-group-cust" v-model="queryParam.shijiWorkDate_begin"></j-date>-->
|
|
|
+<!-- <span class="query-group-split-cust"></span>-->
|
|
|
+<!-- <j-date placeholder="请选择结束日期" class="query-group-cust" v-model="queryParam.shijiWorkDate_end"></j-date>-->
|
|
|
+<!-- </a-form-item>-->
|
|
|
+<!-- </a-col>-->
|
|
|
</template>
|
|
|
<a-col :xl="6" :lg="7" :md="8" :sm="24">
|
|
|
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
|
|
@@ -183,6 +183,21 @@ export default {
|
|
|
align:"center",
|
|
|
dataIndex: 'shebeiId_dictText'
|
|
|
},
|
|
|
+ {
|
|
|
+ title:'试验类型',
|
|
|
+ align:"center",
|
|
|
+ dataIndex: 'shiiyanType_dictText'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title:'试验员',
|
|
|
+ align:"center",
|
|
|
+ dataIndex: 'worker'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ title:'委托样品数量',
|
|
|
+ align:"center",
|
|
|
+ dataIndex: 'yangpinCount'
|
|
|
+ },
|
|
|
// {
|
|
|
// title:'工单id',
|
|
|
// align:"center",
|
|
@@ -207,6 +222,12 @@ export default {
|
|
|
dataIndex: 'endTime'
|
|
|
},
|
|
|
{
|
|
|
+ title:'传感器',
|
|
|
+ align:"center",
|
|
|
+ dataIndex: 'chuanganqi_dictText'
|
|
|
+ // dataIndex: 'chuanganqi'
|
|
|
+ },
|
|
|
+ {
|
|
|
title:'实绩设备',
|
|
|
align:"center",
|
|
|
dataIndex: 'shijiShebeiId_dictText'
|
|
@@ -239,12 +260,6 @@ export default {
|
|
|
// align:"center",
|
|
|
// dataIndex: 'remark'
|
|
|
// },
|
|
|
- {
|
|
|
- title:'传感器',
|
|
|
- align:"center",
|
|
|
- dataIndex: 'chuanganqi_dictText'
|
|
|
- // dataIndex: 'chuanganqi'
|
|
|
- },
|
|
|
// {
|
|
|
// title: '操作',
|
|
|
// dataIndex: 'action',
|