Commit d440aa81 by lichengming

修改了试验任务分配

parent ff041bdf
...@@ -48,7 +48,17 @@ export default { ...@@ -48,7 +48,17 @@ export default {
.post('soil/v1/experiment/page_allot_by_exp_his', data) .post('soil/v1/experiment/page_allot_by_exp_his', data)
.then(res => res), .then(res => res),
pageExperimentAllot: data => pageExperimentAllot: data =>
http.post('soil/v1/experiment/page_exp_allot', data).then(res => res), http.post('soil/v1/experiment/page_exp_allot_bath', data).then(res => res),
pageExperimentAllotBath: data =>
https
.post(
'soil/v1/experiment/page_exp_allot_bath?page=' +
data.page +
'&rows=' +
data.rows,
JSON.stringify(data.obj)
)
.then(res => res),
pageExperimentAllotHis: data => pageExperimentAllotHis: data =>
http.post('soil/v1/experiment/page_exp_allot_his', data).then(res => res), http.post('soil/v1/experiment/page_exp_allot_his', data).then(res => res),
pageTestByExp: data => pageTestByExp: data =>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<Col span="24"> <Col span="24">
<PTVXETable ref="pageTable" :page-columns="pageColumns" :table-name="tableName" <PTVXETable ref="pageTable" :page-columns="pageColumns" :table-name="tableName"
:table-height="tableHeight" :table-height="tableHeight"
:get-page="getPage" :is-radio="true" select-data hide-checkbox @on-result-change="_tableResultChange"> :get-page="getPage" select-data @on-result-change="_tableResultChange">
<vxe-table-column <vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns" v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key" :key="item.key"
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<Form id="task-assign-item-right" :label-width="70" inline onsubmit="return false"> <Form id="task-assign-item-right" :label-width="70" 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.sampleCode" @on-enter="_formSearch" placeholder="请输入试样编号" clearable></Input> <Input v-model="formObj.obj.sampleCode" @on-enter="_formSearch" placeholder="请输入试样编号" clearable></Input>
</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>
...@@ -67,7 +67,11 @@ export default { ...@@ -67,7 +67,11 @@ export default {
name: '', name: '',
testMethod: '', testMethod: '',
testBasis: '', testBasis: '',
sampleCode: undefined obj: {
nameList: [],
entrustId: undefined,
sampleCode: undefined
}
}, },
entrustId: '', entrustId: '',
// 用户自己选中的列 // 用户自己选中的列
...@@ -355,17 +359,18 @@ export default { ...@@ -355,17 +359,18 @@ export default {
return obj return obj
}, },
_page: async function() { _page: async function() {
const saveName = this.leftSelectData.name const saveName = []
const saveMethod = this.leftSelectData.testMethod for (let i = 0; i < this.leftSelectData.length; i++) {
saveName.push(this.leftSelectData[i].name)
}
// for (let i = 0; i < this.leftSelectData.length; i++) { // for (let i = 0; i < this.leftSelectData.length; i++) {
// saveName.push(this.leftSelectData[i].name) // saveName.push(this.leftSelectData[i].name)
// saveMethod.push(this.leftSelectData[i].testMethod) // saveMethod.push(this.leftSelectData[i].testMethod)
// } // }
Object.assign(this.formObj, this.$refs.pageTable._searchParams()) Object.assign(this.formObj, this.$refs.pageTable._searchParams())
this.formObj.entrustId = this.entrustId this.formObj.obj.entrustId = this.entrustId
this.formObj.name = saveName this.formObj.obj.nameList = saveName
this.formObj.testMethod = saveMethod const result = await soilTest.pageExperimentAllotBath(
const result = await soilTest.pageExperimentAllot(
this.$serializeForm(this.formObj) this.$serializeForm(this.formObj)
) )
if (result) { if (result) {
......
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