Merge branch 'develop' into FOTON

This commit is contained in:
Superman_Main
2021-11-27 22:35:06 +08:00
@@ -676,15 +676,17 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item v-show="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled"> <el-form-item v-show="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.wssmr" placeholder="请选择我司署名人" multiple> <el-input v-model="form.wssmr" placeholder="选择我司署名人" @click.native="choiceZRRS('wssmr', '选择责任人', form.wssmr)">
<el-option </el-input>
v-for="item in wssmrOptions" <!-- <el-select :popper-append-to-body="false" v-model="form.wssmr" placeholder="请选择我司署名人" multiple>-->
placeholder="请选择" <!-- <el-option-->
:key="item.value" <!-- v-for="item in wssmrOptions"-->
:value="item.value" <!-- placeholder="请选择"-->
:label="item.label" <!-- :key="item.value"-->
></el-option> <!-- :value="item.value"-->
</el-select> <!-- :label="item.label"-->
<!-- ></el-option>-->
<!-- </el-select>-->
</el-form-item> </el-form-item>
<el-form-item v-show="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled"> <el-form-item v-show="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.cysd" placeholder="请选择我司参与深度"> <el-select :popper-append-to-body="false" v-model="form.cysd" placeholder="请选择我司参与深度">
@@ -1719,6 +1721,8 @@
}) })
this.roleForm.zrUserId=idList; this.roleForm.zrUserId=idList;
this.roleForm.zrUserName=nameList; this.roleForm.zrUserName=nameList;
this.form.wssmr = nameList
}, },
checkedRole (data) { checkedRole (data) {
if (this.userType === 'jlUserId') { if (this.userType === 'jlUserId') {
@@ -2825,6 +2829,9 @@
.prc-content-border { .prc-content-border {
border: none; border: none;
padding: 0 20px 0; padding: 0 20px 0;
/deep/ .el-input__inner {
padding-left: 30px;
}
} }
} }
position: relative; position: relative;