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:
zhaokaiyao@91isoft.com
2021-09-27 21:40:52 +08:00
parent 6ef0954ab6 f72d1bedb6
commit 23f6532ff8
5 changed files with 105 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.js
+11 -3
View File
@@ -76,10 +76,18 @@ router.beforeEach(function (to, from, next) {
next({path:"bzqdfbStep1-4"+param})
}else if (prcType === '5'){
//标准项目合规评估 标准维度
next({path:"xmpgStep1-2"+param})
if(path === "/xmpgStep2" || path === "/xmpgStep1" || path === "/xmpgStep1-2"){
next({path:"xmpgStep1-2"+param})
}else {
next({path:"xmpgStep1-7"+param})
}
}else if(prcType === '6'){
//标准项目合规评估 项目维度
next({path:"xmpg2Step1-2"+param})
if(path === "/xmpg2Step1" || path === "/xmpg2Step2" || path === "/xmpg2Step1-2"){
next({path:"xmpg2Step1-2"+param})
}else {
next({path:"xmpg2Step1-12"+param})
}
} else if (prcType === '8') {
// 未符合项整改
next({path:"wfhxzgStep5-1"+param})
@@ -93,7 +101,7 @@ router.beforeEach(function (to, from, next) {
next({path:"bzzqyjStep1-9"+param})
}else if(prcType === '10'){
//项目清单确认
next({path:"xmqdqrStep1-2"+param})
next({path:"xmqdqrStep1-3"+param})
}
}
console.log("res : res =>", res);
src/pages/processCenter/pages/newProcess/index.vue
+76 -1
View File
@@ -148,7 +148,7 @@
</div>
</el-card>
</el-col>
<el-col :span="size ? 6 : 8" v-btn-permission="">
<el-col :span="size ? 6 : 8" v-btn-permission="'9d3775db9a76f37402e3e49f3e55e77e'">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('11')">
<div class="card-top">
@@ -166,6 +166,63 @@
</div>
</el-card>
</el-col>
<!--严逸舟写的分割线-->
<el-col :span="size ? 6 : 8" v-btn-permission="">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('12')">
<div class="card-top">
<div class="card-top-left">
<img :src="getImg(Math.floor(Math.random() * 6))">
</div>
<div class="card-top-right">
<div class="card-top-right-text">赵开耀的流程</div>
<div class="card-top-right-line"></div>
</div>
</div>
<!-- <div class="card-bottom">-->
<!-- 流程简介: 容器默认存在两根轴：水平的主轴（main axis）和垂直的交叉轴（cross axis）。主轴的开始位置（与边框的交叉点）叫做main start，结束位置叫做main end；交叉轴的开始位置叫做cross start，结束位置叫做cross end。-->
<!-- </div>-->
</div>
</el-card>
</el-col>
<el-col :span="size ? 6 : 8" v-btn-permission="">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('13')">
<div class="card-top">
<div class="card-top-left">
<img :src="getImg(Math.floor(Math.random() * 6))">
</div>
<div class="card-top-right">
<div class="card-top-right-text">严逸舟的流程</div>
<div class="card-top-right-line"></div>
</div>
</div>
<!-- <div class="card-bottom">-->
<!-- 流程简介: 容器默认存在两根轴：水平的主轴（main axis）和垂直的交叉轴（cross axis）。主轴的开始位置（与边框的交叉点）叫做main start，结束位置叫做main end；交叉轴的开始位置叫做cross start，结束位置叫做cross end。-->
<!-- </div>-->
</div>
</el-card>
</el-col>
<el-col :span="size ? 6 : 8" v-btn-permission="">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('14')">
<div class="card-top">
<div class="card-top-left">
<img :src="getImg(Math.floor(Math.random() * 6))">
</div>
<div class="card-top-right">
<div class="card-top-right-text">张宇欢的流程</div>
<div class="card-top-right-line"></div>
</div>
</div>
<!-- <div class="card-bottom">-->
<!-- 流程简介: 容器默认存在两根轴：水平的主轴（main axis）和垂直的交叉轴（cross axis）。主轴的开始位置（与边框的交叉点）叫做main start，结束位置叫做main end；交叉轴的开始位置叫做cross start，结束位置叫做cross end。-->
<!-- </div>-->
</div>
</el-card>
</el-col>
<!--严逸舟写的分割线-->
</div>
</div>
<div v-if="zcgllc">
@@ -283,6 +340,24 @@ export default {
name:'xmqdqrStep1'
})
break
case '12':
// 赵开耀的流程
this.$router.push({
name: 'zhaokaiyaoStep1'
})
break
case '13':
// 严逸舟的流程
this.$router.push({
name: 'yanyizhouStep1'
})
break
case '14':
// 张宇欢的流程
this.$router.push({
name: 'zhangyuhuanStep1'
})
break
}
},
checkPermission(permissionIdArray) {
src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+1 -4
View File
@@ -374,18 +374,15 @@ export default {
});
}
},
created() {
this.searchSarAccess();
},
mounted() {
// 分页查询数据
this.searchSarAccess();
// 从数据库中查询各下拉框数据
this.$http.get("sys/dictype/getDicTypeListCode", "", {
_this: this
}, res => {
this.countryOptions = res.data.COUNTRY;
this.setMap(this.countryOptions);
this.searchSarAccess();
}, e => {
});
}
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+16 -1
View File
@@ -81,7 +81,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="标准名称" class="search-item">
<el-form-item label="标准号/标准名称" class="search-item">
<el-input
v-model="sarAccessInfoSearch.standName"
placeholder="请输入"
@@ -605,6 +605,7 @@ export default {
},
data() {
return {
// isAdvancedSearch: false,
textStatusMap: {},
countryAreaMap: {},
typeApplicableMap: {},
@@ -951,6 +952,20 @@ export default {
}
this.selectLawsStands()
},
// selectMoreBtn() {
// this.isAdvancedSearch = true
// this.standardFormList.standName = ''
// this.standardFormList.typeApplicable = ''
// this.standardFormList.nylx = ''
// this.standardFormList.zrbm = ''
// this.standardFormList.sycpx = ''
// this.showTableFlag = false
// this.page = 1
// this.standardForm.page = 1
// this.selectInfoMore()
// },
// 法规维护人树
getDept() {
return new Promise((resolve, reject) => {
src/pages/searchCenter/pages/standardSearch.vue
+1 -1
View File
@@ -243,7 +243,7 @@
<div class="AllBoxTitle">
<span v-html="item.indexType === 'stand' ? '国内标准法规' : (item.indexType === 'FOREIGN' ? '海外标准法规' : (item.indexType === 'laws' ? '国内外政策' : (item.indexType === 'bussstand' ? '企业标准' : (item.indexType === 'items' ? '数据化条目' : '动态&资料'))))" class="typetext"></span>
<span style="cursor:pointer;" class="AllBoxText" v-html="item.title" @click="toPage(item)"></span>
<span @click="checkItems(item)" class="more" style="cursor: pointer; position: absolute; right: 5px;">更多</span>
<span @click="checkItems(item)" class="more" style="cursor: pointer; position: absolute; right: 5px;">详情</span>
</div>
<div class="AllBoxContent" v-html="item.textContent"></div>
<div v-if="item.indexType !== 'items' && item.indexType !== 'msgdyinfo'" class="AllTime">