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-05-23 14:02:46 +08:00
parent 7a82a6a3ed 635754c757
commit e3c4456a99
13 changed files with 252 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/roleTree/index.vue
+50 -14
View File
@@ -14,11 +14,16 @@
>
<el-form-item class="form-item-disabled" style="margin: 10px;">
<el-input
v-model="filterText"
placeholder="请输入姓名"
@input="changeInput"
v-model="filterText"
placeholder="请输入姓名"
@keyup.enter.native="searchChange"
></el-input>
</el-form-item>
<el-form-item class="form-item-disabled" style="margin-top: 10px;">
<el-button size="medium " type="primary" @click="searchChange">
查询
</el-button>
</el-form-item>
</el-form>
<div class="divTree">
<el-tree
@@ -31,6 +36,7 @@
:data="treeData"
:props="defaultProps"
:default-checked-keys="nodeList2"
:default-expanded-keys="defaultKey"
highlight-current
check-strictly
@check="drawerCheck"
@@ -38,7 +44,7 @@
show-checkbox
ref="tree"
:load="loadNode"
lazy>
:lazy="true">
<span class="custom-tree-node" slot-scope="{ node, data }">
<span :class="node.disabled ? 'is-show' : 'is-leaf-none'"></span>
<span> {{ node.label }} </span>
@@ -54,13 +60,14 @@
:props="defaultProps"
@check-change="checkChange2"
:default-checked-keys="nodeList2"
highlight-current
check-strictly
@check="drawerCheck"
:expand-on-click-node="true"
:default-expanded-keys="defaultKey"
default-expand-all
highlight-current
:check-strictly="true"
@check="drawerCheck"
show-checkbox
ref="tree">
ref="tree"
:lazy="false">
<span class="custom-tree-node" slot-scope="{ node, data }">
<span :class="node.disabled ? 'is-show' : 'is-leaf-none'"></span>
<span> {{ node.label }} </span>
@@ -128,6 +135,7 @@
},
data () {
return {
defaultKey: [],
visible: false,
selectList: [],
nodeList2: [],
@@ -137,11 +145,6 @@
defaultProps: {
children: 'children',
label: 'name',
isLeaf: (data, node) => {
if (!node.disabled) {
return true
}
}
},
treeData1: [],
treeData: [],
@@ -193,6 +196,39 @@
}
)
},
searchChange(){
if (this.filterText.length) {
this.open1 = false
this.treeLoading = true
this.defaultKey = []
this.$http.get('SarInstitution/institution/getNextTwo', {
userName: this.filterText
}, {}, res => {
this.treeData1 = res
this.treeData1.forEach(item => {
this.defaultKey.push(item.id)
})
this.treeLoading = false
})
// this.$http.get('SarInstitution/institution/institutionAndUser', {
// userName: this.filterText
// }, {}, res => {
// this.treeData1 = res.data
// this.treeData1.forEach(item => {
// this.defaultKey.push(item.id)
// })
// console.log(1);
// this.getChildren()
// this.treeLoading = false
// })
} else {
this.open1 = true
}
},
changeInput:debounce(function (val) {
if (val.length) {
this.open1 = false
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+23 -23
View File
@@ -887,13 +887,13 @@
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
<el-input
type="textarea"
style="display:none;"
v-model="form.bfdtbzh"
placeholder="请输入部分代替标准号"
></el-input>
<!-- <el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">-->
<!-- <el-input-->
<!-- type="textarea"-->
<!-- style="display:none;"-->
<!-- v-model="form.bfdtbzh"-->
<!-- placeholder="请输入部分代替标准号"-->
<!-- ></el-input>-->
<!-- <el-tooltip v-if="form.bfbdtbzh" effect="dark" :content=form.bfbdtbzh placement="top-start">-->
<!-- <el-input-->
<!-- v-model="form.bfbdtbzh"-->
@@ -901,22 +901,22 @@
<!-- clearable-->
<!-- ></el-input>-->
<!-- </el-tooltip>-->
<el-input
type="textarea"
:title="form.bfbdtbzh"
v-model="form.bfbdtbzh"
placeholder="请输入部分代替标准号"
clearable
></el-input>
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="position:absolute;top: 10px;right: 0;"
@click="selectLaws('bfbdtbzh'),config.attrName = '部分代替标准号'"
>{{ '手动查找' }}
</el-button>
</el-form-item>
<!-- <el-input-->
<!-- type="textarea"-->
<!-- :title="form.bfbdtbzh"-->
<!-- v-model="form.bfbdtbzh"-->
<!-- placeholder="请输入部分代替标准号"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- class="common-button-primary"-->
<!-- size="mini"-->
<!-- style="position:absolute;top: 10px;right: 0;"-->
<!-- @click="selectLaws('bfbdtbzh'),config.attrName = '部分代替标准号'"-->
<!-- >{{ '手动查找' }}-->
<!-- </el-button>-->
<!-- </el-form-item>-->
<el-form-item v-show="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled">
<!-- <el-tooltip v-if="form.cbbh" effect="dark" :content=form.cbbh placement="top-start">-->
<!-- <el-input-->
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+19 -19
View File
@@ -597,25 +597,25 @@
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
<el-tooltip v-if="form.bfbdtbzh" effect="dark" :content=form.bfbdtbzh placement="top-start">
<el-input
disabled
type="textarea"
v-model="form.bfbdtbzh"
placeholder="请输入部分代替标准号"
clearable
></el-input>
</el-tooltip>
<el-input
v-else
disabled
type="textarea"
v-model="form.bfbdtbzh"
placeholder="请输入部分代替标准号"
clearable
></el-input>
</el-form-item>
<!-- <el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">-->
<!-- <el-tooltip v-if="form.bfbdtbzh" effect="dark" :content=form.bfbdtbzh placement="top-start">-->
<!-- <el-input-->
<!-- disabled-->
<!-- type="textarea"-->
<!-- v-model="form.bfbdtbzh"-->
<!-- placeholder="请输入部分代替标准号"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- </el-tooltip>-->
<!-- <el-input-->
<!-- v-else-->
<!-- disabled-->
<!-- type="textarea"-->
<!-- v-model="form.bfbdtbzh"-->
<!-- placeholder="请输入部分代替标准号"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<el-form-item v-if="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled">
<el-tooltip v-if="form.cbbh" effect="dark" :content=form.cbbh placement="top-start">
<el-input
src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+19 -19
View File
@@ -568,25 +568,25 @@
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
<el-tooltip v-if="form.bfbdtbzh" effect="dark" :content=form.bfbdtbzh placement="top-start">
<el-input
disabled
type="textarea"
v-model="form.bfbdtbzh"
placeholder="请输入部分代替标准号"
clearable
></el-input>
</el-tooltip>
<el-input
v-else
disabled
type="textarea"
v-model="form.bfbdtbzh"
placeholder="请输入部分代替标准号"
clearable
></el-input>
</el-form-item>
<!-- <el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">-->
<!-- <el-tooltip v-if="form.bfbdtbzh" effect="dark" :content=form.bfbdtbzh placement="top-start">-->
<!-- <el-input-->
<!-- disabled-->
<!-- type="textarea"-->
<!-- v-model="form.bfbdtbzh"-->
<!-- placeholder="请输入部分代替标准号"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- </el-tooltip>-->
<!-- <el-input-->
<!-- v-else-->
<!-- disabled-->
<!-- type="textarea"-->
<!-- v-model="form.bfbdtbzh"-->
<!-- placeholder="请输入部分代替标准号"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<el-form-item v-if="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled">
<el-tooltip v-if="form.cbbh" effect="dark" :content=form.cbbh placement="top-start">
<el-input
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+31 -31
View File
@@ -1147,37 +1147,37 @@
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
<el-input
style="display:none;"
v-model="form.bfdtbzh"
type="textarea"
placeholder="请输入部分代替标准号"
></el-input>
<el-tooltip v-if="form.bfbdtbzh" effect="dark" :content=form.bfbdtbzh placement="top-start">
<el-input
v-model="form.bfbdtbzh"
type="textarea"
placeholder="请输入部分代替标准号"
clearable
></el-input>
</el-tooltip>
<el-input
v-else
type="textarea"
v-model="form.bfbdtbzh"
placeholder="请输入部分代替标准号"
clearable
></el-input>
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="position:absolute;top: 10px;right: 0;"
@click="selectLaws('bfbdtbzh'),config.attrName = '部分代替标准号'"
>{{ '手动查找' }}
</el-button>
</el-form-item>
<!-- <el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">-->
<!-- <el-input-->
<!-- style="display:none;"-->
<!-- v-model="form.bfdtbzh"-->
<!-- type="textarea"-->
<!-- placeholder="请输入部分代替标准号"-->
<!-- ></el-input>-->
<!-- <el-tooltip v-if="form.bfbdtbzh" effect="dark" :content=form.bfbdtbzh placement="top-start">-->
<!-- <el-input-->
<!-- v-model="form.bfbdtbzh"-->
<!-- type="textarea"-->
<!-- placeholder="请输入部分代替标准号"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- </el-tooltip>-->
<!-- <el-input-->
<!-- v-else-->
<!-- type="textarea"-->
<!-- v-model="form.bfbdtbzh"-->
<!-- placeholder="请输入部分代替标准号"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- class="common-button-primary"-->
<!-- size="mini"-->
<!-- style="position:absolute;top: 10px;right: 0;"-->
<!-- @click="selectLaws('bfbdtbzh'),config.attrName = '部分代替标准号'"-->
<!-- >{{ '手动查找' }}-->
<!-- </el-button>-->
<!-- </el-form-item>-->
<el-form-item v-if="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled">
<el-tooltip v-if="form.cbbh" effect="dark" :content=form.cbbh placement="top-start">
<el-input
src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
+19 -19
View File
@@ -597,25 +597,25 @@
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
<el-tooltip v-if="form.bfbdtbzh" effect="dark" :content=form.bfbdtbzh placement="top-start">
<el-input
disabled
type="textarea"
v-model="form.bfbdtbzh"
placeholder="请输入部分代替标准号"
clearable
></el-input>
</el-tooltip>
<el-input
v-else
disabled
type="textarea"
v-model="form.bfbdtbzh"
placeholder="请输入部分代替标准号"
clearable
></el-input>
</el-form-item>
<!-- <el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">-->
<!-- <el-tooltip v-if="form.bfbdtbzh" effect="dark" :content=form.bfbdtbzh placement="top-start">-->
<!-- <el-input-->
<!-- disabled-->
<!-- type="textarea"-->
<!-- v-model="form.bfbdtbzh"-->
<!-- placeholder="请输入部分代替标准号"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- </el-tooltip>-->
<!-- <el-input-->
<!-- v-else-->
<!-- disabled-->
<!-- type="textarea"-->
<!-- v-model="form.bfbdtbzh"-->
<!-- placeholder="请输入部分代替标准号"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<el-form-item v-if="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled">
<el-tooltip v-if="form.cbbh" effect="dark" :content=form.cbbh placement="top-start">
<el-input
src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+3 -3
View File
@@ -353,7 +353,7 @@
newText: '',
reason: '',
id: '',
department: this.$store.getters.userInfo.institutionName,
department: this.$store.getters.userInfo.institutionNameDepartment,
responUserName: this.$store.getters.userInfo.userName,
responUser: this.$store.getters.userInfo.userId
},
@@ -456,7 +456,7 @@
newText: '',
reason: '',
id: id,
department: this.$store.getters.userInfo.institutionName,
department: this.$store.getters.userInfo.institutionNameDepartment,
responUserName: this.$store.getters.userInfo.userName,
responUser: this.$store.getters.userInfo.userId
}
@@ -724,7 +724,7 @@
window.addEventListener("storage", ev => {
if(ev.key === 'freshClueNum'){
let form = JSON.parse(window.localStorage.getItem('bzzqyjForm'))
form.department = this.$store.getters.userInfo.institutionName
form.department = this.$store.getters.userInfo.institutionNameDepartment
form.responUserName = this.$store.getters.userInfo.userName
form.responUser = this.$store.getters.userInfo.userId
this.data.push(form)
src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+3 -3
View File
@@ -500,7 +500,7 @@ export default {
newText: '',
reason: '',
id: id,
department: this.$store.getters.userInfo.institutionName,
department: this.$store.getters.userInfo.institutionNameDepartment,
responUserName: this.$store.getters.userInfo.userName,
responUser: this.$store.getters.userInfo.userId
}
@@ -528,7 +528,7 @@ export default {
// newText: '',
// reason: '',
// id: id,
// department: this.$store.getters.userInfo.institutionName,
// department: this.$store.getters.userInfo.institutionNameDepartment,
// responUserName: this.$store.getters.userInfo.userName,
// responUser: this.$store.getters.userInfo.userId
// }
@@ -738,7 +738,7 @@ export default {
window.addEventListener("storage", ev => {
if(ev.key === 'freshClueNum'){
let form = JSON.parse(window.localStorage.getItem('bzzqyjForm'))
form.department = this.$store.getters.userInfo.institutionName
form.department = this.$store.getters.userInfo.institutionNameDepartment
form.responUserName = this.$store.getters.userInfo.userName
form.responUser = this.$store.getters.userInfo.userId
this.data.push(form)
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+34 -17
View File
@@ -126,6 +126,7 @@
>
<template slot-scope="scope">
<el-select
@focus="typeList(scope.row)"
@change="fileTypeChange"
v-model="scope.row.fileType"
placeholder="请选择"
@@ -133,9 +134,9 @@
>
<el-option
v-for="item in decomposeOptions"
:value="item.attrField"
:value="item.value"
:key="item.id"
:label="item.attrName"
:label="item.label"
>
</el-option>
</el-select>
@@ -569,6 +570,22 @@ export default {
});
});
},
typeList(row){
this.decomposeOptions = []
this.$http.get("SarStandItems/sar-stand-items/getFileType", {
standId: row.standId
}, {}, res => {
this.decomposeOptions.push(
{
value: 'BDR',
label: '不带入'
}
)
res.data.forEach(item => {
this.decomposeOptions.push(item)
})
});
},
fileTypeChange(type){
this.fileType = type
let ids = [];
@@ -948,21 +965,21 @@ export default {
}, e => {
});
//查找分解单来源数据
this.$http.get('lawss/sarStandAttrDetails/getListData',{},{
_this: this
}, res => {
this.decomposeOptions.push(
{
attrField: 'BDR',
attrName: '不带入'
}
)
res.data.forEach(item => {
if(item.sarType === 'STAND' || item.sarType === 'INLAND_STAND' || item.sarType === 'FOREIGN_STAND'){
this.decomposeOptions.push(item)
}
})
})
// this.$http.get('lawss/sarStandAttrDetails/getListData',{},{
// _this: this
// }, res => {
// this.decomposeOptions.push(
// {
// attrField: 'BDR',
// attrName: '不带入'
// }
// )
// res.data.forEach(item => {
// if(item.sarType === 'STAND' || item.sarType === 'INLAND_STAND' || item.sarType === 'FOREIGN_STAND'){
// this.decomposeOptions.push(item)
// }
// })
// })
}
};
</script>
src/pages/processCenter/pages/phone/bzrk/step2.vue
+1 -1
View File
@@ -383,7 +383,7 @@
- -
</div>
</el-form-item>
<van-field label="部分代替标准号" v-model="form.bfbdtbzh" readonly placeholder="请输入部分代替标准号"/>
<!-- <van-field label="部分代替标准号" v-model="form.bfbdtbzh" readonly placeholder="请输入部分代替标准号"/>-->
<van-field v-if="form.standInData === '0'" label="采标编号" v-model="form.cbbh" readonly placeholder="请输入采标编号"/>
<van-field label="引用标准" v-model="form.yybj" readonly placeholder="请输入引用标准"/>
</div>
src/pages/processCenter/pages/phone/bzzqyj/step9.vue
+32 -34
View File
@@ -3,7 +3,7 @@
<!-- 标准调研流程-->
<ProcessHeaderPhone toggle>
<template slot="proName">标准征求意见流程</template>
<template slot="proNode">工程研究总院院长批准</template>
<template slot="proNode">批准</template>
</ProcessHeaderPhone>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -380,39 +380,37 @@
this.$message.warning("请输入反馈意见");
}
},
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg);
this.form.fjList = data.fjList || data.form.fjList
if (data.fjListId === '') {
this.form.fjListId = ''
} else {
this.form.fjListId = data.form.fjListId || data.fjListId
}
this.commentText9 = data.commentText9 || ''
this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime;
this.form.cname = data.cname || data.form.cname;
this.oldData = JSON.parse(JSON.stringify(data.info))
var arr = []
data.info.forEach(item => {
if (item.state != '3') {
arr.push(item)
}
})
this.json = data
this.form.textType = data.textType || data.form.textType
this.form.modelList = data.modelList || data.form.modelList
this.form.modelNameList = data.modelNameList || data.form.modelNameList
this.data = arr
}).catch(e => {
});
});
}
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.commentText9 = data.commentText9 || ''
this.onlyKey = data.form ? data.form.onlyKey :data.onlyKey
this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
this.form.fjList = data.fjList || data.form.fjList
this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime;
this.form.textType = data.textType || data.form.textType
this.form.modelList = data.modelList || data.form.modelList
let newArr = data.info ? data.info : data.form.data
this.oldData = JSON.parse(JSON.stringify(newArr))
let arr = []
newArr.forEach(item => {
if (item.state !== '3') {
arr.push(item)
}
})
this.json = data
this.data = arr
this.data2 = newArr
}).catch(e => {
});
});
}
},
mounted() {
this.getHistoryData();
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+3 -3
View File
@@ -1990,9 +1990,9 @@
clearable :maxlength="100"></el-input>
</el-form-item>
<!-- 部分代替标准号-->
<el-form-item label="部分代替标准号" class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.BFDTBZ" clearable placeholder="根据部分代替标准号查找"></el-input>
</el-form-item>
<!-- <el-form-item label="部分代替标准号" class="add-form-item form-item-disabled">-->
<!-- <el-input v-model="advanceSearchMapping.BFDTBZ" clearable placeholder="根据部分代替标准号查找"></el-input>-->
<!-- </el-form-item>-->
<!-- 采标编号-->
<el-form-item label="采标编号" prop="nameShow" class="add-form-item form-item-disabled">
<el-input v-model="advanceSearchMapping.CBBH" clearable placeholder="根据采标编号查找"></el-input>
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+15 -2
View File
@@ -786,7 +786,14 @@
></custom-input>
</template>
</template>
<template v-else-if="field.attrType === 'DATE_PICKER'">
<template v-else-if="field.attrType === 'DATE_PICKER' && field.attrField !== 'BARQ'">
<custom-date-pick
:config="field"
v-model="sarBussionessStandEO[field.attrField]"
:disabled="formdisableflag"
></custom-date-pick>
</template>
<template v-else-if="field.attrType === 'DATE_PICKER' && field.attrField === 'BARQ' && QCBFC">
<custom-date-pick
:config="field"
v-model="sarBussionessStandEO[field.attrField]"
@@ -1154,7 +1161,7 @@
</el-form-item>
<!-- 备案日期 -->
<el-form-item label="备案日期" class="add-form-item form-item-disabled">
<el-form-item label="备案日期" class="add-form-item form-item-disabled">
<el-date-picker
v-model="sarBussionessSearch.BARQ"
type="daterange"
@@ -1690,6 +1697,7 @@ export default {
props: {},
data() {
return {
QCBFC: false, //C类标准展示备案日期
replaceLawsNumModel: false,
replaceLawType: '',
sarBussionessLawsEO: {
@@ -3569,6 +3577,11 @@ export default {
this.$http.get('lawss/sarBussionessStand/getStandInfoUpdateById', {id: row.id}, {
_this: this
}, res => {
if(res.data.standCode.includes('Q/QCBFC')){
this.QCBFC = true
}else{
this.QCBFC = false
}
const item = res.data || {}
this.drawerTitle = '修改企业标准'
this.modalshowflag = true