Commit 9f964dd1 by wangweidong

优化修改

parent b719b6c4
...@@ -8,11 +8,11 @@ ...@@ -8,11 +8,11 @@
<Col span="24" style="margin-top: 10px"> <Col span="24" style="margin-top: 10px">
<Form v-show="searchOpen" id="formId" :label-width="90" inline onsubmit="return false"> <Form v-show="searchOpen" id="formId" :label-width="90" inline onsubmit="return false">
<label class="label-sign"></label> <label class="label-sign"></label>
<Form-item class="search-item" label="实验室名称:"> <Form-item class="search-item" label="委托单位:">
<Input v-model="formObj.name" name="name" placeholder="请输入实验室名称" clearable @on-enter="_formSearch"/> <Input v-model="formObj.client" name="client" placeholder="请输入委托单位" clearable @on-enter="_formSearch"/>
</Form-item> </Form-item>
<Form-item class="search-item" label="资质:"> <Form-item class="search-item" label="合同编号:">
<Input v-model="formObj.aptitude" name="aptitude" placeholder="请输入资质" clearable @on-enter="_formSearch"/> <Input v-model="formObj.salesCode" name="salesCode" placeholder="请输入合同编号" clearable @on-enter="_formSearch"/>
</Form-item> </Form-item>
<Form-item class="search-btn"> <Form-item class="search-btn">
<Button type="primary" @click="_formSearch">搜索</Button> <Button type="primary" @click="_formSearch">搜索</Button>
...@@ -104,8 +104,8 @@ export default { ...@@ -104,8 +104,8 @@ export default {
} }
], ],
formObj: { formObj: {
name: undefined, client: undefined,
aptitude: undefined salesCode: undefined
}, },
selectIds: [], selectIds: [],
selectData: [], selectData: [],
......
...@@ -30,6 +30,12 @@ ...@@ -30,6 +30,12 @@
<Form-item label="合同编号" prop="salesCode" class="width-48"> <Form-item label="合同编号" prop="salesCode" class="width-48">
<Input v-model="formObj.salesCode" name="salesCode" placeholder="请输入合同编号"/> <Input v-model="formObj.salesCode" name="salesCode" placeholder="请输入合同编号"/>
</Form-item> </Form-item>
<Form-item label="合同登记时间:" prop="edate" class="width-48">
<Date-picker v-model="formObj.edate" @on-change="_etimeChange" type="date" split-panels style="width:100%;"
placeholder="请选择合同登记时间"></Date-picker>
</Form-item>
<Form-item label="要求完成时间:" prop="odate" class="width-48"> <Form-item label="要求完成时间:" prop="odate" class="width-48">
<Date-picker v-model="formObj.odate" @on-change="_ctimeChange" type="date" split-panels style="width:100%;" <Date-picker v-model="formObj.odate" @on-change="_ctimeChange" type="date" split-panels style="width:100%;"
placeholder="请选择要求完成时间"></Date-picker> placeholder="请选择要求完成时间"></Date-picker>
...@@ -310,10 +316,10 @@ export default { ...@@ -310,10 +316,10 @@ export default {
console.log(query) console.log(query)
}, },
_ctimeChange(data) { _ctimeChange(data) {
console.log('时间', data)
this.formObj.odate = data this.formObj.odate = data
// this.formObj.ctimeBegin = data[0] },
// this.formObj.ctimeEnd = data[1] _etimeChange(data) {
this.formObj.edate = data
}, },
_judgeBasisChange(msg, data) { _judgeBasisChange(msg, data) {
switch (msg) { switch (msg) {
......
...@@ -8,11 +8,11 @@ ...@@ -8,11 +8,11 @@
<Col span="24" style="margin-top: 10px"> <Col span="24" style="margin-top: 10px">
<Form id="formId" v-show="searchOpen" :label-width="90" inline onsubmit="return false"> <Form id="formId" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
<label class="label-sign"></label> <label class="label-sign"></label>
<Form-item class="search-item" label="实验室名称:"> <Form-item class="search-item" label="委托单位:">
<Input v-model="formObj.name" @on-enter="_formSearch" name="name" placeholder="请输入实验室名称" clearable/> <Input v-model="formObj.client" @on-enter="_formSearch" name="client" placeholder="请输入委托单位" clearable/>
</Form-item> </Form-item>
<Form-item class="search-item" label="资质:"> <Form-item class="search-item" label="合同编号:">
<Input v-model="formObj.aptitude" @on-enter="_formSearch" name="aptitude" placeholder="请输入资质" clearable/> <Input v-model="formObj.salesCode" @on-enter="_formSearch" name="salesCode" placeholder="请输入合同编号" clearable/>
</Form-item> </Form-item>
<Form-item class="search-btn"> <Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button> <Button @click="_formSearch" type="primary">搜索</Button>
...@@ -62,11 +62,16 @@ export default { ...@@ -62,11 +62,16 @@ export default {
formId: 'meterSubcontractorFormId', formId: 'meterSubcontractorFormId',
searchOpen: false, searchOpen: false,
btn: [ btn: [
{ // {
type: 'success', // type: 'success',
id: 'meter-contract-register-his-add', // id: 'meter-contract-register-his-add',
name: '添加' // name: '添加'
} // },
// {
// type: 'success',
// id: '',
// name: '导出项目统计表'
// }
], ],
iconMsg: [ iconMsg: [
// { // {
...@@ -96,8 +101,8 @@ export default { ...@@ -96,8 +101,8 @@ export default {
} }
], ],
formObj: { formObj: {
name: undefined, client: undefined,
aptitude: undefined salesCode: undefined
}, },
selectIds: [], selectIds: [],
getPage: {}, getPage: {},
......
...@@ -8,11 +8,11 @@ ...@@ -8,11 +8,11 @@
<Col span="24" style="margin-top: 10px"> <Col span="24" style="margin-top: 10px">
<Form id="formId" v-show="searchOpen" :label-width="90" inline onsubmit="return false"> <Form id="formId" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
<label class="label-sign"></label> <label class="label-sign"></label>
<Form-item class="search-item" label="实验室名称:"> <Form-item class="search-item" label="委托单位:">
<Input v-model="formObj.name" @on-enter="_formSearch" name="name" placeholder="请输入实验室名称" clearable/> <Input v-model="formObj.client" @on-enter="_formSearch" name="client" placeholder="请输入委托单位" clearable/>
</Form-item> </Form-item>
<Form-item class="search-item" label="资质:"> <Form-item class="search-item" label="合同编号:">
<Input v-model="formObj.aptitude" @on-enter="_formSearch" name="aptitude" placeholder="请输入资质" clearable/> <Input v-model="formObj.salesCode" @on-enter="_formSearch" name="salesCode" placeholder="请输入合同编号" clearable/>
</Form-item> </Form-item>
<Form-item class="search-btn"> <Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button> <Button @click="_formSearch" type="primary">搜索</Button>
...@@ -114,8 +114,8 @@ export default { ...@@ -114,8 +114,8 @@ export default {
} }
], ],
formObj: { formObj: {
name: undefined, client: undefined,
aptitude: undefined salesCode: undefined
}, },
selectIds: [], selectIds: [],
getPage: {}, getPage: {},
......
...@@ -8,11 +8,11 @@ ...@@ -8,11 +8,11 @@
<Col span="24" style="margin-top: 10px"> <Col span="24" style="margin-top: 10px">
<Form id="formId" v-show="searchOpen" :label-width="90" inline onsubmit="return false"> <Form id="formId" v-show="searchOpen" :label-width="90" inline onsubmit="return false">
<label class="label-sign"></label> <label class="label-sign"></label>
<Form-item class="search-item" label="实验室名称:"> <Form-item class="search-item" label="委托单位:">
<Input v-model="formObj.name" @on-enter="_formSearch" name="name" placeholder="请输入实验室名称" clearable/> <Input v-model="formObj.client" @on-enter="_formSearch" name="client" placeholder="请输入委托单位" clearable/>
</Form-item> </Form-item>
<Form-item class="search-item" label="资质:"> <Form-item class="search-item" label="合同编号:">
<Input v-model="formObj.aptitude" @on-enter="_formSearch" name="aptitude" placeholder="请输入资质" clearable/> <Input v-model="formObj.salesCode" @on-enter="_formSearch" name="salesCode" placeholder="请输入合同编号" clearable/>
</Form-item> </Form-item>
<Form-item class="search-btn"> <Form-item class="search-btn">
<Button @click="_formSearch" type="primary">搜索</Button> <Button @click="_formSearch" type="primary">搜索</Button>
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<!--表格--> <!--表格-->
<Col span="24"> <Col span="24">
<PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true" <PTVXETable ref="pageTable" :table-height="tableHeight" :form-id="formId" :loading="true"
:get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange" hide-checkbox> :get-page="getPage" :icon-msg="iconMsg" @on-result-change="_tableResultChange">
<vxe-table-column <vxe-table-column
v-for="item in pageColumns" v-for="item in pageColumns"
:key="item.key" :key="item.key"
...@@ -62,10 +62,15 @@ export default { ...@@ -62,10 +62,15 @@ export default {
formId: 'meterSubcontractorFormId', formId: 'meterSubcontractorFormId',
searchOpen: false, searchOpen: false,
btn: [ btn: [
// {
// type: 'success',
// id: 'contract-review-meter-contract-review-his-add',
// name: '添加'
// },
{ {
type: 'success', type: 'success',
id: 'contract-review-meter-contract-review-his-add', id: '',
name: '添加' name: '导出项目统计表'
} }
], ],
iconMsg: [ iconMsg: [
...@@ -96,8 +101,8 @@ export default { ...@@ -96,8 +101,8 @@ export default {
} }
], ],
formObj: { formObj: {
name: undefined, client: undefined,
aptitude: undefined salesCode: undefined
}, },
selectIds: [], selectIds: [],
getPage: {}, getPage: {},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment