Merge branch 'bjxz-dev' of http://139.9.66.234:18023/dhp/zhgdyun into bjxz-dev

This commit is contained in:
”Rain“ 2024-05-25 23:31:38 +08:00
commit 7d3862422f
30 changed files with 123 additions and 66 deletions

View File

@ -1,3 +1,4 @@
const newLocal = '总投资额(万元)';
export default { export default {
projectExtension:'项目扩展信息表', projectExtension:'项目扩展信息表',
contractSigning:'合同签订', contractSigning:'合同签订',
@ -18,6 +19,9 @@ export default {
editProjectFormRules: { editProjectFormRules: {
contractPrice: [ contractPrice: [
{ required: true, message: "请输入合同额", trigger: "change" }, { required: true, message: "请输入合同额", trigger: "change" },
],
investmentPrice: [
{ required: true, message: "请输入投资额", trigger: "change" },
], ],
contractSignTime: [ contractSignTime: [
{ required: true, message: "请选择合同签订日期", trigger: "change" }, { required: true, message: "请选择合同签订日期", trigger: "change" },
@ -48,5 +52,6 @@ export default {
], ],
}, },
modifySuccessfully:"修改成功", modifySuccessfully:"修改成功",
contractPrice:'合同额(万元)' contractPrice:'施工合同额(万元)',
investmentPrice:'总投资额(万元)'
} }

View File

@ -31,4 +31,5 @@ subpackage9:'总承包单位',
subpackage10:'勘查单位', subpackage10:'勘查单位',
subpackage11:'设计单位', subpackage11:'设计单位',
subpackage12:'其它', subpackage12:'其它',
subpackage13:'全部类型',
} }

View File

