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

Merge remote-tracking branch 'origin/fix_foton' into FOTON

Browse Source
This commit is contained in:
高嵩
2022-12-08 16:57:45 +08:00
parent f6b093be6e 10c8313769
commit 11911ccd70
7 changed files with 117 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/roleTree/index.vue
+12 -3
View File
@@ -70,7 +70,8 @@
show-checkbox
ref="tree"
:lazy="false"
:key="treeKey">
:key="treeKey"
>
<span class="custom-tree-node" slot-scope="{ node, data }">
<span :class="node.disabled ? 'is-show' : 'is-leaf-none'"></span>
<span> {{ node.label }} </span>
@@ -159,7 +160,13 @@
}
},
methods: {
handleClose (tag) {
nameJoinAccount(treeData1){
treeData1.forEach(item=>{
if(item.account) item.name = `${item.name}(${item.account})`
if(item.children) this.nameJoinAccount(item.children)
})
},
handleClose (tag) {
let arr = []
for (let a = 0; a < this.delList.length; a++) {
if (tag.id === this.delList[a].id) {
@@ -214,6 +221,7 @@
this.treeData1.forEach(item => {
this.defaultKey.push(item.id)
})
this.nameJoinAccount(this.treeData1)
this.treeLoading = false
})
// this.treeKey++
@@ -333,7 +341,8 @@
}
this.open1 = true
},
drawerCheck (data) {//当复选框被点击的时候触发
drawerCheck (data) {
//当复选框被点击的时候触发
//共两个参数，依次为：传递给 data 属性的数组中该节点所对应的对象、树目前的选中状态对象，包含 checkedNodes、checkedKeys、halfCheckedNodes、halfCheckedKeys 四个属性
if (this.checkBox) { // 单选
// 单选判断
src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
+3 -3
View File
@@ -1632,9 +1632,9 @@ export default {
issueTime: [
{ required: false, message: '请选择企标发布日期', trigger: 'change' }
],
putTime: [
{ required: true, message: '请选择企标实施日期', trigger: 'change' }
],
// putTime: [
// { required: true, message: '请选择企标实施日期', trigger: 'change' }
// ],
FBGBUSSName: [
{ required: false, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
],
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
+21 -3
View File
@@ -193,8 +193,14 @@
</div>
</el-form>
<!-- 选择企标计划抽屉-->
<!-- <el-drawer v-if="!disabledXX"-->
<!-- title="选择企业标准"-->
<!-- :visible.sync="ListModel"-->
<!-- size="900px"-->
<!-- custom-class="demo-drawer"-->
<!-- >-->
<el-drawer v-if="!disabledXX"
title="选择企业标准"
title="选择企标计划"
:visible.sync="ListModel"
size="900px"
custom-class="demo-drawer"
@@ -261,8 +267,9 @@
label="计划状态"
align="center">
<template slot-scope="scope">
<div>{{ scope.row.planStatus === '0'? '未开始' : (scope.row.planStatus === '1'? '制定中' : (scope.row.planStatus === '2'? '修订中' :
(scope.row.planStatus === '3'? '已取消' : '已完成'))) }}</div>
<!-- <div>{{ scope.row.planStatus === '0'? '未开始' : (scope.row.planStatus === '1'? '制定中' : (scope.row.planStatus === '2'? '修订中' :-->
<!-- (scope.row.planStatus === '3'? '已取消' : '已完成'))) }}</div>-->
<div>{{ getMap1(scope.row.planStatus) }}</div>
</template>
</el-table-column>
<el-table-column
@@ -404,6 +411,17 @@ export default {
})
},
methods: {
getMap1(item){
const map = new Map();
map.set('0','未开始')
map.set('1','制定中')
map.set('2','修订中')
map.set('3','已取消')
map.set('4','已完成')
map.set('5','立项已完成')
map.set('6','计划已确认')
return map.get(item)
},
validateForm (callback) {
this.$refs['qbfsForm'].validate((valid) => {
if (valid) {
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
+21 -3
View File
@@ -209,8 +209,14 @@
</div>
</el-form>
<!-- 选择企标计划抽屉-->
<!-- <el-drawer v-if="!disabledXX"-->
<!-- title="选择企业标准"-->
<!-- :visible.sync="ListModel"-->
<!-- size="900px"-->
<!-- custom-class="demo-drawer"-->
<!-- >-->
<el-drawer v-if="!disabledXX"
title="选择企业标准"
title="选择企标计划"
:visible.sync="ListModel"
size="900px"
custom-class="demo-drawer"
@@ -277,8 +283,9 @@
label="计划状态"
align="center">
<template slot-scope="scope">
<div>{{ scope.row.planStatus === '0'? '未开始' : (scope.row.planStatus === '1'? '制定中' : (scope.row.planStatus === '2'? '修订中' :
(scope.row.planStatus === '3'? '已取消' : '已完成'))) }}</div>
<!-- <div>{{ scope.row.planStatus === '0'? '未开始' : (scope.row.planStatus === '1'? '制定中' : (scope.row.planStatus === '2'? '修订中' :-->
<!-- (scope.row.planStatus === '3'? '已取消' : '已完成'))) }}</div>-->
<div>{{ getMap1(scope.row.planStatus) }}</div>
</template>
</el-table-column>
<el-table-column
@@ -426,6 +433,17 @@ export default {
})
},
methods: {
getMap1(item){
const map = new Map();
map.set('0','未开始')
map.set('1','制定中')
map.set('2','修订中')
map.set('3','已取消')
map.set('4','已完成')
map.set('5','立项已完成')
map.set('6','计划已确认')
return map.get(item)
},
validateForm (callback) {
this.$refs['qbfsForm'].validate((valid) => {
if (valid) {
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+22 -4
View File
@@ -207,8 +207,14 @@
</div>
</el-form>
<!-- 选择企标计划抽屉-->
<el-drawer v-if="!disabledXX"
title="选择企业标准"
<!-- <el-drawer v-if="!disabledXX"-->
<!-- title="选择企业标准"-->
<!-- :visible.sync="ListModel"-->
<!-- size="900px"-->
<!-- custom-class="demo-drawer"-->
<!-- >-->
<el-drawer v-if="!disabledXX"
title="选择企标计划"
:visible.sync="ListModel"
size="900px"
custom-class="demo-drawer"
@@ -276,8 +282,9 @@
label="计划状态"
align="center">
<template slot-scope="scope">
<div>{{ scope.row.planStatus === '0'? '未开始' : (scope.row.planStatus === '1'? '制定中' : (scope.row.planStatus === '2'? '修订中' :
(scope.row.planStatus === '3'? '已取消' : '已完成'))) }}</div>
<!-- <div>{{ scope.row.planStatus === '0'? '未开始' : (scope.row.planStatus === '1'? '制定中' : (scope.row.planStatus === '2'? '修订中' :-->
<!-- (scope.row.planStatus === '3'? '已取消' : '已完成'))) }}</div>-->
<div>{{ getMap1(scope.row.planStatus) }}</div>
</template>
</el-table-column>
<el-table-column
@@ -751,6 +758,17 @@ export default {
}
},
methods: {
getMap1(item){
const map = new Map();
map.set('0','未开始')
map.set('1','制定中')
map.set('2','修订中')
map.set('3','已取消')
map.set('4','已完成')
map.set('5','立项已完成')
map.set('6','计划已确认')
return map.get(item)
},
choiceLeader(){
this.workModel = true
},
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
+22 -4
View File
@@ -200,8 +200,14 @@
</div>
</el-form>
<!-- 选择企标计划抽屉-->
<el-drawer v-if="!disabledXX"
title="选择企业标准"
<!-- <el-drawer v-if="!disabledXX"-->
<!-- title="选择企业标准"-->
<!-- :visible.sync="ListModel"-->
<!-- size="900px"-->
<!-- custom-class="demo-drawer"-->
<!-- >-->
<el-drawer v-if="!disabledXX"
title="选择企标计划"
:visible.sync="ListModel"
size="900px"
custom-class="demo-drawer"
@@ -268,8 +274,9 @@
label="计划状态"
align="center">
<template slot-scope="scope">
<div>{{ scope.row.planStatus === '0'? '未开始' : (scope.row.planStatus === '1'? '制定中' : (scope.row.planStatus === '2'? '修订中' :
(scope.row.planStatus === '3'? '已取消' : '已完成'))) }}</div>
<!-- <div>{{ scope.row.planStatus === '0'? '未开始' : (scope.row.planStatus === '1'? '制定中' : (scope.row.planStatus === '2'? '修订中' :-->
<!-- (scope.row.planStatus === '3'? '已取消' : '已完成'))) }}</div>-->
<div>{{ getMap1(scope.row.planStatus) }}</div>
</template>
</el-table-column>
<el-table-column
@@ -413,6 +420,17 @@ export default {
})
},
methods: {
getMap1(item){
const map = new Map();
map.set('0','未开始')
map.set('1','制定中')
map.set('2','修订中')
map.set('3','已取消')
map.set('4','已完成')
map.set('5','立项已完成')
map.set('6','计划已确认')
return map.get(item)
},
validateForm (callback) {
this.$refs['qbfsForm'].validate((valid) => {
if (valid) {
src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue
+16 -4
View File
@@ -755,10 +755,10 @@ export default {
{ required: true, message: "请输入工作组组长", trigger: "blur" }
],
draftTime: [
{ required: true, message: "请选择计划标准初稿完成时间", trigger: "change" }
{ required: true, message: "请选择计划标准初稿完成时间", trigger: "blur" }
],
releaseTime: [
{ required: true, message: "请选择计划标准发布时间", trigger: "change" }
{ required: true, message: "请选择计划标准发布时间", trigger: "blur" }
],
endTime: [
{ required: true, message: "请选择立项完成时间", trigger: "change" }
@@ -767,10 +767,10 @@ export default {
{ required: true, message: "请选择体系结构", trigger: "change" }
],
area: [
{ required: true, message: "请选择适用车型", trigger: "change" }
{ required: true, message: "请选择适用车型", trigger: "blur" }
],
isRelate: [
{ required: true, message: "请选择是否采用标准", trigger: "change" }
{ required: true, message: "请选择是否采用标准", trigger: "blur" }
],
technologic: [
{ required: true, message: "请输入指标依据", trigger: "blur" }
@@ -1135,6 +1135,17 @@ export default {
},
TXJGenterDrawer () {
let list = this.$refs.TXJGTree.getCheckedNodes()
if (this.$refs.TXJGTree.getCheckedNodes().length > 1) {
this.$message.warning('仅能选择一个体系结构')
return;
}
if(list.length > 0){
let parenList = list.filter ( item => item.parentId === null || item.parentId === '');
if (parenList.length > 0) {
this.$message.error('请选择二级及以下目录')
return
}
}
let id = ''
let name = ''
list.map(item => {
@@ -1169,6 +1180,7 @@ export default {
},
QYBZcloseDrawer () {
this.clearQYBZ()
this.QYBZmodal = false;//关闭弹窗
},
QYBZenterDrawer () {
console.log(this.QYBZformSelect);