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:
yanyizhou
2021-09-16 16:52:52 +08:00
parent 690931315e 1e1c7eee89
commit 58936d6a78
20 changed files with 106 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/process.js
+8
View File
@@ -415,6 +415,14 @@ export function isEnd (data) {
})
}
export function get_verify_by_instance (data) {
return axios({
url: '/api/lawss/activiti/get_verify_by_instance',
method: 'get',
params: data
})
}
// 流程委托接口
export function changeAssigneeNew (data) {
return axios({
src/main.js
+62 -1
View File
@@ -4,7 +4,6 @@ require('es6-promise').polyfill();
require('es6-promise/auto');
import Vue from 'vue'
import App from './App'
import router from './router'
import ElementUI from 'element-ui'
import 'element-ui/lib/theme-chalk/index.css'
// jQuery
@@ -42,6 +41,68 @@ import Contextmenu from 'vue-contextmenujs'
import animate from 'animate.css'
// 引入路由器
import router from './router'
// 路由解析器
import Re from 'path-to-regexp'
import { get_verify_by_instance } from 'api/process'
// 路由拦截
router.beforeEach(function (to, from, next) {
let path = to.path;
console.log("auth : to =>", to);
console.log("auth : path =>" + path);
let taskId = to.query.taskIds;
let prcId = to.query.prcId;
let prcNum = to.query.prcNum;
let prcName = to.query.prcName;
let prcType = to.query.prcType;
if(taskId !== undefined && taskId !== null && prcId !== undefined && prcId !== null){
get_verify_by_instance({
taskId: taskId, // 任务id
pId: prcId // 流程实例
}).then(res => {
if(res && res > 0){
let param = "?taskIds="+taskId+"&prcId="+prcId
+"&prcNum="+prcNum+"&prcName="+prcName+"&prcType="+prcType;
// 根据type判断跳转具体流程页面
if (prcType === '1') {
// 标准入库流程数据
next({path:"bzrkStep5"+param})
}else if(prcType === '4'){
//标准清单发布流程数据
next({path:"bzqdfbStep1-4"+param})
}else if (prcType === '5'){
//标准项目合规评估 标准维度
next({path:"xmpgStep1-2"+param})
}else if(prcType === '6'){
//标准项目合规评估 项目维度
next({path:"xmpg2Step1-2"+param})
} else if (prcType === '8') {
// 未符合项整改
next({path:"wfhxzgStep5-1"+param})
} else if(prcType === '9'){
next({path:"bzjdStep1-6"+param})
//标准调研流程
}else if(prcType === '2'){
next({path:"bzdyStep1-9"+param})
}else if(prcType === '3'){
//标准征求意见
next({path:"bzzqyjStep1-9"+param})
}else if(prcType === '10'){
//项目清单确认
next({path:"xmqdqrStep1-2"+param})
}
}
console.log("res : res =>", res);
})
}
next()
})
Vue.config.productionTip = false
// jquery
Vue.prototype.$ = $
src/pages/home1/components/release/index.vue
+1 -1
View File
@@ -49,7 +49,7 @@ export default {
//获取数据
getAdvice() {
let obj = {}
obj.limit = 8
obj.limit = 10
this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoByList', obj, {
_this: this
}, res => {
src/pages/home1/components/solicitopinions/index.vue
+3 -8
View File
@@ -4,7 +4,7 @@
<ul>
<li v-for="item in domesticDynamics" :key="item.id" class="time-title">
<div style="height: 18px">
<a class="title" :title="item.cname" @click="standForComments(item)">{{ item.cname }}</a>
<a class="title" :title="item.cname" @click="standForComments(item)">{{ item.cid }}</a>
<span class="time">{{ item.endTime }}</span>
</div>
</li>
@@ -40,16 +40,11 @@ export default {
getAdvice() {
this.$http.get("slrs/sar-public-idea/SelectAllPage", {
page: 1,
size: 1000
size: 10
}, {
_this: this
}, res => {
let arr = res.data.records;
arr.forEach(item => {
if (item.cname !== "") {
this.domesticDynamics.push(item);
}
});
this.domesticDynamics = res.data.records
}, e => {
});
src/pages/localTool/standardWarning.vue
+4 -4
View File
@@ -109,7 +109,7 @@
</el-table-column>
<el-table-column label="标准类型" align="center">
<template slot-scope="scope">
<div>{{ scope.row.standCode.slice(0, 3) }}</div>
<div>{{ scope.row.standCode.split(' ')[0] }}</div>
</template>
</el-table-column>
<el-table-column prop="dutyEngineer" label="标准责任工程师" align="center">
@@ -172,7 +172,7 @@
</el-table-column>
<el-table-column label="标准类型" align="center">
<template slot-scope="scope">
<div>{{ scope.row.standCode.slice(0, 3) }}</div>
<div>{{ scope.row.standCode.split(' ')[0] }}</div>
</template>
</el-table-column>
<el-table-column prop="dutyEngineer" label="标准责任工程师" align="center">
@@ -237,7 +237,7 @@
<el-table-column prop="mark" label="标准分类" align="center">
<template slot-scope="scope">
<!-- <a @click="showStandDetails(scope.row)">{{ scope.row.mark }}</a>-->
<div>{{ scope.row.standCode.slice(0, 3) }}</div>
<div>{{ scope.row.standCode.split(' ')[0] }}</div>
</template>
</el-table-column>
<el-table-column prop="dutyEngineer" label="标准责任工程师" align="center">
@@ -301,7 +301,7 @@
</el-table-column>
<el-table-column prop="mark" label="标准分类" align="center">
<template slot-scope="scope">
<div>{{ scope.row.standCode.slice(0, 3) }}</div>
<div>{{ scope.row.standCode.split(' ')[0] }}</div>
<!-- <a @click="showStandDetails(scope.row)">{{ scope.row.mark }}</a>-->
</template>
</el-table-column>
src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
+7
View File
@@ -100,6 +100,12 @@
</div>
</template>
</el-table-column>
<el-table-column
prop="dyhz"
label="回执说明"
align="center">
</el-table-column>
</el-table>
</div>
<el-collapse accordion>
@@ -392,6 +398,7 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
console.log(data);
this.form.title = data.title || data.form.title
this.form.date = data.date || data.form.date
this.json = data || data.form
src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+1
View File
@@ -94,6 +94,7 @@
<el-table-column
prop="chapterNumber"
align="center"
sortable
label="章条编号"
width="170px">
<template slot-scope="scope">
src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+1
View File
@@ -76,6 +76,7 @@
<el-table-column
prop="chapterNumber"
align="center"
sortable
label="章条编号"
width="170px">
</el-table-column>
src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+1
View File
@@ -76,6 +76,7 @@
<el-table-column
prop="chapterNumber"
align="center"
sortable
label="章条编号"
width="170px">
</el-table-column>
src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+1
View File
@@ -88,6 +88,7 @@
<el-table-column
prop="chapterNumber"
align="center"
sortable
label="章条编号"
width="170px">
</el-table-column>
src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+1
View File
@@ -89,6 +89,7 @@
prop="chapterNumber"
align="center"
label="章条编号"
sortable
width="170px">
</el-table-column>
<el-table-column
src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
+1
View File
@@ -87,6 +87,7 @@
</el-table-column>
<el-table-column
prop="chapterNumber"
sortable
align="center"
label="章条编号"
width="170px">
src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
+1
View File
@@ -88,6 +88,7 @@
<el-table-column
prop="chapterNumber"
align="center"
sortable
label="章条编号"
width="170px">
</el-table-column>
src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue
-4
View File
@@ -71,10 +71,6 @@
width="55"
align="center">
</el-table-column>
<el-table-column
prop="productLine"
label="条款号">
</el-table-column>
<el-table-column
prop="productLine"
label="产品线">
src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
-4
View File
@@ -71,10 +71,6 @@
width="55"
align="center">
</el-table-column>
<el-table-column
prop="productLine"
label="条款号">
</el-table-column>
<el-table-column
prop="productLine"
label="产品线">
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+1
View File
@@ -4157,6 +4157,7 @@ export default {
.el-card{
min-width: min-content;
}
height: 95%;
width: 95%;
position: absolute;
left: 0;
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+1 -1
View File
@@ -4747,7 +4747,7 @@ export default {
.el-card {
min-width: min-content;
}
height: 95%;
width: calc(~'100% - 15px');
position: absolute;
left: 0;
src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
+1 -1
View File
@@ -163,7 +163,7 @@
</el-table-column>
<el-table-column
prop="actualCloseTime"
width="150"
width="130"
align="center"
sortable
label="实际关闭时间">
src/pages/regulatoryRepository/standardForComments/index.vue
+2 -2
View File
@@ -74,11 +74,11 @@
</template>
</el-table-column>
<el-table-column
prop="cname"
prop="cid"
label="标准名称/政策名称"
align="center">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.cname }}</a>
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.cid }}</a>
</template>
</el-table-column>
<el-table-column
src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+9 -9
View File
@@ -10,21 +10,21 @@
<transition name="el-zoom-in-top">
<div v-show="heightShow" class="transition-box">
<p class="transition-box-p">
<label class="transition-box-label">标准号：</label>
<label class="transition-box-label">标准名称：</label>
<span class="transition-box-span table-jump"
@click="handlePreview(itemData)"
>
{{ this.$route.query.item.cid }}
</span>
</p>
<p class="transition-box-p">
<label class="transition-box-label">标准名称：</label>
<span class="transition-box-span table-jump"
@click="handlePreview(itemData)"
>
{{ this.$route.query.item.cname || '-' }}
</span>
</p>
<!-- <p class="transition-box-p">-->
<!-- <label class="transition-box-label">标准名称：</label>-->
<!-- <span class="transition-box-span table-jump"-->
<!-- @click="handlePreview(itemData)"-->
<!-- >-->
<!-- {{ this.$route.query.item.cname || '-' }}-->
<!-- </span>-->
<!-- </p>-->
<p class="transition-box-p">
<label class="transition-box-label">附件：</label>
<span class="file-box" v-if="fileInfoList.length > 0">