FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

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