@ -84,10 +84,10 @@ if (process.env.NODE_ENV == 'development') {
// axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益(上海建工) // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益(上海建工)
// axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地
axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地 // axios.defaults.baseURL ='http://192.168.34.221:9111/' //郭圣雄本地
// axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地
// axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程 // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程
// axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程 axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程
// axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈
// axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头 // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头
// axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目 // axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目

View File

@ -61,18 +61,18 @@ export default new Vuex.Store({
// UPLOADURL:'http://42.180.188.17:11211/upload/image',//测试 // UPLOADURL:'http://42.180.188.17:11211/upload/image',//测试
// FILEURL:'http://42.180.188.17:11211/image/',//测试 // FILEURL:'http://42.180.188.17:11211/image/',//测试
// BASEURL: baseUrl BASEURL: baseUrl
// ? baseUrl ? baseUrl
// : window.location.protocol + "//" + window.location.host + "/", //正式环境 : window.location.protocol + "//" + window.location.host + "/", //正式环境
// UPLOADURL: UPLOADURL:
// window.location.protocol + window.location.protocol +
// "//" + "//" +
// window.location.host + window.location.host +
// "/upload/image", //正式环境 "/upload/image", //正式环境
// FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
// WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用) // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用)
// WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用) // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用)
// WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址 WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址
// WORKFLOWURL: 'http://42.180.188.17:19098/#/workspace/forms',//鞍钢测试平台工作流地址 // WORKFLOWURL: 'http://42.180.188.17:19098/#/workspace/forms',//鞍钢测试平台工作流地址
//--------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------
// BASEURL: baseUrl // BASEURL: baseUrl

View File

@ -220,7 +220,7 @@
</div> </div>
</div> </div>
</el-dialog> </el-dialog>
<!-- 新增企业弹框 --> <!-- 弹框 -->
<el-dialog :modal-append-to-body="false" @close="close" :title="titleRes" :visible.sync="diaLogShow" width="667px"> <el-dialog :modal-append-to-body="false" @close="close" :title="titleRes" :visible.sync="diaLogShow" width="667px">
<div class="dialog_content"> <div class="dialog_content">
<el-form size="medium" ref="addEditForm" :model="addEditForm" :rules="addEditRules" label-width="120px" class="dialogFormBox"> <el-form size="medium" ref="addEditForm" :model="addEditForm" :rules="addEditRules" label-width="120px" class="dialogFormBox">

View File

@ -783,6 +783,7 @@
<el-select <el-select
v-model="addEditForm.alarmPushWorkerId" v-model="addEditForm.alarmPushWorkerId"
multiple multiple
filterable
collapse-tags collapse-tags
:placeholder="$t('message.deviceManage.placeholder_select')" :placeholder="$t('message.deviceManage.placeholder_select')"
> >

View File

@ -95,7 +95,7 @@
:props="props" :props="props"
clearable> clearable>
</el-cascader> --> </el-cascader> -->
<el-select v-model="addForm.responsibilityCompanyId" placeholder="请选择责任分包单位" @change="unitChange"> <el-select v-model="addForm.responsibilityCompanyId" filterable placeholder="请选择责任分包单位" @change="unitChange">
<el-option <el-option
:label="item.enterpriseName" :label="item.enterpriseName"
:value="item.id" :value="item.id"
@ -107,7 +107,7 @@
</el-form-item> </el-form-item>
<el-form-item label="责任人:" required :label-width="formLabelWidth"> <el-form-item label="责任人:" required :label-width="formLabelWidth">
<!-- <el-input v-model="addForm.personLiable" :disabled="isDisabled" placeholder="请输入责任人" autocomplete="off"></el-input> --> <!-- <el-input v-model="addForm.personLiable" :disabled="isDisabled" placeholder="请输入责任人" autocomplete="off"></el-input> -->
<el-select v-model="addForm.personLiableId" placeholder="请选择责任人"> <el-select v-model="addForm.personLiableId" filterable placeholder="请选择责任人">
<el-option <el-option
:label="item.realName" :label="item.realName"
:value="item.userId" :value="item.userId"

View File

@ -57,7 +57,7 @@
<el-input v-model="addEditForm.devSn" placeholder="请输入"></el-input> <el-input v-model="addEditForm.devSn" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="司机" prop="driverId"> <el-form-item label="司机" prop="driverId">
<el-select v-model="addEditForm.driverId" placeholder="请选择" clearable :style="{ width: '100%' }"> <el-select v-model="addEditForm.driverId" filterable placeholder="请选择" clearable :style="{ width: '100%' }">
<el-option v-for="(item, index) in workerList" :key="index" :label="item.workerName" :value="item.id"></el-option> <el-option v-for="(item, index) in workerList" :key="index" :label="item.workerName" :value="item.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>

View File

@ -4,7 +4,7 @@
<div class="search-box"> <div class="search-box">
<el-form :inline="true" :model="formInline" class="demo-form-inline" size="small"> <el-form :inline="true" :model="formInline" class="demo-form-inline" size="small">
<el-form-item label="企业"> <el-form-item label="企业">
<el-select v-model="formInline.enterpriseId" placeholder="请选择企业"> <el-select v-model="formInline.enterpriseId" filterable placeholder="请选择企业">
<el-option :label="item.enterpriseName" :value="item.id" <el-option :label="item.enterpriseName" :value="item.id"
v-for="(item, index) in responsibilityList" :key="index"> v-for="(item, index) in responsibilityList" :key="index">
</el-option> </el-option>

View File

@ -4,7 +4,7 @@
<div class="search-box"> <div class="search-box">
<el-form :inline="true" :model="formInline" class="demo-form-inline" size="small"> <el-form :inline="true" :model="formInline" class="demo-form-inline" size="small">
<el-form-item label="企业"> <el-form-item label="企业">
<el-select v-model="formInline.enterpriseId" placeholder="请选择企业"> <el-select v-model="formInline.enterpriseId" filterable placeholder="请选择企业">
<el-option :label="item.enterpriseName" :value="item.id" <el-option :label="item.enterpriseName" :value="item.id"
v-for="(item, index) in responsibilityList" :key="index"> v-for="(item, index) in responsibilityList" :key="index">
</el-option> </el-option>

View File

@ -4,7 +4,7 @@
<div class="search-box"> <div class="search-box">
<el-form :inline="true" :model="formInline" class="demo-form-inline" size="small"> <el-form :inline="true" :model="formInline" class="demo-form-inline" size="small">
<el-form-item label="企业"> <el-form-item label="企业">
<el-select v-model="formInline.enterpriseId" placeholder="请选择企业"> <el-select v-model="formInline.enterpriseId" filterable placeholder="请选择企业">
<el-option :label="item.enterpriseName" :value="item.id" <el-option :label="item.enterpriseName" :value="item.id"
v-for="(item, index) in responsibilityList" :key="index"> v-for="(item, index) in responsibilityList" :key="index">
</el-option> </el-option>

View File

@ -83,7 +83,7 @@
<div @click="openDoor"> <div @click="openDoor">
<el-radio :label="1">手动抽题</el-radio> <el-radio :label="1">手动抽题</el-radio>
</div> </div>
<div style="margin-left:10px" @click="dialogVisible3 = true"> <div style="margin-left:10px" @click="openRandom">
<el-radio :label="2">随机抽题</el-radio> <el-radio :label="2">随机抽题</el-radio>
</div> </div>
</div> </div>
@ -595,6 +595,15 @@ export default {
// this.loadData() // // this.loadData() //
}, },
methods: { methods: {
openRandom(){
this.dialogVisible3 = true
this.getList({
pageNo: 1,
pageSize: 99999,
questionName: "",
questionSubjectId: this.randomQuestion.name,
})
},
cancel2(){ cancel2(){
// this.examForm.checkQuestionType = null // this.examForm.checkQuestionType = null
this.dialogVisible2 = false this.dialogVisible2 = false
@ -856,13 +865,13 @@ export default {
this.$message.success('新增成功') this.$message.success('新增成功')
this.handleClose() this.handleClose()
this.getRecordList() this.getRecordList()
this.clearFilter()
}) })
} else { } else {
// this.examForm.questions = this.$refs.questionListTable.selection; // this.examForm.questions = this.$refs.questionListTable.selection;
if(this.$refs.questionListTable){ if(this.$refs.questionListTable){
this.examForm.questions = this.$refs.questionListTable.selection; this.examForm.questions = this.$refs.questionListTable.selection;
} else { } else {
// if(this.examForm.checkQuestionType === 1){
let arr = []; let arr = [];
this.questionList.map(item => { this.questionList.map(item => {
this.examForm.questions.split(',').map(item2 => { this.examForm.questions.split(',').map(item2 => {
@ -873,21 +882,13 @@ export default {
}) })
}) })
this.examForm.questions = arr; this.examForm.questions = arr;
// }else{
console.log("==========================")
console.log(this.examForm)
console.log("==========================")
// }
} }
console.log("123123131231231313123123") console.log("123123131231231313123123")
console.log(this.examForm) console.log(this.examForm)
console.log("123123131231231313123123") console.log("123123131231231313123123")
if(this.examForm.checkQuestionType === 2){ if(this.examForm.checkQuestionType === 2 && this.randomQuestionList.length === 0){
this.randomQuestionList = this.examForm.questions this.randomQuestionList = this.examForm.questions
} }
console.log(this.randomQuestionList)
console.log("123123131231231313123123")
console.log(this.randomQuestionList.map(item => item.id).join(','))
let examInfo = { let examInfo = {
checkQuestionType:this.examForm.checkQuestionType, checkQuestionType:this.examForm.checkQuestionType,
@ -903,8 +904,10 @@ export default {
id:item.id, id:item.id,
} }
}), }),
radio:this.examForm.checkQuestionType == 1 ? this.examForm.questions.filter(item => item.type == 1).length : this.randomQuestion.examSingle.count, // radio:this.examForm.checkQuestionType == 1 ? this.examForm.questions.filter(item => item.type == 1).length : this.randomQuestion.examSingle.count,
multi:this.examForm.checkQuestionType == 1 ? this.examForm.questions.filter(item => item.type == 2).length : this.randomQuestion.examMultiple.count, // multi:this.examForm.checkQuestionType == 1 ? this.examForm.questions.filter(item => item.type == 2).length : this.randomQuestion.examMultiple.count,
radio:this.examForm.checkQuestionType == 1 ? this.examForm.questions.filter(item => item.type == 1).length : this.randomQuestionList.filter(item => item.type === 1).length,
multi:this.examForm.checkQuestionType == 1 ? this.examForm.questions.filter(item => item.type == 2).length : this.randomQuestionList.filter(item => item.type === 2).length
} }
// examInfo.questions = this.examForm.checkQuestionType == 1 ? this.examForm.questions.map(item => item.id).join(',') : this.randomQuestionList.map(item => item.id).join(','), // examInfo.questions = this.examForm.checkQuestionType == 1 ? this.examForm.questions.map(item => item.id).join(',') : this.randomQuestionList.map(item => item.id).join(','),
examInfo.id = this.examForm.id examInfo.id = this.examForm.id
@ -913,6 +916,7 @@ export default {
this.$message.success('编辑成功') this.$message.success('编辑成功')
this.handleClose() this.handleClose()
this.getRecordList() this.getRecordList()
this.clearFilter()
} }
}) })
} }

