Commit d7ed14b7 by lichengming

修改了开土制备的原始记录填写

parent 05cb31e2
......@@ -69,6 +69,16 @@ export default {
JSON.stringify(data.obj)
)
.then(res => res),
pageExpPrepareBath: data =>
https
.post(
'soil/v1/experiment/page_exp_prepare_bath?page=' +
data.page +
'&rows=' +
data.rows,
JSON.stringify(data.obj)
)
.then(res => res),
pageExpPrepare: data =>
http.post('soil/v1/experiment/page_exp_prepare', data).then(res => res),
zTree: data =>
......
......@@ -18,9 +18,9 @@
</Col>
<!-- 表格 -->
<Col span="24">
<PTVXETable ref="pageTable" :isRadio="true" :pageColumns="pageColumns" :table-name="tableName"
<PTVXETable ref="pageTable" :pageColumns="pageColumns" :table-name="tableName"
:tableHeight="tableHeight"
@on-result-change="_tableResultChange" :getPage="getPage" :hide-checkbox="true" select-data>
@on-result-change="_tableResultChange" :getPage="getPage" select-data>
<vxe-table-column
v-for="item in userColumns.length > 0 ?userColumns:pageColumns"
:key="item.key"
......@@ -52,6 +52,7 @@ export default {
formObj: {
name: undefined
},
selectDataName: [],
tableName: 'food-task-assign-item-left',
// 用户自己选中的列
userColumns: [],
......@@ -116,10 +117,15 @@ export default {
console.log(msg, data)
switch (msg) {
case 'page':
this.getPage = this.$store.state.FoodItem.page
this._page()
break
case 'selectData':
this.$emit('on-result-change', data)
this.selectDataName = []
for (let i = 0; i < data.length; i++) {
this.selectDataName.push(data[i].name)
}
console.log('selectDataName', this.selectDataName)
this.$emit('on-result-change', this.selectDataName)
break
case 'singleSelect':
this.$emit('on-result-change', data)
......
......@@ -90,7 +90,11 @@ export default {
entrustId: '',
name: '',
testMethod: '',
testBasis: ''
testBasis: '',
obj: {
entrustId: '',
nameList: []
}
},
entrustId: '',
envPro: false,
......@@ -152,7 +156,7 @@ export default {
{ title: '检测依据', key: 'testBasis', width: 140 },
{ title: '检测科室', key: 'groupName', width: 150 }
],
leftSelectData: {},
leftSelectData: [],
selectIds: [], // 检测项目id
selectData: [], // 检测项目data
selectSampleIds: [], // 样品ids
......@@ -610,11 +614,13 @@ export default {
return obj
},
_page: async function() {
this.formObj.obj.nameList = []
Object.assign(this.formObj, this.$refs.pageTable._searchParams())
this.formObj.entrustId = this.entrustId
this.formObj.name = this.leftSelectData.name
this.formObj.testMethod = this.leftSelectData.testMethod
const result = await soilTest.pageExpPrepare(
this.formObj.obj.entrustId = this.entrustId
this.formObj.obj.nameList = this.leftSelectData
// this.formObj.entrustId = this.entrustId
// this.formObj.nameList = this.leftSelectData.join(',')
const result = await soilTest.pageExpPrepareBath(
this.$serializeForm(this.formObj)
)
if (result) {
......@@ -623,6 +629,20 @@ export default {
this.getPage = result
}
},
// _page: async function() {
// Object.assign(this.formObj, this.$refs.pageTable._searchParams())
// this.formObj.entrustId = this.entrustId
// this.formObj.name = this.leftSelectData.name
// this.formObj.testMethod = this.leftSelectData.testMethod
// const result = await soilTest.pageExpPrepare(
// this.$serializeForm(this.formObj)
// )
// if (result) {
// this.$refs.pageTable._hideLoading()
// this.$refs.pageTable._checkAll()
// this.getPage = result
// }
// },
_tableResultChange(msg, data) {
const selectIds = []
switch (msg) {
......
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