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

Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop

Browse Source
This commit is contained in:
宋伟佳
2021-07-28 18:18:56 +08:00
parent e960aa5cdf 021f77f0ed
commit 5123e51408
35 changed files with 1655 additions and 1205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/assets/images/shangqi/img/mechanism.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.8 KiB

src/assets/images/shangqi/img/personnel.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.1 KiB

src/assets/images/shangqi/img/process1.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB

src/assets/images/shangqi/img/process2.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.4 KiB

src/assets/images/shangqi/img/process3.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.7 KiB

src/assets/images/shangqi/img/process4.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.2 KiB

src/assets/images/shangqi/img/process5.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.0 KiB

src/assets/images/shangqi/img/process6.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB

src/assets/styles/newStyle.less
+1
View File
@@ -909,3 +909,4 @@ tr.el-table__row{
.button-list {
padding: 5px 0px;
}
src/components/CustomFormComponents/File.vue
+1 -1
View File
@@ -255,7 +255,7 @@ export default {
uploadSuccess(res, file, fileList) {
if (res.ok) {
// this.value += res.data.id + ','
this.$emit('input', this.value + res.data.id + ',')
this.$emit('input', this.value ? this.value + ',' : this.value+ res.data.id + ',')
this.$emit('success')
this.$message({
message: '文件上传成功',
src/components/roleTree/index.vue
+97 -5
View File
@@ -5,7 +5,7 @@
:visible.sync="isVisible2"
:wrapperClosable="false"
@close="handleTreeDrawerCancel"
size="800px">
size="400px">
<el-form
ref="attributeEO"
class="label-input-form"
@@ -22,7 +22,8 @@
v-if="open1 && isVisible2"
node-key="id"
style="height: 100%; overflow: auto;"
class="filter-tree"
class="filter-tree tree-line"
:class="treeClass"
:data="treeData"
:props="defaultProps"
:default-checked-keys="nodeList"
@@ -34,12 +35,16 @@
ref="tree"
:load="loadNode"
lazy>
<span class="custom-tree-node" slot-scope="{ node, data }">
<span :class="node.disabled ? 'is-show' : 'is-leaf-none'"></span>
<span> {{ node.label }} </span>
</span>
</el-tree>
<el-tree
v-if="!open1 && isVisible2"
node-key="id"
style="height: 100%; overflow: auto;"
class="filter-tree"
class="filter-tree tree-line"
:data="treeData1"
:props="defaultProps"
:default-checked-keys="nodeList"
@@ -50,6 +55,10 @@
default-expand-all
show-checkbox
ref="tree">
<span class="custom-tree-node" slot-scope="{ node, data }">
<span :class="node.disabled ? 'is-show' : 'is-leaf-none'"></span>
<span> {{ node.label }} </span>
</span>
</el-tree>
<div id="roleFormButton" class="demo-drawer-footer">
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="saveUserInfo">确定</el-button>
@@ -89,7 +98,12 @@
filterText: '',
defaultProps: {
children: 'children',
label: 'name'
label: 'name',
isLeaf: (data, node) => {
if (!node.disabled) {
return true
}
}
},
treeData1: [],
treeData: [],
@@ -99,6 +113,9 @@
}
},
methods: {
treeClass () {
},
handleTreeDrawerCancel () {
this.filterText = ''
this.isVisible2 = false
@@ -171,5 +188,80 @@
}
</script>
<style scoped>
<style lang="less" scoped>
/deep/.el-tree-node__content {
padding-left: 0px !important;
}
/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/personnel.png');
background-size:100% 100%;
}
/deep/ .is-show{
position: relative;
display: inline-block;
width: 15px;
height: 15px;
background:url('~@/assets/images/shangqi/img/mechanism.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>
src/components/treeSelect/treeSelectNew.vue
+4
View File
@@ -273,6 +273,10 @@
</script>
<style lang="less" scoped>
/deep/ .expanded{
background-image: none !important;
background-size:100% 100%;
}
.el-drawer__body{
& > div:first-child{
display: flex;
src/pages/config/pages/roleManage/index.vue
+5 -5
View File
@@ -192,7 +192,7 @@
placeholder="请输入角色描述"
clearable></el-input>
</el-form-item>
<el-form-item label="角色状态" prop="useFlag" style="margin-left: 10px">
<el-form-item label="角色状态" prop="useFlag" label-width="80px" class="add-form-item">
<el-select class="bead-input" v-model="addForm.useFlag">
<el-option
v-for="item in options"
@@ -261,6 +261,9 @@ export default {
name: [
{ required: true, message: '请输入角色名称', trigger: 'blur' },
{type: 'string', max: 100, message: '角色名称不能超过100个字符', trigger: 'blur'}
],
useFlag: [
{ required: true, message: '请选择角色状态', trigger: 'change' },
]
},
addForm: {
@@ -392,9 +395,9 @@ export default {
}
})
}
this.addModel = false
}
})
this.addModel = false
},
SuperiorRole () { // 点击选择上级角色按钮
this.SuperiorRoleModel = true
@@ -418,9 +421,6 @@ export default {
this.nodeList3 = []
this.nodeList3.push(this.addForm.parentId)
}
this.$watch('newForm', (newVal, oldVal) => {
console.log(newVal, oldVal);
})
this.addModel = true
},
getTree3 () {
src/pages/details/otherStandardDetails/index.vue
+95 -2
View File
@@ -139,7 +139,6 @@
<span
v-else-if="child.attrType === 'DATE_PICKER'"
class="modular-content-p-val"
:title="child.value || '-'"
>
{{ child.value ? child.value.substring(0,10) : '-' }}
</span>
@@ -201,7 +200,7 @@
</template>
<template
v-for="(child, childIndex) in item.child"
v-if="child.isShowImp === '0' && (item.label !== '实施日期' || (childIndex < 6 || item.showAll))"
v-if="child.isShowImp === '0' && item.label === '关联信息'"
>
<div
:key="child.id"
@@ -293,6 +292,100 @@
</div>
</template>
<template
v-for="(child, childIndex) in item.one"
v-if="child.isShowImp === '0' && item.label !== '关联信息' && (item.label !== '实施日期' || (childIndex < 6 || item.showAll))"
>
<div
:key="child.id"
class="modular-item"
>
<label class="modular-content-p-name" :title="child.attrName">{{ child.attrName }}</label>
<!--相关流程-->
<template v-if="child.attrField === 'XGLC' && child.value">
<p class="modular-content-p-val">
<span v-for="(item, index) in child.value.split(',')" :key="index">
<a @click="processCenterClick(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;" class="span-line">{{item}}</a>
</span>
</p>
</template>
<template
v-else-if="child.attrField === 'DTBJH'|| child.attrField === 'BDTBZBH' || child.attrField === 'YYBJ' || child.attrField === 'BYYBJ' || child.attrField === 'CBBH' || child.attrField === 'DXBZ' || child.attrField === 'BFDTBZ'"
>
<p class="modular-content-p-val" v-if="child.value">
<span v-for="(item, index) in child.value.split(',')" :key="index">
<a @click="showReplaceStandInfo(item)" style="cursor: pointer;color: #0c91e5;margin-right: 5px;" class="span-line">{{item}}</a>
</span>
</p>
<span class="modular-content-p-val" v-else>-</span>
</template>
<span
v-else-if="child.attrField === 'SVPPS'"
class="modular-content-p-val"
:title="child.tips || '-'"
>
{{ !child.value || child.value === 'null' ? '-' : child.value }}
</span>
<span
v-else-if="child.attrType !== 'FILE'"
class="modular-content-p-val"
:title="child.value || '-'"
>
{{ child.value || '-' }}
</span>
<div v-else class="modular-content-p-flies">
<p
class="files-title"
v-for="(file, fileIndex) in child.value"
:key="fileIndex"
>
<!-- <span style="cursor: pointer;" @click="openFileInPdf(file.id, file.oldFileName)">|{{file.id}}|</span>-->
<!--发布稿、增补件单独设置下载权限-->
<template v-if="child.attrField === 'XGD' || child.attrField === 'FBGBJBD' || child.attrField === 'BPG'
|| child.attrField === 'SSG'|| child.attrField === 'ZQYJG'|| child.attrField === 'CA'
|| child.attrField === 'JDWJ' || child.attrField === 'GLWJ'">
<a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a>
<i
title="下载"
@click="downloadFile(file.id)"
class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
/>
<i
title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
/>
<span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
</template>
<template v-else>
<a @click="openFileInPdf(file.id, file.oldFileName)" target="_blank">{{ file.oldFileName }}</a>
<i
title="下载"
@click="downloadFile(file.id)"
class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
/>
<i
title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
/>
<span class="time-text">上传时间：{{ dateFormat(file.modifyTime) }}</span>
</template>
</p>
<!-- <el-button-->
<!-- v-if="child.attrField === 'FBGBJBD' || child.attrField === 'SSG' || child.attrField === 'ZQYJG' || child.attrField === 'BPG' || child.attrField === 'ZBJBD' || child.attrField === 'CA'"-->
<!-- @click="showItemsModel(child.attrField)"-->
<!-- class="decomposition-btn"-->
<!-- icon="icon-separate"-->
<!-- >标准分解单</el-button>-->
</div>
</div>
</template>
<div class="modular-item-more" v-if="item.label === '实施日期' && item.one.length > 6">
<div class="wrap" @click="handleToggleShowAll(item)">
<span>{{ item.showAll ? '收起' : '更多' }}</span>
src/pages/personal/pages/my-collection/components/CollectionStandard.vue
+8 -6
View File
@@ -62,7 +62,7 @@
<el-col :span="4" :offset="3">创建时间：{{getDate(item.creationTime)}}</el-col>
</div>
<el-col :span="4">
<el-button size="mini" @click="cancelStandard(item.id)" style="margin-top: -5px; border: 1px dashed #dcdee2">取消收藏</el-button>
<el-button size="mini" @click="cancelStandard(item)" style="margin-top: -5px; border: 1px dashed #dcdee2">取消收藏</el-button>
</el-col>
</el-row>
</div>
@@ -150,7 +150,7 @@ export default {
}, e => {})
},
// 取消收藏
cancelStandard (id) {
cancelStandard (item) {
this.$confirm('确定取消收藏此数据?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@@ -158,16 +158,18 @@ export default {
confirmButtonClass: 'common-button-primary',
roundButton: true
}).then(() => {
var json = {}
json.userId = this.$store.getters.userInfo.userId
json.id = id
this.$http.postData('/sarPersonalCenter/sar-user-star/delete',json, {
// var json = {
// id: item.collectId
// }
// json.userId = this.$store.getters.userInfo.userId
this.$http.put('person/personCollect/updateByUserId',{'id': item.id}, {
_this: this
}, res => {
if (res.ok) {
this.$message.success('已取消收藏')
this.contentOpen = false
this.pageChange(1)
this.selectStandard()
}
}, e => {
})
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+14 -7
View File
@@ -512,7 +512,7 @@
:key="key1"
:lazy=true
:multiple=true
:check-Strictly="false"
:check-strictly= true
:modalShowFlag="modalShowFlag2"
:drawerTitle="drawerTitle"
:show-checkBox="showCheckBox"
@@ -528,7 +528,7 @@
:key="key2"
:lazy=true
:multiple=true
:check-Strictly="false"
:check-strictly= true
:modalShowFlag="modalShowFlag3"
:drawerTitle="drawerTitle"
:show-checkBox="showCheckBox"
@@ -544,7 +544,7 @@
:key="key3"
:lazy=true
:multiple=true
:check-Strictly="false"
:check-strictly= true
:modalShowFlag="modalShowFlag4"
:drawerTitle="drawerTitle"
:url="url"
@@ -678,8 +678,8 @@
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="采标程度" prop="cbcd" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.cbcd" placeholder="请选择采标程度">
<el-option label="采标程度1" value="1"></el-option>
<el-option label="采标程度2" value="2"></el-option>
<el-option v-for="item in cbcdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">-->
@@ -849,7 +849,7 @@
accept=".pdf, .PDF, .ppt, .PPT, .pptx,.PPTX, .doc, .DOC, .docx, .DOCX, .xls, .xlsx"
:before-upload="beginImportFile"
:on-success="importFileSuccess"
:show-file-list="false"
:show-file-list="true"
>
<div style="padding: 20px 0">
<i class="el-icon-upload" style="color: #3399ff"></i>
@@ -1400,6 +1400,7 @@
categoryOptions: [], // 能源类型
applyAuthOptions: [], // 适用认证
cysdOptions: [], // 我司参与深度
cbcdOptions: [], // 采标程度
wssmrOptions: [], // 我司署名人
sycpxOptions: [], // 适用产品线
zrbmOptions: [], // 责任部门
@@ -1583,6 +1584,7 @@
console.log(bringData)
const json = Object.assign(bringData, bringData.attrInfoCaseMap);
this.form = JSON.parse(JSON.stringify(json))
console.log(json,'AAAAAAA')
this.form.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.split(',') : []
this.form.zrgcs = JSON.parse(JSON.stringify(json)).zrgcs ? JSON.parse(JSON.stringify(json)).zrgcs.split(',') : []
@@ -1962,7 +1964,11 @@
return true
},
// 导入标准数据成功后执行
importFileSuccess (response, file) {
importFileSuccess (response, file,fileList) {
// 上传成功后判断是否是两条数据是的话替换掉旧数据
if (fileList.length > 1) {
fileList.splice(0, 1)
}
if (response.ok) {
this.fileMadel = false
if(this.fileType === 'fbgbjbd'){
@@ -2190,6 +2196,7 @@
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
this.qcdwOption = res.data.QCDW // 体系类别
this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
this.setMap(this.standStateOptions)
})
this.busVsFunc()
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+7 -3
View File
@@ -452,8 +452,7 @@
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="采标程度" prop="cbcd" class="add-form-item form-item-disabled">
<el-select v-model="form.cbcd" placeholder="请选择采标程度" disabled>
<el-option label="采标程度1" value="1"></el-option>
<el-option label="采标程度2" value="2"></el-option>
<el-option v-for="item in cbcdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">
@@ -819,6 +818,7 @@
standSystemOptions: [], // 标准体系
applyArcticOptions: [], // 适用车型
gkglbmOptions: [], // 归口管理部门
cbcdOptions: [], // 采标程度
categoryOptions: [], // 能源类型
applyAuthOptions: [], // 适用认证
cysdOptions: [], // 我司参与深度
@@ -876,8 +876,11 @@
}
},
getRule(){
if (this.formTongGuo.approvalOpinion !== '1') {
if (this.formTongGuo.approvalOpinion === '0') {
this.rules.commentText.required = false
this.$refs.formTongGuo.clearValidate('commentText')
} else {
this.rules.commentText.required = true
}
},
popoverHide (checkedIds, checkedData) {
@@ -1069,6 +1072,7 @@
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
this.txlbOptions = res.data.TXLBCLASS // 体系类别
this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
this.key++
})
this.busVsFunc()
src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+3 -2
View File
@@ -445,8 +445,7 @@
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="采标程度" prop="cbcd" class="add-form-item form-item-disabled">
<el-select v-model="form.cbcd" placeholder="请选择采标程度" disabled>
<el-option label="采标程度1" value="1"></el-option>
<el-option label="采标程度2" value="2"></el-option>
<el-option v-for="item in cbcdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">-->
@@ -793,6 +792,7 @@ export default {
standSystemOptions: [], // 标准体系
applyArcticOptions: [], // 适用车型
gkglbmOptions: [], // 归口管理部门
cbcdOptions: [], // 采标程度
categoryOptions: [], // 能源类型
applyAuthOptions: [], // 适用认证
cysdOptions: [], // 我司参与深度
@@ -1053,6 +1053,7 @@ export default {
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
this.txlbOptions = res.data.TXLBCLASS // 体系类别
this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
this.key++
})
this.busVsFunc()
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+3 -2
View File
@@ -663,8 +663,7 @@
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="采标程度" prop="cbcd" class="add-form-item form-item-disabled">
<el-select v-model="form.cbcd" placeholder="请选择采标程度">
<el-option label="采标程度1" value="1"></el-option>
<el-option label="采标程度2" value="2"></el-option>
<el-option v-for="item in cbcdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">
@@ -1224,6 +1223,7 @@ export default {
applyArcticOptions: [], // 适用车型
categoryOptions: [], // 能源类型
gkglbmOptions: [], // 归口管理部门
cbcdOptions: [], // 采标程度
applyAuthOptions: [], // 适用认证
cysdOptions: [], // 我司参与深度
wssmrOptions: [], // 我司署名人
@@ -1750,6 +1750,7 @@ export default {
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
this.txlbOptions = res.data.TXLBCLASS // 体系类别
this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
this.treeStatus = true
this.key++
})
src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
+3 -2
View File
@@ -463,8 +463,7 @@
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="采标程度" prop="cbcd" class="add-form-item form-item-disabled">
<el-select v-model="form.cbcd" placeholder="请选择采标程度" disabled>
<el-option label="采标程度1" value="1"></el-option>
<el-option label="采标程度2" value="2"></el-option>
<el-option v-for="item in cbcdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">-->
@@ -782,6 +781,7 @@
applyArcticOptions: [], // 适用车型
categoryOptions: [], // 能源类型
gkglbmOptions: [], // 归口管理部门
cbcdOptions: [], // 采标程度
applyAuthOptions: [], // 适用认证
cysdOptions: [], // 我司参与深度
sycpxOptions: [], // 适用产品线
@@ -977,6 +977,7 @@
this.txlbOptions = res.data.TXLBCLASS // 体系类别
this.qcdwOption = res.data.QCDW // 体系类别
this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
})
}
}
src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+15 -20
View File
@@ -288,18 +288,7 @@ export default {
ProcessFooter,
ProcessTitle
},
mounted () {
this.getJsonData()
},
methods: {
getJsonData() {
const params = {
type: '8'
}
startProcess(params).then(res => {
this.taskID = res.data
})
},
//点击新增事件
addList() {
standUnqualified(this.queryUnqualidiedData).then(res => {
@@ -383,15 +372,21 @@ export default {
} else {
this.$refs['roleForm'].validate((valid) => {
if (valid) {
const params = new FormData();
params.set('json', JSON.stringify(json))
params.set('userId', this.$store.getters.userInfo.userId)
params.set('taskIds', this.taskID)
completeTask(params).then(res => {
if(res.success === true) {
this.$message.success('提交成功')
this.$router.push("/processCenter");
}
const paramsInfo = {
type: '8'
}
startProcess(paramsInfo).then(res => {
this.taskID = res.data
const params = new FormData();
params.set('json', JSON.stringify(json))
params.set('userId', this.$store.getters.userInfo.userId)
params.set('taskIds', this.taskID)
completeTask(params).then(res => {
if(res.success === true) {
this.$message.success('提交成功')
this.$router.push("/processCenter");
}
})
})
}
})
src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
+128 -121
View File
@@ -41,92 +41,98 @@
<template slot="title">填写信息</template>
</process-title>
<el-table
:data="dataList"
border
ref="selection"
height="70%"
style="width: 100%; border:1px solid #ccc"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
:data="dataList"
style="width: 100%; border: 1px solid #cccccc"
row-key="standId"
height="70%"
border
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
>
<el-table-column
type="selection"
width="55"
align="center">
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="standNumber"
align="center"
width="200"
label="标准编号">
prop="standEnName"
label="标准编号"
width="180"
fixed="left"
align="center"
>
</el-table-column>
<el-table-column
prop="standName"
align="center"
width="200"
label="标准名称">
prop="standName"
fixed="left"
width="180"
align="center"
label="标准名称"
>
</el-table-column>
<el-table-column
prop="itemNum"
align="center"
width="200"
label="条款号">
prop="itemsNum"
align="center"
width="200"
label="条款号">
</el-table-column>
<el-table-column
prop="itemsName"
width="200"
align="center"
label="条款名称">
prop="itemsName"
width="200"
align="center"
label="条款名称">
</el-table-column>
<el-table-column
prop="xCXSSRQ"
width="200"
align="center"
label="新车型实施日期">
prop="xcxssrqgj"
width="200"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="zCCSSRQ"
width="200"
align="center"
label="在产车实施日期">
prop="zccssrqgj"
width="200"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
<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="在研产品">
prop="productType"
align="center"
label="在研产品">
<el-table-column
prop="complianceReasons"
align="center"
width="160"
label="合规">
prop="complianceReasons"
align="center"
width="160"
label="合规">
</el-table-column>
<el-table-column
align="center"
width="160"
prop="researchNonCompliance"
label="不合规">
align="center"
width="160"
prop="researchNonCompliance"
label="不合规">
<el-table-column
prop="noCompliance"
align="center"
width="160"
label="不合规项目">
prop="noCompliance"
align="center"
width="160"
label="不合规项目">
</el-table-column>
<el-table-column
prop="countermeasures"
align="center"
width="160"
label="应对措施">
prop="countermeasures"
align="center"
width="160"
label="应对措施">
</el-table-column>
<el-table-column
prop="completionTime"
align="center"
width="160"
label="完成时间">
prop="completionTime"
align="center"
width="160"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
</template>
@@ -134,48 +140,41 @@
</el-table-column>
</el-table-column>
<el-table-column
align="center"
label="在产产品">
align="center"
label="在产产品">
<el-table-column
prop="zcComplianceReasons"
align="center"
width="160"
label="合规(具体情况)">
prop="zcComplianceReasons"
align="center"
width="160"
label="合规(具体情况)">
</el-table-column>
<el-table-column
align="center"
width="160"
label="不合规">
align="center"
width="160"
label="不合规">
<el-table-column
prop="zcNoCompliance"
align="center"
width="160"
label="不合规项目">
prop="zcNoCompliance"
align="center"
width="160"
label="不合规项目">
</el-table-column>
<el-table-column
prop="zcCountermeasures"
align="center"
width="160"
label="应对措施">
prop="zcCountermeasures"
align="center"
width="160"
label="应对措施">
</el-table-column>
<el-table-column
prop="zcCompletionTime"
align="center"
width="160"
label="完成时间">
prop="zcCompletionTime"
align="center"
width="160"
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
fixed="right"
align="center"
width="150"
prop="workPeople"
label="落实人">
</el-table-column>
</el-table>
</div>
<div>
@@ -297,7 +296,7 @@ export default {
saveLoading: false,
//表单的数据
listForm: {
BZFlag: " ", //1审批通过 其他为驳回
bzFlag: " ", //1审批通过 其他为驳回
projectNumber: "", //项目编号
projectName: "", //项目名称
dataList: [], //项目下的标准数据
@@ -359,42 +358,50 @@ export default {
},
//驳回事件
beforeBack() {
this.listForm.BZFlag = "2";
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");
}
}, e => {
});
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
}else{
this.listForm.bzFlag = "2";
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");
}
}, e => {
});
}
},
//提交事件
handleSubmit() {
this.listForm.BZFlag = "1";
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");
}
}, e => {
});
}
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
}else{
this.listForm.bzFlag = "1";
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");
}
}, e => {
});
}
},
},
computed: {
listNoDataText() {
src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
+129 -121
View File
@@ -41,92 +41,98 @@
<template slot="title">填写信息</template>
</process-title>
<el-table
:data="dataList"
border
ref="selection"
height="70%"
style="width: 100%; border:1px solid #ccc"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
:data="dataList"
style="width: 100%; border: 1px solid #cccccc"
row-key="standId"
height="70%"
border
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
>
<el-table-column
type="selection"
width="55"
align="center">
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="standNumber"
align="center"
width="200"
label="标准编号">
prop="standEnName"
label="标准编号"
width="180"
fixed="left"
align="center"
>
</el-table-column>
<el-table-column
prop="standName"
align="center"
width="200"
label="标准名称">
prop="standName"
fixed="left"
width="180"
align="center"
label="标准名称"
>
</el-table-column>
<el-table-column
prop="itemNum"
align="center"
width="200"
label="条款号">
prop="itemsNum"
align="center"
width="200"
label="条款号">
</el-table-column>
<el-table-column
prop="itemsName"
width="200"
align="center"
label="条款名称">
prop="itemsName"
width="200"
align="center"
label="条款名称">
</el-table-column>
<el-table-column
prop="xCXSSRQ"
width="200"
align="center"
label="新车型实施日期">
prop="xcxssrqgj"
width="200"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="zCCSSRQ"
width="200"
align="center"
label="在产车实施日期">
prop="zccssrqgj"
width="200"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
<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="在研产品">
prop="productType"
align="center"
label="在研产品">
<el-table-column
prop="complianceReasons"
align="center"
width="160"
label="合规">
prop="complianceReasons"
align="center"
width="160"
label="合规">
</el-table-column>
<el-table-column
align="center"
width="160"
prop="researchNonCompliance"
label="不合规">
align="center"
width="160"
prop="researchNonCompliance"
label="不合规">
<el-table-column
prop="noCompliance"
align="center"
width="160"
label="不合规项目">
prop="noCompliance"
align="center"
width="160"
label="不合规项目">
</el-table-column>
<el-table-column
prop="countermeasures"
align="center"
width="160"
label="应对措施">
prop="countermeasures"
align="center"
width="160"
label="应对措施">
</el-table-column>
<el-table-column
prop="completionTime"
align="center"
width="160"
label="完成时间">
prop="completionTime"
align="center"
width="160"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
</template>
@@ -134,48 +140,41 @@
</el-table-column>
</el-table-column>
<el-table-column
align="center"
label="在产产品">
align="center"
label="在产产品">
<el-table-column
prop="zcComplianceReasons"
align="center"
width="160"
label="合规(具体情况)">
prop="zcComplianceReasons"
align="center"
width="160"
label="合规(具体情况)">
</el-table-column>
<el-table-column
align="center"
width="160"
label="不合规">
align="center"
width="160"
label="不合规">
<el-table-column
prop="zcNoCompliance"
align="center"
width="160"
label="不合规项目">
prop="zcNoCompliance"
align="center"
width="160"
label="不合规项目">
</el-table-column>
<el-table-column
prop="zcCountermeasures"
align="center"
width="160"
label="应对措施">
prop="zcCountermeasures"
align="center"
width="160"
label="应对措施">
</el-table-column>
<el-table-column
prop="zcCompletionTime"
align="center"
width="160"
label="完成时间">
prop="zcCompletionTime"
align="center"
width="160"
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
fixed="right"
align="center"
width="150"
prop="workPeople"
label="落实人">
</el-table-column>
</el-table>
</div>
<div>
@@ -297,7 +296,7 @@ export default {
saveLoading: false,
//表单的数据
listForm: {
BZFlag: " ", //1审批通过 其他为驳回
bzFlag: " ", //1审批通过 其他为驳回
projectNumber: "", //项目编号
projectName: "", //项目名称
dataList: [], //项目下的标准数据
@@ -359,43 +358,52 @@ export default {
},
//驳回事件
beforeBack() {
this.listForm.BZFlag = "2";
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");
}
}, e => {
});
if (this.commentText === null || this.commentText === undefined || this.commentText === '') {
this.$message.warning('请填写审批意见')
} else {
this.listForm.bzFlag = "2";
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");
}
}, e => {
});
}
},
//提交事件
handleSubmit() {
this.listForm.BZFlag = "1";
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");
}
}, e => {
});
}
if (this.commentText === null || this.commentText === undefined || this.commentText === '') {
this.$message.warning('请填写审批意见')
} else {
this.listForm.bzFlag = "1";
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");
}
}, e => {
});
}
},
},
computed: {
listNoDataText() {
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
+129 -122
View File
@@ -41,92 +41,98 @@
<template slot="title">填写信息</template>
</process-title>
<el-table
:data="dataList"
border
ref="selection"
height="70%"
style="width: 100%; border:1px solid #ccc"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
:data="dataList"
style="width: 100%; border: 1px solid #cccccc"
row-key="standId"
height="70%"
border
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
>
<el-table-column
type="selection"
width="55"
align="center">
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="standNumber"
align="center"
width="200"
label="标准编号">
prop="standEnName"
label="标准编号"
width="180"
fixed="left"
align="center"
>
</el-table-column>
<el-table-column
prop="standName"
align="center"
width="200"
label="标准名称">
prop="standName"
fixed="left"
width="180"
align="center"
label="标准名称"
>
</el-table-column>
<el-table-column
prop="itemNum"
align="center"
width="200"
label="条款号">
prop="itemsNum"
align="center"
width="200"
label="条款号">
</el-table-column>
<el-table-column
prop="itemsName"
width="200"
align="center"
label="条款名称">
prop="itemsName"
width="200"
align="center"
label="条款名称">
</el-table-column>
<el-table-column
prop="xCXSSRQ"
width="200"
align="center"
label="新车型实施日期">
prop="xcxssrqgj"
width="200"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="zCCSSRQ"
width="200"
align="center"
label="在产车实施日期">
prop="zccssrqgj"
width="200"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
<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="在研产品">
prop="productType"
align="center"
label="在研产品">
<el-table-column
prop="complianceReasons"
align="center"
width="160"
label="合规">
prop="complianceReasons"
align="center"
width="160"
label="合规">
</el-table-column>
<el-table-column
align="center"
width="160"
prop="researchNonCompliance"
label="不合规">
align="center"
width="160"
prop="researchNonCompliance"
label="不合规">
<el-table-column
prop="noCompliance"
align="center"
width="160"
label="不合规项目">
prop="noCompliance"
align="center"
width="160"
label="不合规项目">
</el-table-column>
<el-table-column
prop="countermeasures"
align="center"
width="160"
label="应对措施">
prop="countermeasures"
align="center"
width="160"
label="应对措施">
</el-table-column>
<el-table-column
prop="completionTime"
align="center"
width="160"
label="完成时间">
prop="completionTime"
align="center"
width="160"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
</template>
@@ -134,48 +140,41 @@
</el-table-column>
</el-table-column>
<el-table-column
align="center"
label="在产产品">
align="center"
label="在产产品">
<el-table-column
prop="zcComplianceReasons"
align="center"
width="160"
label="合规(具体情况)">
prop="zcComplianceReasons"
align="center"
width="160"
label="合规(具体情况)">
</el-table-column>
<el-table-column
align="center"
width="160"
label="不合规">
align="center"
width="160"
label="不合规">
<el-table-column
prop="zcNoCompliance"
align="center"
width="160"
label="不合规项目">
prop="zcNoCompliance"
align="center"
width="160"
label="不合规项目">
</el-table-column>
<el-table-column
prop="zcCountermeasures"
align="center"
width="160"
label="应对措施">
prop="zcCountermeasures"
align="center"
width="160"
label="应对措施">
</el-table-column>
<el-table-column
prop="zcCompletionTime"
align="center"
width="160"
label="完成时间">
prop="zcCompletionTime"
align="center"
width="160"
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
fixed="right"
align="center"
width="150"
prop="workPeople"
label="落实人">
</el-table-column>
</el-table>
</div>
<div>
@@ -297,7 +296,7 @@ export default {
saveLoading: false,
//表单的数据
listForm: {
BZFlag: " ", //1审批通过 其他为驳回
dlFlag: " ", //1审批通过 其他为驳回
projectNumber: "", //项目编号
projectName: "", //项目名称
dataList: [], //项目下的标准数据
@@ -359,42 +358,50 @@ export default {
},
//驳回事件
beforeBack() {
this.listForm.BZFlag = "2";
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");
}
}, e => {
});
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
}else{
this.listForm.dlFlag = "2";
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");
}
}, e => {
});
}
},
//提交事件
handleSubmit() {
this.listForm.BZFlag = "1";
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");
}
}, e => {
});
}
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
}else{
this.listForm.dlFlag = "1";
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");
}
}, e => {
});
}
},
},
computed: {
listNoDataText() {
@@ -404,7 +411,7 @@ export default {
mounted() {
this.processTable();
this.getData();
}
},
};
</script>
src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+18 -47
View File
@@ -72,7 +72,7 @@
>
</el-table-column>
<el-table-column
prop="itemNum"
prop="itemsNum"
align="center"
width="200"
label="条款号">
@@ -84,21 +84,21 @@
label="条款名称">
</el-table-column>
<el-table-column
prop="xCXSSRQ"
prop="xcxssrqgj"
width="200"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="zCCSSRQ"
prop="zccssrqgj"
width="200"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
@@ -112,7 +112,7 @@
label="合规">
<template slot-scope="scope">
<el-input
v-model="dataList[scope.$index].complianceReasons"
v-model="scope.row.complianceReasons"
placeholder="请输入合规原因"
>
</el-input>
@@ -130,7 +130,7 @@
label="不合规项目">
<template slot-scope="scope">
<el-input
v-model="dataList[scope.$index].noCompliance"
v-model="scope.row.noCompliance"
placeholder="请输入不合规项目"
>
</el-input>
@@ -143,7 +143,7 @@
label="应对措施">
<template slot-scope="scope">
<el-input
v-model="dataList[scope.$index].countermeasures"
v-model="scope.row.countermeasures"
placeholder="请输入应对措施"
>
</el-input>
@@ -156,7 +156,7 @@
label="完成时间">
<template slot-scope="scope">
<el-date-picker
v-model="dataList[scope.$index].completionTime"
v-model="scope.row.completionTime"
type="date"
placeholder="选择日期">
</el-date-picker>
@@ -174,7 +174,7 @@
label="合规(具体情况)">
<template slot-scope="scope">
<el-input
v-model="dataList[scope.$index].zcComplianceReasons"
v-model="scope.row.zcComplianceReasons"
placeholder="请输入合规原因"
>
</el-input>
@@ -191,7 +191,7 @@
label="不合规项目">
<template slot-scope="scope">
<el-input
v-model="dataList[scope.$index].zcNoCompliance"
v-model="scope.row.zcNoCompliance"
placeholder="请输入不合规项目"
>
</el-input>
@@ -204,7 +204,7 @@
label="应对措施">
<template slot-scope="scope">
<el-input
v-model="dataList[scope.$index].zcCountermeasures"
v-model="scope.row.zcCountermeasures"
placeholder="请输入应对措施"
>
</el-input>
@@ -217,7 +217,7 @@
label="完成时间">
<template slot-scope="scope">
<el-date-picker
v-model="dataList[scope.$index].zcCompletionTime"
v-model="scope.row.zcCompletionTime"
type="date"
placeholder="选择日期">
</el-date-picker>
@@ -396,6 +396,7 @@ export default {
pId: this.pId
}).then(res => {
if (res) {
console.log(res.mesg)
const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm);
}
@@ -407,37 +408,13 @@ export default {
getFormFieldList(item) {
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item));
console.log(this.listForm)
this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
this.dataList = item.dataList;
let children = [];
item.breakdownList.forEach(
item => {
let aa = {
key: item.standId,
id: item.id,
standId: item.itemsNum,
itemsNum: item.itemsNum,
itemsName: item.itemsName,
workPeople: "请选择责任人"
};
children.push(aa);
}
);
this.dataList.forEach(key => {
key["children"] = [];
children.forEach(breakDown => {
if (key.standId === breakDown.key) {
key["children"].push(breakDown);
}
});
if (key["children"].length === 0) {
delete key["children"];
}
});
this.listForm.children = children;
// this.listForm.dataList = item.dataList;
this.dataList = this.listForm.dataList;
console.log(this.dataList)
});
},
//保存事件
@@ -446,8 +423,6 @@ export default {
},
//提交事件
handleSubmit() {
this.listForm.dataList.forEach(item => {
if (item.workPeople !== undefined) {
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", {
@@ -463,10 +438,6 @@ export default {
}
}, e => {
});
} else {
this.$message.warning("请选择分发负责人");
}
});
},
//标准表格选择框改变
selectStandChange(data) {
src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
+473 -467
View File
@@ -1,485 +1,491 @@
<template>
<div class="xmpg2-step7">
<ProcessHeader toggle>
<template slot="proName">项目合规评估流程-项目</template>
<template slot="proNode">分发责任人审批</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto">
<process-title>
<template slot="title">基础信息</template>
</process-title>
<el-form
:model="listForm"
class="label-input-form prc-content-border"
label-width="150px"
>
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="项目编号" prop="projectNumber" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.projectNumber"
placeholder="请输入项目编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="项目名称" prop="projectName" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.projectName"
placeholder="请输入项目名称"
clearable
></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<process-title style="margin-top:5px; margin-bottom: 5px">
<template slot="title">填写信息</template>
</process-title>
<el-table
:data="dataList"
border
ref="selection"
height="70%"
style="width: 100%; border:1px solid #ccc"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="standNumber"
align="center"
width="200"
label="标准编号">
</el-table-column>
<el-table-column
prop="standName"
align="center"
width="200"
label="标准名称">
</el-table-column>
<el-table-column
prop="itemNum"
align="center"
width="200"
label="条款号">
</el-table-column>
<el-table-column
prop="itemsName"
width="200"
align="center"
label="条款名称">
</el-table-column>
<el-table-column
prop="xCXSSRQ"
width="200"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column
prop="zCCSSRQ"
width="200"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<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="complianceReasons"
align="center"
width="160"
label="合规">
</el-table-column>
<el-table-column
align="center"
width="160"
prop="researchNonCompliance"
label="不合规">
<el-table-column
prop="noCompliance"
align="center"
width="160"
label="不合规项目">
</el-table-column>
<el-table-column
prop="countermeasures"
align="center"
width="160"
label="应对措施">
</el-table-column>
<el-table-column
prop="completionTime"
align="center"
width="160"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
</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="160"
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="160"
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
fixed="right"
align="center"
width="150"
prop="workPeople"
label="落实人">
</el-table-column>
</el-table>
</div>
<div>
<el-collapse accordion>
<el-collapse-item title="意见填写">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
<div class="xmpg2-step7">
<ProcessHeader toggle>
<template slot="proName">项目合规评估流程-项目</template>
<template slot="proNode">分发责任人审批</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto">
<process-title>
<template slot="title">基础信息</template>
</process-title>
<el-form
:model="listForm"
class="label-input-form prc-content-border"
label-width="150px"
>
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="项目编号" prop="projectNumber" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.projectNumber"
placeholder="请输入项目编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="项目名称" prop="projectName" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.projectName"
placeholder="请输入项目名称"
clearable
></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<process-title style="margin-top:5px; margin-bottom: 5px">
<template slot="title">填写信息</template>
</process-title>
<el-table
:data="dataList"
style="width: 100%; border: 1px solid #cccccc"
row-key="standId"
height="70%"
border
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
>
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="standEnName"
label="标准编号"
width="180"
fixed="left"
align="center"
>
</el-table-column>
<el-table-column
prop="standName"
fixed="left"
width="180"
align="center"
label="标准名称"
>
</el-table-column>
<el-table-column
prop="itemsNum"
align="center"
width="200"
label="条款号">
</el-table-column>
<el-table-column
prop="itemsName"
width="200"
align="center"
label="条款名称">
</el-table-column>
<el-table-column
prop="xcxssrqgj"
width="200"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="zccssrqgj"
width="200"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<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"
width="160"
label="合规">
</el-table-column>
<el-table-column
align="center"
width="160"
prop="researchNonCompliance"
label="不合规">
<el-table-column
prop="noCompliance"
align="center"
width="160"
label="不合规项目">
</el-table-column>
<el-table-column
prop="countermeasures"
align="center"
width="160"
label="应对措施">
</el-table-column>
<el-table-column
prop="completionTime"
align="center"
width="160"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
</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="160"
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="160"
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>
</div>
</el-collapse-item>
</el-collapse>
</div>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list" style="height: 100%">
<el-table
height="100%"
ref="selection"
:data="detailData"
tooltip-effect="dark"
style="width: 100%"
border
row-key="id"
:no-data-text="listNoDataText"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
<div>
<el-collapse accordion>
<el-collapse-item title="意见填写">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list" style="height: 100%">
<el-table
height="100%"
ref="selection"
:data="detailData"
tooltip-effect="dark"
style="width: 100%"
border
row-key="id"
:no-data-text="listNoDataText"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
>
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="name"
label="任务步骤"
align="center"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="endTime"
label="完成时间"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="comment"
label="审批意见"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.commentText }}</span>
</template>
</el-table-column>
<el-table-column
prop="completeFlag"
label="状态"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
</template>
</el-table-column>
</el-table>
<loading :loading="loading">流程列表加载中</loading>
</div>
</div>
<ProcessFooter
show-back
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
:approval="true"
@back="beforeBack"
@submit="handleSubmit"
>
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="name"
label="任务步骤"
align="center"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="endTime"
label="完成时间"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="comment"
label="审批意见"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.commentText }}</span>
</template>
</el-table-column>
<el-table-column
prop="completeFlag"
label="状态"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
</template>
</el-table-column>
</el-table>
<loading :loading="loading">流程列表加载中</loading>
</div>
</ProcessFooter>
</div>
<ProcessFooter
show-back
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
:approval="true"
@back="beforeBack"
@submit="handleSubmit"
>
</ProcessFooter>
</div>
</template>
<script>
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail, queryDetail } from "api/process";
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import {inboundLiaisonDetail, queryDetail} from "api/process";
export default {
name: "xmpg2Step7",
components: {
ProcessTitle,
ProcessHeader,
ProcessFooter
},
data() {
return {
active: "1",
loading: false,
// 当前流程类型(1待办/2已办)
processType: 1,
isSubmit: false,
saveLoading: false,
//表单的数据
listForm: {
BZFlag: " ", //1审批通过 其他为驳回
projectNumber: "", //项目编号
projectName: "", //项目名称
dataList: [], //项目下的标准数据
breakdownList: [] //标准下的分解单数据
},
dataList: [], //展示的标准数据
commentText: "", //审批意见
detailData: [],//流程历史数据
userId: this.$store.getters.userInfo.userId,
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId
export default {
name: "xmpg2Step7",
components: {
ProcessTitle,
ProcessHeader,
ProcessFooter
},
data() {
return {
active: "1",
loading: false,
// 当前流程类型(1待办/2已办)
processType: 1,
isSubmit: false,
saveLoading: false,
//表单的数据
listForm: {
ffFlag: " ", //1审批通过 其他为驳回
projectNumber: "", //项目编号
projectName: "", //项目名称
dataList: [], //项目下的标准数据
breakdownList: [] //标准下的分解单数据
},
dataList: [], //展示的标准数据
commentText: "", //审批意见
detailData: [],//流程历史数据
userId: this.$store.getters.userInfo.userId,
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId
};
},
methods: {
processTable() {
this.$http.get("lawss/activiti/get_list_by_instance", {
prcNum: this.$route.query.prcNum,
sortWord: this.shunxu ? this.paixu : "",
shunxu: this.shunxu
}, {
loading: "loading",
_this: this
}, res => {
this.detailData = res;
}, e => {
});
},
//tab改变
handleTabs(type) {
this.active = type;
},
//获取数据
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
if (res) {
const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm);
}
}).catch(e => {
});
});
},
//动态表单读取
getFormFieldList(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;
this.dataList = item.dataList;
this.dataList.distributePerson = item.dataList[0].distributePerson;
this.listForm.breakdownList = item.breakdownList;
});
},
//驳回事件
beforeBack() {
if (this.commentText === null || this.commentText === undefined || this.commentText === '') {
this.$message.warning('请填写审批意见')
} else {
this.listForm.ffFlag = "2";
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");
}
}, e => {
});
}
},
//提交事件
handleSubmit() {
if (this.commentText === null || this.commentText === undefined || this.commentText === '') {
this.$message.warning('请填写审批意见')
} else {
this.listForm.ffFlag = "1";
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");
}
});
}
},
},
computed: {
listNoDataText() {
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
}
},
mounted() {
this.processTable();
this.getData();
},
};
},
methods: {
processTable() {
this.$http.get("lawss/activiti/get_list_by_instance", {
prcNum: this.$route.query.prcNum,
sortWord: this.shunxu ? this.paixu : "",
shunxu: this.shunxu
}, {
loading: "loading",
_this: this
}, res => {
this.detailData = res;
}, e => {
});
},
//tab改变
handleTabs(type) {
this.active = type;
},
//获取数据
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
if (res) {
const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm);
}
}).catch(e => {
});
});
},
//动态表单读取
getFormFieldList(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;
this.dataList = item.dataList;
this.dataList.distributePerson = item.dataList[0].distributePerson;
this.listForm.breakdownList = item.breakdownList;
});
},
//驳回事件
beforeBack() {
this.listForm.BZFlag = "2";
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");
}
}, e => {
});
},
//提交事件
handleSubmit() {
this.listForm.BZFlag = "1";
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");
}
}, e => {
});
}
},
computed: {
listNoDataText() {
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
}
},
mounted() {
this.processTable();
this.getData();
}
};
</script>
<style lang="less" scoped>
@import '~@/assets/styles/style';
@import '~@/assets/styles/style';
.xmpg2-step7 {
/deep/ .el-drawer__container {
.prc-content-border {
border: none;
padding: 0 20px 0;
}
}
.xmpg2-step7 {
/deep/ .el-drawer__container {
.prc-content-border {
border: none;
padding: 0 20px 0;
}
}
.choiceBtn {
.el-button--primary {
width: 150px;
}
}
.choiceBtn {
.el-button--primary {
width: 150px;
}
}
position: relative;
height: 100%;
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 0;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
display: flex;
flex-direction: column;
justify-content: space-between;
height: calc(~'100% - 103px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
height: 30px;
line-height: 30px;
position: relative;
font-size: 13px;
font-weight: bold;
.tableButton {
position: absolute;
right: 0;
top: 0;
}
.accessStandardsAndRegulations {
position: relative;
height: 100%;
}
}
}
.demo-drawer-content {
margin-top: 10px;
}
}
.headerTabs {
height: 52px;
display: flex;
align-items: center;
position: absolute;
top: 0;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
height: 30px;
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content {
display: flex;
flex-direction: column;
justify-content: space-between;
height: calc(~'100% - 103px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
height: 30px;
line-height: 30px;
position: relative;
font-size: 13px;
font-weight: bold;
.tableButton {
position: absolute;
right: 0;
top: 0;
}
.accessStandardsAndRegulations {
height: 100%;
}
}
}
.demo-drawer-content {
margin-top: 10px;
}
}
</style>
src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
+128 -121
View File
@@ -41,92 +41,98 @@
<template slot="title">填写信息</template>
</process-title>
<el-table
:data="dataList"
border
ref="selection"
height="70%"
style="width: 100%; border:1px solid #ccc"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
:data="dataList"
style="width: 100%; border: 1px solid #cccccc"
row-key="standId"
height="70%"
border
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
>
<el-table-column
type="selection"
width="55"
align="center">
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="standNumber"
align="center"
width="200"
label="标准编号">
prop="standEnName"
label="标准编号"
width="180"
fixed="left"
align="center"
>
</el-table-column>
<el-table-column
prop="standName"
align="center"
width="200"
label="标准名称">
prop="standName"
fixed="left"
width="180"
align="center"
label="标准名称"
>
</el-table-column>
<el-table-column
prop="itemNum"
align="center"
width="200"
label="条款号">
prop="itemsNum"
align="center"
width="200"
label="条款号">
</el-table-column>
<el-table-column
prop="itemsName"
width="200"
align="center"
label="条款名称">
prop="itemsName"
width="200"
align="center"
label="条款名称">
</el-table-column>
<el-table-column
prop="xCXSSRQ"
width="200"
align="center"
label="新车型实施日期">
prop="xcxssrqgj"
width="200"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="zCCSSRQ"
width="200"
align="center"
label="在产车实施日期">
prop="zccssrqgj"
width="200"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
<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="在研产品">
prop="productType"
align="center"
label="在研产品">
<el-table-column
prop="complianceReasons"
align="center"
width="160"
label="合规">
prop="complianceReasons"
align="center"
width="160"
label="合规">
</el-table-column>
<el-table-column
align="center"
width="160"
prop="researchNonCompliance"
label="不合规">
align="center"
width="160"
prop="researchNonCompliance"
label="不合规">
<el-table-column
prop="noCompliance"
align="center"
width="160"
label="不合规项目">
prop="noCompliance"
align="center"
width="160"
label="不合规项目">
</el-table-column>
<el-table-column
prop="countermeasures"
align="center"
width="160"
label="应对措施">
prop="countermeasures"
align="center"
width="160"
label="应对措施">
</el-table-column>
<el-table-column
prop="completionTime"
align="center"
width="160"
label="完成时间">
prop="completionTime"
align="center"
width="160"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
</template>
@@ -134,48 +140,41 @@
</el-table-column>
</el-table-column>
<el-table-column
align="center"
label="在产产品">
align="center"
label="在产产品">
<el-table-column
prop="zcComplianceReasons"
align="center"
width="160"
label="合规(具体情况)">
prop="zcComplianceReasons"
align="center"
width="160"
label="合规(具体情况)">
</el-table-column>
<el-table-column
align="center"
width="160"
label="不合规">
align="center"
width="160"
label="不合规">
<el-table-column
prop="zcNoCompliance"
align="center"
width="160"
label="不合规项目">
prop="zcNoCompliance"
align="center"
width="160"
label="不合规项目">
</el-table-column>
<el-table-column
prop="zcCountermeasures"
align="center"
width="160"
label="应对措施">
prop="zcCountermeasures"
align="center"
width="160"
label="应对措施">
</el-table-column>
<el-table-column
prop="zcCompletionTime"
align="center"
width="160"
label="完成时间">
prop="zcCompletionTime"
align="center"
width="160"
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
fixed="right"
align="center"
width="150"
prop="workPeople"
label="落实人">
</el-table-column>
</el-table>
</div>
<div>
@@ -297,7 +296,7 @@ export default {
saveLoading: false,
//表单的数据
listForm: {
BZFlag: " ", //1审批通过 其他为驳回
jgFlag: " ", //1审批通过 其他为驳回
projectNumber: "", //项目编号
projectName: "", //项目名称
dataList: [], //项目下的标准数据
@@ -359,42 +358,50 @@ export default {
},
//驳回事件
beforeBack() {
this.listForm.BZFlag = "2";
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");
}
}, e => {
});
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
}else{
this.listForm.jgFlag = "2";
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");
}
}, e => {
});
}
},
//提交事件
handleSubmit() {
this.listForm.BZFlag = "1";
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");
}
}, e => {
});
}
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
}else{
this.listForm.jgFlag = "1";
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");
}
}, e => {
});
}
},
},
computed: {
listNoDataText() {
src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
+127 -120
View File
@@ -41,92 +41,98 @@
<template slot="title">填写信息</template>
</process-title>
<el-table
:data="dataList"
border
ref="selection"
height="70%"
style="width: 100%; border:1px solid #ccc"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
:data="dataList"
style="width: 100%; border: 1px solid #cccccc"
row-key="standId"
height="70%"
border
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
>
<el-table-column
type="selection"
width="55"
align="center">
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="standNumber"
align="center"
width="200"
label="标准编号">
prop="standEnName"
label="标准编号"
width="180"
fixed="left"
align="center"
>
</el-table-column>
<el-table-column
prop="standName"
align="center"
width="200"
label="标准名称">
prop="standName"
fixed="left"
width="180"
align="center"
label="标准名称"
>
</el-table-column>
<el-table-column
prop="itemNum"
align="center"
width="200"
label="条款号">
prop="itemsNum"
align="center"
width="200"
label="条款号">
</el-table-column>
<el-table-column
prop="itemsName"
width="200"
align="center"
label="条款名称">
prop="itemsName"
width="200"
align="center"
label="条款名称">
</el-table-column>
<el-table-column
prop="xCXSSRQ"
width="200"
align="center"
label="新车型实施日期">
prop="xcxssrqgj"
width="200"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xCXSSRQ ? $moment(scope.row.xCXSSRQ).format('YYYY-MM-DD') : '' }}</span>
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="zCCSSRQ"
width="200"
align="center"
label="在产车实施日期">
prop="zccssrqgj"
width="200"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format('YYYY-MM-DD') : '' }}</span>
<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="在研产品">
prop="productType"
align="center"
label="在研产品">
<el-table-column
prop="complianceReasons"
align="center"
width="160"
label="合规">
prop="complianceReasons"
align="center"
width="160"
label="合规">
</el-table-column>
<el-table-column
align="center"
width="160"
prop="researchNonCompliance"
label="不合规">
align="center"
width="160"
prop="researchNonCompliance"
label="不合规">
<el-table-column
prop="noCompliance"
align="center"
width="160"
label="不合规项目">
prop="noCompliance"
align="center"
width="160"
label="不合规项目">
</el-table-column>
<el-table-column
prop="countermeasures"
align="center"
width="160"
label="应对措施">
prop="countermeasures"
align="center"
width="160"
label="应对措施">
</el-table-column>
<el-table-column
prop="completionTime"
align="center"
width="160"
label="完成时间">
prop="completionTime"
align="center"
width="160"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
</template>
@@ -134,48 +140,41 @@
</el-table-column>
</el-table-column>
<el-table-column
align="center"
label="在产产品">
align="center"
label="在产产品">
<el-table-column
prop="zcComplianceReasons"
align="center"
width="160"
label="合规(具体情况)">
prop="zcComplianceReasons"
align="center"
width="160"
label="合规(具体情况)">
</el-table-column>
<el-table-column
align="center"
width="160"
label="不合规">
align="center"
width="160"
label="不合规">
<el-table-column
prop="zcNoCompliance"
align="center"
width="160"
label="不合规项目">
prop="zcNoCompliance"
align="center"
width="160"
label="不合规项目">
</el-table-column>
<el-table-column
prop="zcCountermeasures"
align="center"
width="160"
label="应对措施">
prop="zcCountermeasures"
align="center"
width="160"
label="应对措施">
</el-table-column>
<el-table-column
prop="zcCompletionTime"
align="center"
width="160"
label="完成时间">
prop="zcCompletionTime"
align="center"
width="160"
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
fixed="right"
align="center"
width="150"
prop="workPeople"
label="落实人">
</el-table-column>
</el-table>
</div>
<div>
@@ -359,42 +358,50 @@ export default {
},
//驳回事件
beforeBack() {
this.listForm.BZFlag = "2";
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");
}
}, e => {
});
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
}else{
this.listForm.gcFlag = "2";
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");
}
}, e => {
});
}
},
//提交事件
handleSubmit() {
this.listForm.BZFlag = "1";
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");
}
}, e => {
});
}
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
}else{
this.listForm.gcFlag = "1";
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");
}
}, e => {
});
}
},
},
computed: {
listNoDataText() {
src/pages/processCenter/pages/newProcess/index.vue
+241 -16
View File
@@ -4,34 +4,165 @@
<div v-if="bzfggllc">
<el-divider content-position="left"><h2>标准法规管理流程</h2></el-divider>
<div class="process-box">
<div class="process-name" @click="handleCreateProcess('2')">标准调研流程</div>
<div class="process-name" @click="handleCreateProcess('1')">标准入库流程</div>
<div class="process-name" @click="handleCreateProcess('3')">标准征求意见流程</div>
<!-- <div class="process-name" @click="handleCreateProcess('4')">标准需求(翻译)申请流程</div>-->
<!-- <div class="process-name" @click="handleCreateProcess('5')">标准发放申请流程</div>-->
<div class="process-name" @click="handleCreateProcess('6')">标准清单发布/更新流程</div>
<div class="process-name" @click="handleCreateProcess('7')">项目合规评估流程-标准</div>
<div class="process-name" @click="handleCreateProcess('10')">项目合规评估流程-项目</div>
<div class="process-name" @click="handleCreateProcess('8')">未符合项整改流程</div>
<div class="process-name" @click="handleCreateProcess('9')">标准解读流程</div>
<el-col :span="size ? 6 : 8">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('1')">
<div class="card-top">
<div class="card-top-left">
<img :src="getImg(Math.floor(Math.random() * 6))">
</div>
<div class="card-top-right">
<div class="card-top-right-text">标准入库流程</div>
<div class="card-top-right-line"></div>
</div>
</div>
<div class="card-bottom">
流程简介: 容器默认存在两根轴：水平的主轴（main axis）和垂直的交叉轴（cross axis）。主轴的开始位置（与边框的交叉点）叫做main start，结束位置叫做main end；交叉轴的开始位置叫做cross start，结束位置叫做cross end。
</div>
</div>
</el-card>
</el-col>
<el-col :span="size ? 6 : 8">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('2')">
<div class="card-top">
<div class="card-top-left">
<img :src="getImg(Math.floor(Math.random() * 6))">
</div>
<div class="card-top-right">
<div class="card-top-right-text">标准调研流程</div>
<div class="card-top-right-line"></div>
</div>
</div>
<div class="card-bottom">
流程简介: 容器默认存在两根轴：水平的主轴（main axis）和垂直的交叉轴（cross axis）。主轴的开始位置（与边框的交叉点）叫做main start，结束位置叫做main end；交叉轴的开始位置叫做cross start，结束位置叫做cross end。
</div>
</div>
</el-card>
</el-col>
<el-col :span="size ? 6 : 8">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('3')">
<div class="card-top">
<div class="card-top-left">
<img :src="getImg(Math.floor(Math.random() * 6))">
</div>
<div class="card-top-right">
<div class="card-top-right-text">标准征求意见流程</div>
<div class="card-top-right-line"></div>
</div>
</div>
<div class="card-bottom">
流程简介: 容器默认存在两根轴：水平的主轴（main axis）和垂直的交叉轴（cross axis）。主轴的开始位置（与边框的交叉点）叫做main start，结束位置叫做main end；交叉轴的开始位置叫做cross start，结束位置叫做cross end。
</div>
</div>
</el-card>
</el-col>
<el-col :span="size ? 6 : 8">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('6')">
<div class="card-top">
<div class="card-top-left">
<img :src="getImg(Math.floor(Math.random() * 6))">
</div>
<div class="card-top-right">
<div class="card-top-right-text">标准清单发布/更新流程</div>
<div class="card-top-right-line"></div>
</div>
</div>
<div class="card-bottom">
流程简介: 容器默认存在两根轴：水平的主轴（main axis）和垂直的交叉轴（cross axis）。主轴的开始位置（与边框的交叉点）叫做main start，结束位置叫做main end；交叉轴的开始位置叫做cross start，结束位置叫做cross end。
</div>
</div>
</el-card>
</el-col>
<el-col :span="size ? 6 : 8">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('7')">
<div class="card-top">
<div class="card-top-left">
<img :src="getImg(Math.floor(Math.random() * 6))">
</div>
<div class="card-top-right">
<div class="card-top-right-text">项目合规评估流程-标准</div>
<div class="card-top-right-line"></div>
</div>
</div>
<div class="card-bottom">
流程简介: 容器默认存在两根轴：水平的主轴（main axis）和垂直的交叉轴（cross axis）。主轴的开始位置（与边框的交叉点）叫做main start，结束位置叫做main end；交叉轴的开始位置叫做cross start，结束位置叫做cross end。
</div>
</div>
</el-card>
</el-col>
<el-col :span="size ? 6 : 8">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('8')">
<div class="card-top">
<div class="card-top-left">
<img :src="getImg(Math.floor(Math.random() * 6))">
</div>
<div class="card-top-right">
<div class="card-top-right-text">未符合项整改流程</div>
<div class="card-top-right-line"></div>
</div>
</div>
<div class="card-bottom">
流程简介: 容器默认存在两根轴：水平的主轴（main axis）和垂直的交叉轴（cross axis）。主轴的开始位置（与边框的交叉点）叫做main start，结束位置叫做main end；交叉轴的开始位置叫做cross start，结束位置叫做cross end。
</div>
</div>
</el-card>
</el-col>
<el-col :span="size ? 6 : 8">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('9')">
<div class="card-top">
<div class="card-top-left">
<img :src="getImg(Math.floor(Math.random() * 6))">
</div>
<div class="card-top-right">
<div class="card-top-right-text">标准解读流程</div>
<div class="card-top-right-line"></div>
</div>
</div>
<div class="card-bottom">
流程简介: 容器默认存在两根轴：水平的主轴（main axis）和垂直的交叉轴（cross axis）。主轴的开始位置（与边框的交叉点）叫做main start，结束位置叫做main end；交叉轴的开始位置叫做cross start，结束位置叫做cross end。
</div>
</div>
</el-card>
</el-col>
<el-col :span="size ? 6 : 8">
<el-card shadow="hover">
<div class="card-box" @click="handleCreateProcess('10')">
<div class="card-top">
<div class="card-top-left">
<img :src="getImg(Math.floor(Math.random() * 6))">
</div>
<div class="card-top-right">
<div class="card-top-right-text">项目合规评估流程-项目</div>
<div class="card-top-right-line"></div>
</div>
</div>
<div class="card-bottom">
流程简介: 容器默认存在两根轴：水平的主轴（main axis）和垂直的交叉轴（cross axis）。主轴的开始位置（与边框的交叉点）叫做main start，结束位置叫做main end；交叉轴的开始位置叫做cross start，结束位置叫做cross end。
</div>
</div>
</el-card>
</el-col>
</div>
</div>
<div v-if="zcgllc">
<el-divider content-position="left"><h2>政策管理流程</h2></el-divider>
<div class="process-box">
</div>
</div>
<div v-if="qbgllc">
<el-divider content-position="left"><h2>企标管理流程</h2></el-divider>
<div class="process-box">
</div>
</div>
<div v-if="bzcgfysqlc">
<el-divider content-position="left"><h2>工作组会议管理流程</h2></el-divider>
<div class="process-box">
</div>
</div>
@@ -42,10 +173,28 @@ export default {
name: 'NewProcess',
data () {
return {
type: ''
type: '',
size: true
}
},
methods: {
getImg (num) {
var url = ''
if (num == 0) {
url = require('@/assets/images/shangqi/img/process1.png')
} else if (num == 1) {
url = require('@/assets/images/shangqi/img/process2.png')
} else if (num == 2) {
url = require('@/assets/images/shangqi/img/process3.png')
} else if (num == 3) {
url = require('@/assets/images/shangqi/img/process4.png')
} else if (num == 4) {
url = require('@/assets/images/shangqi/img/process5.png')
} else if (num == 5) {
url = require('@/assets/images/shangqi/img/process6.png')
}
return url
},
// 新建流程
handleCreateProcess (prcType) {
this.$store.commit('setDetailMap', this.$route.path)
@@ -176,6 +325,12 @@ export default {
}
},
mounted () {
let width = document.body.clientWidth
if (width > 1900) {
this.size = true
} else {
this.size = false
}
this.type = this.$route.params.type
}
}
@@ -186,17 +341,81 @@ export default {
//height: 100%;
padding: 15px 15px 0;
background: #ffffff;
/deep/.el-card__body {
padding: 0;
}
.el-card {
margin: 25px;
border-radius: 10px;
}
.card-box {
.card-top {
width: 100%;
background: #2d8cf0;
height: 120px;
display: flex;
justify-content: space-between;
.card-top-left {
img {
margin: 10px;
width: 100px;
height: 100px;
}
}
.card-top-right {
width: 200px;
.card-top-right-text {
margin: 40px 0 5px 0;
color: #e6e6e6;
font-size: 18px;
}
.card-top-right-line {
height: 3px;
width: 200px;
background: #e6e6e6;
}
}
}
.card-bottom {
width: calc(~'100% - 60px');
color: #c1c1c1;
margin: 10px 30px;
line-height: 20px;
font-size: 14px;
height: 100px;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 5;
overflow: hidden;
}
}
.card-box:hover {
.card-top {
.card-top-right {
.card-top-right-text {
color: rgb(247, 186, 42);
}
.card-top-right-line {
background: rgb(247, 186, 42);
}
}
}
.card-bottom {
color: #2d8cf0;
}
}
.process-box{
margin-left: -5px;
margin-right: -5px;
padding-top: 20px;
padding-bottom: 20px;
.process-name{
width: 260px;
padding: 10px 0;
width: 300px;
padding: 40px 0;
margin-bottom: 10px;
text-align: center;
border: 1px dashed #ddd;
border-radius: 5px;
background: #fdfdfd;
font-size: 18px;
font-family: Helvetica, 'Hiragino Sans GB', 'Microsoft Yahei', Arial, sans-serif;
@@ -205,6 +424,12 @@ export default {
margin-left: 5px;
margin-right: 5px;
}
.process-name:hover {
transform:translateY(-5px);
border: 1px dashed #2d8cf0;
background: #c6e2ff;
color: #2d8cf0;
}
}
}
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+3 -3
View File
@@ -973,8 +973,8 @@ export default {
return false
}
// 判断文件上传大小
if (file.size / 1024 / 1024 > 300) {
this.$message.warning('文件' + file.name + '大小不能超过300M')
if (file.size / 1024 / 1024 > 200) {
this.$message.warning('文件' + file.name + '大小不能超过200M')
return false
}
return true
@@ -1403,7 +1403,7 @@ export default {
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
}
})
this.drawerTotal = res.data.list.length
this.drawerTotal = res.data.count
}, e => {
})
},
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+1 -1
View File
@@ -1369,7 +1369,7 @@ export default {
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
}
})
this.drawerTotal = res.data.list.length
this.drawerTotal = res.data.count
}, e => {
})
},
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+1 -1
View File
@@ -1368,7 +1368,7 @@ export default {
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
}
})
this.drawerTotal = res.data.list.length
this.drawerTotal = res.data.count
}, e => {
})
},
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+7 -3
View File
@@ -995,7 +995,8 @@
<tree-select-new
width = "500"
:lazy=true
:multiple=false
:multiple=true
:check-strictly=true
:modalShowFlag="modalShowFlag2"
:drawerTitle="drawerTitle"
:url="url"
@@ -1005,7 +1006,8 @@
<tree-select-new
width = "500"
:lazy=true
:multiple=false
:multiple=true
:check-strictly=true
:modalShowFlag="modalShowFlag3"
:drawerTitle="drawerTitle"
:url="url"
@@ -1015,7 +1017,8 @@
<tree-select-new
width = "500"
:lazy=true
:multiple=false
:multiple=true
:check-strictly=true
:modalShowFlag="modalShowFlag4"
:drawerTitle="drawerTitle"
:url="url"
@@ -4768,6 +4771,7 @@ export default {
.el-tree-node {
position: relative;
padding-left: 0px; // 缩进量
line-height: 30px;
}
.el-tree-node__children {
padding-left: 16px; // 缩进量
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+8 -5
View File
@@ -1254,7 +1254,8 @@
<tree-select-new
width = "500"
:lazy=true
:multiple=false
:multiple=true
:check-strictly=true
:modalShowFlag="modalShowFlag2"
:drawerTitle="drawerTitle"
:url="url"
@@ -1264,7 +1265,8 @@
<tree-select-new
width = "500"
:lazy=true
:multiple=false
:multiple=true
:check-strictly=true
:modalShowFlag="modalShowFlag3"
:drawerTitle="drawerTitle"
:url="url"
@@ -1274,7 +1276,8 @@
<tree-select-new
width = "500"
:lazy=true
:multiple=false
:multiple=true
:check-strictly=true
:modalShowFlag="modalShowFlag4"
:drawerTitle="drawerTitle"
:url="url"
@@ -4316,13 +4319,13 @@ export default {
</script>
<style lang="less" scoped>
/deep/ .icon-tree {
/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{
/deep/.expanded{
background:url('~@/assets/images/shangqi/img/tree-sub.png');
background-size:100% 100%;
}
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+6 -2
View File
@@ -59,11 +59,14 @@
align="center">
</el-table-column>
<el-table-column
prop="standId"
prop="standNumber"
label="项目编号"
fixed="left"
width="260px"
>
<template slot-scope="scope">
<span style="margin-left: 10px">{{ scope.row.standSort+ ' ' + scope.row.standNumber + '-' + scope.row.standYear}}</span>
</template>
</el-table-column>
<el-table-column
prop="standName"
@@ -555,7 +558,7 @@ export default {
this.active = -1
}
}
// 考虑如果没有当前时间，颜色怎么设置
// 考虑如果没有当前时间， 颜色怎么设置
})
this.selectTableDataList()
},
@@ -586,6 +589,7 @@ export default {
}
const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' +
'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName + '&id=' + this.localProEO.id
console.log(exportURL)
window.open(exportURL)
this.$message.success('导出信息成功')
}