View File

@ -190,13 +190,13 @@
<el-form :inline="true" ref="searchRef" size="medium" class="demo-form-inline"> <el-form :inline="true" ref="searchRef" size="medium" class="demo-form-inline">
<!-- <el-form-item label="选择企业" prop="enterpriseId"> --> <!-- <el-form-item label="选择企业" prop="enterpriseId"> -->
<el-form-item label="" prop="enterpriseId"> <el-form-item label="" prop="enterpriseId">
<el-select v-model="workerInfo.enterpriseId" placeholder="请选择企业" @change="getTeamInfoList" clearable=""> <el-select v-model="workerInfo.enterpriseId" filterable placeholder="请选择企业" @change="getTeamInfoList" clearable="">
<el-option v-for="item in enterpriseInfoList" :key="item.id" :label="item.enterpriseName" :value="item.id"></el-option> <el-option v-for="item in enterpriseInfoList" :key="item.id" :label="item.enterpriseName" :value="item.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="选择班组" prop="teamId"> --> <!-- <el-form-item label="选择班组" prop="teamId"> -->
<el-form-item label="" prop="departmentAndTeam"> <el-form-item label="" prop="departmentAndTeam">
<el-select v-model="workerInfo.departmentAndTeam" placeholder="请选择班组/部门" value-key="gtMaterialDepartmentTeamId" clearable> <el-select v-model="workerInfo.departmentAndTeam" filterable placeholder="请选择班组/部门" value-key="gtMaterialDepartmentTeamId" clearable>
<!-- <el-option v-for="item in teamInfoList" :key="item.id" :label="item.teamName" :value="item.id"></el-option> --> <!-- <el-option v-for="item in teamInfoList" :key="item.id" :label="item.teamName" :value="item.id"></el-option> -->
<el-option v-for="(item) in teamInfoList" :key="item.gtMaterialDepartmentTeamId" :label="item.departmentTeamName" :value="item"></el-option> <el-option v-for="(item) in teamInfoList" :key="item.gtMaterialDepartmentTeamId" :label="item.departmentTeamName" :value="item"></el-option>
</el-select> </el-select>

