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:
396572590@qq.com
2022-07-13 17:17:59 +08:00
parent f8b9fa1641 b9ca214c0f
commit f75a4d3773
19 changed files with 350 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/static/pdf/web/viewer.css
+1 -1
View File
@@ -462,7 +462,7 @@ html[dir='rtl'] #outerContainer.sidebarOpen > #sidebarContainer {
html[dir='ltr'] #outerContainer.sidebarOpen > #mainContainer { html[dir='ltr'] #outerContainer.sidebarOpen > #mainContainer {
-webkit-transition-property: left; -webkit-transition-property: left;
transition-property: left; transition-property: left;
left: 200px; /*left: 200px;*/
} }
html[dir='rtl'] #outerContainer.sidebarOpen > #mainContainer { html[dir='rtl'] #outerContainer.sidebarOpen > #mainContainer {
-webkit-transition-property: right; -webkit-transition-property: right;
public/static/pdf/web/viewer.html
+1 -1
View File
@@ -232,7 +232,7 @@ See https://github.com/adobe-type-tools/cmap-resources
<!-- </div>--> <!-- </div>-->
<div id="outerContainer"> <div id="outerContainer">
<div id="sidebarContainer"> <div id="sidebarContainer" style="display: none">
<div id="toolbarSidebar"> <div id="toolbarSidebar">
<div class="splitToolbarButton toggled"> <div class="splitToolbarButton toggled">
<button id="viewThumbnail" class="toolbarButton toggled" title="Show Thumbnails" tabindex="2" data-l10n-id="thumbs"> <button id="viewThumbnail" class="toolbarButton toggled" title="Show Thumbnails" tabindex="2" data-l10n-id="thumbs">
src/components/CustomFormComponents/DatePickerGroup.vue
+1
View File
@@ -45,6 +45,7 @@
type="primary" type="primary"
plain plain
size="mini" size="mini"
:disabled="disabled"
@click="handleAddDate">增加日期</el-button> @click="handleAddDate">增加日期</el-button>
</div> </div>
</div> </div>
src/pages/personal/pages/my-questions/components/questionDetail.vue
+76
View File
@@ -0,0 +1,76 @@
<!--回答框-->
<template>
<div>
<div class="contentTitle">
<div class="back" title="返回" @click="back">
<i class="el-icon-back"></i>
</div>
</div>
<div v-if="answerList.length !== 0" style="height: 90%;overflow-y: auto;">
<template v-for="(item, index) in answerList">
<div class="clearfix">
<div class="answer-box" >
<question-item-info :answer="item"></question-item-info>
</div>
</div>
</template>
</div>
<div v-else>
暂无数据
</div>
</div>
</template>
<script>
import questionItemInfo from '../../../../regulatoryRepository/standQA/components/questionItemInfo'
export default {
name: "QuestionDetail",
components: {
questionItemInfo
},
data(){
return{
attId: '',
answerList: []
}
},
mounted() {
this.attId = this.$route.query.id
this.getDetail()
},
methods:{
back() {
this.$router.push({path: "/questions"});
},
getDetail(){
this.$http.get('lawss/AskQuestions/getAskQuestionsByakId',{
id: this.attId
},{
_this: this
}, res => {
this.answerList = res.data
}, e => {
})
}
}
};
</script>
<style lang="less" scoped>
.answer-box{
height: auto;
width: auto;
background: #F5F7FA;
float: right;
margin: 20px 10px 0 80px;
word-break: break-word; /* 文本行的任意字内断开 */
word-wrap: break-word; /* IE */
white-space: -moz-pre-wrap; /* Mozilla */
white-space: -hp-pre-wrap; /* HP printers */
white-space: -o-pre-wrap; /* Opera 7 */
white-space: -pre-wrap; /* Opera 4-6 */
white-space: pre; /* CSS2 */
white-space: pre-wrap; /* CSS 2.1 */
white-space: pre-line; /* CSS 3 (and 2.1 as well, actually) */
}
</style>
src/pages/personal/pages/my-questions/index.vue
+15 -9
View File
@@ -1399,16 +1399,22 @@ export default {
//点击跳转问题详情 //点击跳转问题详情
historyJump(item){ historyJump(item){
this.$router.push({ this.$router.push({
path: '/standQA', path: "/questionDetail",
query:{ query: {
standId: item.standardId, id: item.id
queId: item.id,
standType: item.classification,
sourceType: 'dialog',
standName: item.standardName,
} }
}) });
this.dialogVisible = false // this.$router.push({
// path: '/standQA',
// query:{
// standId: item.standardId,
// queId: item.id,
// standType: item.classification,
// sourceType: 'dialog',
// standName: item.standardName,
// }
// })
// this.dialogVisible = false
}, },
// 点击查看 // 点击查看
handlePreview(item) { handlePreview(item) {
src/pages/phone/domesticStand.vue
+1 -1
View File
@@ -28,7 +28,7 @@
<div v-else class="title">{{item.standSort + '&nbsp&nbsp' + item.standNumber }}</div> <div v-else class="title">{{item.standSort + '&nbsp&nbsp' + item.standNumber }}</div>
</div> </div>
<div class="standContent"> <div class="standContent">
<div class="standState">{{item.standName}}</div> <div class="standState">{{item.standName && item.standName !== '' ? item.standName : item.standEnName}}</div>
<!-- <div class="standSubTime">标准性质:--> <!-- <div class="standSubTime">标准性质:-->
<!-- <span v-if="natureMap[item.standNature] === '强制性' "--> <!-- <span v-if="natureMap[item.standNature] === '强制性' "-->
<!-- style="color: #F56C6C; padding-left: 5px;">--> <!-- style="color: #F56C6C; padding-left: 5px;">-->
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+19 -5
View File
@@ -78,8 +78,8 @@
</el-row> </el-row>
</div> </div>
</el-collapse-transition> </el-collapse-transition>
<el-button :disabled="disabledXX" v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button> <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
<el-button :disabled="disabledXX" v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button> <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
</el-form> </el-form>
</div> </div>
<ProcessTitle> <ProcessTitle>
@@ -127,7 +127,7 @@
show-overflow-tooltip show-overflow-tooltip
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button :disabled="disabledXX" size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary"> <el-button size="mini" type="primary" @click="itermsConditionsOpen(scope.row.itermsConditions)" class="common-button-primary">
查看条款内容 查看条款内容
</el-button> </el-button>
</template> </template>
@@ -513,7 +513,7 @@
import ProcessHeader from '../../components/ProcessHeader' import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter' import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import {saveTaskFirst, taskDel} from 'api/process' import {saveTaskFirst, taskDel,queryTaskFirst} from 'api/process'
export default { export default {
name: "bzjdStep1", name: "bzjdStep1",
@@ -1168,9 +1168,23 @@ export default {
return this.$message.warning('请完善基础信息') return this.$message.warning('请完善基础信息')
} }
}) })
} },
getTaskId() {
queryTaskFirst({
bpnId: this.$route.query.bpnId
}).then(res => {
let mes = JSON.parse(res.mes)
this.form = JSON.parse(JSON.stringify(mes.form))
this.itemList = mes.itemList
this.roleForm = mes.roleForm
this.commentText1 = mes.commentText1
})
},
}, },
mounted() { mounted() {
if(this.$route.query.bpnId){
this.getTaskId()
}
window.addEventListener('resize', this.handleResize); window.addEventListener('resize', this.handleResize);
this.$http.get('sys/dictype/getDicTypeListCode', '', { this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this _this: this
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+22 -7
View File
@@ -25,9 +25,9 @@
<el-col :span="24"> <el-col :span="24">
<el-form-item label="选择清单" prop="orgName" class="add-form-item form-item-disabled"> <el-form-item label="选择清单" prop="orgName" class="add-form-item form-item-disabled">
<el-radio-group v-model="listType" @change="selectionList"> <el-radio-group v-model="listType" @change="selectionList">
<el-radio label="country">国家/地区清单</el-radio> <el-radio :disabled="disabledXX" label="country">国家/地区清单</el-radio>
<el-radio label="project">车型类别清单</el-radio> <el-radio :disabled="disabledXX" label="project">车型类别清单</el-radio>
<el-radio label="other">其他清单</el-radio> <el-radio :disabled="disabledXX" label="other">其他清单</el-radio>
</el-radio-group> </el-radio-group>
<el-button :disabled="disabledXX" size="mini" type="primary" style="margin-left: 40px;" @click="choiceShow"> <el-button :disabled="disabledXX" size="mini" type="primary" style="margin-left: 40px;" @click="choiceShow">
选择清单 选择清单
@@ -78,8 +78,8 @@
</el-form-item> </el-form-item>
<el-form-item label="会签" prop="sign" class="add-form-item form-item-disabled"> <el-form-item label="会签" prop="sign" class="add-form-item form-item-disabled">
<el-radio-group v-model="signFlag" @change="selectSign"> <el-radio-group v-model="signFlag" @change="selectSign">
<el-radio label="1">是</el-radio> <el-radio :disabled="disabledXX" label="1">是</el-radio>
<el-radio label="2">否</el-radio> <el-radio :disabled="disabledXX" label="2">否</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -707,7 +707,7 @@
import ProcessHeader from "../../components/ProcessHeader"; import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter"; import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle"; import ProcessTitle from "../../components/ProcessTitle";
import { saveTaskFirst, taskDel } from "api/process"; import { saveTaskFirst, taskDel,queryTaskFirst } from "api/process";
import seeDatalis from "@/pages/localTool/standContrast/pages/seeDatalis"; import seeDatalis from "@/pages/localTool/standContrast/pages/seeDatalis";
export default { export default {
@@ -1503,10 +1503,25 @@ export default {
this.pageSizeNo = this.$store.getters.userInfo.configContent; this.pageSizeNo = this.$store.getters.userInfo.configContent;
this.getStandData(); this.getStandData();
} },
getTaskId() {
queryTaskFirst({
bpnId: this.$route.query.bpnId
}).then(res => {
let mes = JSON.parse(res.mes)
this.listForm = JSON.parse(JSON.stringify(mes.form))
this.fileInfoList = this.listForm.fileName
this.dataList = this.listForm.dataList
this.roleForm = mes.roleForm
this.commentText = mes.commentText
})
},
}, },
computed: {}, computed: {},
mounted() { mounted() {
if(this.$route.query.bpnId){
this.getTaskId()
}
//从数据库中查询下拉框数据 //从数据库中查询下拉框数据
this.$http.get("sys/dictype/getDicTypeListCode", {}, { this.$http.get("sys/dictype/getDicTypeListCode", {}, {
_this: this _this: this
src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+14 -1
View File
@@ -382,7 +382,7 @@
import ProcessHeader from '../../components/ProcessHeader' import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter' import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import {saveTaskFirst, taskDel} from 'api/process' import {saveTaskFirst, taskDel,queryTaskFirst} from 'api/process'
export default { export default {
name: "bzzqyjStep1", name: "bzzqyjStep1",
@@ -498,6 +498,9 @@ export default {
ProcessTitle ProcessTitle
}, },
mounted() { mounted() {
if(this.$route.query.bpnId){
this.getTaskId()
}
this.$http.get('lawss/sarStandAttrDetails/getListData', '', { this.$http.get('lawss/sarStandAttrDetails/getListData', '', {
_this: this _this: this
}, res => { }, res => {
@@ -516,6 +519,16 @@ export default {
} }
}, },
methods: { methods: {
getTaskId() {
queryTaskFirst({
bpnId: this.$route.query.bpnId
}).then(res => {
let mes = JSON.parse(res.mes)
this.form = JSON.parse(JSON.stringify(mes.form))
this.roleForm = mes.roleForm
this.commentText = mes.commentText
})
},
filesUpload (file) { // 下载 filesUpload (file) { // 下载
const attId = file.attId const attId = file.attId
if (attId) { if (attId) {
src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+5 -1
View File
@@ -337,7 +337,10 @@
<div class="prc-content-border" v-show="verifySarStandard"> <div class="prc-content-border" v-show="verifySarStandard">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="代替企标编号" prop="DTQBBHBUSS" class="add-form-item form-item-disabled"> <el-form-item label="代替企标编号"
prop="DTQBBHBUSS"
:rules="form.reviseStatus === '1' ? rules.DTQBBHBUSSNot : rules.DTQBBHBUSS"
class="add-form-item form-item-disabled">
<el-input :disabled="disabledXX" <el-input :disabled="disabledXX"
v-model="form.DTQBBHBUSS" v-model="form.DTQBBHBUSS"
placeholder="请输入代替标准号" placeholder="请输入代替标准号"
@@ -1543,6 +1546,7 @@
DTQBBHBUSS: [ DTQBBHBUSS: [
{ required: true, message: '请选择代替企标编号', trigger: 'change' } { required: true, message: '请选择代替企标编号', trigger: 'change' }
], ],
DTQBBHBUSSNot: [],
}, },
zrUserIds: [], // 选择多个会签责任人 zrUserIds: [], // 选择多个会签责任人
userType:'', // 选择用户ID判断 userType:'', // 选择用户ID判断
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+2
View File
@@ -115,6 +115,7 @@
:placeholderText="'包括已有、应有的关联标准，如企业标准、行业标准、国家标准'" :placeholderText="'包括已有、应有的关联标准，如企业标准、行业标准、国家标准'"
:config="{attrName: '引用标准'}" :config="{attrName: '引用标准'}"
:labelWidth="'150px'" :labelWidth="'150px'"
:disabled="disabledXX"
v-model="qbfsForm.esMatingRelations" v-model="qbfsForm.esMatingRelations"
></custom-input-for-all-standards2> ></custom-input-for-all-standards2>
</template> </template>
@@ -190,6 +191,7 @@
:config="{attrName: '采用标准'}" :config="{attrName: '采用标准'}"
:labelWidth="'180px'" :labelWidth="'180px'"
v-model="qbfsForm.esStandRelations" v-model="qbfsForm.esStandRelations"
:disabled="disabledXX"
></custom-input-for-all-standards2> ></custom-input-for-all-standards2>
</template> </template>
<el-form-item label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled"> <el-form-item label="合并原因" prop="mergeReason" class="add-form-item form-item-disabled">
src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+17 -3
View File
@@ -24,7 +24,7 @@
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="选择项目" prop="orgName" class="add-form-item form-item-disabled"> <el-form-item label="选择项目" prop="orgName" class="add-form-item form-item-disabled">
<el-button size="mini" type="primary" style="margin-left: 10px;" @click="choiceShow">选择项目</el-button> <el-button :disabled="disabledXX" size="mini" type="primary" style="margin-left: 10px;" @click="choiceShow">选择项目</el-button>
</el-form-item> </el-form-item>
<el-form-item label="项目编号" prop="projectNumber" class="add-form-item form-item-disabled"> <el-form-item label="项目编号" prop="projectNumber" class="add-form-item form-item-disabled">
<el-input <el-input
@@ -346,7 +346,7 @@
import ProcessHeader from "../../components/ProcessHeader"; import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter"; import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle"; import ProcessTitle from "../../components/ProcessTitle";
import { saveTaskFirst, taskDel } from "api/process"; import { saveTaskFirst, taskDel,queryTaskFirst } from "api/process";
import file from "@/pages/knowledgeGraph/components/file"; import file from "@/pages/knowledgeGraph/components/file";
export default { export default {
@@ -706,9 +706,23 @@ export default {
this.roleForm.statuteMinister = data[0].id; this.roleForm.statuteMinister = data[0].id;
this.roleForm.statuteMinisterName = data[0].name; this.roleForm.statuteMinisterName = data[0].name;
} }
} },
getTaskId() {
queryTaskFirst({
bpnId: this.$route.query.bpnId
}).then(res => {
let mes = JSON.parse(res.mes)
this.listForm = JSON.parse(JSON.stringify(mes.form))
this.dataList = this.listForm.dataList ? this.listForm.dataList : []
this.roleForm = mes.roleForm
this.commentText = mes.commentText
})
},
}, },
mounted() { mounted() {
if(this.$route.query.bpnId){
this.getTaskId()
}
this.getProjectData(); this.getProjectData();
// 查询各下拉框数据 // 查询各下拉框数据
this.$http.get("sys/dictype/getDicTypeListCode", "", { this.$http.get("sys/dictype/getDicTypeListCode", "", {
src/pages/processCenter/pages/creatProcess/zcrk/step1.vue
+7 -7
View File
@@ -149,8 +149,8 @@
</el-form-item> </el-form-item>
<el-form-item v-show="verifySarStandard" label="是否纳入认证清单" prop="isRelateAccess" class="add-form-item form-item-disabled"> <el-form-item v-show="verifySarStandard" label="是否纳入认证清单" prop="isRelateAccess" class="add-form-item form-item-disabled">
<el-radio-group v-model="form.isRelateAccess"> <el-radio-group v-model="form.isRelateAccess">
<el-radio label="1">是</el-radio> <el-radio :disabled="disabledXX" label="1">是</el-radio>
<el-radio label="2">否</el-radio> <el-radio :disabled="disabledXX" label="2">否</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item v-show="verifySarStandard" label="年度" prop="lawsYear" class="add-form-item form-item-disabled"> <el-form-item v-show="verifySarStandard" label="年度" prop="lawsYear" class="add-form-item form-item-disabled">
@@ -205,7 +205,7 @@
<cus-tom-data-picker-group <cus-tom-data-picker-group
:config="{attrName:'实施日期(标准文本)',attrField:'SSRQLAWS'}" :config="{attrName:'实施日期(标准文本)',attrField:'SSRQLAWS'}"
v-model="form.SSRQLAWS" v-model="form.SSRQLAWS"
:disabled="false" :disabled="disabledXX"
></cus-tom-data-picker-group> ></cus-tom-data-picker-group>
<!-- <el-form-item label="实施日期(标准文本)" prop="SSRQLAWS" class="add-form-item form-item-disabled">--> <!-- <el-form-item label="实施日期(标准文本)" prop="SSRQLAWS" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker :disabled="disabledXX"--> <!-- <el-date-picker :disabled="disabledXX"-->
@@ -216,9 +216,9 @@
<!-- </el-date-picker>--> <!-- </el-date-picker>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<cus-tom-data-picker-group <cus-tom-data-picker-group
:config="{attrName:'请选择在产车实施日期(标准文本)',attrField:'ZCXSSRQLAWS'}" :config="{attrName:'在产车实施日期(标准文本)',attrField:'ZCXSSRQLAWS'}"
v-model="form.ZCXSSRQLAWS" v-model="form.ZCXSSRQLAWS"
:disabled="false" :disabled="disabledXX"
></cus-tom-data-picker-group> ></cus-tom-data-picker-group>
<!-- <el-form-item label="在产车实施日期(标准文本)" prop="ZCXSSRQLAWS" class="add-form-item form-item-disabled">--> <!-- <el-form-item label="在产车实施日期(标准文本)" prop="ZCXSSRQLAWS" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker :disabled="disabledXX"--> <!-- <el-date-picker :disabled="disabledXX"-->
@@ -231,9 +231,9 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<cus-tom-data-picker-group <cus-tom-data-picker-group
:config="{attrName:'请选择新车型实施日期(标准文本)',attrField:'XCXSSRQLAWS'}" :config="{attrName:'新车型实施日期(标准文本)',attrField:'XCXSSRQLAWS'}"
v-model="form.XCXSSRQLAWS" v-model="form.XCXSSRQLAWS"
:disabled="false" :disabled="disabledXX"
></cus-tom-data-picker-group> ></cus-tom-data-picker-group>
<!-- <el-form-item label="新车型实施日期(标准文本)" prop="XCXSSRQLAWS" class="add-form-item form-item-disabled">--> <!-- <el-form-item label="新车型实施日期(标准文本)" prop="XCXSSRQLAWS" class="add-form-item form-item-disabled">-->
<!-- <el-date-picker :disabled="disabledXX"--> <!-- <el-date-picker :disabled="disabledXX"-->
src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step1.vue
+51 -9
View File
@@ -353,7 +353,7 @@
import ProcessHeader from "../../components/ProcessHeader"; import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter"; import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle"; import ProcessTitle from "../../components/ProcessTitle";
import {saveTaskFirst} from "api/process"; import {saveTaskFirst,taskDel,queryTaskFirst} from "api/process";
export default { export default {
name: "zdrzbzORzchgxxmscStep1", name: "zdrzbzORzchgxxmscStep1",
@@ -475,7 +475,24 @@ export default {
saveLoading: false, saveLoading: false,
} }
}, },
mounted() {
if(this.$route.query.bpnId){
this.getTaskId()
}
},
methods: { methods: {
getTaskId() {
queryTaskFirst({
bpnId: this.$route.query.bpnId
}).then(res => {
let mes = JSON.parse(res.mes)
console.log(mes)
this.form = JSON.parse(JSON.stringify(mes.form))
this.infoTableDatas = mes.infoTableDatas ? JSON.parse(mes.infoTableDatas) : []
this.roleForm = mes.roleForm
this.commentText = mes.commentText
})
},
deleteSelectChange(data) { deleteSelectChange(data) {
console.log('483',data) console.log('483',data)
this.deleteSelectedList = [] this.deleteSelectedList = []
@@ -683,24 +700,26 @@ export default {
}, },
//保存事件 //保存事件
handleSave() { handleSave() {
this.saveLoading = true; this.isSubmit = true
this.saveLoading = true
let _formData = new FormData(); let _formData = new FormData();
_formData.append("id", this.bpnId || ""); _formData.append("id", this.bpnId || "");
_formData.append("createUser", this.$store.getters.userInfo.userId); _formData.append("createUser", this.$store.getters.userInfo.userId);
_formData.append("createUserName", this.$store.getters.userInfo.userName); _formData.append("createUserName", this.$store.getters.userInfo.userName);
_formData.append("prcType", "12"); _formData.append("prcType", "laws3");
_formData.append("json", JSON.stringify({ _formData.append("json", JSON.stringify({
taskInfo: "人确认",
form: this.infoForm, form: this.infoForm,
roleForm: this.roleForm, roleForm: this.roleForm,
commentText: this.commentText commentText: this.commentText
})); }));
saveTaskFirst(_formData).then(res => { saveTaskFirst(_formData).then(res => {
this.saveLoading = false; this.isSubmit = false
this.saveLoading = false
this.$message.success("保存成功"); this.$message.success("保存成功");
this.bpnId = res.result; this.bpnId = res.result;
}).catch(e => { }).catch(e => {
this.saveLoading = false; this.isSubmit = false
this.saveLoading = false
}); });
}, },
//提交事件 //提交事件
@@ -711,12 +730,24 @@ export default {
this.$refs['Form'].validate((valid) => { this.$refs['Form'].validate((valid) => {
if (valid) { if (valid) {
this.isSubmit = true this.isSubmit = true
this.saveLoading = true
let infoTableDatas = [] let infoTableDatas = []
infoTableDatas = JSON.stringify(this.infoTableDatas) infoTableDatas = JSON.stringify(this.infoTableDatas)
localStorage.setItem('infoTableDatas', JSON.stringify(this.infoTableDatas)) localStorage.setItem('infoTableDatas', JSON.stringify(this.infoTableDatas))
this.$http.get('lawss/activiti/startProcess', { this.$http.post('lawss/activiti/startProcessRollBack', {
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
type: 'laws3', type: 'laws3',
}, {_this: this}, res => { json: JSON.stringify({
form: this.form,
roleForm: this.roleForm,
commentText: this.commentText,
infoTableDatas: infoTableDatas,
})
}, {
_this: this
}, res => {
if (res.ok) { if (res.ok) {
var json = Object.assign(this.form, this.roleForm) var json = Object.assign(this.form, this.roleForm)
json.commentText = this.commentText json.commentText = this.commentText
@@ -730,16 +761,27 @@ export default {
}, {_this: this}, res => { }, {_this: this}, res => {
if (res.success) { if (res.success) {
this.$message.success('流程发起成功') this.$message.success('流程发起成功')
if (this.$route.query.bpnId && this.$route.query.bpnId !== '') {
let taskId = {
id: this.$route.query.bpnId
}
taskDel(taskId).then(res=>{
return res
})
}
this.$router.push('/processCenter') this.$router.push('/processCenter')
this.isSubmit = false this.isSubmit = false
this.saveLoading = false
} else { } else {
this.$message.warning('流程启动失败') this.$message.warning('流程启动失败')
this.isSubmit = false this.isSubmit = false
} this.saveLoading = false
}
}) })
} else { } else {
this.$message.warning('流程启动失败') this.$message.warning('流程启动失败')
this.isSubmit = false this.isSubmit = false
this.saveLoading = false
} }
}) })
} else { } else {
src/pages/processCenter/pages/processDetail/index.vue
+45 -117
View File
@@ -209,11 +209,11 @@ export default {
let prcType = this.detailData[index].prcType // 流程类型 let prcType = this.detailData[index].prcType // 流程类型
console.log(prcType); console.log(prcType);
// 判断当前流程是否已全部办理完成 // 判断当前流程是否已全部办理完成
this.detailData.map(item => { // this.detailData.map(item => {
if (!item.endTime) { // if (!item.endTime) {
isEnd = false // isEnd = false
} // }
}) // })
if (isEnd) { if (isEnd) {
if (this.$store.state.detailMap !== '') { if (this.$store.state.detailMap !== '') {
let lastDetailMap = this.$store.getters.getLastDetailMap let lastDetailMap = this.$store.getters.getLastDetailMap
@@ -225,16 +225,18 @@ export default {
this.setHandleInfo((JSON.stringify(row))) this.setHandleInfo((JSON.stringify(row)))
this.setPrcLastDetail((JSON.stringify(row))) this.setPrcLastDetail((JSON.stringify(row)))
// 根据type判断跳转具体流程页面 // 根据type判断跳转具体流程页面
// 根据type判断跳转具体流程页面
if (prcType === '1') { if (prcType === '1') {
// 标准入库流程数据 // 标准入库流程数据
this.toProcessDetail('bzrkStep5',row) this.toProcessDetail('bzrkStep1',row)
}else if(prcType === 'laws1'){ }else if(prcType === 'laws1'){
//政策入库 //政策入库
this.toProcessDetail('zcrkStep5',row) this.toProcessDetail('zcrkStep1',row)
}else if(prcType === 'laws2'){ }else if(prcType === 'laws2'){
//政策入库 //政策征求意见流程
this.toProcessDetail('zczqyjStep9Detil',row) this.toProcessDetail('zczqyjStep1',row)
}else if(prcType === 'laws3'){
//重点认证标准/政策合规性项目审查流程
this.toProcessDetail('zdrzbzORzchgxxmscStep1',row)
}else if(prcType === 'buss1'){ }else if(prcType === 'buss1'){
//企标入库 //企标入库
this.toProcessDetail('bussLibrary1',row) this.toProcessDetail('bussLibrary1',row)
@@ -242,144 +244,70 @@ export default {
//企标入库 //企标入库
this.toProcessDetail('bussLibraryProduct1',row) this.toProcessDetail('bussLibraryProduct1',row)
}else if(prcType === 'buss3'){ }else if(prcType === 'buss3'){
//企标复审 //企标复审
this.toProcessDetail('qbfsStep1',row) this.toProcessDetail('qbfsStep1',row)
}else if(prcType === '4'){ }else if(prcType === '4'){
//标准清单发布流程数据 //标准清单发布流程数据
this.toProcessDetail('bzqdfbStep1-4',row) this.toProcessDetail('bzqdfbStep1',row)
}else if (prcType === '5'){ }else if (prcType === '5'){
//标准项目合规评估 //标准项目合规评估
this.toProcessDetail('bzpgStep8-1',row) this.toProcessDetail('bzpgStep1',row)
}else if(prcType === '6'){ }else if(prcType === '6'){
//标准项目合规评估 项目维度 //标准项目合规评估 项目维度
this.toProcessDetail('xmpgStep1-5',row) this.toProcessDetail('xmpg2Step1',row)
} else if (prcType === '8') { } else if (prcType === '8') {
// 未符合项整改 // 未符合项整改
this.toProcessDetail('wfhxzgStep5-1',row) this.toProcessDetail('wfhxzgStep1',row)
} else if(prcType === '9'){ } else if(prcType === '9'){
this.toProcessDetail('bzjdStep1-6',row) this.toProcessDetail('bzjdStep1',row)
//标准调研流程 //标准调研流程
}else if(prcType === '2'){ }else if(prcType === '2'){
this.toProcessDetail('bzdyStep1-9',row) this.toProcessDetail('bzdyStep1',row)
}else if(prcType === '3'){ }else if(prcType === '3'){
//标准征求意见 //标准征求意见
this.toProcessDetail('bzzqyjStep1-9',row) this.toProcessDetail('bzzqyjStep1',row)
}else if(prcType === '10'){ }else if(prcType === '10'){
//项目清单确认 //项目清单确认
this.toProcessDetail('xmqdqrStep1-4',row, 'unShowReceipt') this.toProcessDetail('xmqdqrStep1',row, 'unShowReceipt')
}else if(prcType === '14'){
//加入标准化协会信息备案流程
this.toProcessDetail('cywbbzzxdStep1',row,)
}else if(prcType === '15'){
//加入标准化协会信息备案流程
this.toProcessDetail('jrbzhxhStep1',row,)
} else if(prcType === '16'){ } else if(prcType === '16'){
//外部署名 //外部署名
this.toProcessDetail('wbsmStep1-5',row) this.toProcessDetail('wbsmStep1',row)
}else if(prcType === '20') { }else if(prcType === '20') {
// 入会流程 // 入会流程
this.toProcessDetail('bzrhStep6-1',row) this.toProcessDetail('bzrhStep1',row)
} else if(prcType === '21') { } else if(prcType === '21') {
// 参会流程 // 参会流程
this.toProcessDetail('bzchStep6-1',row) this.toProcessDetail('bzchStep1',row)
} else if(prcType === '23'){ } else if(prcType === '23'){
//企标复审 //企标复审
this.toProcessDetail('qbfsStep1-4',row) this.toProcessDetail('qbfsStep1',row)
}else if(prcType === '24'){ }else if(prcType === '24'){
//企标废止 //企标废止
this.toProcessDetail('qbfzStep1-7',row) this.toProcessDetail('qbfzStep1',row)
}else if(prcType === '25'){ }else if(prcType === '25'){
//企标制修订计划管控 //企标制修订计划管控
this.toProcessDetail('qbzxdjhgkStep1-5',row) this.toProcessDetail('qbzxdjhgkStep1',row)
}else if(prcType === '26'){ }else if(prcType === '26'){
//企标制修订计划立项 //企标制修订计划立项
this.toProcessDetail('qbzxdlxStep1-2',row) this.toProcessDetail('qbzxdlxStep1',row)
}else if(prcType === '17'){
//政策课题入会发起流程
this.toProcessDetail('zcrhStep1',row)
}else if(prcType === '18'){
//政策课题参会发起流程
this.toProcessDetail('zcchStep1',row)
}else if(prcType === '12'){
//政策课题参会发起流程
this.toProcessDetail('zdrzbzORzchgxxmscStep1',row)
} }
// if (prcType === '1') {
// // 标准入库流程数据
// this.toProcessDetail('bzrkStep1',row)
// }else if(prcType === 'laws1'){
// //政策入库
// this.toProcessDetail('zcrkStep1',row)
// }else if(prcType === 'laws2'){
// //政策征求意见流程
// this.toProcessDetail('zczqyjStep1',row)
// }else if(prcType === 'buss1'){
// //企标入库
// this.toProcessDetail('bussLibraryDetail',row)
// }else if(prcType === 'buss2'){
// //企标入库
// this.toProcessDetail('bussLibraryProductDetail',row)
// }else if(prcType === 'buss3'){
// //企标复审
// this.toProcessDetail('qbfsStep1',row)
// }else if(prcType === '4'){
// //标准清单发布流程数据
// this.toProcessDetail('bzqdfbStep1',row)
// }else if (prcType === '5'){
// //标准项目合规评估
// this.toProcessDetail('bzpgStep1',row)
// }else if(prcType === '6'){
// //标准项目合规评估 项目维度
// this.toProcessDetail('xmpg2Step1',row)
// } else if (prcType === '8') {
// // 未符合项整改
// this.toProcessDetail('wfhxzgStep1',row)
// } else if(prcType === '9'){
// this.toProcessDetail('bzjdStep1',row)
// //标准调研流程
// }else if(prcType === '2'){
// this.toProcessDetail('bzdyStep1',row)
// }else if(prcType === '3'){
// //标准征求意见
// this.toProcessDetail('bzzqyjStep1',row)
// }else if(prcType === '10'){
// //项目清单确认
// this.toProcessDetail('xmqdqrStep1',row, 'unShowReceipt')
// }else if(prcType === '14'){
// //加入标准化协会信息备案流程
// this.toProcessDetail('cywbbzzxdStep1',row,)
// }else if(prcType === '15'){
// //加入标准化协会信息备案流程
// this.toProcessDetail('jrbzhxhStep1',row,)
// } else if(prcType === '16'){
// //外部署名
// this.toProcessDetail('wbsmStep1',row)
// }else if(prcType === '20') {
// // 入会流程
// this.toProcessDetail('bzrhStep1',row)
// } else if(prcType === '21') {
// // 参会流程
// this.toProcessDetail('bzchStep1',row)
// } else if(prcType === '23'){
// //企标复审
// this.toProcessDetail('qbfsStep1',row)
// }else if(prcType === '24'){
// //企标废止
// this.toProcessDetail('qbfzStep1',row)
// }else if(prcType === '25'){
// //企标制修订计划管控
// this.toProcessDetail('qbzxdjhgkStep1',row)
// }else if(prcType === '26'){
// //企标制修订计划立项
// this.toProcessDetail('qbzxdlxStep1',row)
// }else if(prcType === '17'){
// //政策课题入会发起流程
// this.toProcessDetail('zcrhStep1',row)
// }else if(prcType === '18'){
// //政策课题参会发起流程
// this.toProcessDetail('zcchStep1',row)
// }else if(prcType === '12'){
// //政策课题参会发起流程
// this.toProcessDetail('zdrzbzORzchgxxmscStep1',row)
// }
} else { } else {
if(prcType === 'buss1'){ this.$message.warning('当前流程未全部办理完成，无法查看')
//企标入库
this.toProcessDetail('bussLibrary1',row)
}else if(prcType === 'buss2'){
//企标入库
this.toProcessDetail('bussLibraryProduct1',row)
}else if(prcType === 'buss3'){
//企标复审
this.toProcessDetail('qbfsStep1',row)
}else {
this.$message.warning('当前流程未全部办理完成，无法查看')
}
} }
}, },
toProcessDetail(componentName,row,unShowReceipt) { toProcessDetail(componentName,row,unShowReceipt) {
src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue
+29 -12
View File
@@ -4,17 +4,18 @@
<div class="back" title="返回" @click="back"> <div class="back" title="返回" @click="back">
<i class="el-icon-back"></i> <i class="el-icon-back"></i>
</div> </div>
<div class="title"> </div>
{{ detailInfoForm.dataTitle + '-详情' }} <!--title 标题-->
</div> <div class="details-header">
<span>
{{detailInfoForm.dataTitle}}
</span>
</div> </div>
<transition name="el-zoom-in-top"> <transition name="el-zoom-in-top">
<div class="transition-box"> <div class="transition-box">
<p class="transition-box-p"> <p class="transition-box-p">
<label class="transition-box-label">类型：</label> <label class="transition-box-label">类型：</label>
<span class="transition-box-span"> <span class="transition-box-span">{{ detailInfoForm.dataType }}</span>
{{ detailInfoForm.dataType }}
</span>
</p> </p>
<p class="transition-box-p"> <p class="transition-box-p">
<label class="transition-box-label">资料标题：</label> <label class="transition-box-label">资料标题：</label>
@@ -204,8 +205,8 @@ export default {
}, },
created() { created() {
this.detailInfoId = this.$route.params.id this.detailInfoId = this.$route.query.id
console.log('13', this.$route.params.id) console.log('13', this.$route.query.id)
}, },
mounted() { mounted() {
let fileId let fileId
@@ -250,15 +251,14 @@ export default {
.transition-box { .transition-box {
padding: 0 10% 0 10%; padding: 0 10% 0 10%;
background: #ffffff; background: #ffffff;
font-size: 28px; font-size: 16px;
.transition-box-p { .transition-box-p {
line-height: 50px; line-height: 50px;
border-bottom: 1px solid #E5E5E5;
.transition-box-label { .transition-box-label {
display: inline-block; display: inline-block;
font-weight: bolder; width: 100px;
width: 200px;
vertical-align: top; vertical-align: top;
} }
@@ -266,6 +266,8 @@ export default {
display: inline-block; display: inline-block;
color: #7e8083; color: #7e8083;
width: calc(~'100% - 100px'); width: calc(~'100% - 100px');
word-break: break-all;
white-space: pre-wrap;
} }
.file-box { .file-box {
@@ -277,6 +279,7 @@ export default {
width: 100%; width: 100%;
cursor: pointer; cursor: pointer;
color: #4498f0; color: #4498f0;
word-break: break-all;
} }
p { p {
@@ -309,4 +312,18 @@ export default {
} }
} }
} }
.details-header {
padding: 34px 20%;
font-size: 20px;
font-weight: bold;
color: #555555;
text-align: center;
word-break: break-all;
white-space: pre-wrap;
& > span {
width: 100%;
}
}
</style> </style>
src/pages/regulatoryRepository/dataCenter/index.vue
+21 -11
View File
@@ -81,9 +81,9 @@
<el-date-picker <el-date-picker
v-model="dataCenterSearch.dataUploadTime" v-model="dataCenterSearch.dataUploadTime"
clearable clearable
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd"
size="small" size="small"
type="datetimerange" type="daterange"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期"> end-placeholder="结束日期">
@@ -120,7 +120,7 @@
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%" style="width: 100%"
border border
height="475px" height="100%"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}" fontWeight: 'bold', height: '48px'}"
> >
@@ -134,12 +134,14 @@
prop="dataType" prop="dataType"
width="250" width="250"
label="类型" label="类型"
:show-overflow-tooltip="true"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="dataTitle" prop="dataTitle"
min-width="250" min-width="250"
label="资料标题" label="资料标题"
:show-overflow-tooltip="true"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span @click.stop="toDetail(scope.row)" style="cursor:pointer;color: #409eff">{{ scope.row.dataTitle }}</span> <span @click.stop="toDetail(scope.row)" style="cursor:pointer;color: #409eff">{{ scope.row.dataTitle }}</span>
@@ -274,9 +276,9 @@
> >
<el-input <el-input
type="textarea" type="textarea"
autosize :autosize="{ minRows: 1, maxRows: 15}"
style="width: 95%" style="width: 95%"
maxlength="200" maxlength="4000"
show-word-limit show-word-limit
v-model="attributeEO.dataExplain" v-model="attributeEO.dataExplain"
placeholder="请输入资料说明" placeholder="请输入资料说明"
@@ -296,7 +298,7 @@
:on-remove="handleRemove" :on-remove="handleRemove"
:before-remove="beforeRemove" :before-remove="beforeRemove"
multiple multiple
:limit="3" :limit="50"
:on-exceed="handleExceed" :on-exceed="handleExceed"
:on-success="uploadSuccess" :on-success="uploadSuccess"
:file-list="fileList"> :file-list="fileList">
@@ -368,6 +370,9 @@ export default {
], ],
dataTitle: [ dataTitle: [
{required: true, message: '资料标题不能为空', trigger: 'change'}, {required: true, message: '资料标题不能为空', trigger: 'change'},
],
attachFileId: [
{required: true, message: '附件不能为空', trigger: 'change'},
] ]
}, },
dataCenterSearch: { dataCenterSearch: {
@@ -602,7 +607,7 @@ export default {
toDetail(row){ toDetail(row){
this.$router.push({ this.$router.push({
name: "dataCenterDetail", name: "dataCenterDetail",
params: { query: {
id: row.id id: row.id
} }
}); });
@@ -630,7 +635,7 @@ export default {
handlePreview(file) { handlePreview(file) {
}, },
handleExceed(files, fileList) { handleExceed(files, fileList) {
this.$message.warning(`当前限制选择 3 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`); this.$message.warning(`当前限制选择 50 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
}, },
beforeRemove(file, fileList) { beforeRemove(file, fileList) {
return this.$confirm(`确定移除 ${file.name}？`); return this.$confirm(`确定移除 ${file.name}？`);
@@ -666,8 +671,13 @@ export default {
}, },
searchInfo() { searchInfo() {
this.loading = true this.loading = true
this.dataCenterSearch.startDataUploadTime = this.dataCenterSearch.dataUploadTime[0] if(this.dataCenterSearch.dataUploadTime && this.dataCenterSearch.dataUploadTime.length !== 0){
this.dataCenterSearch.endDataUploadTime = this.dataCenterSearch.dataUploadTime[1] this.dataCenterSearch.startDataUploadTime = this.dataCenterSearch.dataUploadTime[0]
this.dataCenterSearch.endDataUploadTime = this.dataCenterSearch.dataUploadTime[1]
}else{
this.dataCenterSearch.startDataUploadTime =''
this.dataCenterSearch.endDataUploadTime = ''
}
this.$http.get('fileMaterialCenter/file-material', this.dataCenterSearch, { this.$http.get('fileMaterialCenter/file-material', this.dataCenterSearch, {
_this: this _this: this
}, res => { }, res => {
@@ -805,7 +815,6 @@ export default {
display: flex; display: flex;
} }
#left { #left {
width: calc(30% - 5px);
height: 100%; height: 100%;
float: left; float: left;
} }
@@ -899,6 +908,7 @@ export default {
} }
} }
.table-area{ .table-area{
height: calc(100% - 180px);
padding: 0 10px 10px 10px; padding: 0 10px 10px 10px;
} }
src/pages/regulatoryRepository/standQA/index.vue
+13 -1
View File
@@ -671,6 +671,9 @@ export default {
case '查看': case '查看':
this.handleDetail(command[0]) this.handleDetail(command[0])
break break
case '订阅':
this.subscribe(command[0])
break
} }
}, },
handleDetail(row){ handleDetail(row){
@@ -686,6 +689,16 @@ export default {
}, e => { }, e => {
}) })
}, },
subscribe(row){
this.$http.postData('lawss/Subscription/insertSubscription',{
askId: row.id,
usId: this.$store.getters.userInfo.userId,
},{
_this: this
}, res => {
console.log(res);
})
},
refreshStandMap(){ refreshStandMap(){
this.standMap = new Map() this.standMap = new Map()
this.standList.forEach(item=>{ this.standList.forEach(item=>{
@@ -944,7 +957,6 @@ export default {
//清空 //清空
delSearch(){ delSearch(){
this.questionSerach = { this.questionSerach = {
classification: 'INLAND',
standardName: '', //标准名称 standardName: '', //标准名称
standardEncdoing: '', //标准编号 standardEncdoing: '', //标准编号
questioner: this.$store.getters.userInfo.userId, //提问人 questioner: this.$store.getters.userInfo.userId, //提问人
src/router/index.js
+10
View File
@@ -323,6 +323,16 @@ const routes = [
menuId: '' menuId: ''
} }
}, },
{
path: '/questionDetail',
name: 'QuestionDetail',
component: resolve => require(['@/pages/personal/pages/my-questions/components/questionDetail.vue'], resolve),
meta: {
requireAuth: true,
title: '问题详情',
menuId: ''
}
}
// { // {
// path: '/questionsAndAnswers', // path: '/questionsAndAnswers',
// name: 'QuestionsAndAnswers', // name: 'QuestionsAndAnswers',