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:
Superman_Main
2021-12-01 19:39:21 +08:00
parent 7762e0dc62 ade1cfd4f1
commit a004801ec3
31 changed files with 1233 additions and 959 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/unqualProcess.js
+6 -3
View File
@@ -63,12 +63,13 @@ export function meetingByMonth(params) {
//未符合项模块新增
export function addUn(
closeState, standSerialNumber, standName,
closeState,standId, standSerialNumber, standName,
itemsNum, itemsName, productType,
productLine, productName, reason, responsibleUnit,
productLine, productName,productId,reason, responsibleUnit,
dutyEngineer, authEngineer, qaEngineer, planCloseTime) {
const data = {
closeState,
standId,
standSerialNumber, //标准号
standName, //标准名称
itemsNum, //条款号
@@ -76,6 +77,7 @@ export function addUn(
productType,
productLine, //产品线
productName, //项目名称
productId, //项目编号
reason, //不合规项目
responsibleUnit, //责任部门
dutyEngineer, //责任工程师
@@ -92,12 +94,13 @@ export function addUn(
//未符合项模块编辑
export function editUn(
closeState, standSerialNumber, standName,
closeState, standId, standSerialNumber, standName,
itemsNum, itemsName, productType,
productLine, productName, reason, responsibleUnit,
dutyEngineer, authEngineer, qaEngineer, planCloseTime, id) {
const data = {
closeState,
standId,
standSerialNumber, //标准号
standName, //标准名称
itemsNum, //条款号
src/components/CustomFormComponents/File.vue
+12 -1
View File
@@ -22,13 +22,23 @@
v-if="reUpload || showUploadBtn">{{ uploadText || '重新上传' }}</el-button>
</ul>
<template style="margin-left: 105px;" v-else>
<ul class="file-file__wrap">
<li class="file-item"
v-for="(file, index) in showFileList"
:key="index"
:title="file.name"
@click="handlePreview(file)">
{{ file.name }}
</li>
</ul>
<el-button
size="small"
@click="clickButtonToUpload('opinionFileList')"
icon="el-icon-upload"
class="form-upload-btn"
>
{{ (value === 'null' || value === '' || value == null) && (!processModel || (processModel && !disabled)) ? '点击上传' : '查看已上传的文件' }}
<!-- {{ (value === 'null' || value === '' || value == null) && (!processModel || (processModel && !disabled)) ? '点击上传' : '查看已上传的文件' }}-->
上传
</el-button>
</template>
<el-dialog
@@ -152,6 +162,7 @@ export default {
}
},
mounted() {
this.getShowFileList()
if (this.showFileModel) {
this.getShowFileList()
}
src/components/CustomFormComponents/SelectArray.vue
+1
View File
@@ -10,6 +10,7 @@
<el-select
v-model="valueArr"
:placeholder="placeholder"
filterable
:disabled="disabled"
clearable
multiple
src/components/treeSelect/treeSelectModule.vue
+3 -3
View File
@@ -177,7 +177,7 @@
if (node.level >= 1) {
setTimeout(() => {
this.getChildByList(node.data.level,node.data.id, resolve);
this.getChildByList(node.data.level,node.data.id,node.data.model, resolve);
}, 500);
return resolve([]); // 加上这个，防止在该节点没有子节点时一直转圈的问题发生。
}
@@ -194,8 +194,8 @@
}
})
},
getChildByList( level,id,resolve) { // 获取子节点请求
let params = {level : level,id :id,type : this.type};
getChildByList( level,id,model,resolve) { // 获取子节点请求
let params = {level : level,id :id,type : this.type,model :model};
this.$http.get(this.urlChild, params, {
_this: this
}, res => {
src/pages/details/complianceDetails/index.vue
+12 -8
View File
@@ -1,6 +1,7 @@
<!--符合性详情-->
<template>
<div id="complianceDetails">
<el-divider content-position="left" v-if="unfit.length < 1 && fit.length < 1" >暂无评估结果</el-divider>
<!-- 不满足-->
<el-divider content-position="left" v-if="unfit.length" >不满足</el-divider>
<div class="content">
@@ -21,25 +22,28 @@
>
</el-table-column>
<el-table-column
prop="noCompliance"
prop="researchNonCompliance"
label="不合规项目"
align="center"
>
</el-table-column>
<el-table-column
prop="countermeasures "
prop="researchCountermeasures"
label="应对措施"
align="center"
>
</el-table-column>
<el-table-column
prop="completionTime "
prop="researchImplementationTime"
label="完成时间"
align="center"
>
<template slot-scope="scope">
<span>{{ scope.row.researchImplementationTime ? $moment(scope.row.researchImplementationTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column
prop="assessor"
prop="evaluationPeople"
label="评估人"
align="center"
>
@@ -54,8 +58,8 @@
</template>
</el-table-column>
</el-table>
<pagination :page="page" :total="total" @pageChange="pageChange"
@pageSizeChange="pageSizeChange"></pagination>
<!-- <pagination :page="page" :total="total" @pageChange="pageChange"-->
<!-- @pageSizeChange="pageSizeChange"></pagination>-->
</div>
<!--满足-->
@@ -78,13 +82,13 @@
>
</el-table-column>
<el-table-column
prop="complianceReasons"
prop="researchCompliance"
label="合规"
align="center"
>
</el-table-column>
<el-table-column
prop="assessor"
prop="evaluationPeople"
label="评估人"
align="center"
>
src/pages/details/otherStandardDetails/index.vue
+7 -6
View File
@@ -5,7 +5,7 @@
<div class="details-header">
<span>{{ sarStandardsInfoEO.standSortShow || '' }} {{
sarStandardsInfoEO.standNumber
}}-{{ sarStandardsInfoEO.standYear }} 《{{ sarStandardsInfoEO.standName }}》 标准详情</span>
}}-{{ sarStandardsInfoEO.standYear }} 《{{ sarStandardsInfoEO.standName }}》</span>
</div>
<!--主体内容-->
<div class="details-content" style="position: relative">
@@ -62,7 +62,7 @@
<span>
<a style="font-size: 16px;color: #409EFF;cursor: pointer"
@click="openFileInPdf(file.id, file.oldFileName)" target="_blank"
:title="file.oldFileName">{{ file.oldFileName | ellipsis }}</a>
:title="file.oldFileName">{{ file.oldFileName }}</a>
<i
title="下载"
@click="downloadFile(file.id)"
@@ -126,7 +126,7 @@
</p>
<template v-for="(child, childIndex) in item.child2">
<p class="half">
<label style=" margin-right: 143px;">{{ child.attrName }}</label>
<label style=" margin-right: 150px;">{{ child.attrName }}</label>
<span>{{ child.value || '-' }}</span>
</p>
</template>
@@ -3282,7 +3282,9 @@ export default {
<style lang="less" scoped>
@import '~@/assets/styles/mixins';
@import '~@/assets/styles/style';
/deep/.el-collapse-item__header {
border-bottom: none !important;
}
/deep/ .decomposition-btn {
position: absolute;
top: 6px;
@@ -3294,7 +3296,6 @@ export default {
color: #07C160;
border: 1px solid #07C160;
background: rgba(1, 193, 96, 0.1);
/deep/ .icon-separate {
display: inline-block;
margin-right: 3px;
@@ -3598,7 +3599,7 @@ export default {
}
& > div:not(.modular-item-more) {
border-bottom: 1px solid #E5E5E5;
/*border-bottom: 1px solid #E5E5E5;*/
min-height: 43px;
line-height: 43px;
src/pages/processCenter/pages/components/ProcessMixin.vue
+13 -1
View File
@@ -80,7 +80,19 @@ export default {
{
label: '外部标准化会后管理流程',
value: "22"
}
},
{
label: "企标复审流程",
value: "23"
},
{
label: '企标废止流程',
value: "24"
},
{
label: '企标制修订计划管控',
value: "25"
},
],
formDisableFlag: false,
pickerOptions: {
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+156 -220
View File
@@ -262,28 +262,21 @@
v-model="form.xgdName"
clearable
></el-input>
<div v-if="xgdFileList.length>0">
<!-- {{ form.xgdName }}-->
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('xgd')">
<i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button>
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('xgd')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
</div>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in xgdFileList" :key="index" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
@click="fileUpload('xgd')">
<i class="el-icon-upload el-icon--right"></i>
</el-button>
</div>
</div>
</el-form-item>
<el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
<el-input
@@ -292,28 +285,21 @@
v-model="form.fbgbjbdName"
clearable
></el-input>
<div v-if="FBGBJBDFileList.length>0">
<!-- {{ form.fbgbjbdName }}-->
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('fbgbjbd')">
<i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button>
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('fbgbjbd')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
</div>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in FBGBJBDFileList" :key="index" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
@click="fileUpload('fbgbjbd')">
<i class="el-icon-upload el-icon--right"></i>
</el-button>
</div>
</div>
</el-form-item>
<el-form-item v-show="form.standInData === '0'" label="送审稿" prop="ssg" class="add-form-item form-item-disabled">
<el-input
@@ -322,28 +308,21 @@
v-model="form.ssgName"
clearable
></el-input>
<div v-if="ssgFileList.length>0">
<!-- {{ form.ssgName }}-->
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('ssg')">
<i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button>
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('ssg')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
</div>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in ssgFileList" :key="index" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
@click="fileUpload('ssg')">
<i class="el-icon-upload el-icon--right"></i>
</el-button>
</div>
</div>
</el-form-item>
<el-form-item label="草案" prop="ca" class="add-form-item form-item-disabled">
<el-input
@@ -352,28 +331,21 @@
v-model="form.caName"
clearable
></el-input>
<div v-if="caFileList.length>0">
<!-- {{ form.caName }}-->
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('ca')">
<i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button>
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('ca')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
</div>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in caFileList" :key="index" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
@click="fileUpload('ca')">
<i class="el-icon-upload el-icon--right"></i>
</el-button>
</div>
</div>
</el-form-item>
<el-form-item v-show="form.standInData === '1'" label="增补件" prop="zbjbd" class="add-form-item form-item-disabled">
<el-input
@@ -382,28 +354,21 @@
v-model="form.zbjbdName"
clearable
></el-input>
<div v-if="zbjbdFileList.length>0">
<!-- {{ form.zbjbdName }}-->
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('zbjbd')">
<i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button>
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('zbjbd')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
</div>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in zbjbdFileList" :key="index" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
@click="fileUpload('zbjbd')">
<i class="el-icon-upload el-icon--right"></i>
</el-button>
</div>
</div>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -414,28 +379,21 @@
v-model="form.kwjName"
clearable
></el-input>
<div v-if="kwjFileList.length>0">
<!-- {{ form.kwjName }}-->
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('kwj')">
<i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button>
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('kwj')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
</div>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in kwjFileList" :key="index" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
@click="fileUpload('kwj')">
<i class="el-icon-upload el-icon--right"></i>
</el-button>
</div>
</div>
</el-form-item>
<!-- ************************************* 2021/11/9 把"解读文件"改为"相关文件"*************************************-->
<el-form-item v-show="form.standInData === '0'" label="相关文件" prop="jdwj" class="add-form-item form-item-disabled">
@@ -446,28 +404,21 @@
v-model="form.jdwjName"
clearable
></el-input>
<div v-if="jdwjFileList.length>0">
<!-- {{ form.jdwjName }}-->
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('jdwj')">
<i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button>
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('jdwj')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
</div>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in jdwjFileList" :key="index" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
@click="fileUpload('jdwj')">
<i class="el-icon-upload el-icon--right"></i>
</el-button>
</div>
</div>
</el-form-item>
<el-form-item v-show="form.standInData === '0'" label="报批稿" prop="bpg" class="add-form-item form-item-disabled">
<el-input
@@ -476,28 +427,21 @@
v-model="form.bpgName"
clearable
></el-input>
<div v-if="bpgFileList.length>0">
<!-- {{ form.bpgName }}-->
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('bpg')">
<i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button>
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('bpg')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
</div>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in bpgFileList" :key="index" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
@click="fileUpload('bpg')">
<i class="el-icon-upload el-icon--right"></i>
</el-button>
</div>
</div>
</el-form-item>
<el-form-item v-show="form.standInData === '0'" label="征求意见稿" prop="zqyjg" class="add-form-item form-item-disabled">
<el-input
@@ -506,28 +450,21 @@
v-model="form.zqyjgName"
clearable
></el-input>
<div v-if="zqyjgFileList.length>0">
<!-- {{ form.zqyjgName }}-->
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('zqyjg')">
<i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button>
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('zqyjg')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
</div>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in zqyjgFileList" :key="index" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
@click="fileUpload('zqyjg')">
<i class="el-icon-upload el-icon--right"></i>
</el-button>
</div>
</div>
</el-form-item>
</el-col>
</el-row>
@@ -771,27 +708,20 @@
v-model="form.glwjName"
clearable
></el-input>
<div v-if="glwjFileList.length>0">
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('glwj')">
<i class="el-icon-upload el-icon--right"></i>
查看已上传文件
</el-button>
<!-- {{ form.glwjName }}-->
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('glwj')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in glwjFileList" :key="index" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
@click="fileUpload('glwj')">
<i class="el-icon-upload el-icon--right"></i>
</el-button>
</div>
</div>
</el-form-item>
</el-col>
@@ -1905,7 +1835,6 @@
const json = Object.assign(bringData, bringData.attrInfoCaseMap);
this.form = JSON.parse(JSON.stringify(json))
this.form.qcdw = JSON.parse(JSON.stringify(json)).qcdw && JSON.parse(JSON.stringify(json)).qcdw !== '[]' ? JSON.parse(JSON.stringify(json)).qcdw.split(',') : []
this.form.wssmr = JSON.parse(JSON.stringify(json)).wssmr && JSON.parse(JSON.stringify(json)).wssmr !== '[]' ? JSON.parse(JSON.stringify(json)).wssmr.split(',') : []
this.form.zrgcs = JSON.parse(JSON.stringify(json)).zrgcs && JSON.parse(JSON.stringify(json)).zrgcs !== '[]' ? JSON.parse(JSON.stringify(json)).zrgcs.split(',') : []
@@ -1924,6 +1853,7 @@
this.key3++
this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN'
this.form.standYear = bringData.standYear ? parseInt(bringData.standYear) : ''
this.form.ssrq = this.$moment(this.form.ssrq).format("YYYY-MM-DD")
this.form.prcNum = this.prcNum
this.form.prcName = this.prcName
this.form['id'] = bringData.id
@@ -2868,6 +2798,12 @@
position: relative;
overflow: hidden;
}
.fileClass {
width: 100%;
overflow: hidden;
text-overflow:ellipsis;
white-space: nowrap;
}
.prc-content-border {
/deep/ .el-input__inner {
padding-left: 30px;
src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
+1
View File
@@ -676,6 +676,7 @@ export default {
this.roleForm = mes.roleForm;
this.commentText = mes.commentText;
this.dataList = mes.form.dataList;
this.fileType = mes.form.fileType
this.dataList.forEach(item => {
if(!item.productLine){
this.dataList = null
src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+30 -8
View File
@@ -208,19 +208,18 @@
</el-table-column>
<el-table-column
label="落实人"
width="170"
width="210"
align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.implementerId" style="display: none;" />
<el-input v-model="scope.row.implementer" placeholder="请选择落实人"
@click.native="choiceZRRS(scope.row.implementerId, 1, scope.$index)" />
@click.native="choiceZRRS(scope.row, 1, scope.$index)" />
</template>
</el-table-column>
</el-table>
<!-- 选择责任人-->
<Role-tree
check-box
is-title="选择落实人"
:is-visible.sync="modalshowflag"
@checkedRole="checkedRole"
@@ -571,18 +570,29 @@ export default {
},
checkedRole(data) {
var idList = "";
var nameList = "";
data.forEach(item => {
if (nameList.length > 0) {
nameList += ",";
idList += ",";
}
idList += item.id;
nameList += item.name;
});
if (this.type === 1) {
this.listForm.breakdownList[this.lsIndex].implementerId = data[0].id;
this.listForm.breakdownList[this.lsIndex].implementer = data[0].name;
this.listForm.breakdownList[this.lsIndex].implementerId = idList;
this.listForm.breakdownList[this.lsIndex].implementer = nameList;
} else if (this.type === 2) {
this.listForm.breakdownList.forEach(item => {
this.selectList.forEach(items => {
if (item === items) {
item.implementerId = data[0].id;
item.implementer = data[0].name;
item.implementerId = idList;
item.implementer = nameList;
}
});
});
this.$refs.multipleTable.clearSelection();
}
this.modalshowflag = false;
},
@@ -596,7 +606,11 @@ export default {
this.nodeList = [];
this.lsIndex = index;
this.lsType = type;
this.nodeList.push(row);
if(row.implementerId){
this.nodeList = row.implementerId.split(",");
}else{
this.nodeList.push(row);
}
this.modalshowflag = true;
} else if (type === 2) {
// 批量
@@ -605,6 +619,14 @@ export default {
this.nodeList = [];
this.modalshowflag = true;
this.drawerTitle = "批量选择责任人";
this.selectList.forEach(item =>{
if(item.implementerId){
this.nodeList = item.implementerId.split(",");
}
})
// if(row.implementerId){
// this.nodeList = row.implementerId.split(",");
// }
} else {
this.$message.warning("请选择要分发的数据");
}
src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+188 -123
View File
@@ -135,6 +135,11 @@
<template slot="title">填写信息</template>
</process-title>
<div class="tableTitle">
<div class="tableButton">
<el-button :disabled="acceptShow" class="common-button-primary add-button" type="primary" size="mini"
@click="batchEdit">批量编辑
</el-button>
</div>
</div>
<el-table
ref="multipleTable"
@@ -143,7 +148,7 @@
style="width: 100%"
border
@selection-change="selectStandChange"
height="56%"
height="48%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
<el-table-column
@@ -211,10 +216,6 @@
<span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- prop="productType"-->
<!-- align="center"-->
<!-- label="在研产品">-->
<el-table-column
prop="researchCompliance"
align="center"
@@ -233,6 +234,7 @@
<el-input
v-else
:disabled="acceptShow"
clearable
v-model="dataList[scope.$index].complianceReasons"
placeholder="请输入合规原因"
>
@@ -306,6 +308,7 @@
:disabled="acceptShow"
class="datePickLen"
clearable
value-format="yyyy-MM-dd HH:mm:ss"
v-model="dataList[scope.$index].completionTime"
type="date"
placeholder="请选择日期">
@@ -313,104 +316,6 @@
</template>
</el-table-column>
</el-table-column>
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- align="center"-->
<!-- label="在产产品">-->
<!-- <el-table-column-->
<!-- prop="productionCompliance"-->
<!-- align="center"-->
<!-- width="160"-->
<!-- label="合规(具体情况)">-->
<!-- <template slot-scope="scope">-->
<!-- <el-input-->
<!-- v-if="dataList[scope.$index].zcNoCompliance && dataList[scope.$index].zcNoCompliance.length>0-->
<!-- || dataList[scope.$index].zcCountermeasures && dataList[scope.$index].zcCountermeasures>0-->
<!-- || dataList[scope.$index].zcCompletionTime && dataList[scope.$index].zcCompletionTime !== null"-->
<!-- disabled-->
<!-- v-model="dataList[scope.$index].zcComplianceReasons"-->
<!-- placeholder="请输入合规原因"-->
<!-- >-->
<!-- </el-input>-->
<!-- <el-input-->
<!-- v-else-->
<!-- v-model="dataList[scope.$index].zcComplianceReasons"-->
<!-- placeholder="请输入合规原因"-->
<!-- >-->
<!-- </el-input>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- align="center"-->
<!-- width="160"-->
<!-- label="不合规">-->
<!-- <el-table-column-->
<!-- prop="productionNonCompliance"-->
<!-- align="center"-->
<!-- width="170"-->
<!-- label="不合规项目">-->
<!-- <template slot-scope="scope">-->
<!-- <el-input-->
<!-- v-if="dataList[scope.$index].zcComplianceReasons && dataList[scope.$index].zcComplianceReasons.length>0"-->
<!-- disabled-->
<!-- v-model="dataList[scope.$index].zcNoCompliance"-->
<!-- placeholder="请输入不合规项目"-->
<!-- >-->
<!-- </el-input>-->
<!-- <el-input-->
<!-- v-else-->
<!-- v-model="dataList[scope.$index].zcNoCompliance"-->
<!-- placeholder="请输入不合规项目"-->
<!-- >-->
<!-- </el-input>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="productionCountermeasures"-->
<!-- align="center"-->
<!-- width="160"-->
<!-- label="应对措施">-->
<!-- <template slot-scope="scope">-->
<!-- <el-input-->
<!-- v-if="dataList[scope.$index].zcComplianceReasons && dataList[scope.$index].zcComplianceReasons.length>0"-->
<!-- disabled-->
<!-- v-model="dataList[scope.$index].zcCountermeasures"-->
<!-- placeholder="请输入应对措施"-->
<!-- >-->
<!-- </el-input>-->
<!-- <el-input-->
<!-- v-else-->
<!-- v-model="dataList[scope.$index].zcCountermeasures"-->
<!-- placeholder="请输入应对措施"-->
<!-- >-->
<!-- </el-input>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="productionCompletionTime"-->
<!-- align="center"-->
<!-- width="140"-->
<!-- label="完成时间">-->
<!-- <template slot-scope="scope">-->
<!-- <el-date-picker-->
<!-- v-if="dataList[scope.$index].zcComplianceReasons && dataList[scope.$index].zcComplianceReasons.length>0"-->
<!-- disabled-->
<!-- v-model="dataList[scope.$index].zcCompletionTime"-->
<!-- type="date"-->
<!-- placeholder="请选择日期">-->
<!-- </el-date-picker>-->
<!-- <el-date-picker-->
<!-- v-else-->
<!-- class="datePickLen"-->
<!-- clearable-->
<!-- v-model="dataList[scope.$index].zcCompletionTime"-->
<!-- type="date"-->
<!-- placeholder="请选择日期">-->
<!-- </el-date-picker>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table-column>-->
<!-- </el-table-column>-->
</el-table>
</div>
<div>
@@ -521,6 +426,96 @@
@checkedRole="checkedTransferRole"
:nodeList="nodeList"
></Role-tree>
<!-- 批量编辑弹窗-->
<el-drawer
title="批量填写"
:visible.sync="modalShowFlag"
:wrapperClosable="false"
size="800px">
<div class="demo-drawer-content">
<el-form :model="batchEditForm" class="label-input-form" ref="projectComplianceForm" label-width="150">
<!-- <el-divider><span><b>在研产品</b></span></el-divider>-->
<el-formItem label="合规原因" class="add-form-item">
<el-input
v-if="batchEditForm.noCompliance && batchEditForm.noCompliance.length>0
|| batchEditForm.countermeasures && batchEditForm.countermeasures.length>0
|| batchEditForm.completionTime && batchEditForm.completionTime !== null"
disabled
v-model="batchEditForm.complianceReasons"
placeholder="请输入合规原因"
>
</el-input>
<el-input
v-else
:disabled="acceptShow"
v-model="batchEditForm.complianceReasons"
placeholder="请输入合规原因"
>
</el-input>
</el-formItem>
<el-form-item label="不合规项目" class="add-form-item">
<el-input
v-if="batchEditForm.complianceReasons && batchEditForm.complianceReasons.length>0"
disabled
v-model="batchEditForm.noCompliance"
placeholder="请输入不合规项目"
>
</el-input>
<el-input
v-else
:disabled="acceptShow"
v-model="batchEditForm.noCompliance"
placeholder="请输入不合规项目"
>
</el-input>
</el-form-item>
<el-form-item label="不合规应对措施" class="add-form-item">
<el-input
v-if="batchEditForm.complianceReasons && batchEditForm.complianceReasons.length>0"
disabled
v-model="batchEditForm.countermeasures"
placeholder="请输入不合规应对措施"
>
</el-input>
<el-input
v-else
:disabled="acceptShow"
v-model="batchEditForm.countermeasures"
placeholder="请输入不合规应对措施"
>
</el-input>
</el-form-item>
<el-form-item label="完成时间" class="add-form-item">
<el-date-picker
v-if="batchEditForm.complianceReasons && batchEditForm.complianceReasons.length>0"
disabled
v-model="batchEditForm.completionTime"
type="date"
placeholder="请选择日期">
</el-date-picker>
<el-date-picker
v-else
:disabled="acceptShow"
class="datePickLen"
clearable
value-format="yyyy-MM-dd HH:mm:ss"
v-model="batchEditForm.completionTime"
type="date"
placeholder="请选择日期">
</el-date-picker>
</el-form-item>
<br>
</el-form>
</div>
<div class="demo-drawer-footer">
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary"
@click="saveBatchEditForm">
确定
</el-button>
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancelBatchEditForm">取消
</el-button>
</div>
</el-drawer>
</div>
</template>
@@ -542,11 +537,24 @@ export default {
return {
//折叠的标志，true为折叠，false为不折叠
foldFormFlag: false,
comFlag: 0,
nodeList:[],
drawerTitle:'',
isTransfer: false,
// 调整处理人抽屉状态
drawerModal: false,
modalShowFlag: false, // 批量编辑开关
batchEditForm: {
// 在研产品
// 合规
complianceReasons: "",
// 不合规
noCompliance: "",
// 应对措施
countermeasures: "",
// 完成时间
completionTime: "",
},
detailData: [],
sarProStateTableHeight: null, // 项目列表高度
// 当前流程类型(1待办/2已办)
@@ -720,6 +728,7 @@ export default {
* @description: 动态表单读取
*/
getFormFieldList(item) {
console.log(item);
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item));
if (item.form === undefined) {
@@ -729,6 +738,12 @@ export default {
item.implementer = this.$store.getters.userInfo.userName;
});
this.dataList = item.step3DTOS;
this.dataList.forEach(item => {
this.$set(item,'complianceReasons', '')
this.$set(item,'noCompliance', '')
this.$set(item,'countermeasures', '')
this.$set(item,'completionTime', '')
})
} else {
this.dataList = item.dataList;
@@ -792,30 +807,80 @@ export default {
this.isSubmit = false
})
},
handlePrice(){
for (let i = 0; i < this.dataList.length; i++) {
if (this.dataList[i].complianceReasons !== '' || (this.dataList[i].noCompliance !== '' && this.dataList[i].countermeasures !== '' && this.dataList[i].completionTime !== '') || (this.dataList[i].complianceReasons === '' && this.dataList[i].noCompliance === '' && this.dataList[i].countermeasures === '' && this.dataList[i].completionTime === '')){
}else {
this.comFlag ++
}
}
},
//提交事件
handleSubmit() {
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
this.listForm.commentText = this.commentText;
this.listForm.approvalOpinion = "";
this.listForm.signFlag = "";
this.listForm.dataList = this.dataList;
const json = JSON.stringify(this.listForm);
this.isSubmit = true;
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false;
}, e => {
this.handlePrice()
if(this.comFlag > 0) {
this.$message.warning('请填写完整的不符合项信息')
this.comFlag = 0
}else{
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
this.listForm.commentText = this.commentText;
this.listForm.approvalOpinion = "";
this.listForm.signFlag = "";
this.listForm.dataList = this.dataList;
const json = JSON.stringify(this.listForm);
this.isSubmit = true;
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false;
}, e => {
});
}
},
//批量编辑
batchEdit() {
if (this.selectList.length > 0) {
//合规
this.batchEditForm.complianceReasons = "";
//不合规
this.batchEditForm.noCompliance = "";
//应对措施
this.batchEditForm.countermeasures = "";
//完成时间
this.batchEditForm.completionTime = "";
this.modalShowFlag = true;
} else {
this.$message.warning("请选择要编辑的数据");
}
},
//批量编辑确定按钮事件
saveBatchEditForm() {
this.dataList.forEach(item => {
this.selectList.forEach(items => {
if (item.id === items) {
item.complianceReasons = this.batchEditForm.complianceReasons;
//不合规
item.noCompliance = this.batchEditForm.noCompliance;
//应对措施
item.countermeasures = this.batchEditForm.countermeasures;
//完成时间
item.completionTime = this.batchEditForm.completionTime;
}
});
});
this.modalShowFlag = false;
},
cancelBatchEditForm() {
this.modalShowFlag = false;
},
//标准表格选择框改变
selectStandChange(data) {
src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
+1 -1
View File
@@ -601,7 +601,7 @@ export default {
},
//流程提交事件
handleSubmit() {
let fileFlag
let fileFlag = true
this.dataList.forEach(item => {
if(!item.fileType){
fileFlag = false
src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue
-41
View File
@@ -110,10 +110,6 @@
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="productType"
align="center"
label="在研产品">
<el-table-column
prop="complianceReasons"
align="center"
@@ -147,43 +143,6 @@
</template>
</el-table-column>
</el-table-column>
</el-table-column>
<el-table-column
align="center"
label="在产产品">
<el-table-column
prop="zcComplianceReasons"
align="center"
width="160"
label="合规(具体情况)">
</el-table-column>
<el-table-column
align="center"
width="160"
label="不合规">
<el-table-column
prop="zcNoCompliance"
align="center"
width="170"
label="不合规项目">
</el-table-column>
<el-table-column
prop="zcCountermeasures"
align="center"
width="160"
label="应对措施">
</el-table-column>
<el-table-column
prop="zcCompletionTime"
align="center"
width="120"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
</el-table-column>
</el-table-column>
<el-table-column
prop="workPeople"
align="center"
src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+1 -1
View File
@@ -618,7 +618,7 @@ export default {
},
//流程提交事件
handleSubmit() {
let fileFlag
let fileFlag = true
this.dataList.forEach(item => {
if(!item.fileType){
fileFlag = false
src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
+6 -6
View File
@@ -470,13 +470,16 @@ export default {
getFormFieldList(item) {
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item));
let dataChildren = []
let dataListChildren = []
this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
let dataChildren = []
let dataListChildren = []
this.listForm.dataList.forEach(item => {
if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
this.dataList.push(item)
}
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
@@ -493,11 +496,9 @@ export default {
dataChildren.forEach((item,index) => {
dataListChildren = dataListChildren.concat(item)
})
dataListChildren = this.dataList.concat(dataListChildren)
this.dataList = dataListChildren
this.total = this.dataList.length;
// this.dataList = item.dataList;
// this.dataList.distributePerson = item.dataList[0].distributePerson;
// this.listForm.breakdownList = item.breakdownList;
});
},
//驳回事件
@@ -529,7 +530,6 @@ export default {
this.listForm.bzFlag = "1";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
console.log(json);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
+6 -6
View File
@@ -467,16 +467,18 @@ export default {
},
//动态表单读取
getFormFieldList(item) {
console.log(item);
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item));
let dataChildren = []
let dataListChildren = []
this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
let dataChildren = []
let dataListChildren = []
this.listForm.dataList.forEach(item => {
if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
this.dataList.push(item)
}
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
@@ -493,11 +495,9 @@ export default {
dataChildren.forEach((item,index) => {
dataListChildren = dataListChildren.concat(item)
})
dataListChildren = this.dataList.concat(dataListChildren)
this.dataList = dataListChildren
this.total = this.dataList.length;
// this.dataList = item.dataList;
// this.dataList.distributePerson = item.dataList[0].distributePerson;
// this.listForm.breakdownList = item.breakdownList;
});
},
//提交事件
src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
+6 -5
View File
@@ -470,13 +470,16 @@ export default {
getFormFieldList(item) {
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item));
let dataChildren = []
let dataListChildren = []
this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
let dataChildren = []
let dataListChildren = []
this.listForm.dataList.forEach(item => {
if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
this.dataList.push(item)
}
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
@@ -493,11 +496,9 @@ export default {
dataChildren.forEach((item,index) => {
dataListChildren = dataListChildren.concat(item)
})
dataListChildren = this.dataList.concat(dataListChildren)
this.dataList = dataListChildren
this.total = this.dataList.length;
// this.dataList = item.dataList;
// this.dataList.distributePerson = item.dataList[0].distributePerson;
// this.listForm.breakdownList = item.breakdownList;
});
},
//驳回事件
src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
+79 -72
View File
@@ -404,8 +404,6 @@ export default {
this.listForm.children = dataListChildren;
this.listForm.dataList = this.dataList;
const json = JSON.stringify(this.listForm);
console.log(json);
return;
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
@@ -423,7 +421,6 @@ export default {
},
//批量分发按钮
choiceZRRS(row, type, index) {
console.log(row);
this.selectedId = row.id || row.standId;
this.type = type;
if (type === 1) {
@@ -431,7 +428,11 @@ export default {
this.nodeList = [];
this.zrIndex = index;
this.zrType = type;
this.nodeList.push(row);
if (row.workPeopleId) {
this.nodeList = row.workPeopleId.split(",");
}else{
this.nodeList.push(row);
}
this.modalshowflag = true;
} else if (type === 2) {
// 批量
@@ -440,6 +441,11 @@ export default {
this.nodeList = [];
this.modalshowflag = true;
this.drawerTitle = "批量选择责任人";
this.selectList.forEach(item =>{
if(item.workPeopleId){
this.nodeList = item.workPeopleId.split(",");
}
})
} else {
this.$message.warning("请选择要分发的数据");
}
@@ -463,6 +469,75 @@ export default {
}
},
checkedRole(data) {
console.log(data);
var idList = "";
var nameList = "";
data.forEach(item => {
if (nameList.length > 0) {
nameList += ",";
idList += ",";
}
idList += item.id;
nameList += item.name;
});
//单选操作
if (this.type === 1) {
this.dataList.forEach(item => {
if(item.standId === this.selectedId){
item.workPeople = nameList || '请选择责任人'
item.workPeopleId = idList;
}
if (item.children) {
item.children.forEach(items => {
if (items.id === this.selectedId) {
items.workPeople = nameList;
items.workPeopleId = idList;
// this.$set(items,'workPeople',data[0].name)
//this.$set(items,'workPeopleId',data[0].id)
}
});
}
});
this.dataList = JSON.parse(JSON.stringify(this.dataList));
} else if (this.type === 2) {
this.selectList.forEach(item => {
this.dataList.map(items => {
if (item.standId === items.standId) {
items.workPeople = nameList || '请选择责任人'
items.workPeopleId = idList;
// this.$message.warning('您只能针对条款进行分发')
}
if (items.children) {
items.children.map(childrenItem => {
if (childrenItem.id === item.id) {
childrenItem.workPeople = nameList;
childrenItem.workPeopleId = idList;
}
});
}
});
});
this.dataList = JSON.parse(JSON.stringify(this.dataList));
} else if (this.type === 3) {
// console.log("529",this.workPeopleList)
for (let i = 0; i < this.workPeopleList.children.length; i++) {
this.workPeopleList.children[i].workPeople = data[0].name;
this.workPeopleList.children[i].workPeopleId = data[0].id;
// console.log(row.children[i].id)
// console.log(row.children[i].workPeople)
}
// items.children.map(childrenItem => {
//
// childrenItem.workPeople = data[0].name;
// childrenItem.workPeopleId = data[0].id;
// })
}
this.modalshowflag = false;
},
setChildren(children, type) {
// 编辑多个子层级
children.map(j => {
@@ -543,74 +618,6 @@ export default {
this.roleRow = this.$refs.tree.getCheckedNodes()[0];
}
},
checkedRole(data) {
var idList = "";
var nameList = "";
data.forEach(item => {
if (nameList.length > 0) {
nameList += ",";
idList += ",";
}
idList += item.id;
nameList += item.name;
});
//单选操作
if (this.type === 1) {
this.dataList.forEach(item => {
if(item.standId === this.selectedId){
item.workPeople = nameList;
item.workPeopleId = idList;
}
if (item.children) {
item.children.forEach(items => {
if (items.id === this.selectedId) {
items.workPeople = nameList;
items.workPeopleId = idList;
// this.$set(items,'workPeople',data[0].name)
//this.$set(items,'workPeopleId',data[0].id)
}
});
}
});
this.dataList = JSON.parse(JSON.stringify(this.dataList));
} else if (this.type === 2) {
this.selectList.forEach(item => {
this.dataList.map(items => {
if (item.standId === items.standId) {
items.workPeople = nameList;
items.workPeopleId = idList;
// this.$message.warning('您只能针对条款进行分发')
}
if (items.children) {
items.children.map(childrenItem => {
if (childrenItem.id === item.id) {
childrenItem.workPeople = nameList;
childrenItem.workPeopleId = idList;
}
});
}
});
});
this.dataList = JSON.parse(JSON.stringify(this.dataList));
} else if (this.type === 3) {
// console.log("529",this.workPeopleList)
for (let i = 0; i < this.workPeopleList.children.length; i++) {
this.workPeopleList.children[i].workPeople = data[0].name;
this.workPeopleList.children[i].workPeopleId = data[0].id;
// console.log(row.children[i].id)
// console.log(row.children[i].workPeople)
}
// items.children.map(childrenItem => {
//
// childrenItem.workPeople = data[0].name;
// childrenItem.workPeopleId = data[0].id;
// })
}
this.modalshowflag = false;
},
cancleUserInfo() {
this.modalshowflag = false;
}
src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+59 -114
View File
@@ -219,6 +219,7 @@
clearable
v-model="scope.row.completionTime"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择日期">
</el-date-picker>
</template>
@@ -451,7 +452,7 @@
></Role-tree>
<el-drawer
title="批量填写"
:visible.sync="modalshowflag"
:visible.sync="modalShowFlag"
:wrapperClosable="false"
size="800px">
<div class="demo-drawer-content">
@@ -522,36 +523,11 @@
clearable
v-model="batchEditForm.completionTime"
type="date"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择日期">
</el-date-picker>
</el-form-item>
<br>
<!-- <el-divider><span><b>在产产品</b></span></el-divider>-->
<!-- <el-formItem label="合规原因" class="add-form-item">-->
<!-- <el-input-->
<!-- v-model="batchEditForm.zcComplianceReasons"-->
<!-- placeholder="请输入合规原因"-->
<!-- ></el-input>-->
<!-- </el-formItem>-->
<!-- <el-form-item label="不合规项目" class="add-form-item">-->
<!-- <el-input-->
<!-- v-model="batchEditForm.zcNoCompliance"-->
<!-- placeholder="请输入不合规项目"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="不合规应对措施" class="add-form-item">-->
<!-- <el-input-->
<!-- v-model="batchEditForm.zcCountermeasures"-->
<!-- placeholder="请输入不合规应对措施"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="完成时间" class="add-form-item">-->
<!-- <el-date-picker-->
<!-- v-model="batchEditForm.zcCompletionTime"-->
<!-- type="date"-->
<!-- placeholder="选择日期">-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
</el-form>
</div>
<div class="demo-drawer-footer">
@@ -582,6 +558,7 @@ export default {
},
data() {
return {
comFlag: 0,
total: 0,
currentPage: 1,
pageSize: 20,
@@ -622,7 +599,7 @@ export default {
todoId: "",
showColumn: true,
drawerTitle: "", //drawer标题
modalshowflag: false, // drawer开关
modalShowFlag: false, // drawer开关
selectList: [],
treeData: [], // 人员数据
roleForm: {
@@ -640,20 +617,10 @@ export default {
listForm: {
projectNumber: "", //项目编号
projectName: "", //项目名称
dataList: [
{
complianceReasons: "",
zcComplianceReasons: ""
}
], //项目下的标准数据
dataList: [], //项目下的标准数据
children: [] //标准下的分解单数据
},
dataList: [
{
complianceReasons: "",
zcComplianceReasons: ""
}
], //展示的标准数据
dataList: [], //展示的标准数据
commentText: "", //审批意见
detailData: [], //流程历史数据
userId: this.$store.getters.userInfo.userId,
@@ -716,58 +683,21 @@ export default {
item.countermeasures = this.batchEditForm.countermeasures;
//完成时间
item.completionTime = this.batchEditForm.completionTime;
}else if(item.standId === items){
item.complianceReasons = this.batchEditForm.complianceReasons;
//不合规
item.noCompliance = this.batchEditForm.noCompliance;
//应对措施
item.countermeasures = this.batchEditForm.countermeasures;
//完成时间
item.completionTime = this.batchEditForm.completionTime;
}
});
});
// for (let a = 0; a < this.dataList.length; a++) {
// for (let b = 0; b < this.selectList.length; b++) {
// if (this.dataList[a].id === this.selectList[b]) {
// console.log('11');
// //合规
// this.dataList[a].complianceReasons = this.batchEditForm.complianceReasons
// //不合规
// this.dataList[a].noCompliance = this.batchEditForm.noCompliance
// //应对措施
// this.dataList[a].countermeasures = this.batchEditForm.countermeasures
// //完成时间
// this.dataList[a].completionTime = this.batchEditForm.completionTime
// //合规
// this.dataList[a].zcComplianceReasons = this.batchEditForm.zcComplianceReasons
// //不合规
// this.dataList[a].zcNoCompliance = this.batchEditForm.zcNoCompliance
// //应对措施
// this.dataList[a].zcCountermeasures = this.batchEditForm.zcCountermeasures
// //完成时间
// this.dataList[a].zcCompletionTime = this.batchEditForm.zcCompletionTime
// } else {
// for (let i = 0; i < this.dataList[a].children.length; i++) {
// if (this.dataList[a].children[i].id === this.selectList[b]) {
// //合规
// this.dataList[a].children[i].complianceReasons = this.batchEditForm.complianceReasons
// //不合规
// this.dataList[a].children[i].noCompliance = this.batchEditForm.noCompliance
// //应对措施
// this.dataList[a].children[i].countermeasures = this.batchEditForm.countermeasures
// //完成时间
// this.dataList[a].children[i].completionTime = this.batchEditForm.completionTime
// //合规
// this.dataList[a].children[i].zcComplianceReasons = this.batchEditForm.zcComplianceReasons
// //不合规
// this.dataList[a].children[i].zcNoCompliance = this.batchEditForm.zcNoCompliance
// //应对措施
// this.dataList[a].children[i].zcCountermeasures = this.batchEditForm.zcCountermeasures
// //完成时间
// this.dataList[a].children[i].zcCompletionTime = this.batchEditForm.zcCompletionTime
// }
// }
// }
//
// }
// }
this.modalshowflag = false;
this.modalShowFlag = false;
},
cancelBatchEditForm() {
this.modalshowflag = false;
this.modalShowFlag = false;
},
//批量编辑
batchEdit() {
@@ -780,15 +710,7 @@ export default {
this.batchEditForm.countermeasures = "";
//完成时间
this.batchEditForm.completionTime = "";
//合规
this.batchEditForm.zcComplianceReasons = "";
//不合规
this.batchEditForm.zcNoCompliance = "";
//应对措施
this.batchEditForm.zcCountermeasures = "";
//完成时间
this.batchEditForm.zcCompletionTime = "";
this.modalshowflag = true;
this.modalShowFlag = true;
} else {
this.$message.warning("请选择要编辑的数据");
}
@@ -871,6 +793,7 @@ export default {
},
//动态表单读取
getFormFieldList(item) {
console.log(item);
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item));
if (item.form === undefined) {
@@ -881,6 +804,9 @@ export default {
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
this.listForm.dataList.forEach(item => {
if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
this.dataList.push(item)
}
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
@@ -897,6 +823,7 @@ export default {
dataChildren.forEach((item,index) => {
dataListChildren = dataListChildren.concat(item)
})
dataListChildren = this.dataList.concat(dataListChildren)
this.dataList = dataListChildren
this.total = this.dataList.length;
} else {
@@ -904,6 +831,9 @@ export default {
let dataChildren = []
let dataListChildren = []
this.listForm.dataList.forEach(item => {
if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
this.dataList.push(item)
}
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
@@ -920,6 +850,7 @@ export default {
dataChildren.forEach((item,index) => {
dataListChildren = dataListChildren.concat(item)
})
dataListChildren = this.dataList.concat(dataListChildren)
this.dataList = dataListChildren
this.total = this.dataList.length;
// this.dataList = item.form.dataList[0].children;
@@ -964,31 +895,45 @@ export default {
this.isSubmit = false;
});
},
handlePrice(){
for (let i = 0; i < this.dataList.length; i++) {
if (this.dataList[i].complianceReasons !== '' || (this.dataList[i].noCompliance !== '' && this.dataList[i].countermeasures !== '' && this.dataList[i].completionTime !== undefined) || (this.dataList[i].complianceReasons === '' && this.dataList[i].noCompliance === '' && this.dataList[i].countermeasures === '' && this.dataList[i].completionTime === undefined)){
}else {
this.comFlag ++
}
}
},
//提交事件
handleSubmit() {
this.isSubmit = true;
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false;
}, e => {
});
this.handlePrice()
if(this.comFlag > 0) {
this.$message.warning('请填写完整的不符合项信息')
this.comFlag = 0
}else{
this.isSubmit = true;
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false;
}, e => {
});
}
},
//标准表格选择框改变
selectStandChange(data) {
this.selectList = [];
for (let i = 0; i < data.length; i++) {
this.selectList.push(data[i].id);
this.selectList.push(data[i].id || data[i].standId);
localStorage.setItem("selectList", JSON.stringify(this.selectList));
}
},
src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
+28 -26
View File
@@ -468,36 +468,38 @@ export default {
},
//动态表单读取
getFormFieldList(item) {
console.log(item);
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item));
this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
let dataChildren = []
let dataListChildren = []
this.listForm.dataList.forEach(item => {
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
this.$set(items, "standEnName", item.standEnName);
this.$set(items, "standYear", item.standYear);
this.$set(items, "standSort", item.standSort);
this.$set(items, "standNumber", item.standNumber);
let dataChildren = []
let dataListChildren = []
this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
this.listForm.dataList.forEach(item => {
if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
this.dataList.push(item)
}
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
this.$set(items, "standEnName", item.standEnName);
this.$set(items, "standYear", item.standYear);
this.$set(items, "standSort", item.standSort);
this.$set(items, "standNumber", item.standNumber);
}
})
})
})
this.listForm.dataList.forEach(item => {
dataChildren.push(item.children)
})
dataChildren.forEach((item,index) => {
dataListChildren = dataListChildren.concat(item)
})
this.dataList = dataListChildren
this.total = this.dataList.length;
// this.dataList = item.dataList;
// this.dataList.distributePerson = item.dataList[0].distributePerson;
// this.listForm.breakdownList = item.breakdownList;
this.listForm.dataList.forEach(item => {
dataChildren.push(item.children)
})
dataChildren.forEach((item,index) => {
dataListChildren = dataListChildren.concat(item)
})
dataListChildren = this.dataList.concat(dataListChildren)
this.dataList = dataListChildren
this.total = this.dataList.length;
});
},
//驳回事件
src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
+6 -5
View File
@@ -468,13 +468,16 @@ export default {
getFormFieldList(item) {
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item));
let dataChildren = []
let dataListChildren = []
this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
let dataChildren = []
let dataListChildren = []
this.listForm.dataList.forEach(item => {
if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
this.dataList.push(item)
}
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
@@ -491,11 +494,9 @@ export default {
dataChildren.forEach((item,index) => {
dataListChildren = dataListChildren.concat(item)
})
dataListChildren = this.dataList.concat(dataListChildren)
this.dataList = dataListChildren
this.total = this.dataList.length;
// this.dataList = item.dataList;
// this.dataList.distributePerson = item.dataList[0].distributePerson;
// this.listForm.breakdownList = item.breakdownList;
});
},
//驳回事件
src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
+6 -5
View File
@@ -470,13 +470,16 @@ export default {
getFormFieldList(item) {
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item));
let dataChildren = []
let dataListChildren = []
this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
let dataChildren = []
let dataListChildren = []
this.listForm.dataList.forEach(item => {
if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
this.dataList.push(item)
}
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
@@ -493,11 +496,9 @@ export default {
dataChildren.forEach((item,index) => {
dataListChildren = dataListChildren.concat(item)
})
dataListChildren = this.dataList.concat(dataListChildren)
this.dataList = dataListChildren
this.total = this.dataList.length;
// this.dataList = item.dataList;
// this.dataList.distributePerson = item.dataList[0].distributePerson;
// this.listForm.breakdownList = item.breakdownList;
});
},
//驳回事件
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+20 -12
View File
@@ -295,7 +295,7 @@
align="center"
label="标准号">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)">{{ scope.row.standNumber }}</a>
<a @click="handlePreview(scope.row)">{{ scope.row.standNumber || scope.row.lawsNumber || scope.row.standCode }}</a>
</template>
</el-table-column>
<el-table-column
@@ -305,7 +305,7 @@
width="260px"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a>
<a @click="handlePreview(scope.row)">{{ scope.row.standName || scope.row.lawsName }}</a>
</template>
</el-table-column>
<el-table-column
@@ -349,7 +349,7 @@
<template slot-scope="scope">
<span v-if="scope.row.zccssrqgj === null || scope.row.zccssrqgj === ''">
</span>
<span v-else>{{ scope.row.zccssrqgj.slice(0, 10) }}</span>
<!-- <span v-else>{{ scope.row.zccssrqgj.slice(0, 10) }}</span>-->
</template>
</el-table-column>
<el-table-column
@@ -361,7 +361,7 @@
<template slot-scope="scope">
<span v-if="scope.row.xcxssrqgj === null || scope.row.xcxssrqgj === ''">
</span>
<span v-else>{{ scope.row.xcxssrqgj.slice(0, 10) }}</span>
<!-- <span v-else>{{ scope.row.xcxssrqgj.slice(0, 10) }}</span>-->
</template>
</el-table-column>
<el-table-column
@@ -1267,6 +1267,7 @@ export default {
this.$message.warning('请勿添加重复数据')
} else {
this.sarAccessInfoList.push(item)
console.log('1270',this.sarAccessInfoList)
// this.$refs.accessTypeSelect.clearSelection()
this.$refs.entryTable.clearSelection()
this.$refs.searchTable.clearSelection()
@@ -1383,17 +1384,17 @@ export default {
let rowlist3 = []
for (let i = 0; i < this.sarAccessInfoList.length; i++) {
rowlist.push(this.sarAccessInfoList[i].id)
if (this.sarAccessInfoList[i].ssrq === null) {
if (this.sarAccessInfoList[i].ssrq === null || this.sarAccessInfoList[i].ssrq === undefined) {
rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
} else {
rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
}
if (this.sarAccessInfoList[i].xcxssrqgj === null) {
if (this.sarAccessInfoList[i].xcxssrqgj === null || this.sarAccessInfoList[i].xcxssrqgj === undefined) {
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
} else {
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
}
if (this.sarAccessInfoList[i].zccssrqgj === null) {
if (this.sarAccessInfoList[i].zccssrqgj === null || this.sarAccessInfoList[i].zccssrqgj === undefined) {
rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
} else {
rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
@@ -1712,14 +1713,21 @@ export default {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.standType = 'INLAND'
this.selectPage()
} else {
} else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') {
this.sarAccessInfoSearch.standType = 'FOREIGN'
this.selectPage()
this.pageInfo()
}else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS') {
this.sarAccessInfoSearch.standType = 'LAWS'
this.pageInfo()
}else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS') {
this.sarAccessInfoSearch.standType = 'BUSINESS'
this.pageInfo()
}
},
// 数据搜索table判断checked状态
selectable(row) {
return row.isRelateAccess === '1'
console.log('1723',row)
return row.isRelateAccess === '1' || row.isRelateAccess === undefined
},
// 数据搜索 table select事件
sarAccessInfoSearchSelect(val) {
@@ -2257,9 +2265,9 @@ export default {
}, res => {
this.sarAccessInfoList = res.data.records
this.sarAccessInfoList.forEach(item => {
if (item.standYear === null) {
if (item.standYear === null && item.standType !== null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
} else {
} else if (item.standYear !== null && item.standType !== null){
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
if (item.attrInfoMap === null) {
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+149 -58
View File
@@ -166,7 +166,7 @@
align="center"
label="标准号">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber || scope.row.lawsNumber || scope.row.standCode}}</a>
</template>
</el-table-column>
<el-table-column
@@ -175,7 +175,7 @@
label="标准名称"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName || scope.row.lawsName}}</a>
</template>
</el-table-column>
<el-table-column
@@ -193,7 +193,8 @@
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
<span v-if="scope.row.xcxssrqgj">{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
<span v-else-if="scope.row.putTime">{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column
@@ -213,7 +214,7 @@
width="120px"
label="文本状态">
<template slot-scope="scope">
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
<span>{{ textStatusMap[scope.row.textStatus] || scope.row.standStatusShow}}</span>
</template>
</el-table-column>
</el-table>
@@ -269,7 +270,7 @@
fixed="left"
label="标准号">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber || scope.row.lawsNumber || scope.row.standCode}}</a>
</template>
</el-table-column>
<el-table-column
@@ -279,7 +280,7 @@
width="260px"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName || scope.row.lawsName}}</a>
</template>
</el-table-column>
<el-table-column
@@ -323,7 +324,7 @@
<template slot-scope="scope">
<span v-if="scope.row.zccssrqgj === null || scope.row.zccssrqgj === ''">
</span>
<span v-else>{{ scope.row.zccssrqgj.slice(0,10) }}</span>
<!-- <span v-else>{{ scope.row.zccssrqgj.slice(0,10) }}</span>-->
</template>
</el-table-column>
<el-table-column
@@ -335,7 +336,7 @@
<template slot-scope="scope">
<span v-if="scope.row.xcxssrqgj === null || scope.row.xcxssrqgj === ''">
</span>
<span v-else>{{ scope.row.xcxssrqgj.slice(0,10) }}</span>
<!-- <span v-else>{{ scope.row.xcxssrqgj.slice(0,10) }}</span>-->
</template>
</el-table-column>
<el-table-column
@@ -647,8 +648,8 @@ export default {
dataSourceOptions: [
{value: 'INLAND_STAND', label: '国内标准法规'},
{value: 'FOREIGN_STAND', label: '海外标准法规'},
// {value: 'FOREIGN_LAWS', label: '国内外政策'},
// {value: 'BUSINESS', label: '企业标准 '},
{value: 'FOREIGN_LAWS', label: '国内外政策'},
{value: 'BUSINESS', label: '企业标准 '},
// {value: 'TEMP', label: '标准法规清单 '}
],
// 新增、编辑 数据搜索字段
@@ -1096,6 +1097,66 @@ export default {
}
]
// 国内外政策可查字段
}else if (val === 'FOREIGN_LAWS'){
this.twoOptions=[
{
label: '适用车辆类型',
value: 'SYCLLX',
type: 'SEL_OPTION',
disabled: false
}, {
label: '政策编号',
value: 'LAWS_NUMBER',
type: 'INPUT',
disabled: false
}, {
label: '中文名称',
value: 'LAWS_NAME',
type: 'INPUT',
disabled: false
}, {
label: '英文名称',
value: 'LAWS_EN_NAME',
type: 'INPUT',
disabled: false
}, {
label: '个性化标签',
value: 'GXHBQXX',
type: 'SEL_OPTION',
disabled: false
}, {
label: '新车型实施日期(文本)',
value: 'XCXSSRQ',
type: 'DATE_PIC_OPTS',
disabled: false
}, {
label: '在产车实施日期(文本)',
value: 'ZCCSSRQ',
type: 'DATE_PIC_OPTS',
disabled: false
}, {
label: '维护工程师',
value: 'ZCGCS',
type: 'SEL_OPTION',
selVal: "USERLIST",
disabled: false
}
]
// 标准法规清单可查字段
}else {
this.twoOptions=[
{
label: '清单名称',
value: 'ACCESS_CONTENT',
type: 'INPUT',
disabled: false
}, {
label: '国家地区',
value: 'COUNTRY',
type: 'SEL_OPTION',
disabled: false
}
]
}
},
/**
@@ -1258,19 +1319,19 @@ export default {
let rowlist3 = []
for (let i = 0; i < this.sarAccessInfoList.length; i++) {
rowlist.push(this.sarAccessInfoList[i].id)
if (this.sarAccessInfoList[i].ssrq === null) {
if (this.sarAccessInfoList[i].ssrq === null || this.sarAccessInfoList[i].ssrq === undefined) {
rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
}else {
} else {
rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
}
if (this.sarAccessInfoList[i].xcxssrqgj === null) {
if (this.sarAccessInfoList[i].xcxssrqgj === null || this.sarAccessInfoList[i].xcxssrqgj === undefined) {
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
}else {
} else {
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
}
if (this.sarAccessInfoList[i].zccssrqgj === null) {
if (this.sarAccessInfoList[i].zccssrqgj === null || this.sarAccessInfoList[i].zccssrqgj === undefined) {
rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
}else {
} else {
rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
}
}
@@ -1433,52 +1494,76 @@ export default {
// })
// },
pageInfo() {
StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{
this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
if (item.attrInfoMap === null) {
this.$set(item, 'zccssrqgj', '')
this.$set(item, 'xcxssrqgj', '')
this.$set(item, 'ssrq', '')
this.$set(item, 'sycpx', '')
this.$set(item, 'typeApplicable', '')
this.$set(item, 'nylx', '')
this.$set(item, 'zrbm', '')
this.$set(item, 'cycvppsbm', '')
this.$set(item, 'cycvppscn', '')
this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
}else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
}
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') {
StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
if (item.attrInfoMap === null) {
this.$set(item, 'zccssrqgj', '')
this.$set(item, 'xcxssrqgj', '')
this.$set(item, 'ssrq', '')
this.$set(item, 'sycpx', '')
this.$set(item, 'typeApplicable', '')
this.$set(item, 'nylx', '')
this.$set(item, 'zrbm', '')
this.$set(item, 'cycvppsbm', '')
this.$set(item, 'cycvppscn', '')
this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
} else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
}
})
this.drawerTotal = res.data.count
}, e => {
})
this.drawerTotal = res.data.count
}, e => {
})
}else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS'){
this.$http.get('lawss/sarLawsInfo/page', this.sarAccessInfoSearch, {
_this: this,
}, res => {
console.log('1640',res)
this.sarAccessInfoSearchList = res.data.list
}, e => {
})
}else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS'){
this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.sarAccessInfoSearch, {
_this: this,
}, res => {
console.log('1648',res)
this.sarAccessInfoSearchList = res.data.list
}, e => {
})
}
},
// 查询数据搜索 table 数据
selectLawsStands () {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.standType = 'INLAND'
this.pageInfo()
} else {
} else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') {
this.sarAccessInfoSearch.standType = 'FOREIGN'
this.pageInfo()
}else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS') {
this.sarAccessInfoSearch.standType = 'LAWS'
this.pageInfo()
}else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS') {
this.sarAccessInfoSearch.standType = 'BUSINESS'
this.pageInfo()
}
},
selectPage() {
@@ -1525,14 +1610,20 @@ export default {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.standType = 'INLAND'
this.selectPage()
} else {
} else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') {
this.sarAccessInfoSearch.standType = 'FOREIGN'
this.selectPage()
this.pageInfo()
}else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS') {
this.sarAccessInfoSearch.standType = 'LAWS'
this.pageInfo()
}else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS') {
this.sarAccessInfoSearch.standType = 'BUSINESS'
this.pageInfo()
}
},
// 数据搜索table判断checked状态
selectable (row) {
return row.isRelateAccess === '1'
return row.isRelateAccess === '1' || row.isRelateAccess === undefined
},
// 数据搜索 table select事件
sarAccessInfoSearchSelect (val) {
@@ -2071,9 +2162,9 @@ export default {
}, res => {
this.sarAccessInfoList = res.data.records
this.sarAccessInfoList.forEach(item => {
if (item.standYear === null) {
if (item.standYear === null && item.standType !== null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
} else {
} else if (item.standYear !== null && item.standType !== null){
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
if (item.attrInfoMap === null) {
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+134 -43
View File
@@ -211,7 +211,7 @@
width="180px"
label="标准号">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber || scope.row.lawsNumber || scope.row.standCode}}</a>
</template>
</el-table-column>
<el-table-column
@@ -220,7 +220,7 @@
label="标准名称"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName || scope.row.lawsName}}</a>
</template>
</el-table-column>
<el-table-column
@@ -250,7 +250,8 @@
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
<span v-if="scope.row.xcxssrqgj">{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
<span v-else-if="scope.row.putTime">{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column
@@ -270,7 +271,7 @@
align="center"
label="文本状态">
<template slot-scope="scope">
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
<span>{{ textStatusMap[scope.row.textStatus] || scope.row.standStatusShow}}</span>
</template>
</el-table-column>
</el-table>
@@ -327,7 +328,7 @@
align="center"
label="标准号">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a>
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber || scope.row.lawsNumber || scope.row.standCode}}</a>
</template>
</el-table-column>
<el-table-column
@@ -337,7 +338,7 @@
width="260px"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName || scope.row.lawsName }}</a>
</template>
</el-table-column>
<el-table-column
@@ -381,7 +382,7 @@
<template slot-scope="scope">
<span v-if="scope.row.zccssrqgj === null || scope.row.zccssrqgj === ''">
</span>
<span v-else>{{ scope.row.zccssrqgj.slice(0, 10) }}</span>
<!-- <span v-else>{{ scope.row.zccssrqgj.slice(0, 10) }}</span>-->
</template>
</el-table-column>
<el-table-column
@@ -393,7 +394,7 @@
<template slot-scope="scope">
<span v-if="scope.row.xcxssrqgj === null || scope.row.xcxssrqgj === ''">
</span>
<span v-else>{{ scope.row.xcxssrqgj.slice(0, 10) }}</span>
<!-- <span v-else>{{ scope.row.xcxssrqgj.slice(0, 10) }}</span>-->
</template>
</el-table-column>
<el-table-column
@@ -719,8 +720,8 @@ export default {
dataSourceOptions: [
{value: 'INLAND_STAND', label: '国内标准法规'},
{value: 'FOREIGN_STAND', label: '海外标准法规'},
// {value: 'FOREIGN_LAWS', label: '国内外政策'},
// {value: 'BUSINESS', label: '企业标准 '},
{value: 'FOREIGN_LAWS', label: '国内外政策'},
{value: 'BUSINESS', label: '企业标准 '},
// {value: 'TEMP', label: '标准法规清单 '}
],
// 新增、编辑 数据搜索字段
@@ -1096,6 +1097,66 @@ export default {
} else if (val === 'FOREIGN_STAND') {
this.selectLawsStands()
// 国内外政策可查字段
}else if (val === 'FOREIGN_LAWS'){
this.twoOptions=[
{
label: '适用车辆类型',
value: 'SYCLLX',
type: 'SEL_OPTION',
disabled: false
}, {
label: '政策编号',
value: 'LAWS_NUMBER',
type: 'INPUT',
disabled: false
}, {
label: '中文名称',
value: 'LAWS_NAME',
type: 'INPUT',
disabled: false
}, {
label: '英文名称',
value: 'LAWS_EN_NAME',
type: 'INPUT',
disabled: false
}, {
label: '个性化标签',
value: 'GXHBQXX',
type: 'SEL_OPTION',
disabled: false
}, {
label: '新车型实施日期(文本)',
value: 'XCXSSRQ',
type: 'DATE_PIC_OPTS',
disabled: false
}, {
label: '在产车实施日期(文本)',
value: 'ZCCSSRQ',
type: 'DATE_PIC_OPTS',
disabled: false
}, {
label: '维护工程师',
value: 'ZCGCS',
type: 'SEL_OPTION',
selVal: "USERLIST",
disabled: false
}
]
// 标准法规清单可查字段
}else {
this.twoOptions=[
{
label: '清单名称',
value: 'ACCESS_CONTENT',
type: 'INPUT',
disabled: false
}, {
label: '国家地区',
value: 'COUNTRY',
type: 'SEL_OPTION',
disabled: false
}
]
}
},
/**
@@ -1258,17 +1319,17 @@ export default {
let rowlist3 = []
for (let i = 0; i < this.sarAccessInfoList.length; i++) {
rowlist.push(this.sarAccessInfoList[i].id)
if (this.sarAccessInfoList[i].ssrq === null) {
if (this.sarAccessInfoList[i].ssrq === null || this.sarAccessInfoList[i].ssrq === undefined) {
rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
} else {
rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
}
if (this.sarAccessInfoList[i].xcxssrqgj === null) {
if (this.sarAccessInfoList[i].xcxssrqgj === null || this.sarAccessInfoList[i].xcxssrqgj === undefined) {
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
} else {
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
}
if (this.sarAccessInfoList[i].zccssrqgj === null) {
if (this.sarAccessInfoList[i].zccssrqgj === null || this.sarAccessInfoList[i].zccssrqgj === undefined) {
rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
} else {
rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
@@ -1542,41 +1603,65 @@ export default {
},
// 查询数据搜索 table 数据
pageInfo() {
StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
this.sarAccessInfoSearchList = res.data.list
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'){
StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
this.sarAccessInfoSearchList = res.data.list
//为空转换
for (let i = 0; i < this.sarAccessInfoSearchList.length; i++) {
//适用车型为空
if (this.sarAccessInfoSearchList[i].attrInfoMap.CLLX === '[]'){
this.sarAccessInfoSearchList[i].attrInfoMap.CLLX = null
//为空转换
for (let i = 0; i < this.sarAccessInfoSearchList.length; i++) {
//适用车型为空
if (this.sarAccessInfoSearchList[i].attrInfoMap.CLLX === '[]'){
this.sarAccessInfoSearchList[i].attrInfoMap.CLLX = null
}
//适用认证为空
if (this.sarAccessInfoSearchList[i].attrInfoMap.SYRZ === '[]'){
this.sarAccessInfoSearchList[i].attrInfoMap.SYRZ = null
}
}
//适用认证为空
if (this.sarAccessInfoSearchList[i].attrInfoMap.SYRZ === '[]'){
this.sarAccessInfoSearchList[i].attrInfoMap.SYRZ = null
}
}
this.sarAccessInfoSearchList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
this.addWord(item)
this.sarAccessInfoSearchList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
} else {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
this.addWord(item)
})
this.changeText(this.sarAccessInfoSearchList)
this.drawerTotal = res.data.count
}, e => {
})
this.changeText(this.sarAccessInfoSearchList)
this.drawerTotal = res.data.count
}, e => {
})
}else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS'){
this.$http.get('lawss/sarLawsInfo/page', this.sarAccessInfoSearch, {
_this: this,
}, res => {
console.log('1640',res)
this.sarAccessInfoSearchList = res.data.list
}, e => {
})
}else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS'){
this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.sarAccessInfoSearch, {
_this: this,
}, res => {
console.log('1648',res)
this.sarAccessInfoSearchList = res.data.list
}, e => {
})
}
},
// 查询按钮
selectLawsStands() {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.standType = 'INLAND'
this.pageInfo()
} else {
} else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') {
this.sarAccessInfoSearch.standType = 'FOREIGN'
this.pageInfo()
}else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS') {
this.sarAccessInfoSearch.standType = 'LAWS'
this.pageInfo()
}else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS') {
this.sarAccessInfoSearch.standType = 'BUSINESS'
this.pageInfo()
}
},
/** 高级查询查询按钮*/
@@ -1601,14 +1686,20 @@ export default {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfo.standType = 'INLAND'
this.selectPage()
} else {
this.sarAccessInfo.standType = 'FOREIGN'
this.selectPage()
} else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') {
this.sarAccessInfoSearch.standType = 'FOREIGN'
this.pageInfo()
}else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS') {
this.sarAccessInfoSearch.standType = 'LAWS'
this.pageInfo()
}else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS') {
this.sarAccessInfoSearch.standType = 'BUSINESS'
this.pageInfo()
}
},
// 数据搜索table判断checked状态
selectable(row) {
return row.isRelateAccess === '1'
return row.isRelateAccess === '1' || row.isRelateAccess === undefined
},
// 数据搜索 table select事件
sarAccessInfoSearchSelect(val) {
@@ -2058,9 +2149,9 @@ export default {
}
this.sarAccessInfoList.forEach(item => {
if (item.standYear === null) {
if (item.standYear === null && item.standType !== null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
} else {
} else if (item.standYear !== null && item.standType !== null){
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
})
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+81 -6
View File
@@ -308,7 +308,7 @@
</el-table-column>
<el-table-column fixed="right"
v-if="isPermission('cac1eb379eb8e3b987cbb2e4599adb50,247cebaefa7cf1683092af160af11502,dbaf9df2990a595c8abea28e68b1a681')>0"
label="收藏" align="center" width="200"
label="收藏" align="center" width="50px"
>
<template slot-scope="scope">
<div
@@ -409,7 +409,7 @@
<!-- 新增样式 -->
<div class="demo-drawer-content">
<el-form
v-if="reloadAddForm"
v-if="reloadAddForm && modalshowflag"
ref="sarStandardsInfoForm"
:model="sarStandardsInfoEO"
:rules="sarStandardsInfoRules"
@@ -698,7 +698,6 @@
:disabled="formdisableflag"
></custom-textarea>
</template>
<!-- 起草单位-->
<template v-else-if="field.attrType === 'SEL_OPTION'">
<template>
<custom-select
@@ -717,7 +716,6 @@
class="add-form-item"
>
<template slot="label">责任部门</template>
<el-input
:key="field.attrField"
:config="field"
@@ -766,6 +764,34 @@
<!-- </el-input>-->
</el-form-item>
</template>
<template v-else-if="field.attrField === 'QCDW'">
<el-form-item
prop="QCDW"
label-width="150px"
class="add-form-item"
>
<template slot="label">起草单位</template>
<div style="display: flex;justify-content: space-between;align-items: center;">
<el-tooltip class="item" effect="dark" :content="sarStandardsInfoEO['QCDW']" placement="top-start">
<el-input
:key="field.attrField"
:config="field"
clearable
v-model="sarStandardsInfoEO['QCDW']"
:disabled="formdisableflag" placeholder="选择或输入起草单位">
</el-input>
</el-tooltip>
<div>
<el-button
size="mini"
type="primary"
@click="QCDWClick(field.options)"
class="common-button-primary">手动查找</el-button>
</div>
</div>
<!-- @click.native="choiceZRBM('QCDWId', '起草单位', sarStandardsInfoEO.QCDWId)">-->
</el-form-item>
</template>
<template v-else>
<custom-select-array
:key="field.attrField"
@@ -1887,10 +1913,31 @@
<loading :loading="OCRLoading">数据加载中……</loading>
<div class="demo-drawer-footer">
<el-button size="mini" @click="OCRclose">取消</el-button>
<el-button type="primary" size="mini" @click="OCRsubmit">转换</el-button>
<el-button type="primary" :loading="OCRSubmitLoading" size="mini" @click="OCRsubmit">{{ OCRSubmitButton }}</el-button>
</div>
</div>
</el-drawer>
<el-dialog
:visible.sync="QCDWmodal"
width="500px"
title="选择起草部门"
destroy-on-close
:close-on-click-modal="false"
@closed="QCDWmodal = false">
<el-select v-model="QCDWValue" multiple filterable placeholder="请选择" style="width: 100%;">
<el-option
v-for="item in QCDWList"
:key="item.value"
:label="item.label"
:value="item.label">
</el-option>
</el-select>
<div slot="footer" class="demo-drawer-footer">
<el-button size="mini" type="primary" class="common-button-default" icon="el-icon-check"
@click="QCDWOK">确认
</el-button>
</div>
</el-dialog>
</div>
</template>
@@ -1947,6 +1994,11 @@ export default {
},
data() {
return {
QCDWValue: [],
QCDWmodal: false,
QCDWList: [],
OCRSubmitLoading: false,
OCRSubmitButton: '',
OCRType: '',
OCRoptions: [],
OCRDatas: [],
@@ -2649,6 +2701,21 @@ export default {
}
},
methods: {
QCDWOK() {
let arr1 = []
if (this.sarStandardsInfoEO['QCDW']) {
let str = this.sarStandardsInfoEO['QCDW'].replace(/，/g, ',')
arr1 = str.split(',')
}
let arr2 = arr1.concat(this.QCDWValue)
this.sarStandardsInfoEO['QCDW'] = Array.from(new Set(arr2)).join(',')
this.QCDWmodal = false
},
QCDWClick(row) {
this.QCDWValue = []
this.QCDWmodal = true
this.QCDWList = row
},
setWBType(type) {
let text = ''
for (let a = 0; a < this.OCRoptions.length; a++) {
@@ -2671,6 +2738,7 @@ export default {
} else if (this.OCRDatas.length === 0) {
this.$message.warning('请选择一个文件')
} else {
this.OCRSubmitLoading = true
if (this.OCRType === '0') {
let json = {
standNumber: this.ocrList[0].standYear ? this.ocrList[0].standSortShow + ' ' + this.ocrList[0].standNumber + '-' + this.ocrList[0].standYear : this.ocrList[0].standSortShow + ' ' + this.ocrList[0].standNumber,
@@ -2687,6 +2755,7 @@ export default {
},
(res) => {
this.OCRModel = false
this.OCRSubmitLoading = false
if (res.ok) {
this.$message.success('OCR实别成功')
} else {
@@ -2698,13 +2767,15 @@ export default {
} else if (this.OCRType === '1') {
let splitEo = {}
splitEo.standId = this.OCRDatas[0].standId
splitEo.fileType = this.setWBType(this.OCRDatas[0].standFileClassify)
splitEo.fileType = this.OCRDatas[0].standFileClassify
// splitEo.fileType = this.setWBType(this.OCRDatas[0].standFileClassify)
splitEo.attId = this.OCRDatas[0].attId
splitEo.fileName = this.OCRDatas[0].fileName
this.$http.postData('lawss/sarFileSplitInfo/fileSplit', splitEo, {
_this: this
}, res => {
this.OCRModel = false
this.OCRSubmitLoading = false
if (res.ok) {
this.$message.success('拆分成功')
} else {
@@ -2720,12 +2791,15 @@ export default {
if (type === '0') {
text = 'OCR识别'
this.OCRTitle = '选择OCR识别文件'
this.OCRSubmitButton = '转换'
} else if (type === '1') {
text = '拆分'
this.OCRTitle = '选择拆分文件'
this.OCRSubmitButton = '拆分'
} else if (type === '2') {
text = '编辑'
this.OCRTitle = '选择编辑文件'
}
if (this.ocrList.length > 1 && (type === '0' || type === '1' || type === '2')) {
this.$message.warning('仅能选择一条数据进行' + text)
@@ -3239,6 +3313,7 @@ export default {
})
})
this.dynamicFormField = displayLocation
console.log(this.dynamicFormField);
this.loading = false
})
})
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+5 -4
View File
@@ -477,13 +477,12 @@
<!-- 新增样式 -->
<div class="demo-drawer-content">
<el-form
v-if="reloadAddForm"
v-if="reloadAddForm && modalshowflag"
ref="sarBussionessStandForm"
:model="sarBussionessStandEO"
:rules="sarBussionessStandRules"
class="label-input-form"
>
<!-- <custom-input-for-standards-->
<!-- :config="{-->
<!-- attrName: '代替企标编号',-->
@@ -511,12 +510,12 @@
</el-form-item>
<el-form-item
label="企标编号"
prop="standCode"
prop="standNumber"
label-width="150px"
class="add-form-item"
>
<el-input
v-model="sarBussionessStandEO.standCode"
v-model="sarBussionessStandEO.standNumber"
:maxlength="100"
placeholder="请输入企标编号"
clearable
@@ -1212,6 +1211,7 @@
>
<div class="demo-drawer-content">
<el-form :model="productModelAdd"
v-if="productModal"
ref="productModelAdd"
:rules="productRules"
class="label-input-form"
@@ -2993,6 +2993,7 @@ export default {
if (nowstandinfo.firstPutTime != null && nowstandinfo.firstPutTime !== '') {
nowstandinfo.firstPutTime = this.$dateFormat(this.sarBussionessStandEO.firstPutTime, 'yyyy-MM-dd hh:mm:ss')
}
nowstandinfo.standCode = nowstandinfo.standSort + ' ' + nowstandinfo.standNumber + ( nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear)
this.$http.postData('lawss/sarBussionessStand/updateSarBussionessStand', nowstandinfo, {
_this: this,
loading: 'isSubmit'
src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
+1 -1
View File
@@ -355,7 +355,7 @@
<!-- 新增样式 -->
<div class="demo-drawer-content">
<el-form
v-if="reloadAddForm"
v-if="reloadAddForm && modalshowflag"
ref="sarLawsStandEO"
:model="sarLawsStandEO"
:rules="sarLawsStandRules"
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+6 -7
View File
@@ -770,7 +770,7 @@
<!-- 新增样式 -->
<div class="demo-drawer-content">
<el-form
v-if="reloadAddForm"
v-if="reloadAddForm && modalshowflag"
ref="sarStandardsInfoForm"
:model="sarStandardsInfoEO"
:rules="sarStandardsInfoRules"
@@ -932,14 +932,14 @@
:disabled="formdisableflag"
></custom-SVPPS>
</template>
<template v-else-if="field.attrField === 'XCXSSRQ' || field.attrField === 'ZCCSSRQ'">
<custom-date-pick
<template v-else-if="field.attrField === 'XCXSSRQ' || field.attrField === 'ZCCSSRQ' || field.attrField === 'SSRQ'">
<custom-date-pick-group
v-if="field.attrField !== 'ZCCSSRQGJ' && field.attrField !== 'XCXSSRQGJ' && field.attrField !== 'SSRQGJ' "
:key="field.attrField"
:config="field"
v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag"
></custom-date-pick>
></custom-date-pick-group>
</template>
<template v-else-if="field.attrType === 'DATE_PIC_OPTS'">
<custom-date-pick-group
@@ -4272,7 +4272,6 @@ export default {
}
})
} else if (this.ocrList.length === 1 && type === '2'){
console.log('4228',this.ocrList)
this.selectStandardPro(this.ocrList[0], 'edit')
}
},
@@ -4895,14 +4894,14 @@ export default {
let idList = ''
let nameList = ''
data.forEach(item => {
if (item.hasChild === '0' && item.children === null) {
// if (item.hasChild === '0' && item.children === null) {
if (nameList.length > 0) {
nameList += ','
idList += ','
}
idList += item.id
nameList += item.name
}
// }
})
this.sarStandardsInfoEO.ZRBMId = idList;
this.sarStandardsInfoEO['ZRBM'] = nameList;
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+1 -1
View File
@@ -161,7 +161,7 @@
<template slot-scope="scope">
<!-- <el-button @click="changeState(scope.row)">符合性状态</el-button>-->
<div class="table-jump" @click="changeState(scope.row)">
<div v-if="scope.row.sarState === 0">符合</div>
<div v-if="scope.row.unCount === 0">符合</div>
<div v-else >不符合</div>
</div>
</template>
src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+209 -172
View File
@@ -115,7 +115,8 @@
<el-table-column
prop="standName"
fixed="left"
width="180"
width="200"
show-overflow-tooltip
label="标准名称">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
@@ -123,22 +124,19 @@
</el-table-column>
<el-table-column
prop="itemsNum"
width="180"
width="75"
label="条款号">
</el-table-column>
<el-table-column
prop="itemsName"
width="180"
show-overflow-tooltip
label="条款名称">
</el-table-column>
<el-table-column
prop="productType"
width="180"
width="100"
label="产品类型">
<template slot-scope="scope">
<div v-if="scope.row.productType === 'research'">在研</div>
<div v-if="scope.row.productType === 'product'">在产</div>
</template>
</el-table-column>
<el-table-column
prop="productLine"
@@ -148,6 +146,7 @@
<el-table-column
prop="productName"
width="180"
show-overflow-tooltip
label="项目名称">
</el-table-column>
<el-table-column
@@ -158,21 +157,24 @@
<el-table-column
prop="responsibleUnit"
width="180"
show-overflow-tooltip
label="责任部门">
</el-table-column>
<el-table-column
prop="dutyEngineer"
width="150"
width="100"
label="责任工程师">
</el-table-column>
<el-table-column
prop="authEngineer"
width="150"
show-overflow-tooltip
label="认证工程师">
</el-table-column>
<el-table-column
prop="qaEngineer"
width="150"
show-overflow-tooltip
label="质量工程师">
</el-table-column>
<el-table-column
@@ -414,7 +416,7 @@
ref="addForm">
<el-form-item prop="productName" label="项目名称" style="width: 100%; margin-right:10px"
class="add-form-item">
<el-select v-model="addForm.productName"@change="handleChange" placeholder="请选择项目名称">
<el-select v-model="addForm.productName" filterable @change="handleChange" placeholder="请选择项目名称">
<el-option
v-for="item in ProjectDatas"
:key="item.id"
@@ -423,13 +425,21 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item prop="projectNumber" label="项目编号" style="width: 100%; margin-right:10px"
class="add-form-item">
<el-input
:disabled="true"
v-model="addForm.projectNumber"
placeholder="请输入项目编号"
/>
</el-form-item>
<el-form-item prop="productType" label="产品类型" style="width: 100%; margin-right:10px"
class="add-form-item">
<el-input
:disabled="true"
v-model="addForm.productType"
placeholder="请输入产品类型"
:maxlength="500" />
/>
</el-form-item>
<el-form-item prop="productLine" label="产品线" style="width: 100%; margin-right:10px"
class="add-form-item">
@@ -437,12 +447,13 @@
:disabled="true"
v-model="addForm.productLine"
placeholder="请输入产品线"
:maxlength="500" />
/>
</el-form-item>
<el-form-item prop="standSerialNumber" label="标准号" style="width: 100%; margin-right:10px"
class="add-form-item">
<el-select
v-model="addForm.standSerialNumber"
filterable
:disabled="serialNumber"
@change="standChange"
placeholder="请选择标准号">
@@ -460,7 +471,7 @@
:disabled="true"
v-model="addForm.standName"
placeholder="请输入标准名称"
:maxlength="500" />
/>
</el-form-item>
<el-form-item prop="itemsNum" label="条款号" style="width: 100%; margin-right:10px"
class="add-form-item add-input">
@@ -480,10 +491,10 @@
<el-form-item prop="responsibleUnit" label="责任部门" style="width: 100%; margin-right:10px"
class="add-form-item">
<el-input
:disabled="true"
v-model="addForm.responsibleUnit"
placeholder="请输入责任部门"
:maxlength="500" />
@click.native="choiceZRBM"
/>
</el-form-item>
<el-form-item prop="reason" label="不合规项目" style="width: 100%; margin-right:10px"
class="add-form-item">
@@ -497,21 +508,24 @@
<el-input
v-model="addForm.dutyEngineer"
placeholder="请输入责任工程师"
:maxlength="500" />
@click.native="choiceZRR"
/>
</el-form-item>
<el-form-item prop="authEngineer" label="认证工程师" style="width: 100%; margin-right:10px"
class="add-form-item">
<el-input
v-model="addForm.authEngineer"
placeholder="请输入认证工程师"
:maxlength="500" />
@click.native="choiceMore('authEngineer','选择认证工程师',addForm.authEngineer)"
/>
</el-form-item>
<el-form-item prop="qaEngineer" label="质量工程师" style="width: 100%; margin-right:10px"
class="add-form-item">
<el-input
v-model="addForm.qaEngineer"
placeholder="请输入质量工程师"
:maxlength="500" />
@click.native="choiceMore('qaEngineer','选择质量工程师',addForm.qaEngineer)"
/>
</el-form-item>
<el-form-item prop="planCloseTime" label="计划关闭时间" style="width: 100%; margin-right:10px"
class="add-form-item">
@@ -534,6 +548,7 @@
class="common-button-primary"
icon="el-icon-check"
type="primary"
:loading="submiting"
@click="submit">提交
</el-button>
<el-button
@@ -544,6 +559,25 @@
</el-button>
</div>
</el-drawer>
<Role-tree
check-box
is-title="选择责任工程师"
:is-visible.sync="roleShowflag"
:nodeList="nodeList"
@checkedRole="drawerCheck"
/>
<Role-tree
:is-title="titleMore"
:is-visible.sync="roleShowMore"
:nodeList="nodeListMore"
@checkedRole="drawerMore"
/>
<MechanismTree
is-title="选择部门信息"
:is-visible.sync="modalshowflagZRBM"
:nodeList="nodeListZRBM"
@checkedRole="drawerCheckZRBM"
/>
</div>
</template>
@@ -557,32 +591,16 @@ export default {
return {
loading: false,
nonList: [], //未符合项表格数据
projectModel: false, //项目弹窗
listModel: false, //标准弹窗
itemModel: false, //条款弹窗
replaceLoading: false,
//项目检索条件
projectSearch: {
projectNumber: "",
projectName: ""
},
//项目数据
ProjectDatas: [],
itemsData: [],
standList: [],
selectItems: [],
dataList: [],
standPage: 1,
standPageSize: this.$store.getters.userInfo.configContent,
standTotal: 0,
replacePage: 1,
replacePageSize: this.$store.getters.userInfo.configContent,
replaceTotal: 0,
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
total: 0,
drawerTitle: "",
breakId: "",
//存放被勾选的项目的数据
selectList: [],
addForm: {
@@ -593,6 +611,7 @@ export default {
itemsNum: "", //条款号
itemsName: "", //条款名称
productType: "",
projectNumber: "",
productLine: "", //产品线
productName: "", //项目名称
reason: "", //不合规项目
@@ -609,12 +628,12 @@ export default {
standName: [
{ required: true, message: "请输入标准名称", trigger: "blur" }
],
itemsNum: [
{ required: true, message: "请输入条款号", trigger: "blur" }
],
itemsName: [
{ required: true, message: "请输入条款名称", trigger: "blur" }
],
// itemsNum: [
// { required: true, message: "请输入条款号", trigger: "blur" }
// ],
// itemsName: [
// { required: true, message: "请输入条款名称", trigger: "blur" }
// ],
productType: [
{ required: true, message: "请输入产品类型", trigger: "blur" }
],
@@ -624,6 +643,9 @@ export default {
productName: [
{ required: true, message: "请输入项目名称", trigger: "change" }
],
projectNumber: [
{ required: true, message: "请输入项目编号", trigger: "change" }
],
reason: [
{ required: true, message: "请输入不合规项目", trigger: "blur" }
],
@@ -664,10 +686,33 @@ export default {
historySeeForm: {},
// 新增编辑框的disabled
serialNumber: true,
addFormEdit: {}
// 提交按钮loading
submiting: false,
// 选择人（单选）
roleShowflag: false,
nodeList: [],
// 选择人（多选）
titleMore: '',
nodeListMore: [],
roleShowMore: false,
// 选择责任部门
nodeListZRBM: [],
modalshowflagZRBM: false
};
},
methods: {
getData() {
// 从数据库中查询各下拉框数据
this.$http.get("sys/dictype/getDicTypeListCode", "", {
_this: this
}, res => {
this.zrbmOptions = res.data.ZRBMCLASS; // 责任部门
this.getTableByPage();
}, e => {
})
},
// 查询未符合项table列表
getTableByPage() {
this.myLoading.loadData = true;
@@ -843,36 +888,37 @@ export default {
});
},
//点击清空按钮事件
clearSearch() {
this.projectSearch = {
projectName: "",
projectNumber: ""
};
this.getProjectData();
},
//提交
submit() {
const id = this.addForm.id;
const closeState = this.addForm.closeState;
const standId = this.addForm.productId // 此处standId储存项目下的标准的id
const standSerialNumber = this.addForm.standSerialNumber;
const standName = this.addForm.standName;
const itemsNum = this.addForm.itemsNum;
const itemsName = this.addForm.itemsName;
const productType = this.addForm.productType;
const productLine = this.addForm.productLine;
const productName = this.addForm.productName;
const productId = this.addForm.projectNumber;
const reason = this.addForm.reason;
const responsibleUnit = this.addForm.responsibleUnit;
const dutyEngineer = this.addForm.dutyEngineer;
const authEngineer = this.addForm.authEngineer;
const qaEngineer = this.addForm.qaEngineer;
const planCloseTime = this.addForm.planCloseTime;
if (this.drawerTitle === "新增") {
const closeState = this.addForm.closeState;
const standSerialNumber = this.addForm.standSerialNumber;
const standName = this.addForm.standName;
const itemsNum = this.addForm.itemsNum;
const itemsName = this.addForm.itemsName;
const productType = this.addForm.productType;
const productLine = this.addForm.productLine;
const productName = this.addForm.productName;
const reason = this.addForm.reason;
const responsibleUnit = this.addForm.responsibleUnit;
const dutyEngineer = this.addForm.dutyEngineer;
const authEngineer = this.addForm.authEngineer;
const qaEngineer = this.addForm.qaEngineer;
const planCloseTime = this.addForm.planCloseTime;
this.$refs["addForm"].validate((valid) => {
if (valid) {
addUn(closeState, standSerialNumber, standName, itemsNum, itemsName, productType,
productLine, productName, reason, responsibleUnit, dutyEngineer, authEngineer, qaEngineer, planCloseTime).then(res => {
this.submiting = true
addUn(
closeState, standId, standSerialNumber,
standName, itemsNum, itemsName, productType,
productLine, productName, productId,reason,
responsibleUnit, dutyEngineer,
authEngineer, qaEngineer, planCloseTime).then(res => {
if (res.ok) {
this.submiting = false
this.$message.success("新增成功");
this.drawerTable = false;
this.getTableByPage();
@@ -880,29 +926,21 @@ export default {
});
} else {
this.$message.warning("请完善基础信息");
this.submiting = false
}
});
} else {
const id = this.addForm.id;
const closeState = this.addForm.closeState;
const standSerialNumber = this.addForm.standSerialNumber;
const standName = this.addForm.standName;
const itemsNum = this.addForm.itemsNum;
const itemsName = this.addForm.itemsName;
const productType = this.addForm.productType;
const productLine = this.addForm.productLine;
const productName = this.addForm.productName;
const reason = this.addForm.reason;
const responsibleUnit = this.addForm.responsibleUnit;
const dutyEngineer = this.addForm.dutyEngineer;
const authEngineer = this.addForm.authEngineer;
const qaEngineer = this.addForm.qaEngineer;
const planCloseTime = this.addForm.planCloseTime;
this.$refs["addForm"].validate((valid) => {
if (valid) {
editUn(closeState, standSerialNumber, standName, itemsNum, itemsName, productType,
productLine, productName, reason, responsibleUnit, dutyEngineer, authEngineer, qaEngineer, planCloseTime, id).then(res => {
this.submiting = true
editUn(
closeState, standId, standSerialNumber,
standName, itemsNum, itemsName, productType,
productLine, productName, reason, responsibleUnit,
dutyEngineer, authEngineer, qaEngineer,
planCloseTime, id).then(res => {
if (res.ok) {
this.submiting = false
this.$message.success("编辑成功");
this.drawerTable = false;
this.getTableByPage();
@@ -910,12 +948,16 @@ export default {
});
} else {
this.$message.warning("请完善基础信息");
this.submiting = false
}
});
}
},
addDrawerClose() {
this.addForm = {};
this.addForm = {}
if (this.drawerTitle === '编辑') {
this.getData()
}
this.drawerTable = false;
}, // 关闭新增drawer
//带入条款确定事件
@@ -931,68 +973,9 @@ export default {
}
},
//带入标准取消事件
closeStand() {
this.listModel = false;
},
//带入标准确定事件
OkStand() {
if (this.standList.length > 1) {
this.$message.warning("您只能选择一条标准进行带入");
} else if (this.standList.length <= 0) {
this.$message.warning("请至少选择一条数据进行带入");
} else {
this.breakId = this.standList[0].standId;
this.addForm.standName = this.standList[0].standName;
this.addForm.standSerialNumber = this.standList[0].standSort + "-" + this.standList[0].standNumber + "-" + this.standList[0].standYear || this.standList[0].standSort + "-" + this.standList[0].standNumber;
this.addForm.responsibleUnit = this.standList[0].zrbm || "--";
this.addForm.standId = this.standList[0].standId;
this.drawerTitle = "新增";
this.drawerTable = true;
this.listModel = false;
}
},
getItem() {
this.$http.get("SarStandItems/sar-stand-items/findAllItems", {
ids: this.breakId,
type: "FBGBJBD"
}, {
_this: this
}, res => {
this.itemsData = res.data;
this.replaceTotal = res.data.length;
}, e => {
this.$message.error("添加失败");
});
},
//手动查找
handSeek() {
this.itemModel = true;
this.getItem();
},
//带入项目取消事件
closeDrawer() {
this.projectModel = false;
},
//带入项目确定事件
OkDrawer() {
if (this.selectList.length > 1) {
this.$message.warning("您只能选择一条数据进行带入");
} else if (this.selectList.length === 0) {
this.$message.warning("请选择一条数据进行带入");
} else {
this.projectId = this.selectList[0].id;
this.addForm.productLine = this.selectList[0].productLine;
this.addForm.productType = this.selectList[0].projectPlatfor;
this.addForm.productName = this.selectList[0].projectName;
this.getStandData();
this.projectModel = false;
this.listModel = true;
}
},
//查询项目下的标准
getStandData(val) {
this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: val.id }, {
getStandData(productId) {
this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: productId }, {
_this: this
}, res => {
res.data.records.forEach(item => {
@@ -1001,7 +984,7 @@ export default {
}
});
this.dataList = res.data.records;
this.dataList.forEach(item => {
/*this.dataList.forEach(item => {
// 责任部门转换
if (item.zrbm !== null || item.zrbm !== "") {
let k = (item.zrbm || "").split(",");
@@ -1014,7 +997,7 @@ export default {
}
}
}
});
});*/
});
},
//新增事件
@@ -1028,9 +1011,11 @@ export default {
//编辑事件
projectEdit(row) {
this.drawerTitle = "编辑";
this.addForm = row;
this.addFormEdit = row
this.addForm = row
let productId = row.standId
this.getProjectData()
this.getStandData(productId)
this.serialNumber = false
this.drawerTable = true;
},
//点击查看按钮事件
@@ -1108,37 +1093,89 @@ export default {
/** 项目名称change事件 */
handleChange(val) {
console.log(val);
if (this.drawerTitle === '编辑') {
this.addForm.standName = ''
this.addForm.standSerialNumber = ''
this.addForm.responsibleUnit = ''
}
this.addForm.productLine = val.productLine
this.addForm.productName = val.projectName
this.addForm.productType = val.projectPlatfor
this.serialNumber = false
this.getStandData(val)
this.addForm.productId = val.id
this.addForm.projectNumber = val.projectNumber
this.addForm.productLine = val.productLine
this.addForm.productName = val.projectName
this.addForm.productType = val.projectPlatfor
this.serialNumber = false
let productId = val.id
this.getStandData(productId)
},
/** 标准号change事件 */
standChange(item) {
this.addForm.standName = item.standName
this.addForm.standSerialNumber = item.standSort + '-' + item.standNumber + '-' + item.standYear
this.addForm.responsibleUnit = item.zrbm || "--";
}
},
/** 责任工程师选择 */
choiceZRR(type, title, id) {
this.nodeList = []
this.nodeList.push(id)
this.type = type
this.roleShowflag = true
},
drawerCheck(data) {
this.addForm.dutyEngineer = data[0].name.slice(0,data[0].name.indexOf('('))
this.roleShowflag = false
},
/** 选择认证工程师和质量工程师 */
choiceMore(type, title, id) {
this.nodeListMore = []
this.nodeListMore.push(id)
this.type = type
this.titleMore = title
this.roleShowMore = true
},
drawerMore(data) {
var idList = ''
var nameList = ''
data.forEach(item => {
if (nameList.length > 0) {
nameList += ','
idList += ','
}
idList += item.id
nameList += item.name.slice(0,item.name.indexOf('('))
})
if (this.type === 'authEngineer') {
this.addForm.authEngineer = nameList
} else {
this.addForm.qaEngineer = nameList
}
this.roleShowMore = true
},
/** 选择责任部门 */
choiceZRBM(type, title, id) {
this.nodeListZRBM = []
this.nodeListZRBM.push(id)
this.modalshowflagZRBM = true
},
drawerCheckZRBM(data) {
let idList = ''
let nameList = ''
data.forEach(item => {
if (nameList.length > 0) {
nameList += ','
idList += ','
}
idList += item.id
nameList += item.name
})
this.addForm.responsibleUnit = nameList;
},
},
mounted() {
//查询已维护的项目
this.getProjectData();
// 从数据库中查询各下拉框数据
this.$http.get("sys/dictype/getDicTypeListCode", "", {
_this: this
}, res => {
this.zrbmOptions = res.data.ZRBMCLASS; // 责任部门
this.getTableByPage();
}, e => {
});
this.getData()
// 加载所有的部门
this.getOrgTreeSource();
}
@@ -1146,7 +1183,9 @@ export default {
</script>
<style lang="less" scoped>
.el-select-dropdown__item.selected {
color: #606266 !important;
}
#rectification-dataBase {
/deep/ .table-wrap {
.el-table__fixed {
@@ -1192,9 +1231,12 @@ export default {
.add-form-item {
/deep/ .el-input__inner {
width: 300px;
width: 370px;
}
}
/deep/.label-input-form .add-form-item .el-input--suffix {
padding-right: 0px;
}
.add-input {
/deep/ .el-input__inner {
@@ -1214,14 +1256,9 @@ export default {
background-color: #fff;
color: #7e8083;
}
/deep/.el-select-dropdown__item.selected {
color: #8d8e91;
}
}
}
}
/deep/.el-select-dropdown__item.selected {
color: #8d8e91 !important;
}
}
</style>