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

Merge branch 'develop' into FOTON

Browse Source
This commit is contained in:
super_liu
2022-04-19 16:52:12 +08:00
parent ce27afe807 52adb01730
commit 59e8689bea
12 changed files with 231 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.js
+2 -1
View File
@@ -46,7 +46,8 @@ import 'vant/lib/index.css';
//vant //vant
import animate from 'animate.css' import animate from 'animate.css'
import tool from './utils/tool'
Vue.use(tool)
// 引入路由器 // 引入路由器
import router from './router' import router from './router'
// 路由解析器 // 路由解析器
src/pages/home2/components/todoList/index.vue
+7 -7
View File
@@ -9,13 +9,13 @@
</div> </div>
<ul> <ul>
<li v-for="item in toDoTaskList" :key="item.id" class="time-title"> <li v-for="item in toDoTaskList" :key="item.id" class="time-title">
<div style="height: 30px"> <div style="min-height: 30px">
<span @click="dealWith(item)" v-if="item.prcName.length<24" <span @click="dealWith(item)"
style="line-height: 30px; font-size: 13px;">{{ getPrcNameFilter(item) }}</span> style="line-height: 30px; font-size: 13px;display: inline-block;width: 400px;">{{ getPrcNameFilter(item) }}</span>
<el-tooltip class="item" effect="dark" :content="getPrcNameFilter(item)" placement="left" v-else> <!-- <el-tooltip class="item" effect="dark" :content="getPrcNameFilter(item)" placement="left" v-else>-->
<span @click="dealWith(item)" <!-- <span @click="dealWith(item)"-->
style="line-height: 30px; font-size: 13px;">{{ getPrcNameFilter(item).substring(0, 32) + '...' }}</span> <!-- style="line-height: 30px; font-size: 13px;">{{ getPrcNameFilter(item).substring(0, 32) + '...' }}</span>-->
</el-tooltip> <!-- </el-tooltip>-->
</div> </div>
</li> </li>
</ul> </ul>
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+4
View File
@@ -437,6 +437,7 @@
v-model="plForm.technicalRequir" v-model="plForm.technicalRequir"
placeholder="请输入核心技术要求" placeholder="请输入核心技术要求"
maxlength="500" maxlength="500"
:autosize="{minRows:10,maxRows:10}"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1"> <el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
@@ -1036,6 +1037,9 @@ export default {
}, },
handleTabs(name) { handleTabs(name) {
this.active = name this.active = name
this.$nextTick(()=>{
this.$refs.filterTable.doLayout()
})
}, },
handleSave() { handleSave() {
this.saveLoading = true this.saveLoading = true
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+45 -33
View File
@@ -26,30 +26,33 @@
<span <span
:class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span> :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span>
<span style="font-size:12px"> {{ node.label }} </span> <span style="font-size:12px"> {{ node.label }} </span>
<!--<span> <span>
<el-button <el-button
type="text" type="text"
size="mini" size="mini"
v-show="data.show" v-show="data.show"
@click="() => append(data)"> v-btn-permission="'764f630a49072d76a237dbcc9a1831e1'"
新增 @click="() => append(data)">
</el-button> 新增
<el-button </el-button>
type="text" <el-button
size="mini" type="text"
v-show="data.show" size="mini"
@click="() => update(data)"> v-show="data.show"
编辑 v-btn-permission="'afdef0736eb111e9865e19fa3129d0ac'"
</el-button> @click="() => update(data)">
<el-button 编辑
type="text" </el-button>
size="mini" <el-button
v-show="data.showDel" type="text"
@click="() => remove(node, data)"> size="mini"
删除 v-show="data.showDel"
</el-button> v-btn-permission="'c517df26b904cb8f69495f7f38f8f77b'"
</span>--> @click="() => remove(node, data)">
</span> 删除
</el-button>
</span>
</span>
</el-tree> </el-tree>
</el-card> </el-card>
</div> </div>
@@ -1769,11 +1772,16 @@
<el-col :span="12"> <el-col :span="12">
<!-- 归口管理部门--> <!-- 归口管理部门-->
<el-form-item label="归口管理部门" class="add-form-item form-item-disabled"> <el-form-item label="归口管理部门" class="add-form-item form-item-disabled">
<el-select v-model="advanceSearchMapping.GKDW" placeholder="归口管理部门" clearable> <search-select
<el-option v-for="(opt, index) in gkglbmOptions" :value="opt.value === undefined ? '' :opt.value" v-model="advanceSearchMapping.GKDW"
:key="index" :label="opt.label">{{ opt.label }} :placeholder="'归口管理部门'"
</el-option> :options="gkglbmOptions"
</el-select> clearable/>
<!-- <el-select v-model="advanceSearchMapping.GKDW" placeholder="归口管理部门" clearable>-->
<!-- <el-option v-for="(opt, index) in gkglbmOptions" :value="opt.value === undefined ? '' :opt.value"-->
<!-- :key="index" :label="opt.label">{{ opt.label }}-->
<!-- </el-option>-->
<!-- </el-select>-->
</el-form-item> </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">
@@ -2283,7 +2291,6 @@ export default {
parentIds: null, parentIds: null,
parentIdsName: "", parentIdsName: "",
displaySeq: "", displaySeq: "",
validFlag: "",
creationTime: "", creationTime: "",
modifyTime: "", modifyTime: "",
remarks: "", remarks: "",
@@ -3615,11 +3622,16 @@ export default {
if (row.parentIds.indexOf(res.data.id) != -1) { if (row.parentIds.indexOf(res.data.id) != -1) {
this.productModelAdd.parentIds = row.parentIds this.productModelAdd.parentIds = row.parentIds
} else { } else {
this.productModelAdd.parentIds = row.parentIds + ',' + res.data.id if(row.parentIds && row.parentIds.substr(-1,1) === ','){
idsName = row.parentIdsName + ',' + res.data.menuName this.productModelAdd.parentIds = row.parentIds + res.data.id+','
idsName = row.parentIdsName + ',' + res.data.menuName
}else {
this.productModelAdd.parentIds = row.parentIds + ',' + res.data.id+','
idsName = row.parentIdsName + ',' + res.data.menuName
}
} }
} else { } else {
this.productModelAdd.parentIds = res.data.id this.productModelAdd.parentIds = ','+res.data.id+','
idsName = res.data.menuName; idsName = res.data.menuName;
} }
this.productModelAdd.parentId = res.data.id this.productModelAdd.parentId = res.data.id
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+58 -34
View File
@@ -25,29 +25,32 @@
<span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)"> <span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
<span :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span> <span :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span>
<span style="font-size:12px"> {{ node.label }} </span> <span style="font-size:12px"> {{ node.label }} </span>
<!-- <span> <span>
<el-button <el-button
type="text" type="text"
size="mini" size="mini"
v-show="data.show" v-show="data.show"
@click="() => append(data)"> v-btn-permission="'21f35d66ae92f2e6f20eeba84ce78987'"
新增 @click="() => append(data)">
</el-button> 新增
<el-button </el-button>
type="text" <el-button
size="mini" type="text"
v-show="data.show" size="mini"
@click="() => update(data)"> v-show="data.show"
编辑 v-btn-permission="'c06b789cb4d6fba4773b12ce0804c1c3'"
</el-button> @click="() => update(data)">
<el-button 编辑
type="text" </el-button>
size="mini" <el-button
v-show="data.showDel" type="text"
@click="() => remove(node, data)"> size="mini"
删除 v-show="data.showDel"
</el-button> v-btn-permission="'9ca2bd379b83d479110cb51bcb4502ed'"
</span>--> @click="() => remove(node, data)">
删除
</el-button>
</span>
</span> </span>
</el-tree> </el-tree>
</el-card> </el-card>
@@ -1756,13 +1759,12 @@ export default {
}, },
productModelAdd: { productModelAdd: {
id: "", id: "",
sorDivide: "INLAND_STAND", sorDivide: "BUSINESS_STAND",
menuName: "", menuName: "",
parentId: null, parentId: null,
parentIds: null, parentIds: null,
parentIdsName: "", parentIdsName: "",
displaySeq: "", displaySeq: "",
validFlag: "",
creationTime: "", creationTime: "",
modifyTime: "", modifyTime: "",
remarks: "", remarks: "",
@@ -2797,7 +2799,7 @@ export default {
_this: this _this: this
}, res => { }, res => {
if (res.ok) { if (res.ok) {
this.selectMenuList() this.selectMenuListNew()
this.productModal = false this.productModal = false
this.productModelAdd = { this.productModelAdd = {
// 模态框信息 // 模态框信息
@@ -2817,7 +2819,7 @@ export default {
this.$http.putData('sarResource/ts-resource', this.productModelAdd, { this.$http.putData('sarResource/ts-resource', this.productModelAdd, {
_this: this _this: this
}, res => { }, res => {
this.selectMenuList() this.selectMenuListNew()
this.productModal = false this.productModal = false
this.productModelAdd = { this.productModelAdd = {
// 模态框信息 // 模态框信息
@@ -2851,6 +2853,18 @@ export default {
this.productModal = false this.productModal = false
}, },
// 查询二级菜单 // 查询二级菜单
selectMenuListNew() {
return new Promise((resolve, reject) => {
this.$http.get('sarResource/ts-resource/getListStandLimitData', {
sorDivide: 'BUSINESS_STAND',
userId: this.$store.getters.userInfo.userId
}, {
_this: this
}, res => {
this.treeList = res.data
})
})
},
selectMenuList() { selectMenuList() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
this.$http.get('sarResource/ts-resource/getListStandLimitData', { this.$http.get('sarResource/ts-resource/getListStandLimitData', {
@@ -2886,11 +2900,16 @@ export default {
if (row.parentIds.indexOf(res.data.id) != -1) { if (row.parentIds.indexOf(res.data.id) != -1) {
this.productModelAdd.parentIds = row.parentIds this.productModelAdd.parentIds = row.parentIds
} else { } else {
this.productModelAdd.parentIds = row.parentIds + ',' + res.data.id if(row.parentIds && row.parentIds.substr(-1,1) === ','){
idsName = row.parentIdsName + ',' + res.data.menuName this.productModelAdd.parentIds = row.parentIds + res.data.id+','
idsName = row.parentIdsName + ',' + res.data.menuName
}else {
this.productModelAdd.parentIds = row.parentIds + ',' + res.data.id+','
idsName = row.parentIdsName + ',' + res.data.menuName
}
} }
} else { } else {
this.productModelAdd.parentIds = res.data.id this.productModelAdd.parentIds = ','+res.data.id+','
idsName = res.data.menuName; idsName = res.data.menuName;
} }
this.productModelAdd.parentId = res.data.id this.productModelAdd.parentId = res.data.id
@@ -2945,7 +2964,7 @@ export default {
message: "删除成功" message: "删除成功"
}) })
this.getBussionStandTable() this.getBussionStandTable()
this.selectMenuList() this.selectMenuListNew()
} else { } else {
this.$message({ this.$message({
type: 'warning', type: 'warning',
@@ -2967,9 +2986,14 @@ export default {
}, },
// 树节点鼠标移入移出 // 树节点鼠标移入移出
mouseenter(data) { mouseenter(data) {
this.$set(data, 'show', true) if(data && data.treeType && data.treeType === 'sarMs'){
if (data.parentId !== null) { this.$set(data, 'show', false)
this.$set(data, 'showDel', true) this.$set(data, 'showDel', false)
}else {
this.$set(data, 'show', true)
if (data.parentId !== null) {
this.$set(data, 'showDel', true)
}
} }
}, },
mouseleave(data) { mouseleave(data) {
src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+28 -2
View File
@@ -809,7 +809,7 @@
{required: true, message: '请选择起草人', trigger: 'change'}, {required: true, message: '请选择起草人', trigger: 'change'},
], ],
rqbJson: [ rqbJson: [
{required: true, message: '请选择代替企标编号', trigger: 'change'}, {required: false, message: '请选择代替企标编号', trigger: ['change', 'blur']},
] ]
}, },
form: { form: {
@@ -1038,6 +1038,7 @@
} }
this.addForm.unit = list this.addForm.unit = list
this.addForm.unitName = listName this.addForm.unitName = listName
this.$refs.addForm.validateField('unitName')
this.modalshowflagZRBM = false this.modalshowflagZRBM = false
}, },
choiceZRBM(id) { choiceZRBM(id) {
@@ -1161,7 +1162,32 @@
}, },
addData () { addData () {
this.addDrawerTitle = '新增' this.addDrawerTitle = '新增'
this.addForm = {} this.addForm = {
bussSort:'',
esMatingRelations: '',
technologic: '',
useLevel: '',
isRelate: '',
esStandRelations: '',
area: [],
tsJson: '',
tsJsonName: '',
rqbJson: '',
rqbName: '',
unit: '', // 单位
unitName: '',
esName: '', // 企标名称
planStatus: '', // 计划状态
reviseStatus: '', // 制修订状态
resPerson: '', // 评审责任人
resPersonName: '',
wgLeader: '', // 工作组组长
wgLeaderName: '',
draftTime: '', // 计划标准初稿完成时间
releaseTime: '', // 计划标准发布时间
drafter: '', // 起草人
drafterName: ''
}
this.DrawerType = 'add' this.DrawerType = 'add'
this.addForm.planStatus = '0' this.addForm.planStatus = '0'
this.addDrawer = true this.addDrawer = true
src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
+15 -8
View File
@@ -30,6 +30,7 @@
type="text" type="text"
size="mini" size="mini"
v-show="data.show" v-show="data.show"
v-btn-permission="'a3109949cc30dae1ef523c037b2651b8'"
@click="() => append(data)"> @click="() => append(data)">
新增 新增
</el-button> </el-button>
@@ -37,6 +38,7 @@
type="text" type="text"
size="mini" size="mini"
v-show="data.show" v-show="data.show"
v-btn-permission="'61a33c05ed689934f7d4a0de4220c9ce'"
@click="() => update(data)"> @click="() => update(data)">
编辑 编辑
</el-button> </el-button>
@@ -44,6 +46,7 @@
type="text" type="text"
size="mini" size="mini"
v-show="data.showDel" v-show="data.showDel"
v-btn-permission="'b123231eb8c42b2a61e3dc5f59654f79'"
@click="() => remove(node, data)"> @click="() => remove(node, data)">
删除 删除
</el-button> </el-button>
@@ -1434,7 +1437,6 @@
parentIds : null, parentIds : null,
parentIdsName : "", parentIdsName : "",
displaySeq : "", displaySeq : "",
validFlag : "0",
creationTime : "", creationTime : "",
modifyTime : "", modifyTime : "",
remarks : "", remarks : "",
@@ -2360,15 +2362,20 @@
if (res.ok) { if (res.ok) {
if(this.modalType === 1){ if(this.modalType === 1){
let idsName = "" let idsName = ""
if(row.parentIds !== null){ if (row.parentIds !== null) {
if(row.parentIds.indexOf(res.data.id) != -1){ if (row.parentIds.indexOf(res.data.id) != -1) {
this.productModelAdd.parentIds = row.parentIds this.productModelAdd.parentIds = row.parentIds
}else { } else {
this.productModelAdd.parentIds = row.parentIds + res.data.id+',' if(row.parentIds && row.parentIds.substr(-1,1) === ','){
idsName = row.parentIdsName + ',' + res.data.menuName this.productModelAdd.parentIds = row.parentIds + res.data.id+','
idsName = row.parentIdsName + ',' + res.data.menuName
}else {
this.productModelAdd.parentIds = row.parentIds + ',' + res.data.id+','
idsName = row.parentIdsName + ',' + res.data.menuName
}
} }
}else { } else {
this.productModelAdd.parentIds = +','+res.data.id+',' this.productModelAdd.parentIds = ','+res.data.id+','
idsName = res.data.menuName; idsName = res.data.menuName;
} }
this.productModelAdd.parentId = res.data.id this.productModelAdd.parentId = res.data.id
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+34 -27
View File
@@ -24,29 +24,32 @@
<span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)"> <span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
<span :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span> <span :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span>
<span style="font-size:12px"> {{ node.label }} </span> <span style="font-size:12px"> {{ node.label }} </span>
<!-- <span> <span>
<el-button <el-button
type="text" type="text"
size="mini" size="mini"
v-show="data.show" v-show="data.show"
@click="() => append(data)"> v-btn-permission="'b1c5fe2985a365d90d10607b47885749'"
新增 @click="() => append(data)">
</el-button> 新增
<el-button </el-button>
type="text" <el-button
size="mini" type="text"
v-show="data.show" size="mini"
@click="() => update(data)"> v-show="data.show"
编辑 v-btn-permission="'8d2e05ebce16d742a7f1fb895f0306b7'"
</el-button> @click="() => update(data)">
<el-button 编辑
type="text" </el-button>
size="mini" <el-button
v-show="data.showDel" type="text"
@click="() => remove(node, data)"> size="mini"
删除 v-show="data.showDel"
</el-button> v-btn-permission="'88ee8b7e529353511d47eb1e67fcd6a1'"
</span>--> @click="() => remove(node, data)">
删除
</el-button>
</span>
</span> </span>
</el-tree> </el-tree>
</el-card> </el-card>
@@ -2272,7 +2275,6 @@ export default {
parentIds: null, parentIds: null,
parentIdsName: "", parentIdsName: "",
displaySeq: "", displaySeq: "",
validFlag: "",
creationTime: "", creationTime: "",
modifyTime: "", modifyTime: "",
remarks: "", remarks: "",
@@ -3041,11 +3043,16 @@ export default {
if (row.parentIds.indexOf(res.data.id) != -1) { if (row.parentIds.indexOf(res.data.id) != -1) {
this.productModelAdd.parentIds = row.parentIds this.productModelAdd.parentIds = row.parentIds
} else { } else {
this.productModelAdd.parentIds = row.parentIds + ',' + res.data.id if(row.parentIds && row.parentIds.substr(-1,1) === ','){
idsName = row.parentIdsName + ',' + res.data.menuName this.productModelAdd.parentIds = row.parentIds + res.data.id+','
idsName = row.parentIdsName + ',' + res.data.menuName
}else {
this.productModelAdd.parentIds = row.parentIds + ',' + res.data.id+','
idsName = row.parentIdsName + ',' + res.data.menuName
}
} }
} else { } else {
this.productModelAdd.parentIds = res.data.id this.productModelAdd.parentIds = ','+res.data.id+','
idsName = res.data.menuName; idsName = res.data.menuName;
} }
this.productModelAdd.parentId = res.data.id this.productModelAdd.parentId = res.data.id
src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
+1 -1
View File
@@ -457,7 +457,7 @@ export default {
let routeUrl = this.$router.resolve({ let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails', name: 'OtherStandardDetails',
params: { params: {
id: item.id, id: item.standId,
pageType: 'INLAND_STAND' pageType: 'INLAND_STAND'
// pageType: item.standType + '_STAND' // pageType: item.standType + '_STAND'
} }
src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+1
View File
@@ -896,6 +896,7 @@ export default {
}, },
showStand(){ showStand(){
this.dialogTableVisible = true this.dialogTableVisible = true
this.getStandDataBtn()
}, },
//标准查询按钮 //标准查询按钮
getStandDataBtn(){ getStandDataBtn(){
src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+23 -1
View File
@@ -388,6 +388,7 @@ export default {
console.log(res.data.records); console.log(res.data.records);
this.total = res.data.total this.total = res.data.total
this.spinShow = false this.spinShow = false
localStorage.setItem('refreshFlag', false)
}, e => { }, e => {
}) })
}, },
@@ -557,6 +558,13 @@ export default {
}, },
handleQueryPdf(file){ handleQueryPdf(file){
window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + file.attId)) window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + file.attId))
},
isVisible(e) {
if (e.target.visibilityState === "visible") {
this.getList()
} else if (e.target.visibilityState === "hidden") {
this.getList()
}
} }
}, },
watch: { watch: {
@@ -572,6 +580,17 @@ export default {
...mapGetters(['refreshFlag']) ...mapGetters(['refreshFlag'])
}, },
mounted() { mounted() {
const that = this;
//监听缓存中指定key的值变化
window.addEventListener("setItemEvent",function(e){
//e.key : 是值发生变化的key
//例如 e.key==="token";
//e.newValue : 是可以对应的新值
if(e.key === "refreshFlag" && e.newValue === true){
this.getList()
}
})
document.addEventListener('visibilitychange', that.isVisible)
if (this.lawsStand) { if (this.lawsStand) {
this.form = { this.form = {
ideaId: this.lawsStand.id, ideaId: this.lawsStand.id,
@@ -613,7 +632,10 @@ export default {
this.getList() this.getList()
this.getIdeaKey() this.getIdeaKey()
this.getFileInfo() this.getFileInfo()
} },
destroyed() {
document.removeEventListener('visibilitychange', this.isVisible)
},
} }
</script> </script>
src/utils/tool.js
+13
View File
@@ -0,0 +1,13 @@
function dispatchEventStroage() {
const signSetItem = localStorage.setItem
localStorage.setItem = function(key, val) {
let setEvent = new Event('setItemEvent')
setEvent.key = key
setEvent.newValue = val
window.dispatchEvent(setEvent)
signSetItem.apply(this, arguments)
}
}
export default dispatchEventStroage