View File

@ -77,6 +77,11 @@
align="center" align="center"
label="批次" label="批次"
></el-table-column> ></el-table-column>
<el-table-column
prop="carNumber"
align="center"
label="车牌号"
></el-table-column>
<el-table-column <el-table-column
prop="entryTime" prop="entryTime"
align="center" align="center"

View File

@ -77,6 +77,11 @@
align="center" align="center"
label="批次" label="批次"
></el-table-column> ></el-table-column>
<el-table-column
prop="carNumber"
align="center"
label="车牌号"
></el-table-column>
<el-table-column <el-table-column
prop="entryTime" prop="entryTime"
align="center" align="center"

View File

@ -503,7 +503,7 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="负责人" prop="dutyUserName"> <el-form-item label="负责人" prop="dutyUserName">
<el-select v-model="workerInfo.dutyUserId" placeholder="请选择"> <el-select v-model="workerInfo.dutyUserId" placeholder="请选择" filterable>
<el-option <el-option
v-for="item in principalLsit" v-for="item in principalLsit"
:key="item.userId" :key="item.userId"

View File

@ -17,12 +17,21 @@
</div> </div>
<div class="flex4"> <div class="flex4">
<div class="type_content"> <div class="type_content">
<!-- 施工合同额 -->
<div class="flex3"> <div class="flex3">
<span class="width_35"> <span class="width_35">
{{ $t("message.extendInfo.contractPrice") }} {{ $t("message.extendInfo.contractPrice") }}
</span> </span>
<span class="width_65">{{ projectDetail.contractPrice }}</span> <span class="width_65">{{ projectDetail.contractPrice }}</span>
</div> </div>
<!-- 总投资额(万元) -->
<div class="flex3">
<span class="width_35">
{{ $t("message.extendInfo.investmentPrice") }}
</span>
<span class="width_65">{{ projectDetail.investmentPrice }}</span>
</div>
<div class="flex3"> <div class="flex3">
<span class="width_35"> <span class="width_35">
{{ $t("message.extendInfo.contractSigning") }} {{ $t("message.extendInfo.contractSigning") }}
@ -92,6 +101,10 @@
<!-- <span class="width_35"></span> --> <!-- <span class="width_35"></span> -->
<span class="width_65"></span> <span class="width_65"></span>
</div> </div>
<div class="flex3">
<!-- <span class="width_35"></span> -->
<span class="width_65"></span>
</div>
<div class="flex3"> <div class="flex3">
<span <span
class="width_35 bg_color" class="width_35 bg_color"
@ -151,7 +164,7 @@
<el-form <el-form
ref="editProjectForm" ref="editProjectForm"
:model="editProjectForm" :model="editProjectForm"
label-width="120px" label-width="140px"
:rules="editProjectFormRules" :rules="editProjectFormRules"
size="medium" size="medium"
> >
@ -174,6 +187,25 @@
:placeholder="$t('message.extendInfo.pleaseEnter')" :placeholder="$t('message.extendInfo.pleaseEnter')"
></el-input-number> --> ></el-input-number> -->
</el-form-item> </el-form-item>
<el-form-item
:label="$t('message.extendInfo.investmentPrice')"
prop="investmentPrice"
>
<el-input
type="number"
@change="checkValue()"
v-model="editProjectForm.investmentPrice"
placeholder="请输入数字类型"
></el-input>
<!-- <el-input-number
type="number"
@change="checkValue()"
style="width: 100%"
v-model="editProjectForm.contractPrice"
:min="0"
:placeholder="$t('message.extendInfo.pleaseEnter')"
></el-input-number> -->
</el-form-item>
<el-form-item <el-form-item
:label="$t('message.extendInfo.contractSigning')" :label="$t('message.extendInfo.contractSigning')"
prop="contractSignTime" prop="contractSignTime"
@ -359,6 +391,7 @@ export default {
projectOverview: "", projectOverview: "",
educationId: "", educationId: "",
contractPrice: "", contractPrice: "",
investmentPrice: ""
}, },
educationList: [], educationList: [],
editProjectFormRules: this.$t("message.extendInfo.editProjectFormRules"), editProjectFormRules: this.$t("message.extendInfo.editProjectFormRules"),
@ -532,7 +565,7 @@ export default {
box-sizing: border-box; box-sizing: border-box;
border: 1px solid rgba(148, 148, 148, 0.5); border: 1px solid rgba(148, 148, 148, 0.5);
border-bottom: none; border-bottom: none;
margin-top: 30px; margin-top: 23px;
// color: #333; // color: #333;
.title { .title {
width: 100%; width: 100%;

View File

@ -109,6 +109,7 @@
<el-select <el-select
v-model="form.dutyId" v-model="form.dutyId"
multiple multiple
filterable
@change="changeDutyId" @change="changeDutyId"
:placeholder="$t('message.quality.pleaseSelect')" :placeholder="$t('message.quality.pleaseSelect')"
style="width: 100%" style="width: 100%"
@ -128,7 +129,9 @@
<el-form-item label="责任人" prop="personId"> <el-form-item label="责任人" prop="personId">
<el-select <el-select
v-model="form.personId" v-model="form.personId"
filterable
multiple multiple
reserve-keyword
:placeholder="$t('message.quality.pleaseSelect')" :placeholder="$t('message.quality.pleaseSelect')"
style="width: 100%" style="width: 100%"
prop="personId" prop="personId"

View File

@ -23,7 +23,7 @@
<!-- 培训类型 --> <!-- 培训类型 -->
<el-form-item :label="$t('message.safetyEducation.trainingType')"> <el-form-item :label="$t('message.safetyEducation.trainingType')">
<el-select <el-select filterable
v-model="formInline.eduType" v-model="formInline.eduType"
:placeholder="$t('message.carManage.placeholder_select')" :placeholder="$t('message.carManage.placeholder_select')"
> >

View File

@ -4,7 +4,7 @@
<el-form :inline="true" ref="searchForm" :model="searchForm" size="medium"> <el-form :inline="true" ref="searchForm" :model="searchForm" size="medium">
<!-- 人员名称 --> <!-- 人员名称 -->
<el-form-item label="人员名称" prop="workerInfoId"> <el-form-item label="人员名称" prop="workerInfoId">
<el-select v-model="searchForm.devSn" placeholder="请选择" clearable :style="{ width: '100%' }" > <el-select v-model="searchForm.devSn" placeholder="请选择" filterable clearable :style="{ width: '100%' }" >
<!-- <el-option v-for="(item, index) in workerList" :key="index" :label="item.workerName" :value="item.id" ></el-option> --> <!-- <el-option v-for="(item, index) in workerList" :key="index" :label="item.workerName" :value="item.id" ></el-option> -->
<el-option v-for="(item, index) in devSnList" :key="index" :label="item.workerName" :value="item.devSn" ></el-option> <el-option v-for="(item, index) in devSnList" :key="index" :label="item.workerName" :value="item.devSn" ></el-option>
</el-select> </el-select>

View File

@ -9,7 +9,7 @@
> >
<!-- 人员名称 --> <!-- 人员名称 -->
<el-form-item label="人员名称" prop="workerInfoId"> <el-form-item label="人员名称" prop="workerInfoId">
<el-select v-model="searchForm.devSn" placeholder="请选择" clearable :style="{ width: '100%' }" > <el-select v-model="searchForm.devSn" placeholder="请选择" filterable clearable :style="{ width: '100%' }" >
<!-- <el-option v-for="(item, index) in workerList" :key="index" :label="item.workerName" :value="item.id" ></el-option> --> <!-- <el-option v-for="(item, index) in workerList" :key="index" :label="item.workerName" :value="item.id" ></el-option> -->
<el-option v-for="(item, index) in devSnList" :key="index" :label="item.workerName" :value="item.devSn" ></el-option> <el-option v-for="(item, index) in devSnList" :key="index" :label="item.workerName" :value="item.devSn" ></el-option>
</el-select> </el-select>

View File

@ -65,7 +65,7 @@
<el-form size="medium" ref="addEditForm" :model="addEditForm" :rules="addEditRules" label-width="120px" class="dialogFormBox"> <el-form size="medium" ref="addEditForm" :model="addEditForm" :rules="addEditRules" label-width="120px" class="dialogFormBox">
<el-form-item label="绑定人员" prop="workerInfoId"> <el-form-item label="绑定人员" prop="workerInfoId">
<!-- <el-input v-model="addEditForm.workerName" placeholder="请输入"></el-input> --> <!-- <el-input v-model="addEditForm.workerName" placeholder="请输入"></el-input> -->
<el-select v-model="addEditForm.workerInfoId" placeholder="请选择" clearable :style="{ width: '100%' }"> <el-select v-model="addEditForm.workerInfoId" filterable placeholder="请选择" clearable :style="{ width: '100%' }">
<el-option v-for="(item, index) in workerList" :key="index" :label="item.workerName" :value="item.id"></el-option> <el-option v-for="(item, index) in workerList" :key="index" :label="item.workerName" :value="item.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>

View File

@ -8,7 +8,7 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="作业申请单位"> <el-form-item label="作业申请单位">
<el-select v-model="formInline.enterpriseId" placeholder="请选择"> <el-select v-model="formInline.enterpriseId" filterable placeholder="请选择">
<el-option :label="item.enterpriseName" :value="item.id" <el-option :label="item.enterpriseName" :value="item.id"
v-for="(item, index) in responsibilityList" :key="index"> v-for="(item, index) in responsibilityList" :key="index">
</el-option> </el-option>

View File

@ -8,7 +8,7 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="作业申请单位"> <el-form-item label="作业申请单位">
<el-select v-model="formInline.enterpriseId" placeholder="请选择"> <el-select v-model="formInline.enterpriseId" filterable placeholder="请选择">
<el-option :label="item.enterpriseName" :value="item.id" <el-option :label="item.enterpriseName" :value="item.id"
v-for="(item, index) in responsibilityList" :key="index"> v-for="(item, index) in responsibilityList" :key="index">
</el-option> </el-option>

View File

@ -8,7 +8,7 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="作业申请单位"> <el-form-item label="作业申请单位">
<el-select v-model="formInline.enterpriseId" placeholder="请选择"> <el-select v-model="formInline.enterpriseId" filterable placeholder="请选择">
<el-option :label="item.enterpriseName" :value="item.id" <el-option :label="item.enterpriseName" :value="item.id"
v-for="(item, index) in responsibilityList" :key="index"> v-for="(item, index) in responsibilityList" :key="index">
</el-option> </el-option>

View File

@ -8,7 +8,7 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="作业申请单位"> <el-form-item label="作业申请单位">
<el-select v-model="formInline.enterpriseId" placeholder="请选择"> <el-select v-model="formInline.enterpriseId" filterable placeholder="请选择">
<el-option :label="item.enterpriseName" :value="item.id" <el-option :label="item.enterpriseName" :value="item.id"
v-for="(item, index) in responsibilityList" :key="index"> v-for="(item, index) in responsibilityList" :key="index">
</el-option> </el-option>

View File

@ -8,7 +8,7 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="作业申请单位"> <el-form-item label="作业申请单位">
<el-select v-model="formInline.enterpriseId" placeholder="请选择"> <el-select v-model="formInline.enterpriseId" filterable placeholder="请选择">
<el-option :label="item.enterpriseName" :value="item.id" <el-option :label="item.enterpriseName" :value="item.id"
v-for="(item, index) in responsibilityList" :key="index"> v-for="(item, index) in responsibilityList" :key="index">
</el-option> </el-option>

View File

@ -8,7 +8,7 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="作业申请单位"> <el-form-item label="作业申请单位">
<el-select v-model="formInline.enterpriseId" placeholder="请选择"> <el-select v-model="formInline.enterpriseId" filterable placeholder="请选择">
<el-option :label="item.enterpriseName" :value="item.id" <el-option :label="item.enterpriseName" :value="item.id"
v-for="(item, index) in responsibilityList" :key="index"> v-for="(item, index) in responsibilityList" :key="index">
</el-option> </el-option>

View File

@ -8,7 +8,7 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="作业申请单位"> <el-form-item label="作业申请单位">
<el-select v-model="formInline.enterpriseId" placeholder="请选择"> <el-select v-model="formInline.enterpriseId" filterable placeholder="请选择">
<el-option :label="item.enterpriseName" :value="item.id" <el-option :label="item.enterpriseName" :value="item.id"
v-for="(item, index) in responsibilityList" :key="index"> v-for="(item, index) in responsibilityList" :key="index">
</el-option> </el-option>

View File

@ -8,7 +8,7 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="作业申请单位"> <el-form-item label="作业申请单位">
<el-select v-model="formInline.enterpriseId" placeholder="请选择"> <el-select v-model="formInline.enterpriseId" filterable placeholder="请选择">
<el-option :label="item.enterpriseName" :value="item.id" <el-option :label="item.enterpriseName" :value="item.id"
v-for="(item, index) in responsibilityList" :key="index"> v-for="(item, index) in responsibilityList" :key="index">
</el-option> </el-option>
@ -152,7 +152,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="作业申请单位:" :label-width="formLabelWidthDetail"> <el-form-item label="作业申请单位:" :label-width="formLabelWidthDetail">
<el-select v-model="workDetail.jobApplicationUnit" placeholder="请选择作业申请单位" disabled> <el-select v-model="workDetail.jobApplicationUnit" filterable placeholder="请选择作业申请单位" disabled>
<el-option :label="item.enterpriseName" :value="item.id" <el-option :label="item.enterpriseName" :value="item.id"
v-for="(item, index) in responsibilityList" :key="index"> v-for="(item, index) in responsibilityList" :key="index">
</el-option> </el-option>