Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
super_liu
@@ -183,7 +183,7 @@
|
||||
<div slot="footer">
|
||||
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="closeDialogData">取消
|
||||
</el-button>
|
||||
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="confirmDialogData">
|
||||
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" :loading="btnLoading" @click="confirmDialogData">
|
||||
确定
|
||||
</el-button>
|
||||
</div>
|
||||
@@ -214,7 +214,7 @@
|
||||
<div slot="footer">
|
||||
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="closeDialogData2">取消
|
||||
</el-button>
|
||||
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="confirmDialogData2">
|
||||
<el-button class="common-button-primary" size="mini" icon="el-icon-check" :loading="btnLoading" type="primary" @click="confirmDialogData2">
|
||||
确定
|
||||
</el-button>
|
||||
</div>
|
||||
@@ -438,6 +438,7 @@ export default {
|
||||
label: 'menuName'
|
||||
},
|
||||
nodeList2: [],
|
||||
btnLoading: false,
|
||||
nodeList4: [],
|
||||
modalflag: false,
|
||||
modalflag2: false,
|
||||
@@ -683,6 +684,7 @@ export default {
|
||||
})
|
||||
},
|
||||
confirmDialogData() {
|
||||
this.btnLoading = true
|
||||
this.$http.postData('sarRole/role/resource', {
|
||||
resourceIds: this.$refs.tree3.getCheckedKeys().concat(this.$refs.tree3.getHalfCheckedKeys()),
|
||||
roleId: this.id
|
||||
@@ -691,10 +693,12 @@ export default {
|
||||
this.$message.success('设置权限成功')
|
||||
this.modalflag = false
|
||||
}
|
||||
this.btnLoading = false
|
||||
})
|
||||
},
|
||||
//配置数据确定按钮
|
||||
confirmDialogData2(){
|
||||
this.btnLoading = true
|
||||
let menuIds = this.$refs.tree4.getCheckedKeys().join(',')
|
||||
this.$http.postData('tsRoleMeunData/ts-role-menu-data/saveBatch', {
|
||||
menuIds: menuIds,
|
||||
@@ -706,6 +710,7 @@ export default {
|
||||
}else{
|
||||
this.$message.warning(res.message)
|
||||
}
|
||||
this.btnLoading = false
|
||||
})
|
||||
},
|
||||
closeDialogData() {
|
||||
|
||||
@@ -428,59 +428,61 @@
|
||||
<div v-if="itermsConditions" v-html="itermsConditions" class="itemsTextBox" style="margin: 5px; padding: 5px; width: 100%; overflow: auto;"></div>
|
||||
<div v-else style="margin: 5px; padding: 5px; width: 100%; overflow: auto;">无内容</div>
|
||||
</div>
|
||||
<el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150 :style="PLmodalType === 2 ? 'width: 100%;' : ''">
|
||||
<el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
|
||||
<el-input
|
||||
type="textarea"
|
||||
v-model="plForm.technicalRequir"
|
||||
placeholder="请输入核心技术要求"
|
||||
maxlength="500"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
|
||||
<el-input
|
||||
type="textarea"
|
||||
v-model="plForm.changePoint"
|
||||
placeholder="请输入国内标准的差异点"
|
||||
maxlength="500"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
|
||||
<el-input
|
||||
type="textarea"
|
||||
:autosize="{ minRows: 4, maxRows: 14}"
|
||||
v-model="plForm.changePoint"
|
||||
placeholder="请输入上一版本差异点"
|
||||
maxlength="500"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<custom-date-pick-group
|
||||
class="myDataPick"
|
||||
:config="{attrName: '新车型实施日期'}"
|
||||
v-model="plForm.newData"
|
||||
></custom-date-pick-group>
|
||||
<custom-date-pick-group
|
||||
class="myDataPick"
|
||||
:config="{attrName: '在产车实施日期'}"
|
||||
v-model="plForm.onlineData"
|
||||
></custom-date-pick-group>
|
||||
<el-form-item label="适用车型" prop="applyArctic" class="add-form-item" >
|
||||
<el-select multiple v-model="plForm.applyArctic">
|
||||
<el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="责任人" prop="zrUserId" class="add-form-item">
|
||||
<el-input
|
||||
style="display: none;"
|
||||
v-model="plForm.zrUserId"
|
||||
></el-input>
|
||||
<el-input
|
||||
@click.native="choiceZRRS(plForm.zrUserId, PLmodalType, PLmodalIndex)"
|
||||
placeholder="请选择责任人"
|
||||
v-model="plForm.zrUserName"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div style="width: 80%">
|
||||
<el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150 :style="PLmodalType === 2 ? 'width: 100%;' : ''">
|
||||
<el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
|
||||
<el-input
|
||||
type="textarea"
|
||||
v-model="plForm.technicalRequir"
|
||||
placeholder="请输入核心技术要求"
|
||||
maxlength="500"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
|
||||
<el-input
|
||||
type="textarea"
|
||||
v-model="plForm.changePoint"
|
||||
placeholder="请输入国内标准的差异点"
|
||||
maxlength="500"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
|
||||
<el-input
|
||||
type="textarea"
|
||||
:autosize="{ minRows: 4, maxRows: 14}"
|
||||
v-model="plForm.changePoint"
|
||||
placeholder="请输入上一版本差异点"
|
||||
maxlength="500"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
<custom-date-pick-group
|
||||
class="myDataPick"
|
||||
:config="{attrName: '新车型实施日期'}"
|
||||
v-model="plForm.newData"
|
||||
></custom-date-pick-group>
|
||||
<custom-date-pick-group
|
||||
class="myDataPick"
|
||||
:config="{attrName: '在产车实施日期'}"
|
||||
v-model="plForm.onlineData"
|
||||
></custom-date-pick-group>
|
||||
<el-form-item label="适用车型" prop="applyArctic" class="add-form-item" >
|
||||
<el-select multiple v-model="plForm.applyArctic">
|
||||
<el-option v-for="(item,index) in cxList" :value="item.label" :label="item.label" :key="index"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="责任人" prop="zrUserId" class="add-form-item">
|
||||
<el-input
|
||||
style="display: none;"
|
||||
v-model="plForm.zrUserId"
|
||||
></el-input>
|
||||
<el-input
|
||||
@click.native="choiceZRRS(plForm.zrUserId, PLmodalType, PLmodalIndex)"
|
||||
placeholder="请选择责任人"
|
||||
v-model="plForm.zrUserName"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="roleFormButton2" class="demo-drawer-footer">
|
||||
|
||||
@@ -80,6 +80,7 @@
|
||||
</el-form-item>
|
||||
<el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
|
||||
<el-date-picker
|
||||
:picker-options="pickerOptions"
|
||||
v-model="listForm.endTime"
|
||||
type="date"
|
||||
placeholder="请选择截止日期"
|
||||
@@ -508,6 +509,11 @@ export default {
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
pickerOptions: {
|
||||
disabledDate(time) {
|
||||
return time.getTime() < Date.now() - 8.64e7;
|
||||
},
|
||||
},
|
||||
submitFlag: '',
|
||||
managementHostName: [], //管理主体名称下拉框
|
||||
developmentHostName: [], //开发主体名称下拉框
|
||||
|
||||
@@ -2456,6 +2456,7 @@ export default {
|
||||
if (this.form.standType === '') {
|
||||
this.$message.warning('请选择标准来源')
|
||||
} else {
|
||||
this.standardSearchForm.page = 1
|
||||
this.standardDrawer = true
|
||||
this.$nextTick(() => {
|
||||
// 动态设置表格高度
|
||||
|
||||
@@ -46,6 +46,7 @@
|
||||
</el-form-item>
|
||||
<el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
|
||||
<el-date-picker
|
||||
:picker-options="pickerOptions"
|
||||
v-model="listForm.endTime"
|
||||
type="date"
|
||||
placeholder="请选择截止日期"
|
||||
@@ -454,6 +455,11 @@ export default {
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
pickerOptions: {
|
||||
disabledDate(time) {
|
||||
return time.getTime() < Date.now() - 8.64e7;
|
||||
},
|
||||
},
|
||||
managementHostName: [], //管理主体名称下拉框
|
||||
developmentHostName: [], //开发主体名称下拉框
|
||||
categoryName: [], //项目细分类下拉框
|
||||
|
||||
Reference in New Issue
Block a user