FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
zhaokaiyao@91isoft.com
2021-08-12 17:49:56 +08:00
parent b6aed9adf4 95ca600094
commit 55d1253b33
16 changed files with 1254 additions and 1111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/config/pages/attributeCustom/components/buss.vue
+2 -2
View File
@@ -2,8 +2,8 @@
<template> <template>
<div class="attribute-custom v-class"> <div class="attribute-custom v-class">
<div class="action-bar1"> <div class="action-bar1">
<el-button class="common-button-primary add-button" size="mini" v-btn-permission="'7UARYUBX8J8BX3ELZDH2'" type="primary" @click="showAddModel"><i class="iconfont">&#xe84e;</i>新增</el-button> <el-button class="common-button-primary add-button" size="mini" v-btn-permission="''" type="primary" @click="showAddModel"><i class="iconfont">&#xe84e;</i>新增</el-button>
<el-button class="common-button-default" size="mini" v-btn-permission="'8QSDDR8R7UMDS9S6M2HU'" @click="showDisplayLocationDialog" >展示区域管理</el-button> <el-button class="common-button-default" size="mini" v-btn-permission="''" @click="showDisplayLocationDialog" >展示区域管理</el-button>
</div> </div>
<loading :loading="attributeDataLoading">数据处理中</loading> <loading :loading="attributeDataLoading">数据处理中</loading>
<div class="content"> <div class="content">
src/pages/localTool/standAutoSplit/index.vue
+8 -4
View File
@@ -82,8 +82,11 @@
label="拆分状态" label="拆分状态"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{ scope.row.splitStatus == '0' ? '编辑中' : (scope.row.splitStatus == '1' ? '审核中' : '已完成' + <span v-if="scope.row.splitStatus == '0'">编辑中</span>
'') }}</div> <span v-else-if="scope.row.splitStatus == '1'">审核中</span>
<span v-else-if="scope.row.splitStatus == '2'">已关联</span>
<span v-else-if="scope.row.splitStatus == '3'">解读中</span>
<span v-else>已完成</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -831,7 +834,7 @@ export default {
name: 'OtherStandardDetails', name: 'OtherStandardDetails',
params: { params: {
id: item.standId, id: item.standId,
pageType: 'INLAND_STAND' pageType: item.standType + '_STAND'
} }
}) })
window.open(routeUrl.href, '_blank') window.open(routeUrl.href, '_blank')
@@ -842,7 +845,7 @@ export default {
name: 'OtherStandardDetails', name: 'OtherStandardDetails',
params: { params: {
id: item.standId, id: item.standId,
pageType: item.sarType + '_STAND' pageType: item.sarType + '_STAND',
} }
}) })
window.open(routeUrl.href, '_blank') window.open(routeUrl.href, '_blank')
@@ -1378,6 +1381,7 @@ export default {
query: { query: {
infoId: row.id, infoId: row.id,
result: row.result, result: row.result,
splitStatus: row.splitStatus
} }
}) })
}, },
src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue
+3 -2
View File
@@ -97,7 +97,8 @@
<i class="iconfont">&#xe61e;</i> <i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.row, '属性']" v-btn-permission="''">属性</el-dropdown-item> <el-dropdown-item :command="[scope.row, '属性']" v-btn-permission="''">属性</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '编辑', scope.$index]" v-btn-permission="''">编辑</el-dropdown-item> <el-dropdown-item :command="[scope.row, '编辑', scope.$index]" v-if="splitStatus === '4'" v-btn-permission="''">编辑</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '编辑', scope.$index]" v-else :disabled="true" v-btn-permission="''">编辑</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '复制']" v-btn-permission="''">复制</el-dropdown-item> <el-dropdown-item :command="[scope.row, '复制']" v-btn-permission="''">复制</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="''">删除</el-dropdown-item> <el-dropdown-item :command="[scope.row, '删除']" v-btn-permission="''">删除</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
@@ -685,6 +686,7 @@ export default {
}, },
data () { data () {
return { return {
splitStatus: this.$route.query.splitStatus,
auditFlag: this.$route.query.auditFlag, auditFlag: this.$route.query.auditFlag,
splitCheckDialog: false, splitCheckDialog: false,
submitLoading: false, submitLoading: false,
@@ -1306,7 +1308,6 @@ export default {
if (cur[i].pId == null || cur[i].pId === '') { if (cur[i].pId == null || cur[i].pId === '') {
this.parentNode = cur[i] this.parentNode = cur[i]
} }
console.log(str);
this.zNodes = str this.zNodes = str
} }
// 查完左侧目录后，如果没有选中的，设置最外层选中 // 查完左侧目录后，如果没有选中的，设置最外层选中
src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+4
View File
@@ -388,6 +388,7 @@
sarType: '', sarType: '',
loading: false, loading: false,
standId: '', standId: '',
statusId: '',
commentText: '', commentText: '',
textarea: '', // 意见 textarea: '', // 意见
title: '', // 新增抽屉标题 title: '', // 新增抽屉标题
@@ -401,6 +402,7 @@
itemsNum: '', itemsNum: '',
itemsName: '', itemsName: '',
standId: '', standId: '',
statusId: '',
itemsNum1: '', itemsNum1: '',
itemsName1: '', itemsName1: '',
oldNumber: '' oldNumber: ''
@@ -622,6 +624,8 @@
this.form.standId = bringData[0].standId this.form.standId = bringData[0].standId
this.sarType = bringData[0].standType this.sarType = bringData[0].standType
this.standId = bringData[0].standId this.standId = bringData[0].standId
this.statusId = bringData[0].id
this.form.statusId = bringData[0].id
this.listModel = false; this.listModel = false;
this.listModel2 = true this.listModel2 = true
this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', { this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', {
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+4
View File
@@ -388,6 +388,7 @@
sarType: '', sarType: '',
loading: false, loading: false,
standId: '', standId: '',
statusId: '',
commentText: '', commentText: '',
textarea: '', // 意见 textarea: '', // 意见
title: '', // 新增抽屉标题 title: '', // 新增抽屉标题
@@ -401,6 +402,7 @@
itemsNum: '', itemsNum: '',
itemsName: '', itemsName: '',
standId: '', standId: '',
statusId: '',
itemsNum1: '', itemsNum1: '',
itemsName1: '', itemsName1: '',
oldNumber: '' oldNumber: ''
@@ -627,6 +629,8 @@
this.form.standId = bringData[0].standId this.form.standId = bringData[0].standId
this.sarType = bringData[0].standType this.sarType = bringData[0].standType
this.standId = bringData[0].standId this.standId = bringData[0].standId
this.statusId = bringData[0].id
this.form.statusId = bringData[0].id
this.listModel = false; this.listModel = false;
this.listModel2 = true this.listModel2 = true
this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', { this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', {
src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
+117 -113
View File
@@ -43,25 +43,25 @@
<template slot="title">填写信息</template> <template slot="title">填写信息</template>
</process-title> </process-title>
<el-table <el-table
:data="dataList" :data="dataList"
style="width: 100%; border: 1px solid #cccccc" style="width: 100%; border: 1px solid #cccccc"
row-key="standId" row-key="standId"
height="70%" height="70%"
border border
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}" fontWeight: 'bold', height: '48px'}"
> >
<el-table-column <el-table-column
type="selection" type="selection"
width="55" width="55"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standEnName" prop="standEnName"
label="标准编号" label="标准编号"
width="180" width="180"
fixed="left" fixed="left"
align="center" align="center"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump" <a v-if="scope.row.standYear" class="table-jump"
@@ -72,126 +72,128 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standName" prop="standName"
fixed="left" fixed="left"
width="180" width="180"
align="center" align="center"
label="标准名称" label="标准名称"
> >
<template slot-scope="scope"> <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 }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="itemsNum" prop="itemsNum"
align="center" align="center"
width="200" width="200"
label="条款号"> label="条款号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="itemsName" prop="itemsName"
width="200" width="200"
align="center" align="center"
label="条款名称"> label="条款名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="xcxssrqgj" prop="xcxssrqgj"
width="200" width="200"
align="center" align="center"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span> <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zccssrqgj" prop="zccssrqgj"
width="200" width="200"
align="center" align="center"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span> <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="productType" prop="productType"
align="center" align="center"
label="在研产品"> label="在研产品">
<el-table-column <el-table-column
prop="complianceReasons" prop="complianceReasons"
align="center" align="center"
width="160" width="160"
label="合规"> label="合规">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
width="160" width="160"
prop="researchNonCompliance" prop="researchNonCompliance"
label="不合规"> label="不合规">
<el-table-column <el-table-column
prop="noCompliance" prop="noCompliance"
align="center" align="center"
width="160" width="160"
label="不合规项目"> label="不合规项目">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="countermeasures" prop="countermeasures"
align="center" align="center"
width="160" width="160"
label="应对措施"> label="应对措施">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="completionTime" prop="completionTime"
align="center" align="center"
width="160" width="160"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
}}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
label="在产产品"> label="在产产品">
<el-table-column <el-table-column
prop="zcComplianceReasons" prop="zcComplianceReasons"
align="center" align="center"
width="160" width="160"
label="合规(具体情况)"> label="合规(具体情况)">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
width="160" width="160"
label="不合规"> label="不合规">
<el-table-column <el-table-column
prop="zcNoCompliance" prop="zcNoCompliance"
align="center" align="center"
width="160" width="160"
label="不合规项目"> label="不合规项目">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zcCountermeasures" prop="zcCountermeasures"
align="center" align="center"
width="160" width="160"
label="应对措施"> label="应对措施">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zcCompletionTime" prop="zcCompletionTime"
align="center" align="center"
width="160" width="160"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : ""
}}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="workPeople" prop="workPeople"
align="center" align="center"
width="200" width="200"
label="责任人"> label="责任人">
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<div> <div>
@@ -351,14 +353,14 @@ export default {
}, res => { }, res => {
this.standardData = res.data.list; this.standardData = res.data.list;
this.standardData.forEach(item => { this.standardData.forEach(item => {
if(item.attrInfoMap === null){ if (item.attrInfoMap === null) {
this.$set(item, "ZCCSSRQ", ''); this.$set(item, "ZCCSSRQ", "");
this.$set(item, "XCXSSRQ", ''); this.$set(item, "XCXSSRQ", "");
}else{ } else {
this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ); this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ); this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
} }
}) });
this.totalNo = res.data.count; this.totalNo = res.data.count;
}, e => { }, e => {
}); });
@@ -410,9 +412,9 @@ export default {
}, },
//驳回事件 //驳回事件
beforeBack() { beforeBack() {
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
this.$message.warning('请填写审批意见') this.$message.warning("请填写审批意见");
}else{ } else {
this.listForm.bzFlag = "2"; this.listForm.bzFlag = "2";
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
@@ -433,24 +435,26 @@ export default {
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.listForm.bzFlag = "1"; this.isSubmit = true;
this.listForm.commentText = this.commentText; this.listForm.bzFlag = "1";
const json = JSON.stringify(this.listForm); this.listForm.commentText = this.commentText;
console.log(json) const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", { console.log(json);
taskIds: this.taskIds, this.$http.post("lawss/activiti/completeTask", {
userId: this.userId, taskIds: this.taskIds,
json: json userId: this.userId,
}, { json: json
_this: this }, {
}, res => { _this: this
if (res.success) { }, res => {
this.$message.success(res.message); if (res.success) {
this.$router.push("/processCenter"); this.$message.success(res.message);
} this.$router.push("/processCenter");
}, e => { }
}); this.isSubmit = false;
}, }, e => {
});
}
}, },
computed: { computed: {
listNoDataText() { listNoDataText() {
src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
+114 -110
View File
@@ -43,25 +43,25 @@
<template slot="title">填写信息</template> <template slot="title">填写信息</template>
</process-title> </process-title>
<el-table <el-table
:data="dataList" :data="dataList"
style="width: 100%; border: 1px solid #cccccc" style="width: 100%; border: 1px solid #cccccc"
row-key="standId" row-key="standId"
height="70%" height="70%"
border border
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}" fontWeight: 'bold', height: '48px'}"
> >
<el-table-column <el-table-column
type="selection" type="selection"
width="55" width="55"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standEnName" prop="standEnName"
label="标准编号" label="标准编号"
width="180" width="180"
fixed="left" fixed="left"
align="center" align="center"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump" <a v-if="scope.row.standYear" class="table-jump"
@@ -72,126 +72,128 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standName" prop="standName"
fixed="left" fixed="left"
width="180" width="180"
align="center" align="center"
label="标准名称" label="标准名称"
> >
<template slot-scope="scope"> <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 }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="itemsNum" prop="itemsNum"
align="center" align="center"
width="200" width="200"
label="条款号"> label="条款号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="itemsName" prop="itemsName"
width="200" width="200"
align="center" align="center"
label="条款名称"> label="条款名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="xcxssrqgj" prop="xcxssrqgj"
width="200" width="200"
align="center" align="center"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span> <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zccssrqgj" prop="zccssrqgj"
width="200" width="200"
align="center" align="center"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span> <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="productType" prop="productType"
align="center" align="center"
label="在研产品"> label="在研产品">
<el-table-column <el-table-column
prop="complianceReasons" prop="complianceReasons"
align="center" align="center"
width="160" width="160"
label="合规"> label="合规">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
width="160" width="160"
prop="researchNonCompliance" prop="researchNonCompliance"
label="不合规"> label="不合规">
<el-table-column <el-table-column
prop="noCompliance" prop="noCompliance"
align="center" align="center"
width="160" width="160"
label="不合规项目"> label="不合规项目">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="countermeasures" prop="countermeasures"
align="center" align="center"
width="160" width="160"
label="应对措施"> label="应对措施">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="completionTime" prop="completionTime"
align="center" align="center"
width="160" width="160"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
}}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
label="在产产品"> label="在产产品">
<el-table-column <el-table-column
prop="zcComplianceReasons" prop="zcComplianceReasons"
align="center" align="center"
width="160" width="160"
label="合规(具体情况)"> label="合规(具体情况)">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
width="160" width="160"
label="不合规"> label="不合规">
<el-table-column <el-table-column
prop="zcNoCompliance" prop="zcNoCompliance"
align="center" align="center"
width="160" width="160"
label="不合规项目"> label="不合规项目">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zcCountermeasures" prop="zcCountermeasures"
align="center" align="center"
width="160" width="160"
label="应对措施"> label="应对措施">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zcCompletionTime" prop="zcCompletionTime"
align="center" align="center"
width="160" width="160"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : ""
}}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="workPeople" prop="workPeople"
align="center" align="center"
width="200" width="200"
label="责任人"> label="责任人">
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<div> <div>
@@ -349,14 +351,14 @@ export default {
}, res => { }, res => {
this.standardData = res.data.list; this.standardData = res.data.list;
this.standardData.forEach(item => { this.standardData.forEach(item => {
if(item.attrInfoMap === null){ if (item.attrInfoMap === null) {
this.$set(item, "ZCCSSRQ", ''); this.$set(item, "ZCCSSRQ", "");
this.$set(item, "XCXSSRQ", ''); this.$set(item, "XCXSSRQ", "");
}else{ } else {
this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ); this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ); this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
} }
}) });
this.totalNo = res.data.count; this.totalNo = res.data.count;
}, e => { }, e => {
}); });
@@ -385,7 +387,7 @@ export default {
taskIds: this.taskIds, taskIds: this.taskIds,
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
console.log(res.mesg) console.log(res.mesg);
if (res) { if (res) {
const processForm = JSON.parse(res.mesg); const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm); this.getFormFieldList(processForm);
@@ -409,23 +411,25 @@ export default {
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.listForm.bzFlag = "1"; this.isSubmit = true;
this.listForm.commentText = this.commentText; this.listForm.bzFlag = "1";
const json = JSON.stringify(this.listForm); this.listForm.commentText = this.commentText;
this.$http.post("lawss/activiti/completeTask", { const json = JSON.stringify(this.listForm);
taskIds: this.taskIds, this.$http.post("lawss/activiti/completeTask", {
userId: this.userId, taskIds: this.taskIds,
json: json userId: this.userId,
}, { json: json
_this: this }, {
}, res => { _this: this
if (res.success) { }, res => {
this.$message.success(res.message); if (res.success) {
this.$router.push("/processCenter"); this.$message.success(res.message);
} this.$router.push("/processCenter");
}, e => { }
}); this.isSubmit = false;
}, }, e => {
});
}
}, },
computed: { computed: {
src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
+117 -113
View File
@@ -43,25 +43,25 @@
<template slot="title">填写信息</template> <template slot="title">填写信息</template>
</process-title> </process-title>
<el-table <el-table
:data="dataList" :data="dataList"
style="width: 100%; border: 1px solid #cccccc" style="width: 100%; border: 1px solid #cccccc"
row-key="standId" row-key="standId"
height="70%" height="70%"
border border
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}" fontWeight: 'bold', height: '48px'}"
> >
<el-table-column <el-table-column
type="selection" type="selection"
width="55" width="55"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standEnName" prop="standEnName"
label="标准编号" label="标准编号"
width="180" width="180"
fixed="left" fixed="left"
align="center" align="center"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump" <a v-if="scope.row.standYear" class="table-jump"
@@ -72,126 +72,128 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standName" prop="standName"
fixed="left" fixed="left"
width="180" width="180"
align="center" align="center"
label="标准名称" label="标准名称"
> >
<template slot-scope="scope"> <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 }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="itemsNum" prop="itemsNum"
align="center" align="center"
width="200" width="200"
label="条款号"> label="条款号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="itemsName" prop="itemsName"
width="200" width="200"
align="center" align="center"
label="条款名称"> label="条款名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="xcxssrqgj" prop="xcxssrqgj"
width="200" width="200"
align="center" align="center"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span> <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zccssrqgj" prop="zccssrqgj"
width="200" width="200"
align="center" align="center"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span> <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="productType" prop="productType"
align="center" align="center"
label="在研产品"> label="在研产品">
<el-table-column <el-table-column
prop="complianceReasons" prop="complianceReasons"
align="center" align="center"
width="160" width="160"
label="合规"> label="合规">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
width="160" width="160"
prop="researchNonCompliance" prop="researchNonCompliance"
label="不合规"> label="不合规">
<el-table-column <el-table-column
prop="noCompliance" prop="noCompliance"
align="center" align="center"
width="160" width="160"
label="不合规项目"> label="不合规项目">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="countermeasures" prop="countermeasures"
align="center" align="center"
width="160" width="160"
label="应对措施"> label="应对措施">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="completionTime" prop="completionTime"
align="center" align="center"
width="160" width="160"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
}}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
label="在产产品"> label="在产产品">
<el-table-column <el-table-column
prop="zcComplianceReasons" prop="zcComplianceReasons"
align="center" align="center"
width="160" width="160"
label="合规(具体情况)"> label="合规(具体情况)">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
width="160" width="160"
label="不合规"> label="不合规">
<el-table-column <el-table-column
prop="zcNoCompliance" prop="zcNoCompliance"
align="center" align="center"
width="160" width="160"
label="不合规项目"> label="不合规项目">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zcCountermeasures" prop="zcCountermeasures"
align="center" align="center"
width="160" width="160"
label="应对措施"> label="应对措施">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zcCompletionTime" prop="zcCompletionTime"
align="center" align="center"
width="160" width="160"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : ""
}}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="workPeople" prop="workPeople"
align="center" align="center"
width="200" width="200"
label="责任人"> label="责任人">
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<div> <div>
@@ -351,14 +353,14 @@ export default {
}, res => { }, res => {
this.standardData = res.data.list; this.standardData = res.data.list;
this.standardData.forEach(item => { this.standardData.forEach(item => {
if(item.attrInfoMap === null){ if (item.attrInfoMap === null) {
this.$set(item, "ZCCSSRQ", ''); this.$set(item, "ZCCSSRQ", "");
this.$set(item, "XCXSSRQ", ''); this.$set(item, "XCXSSRQ", "");
}else{ } else {
this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ); this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ); this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
} }
}) });
this.totalNo = res.data.count; this.totalNo = res.data.count;
}, e => { }, e => {
}); });
@@ -410,9 +412,9 @@ export default {
}, },
//驳回事件 //驳回事件
beforeBack() { beforeBack() {
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
this.$message.warning('请填写审批意见') this.$message.warning("请填写审批意见");
}else{ } else {
this.listForm.dlFlag = "2"; this.listForm.dlFlag = "2";
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
@@ -433,23 +435,25 @@ export default {
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.listForm.dlFlag = "1"; this.isSubmit = true;
this.listForm.commentText = this.commentText; this.listForm.dlFlag = "1";
const json = JSON.stringify(this.listForm); this.listForm.commentText = this.commentText;
this.$http.post("lawss/activiti/completeTask", { const json = JSON.stringify(this.listForm);
taskIds: this.taskIds, this.$http.post("lawss/activiti/completeTask", {
userId: this.userId, taskIds: this.taskIds,
json: json userId: this.userId,
}, { json: json
_this: this }, {
}, res => { _this: this
if (res.success) { }, res => {
this.$message.success(res.message); if (res.success) {
this.$router.push("/processCenter"); this.$message.success(res.message);
} this.$router.push("/processCenter");
}, e => { }
}); this.isSubmit = false;
}, }, e => {
});
}
}, },
computed: { computed: {
listNoDataText() { listNoDataText() {
@@ -459,7 +463,7 @@ export default {
mounted() { mounted() {
this.processTable(); this.processTable();
this.getData(); this.getData();
}, }
}; };
</script> </script>
src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
+54 -50
View File
@@ -44,7 +44,8 @@
</process-title> </process-title>
<div class="tableTitle"> <div class="tableTitle">
<div class="tableButton"> <div class="tableButton">
<el-button plain class="common-button-primary" size="mini" @click="choiceZRRS('', 2, '')">批量分发责任人</el-button> <el-button plain class="common-button-primary" size="mini" @click="choiceZRRS('', 2, '')">批量分发责任人
</el-button>
</div> </div>
</div> </div>
<el-table <el-table
@@ -112,8 +113,9 @@
width="170" width="170"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-model="scope.row.liablePeopleId" style="display: none;"/> <el-input v-model="scope.row.liablePeopleId" style="display: none;" />
<el-input v-model="scope.row.liablePeople" placeholder="请选择分发责任人" @click.native="choiceZRRS(scope.row.liablePeopleId, 1, scope.$index)"/> <el-input v-model="scope.row.liablePeople" placeholder="请选择分发责任人"
@click.native="choiceZRRS(scope.row.liablePeopleId, 1, scope.$index)" />
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -225,7 +227,7 @@
import ProcessHeader from "../../components/ProcessHeader"; import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter"; import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle"; import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail, saveTaskForPub } from "api/process"; import { inboundLiaisonDetail, saveTaskForPub } from "api/process";
export default { export default {
name: "xmpg2Step4", name: "xmpg2Step4",
@@ -247,8 +249,8 @@ export default {
modalshowflag: false, // drawer开关 modalshowflag: false, // drawer开关
selectList: [], selectList: [],
treeData: [], // 人员数据 treeData: [], // 人员数据
zrIndex: '', zrIndex: "",
zrType: '', zrType: "",
roleForm: { roleForm: {
liablePeople: "" liablePeople: ""
}, },
@@ -270,7 +272,7 @@ export default {
detailData: [], //流程历史数据 detailData: [], //流程历史数据
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.userId,
taskIds: this.$route.query.taskIds, taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId, pId: this.$route.query.prcId
}; };
}, },
methods: { methods: {
@@ -297,14 +299,14 @@ export default {
}, res => { }, res => {
this.standardData = res.data.list; this.standardData = res.data.list;
this.standardData.forEach(item => { this.standardData.forEach(item => {
if(item.attrInfoMap === null){ if (item.attrInfoMap === null) {
this.$set(item, "ZCCSSRQ", ''); this.$set(item, "ZCCSSRQ", "");
this.$set(item, "XCXSSRQ", ''); this.$set(item, "XCXSSRQ", "");
}else{ } else {
this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ); this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ); this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
} }
}) });
this.totalNo = res.data.count; this.totalNo = res.data.count;
}, e => { }, e => {
}); });
@@ -346,7 +348,7 @@ export default {
getFormFieldList(item) { getFormFieldList(item) {
this.$nextTick(() => { this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item)); this.listForm = JSON.parse(JSON.stringify(item));
if(item.form === undefined){ if (item.form === undefined) {
this.listForm.prcNum = this.prcNum; this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName; this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id; this.listForm["id"] = item.id;
@@ -354,8 +356,8 @@ export default {
this.dataList = item.dataList; this.dataList = item.dataList;
this.listForm.breakdownList = item.breakdownList; this.listForm.breakdownList = item.breakdownList;
} else { } else {
this.listForm = item.form this.listForm = item.form;
this.dataList = item.form.dataList this.dataList = item.form.dataList;
} }
}); });
@@ -382,13 +384,14 @@ export default {
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.listForm.dataList.forEach(item => { this.listForm.dataList.forEach(item => {
if(item.liablePeople !== undefined){ if (item.liablePeople !== undefined) {
this.peopleFlag = true this.peopleFlag = true;
}else{ } else {
this.peopleFlag = false this.peopleFlag = false;
} }
}) });
if(this.peopleFlag === true){ if (this.peopleFlag === true) {
this.isSubmit = true;
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
@@ -402,30 +405,31 @@ export default {
this.$message.success(res.message); this.$message.success(res.message);
this.$router.push("/processCenter"); this.$router.push("/processCenter");
} }
this.isSubmit = false;
}, e => { }, e => {
}); });
}else{ } else {
this.$message.warning('请选择分发负责人') this.$message.warning("请选择分发负责人");
} }
}, },
choiceZRRS (row, type, index) { choiceZRRS(row, type, index) {
this.type = type this.type = type;
if (type === 1) { if (type === 1) {
this.drawerTitle = '选择责任人' this.drawerTitle = "选择责任人";
this.nodeList = [] this.nodeList = [];
this.zrIndex = index this.zrIndex = index;
this.zrType = type this.zrType = type;
this.nodeList.push(row) this.nodeList.push(row);
this.modalshowflag = true this.modalshowflag = true;
} else if (type === 2) { } else if (type === 2) {
// 批量 // 批量
if (this.selectList.length > 0) { if (this.selectList.length > 0) {
this.zrType = type this.zrType = type;
this.nodeList = [] this.nodeList = [];
this.modalshowflag = true this.modalshowflag = true;
this.drawerTitle = '批量选择责任人' this.drawerTitle = "批量选择责任人";
} else { } else {
this.$message.warning('请选择要分发的数据') this.$message.warning("请选择要分发的数据");
} }
} }
}, },
@@ -447,25 +451,25 @@ export default {
this.roleRow = this.$refs.tree.getCheckedNodes()[0]; this.roleRow = this.$refs.tree.getCheckedNodes()[0];
} }
}, },
checkedRole (data) { checkedRole(data) {
if (this.type === 1) { if (this.type === 1) {
const newRow = JSON.parse(JSON.stringify(this.dataList[this.zrIndex])) const newRow = JSON.parse(JSON.stringify(this.dataList[this.zrIndex]));
newRow.liablePeopleId = data[0].id newRow.liablePeopleId = data[0].id;
newRow.liablePeople = data[0].name newRow.liablePeople = data[0].name;
this.$set(this.dataList, this.zrIndex, newRow) this.$set(this.dataList, this.zrIndex, newRow);
} else if(this.type === 2) { } else if (this.type === 2) {
this.dataList.forEach((item, index) => { this.dataList.forEach((item, index) => {
this.selectList.forEach( items => { this.selectList.forEach(items => {
if (item.standId === items.standId) { if (item.standId === items.standId) {
const newRow = JSON.parse(JSON.stringify(item)) const newRow = JSON.parse(JSON.stringify(item));
newRow.liablePeopleId = data[0].id newRow.liablePeopleId = data[0].id;
newRow.liablePeople = data[0].name newRow.liablePeople = data[0].name;
this.$set(this.dataList, index, newRow) this.$set(this.dataList, index, newRow);
} }
}) });
}) });
} }
this.modalshowflag = false this.modalshowflag = false;
}, },
cancleUserInfo() { cancleUserInfo() {
this.modalshowflag = false; this.modalshowflag = false;
src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
+34 -31
View File
@@ -96,7 +96,8 @@
<el-table-column label="责任人" prop="workPeople" align="center"> <el-table-column label="责任人" prop="workPeople" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div :class="{'fileClass': !scope.row.workPeople}"> <div :class="{'fileClass': !scope.row.workPeople}">
{{ scope.row.workPeople ? scope.row.workPeople: '' }}</div> {{ scope.row.workPeople ? scope.row.workPeople : "" }}
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -279,14 +280,14 @@ export default {
}, res => { }, res => {
this.standardData = res.data.list; this.standardData = res.data.list;
this.standardData.forEach(item => { this.standardData.forEach(item => {
if(item.attrInfoMap === null){ if (item.attrInfoMap === null) {
this.$set(item, "ZCCSSRQ", ''); this.$set(item, "ZCCSSRQ", "");
this.$set(item, "XCXSSRQ", ''); this.$set(item, "XCXSSRQ", "");
}else{ } else {
this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ); this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ); this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
} }
}) });
this.totalNo = res.data.count; this.totalNo = res.data.count;
}, e => { }, e => {
}); });
@@ -328,7 +329,7 @@ export default {
getFormFieldList(item) { getFormFieldList(item) {
this.$nextTick(() => { this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item)); this.listForm = JSON.parse(JSON.stringify(item));
if(item.form === undefined){ if (item.form === undefined) {
this.listForm.prcNum = this.prcNum; this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName; this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id; this.listForm["id"] = item.id;
@@ -362,8 +363,8 @@ export default {
}); });
this.listForm.children = children; this.listForm.children = children;
} else { } else {
this.listForm = item.form this.listForm = item.form;
this.dataList = item.form.dataList this.dataList = item.form.dataList;
} }
}); });
@@ -389,21 +390,23 @@ export default {
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.listForm.commentText = this.commentText; this.isSubmit = true;
const json = JSON.stringify(this.listForm); this.listForm.commentText = this.commentText;
this.$http.post("lawss/activiti/completeTask", { const json = JSON.stringify(this.listForm);
taskIds: this.taskIds, this.$http.post("lawss/activiti/completeTask", {
userId: this.userId, taskIds: this.taskIds,
json: json userId: this.userId,
}, { json: json
_this: this }, {
}, res => { _this: this
if (res.success) { }, res => {
this.$message.success(res.message); if (res.success) {
this.$router.push("/processCenter"); this.$message.success(res.message);
} this.$router.push("/processCenter");
}, e => { }
}); this.isSubmit = false;
}, e => {
});
}, },
//批量分发按钮 //批量分发按钮
batchOperation(id) { batchOperation(id) {
@@ -434,7 +437,7 @@ export default {
} }
}, },
checkedRole(data) { checkedRole(data) {
console.log(data[0].name) console.log(data[0].name);
// 选取负责人时的操作 // 选取负责人时的操作
let deposit = new Map(); let deposit = new Map();
let mis2 = new Map(); let mis2 = new Map();
@@ -456,19 +459,19 @@ export default {
i.workPeople = undefined; i.workPeople = undefined;
}); });
} else { } else {
const newItem = JSON.parse(JSON.stringify(item)) const newItem = JSON.parse(JSON.stringify(item));
newItem.workPeopleId = data[0].id newItem.workPeopleId = data[0].id;
newItem.workPeople = data[0].name newItem.workPeople = data[0].name;
this.$set(this.dataList, index, newItem) this.$set(this.dataList, index, newItem);
} }
} else { } else {
if (item.children) { if (item.children) {
item.children.forEach((items, childIndex) => { item.children.forEach((items, childIndex) => {
if (deposit.get(items.standId)) { if (deposit.get(items.standId)) {
const childItems = JSON.parse(JSON.stringify(items)) const childItems = JSON.parse(JSON.stringify(items));
childItems.workPeopleId = deposit.get(items.standId).workPeopleId; childItems.workPeopleId = deposit.get(items.standId).workPeopleId;
childItems.workPeople = deposit.get(items.standId).workPeople; childItems.workPeople = deposit.get(items.standId).workPeople;
this.$set(this.dataList[index].children, childIndex, childItems) this.$set(this.dataList[index].children, childIndex, childItems);
} }
}); });
} }
src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+44 -42
View File
@@ -124,7 +124,7 @@
label="合规"> label="合规">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input
v-model="scope.row.complianceReasons" v-model="scope.row.complianceReasons"
placeholder="请输入合规原因" placeholder="请输入合规原因"
> >
</el-input> </el-input>
@@ -142,7 +142,7 @@
label="不合规项目"> label="不合规项目">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input
v-model="scope.row.noCompliance" v-model="scope.row.noCompliance"
placeholder="请输入不合规项目" placeholder="请输入不合规项目"
> >
</el-input> </el-input>
@@ -155,7 +155,7 @@
label="应对措施"> label="应对措施">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input
v-model="scope.row.countermeasures" v-model="scope.row.countermeasures"
placeholder="请输入应对措施" placeholder="请输入应对措施"
> >
</el-input> </el-input>
@@ -168,7 +168,7 @@
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<el-date-picker <el-date-picker
v-model="scope.row.completionTime" v-model="scope.row.completionTime"
type="date" type="date"
placeholder="选择日期"> placeholder="选择日期">
</el-date-picker> </el-date-picker>
@@ -186,7 +186,7 @@
label="合规(具体情况)"> label="合规(具体情况)">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input
v-model="scope.row.zcComplianceReasons" v-model="scope.row.zcComplianceReasons"
placeholder="请输入合规原因" placeholder="请输入合规原因"
> >
</el-input> </el-input>
@@ -203,7 +203,7 @@
label="不合规项目"> label="不合规项目">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input
v-model="scope.row.zcNoCompliance" v-model="scope.row.zcNoCompliance"
placeholder="请输入不合规项目" placeholder="请输入不合规项目"
> >
</el-input> </el-input>
@@ -216,7 +216,7 @@
label="应对措施"> label="应对措施">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input <el-input
v-model="scope.row.zcCountermeasures" v-model="scope.row.zcCountermeasures"
placeholder="请输入应对措施" placeholder="请输入应对措施"
> >
</el-input> </el-input>
@@ -229,7 +229,7 @@
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<el-date-picker <el-date-picker
v-model="scope.row.zcCompletionTime" v-model="scope.row.zcCompletionTime"
type="date" type="date"
placeholder="选择日期"> placeholder="选择日期">
</el-date-picker> </el-date-picker>
@@ -370,24 +370,24 @@ export default {
children: "children", children: "children",
label: "name" label: "name"
}, },
complianceReasons:'', complianceReasons: "",
zcComplianceReasons:'', zcComplianceReasons: "",
//表单的数据 //表单的数据
listForm: { listForm: {
projectNumber: "", //项目编号 projectNumber: "", //项目编号
projectName: "", //项目名称 projectName: "", //项目名称
dataList: [ dataList: [
{ {
complianceReasons:'', complianceReasons: "",
zcComplianceReasons:'', zcComplianceReasons: ""
} }
], //项目下的标准数据 ], //项目下的标准数据
children: [] //标准下的分解单数据 children: [] //标准下的分解单数据
}, },
dataList: [ dataList: [
{ {
complianceReasons:'', complianceReasons: "",
zcComplianceReasons:'', zcComplianceReasons: ""
} }
], //展示的标准数据 ], //展示的标准数据
commentText: "", //审批意见 commentText: "", //审批意见
@@ -421,14 +421,14 @@ export default {
}, res => { }, res => {
this.standardData = res.data.list; this.standardData = res.data.list;
this.standardData.forEach(item => { this.standardData.forEach(item => {
if(item.attrInfoMap === null){ if (item.attrInfoMap === null) {
this.$set(item, "ZCCSSRQ", ''); this.$set(item, "ZCCSSRQ", "");
this.$set(item, "XCXSSRQ", ''); this.$set(item, "XCXSSRQ", "");
}else{ } else {
this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ); this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ); this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
} }
}) });
this.totalNo = res.data.count; this.totalNo = res.data.count;
}, e => { }, e => {
}); });
@@ -458,7 +458,7 @@ export default {
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
if (res) { if (res) {
console.log(res.mesg) console.log(res.mesg);
const processForm = JSON.parse(res.mesg); const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm); this.getFormFieldList(processForm);
} }
@@ -470,15 +470,15 @@ export default {
getFormFieldList(item) { getFormFieldList(item) {
this.$nextTick(() => { this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item)); this.listForm = JSON.parse(JSON.stringify(item));
if(item.form === undefined){ if (item.form === undefined) {
this.listForm.prcNum = this.prcNum; this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName; this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id; this.listForm["id"] = item.id;
// this.listForm.dataList = item.dataList; // this.listForm.dataList = item.dataList;
this.dataList = this.listForm.dataList; this.dataList = this.listForm.dataList;
} else { } else {
this.listForm = item.form this.listForm = item.form;
this.dataList = item.form.dataList this.dataList = item.form.dataList;
} }
}); });
@@ -504,21 +504,23 @@ export default {
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.listForm.commentText = this.commentText; this.isSubmit = true;
const json = JSON.stringify(this.listForm); this.listForm.commentText = this.commentText;
this.$http.post("lawss/activiti/completeTask", { const json = JSON.stringify(this.listForm);
taskIds: this.taskIds, this.$http.post("lawss/activiti/completeTask", {
userId: this.userId, taskIds: this.taskIds,
json: json userId: this.userId,
}, { json: json
_this: this }, {
}, res => { _this: this
if (res.success) { }, res => {
this.$message.success(res.message); if (res.success) {
this.$router.push("/processCenter"); this.$message.success(res.message);
} this.$router.push("/processCenter");
}, e => { }
}); this.isSubmit = false;
}, e => {
});
}, },
//标准表格选择框改变 //标准表格选择框改变
selectStandChange(data) { selectStandChange(data) {
@@ -537,7 +539,7 @@ export default {
this.$refs.tree.setCheckedKeys([data.id]); this.$refs.tree.setCheckedKeys([data.id]);
this.roleRow = this.$refs.tree.getCheckedNodes()[0]; this.roleRow = this.$refs.tree.getCheckedNodes()[0];
} }
}, }
}, },
computed: { computed: {
listNoDataText() { listNoDataText() {
@@ -602,9 +604,9 @@ export default {
height: calc(~'100% - 103px'); height: calc(~'100% - 103px');
overflow: auto; overflow: auto;
.accessStandardsAndRegulations { .accessStandardsAndRegulations {
height: 100%; height: 100%;
} }
} }
.demo-drawer-content { .demo-drawer-content {
src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
+532 -528
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
+2
View File
@@ -433,6 +433,7 @@ export default {
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.isSubmit = true;
this.listForm.jgFlag = "1"; this.listForm.jgFlag = "1";
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
@@ -447,6 +448,7 @@ export default {
this.$message.success(res.message); this.$message.success(res.message);
this.$router.push("/processCenter"); this.$router.push("/processCenter");
} }
this.isSubmit = false;
}, e => { }, e => {
}); });
}, },
src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
+116 -112
View File
@@ -43,25 +43,25 @@
<template slot="title">填写信息</template> <template slot="title">填写信息</template>
</process-title> </process-title>
<el-table <el-table
:data="dataList" :data="dataList"
style="width: 100%; border: 1px solid #cccccc" style="width: 100%; border: 1px solid #cccccc"
row-key="standId" row-key="standId"
height="70%" height="70%"
border border
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}" fontWeight: 'bold', height: '48px'}"
> >
<el-table-column <el-table-column
type="selection" type="selection"
width="55" width="55"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standEnName" prop="standEnName"
label="标准编号" label="标准编号"
width="180" width="180"
fixed="left" fixed="left"
align="center" align="center"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump" <a v-if="scope.row.standYear" class="table-jump"
@@ -72,126 +72,128 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standName" prop="standName"
fixed="left" fixed="left"
width="180" width="180"
align="center" align="center"
label="标准名称" label="标准名称"
> >
<template slot-scope="scope"> <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 }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="itemsNum" prop="itemsNum"
align="center" align="center"
width="200" width="200"
label="条款号"> label="条款号">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="itemsName" prop="itemsName"
width="200" width="200"
align="center" align="center"
label="条款名称"> label="条款名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="xcxssrqgj" prop="xcxssrqgj"
width="200" width="200"
align="center" align="center"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span> <span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zccssrqgj" prop="zccssrqgj"
width="200" width="200"
align="center" align="center"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span> <span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="productType" prop="productType"
align="center" align="center"
label="在研产品"> label="在研产品">
<el-table-column <el-table-column
prop="complianceReasons" prop="complianceReasons"
align="center" align="center"
width="160" width="160"
label="合规"> label="合规">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
width="160" width="160"
prop="researchNonCompliance" prop="researchNonCompliance"
label="不合规"> label="不合规">
<el-table-column <el-table-column
prop="noCompliance" prop="noCompliance"
align="center" align="center"
width="160" width="160"
label="不合规项目"> label="不合规项目">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="countermeasures" prop="countermeasures"
align="center" align="center"
width="160" width="160"
label="应对措施"> label="应对措施">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="completionTime" prop="completionTime"
align="center" align="center"
width="160" width="160"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format("YYYY-MM-DD") : ""
}}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
label="在产产品"> label="在产产品">
<el-table-column <el-table-column
prop="zcComplianceReasons" prop="zcComplianceReasons"
align="center" align="center"
width="160" width="160"
label="合规(具体情况)"> label="合规(具体情况)">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center" align="center"
width="160" width="160"
label="不合规"> label="不合规">
<el-table-column <el-table-column
prop="zcNoCompliance" prop="zcNoCompliance"
align="center" align="center"
width="160" width="160"
label="不合规项目"> label="不合规项目">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zcCountermeasures" prop="zcCountermeasures"
align="center" align="center"
width="160" width="160"
label="应对措施"> label="应对措施">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="zcCompletionTime" prop="zcCompletionTime"
align="center" align="center"
width="160" width="160"
label="完成时间"> label="完成时间">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.zcCompletionTime ? $moment(scope.row.zcCompletionTime).format("YYYY-MM-DD") : ""
}}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="workPeople" prop="workPeople"
align="center" align="center"
width="200" width="200"
label="责任人"> label="责任人">
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<div> <div>
@@ -351,14 +353,14 @@ export default {
}, res => { }, res => {
this.standardData = res.data.list; this.standardData = res.data.list;
this.standardData.forEach(item => { this.standardData.forEach(item => {
if(item.attrInfoMap === null){ if (item.attrInfoMap === null) {
this.$set(item, "ZCCSSRQ", ''); this.$set(item, "ZCCSSRQ", "");
this.$set(item, "XCXSSRQ", ''); this.$set(item, "XCXSSRQ", "");
}else{ } else {
this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ); this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ); this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
} }
}) });
this.totalNo = res.data.count; this.totalNo = res.data.count;
}, e => { }, e => {
}); });
@@ -410,9 +412,9 @@ export default {
}, },
//驳回事件 //驳回事件
beforeBack() { beforeBack() {
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){ if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
this.$message.warning('请填写审批意见') this.$message.warning("请填写审批意见");
}else{ } else {
this.listForm.gcFlag = "2"; this.listForm.gcFlag = "2";
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
@@ -433,23 +435,25 @@ export default {
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.listForm.gcFlag = "1"; this.isSubmit = true;
this.listForm.commentText = this.commentText; this.listForm.gcFlag = "1";
const json = JSON.stringify(this.listForm); this.listForm.commentText = this.commentText;
this.$http.post("lawss/activiti/completeTask", { const json = JSON.stringify(this.listForm);
taskIds: this.taskIds, this.$http.post("lawss/activiti/completeTask", {
userId: this.userId, taskIds: this.taskIds,
json: json userId: this.userId,
}, { json: json
_this: this }, {
}, res => { _this: this
if (res.success) { }, res => {
this.$message.success(res.message); if (res.success) {
this.$router.push("/processCenter"); this.$message.success(res.message);
} this.$router.push("/processCenter");
}, e => { }
}); this.isSubmit = false;
}, }, e => {
});
}
}, },
computed: { computed: {
listNoDataText() { listNoDataText() {
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+103 -3
View File
@@ -4,18 +4,25 @@
<!--左侧树--> <!--左侧树-->
<div class="tree-content" :class="{ 'tree-closed': sideClose }" > <div class="tree-content" :class="{ 'tree-closed': sideClose }" >
<div class="tree"> <div class="tree">
<el-input
placeholder="输入树状图体系"
v-model="filterText">
</el-input>
<el-tree <el-tree
ref="tree" ref="tree"
node-key="id" node-key="id"
class="filter-tree" class="tree-line"
icon-class="icon-tree"
:indent="0"
:props="props" :props="props"
:data="treeList" :data="treeList"
highlight-current highlight-current
@node-click="treeClick" @node-click="treeClick"
:filter-node-method="filterNode"
default-expand-all default-expand-all
:expand-on-click-node="false"> :expand-on-click-node="false">
<span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)"> <span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)">
<span> {{ node.label}} </span> <span :class="data.children.length !== 0 ? 'is-show' : 'is-leaf-none'"></span> <span> {{ node.label}} </span>
<span> <span>
<el-button <el-button
type="text" type="text"
@@ -1021,6 +1028,7 @@ export default {
// 唯一辨识 // 唯一辨识
dicId: "" dicId: ""
}, },
filterText: '', // 企业标准库过滤
treeList: [], treeList: [],
standId: '', standId: '',
visibleOrgTable: false, visibleOrgTable: false,
@@ -3434,7 +3442,11 @@ export default {
} }
} }
}, },
watch: {}, watch: {
filterText(val) {
this.$refs.tree.filter(val);
}
},
computed: { computed: {
// 是否拥有拖拽权限 // 是否拥有拖拽权限
hasPermissionDrag () { hasPermissionDrag () {
@@ -3491,6 +3503,94 @@ export default {
} }
</script> </script>
<style lang="less" scoped>
/deep/ .icon-tree {
margin:0 5px 0 10px;
position:relative;
background:url('~@/assets/images/shangqi/img/tree-add.png');
background-size:100% 100%;
}
/deep/ .expanded{
background:url('~@/assets/images/shangqi/img/tree-sub.png');
background-size:100% 100%;
}
/deep/ .is-leaf{
background-image:none;
background-size:100% 100%;
}
/deep/ .is-leaf-none{
position: relative;
display: inline-block;
width: 15px;
height: 15px;
background:url('~@/assets/images/shangqi/img/none-file.png');
background-size:100% 100%;
}
/deep/ .is-show{
position: relative;
display: inline-block;
width: 15px;
height: 15px;
background:url('~@/assets/images/shangqi/img/tree.png');
background-size:100% 100%;
}
/deep/.tree-line{
.el-tree-node {
position: relative;
padding-left: 0px; // 缩进量
line-height: 30px;
}
.el-tree-node__children {
padding-left: 16px; // 缩进量
}
// 竖线
.el-tree-node::before {
content: "";
height: 100%;
width: 1px;
position: absolute;
left: -3px;
top: -26px;
border-width: 1px;
border-left: 1px dashed #858990e0;
}
// 当前层最后一个节点的竖线高度固定
.el-tree-node:last-child::before {
height: 38px; // 可以自己调节到合适数值
}
// 横线
.el-tree-node::after {
content: "";
width: 11px;
height: 20px;
position: absolute;
left: -3px;
top: 12px;
border-width: 1px;
border-top: 1px dashed #858990e0;
}
// 去掉最顶层的虚线，放最下面样式才不会被上面的覆盖了
& > .el-tree-node::after {
border-top: none;
}
& > .el-tree-node::before {
border-left: none;
}
// 展开关闭的icon
.el-tree-node__expand-icon{
font-size: 16px;
// 叶子节点（无子节点）
&.is-leaf{
color: transparent;
// display: none; // 也可以去掉
}
}
}
</style>
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/assets/styles/mixins'; @import '~@/assets/styles/mixins';
@import '~@/assets/styles/style'; @import '~@/assets/styles/style';
src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
-1
View File
@@ -1082,7 +1082,6 @@ export default {
this.localProTableSearch = { ...this.localProTableSearchDefault }; this.localProTableSearch = { ...this.localProTableSearchDefault };
this.projectLibrarySearch = { ...this.projectLibrarySearchDefault }; this.projectLibrarySearch = { ...this.projectLibrarySearchDefault };
this.localProTableSearch.page = 1; this.localProTableSearch.page = 1;
this.isAdvancedSearch = false;
this.getLocalProductTable(); this.getLocalProductTable();
}, },
resolveTime(data) { resolveTime(data) {