Commit 91e71dd9 by lichengming

修改了收样管理项目负责人下拉

parent a4703383
...@@ -157,6 +157,7 @@ export default { ...@@ -157,6 +157,7 @@ export default {
.post('soil/v1/prepare/bath_update_surplus_info/', data) .post('soil/v1/prepare/bath_update_surplus_info/', data)
.then(res => res), .then(res => res),
getUserList: data => http.post('/base/v1/user/page').then(res => res), getUserList: data => http.post('/base/v1/user/page').then(res => res),
queryUserList: data => http.post('/base/v1/user/page', data).then(res => res),
scanTakeSample: data => scanTakeSample: data =>
http http
.post('soil/v1/sample/scan_take_sample?sampleCode=' + data) .post('soil/v1/sample/scan_take_sample?sampleCode=' + data)
......
...@@ -16,8 +16,11 @@ ...@@ -16,8 +16,11 @@
@on-result-change="_projectChange" name="projectName" placeholder="请输入或选择项目名称" @on-result-change="_projectChange" name="projectName" placeholder="请输入或选择项目名称"
></AutoComplete> ></AutoComplete>
</Form-item> </Form-item>
<Form-item @click.native="_selectProjectPerson" label="项目负责人" prop="projectLeader" class="width-48"> <Form-item label="项目负责人" prop="projectLeader" class="width-48">
<Input v-model="formObj.projectLeader" name="projectLeader" placeholder="请输入项目负责人"/> <AutoComplete ref="autoInput" v-model="formObj.projectLeader" :down-data="projectLeaderData"
@on-result-change="_projectLeaderChange" show-key="realname" name="projectLeader" placeholder="请输入或选择项目负责人"
></AutoComplete>
<!-- <Input v-model="formObj.projectLeader" name="projectLeader" placeholder="请输入项目负责人"/>-->
</Form-item> </Form-item>
<Form-item label="钻孔名称" prop="boreholeName" class="width-48"> <Form-item label="钻孔名称" prop="boreholeName" class="width-48">
<Input v-model="formObj.boreholeName" name="boreholeName" placeholder="请输入名称"/> <Input v-model="formObj.boreholeName" name="boreholeName" placeholder="请输入名称"/>
...@@ -49,7 +52,7 @@ ...@@ -49,7 +52,7 @@
/** /**
* 添加编辑分包商 * 添加编辑分包商
*/ */
import { meterEntrust, meterSample, soilEntrust } from '../../api' import { meterEntrust, meterSample, soilEntrust, soilSample } from '../../api'
import importModal from '../../components/import/DownloadTemplateImport' import importModal from '../../components/import/DownloadTemplateImport'
import AutoComplete from '../../components/base/AutoCompletes' import AutoComplete from '../../components/base/AutoCompletes'
import SampleItemSelect from '../meter-aptitude/standard-manage/SampleItemSelect' import SampleItemSelect from '../meter-aptitude/standard-manage/SampleItemSelect'
...@@ -75,6 +78,7 @@ export default { ...@@ -75,6 +78,7 @@ export default {
showBtn: true, showBtn: true,
customerData: [], customerData: [],
projectData: [], projectData: [],
projectLeaderData: [],
edit: false, edit: false,
cityData: [], cityData: [],
selectData: [], selectData: [],
...@@ -308,8 +312,34 @@ export default { ...@@ -308,8 +312,34 @@ export default {
this._projectQuery(data) this._projectQuery(data)
} }
}, },
_projectLeaderChange(msg, data) {
if (this.$string(this.id).isEmpty()) {
// 添加的时候选择单位
switch (msg) {
case 'select':
this._leaderMatch(data)
break
case 'query':
this._leaderQuery(data)
break
}
} else if (this.projectLeaderData.indexOf(data) !== -1) {
this._queryUserList(data)
} else {
this._leaderQuery(data)
}
},
_leaderMatch(data) {
this.formObj.projectLeader = data.realname
if (data.id) {
this.formObj.projectLeaderId = data.id
}
},
_leaderQuery(query) {
this._queryUserList(query)
},
_projectMatch(data) { _projectMatch(data) {
this._getQueryList(data) this.formObj.projectName = data
}, },
_projectQuery(query) { _projectQuery(query) {
this.formObj.projectName = query this.formObj.projectName = query
...@@ -596,6 +626,7 @@ export default { ...@@ -596,6 +626,7 @@ export default {
this.$refs.autoInput._clear() this.$refs.autoInput._clear()
this.edit = false this.edit = false
this._getProjectList() this._getProjectList()
this._getLeaderList()
this.showBtn = true this.showBtn = true
this.showModal = true this.showModal = true
this._hideLoading() this._hideLoading()
...@@ -669,6 +700,12 @@ export default { ...@@ -669,6 +700,12 @@ export default {
this.projectData = projectlist this.projectData = projectlist
} }
}, },
_getLeaderList: async function() {
const result = await soilSample.getUserList()
if (result) {
this.projectLeaderData = result.records
}
},
_getQueryList: async function(data) { _getQueryList: async function(data) {
const result = await meterEntrust.pageQueryList(data) const result = await meterEntrust.pageQueryList(data)
const queryList = [] const queryList = []
...@@ -680,6 +717,13 @@ export default { ...@@ -680,6 +717,13 @@ export default {
console.log('委托商', result) console.log('委托商', result)
} }
}, },
_queryUserList: async function(query) {
console.log(query)
const result = await soilSample.queryUserList(query)
if (result) {
this.projectLeaderData = result.records
}
},
_getProjectQueryList: async function(data) { _getProjectQueryList: async function(data) {
const queryData = {} const queryData = {}
queryData.type = '项目名称' queryData.type = '项目名称'
......
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