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-06-27 17:20:14 +08:00
parent dabe729f8f 989df9d527
commit 7ff51f5cde
34 changed files with 385 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/index.html
+53 -3
View File
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html>
<html class="cloud-login">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -9,15 +9,65 @@
<meta http-equiv="Cache-Control" content="no-cache, must-revalidate">
<meta http-equiv="expires" content="0">
<title>标准法规管理系统</title>
<script src = "https://cdn.jsdelivr.net/npm/proxy-polyfill@0.3.0/proxy.min.js"></script>
<!-- vconsole调试工具-->
<script src="static/polyfill/proxy.min.js"></script>
<style>
.logo {
position: absolute;
top: 5.8vh;
left: 9vw;
width: 160px;
height: 61px;background: url("static/images/logo2.png") no-repeat center;
background-position: center left;
background-size: 100% 100%;
}
.cloud-login{
position: relative;
width: 100%;
height: 100%;
background: url("static/images/BG.png");
background-size: 100% 100%;
background-repeat: no-repeat;
background-attachment: fixed;
}
#headerId {margin:0;}
.p1Class {color: #fff;font-size: 25px;}
.inner-header {height:65vh;width:100%;margin:0;padding:0;}
.flex {display:flex;flex-direction:column;justify-content:center;align-items:center;text-align:center;}
</style>
<!-- vconsole调试工具-->
<!-- <script src="https://cdn.bootcss.com/vConsole/3.3.4/vconsole.min.js"></script>-->
<!-- <script type="text/javascript">-->
<!-- var vConsole = new VConsole();-->
<!-- </script>-->
<script type="text/javascript">
(function(window) {
var theUA = window.navigator.userAgent.toLowerCase();
if (
// theUA.indexOf('trident') > -1 && theUA.indexOf('rv:11.0') > -1
(theUA.indexOf("compatible") > -1 && theUA.indexOf("msie") > -1) || (theUA.indexOf('trident') > -1 && theUA.indexOf('rv:11.0') > -1)
) {
var str2 = "<div id=\"headerId\" class=\"header\">\n" +
" <div class=\"logo\"></div>\n" +
"\n" +
" <div class=\"inner-header flex\">\n" +
" <p class=\"p1Class\">检测到您使用的是IE浏览器,建议您更换为谷歌浏览器或火狐浏览器</p>\n" +
"<!-- <a id=\"UrlId\" href=\"\">无需等待，点击进入</a>-->\n" +
" </div>\n" +
" </div>";
document.writeln(str2);
console.log("浏览器不合格")
document.execCommand("Stop");
}
else{
console.log("浏览器合格")
}
})(window);
</script>
</head>
<body class="el-drawer-body">
<div id="app"></div>
<!-- built files will be auto injected -->
</body>
</html>
public/static/images/BG.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 510 KiB

public/static/images/logo2.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.1 KiB

public/static/polyfill/proxy.min.js
Vendored
+4
View File
@@ -0,0 +1,4 @@
(function(){function l(){function n(a){return a?"object"===typeof a||"function"===typeof a:!1}var p=null;var g=function(a,b){function f(){}if(!n(a)||!n(b))throw new TypeError("Cannot create proxy with a non-object as target or handler");p=function(){f=function(a){throw new TypeError("Cannot perform '"+a+"' on a proxy that has been revoked");}};var e=b;b={get:null,set:null,apply:null,construct:null};for(var k in e){if(!(k in b))throw new TypeError("Proxy polyfill does not support trap '"+k+"'");b[k]=e[k]}"function"===
typeof e&&(b.apply=e.apply.bind(e));var c=this,g=!1,q=!1;"function"===typeof a?(c=function(){var h=this&&this.constructor===c,d=Array.prototype.slice.call(arguments);f(h?"construct":"apply");return h&&b.construct?b.construct.call(this,a,d):!h&&b.apply?b.apply(a,this,d):h?(d.unshift(a),new (a.bind.apply(a,d))):a.apply(this,d)},g=!0):a instanceof Array&&(c=[],q=!0);var r=b.get?function(a){f("get");return b.get(this,a,c)}:function(a){f("get");return this[a]},v=b.set?function(a,d){f("set");b.set(this,
a,d,c)}:function(a,b){f("set");this[a]=b},t={};Object.getOwnPropertyNames(a).forEach(function(b){if(!((g||q)&&b in c)){var d={enumerable:!!Object.getOwnPropertyDescriptor(a,b).enumerable,get:r.bind(a,b),set:v.bind(a,b)};Object.defineProperty(c,b,d);t[b]=!0}});e=!0;Object.setPrototypeOf?Object.setPrototypeOf(c,Object.getPrototypeOf(a)):c.__proto__?c.__proto__=a.__proto__:e=!1;if(b.get||!e)for(var m in a)t[m]||Object.defineProperty(c,m,{get:r.bind(a,m)});Object.seal(a);Object.seal(c);return c};g.revocable=
function(a,b){return{proxy:new g(a,b),revoke:p}};return g};var u="undefined"!==typeof process&&"[object process]"==={}.toString.call(process)||"undefined"!==typeof navigator&&"ReactNative"===navigator.product?global:self;u.Proxy||(u.Proxy=l(),u.Proxy.revocable=u.Proxy.revocable);})()
src/assets/styles/newStyle.less
+2
View File
@@ -315,6 +315,8 @@ tr.el-table__row{
padding: 13px 10px;
height: 49px;
border: none;
font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important;
font-weight: lighter;
}
}
.el-input-number{
src/pages/details/otherBussStandardDetails/index.vue
+1 -1
View File
@@ -3,7 +3,7 @@
<div class="other-standard-details v-class" :class="{'hidden': !isMoreAwayBtn}">
<!--title 标题-->
<div class="details-header">
<span>{{sarStandardsInfoEO.standCode}} 《{{sarStandardsInfoEO.standName}}》 企标详情</span>
<span>{{sarStandardsInfoEO.standCode}} 《{{sarStandardsInfoEO.standName ? sarStandardsInfoEO.standName : sarStandardsInfoEO.standEnName}}》 企标详情</span>
<b style="float:right;font-size: 25px;color: #ff9900">{{ ((qualityCommentScore*2*0.9)+(dynamicCommentScore*2*0.1)).toFixed(1) }}</b>
<!-- 之前的，先注掉-->
<!-- <span>{{sarStandardsInfoEO.standCode}}-{{sarStandardsInfoEO.standYear}} 《{{sarStandardsInfoEO.standName}}》 企标详情</span>-->
src/pages/details/otherStandardDetails/index.vue
+1 -1
View File
@@ -5,7 +5,7 @@
<div class="details-header">
<span v-if="sarStandardsInfoEO.standYear === null">{{ sarStandardsInfoEO.standSortShow || '' }} {{
sarStandardsInfoEO.standNumber
}} 《{{ sarStandardsInfoEO.standName }}》</span>
}} 《{{ sarStandardsInfoEO.standName ? sarStandardsInfoEO.standName : sarStandardsInfoEO.standEnName }}》</span>
<span v-else>{{ sarStandardsInfoEO.standSortShow || '' }} {{
sarStandardsInfoEO.standNumber
}}-{{ sarStandardsInfoEO.standYear }} 《{{ sarStandardsInfoEO.standName }}》</span>
src/pages/personal/pages/my-questions/index.vue
+19 -7
View File
@@ -19,7 +19,7 @@
<el-button size="mini" @click="delSearch">清空</el-button>
</el-form-item>
<el-form-item>
<el-button size="mini" type="primary" @click="queBtn">提问</el-button>
<el-button v-if="activeName === 'myQue'" size="mini" type="primary" @click="queBtn">提问</el-button>
</el-form-item>
</el-form>
</div>
@@ -1321,6 +1321,7 @@ export default {
answerList: [],
standList: [],
questionsList: [],
standMap: new Map()
}
},
mounted(){
@@ -1352,6 +1353,12 @@ export default {
}
},
methods:{
refreshStandMap(){
this.standMap = new Map()
this.standList.forEach(item=>{
this.standMap.set(item.standardId,item)
})
},
checkedRole(data){
if(data[0].id){
let asdId = sessionStorage.getItem('queId')
@@ -1666,15 +1673,16 @@ export default {
queBtn(){
this.fileList = []
// 清空提问
this.standType = "INLAND"
const selectedStand = this.activestand == '0' ? this.standList[0] : this.standMap.get(this.activestand)
this.standType = selectedStand.classification
this.questionForm = {
pubQue : '',//公共问题
classification: 'INLAND', //标准类型
pubQue : selectedStand.classification === "OTHER" ? selectedStand.standardId : '',//公共问题
classification: selectedStand.classification, //标准类型
problemDescription: '', //问题
questioner: this.$store.getters.userInfo.userId, //提问人
standardEncdoing: '', //标准编号
standardName: '', //标准名称
standardId:'', //标准id
standardEncdoing: selectedStand.standardEncdoing, //标准编号
standardName: selectedStand.standardName, //标准名称
standardId: selectedStand.standardId, //标准id
fileList: '',
}
this.dialogVisible = true
@@ -1720,6 +1728,7 @@ export default {
_this: this
}, res => {
this.standList = res.data
this.refreshStandMap()
})
},
//问题查询
@@ -1742,6 +1751,7 @@ export default {
_this: this,
}, res => {
this.standList = res.data
this.refreshStandMap()
this.questionClick()
})
},
@@ -1754,6 +1764,7 @@ export default {
_this: this
}, res => {
this.standList = res.data
this.refreshStandMap()
this.questionClick()
}, e =>{
@@ -1765,6 +1776,7 @@ export default {
_this: this
}, res =>{
this.standList = res.data
this.refreshStandMap()
this.questionClick()
}, e => {
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+3 -3
View File
@@ -22,7 +22,7 @@
<template slot="title">基础信息</template>
</ProcessTitle>
<el-collapse-transition>
<div class="prc-content-border" v-if="foldFormFlag === false">
<div class="prc-content-border" v-show="foldFormFlag === false">
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准拆分数据" class="add-form-item form-item-disabled">
@@ -413,7 +413,7 @@
<div style="display: flex; height: 100%;">
<div style="width: 50%; overflow: auto; border-right: 1px solid #ccc;" v-if="form.itemsNum1 && PLmodalType === 1 ">
<div v-if="BDtext" style="width: 100%; height: 100%;display: flex;">
<div v-if="itermsConditions" v-html="itermsConditions" class="itemsTextBox" style="margin: 5px; padding: 5px; width: 100%; overflow: auto;"></div>
<div v-if="itermsConditions" v-html="itermsConditions" class="itemsTextBox" style="margin: 5px; padding: 5px; height:auto;max-height:none"></div>
<div v-else style="margin: 5px; padding: 5px; width: 100%; overflow: auto;">无内容</div>
</div>
<div v-else style="height: 100%;">
@@ -426,7 +426,7 @@
</div>
</div>
<div style="width: 50%; overflow: auto; border-right: 1px solid #ccc;" v-if="!form.itemsNum1 && PLmodalType === 1 ">
<div v-if="itermsConditions" v-html="itermsConditions" class="itemsTextBox" style="margin: 5px; padding: 5px; width: 100%; overflow: auto;"></div>
<div v-if="itermsConditions" v-html="itermsConditions" class="itemsTextBox" style="margin: 5px; padding: 5px; height:auto;max-height:none"></div>
<div v-else style="margin: 5px; padding: 5px; width: 100%; overflow: auto;">无内容</div>
</div>
<div style="width: 80%">
src/pages/processCenter/pages/creatProcess/bzpg/step3.vue
+68
View File
@@ -231,6 +231,41 @@
<div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
<div class="left">
<el-form :modal="projectSearch" :inline="true" class="label-input-form" style="margin-left:10px">
<el-form-item label="管理主体" class="search-item search-item-last">
<el-select v-model="projectSearch.managementHostName"
@change="optionsChange(projectSearch)"
placeholder="请选择管理主体" filterable clearable>
<el-option
v-for="(item, index) in managementHostName"
:key="index"
:value="item"
:label="item"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="开发主体" class="search-item search-item-last">
<el-select v-model="projectSearch.developmentHostName" @change="optionsChange(projectSearch)" placeholder="请选择开发主体" filterable clearable>
<el-option
v-for="(item, index) in developmentHostName"
:key="index"
:value="item"
:label="item"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="项目细分类" class="search-item search-item-last">
<el-select v-model="projectSearch.categoryName" @change="optionsChange(projectSearch)" placeholder="请选择项目细分类" filterable clearable>
<el-option
v-for="(item, index) in categoryName"
:key="index"
:value="item"
:label="item"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="项目状态" class="search-item search-item-last">
<el-select v-model="projectSearch.projectStatus" placeholder="请选择项目状态" filterable clearable>
<el-option
@@ -403,12 +438,16 @@ export default {
selectProjectGroupList: [],
productData: [], //项目群下的项目
projectStatus: [], //项目状态下拉框
managementHostName: [], //管理主体名称下拉框
developmentHostName: [], //开发主体名称下拉框
categoryName: [], //项目细分类下拉框
projectSearch: {
projectStatus: "" //项目状态
}
}
},
mounted() {
this.optionsChange()
this.getData();
this.processTable();
/**
@@ -425,6 +464,35 @@ export default {
});
},
methods: {
optionsChange(){
this.managementHostName = [] //管理主体名称下拉框
this.developmentHostName = [] //开发主体名称下拉框
this.categoryName = [] //项目细分类下拉框
/**
* 获取项目群筛选项的值
*/
this.$http.post("sarStandProjectLibrary/querySelect", {
...this.projectSearch
}, {
_this: this
}, res => {
res.data.managementHostList.forEach(item => {
if (item) {
this.managementHostName.push(item); //管理主体
}
});
res.data.developmentHostList.forEach(item => {
if (item) {
this.developmentHostName.push(item); //开发主体
}
});
res.data.categoryList.forEach(item => {
if (item) {
this.categoryName.push(item); //项目细分类
}
});
});
},
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
src/pages/processCenter/pages/creatProcess/bzpg/step4.vue
+2 -1
View File
@@ -138,7 +138,7 @@
</el-table-column>
<el-table-column
label="条款内容"
width="200"
width="125"
show-overflow-tooltip
align="center">
<template slot-scope="scope">
@@ -149,6 +149,7 @@
</el-table-column>
<el-table-column
v-if="!changePoint"
:show-overflow-tooltip="true"
prop="technicalRequir"
align="center"
width="200px"
src/pages/processCenter/pages/creatProcess/bzpg/step5.vue
+2 -1
View File
@@ -190,7 +190,7 @@
</el-table-column>
<el-table-column
label="条款内容"
width="200"
width="125"
show-overflow-tooltip
align="center">
<template slot-scope="scope">
@@ -201,6 +201,7 @@
</el-table-column>
<el-table-column
v-if="!changePoint"
:show-overflow-tooltip="true"
prop="technicalRequir"
align="center"
width="250"
src/pages/processCenter/pages/creatProcess/bzpg/step6.vue
+2 -1
View File
@@ -183,7 +183,7 @@
</el-table-column>
<el-table-column
label="条款内容"
width="200"
width="125"
show-overflow-tooltip
align="center">
<template slot-scope="scope">
@@ -194,6 +194,7 @@
</el-table-column>
<el-table-column
v-if="!changePoint"
:show-overflow-tooltip="true"
prop="technicalRequir"
align="center"
width="250"
src/pages/processCenter/pages/creatProcess/bzpg/step7.vue
+2 -1
View File
@@ -192,7 +192,7 @@
</el-table-column>
<el-table-column
label="条款内容"
width="200"
width="125"
show-overflow-tooltip
align="center">
<template slot-scope="scope">
@@ -204,6 +204,7 @@
<el-table-column
v-if="!changePoint"
prop="technicalRequir"
:show-overflow-tooltip="true"
align="center"
width="250"
label="核心技术要求/变化点">
src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue
+2 -1
View File
@@ -192,7 +192,7 @@
</el-table-column>
<el-table-column
label="条款内容"
width="200"
width="125"
show-overflow-tooltip
align="center">
<template slot-scope="scope">
@@ -203,6 +203,7 @@
</el-table-column>
<el-table-column
v-if="!changePoint"
:show-overflow-tooltip="true"
prop="technicalRequir"
align="center"
width="250"
src/pages/processCenter/pages/creatProcess/bzpg/step8.vue
+2 -1
View File
@@ -192,7 +192,7 @@
</el-table-column>
<el-table-column
label="条款内容"
width="200"
width="125"
show-overflow-tooltip
align="center">
<template slot-scope="scope">
@@ -203,6 +203,7 @@
</el-table-column>
<el-table-column
v-if="!changePoint"
:show-overflow-tooltip="true"
prop="technicalRequir"
align="center"
width="250"
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+21 -10
View File
@@ -122,6 +122,8 @@
<el-tooltip :disabled="!form.standName" effect="dark" :content=form.standName placement="top-start">
<el-input
v-model="form.standName"
type="textarea"
autosize
placeholder="请输入标准中文名称"
clearable
></el-input>
@@ -132,6 +134,8 @@
<el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
<el-input
v-model="form.standEnName"
type="textarea"
autosize
placeholder="请输入标准英文名称"
clearable
></el-input>
@@ -2263,6 +2267,7 @@ export default {
bringData.standInData = this.form.standInData && this.form.standInData != '' ? this.form.standInData : '0'
const json = Object.assign(bringData, bringData.attrInfoCaseMap);
this.form = JSON.parse(JSON.stringify(json))
this.form.textStatus = this.form.textStatus === 'jjxoynfepp' ? '' : this.form.textStatus
this.getListTree(bringData)
this.form.standId = bringData.id
if (this.form.country) {
@@ -2785,13 +2790,13 @@ export default {
},
selectLaws(type) {
if(type === 'dtbjh'){
this.textList = this.form.dtbjh.split(',')
this.textList = this.form.dtbjh ? this.form.dtbjh.split(',') : []
}else if(type === 'bfbdtbzh'){
this.textList = this.form.bfbdtbzh.split(',')
this.textList = this.form.bfbdtbzh ? this.form.bfbdtbzh.split(',') : []
}else if(type === 'cbbh'){
this.textList = this.form.cbbh.split(',')
this.textList = this.form.cbbh ? this.form.cbbh.split(',') : []
}else if(type === 'yybj'){
this.textList = this.form.yybj.split(',')
this.textList = this.form.yybj ? this.form.yybj.split(',') : []
}
// if (this.standNumFlag === 1) {
// this.$refs.selections.selectAll(false)
@@ -3464,10 +3469,6 @@ export default {
},
},
mounted() {
this.bpnId = this.$route.query.bpnId
if (this.bpnId !== undefined) {
this.getTaskId()
}
this.getTree()
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
@@ -3475,7 +3476,13 @@ export default {
this.countryOptions = res.data.COUNTRY//国家地区
this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
this.standNatureOptions = res.data.SARPROPERTY // 标准性质
this.standStateOptions = res.data.WBZTCLASS // 文本状态
const standOptions = []
res.data.WBZTCLASS.forEach(item=>{
if( item.label === '草案' || item.label === '征求意见' || item.label === '送审' || item.label === '报批' || item.label === '发布'){
standOptions.push(item)
}
})
this.standStateOptions = standOptions // 文本状态
this.standSystemOptions = res.data.BZTXCLASS // 标准体系
this.applyArcticOptions.options = res.data.ENERGYTYPES // 适用车型
this.categoryOptions.options = res.data.NYLXCLASS // 能源类型
@@ -3491,6 +3498,10 @@ export default {
this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
this.txlbOptions = res.data.TXLBCLASS // 体系类别
this.setMap(this.standStateOptions)
this.bpnId = this.$route.query.bpnId
if (this.bpnId !== undefined) {
this.getTaskId()
}
})
this.busVsFunc()
this.modelFunc()
@@ -3540,7 +3551,7 @@ export default {
}
.prc-content-border {
/deep/ .el-input__inner {
/deep/ .el-textarea__inner,.el-input__inner {
padding-left: 30px;
}
}
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+32 -16
View File
@@ -115,6 +115,8 @@
<el-tooltip v-if="form.standName" effect="dark" :content=form.standName placement="top-start">
<el-input
v-model="form.standName"
type="textarea"
autosize
disabled
placeholder="请输入标准中文名称"
clearable
@@ -124,6 +126,8 @@
v-else
disabled
v-model="form.standName"
type="textarea"
autosize
placeholder="请输入标准中文名称"
clearable
></el-input>
@@ -134,6 +138,8 @@
<el-input
disabled
v-model="form.standEnName"
type="textarea"
autosize
placeholder="请输入标准英文名称"
clearable
></el-input>
@@ -1190,6 +1196,16 @@ export default {
})
})
},
filterObj(obj){
if(obj && obj !== ''){
if(obj instanceof Array){
return obj;
}else {
return obj.split(",")
}
}
return "";
},
/**
* @description: 动态表单读取
*/
@@ -1198,10 +1214,10 @@ export default {
this.form = JSON.parse(JSON.stringify(item))
let wssmrName = this.form.wssmrname || this.form.wssmr
this.form.wssmr = wssmrName
this.form.sycpx = this.form.sycpx && this.form.sycpx !== [] ? this.form.sycpx : ''
this.form.nylx = this.form.nylx && this.form.nylx !== [] ? this.form.nylx : ''
this.form.cllx = this.form.cllx && this.form.cllx !== [] ? this.form.cllx: ''
this.form.syrz = this.form.syrz && this.form.syrz !== [] ? this.form.syrz : ''
this.form['sycpx'] = this.filterObj(this.form['sycpx'])
this.form['nylx'] = this.filterObj(this.form['nylx'])
this.form['cllx'] = this.filterObj(this.form['cllx'])
this.form['syrz'] = this.filterObj(this.form['syrz'])
this.defaultCheckedKeys = [this.form.standSystem]
this.defaultCheckedKeys1 = [this.form.cycvppsbm]
this.defaultCheckedKeys2 = [this.form.kccvppsbm]
@@ -1278,21 +1294,21 @@ export default {
if (this.form.zrgcs.length === 0) {
this.form.zrgcs = "";
}
let qcdwName = []
if(this.form.qcdw && this.form.qcdw.length > 0){
this.form.qcdw.map(item => {
this.qcdwOptions.forEach(items => {
if(item === items.value){
qcdwName.push(items.label)
}
})
})
}
// let qcdwName = []
// if(this.form.qcdw && this.form.qcdw.length > 0){
// this.form.qcdw.map(item => {
// this.qcdwOptions.forEach(items => {
// if(item === items.value){
// qcdwName.push(items.label)
// }
// })
// })
// }
this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
this.form.menuIds = this.form.treeListId;
this.form.BBFDTBZ = this.form.bfbdtbzh
this.form.qcdw = qcdwName
this.form.qcdw = qcdwName.splice(',')
// this.form.qcdw = qcdwName
// this.form.qcdw = qcdwName.splice(',')
const json = JSON.stringify(this.form);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+19 -4
View File
@@ -126,6 +126,8 @@
v-else
disabled
v-model="form.standName"
type="textarea"
autosize
placeholder="请输入标准中文名称"
clearable
></el-input>
@@ -136,6 +138,8 @@
<el-input
disabled
v-model="form.standEnName"
type="textarea"
autosize
placeholder="请输入标准英文名称"
clearable
></el-input>
@@ -1156,6 +1160,16 @@ export default {
})
})
},
filterObj(obj){
if(obj && obj !== ''){
if(obj instanceof Array){
return obj;
}else {
return obj.split(",")
}
}
return "";
},
/**
* @description: 动态表单读取
*/
@@ -1163,12 +1177,13 @@ export default {
console.log(item);
this.$nextTick(() => {
this.form = JSON.parse(JSON.stringify(item))
console.log(this.form)
let wssmrName = this.form.wssmrname || this.form.wssmr
this.form.wssmr = wssmrName
this.form.sycpx = this.form.sycpx && this.form.sycpx !== [] ? this.form.sycpx : ''
this.form.nylx = this.form.nylx && this.form.nylx !== [] ? this.form.nylx : ''
this.form.cllx = this.form.cllx && this.form.cllx !== [] ? this.form.cllx: ''
this.form.syrz = this.form.syrz && this.form.syrz !== [] ? this.form.syrz: ''
this.form['sycpx'] = this.filterObj(this.form['sycpx'])
this.form['nylx'] = this.filterObj(this.form['nylx'])
this.form['cllx'] = this.filterObj(this.form['cllx'])
this.form['syrz'] = this.filterObj(this.form['syrz'])
this.form.country = this.form.country && this.form.country !== [] ? this.form.country: ''
this.defaultCheckedKeys = [this.form.standSystem]
this.defaultCheckedKeys1 = [this.form.cycvppsbm]
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+25 -2
View File
@@ -127,6 +127,8 @@
<el-tooltip :disabled="!form.standName" effect="dark" :content=form.standName placement="top-start">
<el-input
v-model="form.standName"
type="textarea"
autosize
placeholder="请输入标准中文名称"
clearable
></el-input>
@@ -137,6 +139,8 @@
<el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
<el-input
v-model="form.standEnName"
type="textarea"
autosize
placeholder="请输入标准英文名称"
clearable
></el-input>
@@ -2649,6 +2653,16 @@ export default {
})
})
},
filterObj(obj){
if(obj && obj !== ''){
if(obj instanceof Array){
return obj;
}else {
return obj.split(",")
}
}
return "";
},
/**
* @description: 动态表单读取
*/
@@ -2662,6 +2676,10 @@ export default {
this.initializeFileList(p, this.form[p]);
}
}
this.form['sycpx'] = this.filterObj(this.form['sycpx'])
this.form['nylx'] = this.filterObj(this.form['nylx'])
this.form['cllx'] = this.filterObj(this.form['cllx'])
this.form['syrz'] = this.filterObj(this.form['syrz'])
this.defaultCheckedKeys = [this.form.standSystem];
this.defaultCheckedKeys1 = [this.form.cycvppsbm];
this.defaultCheckedKeys2 = [this.form.kccvppsbm];
@@ -2789,6 +2807,7 @@ export default {
//表单文件处理
this.fileInfoHandle();
this.form.commentText = this.commentText;
this.isSubmit = true
this.saveLoading = true
let _formData = new FormData()
_formData.append("id", this.bpnId || "");
@@ -2805,11 +2824,13 @@ export default {
// taskIds:this.taskIds
}))
saveTaskForPub(_formData).then(res => {
this.isSubmit = false
this.saveLoading = false
this.$message.success('保存成功')
this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
this.isSubmit = false
this.saveLoading = false
})
},
fileInfoHandle() {
@@ -2869,6 +2890,7 @@ export default {
if (res.ok) {
this.fileInfoHandle();
this.isSubmit = true
this.saveLoading = true
this.form.submitType = this.submitType
this.form.commentText = this.commentText
this.form.approvalOpinion = this.approvalOpinion
@@ -2887,7 +2909,8 @@ export default {
} else {
this.$message.success(res.message)
}
this.isSubmit = false
this.isSubmit = false
this.saveLoading = false
})
} else {
this.$message.warning('标准号重复')
src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
+20 -4
View File
@@ -115,6 +115,8 @@
<el-tooltip v-if="form.standName" effect="dark" :content=form.standName placement="top-start">
<el-input
v-model="form.standName"
type="textarea"
autosize
disabled
placeholder="请输入标准中文名称"
clearable
@@ -124,6 +126,8 @@
v-else
disabled
v-model="form.standName"
type="textarea"
autosize
placeholder="请输入标准中文名称"
clearable
></el-input>
@@ -134,6 +138,8 @@
<el-input
disabled
v-model="form.standEnName"
type="textarea"
autosize
placeholder="请输入标准英文名称"
clearable
></el-input>
@@ -1162,6 +1168,16 @@ export default {
})
})
},
filterObj(obj){
if(obj && obj !== ''){
if(obj instanceof Array){
return obj;
}else {
return obj.split(",")
}
}
return "";
},
/**
* @description: 动态表单读取
*/
@@ -1170,10 +1186,10 @@ export default {
this.form = JSON.parse(JSON.stringify(item))
let wssmrName = this.form.wssmrname || this.form.wssmr
this.form.wssmr = wssmrName
this.form.sycpx = this.form.sycpx && this.form.sycpx !== [] ? this.form.sycpx : ''
this.form.nylx = this.form.nylx && this.form.nylx !== [] ? this.form.nylx : ''
this.form.cllx = this.form.cllx && this.form.cllx !== [] ? this.form.cllx: ''
this.form.syrz = this.form.syrz && this.form.syrz !== [] ? this.form.syrz : ''
this.form['sycpx'] = this.filterObj(this.form['sycpx'])
this.form['nylx'] = this.filterObj(this.form['nylx'])
this.form['cllx'] = this.filterObj(this.form['cllx'])
this.form['syrz'] = this.filterObj(this.form['syrz'])
this.defaultCheckedKeys = [this.form.standSystem]
this.defaultCheckedKeys1 = [this.form.cycvppsbm]
this.defaultCheckedKeys2 = [this.form.kccvppsbm]
src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
+3
View File
@@ -2076,6 +2076,9 @@
this.form.modelDataNameVerify=[]
this.form.modelDataZrUserVerify=[]
this.form.QCDWID= ''
this.form.menuId = this.form['TXLBBUSSMenuId']
console.log(this.form)
console.log(this.form.menuId)
this.form.WJSCRYBUSS= this.$store.getters.userInfo.userId
this.form.WJSCRYBUSSName= this.$store.getters.userInfo.userName
this.form['id'] = bringData.id
src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue
+7 -4
View File
@@ -2209,6 +2209,7 @@
this.form.treeType = 'sarMs'
}
}
this.formKey++
this.modalShowFlag1 = false
this.$forceUpdate()
},
@@ -2411,7 +2412,7 @@
this.rules.commentText[0].required = true;
}
},
async saveConfStand(standId) {
saveConfStand(standId) {
if(this.form.menuId && this.form.menuId !== ''){
let search = {}
let list = []
@@ -2425,6 +2426,9 @@
_this: this
}, res => {
const history = res;
this.$message.success("入库成功")
this.submitLoading = false
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
resolve(history)
})
})
@@ -2455,6 +2459,8 @@
this.form.reviseStatus = 'buss2_'+this.form.standStatus
this.form.textStatusBuss = '6jnqba2mby'
const json = JSON.stringify(this.form);
this.processCreateBuss(json)
return
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId : this.userId,
@@ -2493,11 +2499,8 @@
_formData.append('infoJson', json)
processCreateBuss(_formData).then(res => {
if (res.result === '操作成功' || res.ok) {
this.$message.success("入库成功")
// 自动匹配配置标准
this.saveConfStand(res.data)
this.submitLoading = false
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
} else {
this.$message.warning(res.message)
this.isSubmit = false
src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue
+6 -1
View File
@@ -36,7 +36,8 @@
@formSelectLawsCancel = "formSelectLawsCancel"
@formChoiceZRRListCancel = "formChoiceZRRListCancel"
@formChoiceQCDW = "formChoiceQCDW"
/>
@formChoiceZRR1 = "formChoiceZRR1"
/>
<ProcessTitle>
<template slot="title">文件汇总</template>
</ProcessTitle>
@@ -1210,6 +1211,9 @@
this.drawerTitle = title
this.modalShowFlagZRBM = true
},
formChoiceZRR1(type, title, id){
this.choiceZRR1(type, title, id)
},
formChoiceQCDW(type, title, id){
this.choiceQCDW(type, title, id)
},
@@ -2246,6 +2250,7 @@
this.form.treeType = 'sarMs'
}
}
this.formKey++
this.modalShowFlag1 = false
this.$forceUpdate()
},
src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
+1
View File
@@ -2348,6 +2348,7 @@
this.form.treeType = 'sarMs'
}
}
this.formKey++
this.modalShowFlag1 = false
this.$forceUpdate()
},
src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
+5
View File
@@ -36,6 +36,7 @@
@formSelectLawsCancel = "formSelectLawsCancel"
@formChoiceZRRListCancel = "formChoiceZRRListCancel"
@formChoiceQCDW = "formChoiceQCDW"
@formChoiceZRR1 = "formChoiceZRR1"
/>
<ProcessTitle>
<template slot="title">文件汇总</template>
@@ -1211,6 +1212,9 @@
this.drawerTitle = title
this.modalShowFlagZRBM = true
},
formChoiceZRR1(type, title, id){
this.choiceZRR1(type, title, id)
},
formChoiceQCDW(type, title, id){
this.choiceQCDW(type, title, id)
},
@@ -2247,6 +2251,7 @@
this.form.treeType = 'sarMs'
}
}
this.formKey++
this.modalShowFlag1 = false
this.$forceUpdate()
},
src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
+1
View File
@@ -2359,6 +2359,7 @@
this.form.treeType = 'sarMs'
}
}
this.formKey++
this.modalShowFlag1 = false
this.$forceUpdate()
},
src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
+2 -2
View File
@@ -22,7 +22,7 @@
<template style="width: 10%">
<el-table
:data="historyData"
height="250"
:height="tablePHeight"
border
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
style="width: 10%;float: left;margin-right: 20px;">
@@ -32,7 +32,7 @@
label="质量评价人"
min-width="100%">
<template slot-scope="scope">
<div @click="ccc(scope.row)">{{scope.row.userName}}-{{scope.row.taskInfo}}</div>
<div @click="ccc(scope.row)" style="cursor: pointer">{{scope.row.userName}}-{{scope.row.taskInfo}}</div>
</template>
</el-table-column>
</el-table>
src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue
+15
View File
@@ -38,6 +38,16 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker
:picker-options="pickerOptions"
v-model="qdform.endTime"
type="date"
placeholder="请选择截止日期"
disabled
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
@@ -635,6 +645,11 @@ export default {
},
data() {
return {
pickerOptions: {
disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7;
},
},
lawInfoTableLoading: true,
lawInfoTable:[],
textState: [],
src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue
+15
View File
@@ -38,6 +38,16 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker
:picker-options="pickerOptions"
v-model="qdform.endTime"
type="date"
placeholder="请选择截止日期"
disabled
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
@@ -659,6 +669,11 @@ export default {
},
data() {
return {
pickerOptions: {
disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7;
},
},
lawInfoTableLoading: true,
lawInfoTable:[],
textState: [],
src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue
+15
View File
@@ -38,6 +38,16 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker
:picker-options="pickerOptions"
v-model="qdform.endTime"
type="date"
placeholder="请选择截止日期"
disabled
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
@@ -659,6 +669,11 @@ export default {
},
data() {
return {
pickerOptions: {
disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7;
},
},
lawInfoTableLoading: true,
lawInfoTable:[],
textState: [],
src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue
+15
View File
@@ -38,6 +38,16 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker
:picker-options="pickerOptions"
v-model="qdform.endTime"
type="date"
placeholder="请选择截止日期"
disabled
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
@@ -650,6 +660,11 @@ export default {
},
data() {
return {
pickerOptions: {
disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7;
},
},
lawInfoTableLoading: true,
lawInfoTable:[],
textState: [],
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+2 -2
View File
@@ -39,9 +39,9 @@
<el-row style="margin-top: 10px">
<!--<el-col :span="5">产品线: <span class="valueColor">{{ localProEO.productLine }} </span></el-col>-->
<el-col :span="6">项目经理: <span class="valueColor">{{ localProEO.uname }} </span></el-col>
<el-col :span="6"> 项目计划开始时间: <span
<el-col :span="6"> 项目计划开始日期: <span
class="valueColor">{{ $moment(localProEO.projectStartDate).format('YYYY-MM-DD') }}</span></el-col>
<el-col :span="6">项目计划完成时间: <span
<el-col :span="6">项目计划完成日期: <span
class="valueColor">{{ $moment(localProEO.projectEndDate).format('YYYY-MM-DD') }} </span></el-col>
</el-row>
</div>
src/pages/regulatoryRepository/standQA/index.vue
+18 -6
View File
@@ -777,6 +777,7 @@ export default {
standList: [],
standIdList: [],
questionsList: [],
standMap: new Map()
}
},
mounted(){
@@ -819,6 +820,12 @@ export default {
});
},
methods:{
refreshStandMap(){
this.standMap = new Map()
this.standList.forEach(item=>{
this.standMap.set(item.standardId,item)
})
},
changeInput:debounce(function(val){
if(val.length){
this.$http.get('lawss/AskQuestions/resemblance',{
@@ -1040,15 +1047,16 @@ export default {
//提问按钮
queBtn(){
this.fileList = []
this.standType = "INLAND"
const selectedStand = this.activestand == '0' ? this.standList[0] : this.standMap.get(this.activestand)
this.standType = selectedStand.classification
this.questionForm = {
pubQue : '',//公共问题
classification: 'INLAND', //标准类型
pubQue : selectedStand.classification === "OTHER" ? selectedStand.standardId : '',//公共问题
classification: selectedStand.classification, //标准类型
problemDescription: '', //问题
questioner: this.$store.getters.userInfo.userId, //提问人
standardEncdoing: '', //标准编号
standardName: '', //标准名称
standardId:'', //标准id
standardEncdoing: selectedStand.standardEncdoing, //标准编号
standardName: selectedStand.standardName, //标准名称
standardId: selectedStand.standardId, //标准id
fileList: '',
}
this.dialogVisible = true
@@ -1076,6 +1084,7 @@ export default {
_this: this
}, res => {
this.standList = res.data
this.refreshStandMap()
})
},
//问题查询
@@ -1107,6 +1116,7 @@ export default {
_this: this
}, res =>{
this.standList = res.data
this.refreshStandMap()
if(this.$route.query.queId){
this.activestand = this.standList[0].standardId
this.queSearch()
@@ -1129,6 +1139,7 @@ export default {
})
if(queNumber === 0){
this.standList = res.data
this.refreshStandMap()
}
}, e => {
@@ -1235,6 +1246,7 @@ export default {
this.standSearch2()
break
}
this.queSearch()
}, e => {
})