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:
zhutianqi
2022-02-23 09:59:58 +08:00
parent c47d8474e8 a7929b7004
commit 42c08cc28a
18 changed files with 251 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/details/complianceDetails/index.vue
+4 -4
View File
@@ -43,7 +43,7 @@
</template>
</el-table-column>
<el-table-column
prop="evaluationPeople"
prop="evaluationPeopleName"
label="评估人"
width="160"
align="center"
@@ -88,7 +88,7 @@
>
</el-table-column>
<el-table-column
prop="evaluationPeople"
prop="evaluationPeopleName"
label="评估人"
width="160"
align="center"
@@ -126,13 +126,13 @@
>
</el-table-column>
<el-table-column
prop="researchNonCompliance"
prop="noInvolve"
label="不涉及"
align="center"
>
</el-table-column>
<el-table-column
prop="evaluationPeople"
prop="evaluationPeopleName"
label="评估人"
width="160"
align="center"
src/pages/localTool/standardWarning.vue
-2
View File
@@ -689,13 +689,11 @@ export default {
this.$http.get('sys/EarlyWarning/ChangePermissions', {
id: row.id,
}, {}, res => {
if (res.ok === true) {
this.pageConfig.page = 1
this.pageConfig.newPolicyPage = 1
this.pageConfig.oldPolicyPage = 1
this.searchBtnClick()
this.getEarlyDate()
}
}
)
}).catch(() => {
src/pages/processCenter/pages/creatProcess/qbfs/step1.vue
+6 -3
View File
@@ -477,7 +477,7 @@
</div>
</el-drawer>
<el-dialog
title="企标复审计划"
title="企标复审计划 - (未来一个月内需要复审的企标信息列表)"
:visible.sync="replaceLawsNumModel"
width="875px"
:close-on-click-modal="false"
@@ -757,12 +757,15 @@ export default {
methods: {
replaceLawsNumModelBt(){
if(this.modelDataSelect && this.modelDataSelect.length > 0){
this.qbfsForm.modelData = []
this.qbfsForm.modelData = this.modelDataSelect
this.qbfsForm.modelData = this.unique(this.qbfsForm.modelData.concat(this.modelDataSelect))
}
console.log(this.qbfsForm.modelData)
this.replaceLawsNumModel = false
},
unique(newArr) {
const res = new Map();
return newArr.filter((newArr) => !res.has(newArr.id) && res.set(newArr.id, 1));
},
// 更多
handleCommand (command) {
if (command[2] === '删除') {
src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
+12 -4
View File
@@ -2708,10 +2708,18 @@
},
popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData) {
if(checkedData.length > 0){
if (checkedData.length > 0) {
this.form.TXLBBUSS = checkedData.map(item => item.menuName).join(",")
}else {
this.form.menuId = checkedData.map(item => item.menuId).join(",")
this.form.treeType = checkedData.map(item => item.treeType).join(",")
} else {
if (checkedData.parentId == null || checkedData.parentId === '') {
this.$message.error('请选择二级及以下目录')
return
}
this.form.TXLBBUSS = checkedData.menuName
this.form.menuId = checkedData.id
this.form.treeType = 'sarMs'
}
}
this.modalShowFlag1 = false
@@ -2858,8 +2866,8 @@
// test
this.isSubmit = false
this.saveLoading = false
if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) {
this.$message.warning("请选择一条代替企标编号")
if((this.form.standStatus === '2') && (this.form.BDTQBBHBUSS === undefined || this.form.BDTQBBHBUSS === '')) {
this.$message.warning("请选择一条被代替企标编号")
return
}
// this.changeTree(this.form.modelData)
src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
+37 -18
View File
@@ -566,7 +566,7 @@
width = "500"
:data="standSystemOptions"
:defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
:nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select-new>
:nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"></tree-select-new>
<tree-select-new
width = "500"
:lazy=true
@@ -577,7 +577,7 @@
:url="url"
:urlChild="urlChild"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select-new>
:nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs" @popoverHideCancel="popoverHideBusVsCancel"></tree-select-new>
</div>
</template>
@@ -2153,10 +2153,18 @@
},
popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData) {
if(checkedData.length > 0){
if (checkedData.length > 0) {
this.form.TXLBBUSS = checkedData.map(item => item.menuName).join(",")
}else {
this.form.menuId = checkedData.map(item => item.menuId).join(",")
this.form.treeType = checkedData.map(item => item.treeType).join(",")
} else {
if (checkedData.parentId == null || checkedData.parentId === '') {
this.$message.error('请选择二级及以下目录')
return
}
this.form.TXLBBUSS = checkedData.menuName
this.form.menuId = checkedData.id
this.form.treeType = 'sarMs'
}
}
this.modalShowFlag1 = false
@@ -2353,6 +2361,25 @@
this.rules.commentText[0].required = true;
}
},
async saveConfStand(standId) {
if(this.form.menuId && this.form.menuId !== ''){
let search = {}
let list = []
list.push(standId)
search.menuId = this.form.menuId
search.menuName = this.form.TXLBBUSS
search.treeType = 'sarMs'
search.idlist = list
return new Promise((resolve, reject) => {
this.$http.postData('lawss/sarBussionessStand/saveStandardsMenu', search, {
_this: this
}, res => {
const history = res;
resolve(history)
})
})
}
},
handleSubmit() {
// this.getRule()
// const val= this.form.country;
@@ -2365,10 +2392,6 @@
// } else if (val === '') {
// this.form.country = []
// }
if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) {
this.$message.warning("请选择一条代替企标编号")
return
}
this.fileInfoHandle()
this.$refs['form'].validate((valid) => {
if (valid) {
@@ -2417,8 +2440,10 @@
const _formData = new FormData()
_formData.append('infoJson', json)
processCreateBuss(_formData).then(res => {
if (res.result === '操作成功' || res.data === '入库成功') {
this.$message.success(res.data)
if (res.result === '操作成功' || res.ok) {
this.$message.success("入库成功")
// 自动匹配配置标准
this.saveConfStand(res.data)
const planForm = {}
planForm.id = this.form.planId
planForm.planStatus = '4'
@@ -2539,8 +2564,8 @@
if(this.form.standStatus === '2'){
this.form.id = ""
this.formKey++
if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) {
this.$message.warning("请选择一条代替企标编号")
if((this.form.standStatus === '2') && (this.form.BDTQBBHBUSS === undefined || this.form.BDTQBBHBUSS === '')) {
this.$message.warning("请选择一条被代替企标编号")
return
}
if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== null){
@@ -2550,12 +2575,6 @@
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}
this.formKey++
}else if(this.form.standStatus === '3' ){
if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) {
this.$message.warning("请选择一条代替企标编号")
return
}
this.formKey++
}else if(this.form.standStatus === '1' ){
this.form.id = ""
if(type === '1'){
src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
+14 -12
View File
@@ -609,7 +609,7 @@
width = "500"
:data="standSystemOptions"
:defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
:nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select-new>
:nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"></tree-select-new>
<tree-select-new
width = "500"
:lazy=true
@@ -620,7 +620,7 @@
:url="url"
:urlChild="urlChild"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select-new>
:nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs" @popoverHideCancel="popoverHideBusVsCancel"></tree-select-new>
</div>
</template>
@@ -1133,8 +1133,8 @@
if(this.form.standStatus === '2'){
this.form.id = ""
this.formKey++
if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) {
this.$message.warning("请选择一条代替企标编号")
if((this.form.standStatus === '2') && (this.form.BDTQBBHBUSS === undefined || this.form.BDTQBBHBUSS === '')) {
this.$message.warning("请选择一条被代替企标编号")
return
}
if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== null){
@@ -1144,12 +1144,6 @@
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}
this.formKey++
}else if(this.form.standStatus === '3' ){
if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) {
this.$message.warning("请选择一条代替企标编号")
return
}
this.formKey++
}else if(this.form.standStatus === '1' ){
this.form.id = ""
if(type === '1'){
@@ -2208,10 +2202,18 @@
},
popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData) {
if(checkedData.length > 0){
if (checkedData.length > 0) {
this.form.TXLBBUSS = checkedData.map(item => item.menuName).join(",")
}else {
this.form.menuId = checkedData.map(item => item.menuId).join(",")
this.form.treeType = checkedData.map(item => item.treeType).join(",")
} else {
if (checkedData.parentId == null || checkedData.parentId === '') {
this.$message.error('请选择二级及以下目录')
return
}
this.form.TXLBBUSS = checkedData.menuName
this.form.menuId = checkedData.id
this.form.treeType = 'sarMs'
}
}
this.modalShowFlag1 = false
src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue
+1 -1
View File
@@ -1071,7 +1071,7 @@
{ required: false, message: '请选择企标发布日期', trigger: 'change'}
],
putTime: [
{ required: true, message: '请选择企标实施日期', trigger: 'change' }
{ required: false, message: '请选择企标实施日期', trigger: 'change' }
],
FBGBUSSName: [
{ required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
+14 -12
View File
@@ -679,7 +679,7 @@
width = "500"
:data="standSystemOptions"
:defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
:nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select-new>
:nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"></tree-select-new>
<tree-select-new
width = "500"
:lazy=true
@@ -690,7 +690,7 @@
:url="url"
:urlChild="urlChild"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select-new>
:nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs" @popoverHideCancel="popoverHideBusVsCancel"></tree-select-new>
</div>
</template>
@@ -1212,8 +1212,8 @@
if(this.form.standStatus === '2'){
this.form.id = ""
this.formKey++
if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) {
this.$message.warning("请选择一条代替企标编号")
if((this.form.standStatus === '2') && (this.form.BDTQBBHBUSS === undefined || this.form.BDTQBBHBUSS === '')) {
this.$message.warning("请选择一条被代替企标编号")
return
}
if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== null){
@@ -1223,12 +1223,6 @@
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}
this.formKey++
}else if(this.form.standStatus === '3' ){
if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) {
this.$message.warning("请选择一条代替企标编号")
return
}
this.formKey++
}else if(this.form.standStatus === '1' ){
this.form.id = ""
if(type === '1'){
@@ -2300,10 +2294,18 @@
},
popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData) {
if(checkedData.length > 0){
if (checkedData.length > 0) {
this.form.TXLBBUSS = checkedData.map(item => item.menuName).join(",")
}else {
this.form.menuId = checkedData.map(item => item.menuId).join(",")
this.form.treeType = checkedData.map(item => item.treeType).join(",")
} else {
if (checkedData.parentId == null || checkedData.parentId === '') {
this.$message.error('请选择二级及以下目录')
return
}
this.form.TXLBBUSS = checkedData.menuName
this.form.menuId = checkedData.id
this.form.treeType = 'sarMs'
}
}
this.modalShowFlag1 = false
src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
+14 -12
View File
@@ -609,7 +609,7 @@
width = "500"
:data="standSystemOptions"
:defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
:nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select-new>
:nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"></tree-select-new>
<tree-select-new
width = "500"
:lazy=true
@@ -620,7 +620,7 @@
:url="url"
:urlChild="urlChild"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select-new>
:nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs" @popoverHideCancel="popoverHideBusVsCancel"></tree-select-new>
</div>
</template>
@@ -1133,8 +1133,8 @@
if(this.form.standStatus === '2'){
this.form.id = ""
this.formKey++
if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) {
this.$message.warning("请选择一条代替企标编号")
if((this.form.standStatus === '2') && (this.form.BDTQBBHBUSS === undefined || this.form.BDTQBBHBUSS === '')) {
this.$message.warning("请选择一条被代替企标编号")
return
}
if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== null){
@@ -1144,12 +1144,6 @@
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}
this.formKey++
}else if(this.form.standStatus === '3' ){
if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) {
this.$message.warning("请选择一条代替企标编号")
return
}
this.formKey++
}else if(this.form.standStatus === '1' ){
this.form.id = ""
if(type === '1'){
@@ -2209,10 +2203,18 @@
},
popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData) {
if(checkedData.length > 0){
if (checkedData.length > 0) {
this.form.TXLBBUSS = checkedData.map(item => item.menuName).join(",")
}else {
this.form.menuId = checkedData.map(item => item.menuId).join(",")
this.form.treeType = checkedData.map(item => item.treeType).join(",")
} else {
if (checkedData.parentId == null || checkedData.parentId === '') {
this.$message.error('请选择二级及以下目录')
return
}
this.form.TXLBBUSS = checkedData.menuName
this.form.menuId = checkedData.id
this.form.treeType = 'sarMs'
}
}
this.modalShowFlag1 = false
src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
+14 -12
View File
@@ -679,7 +679,7 @@
width = "500"
:data="standSystemOptions"
:defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
:nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select-new>
:nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"></tree-select-new>
<tree-select-new
width = "500"
:lazy=true
@@ -690,7 +690,7 @@
:url="url"
:urlChild="urlChild"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys1"
:nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs"></tree-select-new>
:nodeKey="nodeKeyCode" @popoverHide="popoverHideBusVs" @popoverHideCancel="popoverHideBusVsCancel"></tree-select-new>
</div>
</template>
@@ -1212,8 +1212,8 @@
if(this.form.standStatus === '2'){
this.form.id = ""
this.formKey++
if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) {
this.$message.warning("请选择一条代替企标编号")
if((this.form.standStatus === '2') && (this.form.BDTQBBHBUSS === undefined || this.form.BDTQBBHBUSS === '')) {
this.$message.warning("请选择一条被代替企标编号")
return
}
if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== null){
@@ -1223,12 +1223,6 @@
this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}
this.formKey++
}else if(this.form.standStatus === '3' ){
if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) {
this.$message.warning("请选择一条代替企标编号")
return
}
this.formKey++
}else if(this.form.standStatus === '1' ){
this.form.id = ""
if(type === '1'){
@@ -2300,10 +2294,18 @@
},
popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData) {
if(checkedData.length > 0){
if (checkedData.length > 0) {
this.form.TXLBBUSS = checkedData.map(item => item.menuName).join(",")
}else {
this.form.menuId = checkedData.map(item => item.menuId).join(",")
this.form.treeType = checkedData.map(item => item.treeType).join(",")
} else {
if (checkedData.parentId == null || checkedData.parentId === '') {
this.$message.error('请选择二级及以下目录')
return
}
this.form.TXLBBUSS = checkedData.menuName
this.form.menuId = checkedData.id
this.form.treeType = 'sarMs'
}
}
this.modalShowFlag1 = false
src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+11 -2
View File
@@ -2606,15 +2606,24 @@
},
popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData) {
if(checkedData.length > 0){
if (checkedData.length > 0) {
this.form.TXLBBUSS = checkedData.map(item => item.menuName).join(",")
}else {
this.form.menuId = checkedData.map(item => item.menuId).join(",")
this.form.treeType = checkedData.map(item => item.treeType).join(",")
} else {
if (checkedData.parentId == null || checkedData.parentId === '') {
this.$message.error('请选择二级及以下目录')
return
}
this.form.TXLBBUSS = checkedData.menuName
this.form.menuId = checkedData.id
this.form.treeType = 'sarMs'
}
}
this.modalShowFlag1 = false
this.$forceUpdate()
},
popoverHideCancel(){
this.modalShowFlag1 = false
},
src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
+11 -3
View File
@@ -566,7 +566,7 @@
width = "500"
:data="standSystemOptions"
:defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
:nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select-new>
:nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"></tree-select-new>
<tree-select-new
width = "500"
:lazy=true
@@ -2130,10 +2130,18 @@
},
popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData) {
if(checkedData.length > 0){
if (checkedData.length > 0) {
this.form.TXLBBUSS = checkedData.map(item => item.menuName).join(",")
}else {
this.form.menuId = checkedData.map(item => item.menuId).join(",")
this.form.treeType = checkedData.map(item => item.treeType).join(",")
} else {
if (checkedData.parentId == null || checkedData.parentId === '') {
this.$message.error('请选择二级及以下目录')
return
}
this.form.TXLBBUSS = checkedData.menuName
this.form.menuId = checkedData.id
this.form.treeType = 'sarMs'
}
}
this.modalShowFlag1 = false
src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
+34 -5
View File
@@ -567,7 +567,7 @@
width = "500"
:data="standSystemOptions"
:defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
:nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select-new>
:nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"></tree-select-new>
<tree-select-new
width = "500"
:lazy=true
@@ -2113,10 +2113,18 @@
},
popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData) {
if(checkedData.length > 0){
if (checkedData.length > 0) {
this.form.TXLBBUSS = checkedData.map(item => item.menuName).join(",")
}else {
this.form.menuId = checkedData.map(item => item.menuId).join(",")
this.form.treeType = checkedData.map(item => item.treeType).join(",")
} else {
if (checkedData.parentId == null || checkedData.parentId === '') {
this.$message.error('请选择二级及以下目录')
return
}
this.form.TXLBBUSS = checkedData.menuName
this.form.menuId = checkedData.id
this.form.treeType = 'sarMs'
}
}
this.modalShowFlag1 = false
@@ -2363,6 +2371,25 @@
})
}})
},
async saveConfStand(standId) {
if(this.form.menuId && this.form.menuId !== ''){
let search = {}
let list = []
list.push(standId)
search.menuId = this.form.menuId
search.menuName = this.form.TXLBBUSS
search.treeType = 'sarMs'
search.idlist = list
return new Promise((resolve, reject) => {
this.$http.postData('lawss/sarBussionessStand/saveStandardsMenu', search, {
_this: this
}, res => {
const history = res;
resolve(history)
})
})
}
},
/**
* @description: 流程入库
* @date: 2020-11-18 21:47:58
@@ -2371,8 +2398,10 @@
const _formData = new FormData()
_formData.append('infoJson', json)
processCreateBuss(_formData).then(res => {
if (res.result === '操作成功' || res.data === '入库成功') {
this.$message.success(res.data)
if (res.result === '操作成功' || res.ok) {
this.$message.success("入库成功")
// 自动匹配配置标准
this.saveConfStand(res.data)
const planForm = {}
planForm.id = this.form.planId
planForm.planStatus = '4'
src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
+11 -3
View File
@@ -611,7 +611,7 @@
width = "500"
:data="standSystemOptions"
:defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
:nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select-new>
:nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"></tree-select-new>
<tree-select-new
width = "500"
:lazy=true
@@ -2157,10 +2157,18 @@
},
popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData) {
if(checkedData.length > 0){
if (checkedData.length > 0) {
this.form.TXLBBUSS = checkedData.map(item => item.menuName).join(",")
}else {
this.form.menuId = checkedData.map(item => item.menuId).join(",")
this.form.treeType = checkedData.map(item => item.treeType).join(",")
} else {
if (checkedData.parentId == null || checkedData.parentId === '') {
this.$message.error('请选择二级及以下目录')
return
}
this.form.TXLBBUSS = checkedData.menuName
this.form.menuId = checkedData.id
this.form.treeType = 'sarMs'
}
}
this.modalShowFlag1 = false
src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
+11 -3
View File
@@ -814,7 +814,7 @@
width = "500"
:data="standSystemOptions"
:defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
:nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select-new>
:nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"></tree-select-new>
<tree-select-new
width = "500"
:lazy=true
@@ -2511,10 +2511,18 @@
},
popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData) {
if(checkedData.length > 0){
if (checkedData.length > 0) {
this.form.TXLBBUSS = checkedData.map(item => item.menuName).join(",")
}else {
this.form.menuId = checkedData.map(item => item.menuId).join(",")
this.form.treeType = checkedData.map(item => item.treeType).join(",")
} else {
if (checkedData.parentId == null || checkedData.parentId === '') {
this.$message.error('请选择二级及以下目录')
return
}
this.form.TXLBBUSS = checkedData.menuName
this.form.menuId = checkedData.id
this.form.treeType = 'sarMs'
}
}
this.modalShowFlag1 = false
src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
+11 -3
View File
@@ -611,7 +611,7 @@
width = "500"
:data="standSystemOptions"
:defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
:nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select-new>
:nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"></tree-select-new>
<tree-select-new
width = "500"
:lazy=true
@@ -2157,10 +2157,18 @@
},
popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData) {
if(checkedData.length > 0){
if (checkedData.length > 0) {
this.form.TXLBBUSS = checkedData.map(item => item.menuName).join(",")
}else {
this.form.menuId = checkedData.map(item => item.menuId).join(",")
this.form.treeType = checkedData.map(item => item.treeType).join(",")
} else {
if (checkedData.parentId == null || checkedData.parentId === '') {
this.$message.error('请选择二级及以下目录')
return
}
this.form.TXLBBUSS = checkedData.menuName
this.form.menuId = checkedData.id
this.form.treeType = 'sarMs'
}
}
this.modalShowFlag1 = false
src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
+11 -3
View File
@@ -814,7 +814,7 @@
width = "500"
:data="standSystemOptions"
:defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
:nodeKey="nodeKey" @popoverHide="popoverHide"></tree-select-new>
:nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"></tree-select-new>
<tree-select-new
width = "500"
:lazy=true
@@ -2511,10 +2511,18 @@
},
popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData) {
if(checkedData.length > 0){
if (checkedData.length > 0) {
this.form.TXLBBUSS = checkedData.map(item => item.menuName).join(",")
}else {
this.form.menuId = checkedData.map(item => item.menuId).join(",")
this.form.treeType = checkedData.map(item => item.treeType).join(",")
} else {
if (checkedData.parentId == null || checkedData.parentId === '') {
this.$message.error('请选择二级及以下目录')
return
}
this.form.TXLBBUSS = checkedData.menuName
this.form.menuId = checkedData.id
this.form.treeType = 'sarMs'
}
}
this.modalShowFlag1 = false
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+35 -3
View File
@@ -1336,7 +1336,7 @@
</div>
</el-drawer>
<el-dialog
title="企标复审计划"
title="企标复审计划 -（已复审过的企标列表记录以及未来一个月内需要复审的企标信息列表以及复审结果）"
:visible.sync="replaceLawsNumModel"
width="875px"
:close-on-click-modal="false"
@@ -2653,9 +2653,17 @@ export default {
if (checkedData) {
if (checkedData.length > 0) {
this.sarBussionessStandEO.TXLBBUSS = checkedData.map(item => item.menuName).join(",")
this.sarBussionessStandEO.menuId = checkedData.map(item => item.menuId).join(",")
this.sarBussionessStandEO.treeType = checkedData.map(item => item.treeType).join(",")
this.sarBussionessSearch.TXLBBUSS = checkedData.map(item => item.menuName).join(",")
} else {
if (checkedData.parentId == null || checkedData.parentId === '') {
this.$message.error('请选择二级及以下目录')
return
}
this.sarBussionessStandEO.TXLBBUSS = checkedData.menuName
this.sarBussionessStandEO.menuId = checkedData.id
this.sarBussionessStandEO.treeType = checkedData.treeType
this.sarBussionessSearch.TXLBBUSS = checkedData.menuName
}
}
@@ -3172,10 +3180,31 @@ export default {
this.configPage = 1
this.selectConfigStand = []
},
async saveConfStand(item) {
if(item.menuId && item.menuId !== ''){
let search = {}
let list = []
list.push(item.id)
search.menuId = item.menuId
search.menuName = item.TXLBBUSS
search.treeType = 'sarMs'
search.idlist = list
return new Promise((resolve, reject) => {
this.$http.postData('lawss/sarBussionessStand/saveStandardsMenu', search, {
_this: this
}, res => {
const history = res;
this.getBussionStandTable(this.tableFlag)
resolve(history)
})
})
}
},
// 提交配置搜索项
saveConfigStand() {
let search = {}
search.menuId = this.selectSarMenu.id
search.menuName = this.selectSarMenu.menuName
search.treeType = this.selectSarMenu.treeType
if (this.selectConfigStand.length === 0) {
this.$message({
@@ -3666,7 +3695,10 @@ export default {
loading: 'isSubmit'
}, res => {
if (res.ok) {
this.getBussionStandTable(this.tableFlag)
// 自动匹配 左侧树 指定菜单
this.saveConfStand(nowstandinfo)
// this.pageChange(1)
this.resetForm()
}
@@ -3932,6 +3964,7 @@ export default {
let search = {}
// 取最外层目录id
search.menuId = this.selectSarMenu.id
console.log(this.selectSarMenu)
search.treeType = this.selectSarMenu.treeType
// search.menuId = this.removeOneId
search.idlist = []
@@ -4088,7 +4121,6 @@ export default {
return data.menuName.indexOf(value) !== -1;
},
treeClick(treeNode) {
console.log(treeNode)
this.selectSarMenu = treeNode // 记录当前选中的二级菜单
this.sarBussionessSearch.menuId = treeNode.id
this.sarBussionessSearch.menuId = treeNode.id // 将当前二级菜单的id传回后台做标准的条件查询