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

This commit is contained in:
super_liu
2021-07-25 20:42:02 +08:00
63 changed files with 8592 additions and 2141 deletions
+30 -19
View File
@@ -9208,7 +9208,7 @@
}, },
"image-size": { "image-size": {
"version": "0.5.5", "version": "0.5.5",
"resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz", "resolved": "https://registry.nlark.com/image-size/download/image-size-0.5.5.tgz",
"integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=", "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=",
"dev": true, "dev": true,
"optional": true "optional": true
@@ -11040,6 +11040,12 @@
"polyline-miter-util": "^1.0.1" "polyline-miter-util": "^1.0.1"
} }
}, },
"popper.js": {
"version": "1.16.1",
"resolved": "https://registry.npm.taobao.org/popper.js/download/popper.js-1.16.1.tgz",
"integrity": "sha1-KiI8s9x7YhPXQOQDcr5A3kPmWxs=",
"dev": true
},
"portfinder": { "portfinder": {
"version": "1.0.28", "version": "1.0.28",
"resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz", "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.28.tgz",
@@ -12300,6 +12306,11 @@
"is-plain-obj": "^1.0.0" "is-plain-obj": "^1.0.0"
} }
}, },
"sortablejs": {
"version": "1.14.0",
"resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.14.0.tgz",
"integrity": "sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w=="
},
"source-list-map": { "source-list-map": {
"version": "2.0.1", "version": "2.0.1",
"resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz", "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
@@ -13519,8 +13530,8 @@
}, },
"vue-loader-v16": { "vue-loader-v16": {
"version": "npm:vue-loader@16.3.3", "version": "npm:vue-loader@16.3.3",
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.3.3.tgz", "resolved": "https://registry.nlark.com/vue-loader/download/vue-loader-16.3.3.tgz",
"integrity": "sha512-/1GzCuQ6MRORbC+leKTKoTGtpQt60bYe0gDGEextSteA2OM+v201FPha5jzmjQzVhRcwieZeUvezAtG5a/e5cw==", "integrity": "sha1-5EDk6xJ4bhYTi12YthIgjynd9TI=",
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
@@ -13531,8 +13542,8 @@
"dependencies": { "dependencies": {
"ansi-styles": { "ansi-styles": {
"version": "4.3.0", "version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1618995651629&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
@@ -13541,8 +13552,8 @@
}, },
"chalk": { "chalk": {
"version": "4.1.1", "version": "4.1.1",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", "resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.1.tgz",
"integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==", "integrity": "sha1-yAs/qyi/Y3HmhjMl7uZ+YYt35q0=",
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
@@ -13552,8 +13563,8 @@
}, },
"color-convert": { "color-convert": {
"version": "2.0.1", "version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
@@ -13562,29 +13573,29 @@
}, },
"color-name": { "color-name": {
"version": "1.1.4", "version": "1.1.4",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "resolved": "https://registry.npm.taobao.org/color-name/download/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "integrity": "sha1-wqCah6y95pVD3m9j+jmVyCbFNqI=",
"dev": true, "dev": true,
"optional": true "optional": true
}, },
"has-flag": { "has-flag": {
"version": "4.0.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "resolved": "https://registry.nlark.com/has-flag/download/has-flag-4.0.0.tgz?cache=0&sync_timestamp=1626716578584&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fhas-flag%2Fdownload%2Fhas-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "integrity": "sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s=",
"dev": true, "dev": true,
"optional": true "optional": true
}, },
"hash-sum": { "hash-sum": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-2.0.0.tgz", "resolved": "https://registry.npm.taobao.org/hash-sum/download/hash-sum-2.0.0.tgz",
"integrity": "sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==", "integrity": "sha1-gdAbtd6OpKIUrV1urRtSNGCwtFo=",
"dev": true, "dev": true,
"optional": true "optional": true
}, },
"loader-utils": { "loader-utils": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", "resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz",
"integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", "integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
@@ -13595,8 +13606,8 @@
}, },
"supports-color": { "supports-color": {
"version": "7.2.0", "version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "resolved": "https://registry.nlark.com/supports-color/download/supports-color-7.2.0.tgz?cache=0&sync_timestamp=1626703455199&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsupports-color%2Fdownload%2Fsupports-color-7.2.0.tgz",
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "integrity": "sha1-G33NyzK4E4gBs+R4umpRyqiWSNo=",
"dev": true, "dev": true,
"optional": true, "optional": true,
"requires": { "requires": {
+2
View File
@@ -19,6 +19,7 @@
"jquery": "^3.5.1", "jquery": "^3.5.1",
"js-base64": "^2.6.2", "js-base64": "^2.6.2",
"moment": "^2.29.1", "moment": "^2.29.1",
"sortablejs": "^1.14.0",
"v-charts": "^1.19.0", "v-charts": "^1.19.0",
"vue": "^2.6.11", "vue": "^2.6.11",
"vue-clipboard2": "^0.3.1", "vue-clipboard2": "^0.3.1",
@@ -34,6 +35,7 @@
"@vue/cli-service": "~4.5.0", "@vue/cli-service": "~4.5.0",
"less": "^3.13.1", "less": "^3.13.1",
"less-loader": "^5.0.0", "less-loader": "^5.0.0",
"popper.js": "^1.16.1",
"vue-template-compiler": "^2.6.11", "vue-template-compiler": "^2.6.11",
"webpack": "^4.27.1" "webpack": "^4.27.1"
} }
+14
View File
@@ -24,3 +24,17 @@ export function uploadFileText (data) {
params: data params: data
}) })
} }
export function dicTypeData (data) {
return axios({
url: 'api/sys/dictype/getDicTypeListCode',
method: 'get',
params: data
})
}
export function StandardsInfoPage (data) {
return axios({
url: 'api/sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',
method: 'get',
params: data
})
}
+9
View File
@@ -457,6 +457,15 @@ export default {
callback() callback()
} }
}, },
// 验证输入数字和英文
testNumberCode (rule, value, callback) {
let reg = /[0-9\-]/
if (value !== '' && !value.match(reg)) {
return callback(new Error('只能输入数字'))
} else {
callback()
}
},
validUrl (rule, value, callback) { validUrl (rule, value, callback) {
let reg = /(^((https|ftp|http|file):\/\/)|www\.)*([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/gm let reg = /(^((https|ftp|http|file):\/\/)|www\.)*([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/gm
if (!value.match(reg)) { if (!value.match(reg)) {
@@ -11,6 +11,8 @@
:class="{'form-item-disabled': disabled}" :class="{'form-item-disabled': disabled}"
> >
<el-date-picker <el-date-picker
:value-format="valueFormat"
format="yyyy-MM-dd"
:value="value" :value="value"
type="date" type="date"
:editable="true" :editable="true"
@@ -38,6 +40,10 @@ export default {
type: Boolean, type: Boolean,
default: false default: false
}, },
valueFormat: {
type: String,
default: 'yyyy-MM-dd'
},
// 栅格比例 // 栅格比例
span: { span: {
type: Number, type: Number,
@@ -120,7 +120,7 @@
@pageChange="pageChangeReplace" @pageChange="pageChangeReplace"
@pageSizeChange="pageSizeChangeReplace"></pagination> @pageSizeChange="pageSizeChangeReplace"></pagination>
<div slot="footer" class="demo-drawer-footer"> <div slot="footer" class="demo-drawer-footer">
<el-button class="common-button-default" icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button> <el-button class="common-button-default" round icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button>
<el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button> <el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button>
</div> </div>
</el-dialog> </el-dialog>
@@ -336,7 +336,7 @@ export default {
standNum = item.standSort + ' ' + item.standNumber standNum = item.standSort + ' ' + item.standNumber
} }
// 验证标准号在系统中是否存在 // 验证标准号在系统中是否存在
this.$http.post('lawss/sarTestItem/validateStandNumber', { this.$http.post('sarStandardsInfo/sar-standards-info/validateStandNumber', {
standnumber: standNum standnumber: standNum
}, { }, {
_this: this _this: this
@@ -218,6 +218,20 @@
this.isShowSelect = !this.isShowSelect; this.isShowSelect = !this.isShowSelect;
} }
}, },
// 递归
getTreeData(data) {
// 循环遍历json数据
for (let i = 0; i < data.length; i++) {
if (data[i].children.length < 1) {
// children若为空数组,则将children设为undefined
delete data[i].children
} else {
// children若不为空数组,则继续 递归调用 本方法
this.getTreeData(data[i].children)
}
}
return data
},
// 节点选中状态发生变化时的回调 // 节点选中状态发生变化时的回调
handleCheckChange () { handleCheckChange () {
var checkedKeys = this.$refs.tree.getCheckedKeys(); // 所有被选中的节点的 key 所组成的数组数据 var checkedKeys = this.$refs.tree.getCheckedKeys(); // 所有被选中的节点的 key 所组成的数组数据
+335 -301
View File
@@ -1,322 +1,356 @@
<!-- 配置管理 - 链接管理 --> <!-- 配置管理 - 链接管理 -->
<template> <template>
<div id="post-manage"> <div id="post-manage">
<!-- 头部操作按钮--> <!-- 头部操作按钮-->
<div class="action-bar"> <div class="action-bar">
<el-button type="primary" <el-button type="primary"
class="common-button-primary add-button" class="common-button-primary add-button"
@click="addLink" @click="addLink"
v-btn-permission="'980cb239683de9e29ee5335cec98e5b4'" v-btn-permission="'980cb239683de9e29ee5335cec98e5b4'"
size="mini">新增</el-button> size="mini">新增</el-button>
<el-button type="primary" <!-- <el-button type="primary"-->
class="common-button-primary add-button" <!-- class="common-button-primary add-button"-->
@click="linkOrder" <!-- @click="linkOrder"-->
v-btn-permission="'779665b2e4bb20fc480cf9372a100f69'" <!-- v-btn-permission="'779665b2e4bb20fc480cf9372a100f69'"-->
size="mini">顺序调整</el-button> <!-- size="mini">顺序调整</el-button>-->
<el-button type="primary" <el-button type="primary"
class="common-button-primary add-button" class="common-button-primary add-button"
@click="deleteAllLink" @click="deleteAllLink"
v-btn-permission="'779665b2e4bb20fc480cf9372a100f69'" v-btn-permission="'779665b2e4bb20fc480cf9372a100f69'"
size="mini">删除</el-button> size="mini">删除</el-button>
</div> </div>
<!-- 表格--> <!-- 表格-->
<div class="content"> <div class="content">
<el-table <el-table
:data="linkList" :data="linkList"
tooltip-effect="dark" tooltip-effect="dark"
border border
style="width: 100%; flex: auto;" style="width: 100%; flex: auto;"
class="drag-table" class="drag-table"
height="100%" height="100%"
: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'}"
@selection-change="handleSelectionChange"> @selection-change="handleSelectionChange">
<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="name" prop="orderBy"
label="链接名称" label="序号"
width="220px"> align="center"
</el-table-column> width="50px">
<el-table-column </el-table-column>
prop="url" <el-table-column
label="链接"> prop="name"
</el-table-column> label="链接名称"
<!-- <el-table-column--> width="220px">
<!-- prop="orderBy"--> </el-table-column>
<!-- label="序号"--> <el-table-column
<!-- sortable--> prop="url"
<!-- width="170px">--> label="链接">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="操作" label="操作"
width="50px"> width="50px">
<template slot-scope="scope"> <template slot-scope="scope">
<div @click.stop style="display: inline-block"> <div @click.stop style="display: inline-block">
<el-dropdown trigger="click" @command="handleCommand"> <el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i> <i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item v-btn-permission="'0fbb849e244e07433a90180fb314ad10'" :command="[scope.row, '删除']">删除</el-dropdown-item> <el-dropdown-item v-btn-permission="'0fbb849e244e07433a90180fb314ad10'" :command="[scope.row, '删除']">删除</el-dropdown-item>
<el-dropdown-item v-btn-permission="'fa0846d977aeef07e9cb7faf648f8f7f'" :command="[scope.row, '编辑']">编辑</el-dropdown-item> <el-dropdown-item v-btn-permission="'fa0846d977aeef07e9cb7faf648f8f7f'" :command="[scope.row, '编辑']">编辑</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<loading :loading="Loading">加载中...</loading> <loading :loading="Loading">加载中...</loading>
<!-- 新增链接弹窗--> <!-- 新增链接弹窗-->
<el-dialog <el-dialog
:title="dialogTitle" :title="dialogTitle"
:visible.sync="modalshowflag" :visible.sync="modalshowflag"
:wrapperClosable="false" :wrapperClosable="false"
size="800px" size="800px"
@close="resetForm" @close="resetForm"
> >
<el-form <el-form
ref="sarStandardsInfoForm" ref="sarStandardsInfoForm"
:model="sarStandardsInfoEO" :model="sarStandardsInfoEO"
:rules="sarStandardsInfoRules" :rules="sarStandardsInfoRules"
class="label-input-form" class="label-input-form"
> >
<el-form-item label="链接名称" prop="name" label-width="150px" class="add-form-item"> <el-form-item label="链接名称" prop="name" label-width="150px" class="add-form-item">
<el-input v-model="sarStandardsInfoEO.name" <el-input v-model="sarStandardsInfoEO.name"
placeholder="请输入链接名称" placeholder="请输入链接名称"
clearable></el-input> clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="链接" prop="url" label-width="150px" class="add-form-item"> <el-form-item label="链接" prop="url" label-width="150px" class="add-form-item">
<el-input v-model="sarStandardsInfoEO.url" <el-input v-model="sarStandardsInfoEO.url"
placeholder="请输入链接" placeholder="请输入链接"
clearable></el-input> clearable></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="demo-drawer-footer"> <span slot="footer" class="demo-drawer-footer">
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="resetForm">取消</el-button> <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="resetForm">取消</el-button>
<el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="submit">确定</el-button> <el-button type="primary" size="mini" class="common-button-primary" icon="el-icon-check" @click="submit">确定</el-button>
</span> </span>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
export default { import Sortable from 'sortablejs'
name: "linkManage", export default {
data () { name: "linkManage",
return { data () {
editId: '', return {
type: '', // 1为新增 2为编辑 editId: '',
dialogTitle: '', type: '', // 1为新增 2为编辑
submitLoading: false, dialogTitle: '',
// 向后台传参使用 submitLoading: false,
data: [], // 向后台传参使用
Loading: false, data: [],
modalshowflag: false, Loading: false,
// 排序 modalshowflag: false,
order:[], // 排序
// 表格选取的 order:[],
selectList:[], // 表格选取的
selectId:[], selectList:[],
ids:'', selectId:[],
// 向后台传参使用 ids:'',
sarStandardsInfoEO: { // 向后台传参使用
name: '', sarStandardsInfoEO: {
url: '', name: '',
// sortId: '' url: '',
}, // sortId: ''
//新增链接未输入时提示 },
sarStandardsInfoRules: { //新增链接未输入时提示
name: [ sarStandardsInfoRules: {
{ required: true, message: '请输入链接名称', trigger: 'blur' } name: [
], { required: true, message: '请输入链接名称', trigger: 'blur' }
url: [ ],
{ required: true, message: '请输入链接', trigger: 'blur' } url: [
] { required: true, message: '请输入链接', trigger: 'blur' }
}, ]
},
modalRole: false, modalRole: false,
props: { props: {
label: 'name', label: 'name',
children: 'children' children: 'children'
}, },
linkList: [] linkList: [],
} sortData: [],
},
methods: {
//头部新增按钮
addLink () {
this.type = 1
this.dialogTitle = '新增链接'
this.modalshowflag = true
},
//头部顺序调整按钮
linkOrder () {
this.order=[]
for (var i=0;i<this.linkList.length;i++){
this.order.push({
urlId:this.linkList[i].id,
sortId:this.linkList[i].sortId
})
}
this.$http.postData('sarUrl/tsUrl/order',this.order, {}, res => {
if (res.ok) {
}else {
this.$message.warning(res.message)
}
})
},
//头部删除按钮
deleteAllLink() {
this.selectId=[]
for (var i=0;i<this.selectList.length;i++){
this.selectId.push(this.selectList[i].id)
}
this.ids=this.selectId.join(",")
if (this.selectList.length === 0) {
this.$message.warning('请选择要删除的链接')
} else {
this.modalRole = true
// this.nodeList = this.selectList[0].idList
this.$http.delete('sarUrl/tsUrl/deleteBatch', {
ids: this.ids
}, {}, res => {
if (res.ok) {
this.$message.success('删除成功')
this.getLink()
}else {
this.$message.warning(res.message)
} }
}) },
} methods: {
}, //头部新增按钮
addLink () {
//弹窗关闭操作 this.type = 1
resetForm () { this.dialogTitle = '新增链接'
this.$refs['sarStandardsInfoForm'].resetFields(); this.modalshowflag = true
this.modalshowflag = false },
}, //表格中操作列删除操作弹窗
deleteLink (row) {
//弹窗确认操作 this.$http.delete('sarUrl/tsUrl/delete', {
submit () { id: row.id
this.$refs['sarStandardsInfoForm'].validate((valid) => { }, {
if (valid) { _this: this,
if (this.type === 1) { loading: 'Loading'
this.$http.postData('/sarUrl/tsUrl/add', { }, res => {
...this.sarStandardsInfoEO, if (res.ok) {
}, { this.$message.success('删除成功')
_this: this, let arr = []
loading: 'Loading' for (let a = 0; a < this.linkList.length; a++) {
}, res=> { if (this.linkList[a].id === row.id) {
if (res.ok) { this.linkList.splice(a, 1)
this.$message.success('新增成功') }
this.modalshowflag = false }
this.getLink() this.linkList.forEach((item, index) => {
} else { let json = {}
this.$message.warning(res.message) json.id = item.id
json.orderBy = index + 1
arr.push(json)
})
this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(arr), {}, res => {
this.getLink()
})
}else {
this.$message.warning(res.message)
}
})
},
//头部删除按钮
deleteAllLink() {
this.selectId=[]
for (var i=0;i<this.selectList.length;i++){
this.selectId.push(this.selectList[i].id)
} }
}) this.ids = this.selectId.join(",")
} else { if (this.selectList.length === 0) {
// 编辑 this.$message.warning('请选择要删除的链接')
this.$http.putData('/sarUrl/tsUrl/edit', {
id: this.editId,
name: this.sarStandardsInfoEO.name,
url: this.sarStandardsInfoEO.url,
}, {
_this: this,
loading: 'Loading'
}, res=> {
if (res.ok) {
this.$message.success('修改成功')
this.modalshowflag = false
this.getLink()
} else { } else {
this.$message.warning(res.message) this.modalRole = true
this.$http.delete('sarUrl/tsUrl/deleteBatch', {
ids: this.ids
}, {}, res => {
if (res.ok) {
this.$message.success('删除成功')
let arr = this.linkList.filter(items => {
if (!this.ids.includes(items.id)) return items;
})
let newArr = []
arr.forEach((item, index) => {
let json = {}
json.id = item.id
json.orderBy = index + 1
newArr.push(json)
})
this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(newArr), {}, res => {
this.getLink()
})
}else {
this.$message.warning(res.message)
}
})
} }
}) },
} //弹窗关闭操作
} else { resetForm () {
return false; this.$refs['sarStandardsInfoForm'].resetFields();
} this.modalshowflag = false
}); },
}, //弹窗确认操作
submit () {
//表格中操作列 this.$refs['sarStandardsInfoForm'].validate((valid) => {
handleCommand (command) { if (valid) {
switch (command[1]) { if (this.type === 1) {
case '删除': this.$http.postData('/sarUrl/tsUrl/add', {
this.deleteLink(command[0]) ...this.sarStandardsInfoEO,
break }, {
case '编辑': _this: this,
this.editLink(command[0]) loading: 'Loading'
break }, res=> {
if (res.ok) {
this.$message.success('新增成功')
this.modalshowflag = false
this.getLink()
} else {
this.$message.warning(res.message)
}
})
} else {
// 编辑
this.$http.putData('/sarUrl/tsUrl/edit', {
id: this.editId,
name: this.sarStandardsInfoEO.name,
url: this.sarStandardsInfoEO.url,
}, {
_this: this,
loading: 'Loading'
}, res=> {
if (res.ok) {
this.$message.success('修改成功')
this.modalshowflag = false
this.getLink()
} else {
this.$message.warning(res.message)
}
})
}
} else {
return false;
}
});
},
//表格中操作列
handleCommand (command) {
switch (command[1]) {
case '删除':
this.deleteLink(command[0])
break
case '编辑':
this.editLink(command[0])
break
}
},
//表格中操作列编辑操作弹窗
editLink (row) {
this.type = 2
this.editId = row.id
this.sarStandardsInfoEO.name = row.name
this.sarStandardsInfoEO.url = row.url
this.sarStandardsInfoEO.sortId = row.sortId
this.dialogTitle = '修改链接'
this.modalshowflag = true
},
//多选框选择
handleSelectionChange (val) {
this.selectList = val
},
// 获取链接数据
getLink () {
this.$http.get('sarUrl/tsUrl', {
}, {
_this: this,
loading: 'Loading'
}, res=> {
this.linkList = res.data
this.initSortable()
})
},
initSortable () {
this.sortData = [...this.linkList]
const el = document.querySelector('.el-table__body-wrapper tbody')
//创建拖拽对象
this.sortable = Sortable.create(el, {
sort: true, //是否可进行拖拽排序
animation: 150,
onEnd: ({newIndex, oldIndex}) => {
const val = this.sortData[oldIndex]
this.sortData.splice(oldIndex, 1)
this.sortData.splice(newIndex, 0, val)
this.sortData.forEach((item, index) => {
item.orderBy = index + 1
})
let arr = []
this.sortData.forEach(item => {
let json = {}
json.id = item.id
json.orderBy = item.orderBy
arr.push(json)
})
this.$http.putData('sarUrl/tsUrl/updateOrder', JSON.stringify(arr), {}, res => {
if (res.ok) {
this.$message.success('保存成功')
} else {
this.$message.warning('保存失败!')
}
})
}
})
},
},
mounted() {
this.getLink();
} }
},
//表格中操作列删除操作弹窗
deleteLink (row) {
this.$http.delete('sarUrl/tsUrl/delete', {
id: row.id
}, {
_this: this,
loading: 'Loading'
}, res => {
if (res.ok) {
this.$message.success('删除成功')
this.getLink()
}else {
this.$message.warning(res.message)
}
})
},
//表格中操作列编辑操作弹窗
editLink (row) {
this.type = 2
this.editId = row.id
this.sarStandardsInfoEO.name = row.name
this.sarStandardsInfoEO.url = row.url
this.sarStandardsInfoEO.sortId = row.sortId
this.dialogTitle = '修改链接'
this.modalshowflag = true
},
//多选框选择
handleSelectionChange (val) {
this.selectList = val
},
// 获取链接数据
getLink () {
this.$http.get('sarUrl/tsUrl', {
}, {
_this: this,
loading: 'Loading'
}, res=> {
this.linkList = res.data
})
},
},
mounted() {
this.getLink();
} }
}
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/assets/styles/mixins'; @import '~@/assets/styles/mixins';
#post-manage { #post-manage {
height: 100%; height: 100%;
.content { .content {
height: calc(~'100% - 53px') height: calc(~'100% - 53px')
}
.filter-tree {
height: calc(~'100% - 50px')
}
} }
.filter-tree { </style>
height: calc(~'100% - 50px')
}
}
</style>
+1 -1
View File
@@ -45,7 +45,7 @@
width="170px"> width="170px">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="createTime" prop="operateTime"
label="操作时间" label="操作时间"
width="170px"> width="170px">
</el-table-column> </el-table-column>
@@ -47,7 +47,7 @@
<p><label style=" margin-right: 150px;">标准年份</label><span>{{ sarStandardsInfoEO.standYear || '-' }}</span></p> <p><label style=" margin-right: 150px;">标准年份</label><span>{{ sarStandardsInfoEO.standYear || '-' }}</span></p>
<p><label style=" margin-right: 150px;">中文名称</label><span>{{ sarStandardsInfoEO.standName || '-' }}</span></p> <p><label style=" margin-right: 150px;">中文名称</label><span>{{ sarStandardsInfoEO.standName || '-' }}</span></p>
<p><label style=" margin-right: 150px;">英文名称</label><span>{{ sarStandardsInfoEO.standEnName || '-' }}</span></p> <p><label style=" margin-right: 150px;">英文名称</label><span>{{ sarStandardsInfoEO.standEnName || '-' }}</span></p>
<p><label style=" margin-right: 150px;">标准性质</label><span>{{ sarStandardsInfoEO.standNature || '-' }}</span></p> <p><label style=" margin-right: 150px;">标准性质</label><span>{{ standMap[sarStandardsInfoEO.standNature] || '-' }}</span></p>
<p> <p>
<label style=" margin-right: 132px;" <label style=" margin-right: 132px;"
title="“计划修订”、“修订中”均为现行有效版本;“已修订”标准的有效性根据实际实施情况判定。" title="“计划修订”、“修订中”均为现行有效版本;“已修订”标准的有效性根据实际实施情况判定。"
@@ -163,13 +163,13 @@
title="下载" title="下载"
@click="downloadFile(file.id)" @click="downloadFile(file.id)"
class="icon-download" class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'WGJP2VRZSJ77EGH2447M' : '44KKMQHU3CNRRPNNF8VN'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
/> />
<i <i
title="下载带水印" title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)" @click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2" class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'EZVNMCLGSB5LWG6XRRL3' : 'VSUKQX3NZW4N8CT5VQE3'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
/> />
<span class="time-text">上传时间{{ dateFormat(file.modifyTime) }}</span> <span class="time-text">上传时间{{ dateFormat(file.modifyTime) }}</span>
</template> </template>
@@ -179,13 +179,13 @@
title="下载" title="下载"
@click="downloadFile(file.id)" @click="downloadFile(file.id)"
class="icon-download" class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'JHQALHMF6F' : 'dakDL3sNLq'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
/> />
<i <i
title="下载带水印" title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)" @click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2" class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'KDLDNFJHENFMF' : 'LKJSNLKFHOFN'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
/> />
<span class="time-text">上传时间{{ dateFormat(file.modifyTime) }}</span> <span class="time-text">上传时间{{ dateFormat(file.modifyTime) }}</span>
</template> </template>
@@ -246,7 +246,7 @@
v-for="(file, fileIndex) in child.value" v-for="(file, fileIndex) in child.value"
:key="fileIndex" :key="fileIndex"
> >
<span style="cursor: pointer;" @click="openFileInPdf(file.id, file.oldFileName)">|{{file.id}}|</span> <!-- <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' <template v-if="child.attrField === 'XGD' || child.attrField === 'FBGBJBD' || child.attrField === 'BPG'
|| child.attrField === 'SSG'|| child.attrField === 'ZQYJG'|| child.attrField === 'CA' || child.attrField === 'SSG'|| child.attrField === 'ZQYJG'|| child.attrField === 'CA'
@@ -256,11 +256,13 @@
title="下载" title="下载"
@click="downloadFile(file.id)" @click="downloadFile(file.id)"
class="icon-download" class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
/> />
<i <i
title="下载带水印" title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)" @click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2" class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
/> />
<span class="time-text">上传时间:{{ dateFormat(file.modifyTime) }}</span> <span class="time-text">上传时间:{{ dateFormat(file.modifyTime) }}</span>
</template> </template>
@@ -270,13 +272,13 @@
title="下载" title="下载"
@click="downloadFile(file.id)" @click="downloadFile(file.id)"
class="icon-download" class="icon-download"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'JHQALHMF6F' : 'dakDL3sNLq'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? '02fd6eff0537c283dd071683de10689f' : 'a772afab2a6708883335500f3f86e771'"
/> />
<i <i
title="下载带水印" title="下载带水印"
@click="downloadFileByWater(file.id, file.fileSuffix)" @click="downloadFileByWater(file.id, file.fileSuffix)"
class="icon-download2" class="icon-download2"
v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'KDLDNFJHENFMF' : 'LKJSNLKFHOFN'" v-btn-permission="$route.params.pageType === 'INLAND_STAND' ? 'd5b28957b5105c805e90a16fd5056a45' : '824f3bf9edef83fc7488917136167232'"
/> />
<span class="time-text">上传时间:{{ dateFormat(file.modifyTime) }}</span> <span class="time-text">上传时间:{{ dateFormat(file.modifyTime) }}</span>
</template> </template>
@@ -412,9 +414,16 @@
width="150" width="150"
> >
</el-table-column> </el-table-column>
<el-table-column
show-overflow-tooltip
prop="itemsName"
label="条款内容"
width="150"
>
</el-table-column>
<el-table-column <el-table-column
prop="termsConditions" prop="termsConditions"
label="内容简介" label="解读内容"
width="250" width="250"
show-overflow-tooltip show-overflow-tooltip
:resizable="false" :resizable="false"
@@ -423,45 +432,46 @@
<div class="table-jump" @click="itemsTextDialog(scope.row.itemsNum, scope.row.termsConditions)">{{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }}</div> <div class="table-jump" @click="itemsTextDialog(scope.row.itemsNum, scope.row.termsConditions)">{{ scope.row.termsConditions ? scope.row.termsConditions.replace(/<.*?>/ig, ' ') : '' }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
show-overflow-tooltip
prop="putTime"
label="实施日期"
width="150"
>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="putTime"
label="适用车型"
width="150"
>
</el-table-column>
<el-table-column <el-table-column
prop="responsibleUnitShow" prop="responsibleUnitShow"
label="责任部门" label="责任部门"
width="150"> width="150">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="foShow" prop="zrgcs"
label="FO" label="责任工程师"
width="150"> width="150">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="dutyEngineerShow" prop="dutyEngineerShow"
label="项目评估角色" label="基于上一版本差异"
width="150"> width="150">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="svppsShow" prop="svppsShow"
label="SVPPS" label="符合性状态"
width="150"> width="150">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="applyArcticShow" prop="applyArcticShow"
label="适用车辆类型" label="合规性分析"
width="150"> width="150">
</el-table-column> </el-table-column>
<el-table-column
prop="claimTypeShow"
label="要求类型"
width="150">
</el-table-column>
<el-table-column
prop="busStandCover"
label="覆盖关系"
width="150">
<template slot-scope="scope">
<span>{{ busStandCoverName(scope.row.busStandCover) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="50" fixed="right"> <el-table-column label="操作" align="center" width="50" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<div @click.stop> <div @click.stop>
@@ -1250,6 +1260,7 @@ export default {
itemsText: '', itemsText: '',
itemsTextDialogs: false, itemsTextDialogs: false,
textStatusMap: {}, textStatusMap: {},
standMap: {}
} }
}, },
props: { props: {
@@ -1260,8 +1271,10 @@ export default {
setMap(data){ setMap(data){
data.forEach(item => { data.forEach(item => {
this.$set(this.textStatusMap, item.value, item.label) this.$set(this.textStatusMap, item.value, item.label)
this.$set(this.standMap, item.value, item.label)
}) })
console.log(this.textStatusMap, '文本状态的值') console.log(this.textStatusMap, '文本状态的值')
console.log(this.standMap, '标准性质')
}, },
statusClick () { statusClick () {
let routeUrl = this.$router.resolve({ let routeUrl = this.$router.resolve({
@@ -2630,6 +2643,7 @@ export default {
this.requestOptions = res.data.REQUESTTYPE this.requestOptions = res.data.REQUESTTYPE
this.BZFGGXOUIUJ = res.data.BZFGGXOUIUJ // 企标覆盖关系 this.BZFGGXOUIUJ = res.data.BZFGGXOUIUJ // 企标覆盖关系
this.setMap(res.data.WBZTCLASS) // 文本状态 this.setMap(res.data.WBZTCLASS) // 文本状态
this.setMap(res.data.SARPROPERTY) // 标准性质
}, e => { }, e => {
}) })
Promise.all([this.queryDisplayLocation(), this.selectStandMessage(), this.getAddFormFieldList()]).then((values) => { Promise.all([this.queryDisplayLocation(), this.selectStandMessage(), this.getAddFormFieldList()]).then((values) => {
@@ -53,10 +53,10 @@
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-tooltip class="item" effect="dark" :content="item.collectTitle" placement="top" v-if="item.collectTitle"> <el-tooltip class="item" effect="dark" :content="item.collectTitle" placement="top" v-if="item.collectTitle">
<div class="left-contents">标题{{ item.collectTitle }}</div> <div class="left-contents" @click="getDetail(item)">标题{{ item.collectTitle }}</div>
</el-tooltip> </el-tooltip>
<div v-else> <div v-else>
<div class="left-contents">标题{{ item.collectTitle }}</div> <div class="left-contents" @click="getDetail(item)">标题{{ item.collectTitle }}</div>
</div> </div>
</el-col> </el-col>
<el-col :span="4" :offset="3">创建时间{{getDate(item.creationTime)}}</el-col> <el-col :span="4" :offset="3">创建时间{{getDate(item.creationTime)}}</el-col>
@@ -103,6 +103,16 @@ export default {
} }
}, },
methods: { methods: {
getDetail(item) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.collectResId,
pageType: 'INLAND_STAND'
}
})
window.open(routeUrl.href, '_blank')
},
// 重置 // 重置
resetSelect () { resetSelect () {
this.search.name = '' this.search.name = ''
File diff suppressed because it is too large Load Diff
@@ -9,7 +9,7 @@
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div> <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div> <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
</div> </div>
<div class="content" v-show ="active === '1'"> <div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto"> <div style="flex: auto; overflow: auto">
<process-title> <process-title>
<template slot="title">基础信息</template> <template slot="title">基础信息</template>
@@ -29,7 +29,9 @@
<el-radio label="project">项目清单</el-radio> <el-radio label="project">项目清单</el-radio>
<el-radio label="other">其他清单</el-radio> <el-radio label="other">其他清单</el-radio>
</el-radio-group> </el-radio-group>
<el-button size="mini" type="primary" style="margin-left: 40px;" @click="choiceShow">选择清单</el-button> <el-button size="mini" type="primary" style="margin-left: 40px;" @click="choiceShow">
选择清单
</el-button>
</el-form-item> </el-form-item>
<el-form-item label="清单名称" prop="listName" class="add-form-item form-item-disabled"> <el-form-item label="清单名称" prop="listName" class="add-form-item form-item-disabled">
<el-input <el-input
@@ -39,27 +41,6 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="适用区域" prop="applyRegion" class="add-form-item form-item-disabled add-form-el-select">
<!-- <el-input-->
<!-- v-model="listForm.applyRegion"-->
<!-- placeholder="请输入适用区域"-->
<!-- clearable-->
<!-- ></el-input>-->
<el-select
width="120"
v-model="listForm.applyRegion"
placeholder="请选择适用区域"
filterable
>
<el-option
v-for="item in countryOptions"
:value="item.value"
:key="item.value"
:label="item.label"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="清单说明" prop="descriptionList" class="add-form-item form-item-disabled"> <el-form-item label="清单说明" prop="descriptionList" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="listForm.descriptionList" v-model="listForm.descriptionList"
@@ -67,26 +48,6 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item label="附件" prop="modelName" class="add-form-item form-item-disabled">-->
<!-- <el-input-->
<!-- disabled-->
<!-- style="display: none;"-->
<!-- v-model="listForm.modelName"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- <div v-if="listForm.modelName" @click="fileUpload" class="fileClass">-->
<!-- {{ listForm.modelName }}-->
<!-- </div>-->
<!-- <div v-else>-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- class="common-button-primary"-->
<!-- @click="fileUpload"-->
<!-- size="mini">-->
<!-- 点击上传-->
<!-- </el-button>-->
<!-- </div>-->
<!-- </el-form-item>-->
<el-form-item label="附件" prop="fileId" class="add-form-item form-item-disabled"> <el-form-item label="附件" prop="fileId" class="add-form-item form-item-disabled">
<el-upload <el-upload
v-if="listForm.fileId == null || this.listForm.fileId== 'undefined' || this.listForm.fileId == '' " v-if="listForm.fileId == null || this.listForm.fileId== 'undefined' || this.listForm.fileId == '' "
@@ -143,7 +104,6 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="code" prop="code"
fixed="left"
width="180px" width="180px"
align="center" align="center"
label="标准号"> label="标准号">
@@ -202,25 +162,28 @@
<h4>标准/政策法规工程师</h4> <h4>标准/政策法规工程师</h4>
<div style="margin-top: 10px;width: 300px;"> <div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.startUser" style="display: none;"></el-input> <el-input v-model="roleForm.startUser" style="display: none;"></el-input>
<el-input v-model="roleForm.startUserName" placeholder="流程发起人" disabled></el-input> <el-input v-model="roleForm.startUserName" placeholder="流程发起人"
disabled></el-input>
</div> </div>
</el-form-item> </el-form-item>
</el-card> </el-card>
</el-timeline-item> </el-timeline-item>
<el-timeline-item timestamp="选择会签责任人,填写意见" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''" v-if="signFlag === '1'"> <el-timeline-item timestamp="选择会签责任人,填写意见" placement="top"
:color="roleForm.dockUser ? '#66b1ff' : ''" v-if="signFlag === '1'">
<el-card> <el-card>
<el-form-item prop="dockUserName" style="margin-bottom: 0"> <el-form-item prop="dockUserName" style="margin-bottom: 0">
<h4>会签人</h4> <h4>会签人</h4>
<div style="margin-top: 10px;width: 300px;"> <div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.dockUser" style="display: none;"></el-input> <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>
<el-input v-model="roleForm.dockUserName" placeholder="选择会签责任人" <el-input v-model="roleForm.dockUserName" placeholder="选择会签责任人"
@click.native="choiceZRR('dockUser', '选择责任人', roleForm.dockUser)"> @click.native="choiceZRRS">
</el-input> </el-input>
</div> </div>
</el-form-item> </el-form-item>
</el-card> </el-card>
</el-timeline-item> </el-timeline-item>
<el-timeline-item timestamp="选择会签责任人,填写意见" placement="top" :color="roleForm.dockUser ? '#66b1ff' : ''" v-if="signFlag === '2'"> <el-timeline-item timestamp="选择会签责任人,填写意见" placement="top"
:color="roleForm.dockUser ? '#66b1ff' : ''" v-if="signFlag === '2'">
<el-card> <el-card>
<el-form-item prop="dockUserName2" style="margin-bottom: 0"> <el-form-item prop="dockUserName2" style="margin-bottom: 0">
<h4>会签人</h4> <h4>会签人</h4>
@@ -233,7 +196,8 @@
</el-form-item> </el-form-item>
</el-card> </el-card>
</el-timeline-item> </el-timeline-item>
<el-timeline-item timestamp="根据会签意见修订" placement="top" :color="roleForm.ministerUser ? '#66b1ff' : ''"> <el-timeline-item timestamp="根据会签意见修订" placement="top"
:color="roleForm.ministerUser ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="ministerUserName" style="margin-bottom: 0"> <el-form-item prop="ministerUserName" style="margin-bottom: 0">
<h4>标准/政策法规工程师</h4> <h4>标准/政策法规工程师</h4>
@@ -245,7 +209,8 @@
</el-form-item> </el-form-item>
</el-card> </el-card>
</el-timeline-item> </el-timeline-item>
<el-timeline-item timestamp="审批" placement="top" :color="roleForm.directorUser ? '#66b1ff' : ''"> <el-timeline-item timestamp="审批" placement="top"
:color="roleForm.directorUser ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="directorUserName" style="margin-bottom: 0"> <el-form-item prop="directorUserName" style="margin-bottom: 0">
<h4>业务经理</h4> <h4>业务经理</h4>
@@ -272,22 +237,8 @@
<div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0"> <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
<div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0"> <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
<div class="left"> <div class="left">
<el-form :modal="sarSarAccessEOSearch" :inline="true" class="label-input-form" style="margin-left:10px"> <el-form :modal="sarSarAccessEOSearch" :inline="true" class="label-input-form"
<!-- <el-form-item label="国家/地区" class="search-item search-item-last">--> style="margin-left:10px">
<!-- <el-select-->
<!-- v-model="sarSarAccessEOSearch.countryArea"-->
<!-- placeholder="请选择"-->
<!-- filterable-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in countryOptions"-->
<!-- :value="item.value"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- >-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="清单名称" class="search-item search-item-last"> <el-form-item label="清单名称" class="search-item search-item-last">
<el-input <el-input
v-model="sarSarAccessEOSearch.detailedListName" v-model="sarSarAccessEOSearch.detailedListName"
@@ -301,7 +252,7 @@
class="common-button-primary" class="common-button-primary"
size="small" size="small"
v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'" v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
@click="selectionList"> @click="queryDetailsData">
查询 查询
</el-button> </el-button>
</el-form-item> </el-form-item>
@@ -343,7 +294,8 @@
align="center" align="center"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<a class="table-jump" @click.stop="showTable(scope.row)">{{ scope.row.detailedListName }}</a> <a class="table-jump" @click.stop="showTable(scope.row)">{{
scope.row.detailedListName }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -422,7 +374,8 @@
align="center" align="center"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<a class="table-jump" @click.stop="showTable(scope.row)">{{ scope.row.detailedListName }}</a> <a class="table-jump" @click.stop="showTable(scope.row)">{{
scope.row.detailedListName }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -462,7 +415,7 @@
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
{{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD hh:mm:ss") : scope.row.updateTime {{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-D hh:mm:ss") : scope.row.updateTime
}} }}
</div> </div>
</template> </template>
@@ -501,7 +454,8 @@
align="center" align="center"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<a class="table-jump" @click.stop="showTable(scope.row)">{{ scope.row.detailedListName }}</a> <a class="table-jump" @click.stop="showTable(scope.row)">{{
scope.row.detailedListName }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -577,51 +531,52 @@
<div class="demo-drawer-content"> <div class="demo-drawer-content">
<div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0"> <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
<div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0"> <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
<div class="left"> <div class="left">
<el-form :modal="standardSearch" :inline="true" class="label-input-form" style="margin-left:10px"> <el-form :modal="standardSearch" :inline="true" class="label-input-form"
<el-form-item label="类型" class="search-item search-item-last"> style="margin-left:10px">
<el-select <el-form-item label="类型" class="search-item search-item-last">
@change="typeChange" <el-select
v-model="standardSearch.standType" @change="typeChange"
placeholder="请选择" v-model="standardSearch.standType"
filterable placeholder="请选择"
> filterable
<el-option >
v-for="item in standardTypeOptions" <el-option
:value="item.value" v-for="item in standardTypeOptions"
:key="item.value" :value="item.value"
:label="item.label" :key="item.value"
> :label="item.label"
</el-option> >
</el-select> </el-option>
</el-form-item> </el-select>
<el-form-item label="标准号/标准名称" class="search-item search-item-last"> </el-form-item>
<el-input <el-form-item label="标准号/标准名称" class="search-item search-item-last">
v-model="standardSearch.standNumber" <el-input
placeholder="请输入标准号或标准名称" v-model="standardSearch.standNumber"
></el-input> placeholder="请输入标准号或标准名称"
</el-form-item> ></el-input>
<el-form-item class="search-item btn-box"> </el-form-item>
<el-button <el-form-item class="search-item btn-box">
:loading="searching" <el-button
type="primary" :loading="searching"
class="common-button-primary" type="primary"
size="small" class="common-button-primary"
v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'" size="small"
@click="addList"> v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
查询 @click="addList">
</el-button> 查询
</el-form-item> </el-button>
<el-form-item class="search-item btn-box"> </el-form-item>
<el-button <el-form-item class="search-item btn-box">
class="common-button-default" <el-button
size="small" class="common-button-default"
v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'" size="small"
@click="clearSearch">清空 v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
</el-button> @click="clearStandSearch">清空
</el-form-item> </el-button>
</el-form> </el-form-item>
</div> </el-form>
</div>
<el-table <el-table
:data="standardData" :data="standardData"
tooltip-effect="dark" tooltip-effect="dark"
@@ -640,14 +595,15 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="code" prop="code"
fixed="left"
align="center" align="center"
label="标准号"> label="标准号">
<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"
@click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
scope.row.standNumber
}}-{{ scope.row.standYear }}</a> }}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} <a v-else @click="handlePreview(scope.row)" class="table-jump">{{
scope.row.standSortShow }}
{{ scope.row.standNumber }}</a> {{ scope.row.standNumber }}</a>
</template> </template>
</el-table-column> </el-table-column>
@@ -706,35 +662,20 @@
> >
</ProcessFooter> </ProcessFooter>
<!-- 选择责任人--> <!-- 选择责任人-->
<el-drawer <Role-tree
:title="drawerTitle" is-title="选择责任部门对接人"
:visible.sync="modalshowflag" :is-visible.sync="modalshowflag2"
:wrapperClosable="false" @checkedRole="checkedRole2"
size="800px"> :nodeList="nodeList2"
<el-tree ></Role-tree>
v-if="modalshowflag" <Role-tree
style="height: 100%; overflow: auto;" check-box
node-key="id" :is-title="drawerTitle"
class="filter-tree" :is-visible.sync="modalshowflag"
:data="treeData" @checkedRole="checkedRole"
:props="defaultProps" :nodeList="nodeList"
:default-checked-keys="nodeList" ></Role-tree>
highlight-current <el-dialog width="400px" :visible.sync="fileMadel" title="上传文件">
check-strictly
@check="drawerCheck"
default-expand-all
:expand-on-click-node="false"
show-checkbox
ref="tree">
</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>
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
</div>
</el-drawer>
<el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
<el-upload <el-upload
multiple multiple
drag drag
@@ -771,25 +712,25 @@ export default {
}, },
data() { data() {
return { return {
fileUrl: 'api/att/attFile/upload', fileUrl: "api/att/attFile/upload",
fileMadel: false, fileMadel: false,
searching: false, searching: false,
// 查询选择清单相关参数 // 查询选择清单相关参数
sarSarAccessEOSearch: { sarSarAccessEOSearch: {
countryArea: "", countryArea: "",
detailedListName: "", detailedListName: "",
page: 1,
pageSize: this.$store.getters.userInfo.configContent
}, },
//查询添加标准相关数据 //查询添加标准相关数据
standardSearch: { standardSearch: {
standType: '', standType: "",
standNumber:'', standNumber: "",
pageNo: 1, pageNo: 1,
pageSizeNo: this.$store.getters.userInfo.configContent pageSizeNo: this.$store.getters.userInfo.configContent
}, },
standList: [], //新添加的标准 standList: [], //新添加的标准
modalshowflag: false, // drawer开关 modalshowflag: false, // drawer开关
modalshowflag2: false,
nodeList2: [],
drawerTitle: "", //drawer标题 drawerTitle: "", //drawer标题
nodeList: [], nodeList: [],
defaultProps: { defaultProps: {
@@ -833,6 +774,7 @@ export default {
sarAccessListDatas: [], //国家地区清单表格 sarAccessListDatas: [], //国家地区清单表格
uploadFileListPath: "api/att/attFile/upload", // 上传的地址 uploadFileListPath: "api/att/attFile/upload", // 上传的地址
fileInfoList: [], // 上传的附件 fileInfoList: [], // 上传的附件
fileIds: [], // 上传的附件
fileListName: [], //上传的附件名称 fileListName: [], //上传的附件名称
standardData: [], //添加标准数据 standardData: [], //添加标准数据
standardData1: [], //添加标准数据 standardData1: [], //添加标准数据
@@ -856,11 +798,10 @@ export default {
listForm: { listForm: {
listType: "", //区分是哪个清单 listType: "", //区分是哪个清单
listName: "", //清单名称 listName: "", //清单名称
applyRegion: "", //适用区域
descriptionList: "", //清单说明 descriptionList: "", //清单说明
fileId:'', fileId: "",
model: '', // 上传模板 model: "", // 上传模板
modelName: '', modelName: "",
standId: "", //选择的清单的id standId: "", //选择的清单的id
signFlag: "1", //是否会签 1为会签 2为不会签 signFlag: "1", //是否会签 1为会签 2为不会签
inforlist: "", //用来存放标准列表的标准id inforlist: "", //用来存放标准列表的标准id
@@ -875,18 +816,18 @@ export default {
}] }]
}, },
choiceForm: {}, //选择标准清单列表 choiceForm: {}, //选择标准清单列表
countryOptions: [], //适用区域下拉框数据 // countryOptions: [], //适用区域下拉框数据
standardTypeOptions: [ standardTypeOptions: [
{ {
value: 'INLAND', value: "INLAND",
label: '国内标准法规', label: "国内标准法规",
item:'INLAND', item: "INLAND"
},
{
value: 'FOREIGN',
label: '海外标准法规',
item:'FOREIGN',
}, },
{
value: "FOREIGN",
label: "海外标准法规",
item: "FOREIGN"
}
], ],
user1: "", user1: "",
user2: "", user2: "",
@@ -897,22 +838,36 @@ export default {
}; };
}, },
methods: { methods: {
saveUserInfo() { checkedRole(data) {
if (this.type === "dockUser") { if (this.type === "dockUser") {
this.roleForm.dockUser = this.roleRow.id; this.roleForm.dockUser = this.roleRow.id;
this.roleForm.dockUserName = this.roleRow.name; this.roleForm.dockUserName = this.roleRow.name;
} else if (this.type === "ministerUser") { } else if (this.type === "ministerUser") {
this.roleForm.ministerUser = this.roleRow.id; this.roleForm.ministerUser = data[0].id;
this.roleForm.ministerUserName = this.roleRow.name; this.roleForm.ministerUserName = data[0].name;
} else if (this.type === "directorUser") { } else if (this.type === "directorUser") {
this.roleForm.directorUser = this.roleRow.id; this.roleForm.directorUser = data[0].id;
this.roleForm.directorUserName = this.roleRow.name; this.roleForm.directorUserName = data[0].name;
} else if (this.type === "presidentUser") { } else if (this.type === "presidentUser") {
this.roleForm.presidentUser = this.roleRow.id; this.roleForm.presidentUser = data[0].id;
this.roleForm.presidentUserName = this.roleRow.name; this.roleForm.presidentUserName = data[0].name;
} }
this.modalshowflag = false; this.modalshowflag = false;
}, },
checkedRole2(data) {
var idList = "";
var nameList = "";
data.forEach(item => {
if (nameList.length > 0) {
nameList += ",";
idList += ",";
}
idList += item.id;
nameList += item.name;
});
this.roleForm.dockUser = idList;
this.roleForm.dockUserName = nameList;
},
cancleUserInfo() { cancleUserInfo() {
this.modalshowflag = false; this.modalshowflag = false;
}, },
@@ -940,9 +895,13 @@ export default {
this.listForm.signFlag = 2; this.listForm.signFlag = 2;
} }
}, },
queryDetailsData(){
this.page = 1
this.selectionList()
},
// //判断当前选中的是哪个清单 // //判断当前选中的是哪个清单
selectionList(type) { selectionList(type) {
type = this.listType type = this.listType;
if (type === "project") { if (type === "project") {
this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", { this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
page: this.page, page: this.page,
@@ -969,7 +928,7 @@ export default {
this.total = res.data.total; this.total = res.data.total;
}, e => { }, e => {
}); });
} else if(type === 'country') { } else if (type === "country") {
this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", { this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
page: this.page, page: this.page,
pageSize: this.pageSize, pageSize: this.pageSize,
@@ -989,12 +948,14 @@ export default {
countryArea: "", countryArea: "",
detailedListName: "" detailedListName: ""
}; };
this.standardSearch ={
standType:'',
standNumber: '',
}
this.selectionList(); this.selectionList();
this.addList() },
clearStandSearch(){
this.standardSearch = {
standType: "",
standNumber: ""
};
this.addList();
}, },
//点击添加事件 //点击添加事件
addList() { addList() {
@@ -1007,7 +968,7 @@ export default {
_this: this _this: this
}, res => { }, res => {
this.standardData = res.data.list; this.standardData = res.data.list;
this.totalNo = res.data.count this.totalNo = res.data.count;
}, e => { }, e => {
}); });
this.standModel = true; this.standModel = true;
@@ -1041,184 +1002,183 @@ export default {
}, },
//保存事件 //保存事件
handleSave() { handleSave() {
this.saveLoading = true; this.saveLoading = true
let _formData = new FormData(); let _formData = new FormData()
_formData.append("createUser", this.$store.getters.userInfo.userId); _formData.append('id', this.bpnId || '')
_formData.append("createUserName", this.$store.getters.userInfo.uName); _formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append("prcType", this.$route.query.type); _formData.append('createUserName', this.$store.getters.userInfo.userName)
_formData.append("json", JSON.stringify({ _formData.append('prcType', '4')
prcForm: this.prcForm, _formData.append('json', JSON.stringify({
sarAccessInfoList: this.sarAccessInfoList, form: this.listForm,
sarAccessInfoListADMIN: this.sarAccessInfoListADMIN, roleForm: this.roleForm,
bzqdForm: this.bzqdForm, commentText: this.commentText
listInfo: this.listInfo, }))
id: this.id saveTaskFirst(_formData).then(res => {
})); this.saveLoading = false
saveTaskFirst(_formData).then(res => { this.$message.success('保存成功')
this.saveLoading = false; this.bpnId = res.result
this.$message.success("保存成功");
}).catch(e => { }).catch(e => {
this.saveLoading = false; this.saveLoading = false
}); })
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
let json = this.listForm; if(this.dataList.length < 1){
console.log(this.fileInfoList); this.$message.warning('标准不能为空')
console.log(this.fileInfoList.join(',')); }else{
this.listForm.fileId = this.fileInfoList.join(',') let json = this.listForm;
this.listForm.fileName = this.fileListName.join(',') this.listForm.fileId = this.fileIds.join(",");
// let json = Object.assign(this.listForm, this.roleForm) this.listForm.fileName = this.fileListName.join(",");
json.zrUserId = this.roleForm.dockUser; //会签人 this.listForm.model = this.listForm.fileId;
json.jlUserId = this.roleForm.directorUser; //业务经理 this.listForm.modelName = this.listForm.fileName;
// (如果是业务经理应该这样写 后续需要更改 例:json.jlUserId = this.roleForm.directorUser;) json.zrUserId = this.roleForm.dockUser; //会签人
json.applyUpdUserId = this.roleForm.ministerUser; // 修订人 json.jlUserId = this.roleForm.directorUser; //业务经理
json.approvalOpinion = ""; json.applyUpdUserId = this.roleForm.ministerUser; // 修订人
json.prcCreateUser = this.$store.getters.userInfo.userId; json.approvalOpinion = "";
json.prcCreateUserName = this.$store.getters.userInfo.account; json.prcCreateUser = this.$store.getters.userInfo.userId;
json.standName = this.listForm.listName; json.prcCreateUserName = this.$store.getters.userInfo.uName;
json.standId = this.listForm.standId; json.standName = this.listForm.listName;
this.$refs["qdfbForm"].validate((valid) => { json.standId = this.listForm.standId;
if (valid) { this.$refs["qdfbForm"].validate((valid) => {
this.$refs["Form"].validate((valid) => { if (valid) {
if (valid) { this.$refs["Form"].validate((valid) => {
this.$http.get("lawss/activiti/startProcess", { type: "4" }, { if (valid) {
_this: this this.$http.get("lawss/activiti/startProcess", { type: "4" }, {
}, res => { _this: this
if (res.ok) { }, res => {
this.$http.post("lawss/activiti/completeTask", { if (res.ok) {
taskIds: res.data, this.$http.post("lawss/activiti/completeTask", {
userId: this.$store.getters.userInfo.userId, taskIds: res.data,
json: JSON.stringify(json) userId: this.$store.getters.userInfo.userId,
}, { json: JSON.stringify(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");
}); }
} });
}); }
} else { });
return this.$message.warning("请完善人员信息"); } else {
} return this.$message.warning("请完善人员信息");
}); }
} else { });
return this.$message.warning("请完善基础信息"); } else {
} return this.$message.warning("请完善基础信息");
}); }
});
}
}, },
// 删除上传的文件 // 删除上传的文件
delFileInfo(file, fileList) { delFileInfo(file, fileList) {
this.fileInfoList = fileList let middle = [];
let middle = [] let files = [];
fileList.forEach(item => { fileList.forEach(item => {
middle.push(item.name) middle.push(item.name);
}) files.push(item.response.data.id);
this.fileListName = middle });
this.fileListName = middle;
this.fileIds = files;
}, },
fileUpload () { fileUpload() {
this.fileMadel = true this.fileMadel = true;
}, },
// 上传文件成功回调 // 上传文件成功回调
uploadBackSuccess (res, file, fileList) { uploadBackSuccess(res, file, fileList) {
if (res.ok) { if (res.ok) {
let middle = [] let middle = [];
fileList.forEach(item => { fileList.forEach(item => {
middle.push(item.name) middle.push(item.name);
}) });
this.fileListName = middle this.fileListName = middle;
let files = [] this.fileIds.push(file.response.data.id);
this.flielist this.$message.success('上传成功')
// this.fileInfoList = fileList
// this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id
// this.$message.success('上传成功')
} else { } else {
this.$message.error(res.message) this.$message.error(res.message);
fileList.pop() fileList.pop();
} }
}, },
// 相关附件 上传之前钩子 // 相关附件 上传之前钩子
beforeUpload (file) { beforeUpload(file) {
var filename = file.name var filename = file.name;
var index1 = filename.lastIndexOf('.') var index1 = filename.lastIndexOf(".");
var index2 = filename.length var index2 = filename.length;
var fileSuffix = filename.substring(index1, index2) var fileSuffix = filename.substring(index1, index2);
// const fileSuffix = file.name.split('.')[1] // 后缀名
//把后缀转大写 //把后缀转大写
if(fileSuffix !== undefined && fileSuffix !== null){ if (fileSuffix !== undefined && fileSuffix !== null) {
fileSuffix = fileSuffix.toUpperCase() fileSuffix = fileSuffix.toUpperCase();
} }
// 判断上传文件格式 // 判断上传文件格式
if (fileSuffix === '.PDF' || fileSuffix === '.DOC' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' if (fileSuffix === ".PDF" || fileSuffix === ".DOC" || fileSuffix === ".DOCX" || fileSuffix === ".PPT"
|| fileSuffix === '.PPTX'|| fileSuffix === '.XLS'|| fileSuffix === '.XLSX' || fileSuffix === ".PPTX" || fileSuffix === ".XLS" || fileSuffix === ".XLSX"
|| fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG') { || fileSuffix === ".PNG" || fileSuffix === ".JPG" || fileSuffix === ".JPEG") {
return true return true;
} else { } else {
this.$message.error('文件' + file.name + '格式不正确,请上传pdf、doc、docx、ppt、pptx、xls、xlsx、png、jpg、jpeg等文件') this.$message.error("文件" + file.name + "格式不正确,请上传pdf、doc、docx、ppt、pptx、xls、xlsx、png、jpg、jpeg等文件");
return false return false;
} }
// 判断文件上传大小 // 判断文件上传大小
if (file.size / 1024 / 1024 > 300) { if (file.size / 1024 / 1024 > 300) {
this.$message.warning('文件' + file.name + '大小不能超过300M') this.$message.warning("文件" + file.name + "大小不能超过300M");
return false return false;
} }
return true return true;
}, },
// 点击查看 // 点击查看
handlePreview (item) { handlePreview(item) {
let routeUrl = this.$router.resolve({ let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails', name: "OtherStandardDetails",
params: { params: {
id: item.id, id: item.id,
pageType: 'INLAND_STAND' pageType: "INLAND_STAND"
} }
}) });
window.open(routeUrl.href, '_blank') window.open(routeUrl.href, "_blank");
}, },
// 导入标准数据成功后执行 // 导入标准数据成功后执行
importFileSuccess (response, file) { importFileSuccess(response, file) {
if (response.ok) { if (response.ok) {
this.fileMadel = false this.fileMadel = false;
this.listForm.model = response.data.id this.listForm.model = response.data.id;
this.listForm.modelName = response.data.name this.listForm.modelName = response.data.name;
this.$message({ this.$message({
showClose: true, showClose: true,
message: response.message, message: response.message,
type: 'success' type: "success"
}) });
} }
}, },
// 导入按钮 上传之前的钩子 // 导入按钮 上传之前的钩子
beginImportFile (file) { beginImportFile(file) {
var filename = file.name var filename = file.name;
var index1 = filename.lastIndexOf('.') var index1 = filename.lastIndexOf(".");
var index2 = filename.length var index2 = filename.length;
var fileSuffix = filename.substring(index1, index2) var fileSuffix = filename.substring(index1, index2);
// const fileSuffix = file.name.split('.')[1] // 后缀名 // const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式 // 判断上传文件格式
if (fileSuffix === '.PDF' || fileSuffix === '.DOC' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' if (fileSuffix === ".PDF" || fileSuffix === ".DOC" || fileSuffix === ".DOCX" || fileSuffix === ".PPT"
|| fileSuffix === '.PPTX'|| fileSuffix === '.XLS'|| fileSuffix === '.XLSX' || fileSuffix === ".PPTX" || fileSuffix === ".XLS" || fileSuffix === ".XLSX"
|| fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG' || || fileSuffix === ".PNG" || fileSuffix === ".JPG" || fileSuffix === ".JPEG" ||
fileSuffix === '.pdf' || fileSuffix === '.doc' || fileSuffix === '.docx' || fileSuffix === '.ppt' fileSuffix === ".pdf" || fileSuffix === ".doc" || fileSuffix === ".docx" || fileSuffix === ".ppt"
|| fileSuffix === '.pptx'|| fileSuffix === '.xls'|| fileSuffix === '.xlsx' || fileSuffix === ".pptx" || fileSuffix === ".xls" || fileSuffix === ".xlsx"
|| fileSuffix === '.png'|| fileSuffix === '.jpg'|| fileSuffix === '.jpeg') { || fileSuffix === ".png" || fileSuffix === ".jpg" || fileSuffix === ".jpeg") {
return true return true;
} else { } else {
this.spinShow = false this.spinShow = false;
this.$message.error('文件' + file.name + '格式不正确,请上传pdf、doc、docx、ppt、pptx、xls、xlsx、png、jpg、jpeg等文件') this.$message.error("文件" + file.name + "格式不正确,请上传pdf、doc、docx、ppt、pptx、xls、xlsx、png、jpg、jpeg等文件");
return false return false;
} }
// 判断文件上传大小 // 判断文件上传大小
// eslint-disable-next-line no-unreachable // eslint-disable-next-line no-unreachable
if (file.size / 1024 / 1024 <= 200) { if (file.size / 1024 / 1024 <= 200) {
return true return true;
} else { } else {
this.$message.error('文件' + file.name + '大小不超过200M') this.$message.error("文件" + file.name + "大小不超过200M");
return false return false;
} }
return true return true;
}, },
// beginImportFile (file) { // beginImportFile (file) {
// var filename = file.name // var filename = file.name
@@ -1252,7 +1212,7 @@ export default {
this.ListModel = false; this.ListModel = false;
}, },
typeChange(type) { typeChange(type) {
this.standardSearch.standType = type this.standardSearch.standType = type;
}, },
//添加标准取消事件 //添加标准取消事件
cancelStand() { cancelStand() {
@@ -1278,7 +1238,7 @@ export default {
_this.dataList.push(item); _this.dataList.push(item);
} }
}); });
this.standardData = [] this.standardData = [];
_this.standModel = false; _this.standModel = false;
} }
}, },
@@ -1295,23 +1255,23 @@ export default {
} }
this.listForm.standId = bringData[0].id; this.listForm.standId = bringData[0].id;
this.listForm.listName = bringData[0].detailedListName; this.listForm.listName = bringData[0].detailedListName;
this.listForm.applyRegion = bringData[0].applicationScope;
this.listForm.descriptionList = bringData[0].remark; this.listForm.descriptionList = bringData[0].remark;
this.listForm.fileId = bringData[0].fileId; this.listForm.fileId = bringData[0].fileId;
this.ListModel = false; this.ListModel = false;
this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", { id: bringData[0].id }, { this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById",
{ id: bringData[0].id, page: this.page, Size:this.pageSize}, {
_this: this _this: this
}, res => { }, res => {
if(res.data==null){ if (res.data == null) {
res.data=[] res.data = [];
} }
this.dataList = res.data; this.dataList = res.data;
this.listForm.dataList = res.data; this.listForm.dataList = res.data;
let formId = [] let formId = [];
this.dataList.map(item => { this.dataList.map(item => {
formId.push(item.id) formId.push(item.id);
}); });
this.listForm.inforlist = formId.join(','); this.listForm.inforlist = formId.join(",");
}, e => { }, e => {
}); });
} else if (this.selectedList.length > 1) { } else if (this.selectedList.length > 1) {
@@ -1345,12 +1305,20 @@ export default {
this.drawerTitle = title; this.drawerTitle = title;
this.modalshowflag = true; this.modalshowflag = true;
}, },
choiceZRRS() {
this.nodeList2 = [];
if (this.roleForm.dockUser.length > 0) {
this.nodeList2 = this.roleForm.dockUser.split(",");
}
this.modalshowflag2 = true;
},
getTree() { getTree() {
this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => { this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => {
this.treeData = res.data; this.treeData = res.data;
}); });
}, },
pageChange(page) { pageChange(page) {
console.log(page);
this.page = page; this.page = page;
this.selectionList(); this.selectionList();
}, },
@@ -1358,15 +1326,15 @@ export default {
this.pageSize = this.$store.getters.userInfo.configContent; this.pageSize = this.$store.getters.userInfo.configContent;
this.selectionList(); this.selectionList();
}, },
pageChangeNo(page){ pageChangeNo(page) {
this.pageNo = page this.pageNo = page;
this.addList() this.addList();
}, },
pageSizeChangeNo(pageSize){ pageSizeChangeNo(pageSize) {
this.pageSizeNo = this.$store.getters.userInfo.configContent; this.pageSizeNo = this.$store.getters.userInfo.configContent;
this.addList() this.addList();
}, }
}, },
computed: {}, computed: {},
mounted() { mounted() {
@@ -1456,11 +1424,13 @@ export default {
} }
} }
} }
.add-form-el-select{
/deep/ .el-select{ .add-form-el-select {
/deep/ .el-select {
width: 210px; width: 210px;
} }
} }
.demo-drawer-content { .demo-drawer-content {
margin-top: 10px; margin-top: 10px;
} }
@@ -21,14 +21,6 @@
> >
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="24"> <el-col :span="24">
<!-- <el-form-item label="选择清单" prop="orgName" class="add-form-item form-item-disabled">-->
<!-- <el-radio-group v-model="listType" @change="selectionList">-->
<!-- <el-radio label="country">国家/地区清单</el-radio>-->
<!-- <el-radio label="project">项目清单</el-radio>-->
<!-- <el-radio label="other">其他清单</el-radio>-->
<!-- </el-radio-group>-->
<!-- <el-button size="mini" type="primary" style="margin-left: 40px;" @click="choiceShow">选择清单</el-button>-->
<!-- </el-form-item>-->
<el-form-item label="清单名称" prop="listName" class="add-form-item form-item-disabled"> <el-form-item label="清单名称" prop="listName" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
@@ -37,14 +29,6 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="适用区域" prop="applyRegion" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="listForm.applyRegion"
placeholder="请输入适用区域"
clearable
></el-input>
</el-form-item>
<el-form-item label="清单说明" prop="descriptionList" class="add-form-item form-item-disabled"> <el-form-item label="清单说明" prop="descriptionList" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
@@ -54,16 +38,25 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="附件" prop="modelName" class="add-form-item form-item-disabled"> <el-form-item label="附件" prop="modelName" class="add-form-item form-item-disabled">
<el-input <div class="file-box" v-if="listForm.model">
v-if="listForm.modelName == null || this.listForm.modelName== 'undefined' || this.listForm.modelName == '' " <p> {{ listForm.modelName }}
placeholder="暂无数据" <i
> title="下载"
</el-input> @click="downloadFile(listForm.model)"
<el-input class="icon-download"
v-else v-btn-permission="''"
v-model="listForm.modelName" />
placeholder="" <i
></el-input> title="下载带水印"
@click="downloadFileByWater(listForm.model,listForm.modelName)"
class="icon-download2"
v-btn-permission="''"
/>
</p>
</div>
<div v-else>
暂无数据
</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@@ -73,20 +66,20 @@
</process-title> </process-title>
<el-table <el-table
:data="dataList" :data="dataList"
style="width: 100%; border: 1px solid #ccc;"
row-key="standId"
height="70%"
border border
height="64.6%"
style="width: 100%"
@selection-change="selectStandChange" @selection-change="selectStandChange"
: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
prop="code" prop="code"
fixed="left"
width="180px" width="180px"
label="标准号"> label="标准号">
<template slot-scope="scope"> <template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a> <p v-if="scope.row.standYear">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</p>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</a> <p v-else>{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -171,7 +164,7 @@
sortable="custom" sortable="custom"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -179,7 +172,7 @@
label="完成时间" label="完成时间"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -187,7 +180,7 @@
label="审批意见" label="审批意见"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row.commentText}}</span> <span>{{ scope.row.commentText }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -195,14 +188,13 @@
label="状态" label="状态"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span> <span>{{ scope.row.endTime ? "已完成" : "未完成" }}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<loading :loading="loading">流程列表加载中</loading> <loading :loading="loading">流程列表加载中</loading>
</div> </div>
</div> </div>
<ProcessFooter <ProcessFooter
show-submit show-submit
:submitLoading="isSubmit" :submitLoading="isSubmit"
@@ -217,6 +209,7 @@ 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, queryDetail } from "api/process"; import { inboundLiaisonDetail, queryDetail } from "api/process";
import seeDatalis from "@/pages/localTool/standContrast/pages/seeDatalis";
export default { export default {
name: "bzqdfbStep2", name: "bzqdfbStep2",
@@ -233,7 +226,7 @@ export default {
loading: false, loading: false,
dataList: [],//清单里的标准数据 dataList: [],//清单里的标准数据
active: "1", active: "1",
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,
listType: "country", //选择的清单类型 listType: "country", //选择的清单类型
@@ -243,6 +236,7 @@ export default {
selectedList: [], //选择清单的选择框 selectedList: [], //选择清单的选择框
selectList: [], //选择标准的选择框 selectList: [], //选择标准的选择框
bringData: [], bringData: [],
fileIds: "",
commentText: "", //填写会签意见 commentText: "", //填写会签意见
page: 1, page: 1,
total: 0, total: 0,
@@ -250,7 +244,7 @@ export default {
listForm: { listForm: {
listType: "", //区分是哪个清单 listType: "", //区分是哪个清单
listName: "", //清单名称 listName: "", //清单名称
applyRegion: "", //适用区域 // applyRegion: "", //适用区域
descriptionList: "", //清单说明 descriptionList: "", //清单说明
enclosure: "", //附件 enclosure: "", //附件
inforlist: "",//用来存放标准的id inforlist: "",//用来存放标准的id
@@ -267,7 +261,7 @@ export default {
}] }]
}, },
choiceForm: {}, //选择标准清单列表 choiceForm: {}, //选择标准清单列表
countryOptions: [], //适用区域下拉框数据 // countryOptions: [], //适用区域下拉框数据
user1: "", user1: "",
user2: "", user2: "",
user3: "", user3: "",
@@ -277,17 +271,18 @@ export default {
}; };
}, },
methods: { methods: {
processTable () { processTable() {
this.$http.get('lawss/activiti/get_list_by_instance', { this.$http.get("lawss/activiti/get_list_by_instance", {
prcNum: this.$route.query.prcNum, prcNum: this.$route.query.prcNum,
sortWord: this.shunxu ? this.paixu : '', sortWord: this.shunxu ? this.paixu : "",
shunxu: this.shunxu shunxu: this.shunxu
}, { }, {
loading: 'loading', loading: "loading",
_this: this _this: this
}, res => { }, res => {
this.detailData = res this.detailData = res;
}, e => {}) }, e => {
});
}, },
//tab发生变化 //tab发生变化
handleTabs(name) { handleTabs(name) {
@@ -304,31 +299,70 @@ export default {
}).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);
} }
}).catch(e => { }).catch(e => {
}) });
}) });
}, },
/** /**
* @description: 动态表单读取 * @description: 动态表单读取
*/ */
getFormFieldList (item) { getFormFieldList(item) {
this.$nextTick(() => { this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item)) this.listForm = JSON.parse(JSON.stringify(item));
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 = item.dataList this.dataList = item.dataList;
this.listForm.applyUpdUserId = item.applyUpdUserId this.listForm.applyUpdUserId = item.applyUpdUserId;
this.listForm.jlUserId = item.jlUserId this.listForm.jlUserId = item.jlUserId;
this.listForm.zrUserId = item.zrUserId this.listForm.zrUserId = item.zrUserId;
}) this.fileIds = item.fileId
this.getFileInfo();
});
},
// 请求上传的文件信息
getFileInfo() {
this.$http.get("att/attFile/getMultiFileInfos", {
fileIds: this.fileIds
}, {
_this: this
}, res => {
console.log(res);
this.$nextTick(() => {
res.data.map(item => {
this.listForm.modelName = item.oldFileName
this.listForm.model = item.id
});
});
}, e => {
});
},
/**
* @Description: 点击下载
*/
downloadFile(attId) {
if (attId != null && attId !== "") {
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
} else {
this.$message.error("请选择要下载的文件");
}
},
downloadFileByWater(attId, fileSuffix) {
let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
if (fileExtension !== "pdf" && fileExtension !== "PDF") {
this.$message.error("水印下载仅支持PDF,pdf格式文件");
} else {
if (attId != null && attId !== "") {
window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
} else {
this.$message.error("请选择要下载的文件");
}
}
}, },
//保存事件 //保存事件
handleSave() { handleSave() {
@@ -345,16 +379,16 @@ export default {
this.listForm.standId = this.listForm.standId; this.listForm.standId = this.listForm.standId;
this.listForm.signFlag = ""; this.listForm.signFlag = "";
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
this.$http.post('lawss/activiti/completeTask', { this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds, taskIds: this.taskIds,
userId: this.userId, userId: this.userId,
json: json, json: json
}, { }, {
_this: this _this: this
}, res => { }, res => {
if (res.success) { if (res.success) {
this.$message.success(res.message) this.$message.success(res.message);
this.$router.push('/processCenter') this.$router.push("/processCenter");
} }
}, e => { }, e => {
@@ -373,28 +407,6 @@ export default {
}, },
selectThree() { selectThree() {
},
// 请求上传的文件信息
getFileInfo() {
// this.$http.get("att/attFile/getMultiFileInfos", {
// fileIds: this.sarAccessEO.fileIds
// }, {
// _this: this
// }, res => {
// console.log(res);
// this.$nextTick(() => {
// res.data.map(item => {
// // 赋值要回显的上传文件内容
// this.fileInfoList.push({
// name: item.oldFileName,
// uid: item.uid,
// status: item.status,
// id: item.id
// });
// });
// });
// }, e => {
// });
}, },
pageChange(page) { pageChange(page) {
this.page = page; this.page = page;
@@ -406,15 +418,14 @@ export default {
} }
}, },
computed: { computed: {
listNoDataText () { listNoDataText() {
return this.processType === 1 ? '暂无待办流程' : '暂无已办流程' return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
}, }
}, },
watch: {},
mounted() { mounted() {
this.processTable() this.processTable();
this.getData() this.getData();
this.getFileInfo()
// console.log(this.$store.getters.getHandleInfo);
} }
}; };
</script> </script>
@@ -429,6 +440,36 @@ export default {
padding: 0 20px 0; padding: 0 20px 0;
} }
} }
.fileClass {
cursor: pointer;
}
.fileClass:hover{
color: #0c91e5;
}
p {
& > a {
cursor: pointer;
}
& > i {
display: inline-block;
margin-left: 3px;
width: 18px;
height: 16px;
background-repeat: no-repeat;
background-size: 100% 100%;
background-position: center center;
vertical-align: sub;
cursor: pointer;
}
.icon-download {
background-image: url("~assets/images/shangqi/img/download.png");
}
.icon-download2 {
background-image: url("~assets/images/shangqi/img/download2.png");
}
}
.choiceBtn { .choiceBtn {
.el-button--primary { .el-button--primary {
@@ -37,13 +37,13 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="适用区域" prop="applyRegion" class="add-form-item form-item-disabled"> <!-- <el-form-item label="适用区域" prop="applyRegion" class="add-form-item form-item-disabled">-->
<el-input <!-- <el-input-->
v-model="listForm.applyRegion" <!-- v-model="listForm.applyRegion"-->
placeholder="请输入适用区域" <!-- placeholder="请输入适用区域"-->
clearable <!-- clearable-->
></el-input> <!-- ></el-input>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="清单说明" prop="descriptionList" class="add-form-item form-item-disabled"> <el-form-item label="清单说明" prop="descriptionList" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="listForm.descriptionList" v-model="listForm.descriptionList"
@@ -340,7 +340,7 @@ export default {
pageSizeNo: this.$store.getters.userInfo.configContent, pageSizeNo: this.$store.getters.userInfo.configContent,
listForm: { listForm: {
listName: "", //清单名称 listName: "", //清单名称
applyRegion: "", //适用区域 // applyRegion: "", //适用区域
descriptionList: "", //清单说明 descriptionList: "", //清单说明
enclosure: "", //附件 enclosure: "", //附件
signFlag: "1", //是否会签 1为会签 2为不会签 signFlag: "1", //是否会签 1为会签 2为不会签
@@ -357,7 +357,7 @@ export default {
}] }]
}, },
choiceForm: {}, //选择标准清单列表 choiceForm: {}, //选择标准清单列表
countryOptions: [], //适用区域下拉框数据 // countryOptions: [], //适用区域下拉框数据
user1: "", user1: "",
user2: "", user2: "",
user3: "", user3: "",
@@ -383,6 +383,17 @@ export default {
handleTabs(name) { handleTabs(name) {
this.active = name; this.active = name;
}, },
// 点击查看
handlePreview(item) {
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
id: item.id,
pageType: "INLAND_STAND"
}
});
window.open(routeUrl.href, "_blank");
},
//点击添加事件 //点击添加事件
addList() { addList() {
this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", "", { this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", "", {
@@ -1,480 +1,507 @@
<!--标准法规清单发布 - 业务经理审批--> <!--标准法规清单发布 - 业务经理审批-->
<template> <template>
<div class="bzqdfb-step4"> <div class="bzqdfb-step4">
<ProcessHeader toggle> <ProcessHeader toggle>
<template slot="proName">标准清单发布/更新流程</template> <template slot="proName">标准清单发布/更新流程</template>
<template slot="proNode">业务经理审批</template> <template slot="proNode">业务经理审批</template>
</ProcessHeader> </ProcessHeader>
<div class="headerTabs"> <div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div> <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div> <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div> </div>
<div class="content" v-show="active == '1'"> <div class="content" v-show="active == '1'">
<div style="flex: auto; overflow: auto"> <div style="flex: auto; overflow: auto">
<process-title> <process-title>
<template slot="title">基础信息</template> <template slot="title">基础信息</template>
</process-title> </process-title>
<el-form <el-form
:model="listForm" :model="listForm"
class="label-input-form prc-content-border" class="label-input-form prc-content-border"
label-width="150px" label-width="150px"
>
<el-row :gutter="24">
<el-col :span="24">
<!-- <el-form-item label="选择清单" prop="orgName" class="add-form-item form-item-disabled">-->
<!-- <el-radio-group v-model="listType" @change="selectionList">-->
<!-- <el-radio label="country">国家/地区清单</el-radio>-->
<!-- <el-radio label="project">项目清单</el-radio>-->
<!-- <el-radio label="other">其他清单</el-radio>-->
<!-- </el-radio-group>-->
<!-- <el-button size="mini" type="primary" style="margin-left: 40px;" @click="choiceShow">选择清单</el-button>-->
<!-- </el-form-item>-->
<el-form-item label="清单名称" prop="listName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="listForm.listName"
placeholder="请输入清单名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="适用区域" prop="applyRegion" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="listForm.applyRegion"
placeholder="请输入适用区域"
clearable
></el-input>
</el-form-item>
<el-form-item label="清单说明" prop="descriptionList" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="listForm.descriptionList"
placeholder="请输入清单说明"
clearable
></el-input>
</el-form-item>
<el-form-item label="附件" prop="modelName" class="add-form-item form-item-disabled">
<el-input
v-if="listForm.modelName == null || this.listForm.modelName== 'undefined' || this.listForm.modelName == '' "
v-model="listForm.modelName"
placeholder="暂无数据"
> >
</el-input> <el-row :gutter="24">
<el-input <el-col :span="24">
v-else <el-form-item label="清单名称" prop="listName" class="add-form-item form-item-disabled">
v-model="listForm.modelName" <el-input
placeholder="" disabled
></el-input> v-model="listForm.listName"
</el-form-item> placeholder="请输入清单名称"
</el-col> clearable
</el-row> ></el-input>
</el-form> </el-form-item>
<process-title> <el-form-item label="清单说明" prop="descriptionList" class="add-form-item form-item-disabled">
<template slot="title">填写信息</template> <el-input
</process-title> disabled
<el-table v-model="listForm.descriptionList"
:data="dataList" placeholder="请输入清单说明"
border clearable
height="64.6%" ></el-input>
style="width: 100%" </el-form-item>
@selection-change="selectStandChange" <el-form-item label="附件" prop="modelName" class="add-form-item form-item-disabled">
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', <div class="file-box" v-if="listForm.model">
<p> {{ listForm.modelName }}
<i
title="下载"
@click="downloadFile(listForm.model)"
class="icon-download"
v-btn-permission="''"
/>
<i
title="下载带水印"
@click="downloadFileByWater(listForm.model,listForm.modelName)"
class="icon-download2"
v-btn-permission="''"
/>
</p>
</div>
<div v-else>
暂无数据
</div>
</el-form-item>
</el-col>
</el-row>
</el-form>
<process-title>
<template slot="title">填写信息</template>
</process-title>
<el-table
:data="dataList"
border
height="64.6%"
style="width: 100%"
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"> fontWeight: 'bold', height: '48px'}">
<el-table-column <el-table-column
prop="code" prop="code"
fixed="left" fixed="left"
width="180px" width="180px"
label="标准号"> label="标准号">
<template slot-scope="scope"> </el-table-column>
<a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a> <el-table-column
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</a> prop="standName"
</template> label="标准名称"
</el-table-column> width="260px"
<el-table-column >
prop="standName" </el-table-column>
label="标准名称" <el-table-column
width="260px" prop="issueTime"
> sortable
</el-table-column> label="发布日期">
<el-table-column </el-table-column>
prop="issueTime" <el-table-column
sortable prop="xcxssrq"
label="发布日期"> sortable
</el-table-column> label="新车型实施日期">
<el-table-column </el-table-column>
prop="xcxssrq" <el-table-column
sortable show-overflow-tooltip
label="新车型实施日期"> prop="zccssrq"
</el-table-column> sortable
<el-table-column label="在产车实施日期">
show-overflow-tooltip </el-table-column>
prop="zccssrq" <el-table-column
sortable show-overflow-tooltip
label="在产车实施日期"> prop="textStatus"
</el-table-column> width="120px"
<el-table-column label="文本状态">
show-overflow-tooltip </el-table-column>
prop="textStatus" </el-table>
width="120px"
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> </div>
</el-collapse-item> <div>
</el-collapse> <el-collapse accordion>
</div> <el-collapse-item title="意见填写">
</div> <div style="margin: 10px 0;">
<div class="content" v-show="active === '3'"> <el-input
<div class="flow-list"> type="textarea"
<el-table :rows="3"
height="100%" resize="none"
ref="selection" placeholder="请输入意见"
:data="detailData" v-model="commentText">
tooltip-effect="dark" </el-input>
style="width: 100%" </div>
border </el-collapse-item>
row-key="id" </el-collapse>
:no-data-text="listNoDataText" </div>
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}" </div>
> <div class="content" v-show="active === '3'">
<el-table-column <div class="flow-list">
type="selection" <el-table
width="55" height="100%"
align="center"> ref="selection"
</el-table-column> :data="detailData"
<el-table-column tooltip-effect="dark"
prop="name" style="width: 100%"
label="任务步骤" border
align="center" row-key="id"
> :no-data-text="listNoDataText"
</el-table-column> :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
<el-table-column >
prop="assignee" <el-table-column
label="任务受理人" type="selection"
align="center" width="55"
> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="createTime" prop="name"
label="创建时间" label="任务步骤"
sortable="custom" align="center"
align="center"> >
<template slot-scope="scope"> </el-table-column>
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span> <el-table-column
</template> prop="assignee"
</el-table-column> label="任务受理人"
<el-table-column align="center"
prop="endTime" >
label="完成时间" </el-table-column>
align="center"> <el-table-column
<template slot-scope="scope"> prop="createTime"
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span> label="创建时间"
</template> sortable="custom"
</el-table-column> align="center">
<el-table-column <template slot-scope="scope">
prop="comment" <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
label="审批意见" </template>
align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column
<span>{{scope.row.commentText}}</span> prop="endTime"
</template> label="完成时间"
</el-table-column> align="center">
<el-table-column <template slot-scope="scope">
prop="completeFlag" <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
label="状态" </template>
align="center"> </el-table-column>
<template slot-scope="scope"> <el-table-column
<span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span> prop="comment"
</template> label="审批意见"
</el-table-column> align="center">
</el-table> <template slot-scope="scope">
<loading :loading="loading">流程列表加载中</loading> <span>{{scope.row.commentText}}</span>
</div> </template>
</div> </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 <ProcessFooter
show-back show-back
show-submit show-submit
:submitLoading="isSubmit" :submitLoading="isSubmit"
:saveLoading="saveLoading" :saveLoading="saveLoading"
:approval="true" :approval="true"
@back="beforeBack" @back="beforeBack"
@submit="handleSubmit" @submit="handleSubmit"
> >
</ProcessFooter> </ProcessFooter>
</div> </div>
</template> </template>
<script> <script>
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 } from "api/process"; import {inboundLiaisonDetail} from "api/process";
export default { export default {
name: "bzqdfbStep4", name: "bzqdfbStep4",
components: { components: {
ProcessHeader, ProcessHeader,
ProcessFooter, ProcessFooter,
ProcessTitle ProcessTitle
}, },
data() { data() {
return { return {
detailData: [], detailData: [],
// 当前流程类型(1待办/2已办) // 当前流程类型(1待办/2已办)
processType: 1, processType: 1,
loading: false, loading: false,
dataList: [],//清单里的标准数据 dataList: [],//清单里的标准数据
approvalOpinion: '', // 通过0/驳回1 approvalOpinion: '', // 通过0/驳回1
active: "1", active: "1",
listType: "country", //选择的清单类型 listType: "country", //选择的清单类型
isSubmit: false, isSubmit: false,
saveLoading: false, saveLoading: false,
tabValue: "listOfCountries", tabValue: "listOfCountries",
selectedList: [], //选择清单的选择框 selectedList: [], //选择清单的选择框
selectList: [], //选择标准的选择框 selectList: [], //选择标准的选择框
bringData: [], bringData: [],
commentText: '', //填写会签意见 commentText: '', //填写会签意见
page: 1, page: 1,
total: 0, total: 0,
pageSize: this.$store.getters.userInfo.configContent, pageSize: this.$store.getters.userInfo.configContent,
listForm: { listForm: {
listType: "", //区分是哪个清单 listType: "", //区分是哪个清单
listName: "", //清单名称 listName: "", //清单名称
applyRegion: "", //适用区域 descriptionList: "", //清单说明
descriptionList: "", //清单说明 enclosure: "", //附件
enclosure: "", //附件 signFlag: "1", //是否会签 1为会签 2为不会签
signFlag: "1", //是否会签 1为会签 2为不会签 approvalOpinion: '', // 通过/驳回
approvalOpinion: '', // 通过/驳回 dataList: [{
dataList: [{ standNumber: "", //标准号
standNumber: "", //标准号 cnName: "", //中文名称
cnName: "", //文名称 enName: "", //文名称
enName: "", //英文名称 isSubTime: "", //发布日期
isSubTime: "", //发布日期 newCarTime: "", //新车型实施日期
newCarTime: "", //新车型实施日期 oldCarTime: "", //在产车实施日期
oldCarTime: "", //在产车实施日期 applyCar: "", //适用车型
applyCar: "", //适用车型 textState: "", //文本状态
textState: "", //文本状态 id: ""
id: "" }]
}] },
}, choiceForm: {}, //选择标准清单列表
choiceForm: {}, //选择标准清单列表 // countryOptions: [], //适用区域下拉框数据
countryOptions: [], //适用区域下拉框数据 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, signFlag: "1", //是否会签 1为会签 2为不会签
signFlag: "1", //是否会签 1为会签 2为不会签 user1: "",
user1: "", user2: "",
user2: "", user3: "",
user3: "", user4: "",
user4: "", user5: "",
user5: "", standMap: new Map()
standMap: new Map() };
},
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(name) {
this.active = name;
},
choiceShow() {
this.ListModel = true;
},
//保存事件
handleSave() {
},
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 => {
})
})
},
/**
* @description: 动态表单读取
*/
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.listForm.applyUpdUserId = item.applyUpdUserId
this.listForm.jlUserId = item.jlUserId
this.listForm.zrUserId = item.zrUserId
})
},
// 请求上传的文件信息
getFileInfo() {
this.$http.get("att/attFile/getMultiFileInfos", {
fileIds: this.fileIds
}, {
_this: this
}, res => {
console.log(res);
this.$nextTick(() => {
res.data.map(item => {
this.listForm.modelName = item.oldFileName
this.listForm.model = item.id
});
});
}, e => {
});
},
/**
* @Description: 点击下载
*/
downloadFile(attId) {
if (attId != null && attId !== "") {
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
} else {
this.$message.error("请选择要下载的文件");
}
},
downloadFileByWater(attId, fileSuffix) {
let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1);
if (fileExtension !== "pdf" && fileExtension !== "PDF") {
this.$message.error("水印下载仅支持PDF,pdf格式文件");
} else {
if (attId != null && attId !== "") {
window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId;
} else {
this.$message.error("请选择要下载的文件");
}
}
},
//驳回事件
beforeBack() {
this.listForm.approvalOpinion = '1'
this.handleSubmit()
},
//提交事件
handleSubmit() {
this.listForm.applyUpdUserId = this.listForm.applyUpdUserId;
this.listForm.zrUserId = this.listForm.zrUserId;
this.listForm.jlUserId = this.listForm.jlUserId;
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
this.listForm.commentText = this.commentText;
this.listForm.signflag = "";
this.listForm.standId = this.listForm.standId;
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')
}
});
},
//选择标准取消事件
closeDrawer() {
this.ListModel = false;
},
//标准表格选择框改变
selectStandChange(data) {
this.selectList = [];
for (let i = 0; i < data.length; i++) {
this.selectList.push(data[i].id);
}
},
selectThree() {
},
pageChange(page) {
this.page = page;
this.searchData();
},
pageSizeChange(pageSize) {
this.pageSize = this.$store.getters.userInfo.configContent;
this.searchData();
}
},
computed: {
listNoDataText() {
return this.processType === 1 ? '暂无待办流程' : '暂无已办流程'
}
},
mounted() {
this.getData()
this.processTable()
},
}; };
},
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(name) {
this.active = name;
},
choiceShow() {
this.ListModel = true;
},
//保存事件
handleSave() {
},
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 => {
})
})
},
/**
* @description: 动态表单读取
*/
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.listForm.applyUpdUserId = item.applyUpdUserId
this.listForm.jlUserId = item.jlUserId
this.listForm.zrUserId = item.zrUserId
})
},
//驳回事件
beforeBack () {
this.listForm.approvalOpinion = '1'
this.handleSubmit()
},
//提交事件
handleSubmit() {
this.listForm.applyUpdUserId = this.listForm.applyUpdUserId;
this.listForm.zrUserId = this.listForm.zrUserId;
this.listForm.jlUserId = this.listForm.jlUserId;
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
this.listForm.commentText = this.commentText;
this.listForm.signflag = "";
this.listForm.standId = this.listForm.standId;
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')
}
});
},
//选择标准取消事件
closeDrawer() {
this.ListModel = false;
},
//标准表格选择框改变
selectStandChange(data) {
this.selectList = [];
for (let i = 0; i < data.length; i++) {
this.selectList.push(data[i].id);
}
},
selectThree() {
},
pageChange(page) {
this.page = page;
this.searchData();
},
pageSizeChange(pageSize) {
this.pageSize = this.$store.getters.userInfo.configContent;
this.searchData();
}
},
computed: {
listNoDataText () {
return this.processType === 1 ? '暂无待办流程' : '暂无已办流程'
}
},
mounted() {
this.getData()
this.processTable()
},
};
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/assets/styles/style'; @import '~@/assets/styles/style';
.bzqdfb-step4 { .bzqdfb-step4 {
/deep/ .el-drawer__container { /deep/ .el-drawer__container {
.prc-content-border { .prc-content-border {
border: none; border: none;
padding: 0 20px 0; padding: 0 20px 0;
} }
} }
.choiceBtn { .choiceBtn {
.el-button--primary { .el-button--primary {
width: 150px; width: 150px;
} }
} }
position: relative; 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 {
height: 100%; height: 100%;
}
}
}
.demo-drawer-content { .headerTabs {
margin-top: 10px; 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> </style>
@@ -58,7 +58,7 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item v-show="verifySarStandard" label="文本状态" prop="textStatus" class="add-form-item form-item-disabled"> <el-form-item v-show="verifySarStandard" label="文本状态" prop="textStatus" class="add-form-item form-item-disabled">
<el-select v-model="form.textStatus" placeholder="请选择文本状态"> <el-select :popper-append-to-body="false" v-model="form.textStatus" placeholder="请选择文本状态">
<el-option <el-option
v-for="item in standStateOptions" v-for="item in standStateOptions"
placeholder="请选择" placeholder="请选择"
@@ -79,7 +79,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled"> <el-form-item label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
<el-select v-model="form.standSort" placeholder="请选择标准类别"> <el-select :popper-append-to-body="false" v-model="form.standSort" placeholder="请选择标准类别">
<el-option <el-option
v-for="item in standSortOptions" v-for="item in standSortOptions"
placeholder="请选择" placeholder="请选择"
@@ -90,7 +90,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="标准性质" prop="standNature" class="add-form-item form-item-disabled"> <el-form-item label="标准性质" prop="standNature" class="add-form-item form-item-disabled">
<el-select v-model="form.standNature" placeholder="请选择标准性质"> <el-select :popper-append-to-body="false" v-model="form.standNature" placeholder="请选择标准性质">
<el-option <el-option
v-for="item in standNatureOptions" v-for="item in standNatureOptions"
placeholder="请选择" placeholder="请选择"
@@ -122,7 +122,7 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item v-show="verifySarStandard" v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled"> <el-form-item v-show="verifySarStandard" v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
<el-input v-model="form.standSystemName" placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input> <el-input v-model="form.standSystem" placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>
<tree-select-new <tree-select-new
:key="key" :key="key"
:multiple=false :multiple=false
@@ -473,7 +473,7 @@
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled"> <el-form-item label="责任部门" prop="zrbm" class="add-form-item form-item-disabled">
<el-select v-model="form.zrbm" placeholder="请选择责任部门" multiple> <el-select :popper-append-to-body="false" v-model="form.zrbm" placeholder="请选择责任部门" multiple>
<el-option <el-option
v-for="item in zrbmOptions" v-for="item in zrbmOptions"
placeholder="请选择" placeholder="请选择"
@@ -484,7 +484,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="适用车型" prop="cllx" class="add-form-item form-item-disabled"> <el-form-item label="适用车型" prop="cllx" class="add-form-item form-item-disabled">
<el-select v-model="form.cllx" placeholder="请选择适用车型" multiple> <el-select :popper-append-to-body="false" v-model="form.cllx" placeholder="请选择适用车型" multiple>
<el-option <el-option
v-for="item in applyArcticOptions" v-for="item in applyArcticOptions"
placeholder="请选择" placeholder="请选择"
@@ -495,7 +495,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="能源类型" prop="nylx" class="add-form-item form-item-disabled"> <el-form-item label="能源类型" prop="nylx" class="add-form-item form-item-disabled">
<el-select v-model="form.nylx" placeholder="请选择能源类型" multiple> <el-select :popper-append-to-body="false" v-model="form.nylx" placeholder="请选择能源类型" multiple>
<el-option <el-option
v-for="item in categoryOptions" v-for="item in categoryOptions"
placeholder="请选择" placeholder="请选择"
@@ -555,7 +555,7 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="起草单位" prop="qcdw" class="add-form-item form-item-disabled">
<el-select v-model="form.qcdw" placeholder="请选择起草单位" multiple> <el-select :popper-append-to-body="false" v-model="form.qcdw" placeholder="请选择起草单位" multiple>
<el-option <el-option
v-for="item in qcdwOption" v-for="item in qcdwOption"
placeholder="请选择" placeholder="请选择"
@@ -566,7 +566,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '1'" label="体系类别" prop="txlb" class="add-form-item form-item-disabled">
<el-select v-model="form.txlb" placeholder="请选择体系类别" multiple> <el-select :popper-append-to-body="false" v-model="form.txlb" placeholder="请选择体系类别" multiple>
<el-option <el-option
v-for="item in txlbOptions" v-for="item in txlbOptions"
placeholder="请选择" placeholder="请选择"
@@ -579,7 +579,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="适用产品线" prop="sycpx" class="add-form-item form-item-disabled"> <el-form-item label="适用产品线" prop="sycpx" class="add-form-item form-item-disabled">
<el-select v-model="form.sycpx" placeholder="请选择适用产品线" multiple> <el-select :popper-append-to-body="false" v-model="form.sycpx" placeholder="请选择适用产品线" multiple>
<el-option <el-option
v-for="item in sycpxOptions" v-for="item in sycpxOptions"
placeholder="请选择" placeholder="请选择"
@@ -590,7 +590,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="适用认证" prop="syrz" class="add-form-item form-item-disabled"> <el-form-item label="适用认证" prop="syrz" class="add-form-item form-item-disabled">
<el-select v-model="form.syrz" placeholder="请选择适用认证" multiple> <el-select :popper-append-to-body="false" v-model="form.syrz" placeholder="请选择适用认证" multiple>
<el-option <el-option
v-for="item in applyAuthOptions" v-for="item in applyAuthOptions"
placeholder="请选择" placeholder="请选择"
@@ -601,7 +601,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled"> <el-form-item label="责任工程师" prop="zrgcs" class="add-form-item form-item-disabled">
<el-select v-model="form.zrgcs" placeholder="请选择责任工程师" multiple> <el-select :popper-append-to-body="false" v-model="form.zrgcs" placeholder="请选择责任工程师" multiple>
<el-option <el-option
v-for="item in zrgcsOptions" v-for="item in zrgcsOptions"
placeholder="请选择" placeholder="请选择"
@@ -633,13 +633,13 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
<el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple> <el-select :popper-append-to-body="false" v-model="form.wssmr" placeholder="请选择我司署名人" multiple>
<el-option label="署名人1" value="1"></el-option> <el-option label="署名人1" value="1"></el-option>
<el-option label="署名人2" value="2"></el-option> <el-option label="署名人2" value="2"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled"> <el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
<el-select v-model="form.cysd" placeholder="请选择我司参与深度"> <el-select :popper-append-to-body="false" v-model="form.cysd" placeholder="请选择我司参与深度">
<el-option <el-option
v-for="item in cysdOptions" v-for="item in cysdOptions"
placeholder="请选择" placeholder="请选择"
@@ -673,7 +673,7 @@
>{{'手动查找'}}</el-button> >{{'手动查找'}}</el-button>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="采标程度" prop="cbcd" class="add-form-item form-item-disabled"> <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-select :popper-append-to-body="false" v-model="form.cbcd" placeholder="请选择采标程度">
<el-option label="采标程度1" value="1"></el-option> <el-option label="采标程度1" value="1"></el-option>
<el-option label="采标程度2" value="2"></el-option> <el-option label="采标程度2" value="2"></el-option>
</el-select> </el-select>
@@ -707,31 +707,10 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<!-- <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">--> <el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
<!-- <el-input-->
<!-- v-model="form.yybj"-->
<!-- placeholder="请输入引用标准"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- class="common-button-primary"-->
<!-- size="mini"-->
<!-- style="position:absolute;top: 10px;right: 0;"-->
<!-- @click="selectLaws('yybj'),config.attrName = '引用标准'"-->
<!-- >{{'手动查找'}}</el-button>-->
<!-- </el-form-item>-->
<el-form-item v-if="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="form.cbbh" v-model="form.yybj"
placeholder="请输入采标编号" placeholder="请输入引用标准"
clearable
></el-input>
</el-form-item>
<el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">
<el-input
v-model="form.byybj"
placeholder="请输入被引用标准"
clearable clearable
></el-input> ></el-input>
<el-button <el-button
@@ -739,9 +718,30 @@
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
style="position:absolute;top: 10px;right: 0;" style="position:absolute;top: 10px;right: 0;"
@click="selectLaws('byybj'),config.attrName = '引用标准'" @click="selectLaws('yybj'),config.attrName = '引用标准'"
>{{'手动查找'}}</el-button> >{{'手动查找'}}</el-button>
</el-form-item> </el-form-item>
<el-form-item v-if="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled">
<el-input
v-model="form.cbbh"
placeholder="请输入采标编号"
clearable
></el-input>
</el-form-item>
<!-- <el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">-->
<!-- <el-input-->
<!-- v-model="form.byybj"-->
<!-- placeholder="请输入被引用标准"-->
<!-- clearable-->
<!-- ></el-input>-->
<!-- <el-button-->
<!-- type="primary"-->
<!-- class="common-button-primary"-->
<!-- size="mini"-->
<!-- style="position:absolute;top: 10px;right: 0;"-->
<!-- @click="selectLaws('byybj'),config.attrName = '被引用标准'"-->
<!-- >{{'手动查找'}}</el-button>-->
<!-- </el-form-item>-->
<!-- <el-form-item v-if="form.standInData === '0'" label="参会记录" prop="chjl" class="add-form-item form-item-disabled">--> <!-- <el-form-item v-if="form.standInData === '0'" label="参会记录" prop="chjl" class="add-form-item form-item-disabled">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="form.chjl"--> <!-- v-model="form.chjl"-->
@@ -859,6 +859,7 @@
<el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form" @keyup.enter.native="getReplaceLawsNumRowFirst"> <el-form :modal="replaceLawsNumForm" :inline="true" class="label-input-form" @keyup.enter.native="getReplaceLawsNumRowFirst">
<el-form-item label="标准来源" class="search-item" v-if="dataSource"> <el-form-item label="标准来源" class="search-item" v-if="dataSource">
<el-select <el-select
:popper-append-to-body="false"
v-model="replaceLawsNumForm.standType" v-model="replaceLawsNumForm.standType"
placeholder="请选择标准来源" placeholder="请选择标准来源"
@change="dataSourceChange"> @change="dataSourceChange">
@@ -940,7 +941,7 @@
@pageChange="pageChangeReplace" @pageChange="pageChangeReplace"
@pageSizeChange="pageSizeChangeReplace"></pagination> @pageSizeChange="pageSizeChangeReplace"></pagination>
<div slot="footer" class="demo-drawer-footer"> <div slot="footer" class="demo-drawer-footer">
<el-button class="common-button-default" icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button> <el-button class="common-button-default" round icon="el-icon-close" @click="replaceLawsNumModel = false">取消</el-button>
<el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button> <el-button type="primary" round class="common-button-primary" icon="el-icon-check" @click="replaceLawsNumModelBt">提交</el-button>
</div> </div>
</el-dialog> </el-dialog>
@@ -984,14 +985,15 @@
<el-form :model="standardSearchForm" inline class="label-input-form search-area"> <el-form :model="standardSearchForm" inline class="label-input-form search-area">
<el-formItem label="标准来源" style="margin-right:-20px" prop="standType" class="search-item" > <el-formItem label="标准来源" style="margin-right:-20px" prop="standType" class="search-item" >
<el-select <el-select
:popper-append-to-body="false"
v-model="standardSearchForm.standType" v-model="standardSearchForm.standType"
placeholder="请选择标准来源"> placeholder="请选择标准来源">
<el-option value="INLAND" label="国内标准库"></el-option> <el-option value="INLAND" label="国内标准库"></el-option>
<el-option value="FOREIGN" label="外标准库"></el-option> <el-option value="FOREIGN" label="外标准库"></el-option>
</el-select> </el-select>
</el-formItem> </el-formItem>
<el-form-item label="标准类别" style="margin-right:-20px" prop="standSort" class="search-item" > <el-form-item label="标准类别" style="margin-right:-20px" prop="standSort" class="search-item" >
<el-select v-model="standardSearchForm.standSort" placeholder="请选择标准类别" filterable clearable> <el-select :popper-append-to-body="false" v-model="standardSearchForm.standSort" placeholder="请选择标准类别" filterable clearable>
<el-option <el-option
v-for="item in standSortOptions" v-for="item in standSortOptions"
:key="item.value" :key="item.value"
@@ -927,7 +927,9 @@
handleTabs(name) { handleTabs(name) {
this.active = name this.active = name
}, },
handleSave() {}, handleSave() {
this.$message.success('保存成功')
},
handleSubmit() { handleSubmit() {
this.isSubmit = true this.isSubmit = true
this.form.commentText = this.commentText this.form.commentText = this.commentText
@@ -452,14 +452,14 @@
<el-option label="采标程度2" value="2"></el-option> <el-option label="采标程度2" value="2"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled"> <!-- <el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">-->
<el-input <!-- <el-input-->
disabled <!-- disabled-->
v-model="form.xglc" <!-- v-model="form.xglc"-->
placeholder="请输入相关流程" <!-- placeholder="请输入相关流程"-->
clearable <!-- clearable-->
></el-input> <!-- ></el-input>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled"> <el-form-item label="关联文件" prop="glwjName" class="add-form-item form-item-disabled">
<div v-if="form.glwjName"> <div v-if="form.glwjName">
{{ form.glwjName }} {{ form.glwjName }}
@@ -486,22 +486,22 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled"> <!-- <el-form-item label="被引用标准" prop="byybj" class="add-form-item form-item-disabled">-->
<el-input <!-- <el-input-->
disabled <!-- disabled-->
v-model="form.byybj" <!-- v-model="form.byybj"-->
placeholder="请输入被引用标准" <!-- placeholder="请输入被引用标准"-->
clearable <!-- clearable-->
></el-input> <!-- ></el-input>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item v-if="form.standInData === '0'" label="参会记录" prop="chjl" class="add-form-item form-item-disabled"> <!-- <el-form-item v-if="form.standInData === '0'" label="参会记录" prop="chjl" class="add-form-item form-item-disabled">-->
<el-input <!-- <el-input-->
disabled <!-- disabled-->
v-model="form.chjl" <!-- v-model="form.chjl"-->
placeholder="请输入参会记录" <!-- placeholder="请输入参会记录"-->
clearable <!-- clearable-->
></el-input> <!-- ></el-input>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@@ -921,29 +921,7 @@ export default {
this.active = name this.active = name
}, },
handleSave() { handleSave() {
this.saveLoading = true this.$message.success('保存成功')
let _formData = new FormData()
// _formData.append('id', this.bpnId)
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.uName)
_formData.append('prcType', this.$route.query.type)
_formData.append('json', JSON.stringify({
prcForm: this.prcForm,
sarAccessInfoList: this.sarAccessInfoList,
sarAccessInfoListADMIN: this.sarAccessInfoListADMIN,
bzqdForm: this.bzqdForm,
listInfo: this.listInfo,
id: this.id
}))
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
// 流程保存之后,应该流转至草稿页面
this.$router.push({path:'/processCenter?tabsName=TaskDraft'})
// this.bpnId = res.result
}).catch(e => {
this.saveLoading = false
})
}, },
handleSubmit() { handleSubmit() {
this.isSubmit = false this.isSubmit = false
@@ -1651,6 +1651,8 @@ export default {
}, res => { }, res => {
if (res.success) { if (res.success) {
this.$message.success(res.message) this.$message.success(res.message)
// 流程提交之后,应该流转至待办任务页面
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
}else { }else {
this.$message.success(res.message) this.$message.success(res.message)
} }
@@ -868,6 +868,8 @@
console.log(res); console.log(res);
if (res.success) { if (res.success) {
this.processCreateStand(json) this.processCreateStand(json)
// 流程提交之后,应该流转至待办任务页面
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
} }
}) })
}, },
@@ -355,6 +355,7 @@
this.form.endTime = data.endTime this.form.endTime = data.endTime
this.form.cname = data.cname this.form.cname = data.cname
this.json = data this.json = data
this.data = data.info
}).catch(e => { }).catch(e => {
}) })
}) })
@@ -74,26 +74,10 @@
prop="chapterNumber" prop="chapterNumber"
label="章条编号" label="章条编号"
width="170px"> width="170px">
<template slot-scope="scope">
<div v-if="scope.row.state == '2'">
<el-input style="margin: 10px 0;" v-model="scope.row.chapterNumber" @change="changeInput(scope.$index)"></el-input>
</div>
<div v-else>
{{ scope.row.chapterNumber }}
</div>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="chapterName" prop="chapterName"
label="章节名称"> label="章节名称">
<template slot-scope="scope">
<div v-if="scope.row.state == '2'">
<el-input style="margin: 10px 0;" v-model="scope.row.chapterName"></el-input>
</div>
<div v-else>
{{ scope.row.chapterName }}
</div>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="commentText" prop="commentText"
@@ -339,7 +323,10 @@
this.form.cname = data.cname this.form.cname = data.cname
this.oldData = JSON.parse(JSON.stringify(data.summaryList)) this.oldData = JSON.parse(JSON.stringify(data.summaryList))
data.summaryList.forEach( item => { data.summaryList.forEach( item => {
item.state = '1' if (item.state) {
} else {
item.state = '1'
}
item.type = false item.type = false
}) })
this.json = data this.json = data
@@ -3,7 +3,7 @@
<!-- 标准调研流程--> <!-- 标准调研流程-->
<ProcessHeader toggle> <ProcessHeader toggle>
<template slot="proName">标准征求意见流程</template> <template slot="proName">标准征求意见流程</template>
<template slot="proNode">标准法规部部长审核</template> <template slot="proNode">审核</template>
</ProcessHeader> </ProcessHeader>
<div class="headerTabs"> <div class="headerTabs">
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div> <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
@@ -192,32 +192,13 @@
@submit="handleSubmit" @submit="handleSubmit"
> >
</ProcessFooter> </ProcessFooter>
<el-drawer <Role-tree
:title="drawerTitle" check-box
:visible.sync="modalshowflag" :is-title="drawerTitle"
:wrapperClosable="false" :is-visible.sync="modalshowflag"
size="800px"> :nodeList="nodeList"
<el-tree @checkedRole="drawerCheck"
v-if="modalshowflag" />
style="height: 100%; overflow: auto;"
node-key="id"
class="filter-tree"
:data="treeData"
:props="defaultProps"
:default-checked-keys="nodeList"
highlight-current
check-strictly
@check="drawerCheck"
default-expand-all
:expand-on-click-node="false"
show-checkbox
ref="tree">
</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>
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
</div>
</el-drawer>
</div> </div>
</template> </template>
@@ -308,7 +289,6 @@ export default {
ProcessTitle ProcessTitle
}, },
mounted () { mounted () {
this.getTree()
this.getJsonData() this.getJsonData()
}, },
methods: { methods: {
@@ -418,13 +398,6 @@ export default {
} }
} }
}, },
// 获取流程节点数据
getTree () {
this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
this.treeData = res.data
console.log(res.data)
})
},
// 流程阶段负责人选择 // 流程阶段负责人选择
choiceZRR (type, title, id) { choiceZRR (type, title, id) {
this.nodeList = [] this.nodeList = []
@@ -434,22 +407,8 @@ export default {
this.modalshowflag = true this.modalshowflag = true
}, },
drawerCheck (data) { drawerCheck (data) {
let getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()); this.roleForm.dockUserName = data[0].id
if(getlist.length == 1) { this.roleForm.dockUserName = data[0].name
this.roleRow = getlist[0]
}else {
this.$refs.tree.setCheckedKeys([data.id]);
this.roleRow = this.$refs.tree.getCheckedNodes()[0]
}
},
// 流程节点负责人抽屉保存按钮
saveUserInfo () {
this.roleForm.dockUser = this.roleRow.id
this.roleForm.dockUserName = this.roleRow.name
this.modalshowflag = false
},
// 流程节点负责人抽屉取消按钮
cancleUserInfo () {
this.modalshowflag = false this.modalshowflag = false
}, },
//未整改项抽屉中的查询按钮 //未整改项抽屉中的查询按钮
@@ -142,32 +142,13 @@
@submit="handleSubmit" @submit="handleSubmit"
> >
</ProcessFooter> </ProcessFooter>
<el-drawer <Role-tree
:title="drawerTitle" check-box
:visible.sync="modalshowflag" :is-title="drawerTitle"
:wrapperClosable="false" :is-visible.sync="modalshowflag"
size="800px"> :nodeList="nodeList"
<el-tree @checkedRole="drawerCheck"
v-if="modalshowflag" />
style="height: 100%; overflow: auto;"
node-key="id"
class="filter-tree"
:data="treeData"
:props="defaultProps"
:default-checked-keys="nodeList"
highlight-current
check-strictly
@check="drawerCheck"
default-expand-all
:expand-on-click-node="false"
show-checkbox
ref="tree">
</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>
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
</div>
</el-drawer>
</div> </div>
</template> </template>
@@ -330,24 +311,8 @@ export default {
this.drawerTitle = title this.drawerTitle = title
this.modalshowflag = true this.modalshowflag = true
}, },
// 获取流程节点数据
getTree () {
roleTreeData().then(res => {
this.treeData = res.data
this.dutyUserCaseData = res.data
})
},
drawerCheck (data) { drawerCheck (data) {
var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()); this.roleRow = data
if(getlist.length !== 0) {
this.roleRow = getlist
}else {
this.$refs.tree.setCheckedKeys([data.id]);
this.roleRow = this.$refs.tree.getCheckedNodes()
}
},
// 流程节点负责人抽屉保存按钮
saveUserInfo () {
// 选取负责人时的操作 // 选取负责人时的操作
this.multipleSelection.forEach(item => { this.multipleSelection.forEach(item => {
item.dutyPeopleInfo = this.roleRow[0].name item.dutyPeopleInfo = this.roleRow[0].name
@@ -356,11 +321,7 @@ export default {
this.lastDataList = this.dataList this.lastDataList = this.dataList
this.$refs.multipleTable.clearSelection(); this.$refs.multipleTable.clearSelection();
// 选取流程信息完成 // 选取流程信息完成
this.roleForm.dutyUserInfoName = this.roleRow.name this.roleForm.dutyUserInfoName = this.roleRow[0].name
this.modalshowflag = false
},
// 流程节点负责人抽屉取消按钮
cancleUserInfo () {
this.modalshowflag = false this.modalshowflag = false
}, },
//查询按钮 //查询按钮
@@ -137,32 +137,13 @@
@submit="handleSubmit" @submit="handleSubmit"
> >
</ProcessFooter> </ProcessFooter>
<el-drawer <Role-tree
:title="drawerTitle" check-box
:visible.sync="modalshowflag" :is-title="drawerTitle"
:wrapperClosable="false" :is-visible.sync="modalshowflag"
size="800px"> :nodeList="nodeList"
<el-tree @checkedRole="drawerCheck"
v-if="modalshowflag" />
style="height: 100%; overflow: auto;"
node-key="id"
class="filter-tree"
:data="treeData"
:props="defaultProps"
:default-checked-keys="nodeList"
highlight-current
check-strictly
@check="drawerCheck"
default-expand-all
:expand-on-click-node="false"
show-checkbox
ref="tree">
</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>
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
</div>
</el-drawer>
</div> </div>
</template> </template>
@@ -309,34 +290,15 @@ export default {
}) })
}, },
// 获取流程节点数据
getTree () {
this.$http.get('SarInstitution/institution/institutionAndUser', {}, {}, res=> {
this.treeData = res.data
})
},
drawerCheck (data) { drawerCheck (data) {
var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes()); this.roleForm = data[0]
if(getlist.length == 1) {
this.roleRow = getlist[0]
}else {
this.$refs.tree.setCheckedKeys([data.id]);
this.roleRow = this.$refs.tree.getCheckedNodes()[0]
}
},
// 流程节点负责人抽屉保存按钮
saveUserInfo () {
// 选择责任人时input框内值 // 选择责任人时input框内值
this.newDataList.dutyPeople = this.roleRow.name this.newDataList.dutyPeople = this.roleRow.name
this.newDataList.dutyPeopleId = this.roleRow.id this.newDataList.dutyPeopleId = this.roleRow.id
this.lastDataList = this.dataList this.lastDataList = this.dataList
console.log(this.dataList)
this.modalshowflag = false
},
// 流程节点负责人抽屉取消按钮
cancleUserInfo () {
this.modalshowflag = false this.modalshowflag = false
}, },
//查询按钮 //查询按钮
getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询 getTableByPage({ standId, productName, responsibleUnit }) {//多条件和模糊查询
this.realList = this.dataList.filter(item => { this.realList = this.dataList.filter(item => {
@@ -336,34 +336,13 @@
> >
</ProcessFooter> </ProcessFooter>
<!-- 选择责任人--> <!-- 选择责任人-->
<el-drawer <Role-tree
:title="drawerTitle" check-box
:visible.sync="modalshowflag" :is-title="drawerTitle"
:wrapperClosable="false" :is-visible.sync="modalshowflag"
size="800px"> @checkedRole="checkedRole"
<el-tree :nodeList="nodeList"
v-if="modalshowflag" ></Role-tree>
style="height: 100%; overflow: auto;"
node-key="id"
class="filter-tree"
:data="treeData"
:props="defaultProps"
:default-checked-keys="nodeList"
highlight-current
check-strictly
@check="drawerCheck"
default-expand-all
:expand-on-click-node="false"
show-checkbox
ref="tree">
</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>
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消</el-button>
</div>
</el-drawer>
</div> </div>
</template> </template>
@@ -507,27 +486,27 @@ export default {
}; };
}, },
methods: { methods: {
saveUserInfo() { checkedRole(data) {
if (this.type === "dockUser") { if (this.type === "dockUser") {
this.roleForm.dockUser = this.roleRow.id; this.roleForm.dockUser = data[0].id;
this.roleForm.dockUserName = this.roleRow.name; this.roleForm.dockUserName = data[0].name;
} else if (this.type === "ministerUser") { } else if (this.type === "ministerUser") {
this.roleForm.ministerUser = this.roleRow.id; this.roleForm.ministerUser = data[0].id;
this.roleForm.ministerUserName = this.roleRow.name; this.roleForm.ministerUserName = data[0].name;
} else if (this.type === "qualityEngineer") { } else if (this.type === "qualityEngineer") {
this.roleForm.qualityEngineer = this.roleRow.id; this.roleForm.qualityEngineer = data[0].id;
this.roleForm.qualityEngineerName = this.roleRow.name; this.roleForm.qualityEngineerName = data[0].name;
this.listForm.qualityEngineer = this.roleForm.qualityEngineer; this.listForm.qualityEngineer = data[0].id;
this.listForm.qualityEngineerName = this.roleForm.qualityEngineerName; this.listForm.qualityEngineerName = data[0].name;
} else if (this.type === "certifiedEngineer") { } else if (this.type === "certifiedEngineer") {
this.roleForm.certifiedEngineer = this.roleRow.id; this.roleForm.certifiedEngineer = data[0].id;
this.roleForm.certifiedEngineerName = this.roleRow.name; this.roleForm.certifiedEngineerName = data[0].name;
this.listForm.certifiedEngineer = this.roleForm.certifiedEngineer; this.listForm.certifiedEngineer = data[0].id;
this.listForm.certifiedEngineerName = this.roleForm.certifiedEngineerName; this.listForm.certifiedEngineerName = data[0].name;
} else if (this.type === "distributePerson") { } else if (this.type === "distributePerson") {
this.listForm.distributePerson = this.roleRow.name; this.listForm.distributePerson = data[0].name;
this.listForm.dataList[this.dsadadadsada].distributePersonId=this.roleRow.id this.listForm.dataList[this.dsadadadsada].distributePersonId= data[0].id
this.listForm.dataList[this.dsadadadsada].distributePerson=this.roleRow.name this.listForm.dataList[this.dsadadadsada].distributePerson= data[0].name
this.showColumn = false; this.showColumn = false;
this.$nextTick(() => { this.$nextTick(() => {
this.showColumn = true this.showColumn = true
@@ -611,7 +590,7 @@ export default {
let _formData = new FormData(); let _formData = new FormData();
_formData.append("createUser", this.$store.getters.userInfo.userId); _formData.append("createUser", this.$store.getters.userInfo.userId);
_formData.append("createUserName", this.$store.getters.userInfo.uName); _formData.append("createUserName", this.$store.getters.userInfo.uName);
_formData.append("prcType", this.$route.query.type); _formData.append("prcType", '5');
_formData.append("json", JSON.stringify({ _formData.append("json", JSON.stringify({
prcForm: this.prcForm, prcForm: this.prcForm,
sarAccessInfoList: this.sarAccessInfoList, sarAccessInfoList: this.sarAccessInfoList,
@@ -635,7 +614,7 @@ export default {
} else { } else {
var json = Object.assign(this.listForm, this.roleForm) var json = Object.assign(this.listForm, this.roleForm)
json.prcCreateUser = this.$store.getters.userInfo.userId; json.prcCreateUser = this.$store.getters.userInfo.userId;
json.prcCreateUserName = this.$store.getters.userInfo.account; json.prcCreateUserName = this.$store.getters.userInfo.uName;
json.standId = this.listForm.standId; json.standId = this.listForm.standId;
json.XCXSSRQ = this.sarAccessListDatas[0].xcxssrqgj json.XCXSSRQ = this.sarAccessListDatas[0].xcxssrqgj
json.ZCCSSRQ = this.sarAccessListDatas[0].zccssrqgj json.ZCCSSRQ = this.sarAccessListDatas[0].zccssrqgj
@@ -37,16 +37,16 @@
</el-form-item> </el-form-item>
<el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled"> <el-form-item label="认证工程师" prop="certifiedEngineerName" class="add-form-item form-item-disabled">
<el-input <el-input
disabled
v-model="listForm.certifiedEngineerName" v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师" placeholder="请选择认证工程师"
clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled"> <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input <el-input
disabled
v-model="listForm.qualityEngineerName" v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师" placeholder="请选择质量工程师"
clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -39,14 +39,14 @@
<el-input <el-input
v-model="listForm.certifiedEngineerName" v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师" placeholder="请选择认证工程师"
clearable disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled"> <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="listForm.qualityEngineerName" v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师" placeholder="请选择质量工程师"
clearable disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -56,6 +56,9 @@
<template slot="title">填写信息</template> <template slot="title">填写信息</template>
</process-title> </process-title>
<div class="tableTitle"> <div class="tableTitle">
<div class="tableButton">
<el-button plain class="common-button-primary" size="mini" @click="batchOperation">批量分发落实人</el-button>
</div>
</div> </div>
<el-table <el-table
ref="multipleTable" ref="multipleTable"
@@ -113,85 +116,25 @@
<span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format("YYYY-MM-DD") : "" }}</span> <span>{{ scope.row.zCCSSRQ ? $moment(scope.row.zCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="落实人" prop="implementer" align="center">
fixed="right" <template slot-scope="scope">
prop="implementer" <div v-if="scope.row.implementer == undefined">
align="center" {{ "请选择落实人" }}
label="落实人"> </div>
<template slot-scope="scope,text" v-if="showColumn"> <div v-else class="fileClass">
<div> {{ scope.row.implementer || "-" }}
<div @click="choiceZRRS(scope)">
{{ listForm.breakdownList[scope.$index].implementer == null ? "请选择落实人" : listForm.breakdownList[scope.$index].implementer
}}
</div>
<!-- <div @click="choiceZRR(scope,'implementer', '选择落实人', roleForm.implementer)">-->
<!-- {{ listForm.breakdownList[scope.$index].implementer == null ? "请选择落实人" : listForm.breakdownList[scope.$index].implementer-->
<!-- }}-->
<!-- </div>-->
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- 选择责任人--> <!-- 选择责任人-->
<!-- <el-drawer--> <Role-tree
<!-- :title="drawerTitle"--> check-box
<!-- :visible.sync="modalshowflag"--> is-title="选择落实人"
<!-- :wrapperClosable="false"--> :is-visible.sync="modalshowflag"
<!-- size="800px">--> @checkedRole="checkedRole"
<!-- <el-tree--> :nodeList="nodeList"
<!-- v-if="modalshowflag"--> ></Role-tree>
<!-- style="height: 100%; overflow: auto;"-->
<!-- node-key="id"-->
<!-- class="filter-tree"-->
<!-- :data="treeData"-->
<!-- :props="defaultProps"-->
<!-- :default-checked-keys="nodeList"-->
<!-- highlight-current-->
<!-- check-strictly-->
<!-- @check="drawerCheck"-->
<!-- default-expand-all-->
<!-- :expand-on-click-node="false"-->
<!-- show-checkbox-->
<!-- ref="tree">-->
<!-- </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>-->
<!-- <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo">取消-->
<!-- </el-button>-->
<!-- </div>-->
<!-- </el-drawer>-->
<el-drawer
title="选择责任部门对接人"
:visible.sync="modalshowflag2"
:wrapperClosable="false"
size="800px">
<el-tree
v-if="modalshowflag2"
style="height: 100%; overflow: auto;"
node-key="id"
class="filter-tree"
:data="treeData"
:props="defaultProps"
:default-checked-keys="nodeList"
highlight-current
check-strictly
default-expand-all
:expand-on-click-node="false"
show-checkbox
ref="tree2">
</el-tree>
<div id="roleFormButton2" class="demo-drawer-footer">
<el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary"
@click="saveUserInfo2">确定
</el-button>
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="cancleUserInfo2">取消
</el-button>
</div>
</el-drawer>
</div> </div>
</div> </div>
@@ -452,69 +395,37 @@ export default {
} }
} }
}, },
// saveUserInfo() { //批量操作按钮
// if (this.type === "implementer") { batchOperation(id) {
// // 如果有勾选的项 if (this.selectList.length === 0) {
// if (this.selectList.length) { this.$message.warning("请至少选择一条数据进行批量分发");
// this.listForm.breakdownList.forEach((item, index) => { } else {
// if (this.selectList.includes(item.itemId)) { this.nodeList = [];
// this.listForm.breakdownList[index].implementerId = this.roleRow.id; this.nodeList.push(id);
// this.listForm.breakdownList[index].implementer = this.roleRow.name; this.modalshowflag = true;
// } }
// });
// } else {
// this.listForm.breakdownList[this.dsadadadsada].implementerId = this.roleRow.id;
// this.listForm.breakdownList[this.dsadadadsada].implementer = this.roleRow.name;
// }
// this.listForm.implementer = this.roleRow.name;
// this.showColumn = false;
// this.$nextTick(() => {
// this.showColumn = true;
// });
// }
// this.modalshowflag = false;
// },
saveUserInfo2 () {
var idList = "";
var nameList = "";
this.$refs.tree2.getCheckedNodes().concat(this.$refs.tree2.getHalfCheckedNodes()).forEach(item => {
if (nameList.length > 0) {
nameList += ",";
idList += ",";
}
idList += item.id;
nameList += item.name;
});
// 如果有勾选的项
if (this.selectList.length) {
this.listForm.breakdownList.forEach((item, index) => {
console.log(item.itemId);
console.log(index);
if (this.selectList.includes(item.itemId)) {
this.listForm.breakdownList[index].implementerId = idList;
this.listForm.breakdownList[index].implementer = nameList;
}
});
} else {
this.listForm.breakdownList[this.dsadadadsada].implementerId = idList;
this.listForm.breakdownList[this.dsadadadsada].implementer = nameList;
}
this.listForm.implementer = nameList;
this.showColumn = false;
this.$nextTick(() => {
this.showColumn = true;
});
this.modalshowflag2 = false;
//不要删除 By 宋伟佳
console.log(this.$refs.multipleTable.clearSelection())
this.$nextTick(() => {
for(var i=0;i<this.$refs.multipleTable.length;i++){
this.$refs.multipleTable[i].clearSelection();
}
})
}, },
cancleUserInfo2() { checkedRole(data) {
this.modalshowflag2 = false; // 选取负责人时的操作
let mis = [];
let miss = [];
this.selectList.forEach(item => {
item.implementer = data[0].name;
item.implementerId = data[0].id;
mis.push(item.projectNumber);
miss.push(item.itemNum)
});
this.listForm.breakdownList.forEach(item => {
if (!mis.includes(item.projectNumber) && !miss.includes(item.itemsNum)) {
this.selectList.push(item);
}
});
this.listForm.breakdownList = this.selectList;
this.$refs.selection.clearSelection();
this.modalshowflag = false;
},
cancleUserInfo() {
this.modalshowflag = false;
}, },
choiceZRRS(scope) { choiceZRRS(scope) {
if (scope != null) this.dsadadadsada = scope.$index; if (scope != null) this.dsadadadsada = scope.$index;
@@ -579,7 +490,7 @@ export default {
}, },
//标准表格选择框改变 //标准表格选择框改变
selectStandChange(data) { selectStandChange(data) {
this.selectList = data.map(item => item.itemId); this.selectList = data
}, },
selectThree() { selectThree() {
@@ -39,14 +39,14 @@
<el-input <el-input
v-model="listForm.certifiedEngineerName" v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师" placeholder="请选择认证工程师"
clearable disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled"> <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="listForm.qualityEngineerName" v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师" placeholder="请选择质量工程师"
clearable disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -244,13 +244,6 @@
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
</el-table-column> </el-table-column>
<el-table-column
fixed="right"
align="center"
width="150"
prop="implementer"
label="落实人">
</el-table-column>
</el-table> </el-table>
</div> </div>
<div> <div>
@@ -500,7 +493,6 @@ export default {
this.listForm.signFlag = ""; this.listForm.signFlag = "";
this.listForm.dataList = this.dataList; this.listForm.dataList = this.dataList;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
console.log(json);
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds, taskIds: this.taskIds,
userId: this.userId, userId: this.userId,
@@ -543,7 +535,6 @@ export default {
mounted() { mounted() {
this.processTable(); this.processTable();
this.getData(); this.getData();
// console.log(this.$store.getters.getHandleInfo);
} }
}; };
</script> </script>
@@ -39,14 +39,14 @@
<el-input <el-input
v-model="listForm.certifiedEngineerName" v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师" placeholder="请选择认证工程师"
clearable disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled"> <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="listForm.qualityEngineerName" v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师" placeholder="请选择质量工程师"
clearable disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -419,7 +419,6 @@ export default {
taskIds: this.taskIds, taskIds: this.taskIds,
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
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)
@@ -39,14 +39,14 @@
<el-input <el-input
v-model="listForm.certifiedEngineerName" v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师" placeholder="请选择认证工程师"
clearable disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled"> <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="listForm.qualityEngineerName" v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师" placeholder="请选择质量工程师"
clearable disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -39,14 +39,14 @@
<el-input <el-input
v-model="listForm.certifiedEngineerName" v-model="listForm.certifiedEngineerName"
placeholder="请选择认证工程师" placeholder="请选择认证工程师"
clearable disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled"> <el-form-item label="质量工程师" prop="qualityEngineerName" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="listForm.qualityEngineerName" v-model="listForm.qualityEngineerName"
placeholder="请选择质量工程师" placeholder="请选择质量工程师"
clearable disabled
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -490,7 +490,7 @@ export default {
_formData.append('id', this.bpnId || '') _formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.userName) _formData.append('createUserName', this.$store.getters.userInfo.userName)
_formData.append('prcType', '2') _formData.append('prcType', '6')
_formData.append('json', JSON.stringify({ _formData.append('json', JSON.stringify({
form: this.form, form: this.form,
roleForm: this.roleForm, roleForm: this.roleForm,
@@ -508,7 +508,7 @@ export default {
handleSubmit(){ handleSubmit(){
var json = Object.assign(this.listForm, this.roleForm) var json = Object.assign(this.listForm, this.roleForm)
json.prcCreateUser = this.$store.getters.userInfo.userId; json.prcCreateUser = this.$store.getters.userInfo.userId;
json.prcCreateUserName = this.$store.getters.userInfo.account; json.prcCreateUserName = this.$store.getters.userInfo.uName;
json.standId = this.listForm.standId; json.standId = this.listForm.standId;
this.$refs['listForm'].validate((valid) => { this.$refs['listForm'].validate((valid) => {
if (valid) { if (valid) {
@@ -0,0 +1,485 @@
<template>
<div class="xmpg2-step10">
<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>
</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"
>
</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";
export default {
name: "xmpg2Step10",
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
};
},
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';
.xmpg2-step10 {
/deep/ .el-drawer__container {
.prc-content-border {
border: none;
padding: 0 20px 0;
}
}
.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 {
height: 100%;
}
}
}
.demo-drawer-content {
margin-top: 10px;
}
}
</style>
@@ -0,0 +1,485 @@
<template>
<div class="xmpg2-step11">
<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>
</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"
>
</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";
export default {
name: "xmpg2Step11",
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
};
},
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';
.xmpg2-step11 {
/deep/ .el-drawer__container {
.prc-content-border {
border: none;
padding: 0 20px 0;
}
}
.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 {
height: 100%;
}
}
}
.demo-drawer-content {
margin-top: 10px;
}
}
</style>
@@ -0,0 +1,485 @@
<template>
<div class="xmpg2-step12">
<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>
</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"
>
</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";
export default {
name: "xmpg2Step12",
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
};
},
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';
.xmpg2-step12 {
/deep/ .el-drawer__container {
.prc-content-border {
border: none;
padding: 0 20px 0;
}
}
.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 {
height: 100%;
}
}
}
.demo-drawer-content {
margin-top: 10px;
}
}
</style>
@@ -1,5 +1,5 @@
<template> <template>
<div class="xmpg-step2"> <div class="xmpg2-step2">
<ProcessHeader toggle> <ProcessHeader toggle>
<template slot="proName">项目合规评估流程-项目</template> <template slot="proName">项目合规评估流程-项目</template>
<template slot="proNode">业务经理审批流程</template> <template slot="proNode">业务经理审批流程</template>
@@ -289,7 +289,6 @@ export default {
taskIds: this.taskIds, taskIds: this.taskIds,
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
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);
@@ -335,7 +334,6 @@ export default {
this.listForm.BZFlag = "1"; this.listForm.BZFlag = "1";
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
console.log(json);
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds, taskIds: this.taskIds,
userId: this.userId, userId: this.userId,
@@ -366,7 +364,7 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/assets/styles/style'; @import '~@/assets/styles/style';
.xmpg-step2 { .xmpg2-step2 {
/deep/ .el-drawer__container { /deep/ .el-drawer__container {
.prc-content-border { .prc-content-border {
border: none; border: none;
@@ -1,5 +1,5 @@
<template> <template>
<div class="xmpg-step2"> <div class="xmpg2-step3">
<ProcessHeader toggle> <ProcessHeader toggle>
<template slot="proName">项目合规评估流程-项目</template> <template slot="proName">项目合规评估流程-项目</template>
<template slot="proNode">工程经理进行转办</template> <template slot="proNode">工程经理进行转办</template>
@@ -34,10 +34,18 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="架构经理" prop="jgUser" class="add-form-item form-item-disabled">
<el-input
v-model="listForm.jgUser"
placeholder="请选择架构经理"
clearable
@click.native="choiceZRR(null,'jgUser', '选择架构经理', roleForm.jgUser)"
></el-input>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<process-title style="margin-top:5px; margin-bottom: 5px"> <process-title>
<template slot="title">填写信息</template> <template slot="title">填写信息</template>
</process-title> </process-title>
<el-table <el-table
@@ -46,6 +54,7 @@
ref="selection" ref="selection"
height="70%" height="70%"
style="width: 100%; border:1px solid #ccc" style="width: 100%; border:1px solid #ccc"
@selection-change="selectStandChange"
: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
@@ -53,23 +62,26 @@
width="55" width="55"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column
prop="standId"
align="center"
label="标准编号"
>
</el-table-column>
<el-table-column <el-table-column
prop="standName" prop="standName"
align="center" align="center"
label="中文名称" label="中文名称"
width="180px"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standEnName" prop="standEnName"
label="英文名称" label="英文名称"
align="center" align="center"
width="180px"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="ssrq" prop="ssrq"
width="190px"
align="center" align="center"
sortable sortable
label="标准实施日期"> label="标准实施日期">
@@ -77,75 +89,14 @@
<span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}</span> <span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
prop="xcxssrqgj"
width="190px"
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"
align="center"
sortable
width="190px"
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 <el-table-column
prop="zrbm" prop="zrbm"
label="责任部门" label="责任部门"
align="center" align="center"
width="180px"
> >
</el-table-column> </el-table-column>
<el-table-column
show-overflow-tooltip
prop="kccvppsbm"
width="180px"
align="center"
label="卡车VPPS编码">
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="kccvppscn"
width="180px"
align="center"
label="卡车vpps中文名称">
</el-table-column>
<el-table-column
prop="cycvppsbm"
width="180px"
align="center"
label="乘用车VPPS编码">
</el-table-column>
<el-table-column
prop="cycvppscn"
width="180px"
align="center"
label="乘用车vpps中文名称">
</el-table-column>
</el-table> </el-table>
</div> </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>
</el-collapse-item>
</el-collapse>
</div>
</div> </div>
<div class="content" v-show="active === '3'"> <div class="content" v-show="active === '3'">
<div class="flow-list" style="height: 100%"> <div class="flow-list" style="height: 100%">
@@ -215,15 +166,22 @@
</div> </div>
</div> </div>
<ProcessFooter <ProcessFooter
show-back show-save
show-submit show-submit
:submitLoading="isSubmit" :submitLoading="isSubmit"
:saveLoading="saveLoading" :saveLoading="saveLoading"
:approval="true" @save="handleSave"
@back="beforeBack"
@submit="handleSubmit" @submit="handleSubmit"
> >
</ProcessFooter> </ProcessFooter>
<!-- 选择责任人-->
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="modalshowflag"
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
</div> </div>
</template> </template>
@@ -248,16 +206,34 @@ export default {
processType: 1, processType: 1,
isSubmit: false, isSubmit: false,
saveLoading: false, saveLoading: false,
showColumn: true,
drawerTitle: "", //drawer标题
modalshowflag: false, // drawer开关
selectList: [],
treeData: [], // 人员数据
roleForm: {
jgUser: ""
},
nodeList: [],
defaultProps: {
children: "children",
label: "name"
},
//表单的数据 //表单的数据
listForm: { listForm: {
projectNumber: "", //项目编号 projectNumber: "", //项目编号
projectName: "", //项目名称 projectName: "", //项目名称
jgUser: "", //架构经理
dataList: [], //项目下的标准数据 dataList: [], //项目下的标准数据
breakdownList: [] //标准下的分解单数据 breakdownList: [] //标准下的分解单数据
}, },
dataList: [], //展示的标准数据 dataList: [], //展示的标准数据
commentText: "", //审批意见 commentText: "", //审批意见
detailData: [] //流程历史数据 detailData: [], //流程历史数据
userId: this.$store.getters.userInfo.userId,
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId
}; };
}, },
methods: { methods: {
@@ -285,7 +261,6 @@ export default {
taskIds: this.taskIds, taskIds: this.taskIds,
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
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);
@@ -307,16 +282,70 @@ export default {
this.listForm.breakdownList = item.breakdownList; this.listForm.breakdownList = item.breakdownList;
}); });
}, },
//驳回事件 //保存事件
beforeBack() { handleSave() {
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
if (this.listForm.jgUser == null || this.listForm.jgUser == undefined ) {
this.$message.warning("请选择架构经理");
} else {
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 => {
});
}
}, },
choiceZRR(scope, type, title, id) {
if (scope != null) {
this.dsadadadsada = scope.$index;
}
this.nodeList = [];
this.nodeList.push(id);
this.type = type;
this.drawerTitle = title;
this.modalshowflag = true;
},
//标准表格选择框改变
selectStandChange(data) {
this.selectList = data;
},
getTree() {
this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => {
this.treeData = res.data;
});
},
drawerCheck(data) {
var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
if (getlist.length == 1) {
this.roleRow = getlist[0];
} else {
this.$refs.tree.setCheckedKeys([data.id]);
this.roleRow = this.$refs.tree.getCheckedNodes()[0];
}
},
checkedRole(data) {
if (this.type === "jgUser") {
this.listForm.jgUserId = data[0].id;
this.listForm.jgUser = data[0].name;
}
},
cancleUserInfo() {
this.modalshowflag = false;
}
}, },
computed: { computed: {
listNoDataText() { listNoDataText() {
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程"; return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
@@ -325,6 +354,7 @@ export default {
mounted() { mounted() {
this.processTable(); this.processTable();
this.getData(); this.getData();
this.getTree();
} }
}; };
</script> </script>
@@ -332,7 +362,7 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/assets/styles/style'; @import '~@/assets/styles/style';
.xmpg-step2 { .xmpg2-step3 {
/deep/ .el-drawer__container { /deep/ .el-drawer__container {
.prc-content-border { .prc-content-border {
border: none; border: none;
@@ -1,13 +1,461 @@
<template> <template>
<div class="xmpg2-step4">
<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>
<template slot="title">填写信息</template>
</process-title>
<div class="tableTitle">
<div class="tableButton">
<el-button plain class="common-button-primary" size="mini" @click="batchOperation">批量分发负责人</el-button>
</div>
</div>
<el-table
:data="dataList"
border
ref="selection"
height="70%"
style="width: 100%; border:1px solid #ccc"
@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="standId"
align="center"
label="标准编号"
>
</el-table-column>
<el-table-column
prop="standName"
align="center"
label="中文名称"
>
</el-table-column>
<el-table-column
prop="standEnName"
label="英文名称"
align="center"
>
</el-table-column>
<el-table-column
prop="ssrq"
align="center"
sortable
label="标准实施日期">
<template slot-scope="scope">
<span>{{ scope.row.ssrq ? $moment(scope.row.ssrq).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="zrbm"
label="责任部门"
align="center"
>
</el-table-column>
<el-table-column label="分发责任人" prop="liablePeople" align="center">
<template slot-scope="scope">
<div v-if="scope.row.liablePeople == undefined">
{{ "请选择分发责任人" }}
</div>
<div v-else class="fileClass">
{{ scope.row.liablePeople || "-" }}
</div>
</template>
</el-table-column>
</el-table>
</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-save
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit"
>
</ProcessFooter>
<!-- 选择责任人-->
<Role-tree
check-box
is-title="选择分发负责人"
:is-visible.sync="modalshowflag"
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
</div>
</template> </template>
<script> <script>
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail, queryDetail } from "api/process";
export default { export default {
name: "xmpg2Step4" name: "xmpg2Step4",
components: {
ProcessTitle,
ProcessHeader,
ProcessFooter
},
data() {
return {
active: "1",
loading: false,
// 当前流程类型(1待办/2已办)
processType: 1,
isSubmit: false,
saveLoading: false,
showColumn: true,
drawerTitle: "", //drawer标题
modalshowflag: false, // drawer开关
selectList: [],
treeData: [], // 人员数据
roleForm: {
liablePeople: ""
},
peopleFlag: true,
nodeList: [],
defaultProps: {
children: "children",
label: "name"
},
//表单的数据
listForm: {
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;
});
},
//保存事件
handleSave() {
},
//提交事件
handleSubmit() {
this.listForm.dataList.forEach(item => {
if(item.liablePeople !== undefined){
this.peopleFlag = true
}else{
this.peopleFlag = false
}
})
if(this.peopleFlag === true){
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
}, e => {
});
}else{
this.$message.warning('请选择分发负责人')
}
},
//批量操作按钮
batchOperation(id) {
if (this.selectList.length === 0) {
this.$message.warning("请至少选择一条数据进行批量分发");
} else {
this.nodeList = [];
this.nodeList.push(id);
this.modalshowflag = true;
}
},
//标准表格选择框改变
selectStandChange(data) {
this.selectList = data;
},
getTree() {
this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => {
this.treeData = res.data;
});
},
drawerCheck(data) {
var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
if (getlist.length == 1) {
this.roleRow = getlist[0];
} else {
this.$refs.tree.setCheckedKeys([data.id]);
this.roleRow = this.$refs.tree.getCheckedNodes()[0];
}
},
checkedRole(data) {
// 选取负责人时的操作
let mis = [];
this.selectList.forEach(item => {
item.liablePeople = data[0].name;
item.liablePeopleId = data[0].id;
mis.push(item.standId);
});
this.dataList.forEach(item => {
if (!mis.includes(item.standId)) {
this.selectList.push(item);
}
});
this.dataList = this.selectList;
this.$refs.selection.clearSelection();
this.modalshowflag = false;
},
cancleUserInfo() {
this.modalshowflag = false;
}
},
computed: {
listNoDataText() {
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
}
},
mounted() {
this.processTable();
this.getData();
this.getTree();
}
}; };
</script> </script>
<style scoped> <style lang="less" scoped>
@import '~@/assets/styles/style';
.xmpg2-step4 {
/deep/ .el-drawer__container {
.prc-content-border {
border: none;
padding: 0 20px 0;
}
}
.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 {
height: 100%;
}
}
}
.demo-drawer-content {
margin-top: 10px;
}
}
</style> </style>
@@ -1,13 +1,488 @@
<template> <template>
<div class="xmpg2-step5">
<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>
<template slot="title">填写信息</template>
</process-title>
<div class="tableTitle">
<div class="tableButton">
<el-button plain class="common-button-primary" size="mini" @click="batchOperation">批量分发责任人</el-button>
</div>
</div>
<el-table
:data="dataList"
style="width: 100%"
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="标准编号"
>
</el-table-column>
<el-table-column
prop="standName"
label="标准名称"
>
</el-table-column>
<el-table-column
prop="itemsNum"
label="条款号"
>
</el-table-column>
<el-table-column
prop="itemsName"
label="条款名称"
>
</el-table-column>
<el-table-column label="责任人" prop="workPeople" align="center">
<template slot-scope="scope">
<div v-if="scope.row.workPeople == undefined">
{{ "请选择责任人" }}
</div>
<div v-else class="fileClass">
{{ scope.row.workPeople || "-" }}
</div>
</template>
</el-table-column>
</el-table>
</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-save
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit"
>
</ProcessFooter>
<!-- 选择责任人-->
<Role-tree
check-box
is-title="选择责任人"
:is-visible.sync="modalshowflag"
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
</div>
</template> </template>
<script> <script>
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail, queryDetail } from "api/process";
export default { export default {
name: "xmpg2Step5" name: "xmpg2Step5",
components: {
ProcessTitle,
ProcessHeader,
ProcessFooter
},
data() {
return {
hasChildren: true,
active: "1",
loading: false,
// 当前流程类型(1待办/2已办)
processType: 1,
isSubmit: false,
saveLoading: false,
showColumn: true,
drawerTitle: "", //drawer标题
modalshowflag: false, // drawer开关
selectList: [],
treeData: [], // 人员数据
roleForm: {
workPeople: ""
},
peopleFlag: true,
nodeList: [],
defaultProps: {
children: "children",
label: "name"
},
//表单的数据
listForm: {
projectNumber: "", //项目编号
projectName: "", //项目名称
dataList: [], //项目下的标准数据
children: [] //标准下的分解单数据
},
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;
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;
});
},
//保存事件
handleSave() {
},
//提交事件
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", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
}, e => {
});
} else {
this.$message.warning("请选择分发负责人");
}
});
},
//批量分发按钮
batchOperation(id) {
if (this.selectList.length === 0) {
this.$message.warning("请至少选择一条数据进行批量分发");
} else {
this.nodeList = [];
this.nodeList.push(id);
this.modalshowflag = true;
}
},
//标准表格选择框改变
selectStandChange(data) {
this.selectList = data;
},
getTree() {
this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => {
this.treeData = res.data;
});
},
drawerCheck(data) {
var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
if (getlist.length == 1) {
this.roleRow = getlist[0];
} else {
this.$refs.tree.setCheckedKeys([data.id]);
this.roleRow = this.$refs.tree.getCheckedNodes()[0];
}
},
checkedRole(data) {
// 选取负责人时的操作
let deposit = new Map();
let mis2 = new Map();
this.selectList.forEach(item => {
item.workPeople = data[0].name;
item.workPeopleId = data[0].id;
if (item.children !== undefined) {
item.children.forEach(items => {
deposit.set(items.standId, items);
});
}
mis2.set(item.standId, item);
});
this.dataList.forEach(item => {
if (undefined !== mis2.get(item.standId)) {
if (undefined !== item.children) {
item.children.forEach(i => {
i.workPeopleId = undefined;
i.workPeople = undefined;
});
}
} else {
if (item.children !== undefined) {
item.children.forEach(items => {
if (undefined !== deposit.get(items.standId)) {
items = deposit.get(items.standId);
}
});
}
}
});
this.$refs.selection.clearSelection();
this.modalshowflag = false;
},
cancleUserInfo() {
this.modalshowflag = false;
}
},
computed: {
listNoDataText() {
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
}
},
mounted() {
this.processTable();
this.getData();
this.getTree();
}
}; };
</script> </script>
<style scoped> <style lang="less" scoped>
@import '~@/assets/styles/style';
.xmpg2-step5 {
/deep/ .el-drawer__container {
.prc-content-border {
border: none;
padding: 0 20px 0;
}
}
.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 {
height: 100%;
}
}
}
.demo-drawer-content {
margin-top: 10px;
}
}
</style> </style>
@@ -1,13 +1,563 @@
<template> <template>
<div class="xmpg2-step6">
<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>
<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="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="researchCompliance"
align="center"
width="160"
label="合规">
<template slot-scope="scope">
<el-input
v-model="dataList[scope.$index].complianceReasons"
placeholder="请输入合规原因"
>
</el-input>
</template>
</el-table-column>
<el-table-column
align="center"
width="160"
prop="researchNonCompliance"
label="不合规">
<el-table-column
prop="researchNonCompliance"
align="center"
width="160"
label="不合规项目">
<template slot-scope="scope">
<el-input
v-model="dataList[scope.$index].noCompliance"
placeholder="请输入不合规项目"
>
</el-input>
</template>
</el-table-column>
<el-table-column
prop="researchCountermeasures"
align="center"
width="160"
label="应对措施">
<template slot-scope="scope">
<el-input
v-model="dataList[scope.$index].countermeasures"
placeholder="请输入应对措施"
>
</el-input>
</template>
</el-table-column>
<el-table-column
prop="researchCompletionTime"
align="center"
width="160"
label="完成时间">
<template slot-scope="scope">
<el-date-picker
v-model="dataList[scope.$index].completionTime"
type="date"
placeholder="选择日期">
</el-date-picker>
</template>
</el-table-column>
</el-table-column>
</el-table-column>
<el-table-column
align="center"
label="在产产品">
<el-table-column
prop="productionCompliance"
align="center"
width="160"
label="合规(具体情况)">
<template slot-scope="scope">
<el-input
v-model="dataList[scope.$index].zcComplianceReasons"
placeholder="请输入合规原因"
>
</el-input>
</template>
</el-table-column>
<el-table-column
align="center"
width="160"
label="不合规">
<el-table-column
prop="productionNonCompliance"
align="center"
width="160"
label="不合规项目">
<template slot-scope="scope">
<el-input
v-model="dataList[scope.$index].zcNoCompliance"
placeholder="请输入不合规项目"
>
</el-input>
</template>
</el-table-column>
<el-table-column
prop="productionCountermeasures"
align="center"
width="160"
label="应对措施">
<template slot-scope="scope">
<el-input
v-model="dataList[scope.$index].zcCountermeasures"
placeholder="请输入应对措施"
>
</el-input>
</template>
</el-table-column>
<el-table-column
prop="productionCompletionTime"
align="center"
width="160"
label="完成时间">
<template slot-scope="scope">
<el-date-picker
v-model="dataList[scope.$index].zcCompletionTime"
type="date"
placeholder="选择日期">
</el-date-picker>
</template>
</el-table-column>
</el-table-column>
</el-table-column>
</el-table>
</div>
</div>
<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-save
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit"
>
</ProcessFooter>
</div>
</template> </template>
<script> <script>
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail, queryDetail } from "api/process";
export default { export default {
name: "xmpg2Step6" name: "xmpg2Step6",
components: {
ProcessTitle,
ProcessHeader,
ProcessFooter
},
data() {
return {
hasChildren: true,
active: "1",
loading: false,
// 当前流程类型(1待办/2已办)
processType: 1,
isSubmit: false,
saveLoading: false,
showColumn: true,
drawerTitle: "", //drawer标题
modalshowflag: false, // drawer开关
selectList: [],
treeData: [], // 人员数据
roleForm: {
workPeople: ""
},
itemFlag: true,
peopleFlag: true,
defaultProps: {
children: "children",
label: "name"
},
complianceReasons:'',
zcComplianceReasons:'',
//表单的数据
listForm: {
projectNumber: "", //项目编号
projectName: "", //项目名称
dataList: [
{
complianceReasons:'',
zcComplianceReasons:'',
}
], //项目下的标准数据
children: [] //标准下的分解单数据
},
dataList: [
{
complianceReasons:'',
zcComplianceReasons:'',
}
], //展示的标准数据
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;
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;
});
},
//保存事件
handleSave() {
},
//提交事件
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", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
}, e => {
});
} else {
this.$message.warning("请选择分发负责人");
}
});
},
//标准表格选择框改变
selectStandChange(data) {
this.selectList = data;
},
getTree() {
this.$http.get("SarInstitution/institution/institutionAndUser", {}, {}, res => {
this.treeData = res.data;
});
},
drawerCheck(data) {
var getlist = this.$refs.tree.getCheckedNodes().concat(this.$refs.tree.getHalfCheckedNodes());
if (getlist.length == 1) {
this.roleRow = getlist[0];
} else {
this.$refs.tree.setCheckedKeys([data.id]);
this.roleRow = this.$refs.tree.getCheckedNodes()[0];
}
},
},
computed: {
listNoDataText() {
return this.processType === 1 ? "暂无待办流程" : "暂无已办流程";
}
},
mounted() {
this.processTable();
this.getData();
this.getTree();
}
}; };
</script> </script>
<style scoped> <style lang="less" scoped>
@import '~@/assets/styles/style';
.xmpg2-step6 {
/deep/ .el-drawer__container {
.prc-content-border {
border: none;
padding: 0 20px 0;
}
}
.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;
.accessStandardsAndRegulations {
height: 100%;
}
}
.demo-drawer-content {
margin-top: 10px;
}
}
</style> </style>
@@ -0,0 +1,485 @@
<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>
</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"
>
</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";
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
};
},
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';
.xmpg2-step7 {
/deep/ .el-drawer__container {
.prc-content-border {
border: none;
padding: 0 20px 0;
}
}
.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 {
height: 100%;
}
}
}
.demo-drawer-content {
margin-top: 10px;
}
}
</style>
@@ -0,0 +1,485 @@
<template>
<div class="xmpg2-step8">
<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>
</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"
>
</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";
export default {
name: "xmpg2Step8",
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
};
},
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';
.xmpg2-step8 {
/deep/ .el-drawer__container {
.prc-content-border {
border: none;
padding: 0 20px 0;
}
}
.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 {
height: 100%;
}
}
}
.demo-drawer-content {
margin-top: 10px;
}
}
</style>
@@ -0,0 +1,485 @@
<template>
<div class="xmpg2-step9">
<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>
</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"
>
</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";
export default {
name: "xmpg2Step9",
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
};
},
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';
.xmpg2-step9 {
/deep/ .el-drawer__container {
.prc-content-border {
border: none;
padding: 0 20px 0;
}
}
.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 {
height: 100%;
}
}
}
.demo-drawer-content {
margin-top: 10px;
}
}
</style>
@@ -556,6 +556,50 @@ export default {
prcType: row.prcType prcType: row.prcType
} }
}) })
}else if(row.taskInfo === '工程经理转办'){
this.$router.push({
name: 'xmpg2Step3',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
} else if(row.taskInfo === '架构经理任务分发') {
this.$router.push({
name: 'xmpg2Step4',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
} else if(row.taskInfo === '分发责任人下发') {
this.$router.push({
name: 'xmpg2Step5',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
} else if(row.taskInfo === '合规性评估') {
this.$router.push({
name: 'xmpg2Step6',
query: {
taskIds: row.taskIds,
prcId: row.prcId,
prcNum: row.prcNum,
prcName: row.prcName,
prcType: row.prcType
}
})
} }
break break
//未符合项整改流程 //未符合项整改流程
@@ -226,6 +226,16 @@ export default {
} }
}) })
break break
case '4':
this.$router.push({
name: 'bzqdfbStep1-1',
query: {
type: '4',
processName: '标准清单发布更新流程',
bpnId: id
}
})
break
} }
}, },
...mapMutations(['setProcess', 'setHandleInfo']), ...mapMutations(['setProcess', 'setHandleInfo']),
@@ -353,7 +353,9 @@ export default {
name: "ListOfStandardsAndRegulationsDetails", name: "ListOfStandardsAndRegulationsDetails",
query: { query: {
id: item.id, id: item.id,
fileIds: item.fileIds fileIds: item.fileIds,
page: 1,
Size: this.$store.getters.userInfo.configContent
} }
}); });
}, },
@@ -353,7 +353,9 @@ export default {
name: "OtherAddEit", name: "OtherAddEit",
query: { query: {
id: item.id, id: item.id,
fileIds: item.fileIds fileIds: item.fileIds,
page: 1,
Size: this.$store.getters.userInfo.configContent
} }
}); });
} }
@@ -356,7 +356,9 @@ export default {
name: "ProjectAddEit", name: "ProjectAddEit",
query: { query: {
id: item.id, id: item.id,
fileIds: item.fileIds fileIds: item.fileIds,
page: 1,
Size: this.$store.getters.userInfo.configContent
} }
}); });
} }
@@ -28,24 +28,6 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="适用领域" prop="applicationScope" class="search-item">
<el-select
v-model="sarAccessEO.applicationScope"
multiple
placeholder="请选择"
filterable
:disabled="disabledFlag"
class="wx-resolve"
>
<el-option
v-for="item in applyOptions"
:value="item.value"
:key="item.value"
:label="item.label"
>
</el-option>
</el-select>
</el-form-item>-->
<br/><br/> <br/><br/>
<el-form-item label="清单说明" prop="remark" class="search-item max-search-item2"> <el-form-item label="清单说明" prop="remark" class="search-item max-search-item2">
<el-input <el-input
@@ -98,9 +80,9 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('m.keywords')" class="search-item"> <el-form-item label="标准名称" v-if="sarAccessInfoSearch.dataSource !== 'TEMP'" class="search-item">
<el-input <el-input
v-model="sarAccessInfoSearch.keywords" v-model="sarAccessInfoSearch.standName"
placeholder="请输入" placeholder="请输入"
:maxlength="100" :maxlength="100"
></el-input> ></el-input>
@@ -163,7 +145,11 @@
@click="clearSearchLaws">清空</el-button> @click="clearSearchLaws">清空</el-button>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" class="common-button-primary" size="mini" @click="selectMoreBtn"> <el-button type="primary" v-if="showSelectBox" class="common-button-primary" size="mini" @click="selectMoreBtn">
<i class="iconfont">&#xe7a5;</i>
高级查询
</el-button>
<el-button type="primary" v-if="!showSelectBox" class="common-button-primary" size="mini" @click="selectMoreBtn">
<i class="iconfont">&#xe7a5;</i> <i class="iconfont">&#xe7a5;</i>
高级查询 高级查询
</el-button> </el-button>
@@ -171,6 +157,50 @@
</el-form> </el-form>
</div> </div>
</div> </div>
<div class="showSelectBox" v-if="!showSelectBox">
<el-form :model="sarAccessInfoSearch" class="label-input-form" v-if="!disabledFlag" inline>
<el-form-item label="文本状态" v-show="!isListType">
<el-select
v-model="sarAccessInfoSearch.textStatus"
placeholder="请选择"
filterable
size="small"
>
<el-option
v-for="item in textStatusOptions"
:value="item.value"
:key="item.value"
:label="item.label"
/>
</el-select>
</el-form-item>
<el-form-item label="发布日期" v-show="!isListType">
<el-date-picker
v-model="sarAccessInfoSearch.issueTime"
type="date"
value-format="yyyy-MM-DD"
size="small"
placeholder="选择发布日期">
</el-date-picker>
</el-form-item>
<el-form-item label="更新人" v-show="isListType">
<el-input
v-model="sarAccessInfoSearch.standName"
placeholder="请输入"
:maxlength="100"
size="small"/>
</el-form-item>
<el-form-item label="更新时间" v-show="isListType">
<el-date-picker
v-model="sarAccessInfoSearch.modifyTime"
type="date"
size="small"
value-format="yyyy-MM-DD"
placeholder="选择更新日期">
</el-date-picker>
</el-form-item>
</el-form>
</div>
<div class="action-bar"> <div class="action-bar">
<el-button <el-button
class="common-button-default" class="common-button-default"
@@ -274,9 +304,15 @@
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="countryArea" prop="country"
label="国家/地区" label="国家/地区"
align="center"> align="center">
<template slot-scope="scope">
<span v-if="scope.row.country !== null && scope.row.country.indexOf(',') > 0">
<span>{{ scope.row.country }}</span>
</span>
<span v-else>{{ countryAreaMap[scope.row.country] }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="detailedListName" prop="detailedListName"
@@ -359,18 +395,12 @@
align="center" align="center"
width="180px" width="180px"
label="适用车型"> label="适用车型">
<template slot-scope="scope">
<span>{{ typeApplicableMap[scope.row.typeApplicable] }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="nylx" prop="nylx"
align="center" align="center"
width="180px" width="180px"
label="能源类型"> label="能源类型">
<template slot-scope="scope">
<span>{{ nylxMap[scope.row.nylx] }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="putTime" prop="putTime"
@@ -409,9 +439,6 @@
width="210px" width="210px"
align="center" align="center"
label="责任部门"> label="责任部门">
<template slot-scope="scope">
<span>{{ zrbmMap[scope.row.zrbm] }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
@@ -419,9 +446,6 @@
width="180px" width="180px"
align="center" align="center"
label="适用产品线"> label="适用产品线">
<template slot-scope="scope">
<span>{{ sycpxMap[scope.row.sycpx] }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
@@ -451,7 +475,7 @@
width="210px" width="210px"
label="卡车VPPS中文名称"> label="卡车VPPS中文名称">
</el-table-column> </el-table-column>
<el-table-column width="200"> <el-table-column width="240" align="center" label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
class="common-button-default" class="common-button-default"
@@ -514,9 +538,11 @@
:wrapperClosable="false" :wrapperClosable="false"
size="800px" size="800px"
> >
<el-form :modal="editRowData" ref="editRowData" label-width="auto" style="margin: 20px"> <el-form :modal="editRowData" label-position="left" ref="editRowData" label-width="150px" style="margin: 20px">
<el-form-item label="标准号"> <el-form-item label="标准号">
<a>{{ editRowData.standSortShow }} {{ editRowData.standNumber }}</a> <el-input v-model.trim="editRowData.standNumber" :disabled="true">
<!-- <a>{{ editRowData.standSortShow }} {{ editRowData.standNumber }}</a>-->
</el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准名称" prop="standName"> <el-form-item label="标准名称" prop="standName">
<el-input v-model.trim="editRowData.standName" :disabled="true"></el-input> <el-input v-model.trim="editRowData.standName" :disabled="true"></el-input>
@@ -611,7 +637,8 @@ import CustomInputForPolicy from '@/components/CustomFormComponents/InputForPoli
import CustomRoleTree from '@/components/CustomFormComponents/roleTree' import CustomRoleTree from '@/components/CustomFormComponents/roleTree'
import stand from "../../../config/pages/attributeCustom/components/stand"; import stand from "../../../config/pages/attributeCustom/components/stand";
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import { editDataInfo } from '@/api/unqualProcess' import { dicTypeData, StandardsInfoPage } from '@/api/unqualProcess'
import {interfaceUrl} from "@/sysConfig";
export default { export default {
name: 'ListOfStandardsAndRegulationsDetails', name: 'ListOfStandardsAndRegulationsDetails',
components: { components: {
@@ -635,32 +662,13 @@ export default {
CustomRoleTree CustomRoleTree
}, },
data () { data () {
// let validatePass = (rule, value, callback) => {
// let list = []
// //sarAccessInfoListADMIN 可能不存在
// if (this.sarAccessInfoListADMIN.length > 0) {
// for (let a = 0; a < this.sarAccessInfoListADMIN.length;a++) {
// list.push(this.sarAccessInfoListADMIN[a].code)
// }
// }
// if (this.sarAccessInfoList.length > 0) {
// for (let b = 0; b < this.sarAccessInfoList.length;b++) {
// list.push(this.sarAccessInfoList[b].code)
// }
// }
// for (let c = 0; c < list.length; c++) {
// if (value === list[c]) {
// callback(new Error('此标准号已存在'))
// }
// }
// }
return { return {
textStatusMap: {}, textStatusMap: {},
countryAreaMap: {},
typeApplicableMap: {}, typeApplicableMap: {},
nylxMap: {}, nylxMap: {},
zrbmMap: {}, zrbmMap: {},
sycpxMap: {}, sycpxMap: {},
zrbmOptions: [],
// 编辑抽屉状态 // 编辑抽屉状态
drawerEdit: false, drawerEdit: false,
// 编辑框数据 // 编辑框数据
@@ -712,9 +720,15 @@ export default {
disabledFlag: false, disabledFlag: false,
regionOptions: [], // 基础信息 区域list regionOptions: [], // 基础信息 区域list
drawerCountryOptions: [], // 基础信息 国家list drawerCountryOptions: [], // 基础信息 国家list
textStatusOptions: [], // 文本状态
applyOptions: [], //基础信息适用领域list applyOptions: [], //基础信息适用领域list
applyArcticOptions: [], // 基础车型 适用车型list /** ****************************/
zrbmOptions: [], // 责任部门
categoryOptions: [], // 能源类型
energyKindOptions: [], // 能源种类list energyKindOptions: [], // 能源种类list
sycpxOptions: [], // 适用产品线
applyArcticOptions: [], // 基础车型 适用车型list
/** ******************************/
accessSarTypeOptions: [], // 要求类型list accessSarTypeOptions: [], // 要求类型list
standSortOptions: [], // 标准类别 standSortOptions: [], // 标准类别
standStateOptions: [], // 标准状态 standStateOptions: [], // 标准状态
@@ -733,6 +747,9 @@ export default {
sarAccessInfoSearch: { sarAccessInfoSearch: {
id: '', id: '',
countryArea: '', // 国家 countryArea: '', // 国家
issueTime: '',
standName: '',
textStatus: '',
// applicationScope: '', //适用区域 // applicationScope: '', //适用区域
keywords: '', // 关键字 keywords: '', // 关键字
detailedListName: '', //清单名称 detailedListName: '', //清单名称
@@ -746,6 +763,7 @@ export default {
}, },
moreSearchBtn: true, // 多属性搜索按钮 状态 moreSearchBtn: true, // 多属性搜索按钮 状态
showTableFlag: true, // 显示添加列表 状态 showTableFlag: true, // 显示添加列表 状态
showSelectBox: true, // 显示高级查询 状态
sarAccessInfoSearchList: [], // 数据搜索 table列表数据 sarAccessInfoSearchList: [], // 数据搜索 table列表数据
importmodalFlag: false, // 导入model 状态 importmodalFlag: false, // 导入model 状态
searching: false, searching: false,
@@ -956,9 +974,32 @@ export default {
uuid: '', uuid: '',
} }
}, },
created() {
this.selectLawsStands()
dicTypeData().then(res => {
// 责任部门数据字典
this.zrbmOptions = res.data.ZRBMCLASS
// 能源类型数据字典
this.energyKindOptions = res.data.ENERGYTYPES
// this.categoryOptions = res.data.NYLXCLASS // 能源类型
// 适用车型数据字典
this.applyArcticOptions = res.data.PRODUCTTYPE
// 适用产品线数据字典
this.sycpxOptions = res.data.SYCPXCLASS
})
},
methods: { methods: {
// 高级检索 // 高级检索
selectMoreBtn () { selectMoreBtn () {
this.showSelectBox = !this.showSelectBox
this.showTableFlag = false
if (!this.showSelectBox) {
this.sarAccessInfoSearch.standName = ''
this.sarAccessInfoSearch.issueTime = ''
this.sarAccessInfoSearch.textStatus = ''
this.sarAccessInfoSearch.modifyTime = ''
}
this.selectLawsStands()
}, },
// 法规维护人树 // 法规维护人树
getDept () { getDept () {
@@ -1062,6 +1103,9 @@ export default {
this.sarAccessInfoSearch.askType = '' // 监管类型 this.sarAccessInfoSearch.askType = '' // 监管类型
this.sarAccessInfoSearch.detailedListName = '' // 清单名称 this.sarAccessInfoSearch.detailedListName = '' // 清单名称
this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源 this.sarAccessInfoSearch.dataSource = 'INLAND_STAND' // 数据来源
this.sarAccessInfoSearch.standName = ''
this.sarAccessInfoSearch.putTime = ''
this.sarAccessInfoSearch.textStatus = ''
this.isListType = false this.isListType = false
this.selectLawsStands() this.selectLawsStands()
}, },
@@ -1277,6 +1321,7 @@ export default {
editTghisRow(row) { editTghisRow(row) {
this.rowList = row this.rowList = row
this.editRowData = this.rowList this.editRowData = this.rowList
this.editRowData.standNumber = this.rowList.standSortShow + this.rowList.standNumber
this.drawerEdit = true this.drawerEdit = true
}, },
// 抽屉取消按钮 // 抽屉取消按钮
@@ -1346,12 +1391,30 @@ export default {
this.$refs['sarAccessForm'].validate((valid) => { this.$refs['sarAccessForm'].validate((valid) => {
if (valid) { if (valid) {
let rowlist = [] let rowlist = []
let rowlist1 = []
let rowlist2 = []
let rowlist3 = []
for (let i = 0; i < this.sarAccessInfoList.length; i++) { for (let i = 0; i < this.sarAccessInfoList.length; i++) {
rowlist.push(this.sarAccessInfoList[i].id) rowlist.push(this.sarAccessInfoList[i].id)
if (this.sarAccessInfoList[i].putTime === null || this.sarAccessInfoList[i].zccssrqgj ===null || this.sarAccessInfoList[i].xcxssrqgj === null) {
rowlist1.push(this.sarAccessInfoList[i].putTime)
rowlist2.push(this.sarAccessInfoList[i].zccssrqgj)
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj)
}else {
rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
}
} }
rowlist = rowlist.join(',') rowlist = rowlist.join(',')
rowlist1 = rowlist1.join(',')
rowlist2 = rowlist2.join(',')
rowlist3 = rowlist3.join(',')
let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO)) let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
sarAccessEO.inforlist = JSON.stringify(rowlist) sarAccessEO.inforlist = JSON.stringify(rowlist)
sarAccessEO.inforlist1 = JSON.stringify(rowlist1)
sarAccessEO.inforlist2 = JSON.stringify(rowlist2)
sarAccessEO.inforlist3 = JSON.stringify(rowlist3)
sarAccessEO.countryArea = sarAccessEO.countryArea.join(',') sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
// sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',') // sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
// 判断是否有附件 // 判断是否有附件
@@ -1402,23 +1465,9 @@ export default {
}, },
// 查询数据搜索 table 数据 // 查询数据搜索 table 数据
selectLawsStands () { selectLawsStands () {
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarAccessInfoSearch, { StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{
_this: this
}, res =>{
this.sarAccessInfoSearchList = res.data.list this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => { this.drawerTotal = res.data.list.length
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
})
console.log(this.sarAccessInfoSearchList)
}, e => { }, e => {
}) })
}, },
@@ -1429,7 +1478,68 @@ export default {
// 数据搜索 table select事件 // 数据搜索 table select事件
sarAccessInfoSearchSelect (val) { sarAccessInfoSearchSelect (val) {
this.selectedAccInfoSearchList = val this.selectedAccInfoSearchList = val
console.log(val) this.selectedAccInfoSearchList.forEach(item => {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
})
this.selectedAccInfoSearchList.forEach(item => {
// 责任部门转换
if (item.zrbm !== null || item.zrbm !== "") {
let k = (item.zrbm || "").split(',')
for (let i in this.zrbmOptions) {
for (let m = 0; m< k.length; m++) {
if (this.zrbmOptions[i].value === k[m]) {
k[m] = this.zrbmOptions[i].label
}
item.zrbm = k.join(',')
}
}
}
// 能源类型转换
if (item.nylx !== null) {
let k = (item.nylx || "").split(',')
for (let i in this.categoryOptions) {
for (let m = 0; m< k.length; m++) {
if (this.categoryOptions[i].value === k[m]) {
k[m] = this.categoryOptions[i].label
}
item.nylx = k.join(',')
}
}
}
// 适用车型转换
if (item.typeApplicable !== null) {
let k = (item.typeApplicable || "").split(',')
for (let i in this.energyKindOptions) {
for (let m = 0; m< k.length; m++) {
if (this.energyKindOptions[i].value === k[m]) {
k[m] = this.energyKindOptions[i].label
}
item.typeApplicable = k.join(',')
}
}
}
// s适用产品线转换
if (item.sycpx !== null) {
let k = (item.sycpx || "").split(',')
for (let i in this.sycpxOptions) {
for (let m = 0; m< k.length; m++) {
if (this.sycpxOptions[i].value === k[m]) {
k[m] = this.sycpxOptions[i].label
}
item.sycpx = k.join(',')
}
}
}
})
}, },
// 数据搜索 清单类型 table select事件 // 数据搜索 清单类型 table select事件
accessSarTypeSelect (selectData) { accessSarTypeSelect (selectData) {
@@ -1448,8 +1558,13 @@ export default {
}, },
// 点击 导出、全部导出按钮事件 // 点击 导出、全部导出按钮事件
exportAccessInfo (type) { exportAccessInfo (type) {
this.exportTestItemNameFlag = true if (this.sarAccessInfoListArry.length > 0) {
this.exportName = '' this.exportTestItemNameFlag = true
this.exportName = ''
}else {
this.$message.warning('请选择数据进行导出')
}
}, },
// 导出确定功能 // 导出确定功能
exportTestItem () { exportTestItem () {
@@ -1465,10 +1580,9 @@ export default {
for (var accessInfo in exportList) { for (var accessInfo in exportList) {
accIdAndrestype.push(exportList[accessInfo].id) accIdAndrestype.push(exportList[accessInfo].id)
} }
window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
window.open(exportURL)
this.$message.success('导出信息成功') this.$message.success('导出信息成功')
} else {
this.$message.warning('当前没有需要导出的数据')
} }
this.exportTestItemNameFlag = false this.exportTestItemNameFlag = false
}, },
@@ -1778,7 +1892,7 @@ export default {
name: routerName, name: routerName,
params: { params: {
id: item.resId, id: item.resId,
pageType: item.sarType pageType: this.sarAccessInfoSearch.dataSource
} }
}) })
window.open(routeUrl.href, '_blank') window.open(routeUrl.href, '_blank')
@@ -1872,17 +1986,21 @@ export default {
return formatText(str) return formatText(str)
}, },
getData() { getData() {
this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById', {id: this.zqaId}, { this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById', {
id: this.zqaId,
page: this.page,
Size: this.Size
}, {
_this: this _this: this
}, res => { }, res => {
this.sarAccessInfoList = res.data this.sarAccessInfoList = res.data
console.log(res.data)
}, e => { }, e => {
}) })
}, },
// 将文本状态的id与name对应 // 将文本状态的id与name对应
setMap(data){ setMap(data){
data.forEach(item => { data.forEach(item => {
this.$set(this.countryAreaMap, item.value, item.label)
this.$set(this.textStatusMap, item.value, item.label) this.$set(this.textStatusMap, item.value, item.label)
this.$set(this.typeApplicableMap, item.value, item.label) this.$set(this.typeApplicableMap, item.value, item.label)
this.$set(this.nylxMap, item.value, item.label) this.$set(this.nylxMap, item.value, item.label)
@@ -1896,7 +2014,6 @@ export default {
isListType (newVal, oldVal) { isListType (newVal, oldVal) {
this.sarAccessInfoSearchList = [] this.sarAccessInfoSearchList = []
this.sarAccessInfoSearch.page = 1 this.sarAccessInfoSearch.page = 1
this.drawerTotal = 0
this.selectedAccInfoSearchList = [] this.selectedAccInfoSearchList = []
this.accessSarTypeList = [] this.accessSarTypeList = []
} }
@@ -1906,6 +2023,8 @@ export default {
}, },
mounted () { mounted () {
this.zqaId =this.$route.query.id; this.zqaId =this.$route.query.id;
this.page = this.$route.query.page
this.Size = this.$route.query.Size
// this.getData() // this.getData()
this.getDept() this.getDept()
// 从数据库中查询各下拉框数据 // 从数据库中查询各下拉框数据
@@ -1914,8 +2033,8 @@ export default {
}, res => { }, res => {
this.allSelectOptions = res.data || {} this.allSelectOptions = res.data || {}
this.regionOptions = res.data.REGION // 基础信息 区域list this.regionOptions = res.data.REGION // 基础信息 区域list
this.applyArcticOptions = res.data.PRODUCTTYPE || [] // 基础车型 适用车型list this.applyArcticOptions = res.data.PRODUCTTYPE // 基础车型 适用车型list
this.energyKindOptions = res.data.ENERGYTYPES || [] // 能源种类list this.energyKindOptions = res.data.ENERGYTYPES // 能源种类list
this.drawerCountryOptions = res.data.COUNTRY // 国家、地区list this.drawerCountryOptions = res.data.COUNTRY // 国家、地区list
this.applyOptions = res.data.COUNTRY //适用区域list this.applyOptions = res.data.COUNTRY //适用区域list
this.standNatureOptions = res.data.SARPROPERTY // 新增 标准性质 this.standNatureOptions = res.data.SARPROPERTY // 新增 标准性质
@@ -1930,10 +2049,7 @@ export default {
this.textStatusOptions = res.data.WBZTCLASS this.textStatusOptions = res.data.WBZTCLASS
this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
this.setMap(this.textStatusOptions) this.setMap(this.textStatusOptions)
this.setMap(this.zrbmOptions) this.setMap(this.drawerCountryOptions)
this.setMap(this.categoryOptions)
this.setMap(this.sycpxOptions)
this.setMap(this.energyKindOptions)
this.getGzzOption() this.getGzzOption()
}, e => { }, e => {
}) })
@@ -1992,6 +2108,9 @@ export default {
} }
} }
} }
.showSelectBox {
padding: 10px;
}
.data-search{ .data-search{
.standards-drawer-table-one{ .standards-drawer-table-one{
position: relative; position: relative;
@@ -4,18 +4,23 @@
<div class="back" title="返回" @click="back"> <div class="back" title="返回" @click="back">
<i class="el-icon-back"></i> <i class="el-icon-back"></i>
</div> </div>
<div class="title">{{ sarAccessEO.detailedListName }}<i class="el-icon-s-order" <div class="title">
@click="heightShow = !heightShow"></i></div> {{ sarAccessEO.detailedListName }}
<i class="el-icon-s-order"
@click="heightShow = !heightShow">
</i>
</div>
</div> </div>
<transition name="el-zoom-in-top"> <transition name="el-zoom-in-top">
<div v-show="heightShow" class="transition-box"> <div v-show="heightShow" class="transition-box">
<p class="transition-box-p"> <p class="transition-box-p" v-if="sarAccessEO.sortKey === '1'">
<label class="transition-box-label">国家/地区</label> <label class="transition-box-label">国家/地区</label>
<span class="transition-box-span" v-if="sarAccessEO.countryArea !== null && sarAccessEOInfo > 0"> <span class="transition-box-span" v-if="sarAccessEO.countryArea !== null && sarAccessEOInfo > 0">
<span>{{ sarAccessEO.countryArea }}</span> <span>{{ sarAccessEO.countryArea }}</span>
</span> </span>
<span class="transition-box-span" v-else>{{ countryAreaMap[sarAccessEO.countryArea] }}</span> <span class="transition-box-span" v-else>{{ countryAreaMap[sarAccessEO.countryArea] }}</span>
</p> </p>
<p v-else></p>
<p class="transition-box-p"> <p class="transition-box-p">
<label class="transition-box-label">清单说明</label> <label class="transition-box-label">清单说明</label>
<span class="transition-box-span">{{ sarAccessEO.remark || "-" }}</span> <span class="transition-box-span">{{ sarAccessEO.remark || "-" }}</span>
@@ -88,12 +93,75 @@
icon="export" icon="export"
>导出 >导出
</el-button> </el-button>
<el-button type="primary" v-btn-permission="'670472f38fe27b192c7f7105847f38ce'" class="common-button-primary" size="mini" @click="selectMoreBtn"><i <el-button type="primary" v-if="showSelectBox" class="common-button-primary" size="mini" @click="selectMoreBtn">
class="iconfont">&#xe7a5;</i>高级查询 <i class="iconfont">&#xe7a5;</i>
高级查询
</el-button>
<el-button type="primary" v-if="!showSelectBox" class="common-button-primary" size="mini" @click="selectMoreBtn">
<i class="iconfont">&#xe7a5;</i>
高级查询
</el-button> </el-button>
</el-form> </el-form>
</div> <div v-if="!showSelectBox">
<div class="right"> <el-form :model="standardForm" class="label-input-form" label-width="108px" inline>
<el-form-item label="英文名称" class="search-item">
<el-input
v-model="standardForm.standEnName"
placeholder="请输入"
:maxlength="100"
size="small"
/>
</el-form-item>
<el-form-item label="适用车型" class="labelBox" label-width="61px">
<el-select
class="showBox"
v-model="standardForm.typeApplicable"
placeholder="请选择"
filterable
size="small"
>
<el-option
v-for="item in applyArcticOptions"
:value="item.value"
:key="item.value"
:label="item.label"
/>
</el-select>
</el-form-item>
<el-form-item label="能源类型" >
<el-select
class="showBox"
v-model="standardForm.nylx"
placeholder="请选择"
filterable
size="small"
>
<el-option
v-for="item in energyKindOptions"
:value="item.value"
:key="item.value"
:label="item.label"
/>
</el-select>
</el-form-item>
<el-form-item label="适用产品线" >
<el-select
class="showBox"
v-model="standardForm.sycpx"
placeholder="请选择"
filterable
size="small"
>
<el-option
v-for="item in sycpxOptions"
:value="item.value"
:key="item.value"
:label="item.label"
/>
</el-select>
</el-form-item>
</el-form>
</div>
</div> </div>
</div> </div>
<div class="container" style="position:relative;"> <div class="container" style="position:relative;">
@@ -142,7 +210,10 @@
width="180px" width="180px"
label="适用车型"> label="适用车型">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ typeApplicableMap[scope.row.typeApplicable] }}</span> <span v-if="scope.row.typeApplicable !== null && scope.row.typeApplicable.indexOf(',') > 0">
{{ scope.row.typeApplicable }}
</span>
<span v-else>{{ typeApplicableMap[scope.row.typeApplicable] }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -151,7 +222,10 @@
width="180px" width="180px"
label="能源类型"> label="能源类型">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ nylxMap[scope.row.nylx] }}</span> <span v-if="scope.row.nylx !== null && scope.row.nylx.indexOf(',') > 0">
{{ scope.row.nylx }}
</span>
<span v-else>{{ nylxMap[scope.row.nylx] }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -160,9 +234,6 @@
align="center" align="center"
width="210px" width="210px"
label="标准实施日期"> label="标准实施日期">
<template slot-scope="scope">
<span>{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
@@ -172,7 +243,10 @@
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 v-if="scope.row.zccssrqgj === null">
{{ scope.row.zccssrqgj }}
</span>
<span v-else>{{ scope.row.zccssrqgj.slice(0, 10) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -182,7 +256,10 @@
width="210px" width="210px"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span> <span v-if="scope.row.xcxssrqgj === null">
{{ scope.row.xcxssrqgj }}
</span>
<span v-else>{{ scope.row.xcxssrqgj.slice(0, 10) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -192,7 +269,10 @@
align="center" align="center"
label="责任部门"> label="责任部门">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ zrbmMap[scope.row.zrbm] }}</span> <span v-if="scope.row.zrbm !== null && scope.row.zrbm.indexOf(',') > 0">
{{ scope.row.zrbm }}
</span>
<span v-else>{{ zrbmMap[scope.row.zrbm] }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -202,6 +282,9 @@
align="center" align="center"
label="适用产品线"> label="适用产品线">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.sycpx !== null && scope.row.sycpx.indexOf(',') > 0">
{{ scope.row.sycpx }}
</span>
<span>{{ sycpxMap[scope.row.sycpx] }}</span> <span>{{ sycpxMap[scope.row.sycpx] }}</span>
</template> </template>
</el-table-column> </el-table-column>
@@ -280,11 +363,12 @@
<script> <script>
import { interfaceUrl } from "@/sysConfig"; import { interfaceUrl } from "@/sysConfig";
export default { export default {
name: "AccessStandardDetails", name: "AccessStandardDetails",
data() { data() {
return { return {
// 高级检索状态
showSelectBox: true,
textStatusMap: {}, textStatusMap: {},
typeApplicableMap: {}, typeApplicableMap: {},
nylxMap: {}, nylxMap: {},
@@ -292,6 +376,14 @@ export default {
sycpxMap: {}, sycpxMap: {},
countryAreaMap: {}, countryAreaMap: {},
standinfoList: [], standinfoList: [],
// 适用车型
applyArcticOptions: [],
// 能源类型
energyKindOptions: [],
// 责任部门
zrbmOptions: [],
// 适用产品线
sycpxOptions: [],
standardFormTotal: 0, standardFormTotal: 0,
relateDialog: false, relateDialog: false,
relateList: [], relateList: [],
@@ -304,7 +396,7 @@ export default {
standName: "", standName: "",
responseUnit: "", responseUnit: "",
page: 1, page: 1,
pageSize: this.$store.getters.userInfo.configContent Size: this.$store.getters.userInfo.configContent
}, },
page: 1, page: 1,
// pageSize: this.$store.getters.userInfo.configContent, // pageSize: this.$store.getters.userInfo.configContent,
@@ -456,7 +548,7 @@ export default {
this.selectInfobyAccid(); this.selectInfobyAccid();
}, },
pageSizeChange(pageSize) { pageSizeChange(pageSize) {
this.standardForm.pageSize = this.$store.getters.userInfo.configContent; this.standardForm.Size = this.$store.getters.userInfo.configContent;
this.selectInfobyAccid(); this.selectInfobyAccid();
}, },
// 请求部门结构树 // 请求部门结构树
@@ -561,6 +653,17 @@ export default {
* 高级检索 * 高级检索
*/ */
selectMoreBtn() { selectMoreBtn() {
this.showSelectBox = !this.showSelectBox
this.showTableFlag = false
if (!this.showSelectBox) {
// this.standardForm = {}
// this.standardForm.issueTime = ''
// this.standardForm.textStatus = ''
// this.standardForm.modifyTime = ''
}
this.page = 1
this.standardForm.page = 1
this.selectInfobyAccid()
}, },
// 获取工作组信息下拉框信息 // 获取工作组信息下拉框信息
getGzzOption() { getGzzOption() {
@@ -611,13 +714,13 @@ export default {
mounted() { mounted() {
this.$nextTick(() => { this.$nextTick(() => {
let accessRow = JSON.parse(sessionStorage.getItem("accessRow")); let accessRow = JSON.parse(sessionStorage.getItem("accessRow"));
console.log(accessRow)
this.pageId = accessRow.id this.pageId = accessRow.id
this.sarAccessEO = accessRow; this.sarAccessEO = accessRow;
this.sarAccessEOInfo = this.sarAccessEO.countryArea.indexOf(',') console.log(this.sarAccessEO)
this.selectInfobyAccid(); this.selectInfobyAccid();
this.getOrgTreeSource(); this.getOrgTreeSource();
this.getFileInfo(); this.getFileInfo();
// this.sarAccessEOInfo = this.sarAccessEO.countryArea.indexOf(',')
}); });
// 从数据库中查询各下拉框数据 // 从数据库中查询各下拉框数据
@@ -646,6 +749,7 @@ export default {
this.setMap(this.sycpxOptions) this.setMap(this.sycpxOptions)
this.setMap(this.energyKindOptions) this.setMap(this.energyKindOptions)
this.setMap(this.drawerCountryOptions) this.setMap(this.drawerCountryOptions)
this.setMap(this.applyArcticOptions)
this.getGzzOption(); this.getGzzOption();
}, e => { }, e => {
}); });
@@ -776,7 +880,11 @@ export default {
} }
} }
} }
.labelBox {
/deep/ .el-form-item__label {
padding-right: 5px;
}
}
/deep/ .relateClass { /deep/ .relateClass {
& > button { & > button {
height: 30px; height: 30px;
@@ -808,6 +916,9 @@ export default {
} }
} }
/deep/.showBox{
width: 165px;
}
.iconClass { .iconClass {
width: 18px; width: 18px;
height: 18px; height: 18px;
@@ -13,24 +13,6 @@
<el-form-item label="清单类别" prop="detailedList" class="search-item"> <el-form-item label="清单类别" prop="detailedList" class="search-item">
<el-input v-model="sarAccessEO.detailedList" :disabled="disabledFlag" placeholder="请输入"></el-input> <el-input v-model="sarAccessEO.detailedList" :disabled="disabledFlag" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item label="适用领域" prop="applicationScope" class="search-item">
<el-select
v-model="sarAccessEO.applicationScope"
multiple
placeholder="请选择"
filterable
:disabled="disabledFlag"
class="wx-resolve"
>
<el-option
v-for="item in applyOptions"
:value="item.value"
:key="item.value"
:label="item.label"
>
</el-option>
</el-select>
</el-form-item>-->
<br/><br/> <br/><br/>
<el-form-item label="清单说明" prop="remark" class="search-item max-search-item2"> <el-form-item label="清单说明" prop="remark" class="search-item max-search-item2">
<el-input <el-input
@@ -83,9 +65,9 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('m.keywords')" class="search-item"> <el-form-item label="标准名称" v-if="sarAccessInfoSearch.dataSource !== 'TEMP'" class="search-item">
<el-input <el-input
v-model="sarAccessInfoSearch.keywords" v-model="sarAccessInfoSearch.standName"
placeholder="请输入" placeholder="请输入"
:maxlength="100" :maxlength="100"
></el-input> ></el-input>
@@ -110,21 +92,6 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="国家/地区" class="search-item" v-show="isListType">
<el-select
v-model="sarAccessInfoSearch.countryArea"
placeholder="请选择"
filterable
>
<el-option
v-for="item in drawerCountryOptions"
:value="item.value"
:key="item.value"
:label="item.label"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="清单名称" prop="detailedListName" class="search-item" v-show="isListType"> <el-form-item label="清单名称" prop="detailedListName" class="search-item" v-show="isListType">
<el-input <el-input
v-model="sarAccessInfoSearch.detailedListName" v-model="sarAccessInfoSearch.detailedListName"
@@ -156,6 +123,58 @@
</el-form> </el-form>
</div> </div>
</div> </div>
<div class="showSelectBox" v-if="!showSelectBox">
<el-form :model="sarAccessInfoSearch" class="label-input-form" label-width="70px" v-if="!disabledFlag" inline>
<el-form-item label="文本状态" v-show="!isListType">
<el-select
v-model="sarAccessInfoSearch.textStatus"
placeholder="请选择"
filterable
size="small"
>
<el-option
v-for="item in textStatusOptions"
:value="item.value"
:key="item.value"
:label="item.label"
/>
</el-select>
</el-form-item>
<el-form-item label="发布日期" v-show="!isListType">
<el-date-picker
v-model="sarAccessInfoSearch.issueTime"
type="date"
value-format="yyyy-MM-DD"
size="small"
placeholder="选择发布日期">
</el-date-picker>
</el-form-item>
<el-form-item label="项目类别" v-show="isListType">
<el-input
size="small"
v-model="sarAccessInfoSearch.standSystem"
placeholder="请输入"
:maxlength="100"
></el-input>
</el-form-item>
<el-form-item label="更新人" v-show="isListType">
<el-input
v-model="sarAccessInfoSearch.standName"
placeholder="请输入"
:maxlength="100"
size="small"/>
</el-form-item>
<el-form-item label="更新时间" v-show="isListType">
<el-date-picker
v-model="sarAccessInfoSearch.modifyTime"
type="date"
size="small"
value-format="yyyy-MM-DD"
placeholder="选择更新日期">
</el-date-picker>
</el-form-item>
</el-form>
</div>
<div class="action-bar"> <div class="action-bar">
<el-button <el-button
class="common-button-default" class="common-button-default"
@@ -344,18 +363,12 @@
align="center" align="center"
width="180px" width="180px"
label="适用车型"> label="适用车型">
<template slot-scope="scope">
<span>{{ typeApplicableMap[scope.row.typeApplicable] }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="nylx" prop="nylx"
align="center" align="center"
width="180px" width="180px"
label="能源类型"> label="能源类型">
<template slot-scope="scope">
<span>{{ nylxMap[scope.row.nylx] }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="putTime" prop="putTime"
@@ -392,7 +405,14 @@
align="center" align="center"
label="责任部门"> label="责任部门">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ zrbmMap[scope.row.zrbm] }}</span> <span
v-for="(item, index) in zrbmOptions"
:key="index"
:value="item.value"
v-if="scope.row.value == item.value"
>
{{ item.label }}
</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -401,9 +421,6 @@
width="180px" width="180px"
align="center" align="center"
label="适用产品线"> label="适用产品线">
<template slot-scope="scope">
<span>{{ sycpxMap[scope.row.sycpx] }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
@@ -433,7 +450,7 @@
width="210px" width="210px"
label="卡车VPPS中文名称"> label="卡车VPPS中文名称">
</el-table-column> </el-table-column>
<el-table-column width="150"> <el-table-column width="150" align="center" label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
class="common-button-default" class="common-button-default"
@@ -506,6 +523,8 @@ import CustomInputForPolicy from '@/components/CustomFormComponents/InputForPoli
import CustomRoleTree from '@/components/CustomFormComponents/roleTree' import CustomRoleTree from '@/components/CustomFormComponents/roleTree'
import stand from "../../../config/pages/attributeCustom/components/stand"; import stand from "../../../config/pages/attributeCustom/components/stand";
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import {interfaceUrl} from "@/sysConfig";
import {dicTypeData} from "@/api/unqualProcess";
export default { export default {
name: 'OtherAddEit', name: 'OtherAddEit',
components: { components: {
@@ -529,32 +548,12 @@ export default {
CustomRoleTree CustomRoleTree
}, },
data () { data () {
// let validatePass = (rule, value, callback) => {
// let list = []
// //sarAccessInfoListADMIN 可能不存在
// if (this.sarAccessInfoListADMIN.length > 0) {
// for (let a = 0; a < this.sarAccessInfoListADMIN.length;a++) {
// list.push(this.sarAccessInfoListADMIN[a].code)
// }
// }
// if (this.sarAccessInfoList.length > 0) {
// for (let b = 0; b < this.sarAccessInfoList.length;b++) {
// list.push(this.sarAccessInfoList[b].code)
// }
// }
// for (let c = 0; c < list.length; c++) {
// if (value === list[c]) {
// callback(new Error('此标准号已存在'))
// }
// }
// }
return { return {
textStatusMap: {}, textStatusMap: {},
typeApplicableMap: {}, typeApplicableMap: {},
nylxMap: {}, nylxMap: {},
zrbmMap: {}, zrbmMap: {},
sycpxMap: {}, sycpxMap: {},
zrbmOptions: [],
selectSearch : [], selectSearch : [],
// 新增、编辑 基础信息字段 // 新增、编辑 基础信息字段
sarAccessEO: { sarAccessEO: {
@@ -585,11 +584,18 @@ export default {
] ]
}, },
disabledFlag: false, disabledFlag: false,
showSelectBox: true,
/** ****************************/
zrbmOptions: [], // 责任部门
categoryOptions: [], // 能源类型
energyKindOptions: [], // 能源种类list
sycpxOptions: [], // 适用产品线
applyArcticOptions: [], // 基础车型 适用车型list
/** ******************************/
textStatusOptions: [], // 文本状态
regionOptions: [], // 基础信息 区域list regionOptions: [], // 基础信息 区域list
drawerCountryOptions: [], // 基础信息 国家list drawerCountryOptions: [], // 基础信息 国家list
applyOptions: [], //基础信息适用领域list applyOptions: [], //基础信息适用领域list
applyArcticOptions: [], // 基础车型 适用车型list
energyKindOptions: [], // 能源种类list
accessSarTypeOptions: [], // 要求类型list accessSarTypeOptions: [], // 要求类型list
standSortOptions: [], // 标准类别 standSortOptions: [], // 标准类别
standStateOptions: [], // 标准状态 standStateOptions: [], // 标准状态
@@ -615,7 +621,7 @@ export default {
askType: '', // 监管类型 askType: '', // 监管类型
dataSource: 'INLAND_STAND', // 数据来源 dataSource: 'INLAND_STAND', // 数据来源
page: 1, page: 1,
pageSize: this.$store.getters.userInfo.configContent, Size: this.$store.getters.userInfo.configContent,
validFlag: 0, validFlag: 0,
advanceSearchVOStr: '' advanceSearchVOStr: ''
}, },
@@ -831,6 +837,20 @@ export default {
uuid: '', uuid: '',
} }
}, },
created() {
this.selectLawsStands()
dicTypeData().then(res => {
// 责任部门数据字典
this.zrbmOptions = res.data.ZRBMCLASS
// 能源类型数据字典
this.energyKindOptions = res.data.ENERGYTYPES
// this.categoryOptions = res.data.NYLXCLASS // 能源类型
// 适用车型数据字典
this.applyArcticOptions = res.data.PRODUCTTYPE
// 适用产品线数据字典
this.sycpxOptions = res.data.SYCPXCLASS
})
},
methods: { methods: {
// 高级检索 // 高级检索
selectMoreBtn () { selectMoreBtn () {
@@ -1258,19 +1278,7 @@ export default {
_this: this _this: this
}, res =>{ }, res =>{
this.sarAccessInfoSearchList = res.data.list this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => { this.drawerTotal = res.data.list.length
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
})
console.log(this.sarAccessInfoSearchList)
}, e => { }, e => {
}) })
@@ -1282,7 +1290,68 @@ export default {
// 数据搜索 table select事件 // 数据搜索 table select事件
sarAccessInfoSearchSelect (val) { sarAccessInfoSearchSelect (val) {
this.selectedAccInfoSearchList = val this.selectedAccInfoSearchList = val
console.log(val) this.selectedAccInfoSearchList.forEach(item => {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
})
this.selectedAccInfoSearchList.forEach(item => {
// 责任部门转换
if (item.zrbm !== null || item.zrbm !== "") {
let k = (item.zrbm || "").split(',')
for (let i in this.zrbmOptions) {
for (let m = 0; m< k.length; m++) {
if (this.zrbmOptions[i].value === k[m]) {
k[m] = this.zrbmOptions[i].label
}
item.zrbm = k.join(',')
}
}
}
// 能源类型转换
if (item.nylx !== null) {
let k = (item.nylx || "").split(',')
for (let i in this.categoryOptions) {
for (let m = 0; m< k.length; m++) {
if (this.categoryOptions[i].value === k[m]) {
k[m] = this.categoryOptions[i].label
}
item.nylx = k.join(',')
}
}
}
// 适用车型转换
if (item.typeApplicable !== null) {
let k = (item.typeApplicable || "").split(',')
for (let i in this.energyKindOptions) {
for (let m = 0; m< k.length; m++) {
if (this.energyKindOptions[i].value === k[m]) {
k[m] = this.energyKindOptions[i].label
}
item.typeApplicable = k.join(',')
}
}
}
// s适用产品线转换
if (item.sycpx !== null) {
let k = (item.sycpx || "").split(',')
for (let i in this.sycpxOptions) {
for (let m = 0; m< k.length; m++) {
if (this.sycpxOptions[i].value === k[m]) {
k[m] = this.sycpxOptions[i].label
}
item.sycpx = k.join(',')
}
}
}
})
}, },
// 数据搜索 清单类型 table select事件 // 数据搜索 清单类型 table select事件
accessSarTypeSelect (selectData) { accessSarTypeSelect (selectData) {
@@ -1297,13 +1366,17 @@ export default {
// 数据搜索table分页条数改变回调 // 数据搜索table分页条数改变回调
drawerPageSizeChange () { drawerPageSizeChange () {
this.sarAccessInfoSearch.pageSize = this.$store.getters.userInfo.configContent this.sarAccessInfoSearch.Size = this.$store.getters.userInfo.configContent
this.selectLawsStands() this.selectLawsStands()
}, },
// 点击 导出、全部导出按钮事件 // 点击 导出、全部导出按钮事件
exportAccessInfo (type) { exportAccessInfo (type) {
this.exportTestItemNameFlag = true if (this.sarAccessInfoListArry.length > 0) {
this.exportName = '' this.exportTestItemNameFlag = true
this.exportName = ''
}else {
this.$message.warning('请选择数据进行导出')
}
}, },
// 导出确定功能 // 导出确定功能
exportTestItem () { exportTestItem () {
@@ -1319,10 +1392,10 @@ export default {
for (var accessInfo in exportList) { for (var accessInfo in exportList) {
accIdAndrestype.push(exportList[accessInfo].id) accIdAndrestype.push(exportList[accessInfo].id)
} }
window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
window.open(exportURL)
// window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames
this.$message.success('导出信息成功') this.$message.success('导出信息成功')
} else {
this.$message.warning('当前没有需要导出的数据')
} }
this.exportTestItemNameFlag = false this.exportTestItemNameFlag = false
}, },
@@ -1727,7 +1800,11 @@ export default {
return formatText(str) return formatText(str)
}, },
getData() { getData() {
this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById', {id: this.zqaId}, { this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById', {
id: this.zqaId,
page: this.page,
Size: this.Size
}, {
_this: this _this: this
}, res => { }, res => {
this.sarAccessInfoList = res.data this.sarAccessInfoList = res.data
@@ -1768,6 +1845,8 @@ export default {
}, },
mounted () { mounted () {
this.zqaId =this.$route.query.id; this.zqaId =this.$route.query.id;
this.page = this.$route.query.page
this.Size = this.$route.query.Size
// this.getData() // this.getData()
this.getDept() this.getDept()
// 从数据库中查询各下拉框数据 // 从数据库中查询各下拉框数据
@@ -1787,7 +1866,7 @@ export default {
this.ROLELIST = res.data.ROLELIST this.ROLELIST = res.data.ROLELIST
this.GXHBQOptions = res.data.GXHBQXX this.GXHBQOptions = res.data.GXHBQXX
this.askNatureOptions = res.data.ACCESSTYPE this.askNatureOptions = res.data.ACCESSTYPE
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrbmOptions = res.data.ZRBMCLASS || [] // 责任部门
this.categoryOptions = res.data.NYLXCLASS // 能源类型 this.categoryOptions = res.data.NYLXCLASS // 能源类型
this.textStatusOptions = res.data.WBZTCLASS this.textStatusOptions = res.data.WBZTCLASS
this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线 this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
@@ -13,24 +13,6 @@
<el-form-item label="项目名称" prop="projectName" class="search-item"> <el-form-item label="项目名称" prop="projectName" class="search-item">
<el-input v-model="sarAccessEO.projectName" :disabled="disabledFlag" placeholder="请输入"></el-input> <el-input v-model="sarAccessEO.projectName" :disabled="disabledFlag" placeholder="请输入"></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item label="适用领域" prop="applicationScope" class="search-item">
<el-select
v-model="sarAccessEO.applicationScope"
multiple
placeholder="请选择"
filterable
:disabled="disabledFlag"
class="wx-resolve"
>
<el-option
v-for="item in applyOptions"
:value="item.value"
:key="item.value"
:label="item.label"
>
</el-option>
</el-select>
</el-form-item>-->
<br/><br/> <br/><br/>
<el-form-item label="清单说明" prop="remark" class="search-item max-search-item2"> <el-form-item label="清单说明" prop="remark" class="search-item max-search-item2">
<el-input <el-input
@@ -83,9 +65,9 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('m.keywords')" class="search-item"> <el-form-item label="标准名称" v-if="sarAccessInfoSearch.dataSource !== 'TEMP'" class="search-item">
<el-input <el-input
v-model="sarAccessInfoSearch.keywords" v-model="sarAccessInfoSearch.standName"
placeholder="请输入" placeholder="请输入"
:maxlength="100" :maxlength="100"
></el-input> ></el-input>
@@ -110,21 +92,6 @@
></el-option> ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="国家/地区" class="search-item" v-show="isListType">
<el-select
v-model="sarAccessInfoSearch.countryArea"
placeholder="请选择"
filterable
>
<el-option
v-for="item in drawerCountryOptions"
:value="item.value"
:key="item.value"
:label="item.label"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="清单名称" prop="detailedListName" class="search-item" v-show="isListType"> <el-form-item label="清单名称" prop="detailedListName" class="search-item" v-show="isListType">
<el-input <el-input
v-model="sarAccessInfoSearch.detailedListName" v-model="sarAccessInfoSearch.detailedListName"
@@ -148,7 +115,11 @@
@click="clearSearchLaws">清空</el-button> @click="clearSearchLaws">清空</el-button>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" class="common-button-primary" size="mini" @click="selectMoreBtn"> <el-button type="primary" v-if="showSelectBox" class="common-button-primary" size="mini" @click="selectMoreBtn">
<i class="iconfont">&#xe7a5;</i>
高级查询
</el-button>
<el-button type="primary" v-if="!showSelectBox" class="common-button-primary" size="mini" @click="selectMoreBtn">
<i class="iconfont">&#xe7a5;</i> <i class="iconfont">&#xe7a5;</i>
高级查询 高级查询
</el-button> </el-button>
@@ -156,6 +127,58 @@
</el-form> </el-form>
</div> </div>
</div> </div>
<div class="showSelectBox" v-if="!showSelectBox">
<el-form :model="sarAccessInfoSearch" class="label-input-form" label-width="70px" v-if="!disabledFlag" inline>
<el-form-item label="文本状态" v-show="!isListType">
<el-select
v-model="sarAccessInfoSearch.textStatus"
placeholder="请选择"
filterable
size="small"
>
<el-option
v-for="item in textStatusOptions"
:value="item.value"
:key="item.value"
:label="item.label"
/>
</el-select>
</el-form-item>
<el-form-item label="发布日期" v-show="!isListType">
<el-date-picker
v-model="sarAccessInfoSearch.issueTime"
type="date"
value-format="yyyy-MM-DD"
size="small"
placeholder="选择发布日期">
</el-date-picker>
</el-form-item>
<el-form-item label="项目名称" v-show="isListType">
<el-input
size="small"
v-model="sarAccessInfoSearch.standSystem"
placeholder="请输入"
:maxlength="100"
></el-input>
</el-form-item>
<el-form-item label="更新人" v-show="isListType">
<el-input
v-model="sarAccessInfoSearch.standName"
placeholder="请输入"
:maxlength="100"
size="small"/>
</el-form-item>
<el-form-item label="更新时间" v-show="isListType">
<el-date-picker
v-model="sarAccessInfoSearch.modifyTime"
type="date"
size="small"
value-format="yyyy-MM-DD"
placeholder="选择更新日期">
</el-date-picker>
</el-form-item>
</el-form>
</div>
<div class="action-bar"> <div class="action-bar">
<el-button <el-button
class="common-button-default" class="common-button-default"
@@ -344,18 +367,12 @@
align="center" align="center"
width="180px" width="180px"
label="适用车型"> label="适用车型">
<template slot-scope="scope">
<span>{{ typeApplicableMap[scope.row.typeApplicable] }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="nylx" prop="nylx"
align="center" align="center"
width="180px" width="180px"
label="能源类型"> label="能源类型">
<template slot-scope="scope">
<span>{{ nylxMap[scope.row.nylx] }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="putTime" prop="putTime"
@@ -391,9 +408,6 @@
width="210px" width="210px"
align="center" align="center"
label="责任部门"> label="责任部门">
<template slot-scope="scope">
<span>{{ zrbmMap[scope.row.zrbm] }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
@@ -401,9 +415,6 @@
width="180px" width="180px"
align="center" align="center"
label="适用产品线"> label="适用产品线">
<template slot-scope="scope">
<span>{{ sycpxMap[scope.row.sycpx] }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
@@ -433,7 +444,7 @@
width="210px" width="210px"
label="卡车VPPS中文名称"> label="卡车VPPS中文名称">
</el-table-column> </el-table-column>
<el-table-column width="150"> <el-table-column width="150" align="center" label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
class="common-button-default" class="common-button-default"
@@ -506,6 +517,8 @@ import CustomInputForPolicy from '@/components/CustomFormComponents/InputForPoli
import CustomRoleTree from '@/components/CustomFormComponents/roleTree' import CustomRoleTree from '@/components/CustomFormComponents/roleTree'
import stand from "../../../config/pages/attributeCustom/components/stand"; import stand from "../../../config/pages/attributeCustom/components/stand";
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import {interfaceUrl} from "@/sysConfig";
import {dicTypeData} from "@/api/unqualProcess";
export default { export default {
name: 'OtherAddEit', name: 'OtherAddEit',
components: { components: {
@@ -529,32 +542,12 @@ export default {
CustomRoleTree CustomRoleTree
}, },
data () { data () {
// let validatePass = (rule, value, callback) => {
// let list = []
// //sarAccessInfoListADMIN
// if (this.sarAccessInfoListADMIN.length > 0) {
// for (let a = 0; a < this.sarAccessInfoListADMIN.length;a++) {
// list.push(this.sarAccessInfoListADMIN[a].code)
// }
// }
// if (this.sarAccessInfoList.length > 0) {
// for (let b = 0; b < this.sarAccessInfoList.length;b++) {
// list.push(this.sarAccessInfoList[b].code)
// }
// }
// for (let c = 0; c < list.length; c++) {
// if (value === list[c]) {
// callback(new Error(''))
// }
// }
// }
return { return {
textStatusMap: {}, textStatusMap: {},
typeApplicableMap: {}, typeApplicableMap: {},
nylxMap: {}, nylxMap: {},
zrbmMap: {}, zrbmMap: {},
sycpxMap: {}, sycpxMap: {},
zrbmOptions: [],
selectSearch : [], selectSearch : [],
// //
sarAccessEO: { sarAccessEO: {
@@ -586,15 +579,21 @@ export default {
] ]
}, },
disabledFlag: false, disabledFlag: false,
/** ****************************/
zrbmOptions: [], //
categoryOptions: [], //
energyKindOptions: [], // list
sycpxOptions: [], // 线
applyArcticOptions: [], // list
/** ******************************/
regionOptions: [], // list regionOptions: [], // list
drawerCountryOptions: [], // list drawerCountryOptions: [], // list
applyOptions: [], //list applyOptions: [], //list
applyArcticOptions: [], // list
energyKindOptions: [], // list
accessSarTypeOptions: [], // list accessSarTypeOptions: [], // list
standSortOptions: [], // standSortOptions: [], //
standStateOptions: [], // standStateOptions: [], //
GXHBQOptions: [], // list GXHBQOptions: [], // list
textStatusOptions: [], //
askNatureOptions: [], // list askNatureOptions: [], // list
ROLELIST: [], // ROLELIST: [], //
// list // list
@@ -622,6 +621,7 @@ export default {
}, },
moreSearchBtn: true, // moreSearchBtn: true, //
showTableFlag: true, // showTableFlag: true, //
showSelectBox: true, //
sarAccessInfoSearchList: [], // table sarAccessInfoSearchList: [], // table
importmodalFlag: false, // model importmodalFlag: false, // model
searching: false, searching: false,
@@ -832,9 +832,26 @@ export default {
uuid: '', uuid: '',
} }
}, },
created() {
this.selectLawsStands()
dicTypeData().then(res => {
//
this.zrbmOptions = res.data.ZRBMCLASS
//
this.energyKindOptions = res.data.ENERGYTYPES
// this.categoryOptions = res.data.NYLXCLASS //
//
this.applyArcticOptions = res.data.PRODUCTTYPE
// 线
this.sycpxOptions = res.data.SYCPXCLASS
})
},
methods: { methods: {
// //
selectMoreBtn () { selectMoreBtn () {
this.showSelectBox = !this.showSelectBox
this.showTableFlag = false
this.selectLawsStands()
}, },
// //
getDept () { getDept () {
@@ -1259,19 +1276,7 @@ export default {
_this: this _this: this
}, res =>{ }, res =>{
this.sarAccessInfoSearchList = res.data.list this.sarAccessInfoSearchList = res.data.list
this.sarAccessInfoSearchList.forEach(item => { this.drawerTotal = res.data.list.length
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
})
console.log(this.sarAccessInfoSearchList)
}, e => { }, e => {
}) })
@@ -1283,7 +1288,68 @@ export default {
// table select // table select
sarAccessInfoSearchSelect (val) { sarAccessInfoSearchSelect (val) {
this.selectedAccInfoSearchList = val this.selectedAccInfoSearchList = val
console.log(val) this.selectedAccInfoSearchList.forEach(item => {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
})
this.selectedAccInfoSearchList.forEach(item => {
//
if (item.zrbm !== null || item.zrbm !== "") {
let k = (item.zrbm || "").split(',')
for (let i in this.zrbmOptions) {
for (let m = 0; m< k.length; m++) {
if (this.zrbmOptions[i].value === k[m]) {
k[m] = this.zrbmOptions[i].label
}
item.zrbm = k.join(',')
}
}
}
//
if (item.nylx !== null) {
let k = (item.nylx || "").split(',')
for (let i in this.categoryOptions) {
for (let m = 0; m< k.length; m++) {
if (this.categoryOptions[i].value === k[m]) {
k[m] = this.categoryOptions[i].label
}
item.nylx = k.join(',')
}
}
}
//
if (item.typeApplicable !== null) {
let k = (item.typeApplicable || "").split(',')
for (let i in this.energyKindOptions) {
for (let m = 0; m< k.length; m++) {
if (this.energyKindOptions[i].value === k[m]) {
k[m] = this.energyKindOptions[i].label
}
item.typeApplicable = k.join(',')
}
}
}
// s线
if (item.sycpx !== null) {
let k = (item.sycpx || "").split(',')
for (let i in this.sycpxOptions) {
for (let m = 0; m< k.length; m++) {
if (this.sycpxOptions[i].value === k[m]) {
k[m] = this.sycpxOptions[i].label
}
item.sycpx = k.join(',')
}
}
}
})
}, },
// table select // table select
accessSarTypeSelect (selectData) { accessSarTypeSelect (selectData) {
@@ -1303,8 +1369,12 @@ export default {
}, },
// //
exportAccessInfo (type) { exportAccessInfo (type) {
this.exportTestItemNameFlag = true if (this.sarAccessInfoListArry.length > 0) {
this.exportName = '' this.exportTestItemNameFlag = true
this.exportName = ''
}else {
this.$message.warning('请选择数据进行导出')
}
}, },
// //
exportTestItem () { exportTestItem () {
@@ -1320,7 +1390,9 @@ export default {
for (var accessInfo in exportList) { for (var accessInfo in exportList) {
accIdAndrestype.push(exportList[accessInfo].id) accIdAndrestype.push(exportList[accessInfo].id)
} }
window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
window.open(exportURL)
// window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames
this.$message.success('导出信息成功') this.$message.success('导出信息成功')
} else { } else {
this.$message.warning('当前没有需要导出的数据') this.$message.warning('当前没有需要导出的数据')
@@ -1728,7 +1800,11 @@ export default {
return formatText(str) return formatText(str)
}, },
getData() { getData() {
this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById', {id: this.zqaId}, { this.$http.get('sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById', {
id: this.zqaId,
page: this.page,
Size: this.Size
}, {
_this: this _this: this
}, res => { }, res => {
this.sarAccessInfoList = res.data this.sarAccessInfoList = res.data
@@ -1769,6 +1845,8 @@ export default {
}, },
mounted () { mounted () {
this.zqaId =this.$route.query.id; this.zqaId =this.$route.query.id;
this.page = this.$route.query.page
this.Size = this.$route.query.Size
//this.getData() //this.getData()
this.getDept() this.getDept()
// //
@@ -3,6 +3,10 @@
<div id="domesticStandardDatabase" :class="{ 'tree-close': sideClose }" class="demo-spin-article v-class"> <div id="domesticStandardDatabase" :class="{ 'tree-close': sideClose }" class="demo-spin-article v-class">
<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"
@@ -11,6 +15,7 @@
: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)">
@@ -116,7 +121,7 @@
<el-button class="common-button-default export-button" <el-button class="common-button-default export-button"
@click="exportStandard()" @click="exportStandard()"
size="mini" size="mini"
v-btn-permission="'84035c53f4e7c3e2f343a83e6c6e291d'" v-btn-permission="'b17f1d035219c47344032e261342d87d'"
title="不勾选时默认导出所有筛选项;勾选时仅导出勾选项"><i class="iconfont">&#xe6e9;</i>导出</el-button> title="不勾选时默认导出所有筛选项;勾选时仅导出勾选项"><i class="iconfont">&#xe6e9;</i>导出</el-button>
<el-button class="common-button-default delete-button" <el-button class="common-button-default delete-button"
:loading="delLoading" :loading="delLoading"
@@ -439,6 +444,7 @@
<custom-input-for-standards <custom-input-for-standards
:key="field.attrField" :key="field.attrField"
:config="field" :config="field"
:class="field.attrField === 'BYYBJ' ? 'classDisplay' : ''"
v-model="sarStandardsInfoEO[field.attrField]" v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag" :disabled="formdisableflag"
></custom-input-for-standards> ></custom-input-for-standards>
@@ -449,7 +455,7 @@
label-width="150px" label-width="150px"
class="add-form-item" class="add-form-item"
> >
<template slot="label">乘用车VPPS编码</template> <template slot="label">关联模块--乘用车VPPS编码</template>
<el-input v-model="sarStandardsInfoEO.CYCVPPSBM" placeholder="选择乘用车VPPS编码" @click.native="choiceZRR2('cycvppsbm', '乘用车VPPS', sarStandardsInfoEO.cycvppsbm)"></el-input> <el-input v-model="sarStandardsInfoEO.CYCVPPSBM" placeholder="选择乘用车VPPS编码" @click.native="choiceZRR2('cycvppsbm', '乘用车VPPS', sarStandardsInfoEO.cycvppsbm)"></el-input>
</el-form-item> </el-form-item>
</template> </template>
@@ -459,7 +465,7 @@
label-width="150px" label-width="150px"
class="add-form-item" class="add-form-item"
> >
<template slot="label">卡车VPPS编码</template> <template slot="label">关联模块--卡车VPPS编码</template>
<el-input v-model="sarStandardsInfoEO.KCCVPPSBM" placeholder="选择卡车VPPS编码" @click.native="choiceZRR3('kccvppsbm', '卡车VPPS', sarStandardsInfoEO.kccvppsbm)"></el-input> <el-input v-model="sarStandardsInfoEO.KCCVPPSBM" placeholder="选择卡车VPPS编码" @click.native="choiceZRR3('kccvppsbm', '卡车VPPS', sarStandardsInfoEO.kccvppsbm)"></el-input>
</el-form-item> </el-form-item>
</template> </template>
@@ -521,7 +527,8 @@
:key="field.attrField" :key="field.attrField"
:config="field" :config="field"
v-model="sarStandardsInfoEO[field.attrField]" v-model="sarStandardsInfoEO[field.attrField]"
:disabled="field.attrName === '在产车实施日期(国家)' || field.attrName === '新车型实施日期(国家)'|| field.attrName === '实施日期(国际)' || formdisableflag" :disabled="formdisableflag"
:class="field.attrName === '在产车实施日期(国家)' || field.attrName === '新车型实施日期(国家)'|| field.attrName === '实施日期(国际)' ? 'classDisplay' : ''"
></custom-date-pick> ></custom-date-pick>
</template> </template>
<template v-else-if="field.attrType === 'FILE'"> <template v-else-if="field.attrType === 'FILE'">
@@ -803,6 +810,9 @@
label="标准号" label="标准号"
align="center" align="center"
> >
<template slot-scope="scope">
<span>{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standName" prop="standName"
@@ -1282,6 +1292,7 @@ export default {
}, },
data () { data () {
return { return {
filterText: '', //
props: { props: {
label: 'menuName', label: 'menuName',
children: 'children' children: 'children'
@@ -1291,6 +1302,8 @@ export default {
children: 'children', children: 'children',
label: 'menuName' label: 'menuName'
}, },
id: '', // id
collectId: '', // id
modalShowFlag1: false, // drawer modalShowFlag1: false, // drawer
modalShowFlag2: false, // drawer modalShowFlag2: false, // drawer
modalShowFlag3: false, // drawer modalShowFlag3: false, // drawer
@@ -1432,10 +1445,10 @@ export default {
assemClassOptions: [], // assemClassOptions: [], //
qcdwOptions: [], // qcdwOptions: [], //
nylxOptions: [], // nylxOptions: [], //
sycpxOptions: [], // 线 // sycpxOptions: [], // 线
syzrOptions: [], // syzrOptions: [], //
zrbmOptions: [], // // zrbmOptions: [], //
zrgcsOptions: [], // // zrgcsOptions: [], //
standAttributeList: [], standAttributeList: [],
sarStandardsSearch: { sarStandardsSearch: {
page: 1, page: 1,
@@ -1465,7 +1478,7 @@ export default {
standNature: '', // standNature: '', //
putTime: '', // putTime: '', //
isRelateAccess: '', // isRelateAccess: '', //
nameShow: '', // // nameShow: '', //
qcdw: '', // qcdw: '', //
nameShow: '', // nameShow: '', //
ZCCTime: '', // ZCCTime: '', //
@@ -1764,17 +1777,17 @@ export default {
], ],
standYear: [ standYear: [
{required: true, message: '标准年份不能为空', trigger: 'change'}, {required: true, message: '标准年份不能为空', trigger: 'change'},
{validator: this.verify.testItemCode, trigger: 'change'}, {validator: this.verify.testNumberCode, trigger: 'change'},
{type: 'string', max: 20, message: '标准年份不能超过20个字符', trigger: 'change'} {type: 'string', max: 100, message: '标准年份不能超过100个字符', trigger: 'change'}
], ],
standName: [ standName: [
{required: true, message: '中文名称不能为空', trigger: 'change'}, {required: true, message: '中文名称不能为空', trigger: 'change'},
{type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'} {type: 'string', max: 500, message: '中文名称不能超过500个字符', trigger: 'change'}
], ],
// standEnName: [ standEnName: [
// {required: true, message: '', trigger: 'change'}, {required: false, message: '英文名称不能为空', trigger: 'change'},
// {type: 'string', max: 1000, message: '1000', trigger: 'change'} {type: 'string', max: 500, message: '英文名称不能超过500个字符', trigger: 'change'}
// ], ],
// isRelateAccess: [ // isRelateAccess: [
// { required: true, message: '', trigger: 'change' } // { required: true, message: '', trigger: 'change' }
// ], // ],
@@ -1792,7 +1805,7 @@ export default {
standNumber: [ standNumber: [
{required: true, type: 'string', message: '标准编号不能为空', trigger: 'change'}, {required: true, type: 'string', message: '标准编号不能为空', trigger: 'change'},
{type: 'string', max: 100, message: '标准编号不能超过100个字符', trigger: 'change'}, {type: 'string', max: 100, message: '标准编号不能超过100个字符', trigger: 'change'},
{type: 'string', validator: this.verify.validateStandardItem, trigger: 'change'} { validator: this.verify.validateStandardItem, trigger: 'change'}
], ],
standYear: [ standYear: [
{required: true, message: '标准年份不能为空', trigger: 'change'}, {required: true, message: '标准年份不能为空', trigger: 'change'},
@@ -1804,7 +1817,7 @@ export default {
{type: 'string', max: 500, message: '标准名称不能超过500个字符', trigger: 'change'} {type: 'string', max: 500, message: '标准名称不能超过500个字符', trigger: 'change'}
], ],
standEnName: [ standEnName: [
{type: 'string', max: 1000, message: '标准英文名称不能超过1000个字符', trigger: 'change'}, {type: 'string', max: 500, message: '标准英文名称不能超过500个字符', trigger: 'change'},
{validator: this.verify.valiateEnName, trigger: 'blur'} {validator: this.verify.valiateEnName, trigger: 'blur'}
], ],
synopsis: [ synopsis: [
@@ -1914,7 +1927,9 @@ export default {
synopsis: '', synopsis: '',
// replaceStandNumCope: '', // replaceStandNumCope: '',
replacedStandNum: '', replacedStandNum: '',
orderBy:'' orderBy:'',
nowOrder: '',
nowOrderBy: '',
}, // }, //
configStandList: [], configStandList: [],
configStandtotal: 0, configStandtotal: 0,
@@ -1930,10 +1945,22 @@ export default {
delLoading: false, delLoading: false,
standState: '', standState: '',
orderBy :'', orderBy :'',
nowOrder: '',
nowOrderBy: '',
textStatusMap: {} // idname textStatusMap: {} // idname
} }
}, },
watch: {
filterText(val) {
this.$refs.tree.filter(val);
}
},
methods: { methods: {
//
filterNode(value, data) {
if (!value) return true;
return data.menuName.indexOf(value) !== -1;
},
choiceZRR1 (type, title, id) { choiceZRR1 (type, title, id) {
this.drawerTitle = title this.drawerTitle = title
this.modalShowFlag1 = true this.modalShowFlag1 = true
@@ -2254,6 +2281,8 @@ export default {
}, },
// //
selectStandardPro (item, state) { selectStandardPro (item, state) {
this.id = item.id
this.collectId = item.collectId
this.addOrUPdateFlag = 2 this.addOrUPdateFlag = 2
this.modalshowtitle = '编辑国内标准' this.modalshowtitle = '编辑国内标准'
this.modalshowflag = true this.modalshowflag = true
@@ -2261,8 +2290,11 @@ export default {
this.$nextTick(() => { this.$nextTick(() => {
Promise.all([this.queryDisplayLocation()]).then((values) => { Promise.all([this.queryDisplayLocation()]).then((values) => {
const [displayLocation] = values const [displayLocation] = values
console.log(this.formFieldList, 'assssssssssss')
console.log(item, 'itemitemitemitem')
const formFieldList = this.formFieldList const formFieldList = this.formFieldList
this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item)) this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item))
console.log(item.attrInfoCaseMap, 'gggg大大大滴滴答答')
if(this.sarStandardsInfoEO.standSystem){ if(this.sarStandardsInfoEO.standSystem){
this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem]; this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem];
} }
@@ -2273,10 +2305,9 @@ export default {
} }
Object.keys(item.attrInfoMap || {}).forEach((key) => { Object.keys(item.attrInfoMap || {}).forEach((key) => {
if (item.attrInfoMap[key]) { if (item.attrInfoMap[key]) {
this.$set(this.sarStandardsInfoEO, key, item.attrInfoMap[key]) this.$set(this.sarStandardsInfoEO, key, item.attrInfoMap[key] === '[]' ? '' : item.attrInfoMap[key])
} }
}) })
const dynamicFormField = this.sarStandardsInfoEO const dynamicFormField = this.sarStandardsInfoEO
this.sarStandardsInfoEO.EOPSSRQ = this.$moment(this.sarStandardsInfoEO.EOPSSRQ).isValid() ? this.$moment(this.sarStandardsInfoEO.EOPSSRQ) : this.sarStandardsInfoEO.EOPSSRQ this.sarStandardsInfoEO.EOPSSRQ = this.$moment(this.sarStandardsInfoEO.EOPSSRQ).isValid() ? this.$moment(this.sarStandardsInfoEO.EOPSSRQ) : this.sarStandardsInfoEO.EOPSSRQ
this.sarStandardsInfoEO['id'] = item.id this.sarStandardsInfoEO['id'] = item.id
@@ -2697,16 +2728,55 @@ export default {
}, },
// //
sortChange (sortObj) { sortChange (sortObj) {
console.log(sortObj, '升降序')
if (sortObj.column.order !== 'normal') { if (sortObj.column.order !== 'normal') {
switch (sortObj.column.property) { switch (sortObj.prop) {
case 'issueTime' : case 'issueTime' :
// //
this.orderBy = 'issueTime ' + sortObj.order if(sortObj.order === null) {
break this.nowOrderBy = ''
} else {
this.nowOrderBy = '1'
}
break;
case 'xcxssrq' :
//
if(sortObj.order === null) {
this.nowOrderBy = ''
} else {
this.nowOrderBy = '2'
}
break;
case 'zccssrq' :
//
if(sortObj.order === null) {
this.nowOrderBy = ''
} else {
this.nowOrderBy = '3'
}
break;
case 'textStatus' :
//
if(sortObj.order === null) {
this.nowOrderBy = ''
} else {
this.nowOrderBy = '4'
}
break;
}
switch (sortObj.order) {
case 'ascending' :
this.nowOrder = '2'
break;
case 'descending' :
this.nowOrder = '1'
break;
default:
this.nowOrder = ''
break;
} }
} }
this.getDomesticStandardTable(this.tableFlag) this.getDomesticStandardTable(this.tableFlag)
}, },
// //
standSelectChange (data) { standSelectChange (data) {
@@ -3052,7 +3122,7 @@ export default {
const value = nowstandinfo[item.attrField] const value = nowstandinfo[item.attrField]
// //
if (item.attrType === 'DATE_PICKER' && value) { if (item.attrType === 'DATE_PICKER' && value) {
nowstandinfo[item.attrField] = this.$dateFormat(this.sarStandardsInfoEO[item.attrField], 'yyyy-MM-dd hh:mm:ss') nowstandinfo[item.attrField] = this.sarStandardsInfoEO[item.attrField]
} }
// //
if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') { if (item.attrType === 'SEL_OPTION' || item.attrType === 'SEL_OPTS') {
@@ -3063,11 +3133,22 @@ export default {
sarStandAttrObj[item.attrField] = nowstandinfo[item.attrField] sarStandAttrObj[item.attrField] = nowstandinfo[item.attrField]
}) })
nowstandinfo['sarStandAttrEOStr'] = JSON.stringify(sarStandAttrObj).replace(/"/g, "'") nowstandinfo['sarStandAttrEOStr'] = JSON.stringify(sarStandAttrObj).replace(/"/g, "'")
console.log(nowstandinfo, '提交参数')
this.$http.postData(this.addOrUPdateFlag === 1 ? 'sarStandardsInfo/sar-standards-info/addarStandardsInfo' : 'sarStandardsInfo/sar-standards-info/updateSarStandardsInfo', nowstandinfo, { this.$http.postData(this.addOrUPdateFlag === 1 ? 'sarStandardsInfo/sar-standards-info/addarStandardsInfo' : 'sarStandardsInfo/sar-standards-info/updateSarStandardsInfo', nowstandinfo, {
_this: this _this: this
}, res => { }, res => {
this.isSubmit = false this.isSubmit = false
if (res.ok) { if (res.ok) {
this.personCollect.collectType = 'INLAND_STAND'
this.personCollect.id = this.id
this.personCollect.collectResId = this.collectId
this.personCollect.collectTitle = this.sarStandardsInfoEO.standName + '(编号:'+this.sarStandardsInfoEO.standSort + this.sarStandardsInfoEO.standNumber + this.sarStandardsInfoEO.standYear +')'
this.personCollect.userId = this.$store.getters.userInfo.userId
this.$http.putData('person/personCollect/updatePersonCollect', this.personCollect, {
_this: this,
loading: 'loading'
}, res => {
}, e => {})
this.getDomesticStandardTable(this.tableFlag) this.getDomesticStandardTable(this.tableFlag)
this.resetForm() this.resetForm()
if (this.addOrUPdateFlag === 1) { if (this.addOrUPdateFlag === 1) {
@@ -3125,7 +3206,9 @@ export default {
} }
// //
formData.orderBy = this.orderBy formData.nowOrder = this.nowOrder
formData.nowOrderBy = this.nowOrderBy
// formData.orderBy = this.orderBy
// //
if (this.selectSarMenu.id === 'wdsc') { if (this.selectSarMenu.id === 'wdsc') {
formData.menuId = undefined formData.menuId = undefined
@@ -3140,6 +3223,7 @@ export default {
formData.collectMenuId = undefined formData.collectMenuId = undefined
} }
formData.standType = 'INLAND' formData.standType = 'INLAND'
formData.userId = this.$store.getters.userInfo.userId
this.SarExportSearchEo = formData this.SarExportSearchEo = formData
this.loading = true this.loading = true
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, { this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, {
@@ -3186,6 +3270,7 @@ export default {
} }
this.sarConfigStandSearch.page = this.configPage this.sarConfigStandSearch.page = this.configPage
// this.sarConfigStandSearch.pageSize = this.configRows // this.sarConfigStandSearch.pageSize = this.configRows
this.sarConfigStandSearch.userId = this.$store.getters.userInfo.userId
this.sarConfigStandSearch.pageSize = this.$store.getters.userInfo.configContent this.sarConfigStandSearch.pageSize = this.$store.getters.userInfo.configContent
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarConfigStandSearch, { this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.sarConfigStandSearch, {
_this: this, _this: this,
@@ -3350,6 +3435,7 @@ export default {
this.quoteIdList1 = [] this.quoteIdList1 = []
this.replaceStandNumForm.quoteIdList = '' this.replaceStandNumForm.quoteIdList = ''
} }
this.replaceStandNumForm.userId = this.$store.getters.userInfo.userId
// if (this.sarStandardsInfoEO.replaceStandNumId !== null && this.sarStandardsInfoEO.replaceStandNumId !== '') { // if (this.sarStandardsInfoEO.replaceStandNumId !== null && this.sarStandardsInfoEO.replaceStandNumId !== '') {
// this.replaceStandNumForm.quoteIdList = this.sarStandardsInfoEO.replaceStandNumId.toString() // this.replaceStandNumForm.quoteIdList = this.sarStandardsInfoEO.replaceStandNumId.toString()
// (this.replaceStandNumForm.quoteIdList) // (this.replaceStandNumForm.quoteIdList)
@@ -3586,6 +3672,7 @@ export default {
if (this.sarStandardsInfoEO.lawsExplainQuote !== null && this.sarStandardsInfoEO.lawsExplainQuote !== '') { if (this.sarStandardsInfoEO.lawsExplainQuote !== null && this.sarStandardsInfoEO.lawsExplainQuote !== '') {
this.lawsExplainQuoteForm.quoteIdList = this.sarStandardsInfoEO.lawsExplainQuote.toString() this.lawsExplainQuoteForm.quoteIdList = this.sarStandardsInfoEO.lawsExplainQuote.toString()
} }
this.sarStandardsInfoEO.userId = this.$store.getters.userInfo.userId
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.lawsExplainQuoteForm, { this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', this.lawsExplainQuoteForm, {
_this: this, _this: this,
loading: 'lawsExplainQuoteFormLoading' loading: 'lawsExplainQuoteFormLoading'
@@ -3828,12 +3915,47 @@ export default {
switch (sortObj.prop) { switch (sortObj.prop) {
case 'issueTime' : case 'issueTime' :
// //
this.sarConfigStandSearch.orderBy = 'issueTime ' + sortObj.order if(sortObj.order === null) {
break this.sarConfigStandSearch.nowOrderBy = ''
case 'XCXSSRQ' : } else {
this.sarConfigStandSearch.nowOrderBy = '1'
}
break;
case 'xcxssrq' :
// //
this.sarConfigStandSearch.orderBy = 'XCXSSRQ ' + sortObj.order if(sortObj.order === null) {
break this.sarConfigStandSearch.nowOrderBy = ''
} else {
this.sarConfigStandSearch.nowOrderBy = '2'
}
break;
case 'zccssrq' :
//
if(sortObj.order === null) {
this.sarConfigStandSearch.nowOrderBy = ''
} else {
this.sarConfigStandSearch.nowOrderBy = '3'
}
break;
case 'textStatus' :
if(sortObj.order === null) {
this.sarConfigStandSearch.nowOrderBy = ''
} else {
this.sarConfigStandSearch.nowOrderBy = '4'
}
//
break;
}
switch (sortObj.order) {
case 'ascending' :
this.sarConfigStandSearch.nowOrder = '2'
break;
case 'descending' :
this.sarConfigStandSearch.nowOrder = '1'
break;
default:
this.sarConfigStandSearch.nowOrder = ''
break;
} }
} }
this.selectConfiguraStand() this.selectConfiguraStand()
@@ -4067,10 +4189,14 @@ export default {
rules.issueTime = [{required: false, message: '发布日期不能为空', trigger: 'change'}] rules.issueTime = [{required: false, message: '发布日期不能为空', trigger: 'change'}]
} }
if (item.attrLen && item.attrType !== 'INPUT_NUM' && item.attrType !== 'DATE_PICKER' && item.attrType !== 'SEL_OPTION' && item.attrType !== 'SEL_OPTS' && item.attrType !== 'DATE_PIC_OPTS') { if (item.attrLen && item.attrType !== 'INPUT_NUM' && item.attrType !== 'DATE_PICKER' && item.attrType !== 'SEL_OPTION' && item.attrType !== 'SEL_OPTS' && item.attrType !== 'DATE_PIC_OPTS') {
rule.push({type: 'string', max: item.attrLen, message: `${item.attrName}不能超过${item.attrLen}个字符`, trigger: 'blur'}) if (item.attrField === 'DTBJH' || item.attrField === 'YYBJ') {
rule.push({type: 'string', max: 100, message: `${item.attrName}不能超过100个字符`, trigger: 'blur'})
} else {
rule.push({type: 'string', max: item.attrLen, message: `${item.attrName}不能超过${item.attrLen}个字符`, trigger: 'blur'})
}
} }
if (item.attrField === 'DTBJH' || item.attrField === 'YYBJ' || item.attrField === 'BYYBJ' || item.attrField === 'CBBH') { if (item.attrField === 'DTBJH' || item.attrField === 'YYBJ' || item.attrField === 'BYYBJ' || item.attrField === 'CBBH') {
rule.push({type: 'string', validator: this.verify.validateStandardItem, trigger: 'blur'}) rule.push({ validator: this.verify.validateStandardItem, trigger: 'blur'})
} }
if (rule.length > 0) { if (rule.length > 0) {
rules[item.attrField] = rule rules[item.attrField] = rule
@@ -4501,5 +4627,7 @@ export default {
.el-date-editor.el-input, .el-date-editor.el-input__inner{ .el-date-editor.el-input, .el-date-editor.el-input__inner{
width: 190px width: 190px
} }
.classDisplay{
display: none;
}
</style> </style>
@@ -3,6 +3,10 @@
<div id="foreignStandardsAndRegulations" :class="{ 'tree-close': sideClose }" class="demo-spin-article v-class"> <div id="foreignStandardsAndRegulations" :class="{ 'tree-close': sideClose }" class="demo-spin-article v-class">
<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"
@@ -11,6 +15,7 @@
: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)">
@@ -499,6 +504,7 @@
:config="field" :config="field"
v-model="sarStandardsInfoEO[field.attrField]" v-model="sarStandardsInfoEO[field.attrField]"
:disabled="formdisableflag" :disabled="formdisableflag"
:class="field.attrField === 'BYYBJ' ? 'classDisplay' : ''"
:data-source-from="field.attrField === 'CBBH' ? 'ALL' : 'INLAND'" :data-source-from="field.attrField === 'CBBH' ? 'ALL' : 'INLAND'"
:data-source="field.attrField === 'CBBH'" :data-source="field.attrField === 'CBBH'"
></custom-input-for-standards> ></custom-input-for-standards>
@@ -509,7 +515,7 @@
label-width="150px" label-width="150px"
class="add-form-item" class="add-form-item"
> >
<template slot="label">乘用车VPPS编码</template> <template slot="label">关联模块--乘用车VPPS编码</template>
<el-input v-model="sarStandardsInfoEO.CYCVPPSBM" placeholder="选择乘用车VPPS编码" @click.native="choiceZRR2('cycvppsbm', '乘用车VPPS', sarStandardsInfoEO.cycvppsbm)"></el-input> <el-input v-model="sarStandardsInfoEO.CYCVPPSBM" placeholder="选择乘用车VPPS编码" @click.native="choiceZRR2('cycvppsbm', '乘用车VPPS', sarStandardsInfoEO.cycvppsbm)"></el-input>
</el-form-item> </el-form-item>
</template> </template>
@@ -519,7 +525,7 @@
label-width="150px" label-width="150px"
class="add-form-item" class="add-form-item"
> >
<template slot="label">卡车VPPS编码</template> <template slot="label">关联模块--卡车VPPS编码</template>
<el-input v-model="sarStandardsInfoEO.KCCVPPSBM" placeholder="选择卡车VPPS编码" @click.native="choiceZRR3('kccvppsbm', '卡车VPPS', sarStandardsInfoEO.kccvppsbm)"></el-input> <el-input v-model="sarStandardsInfoEO.KCCVPPSBM" placeholder="选择卡车VPPS编码" @click.native="choiceZRR3('kccvppsbm', '卡车VPPS', sarStandardsInfoEO.kccvppsbm)"></el-input>
</el-form-item> </el-form-item>
</template> </template>
@@ -580,6 +586,7 @@
:key="field.attrField" :key="field.attrField"
:config="field" :config="field"
v-model="sarStandardsInfoEO[field.attrField]" v-model="sarStandardsInfoEO[field.attrField]"
:class="field.attrName === '在产车实施日期(国家)' || field.attrName === '新车型实施日期(国家)'|| field.attrName === '实施日期(国际)' ? 'classDisplay' : ''"
:disabled="formdisableflag" :disabled="formdisableflag"
></custom-date-pick> ></custom-date-pick>
</template> </template>
@@ -1739,14 +1746,23 @@ export default {
displayLocation: [], displayLocation: [],
orgData: [], orgData: [],
delLoading: false, delLoading: false,
standState: '' standState: '',
filterText: ''
} }
}, },
props: { props: {
}, },
watch: { watch: {
filterText(val) {
this.$refs.tree.filter(val);
}
}, },
methods: { methods: {
//
filterNode(value, data) {
if (!value) return true;
return data.menuName.indexOf(value) !== -1;
},
choiceZRR2 (type, title, id) { choiceZRR2 (type, title, id) {
this.drawerTitle = title this.drawerTitle = title
this.modalShowFlag2 = true this.modalShowFlag2 = true
@@ -2046,7 +2062,7 @@ export default {
Promise.all([this.queryDisplayLocation()]).then((values) => { Promise.all([this.queryDisplayLocation()]).then((values) => {
const [displayLocation] = values const [displayLocation] = values
const formFieldList = this.formFieldList const formFieldList = this.formFieldList
console.log(formFieldList) console.log(formFieldList, 'AAAAAAAAAAAAAAAAAAAAA')
this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item)) this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item))
this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem]; this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem];
this.sarStandardsInfoEO.standSort = item.standSort this.sarStandardsInfoEO.standSort = item.standSort
@@ -4256,5 +4272,8 @@ export default {
border-radius: 0 !important; border-radius: 0 !important;
} }
} }
.classDisplay{
display: none;
}
} }
</style> </style>
@@ -30,10 +30,11 @@
</div> </div>
</el-card> </el-card>
<div class="action-bar"> <div class="action-bar">
<el-button plain class="common-button-primary" size="mini" @click="addList">调取</el-button> <el-button plain class="common-button-primary" v-btn-permission="''" size="mini" @click="addList">调取</el-button>
<el-button plain class="common-button-primary" size="mini" @click="deleteList">批量删除</el-button> <el-button plain class="common-button-primary" v-btn-permission="''" size="mini" @click="deleteList">批量删除</el-button>
<el-button class="common-button-default export-button" <el-button class="common-button-default export-button"
size="mini" @click="exportStandard" size="mini" @click="exportStandard"
v-btn-permission="''"
title="不勾选时默认导出所有筛选项;勾选时仅导出勾选项" title="不勾选时默认导出所有筛选项;勾选时仅导出勾选项"
icon="export" icon="export"
>导出</el-button> >导出</el-button>
@@ -107,6 +107,13 @@
:maxlength="100" :maxlength="100"
clearable></el-input> clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="项目编号" class="search-item search-item-last">
<el-input
v-model="sarProStateEO.standId"
placeholder="根据项目编号查找"
:maxlength="100"
clearable></el-input>
</el-form-item>
<el-form-item class="search-item btn-box"> <el-form-item class="search-item btn-box">
<el-button <el-button
type="primary" type="primary"
@@ -290,7 +297,8 @@ export default {
page: 1, page: 1,
pageSize: this.$store.getters.userInfo.configContent, pageSize: this.$store.getters.userInfo.configContent,
sarProStateEO: { sarProStateEO: {
productName: '' productName: '',
standId: ''
}, },
sarProStateTotal: 0, sarProStateTotal: 0,
sarProStateTotalPage: 1, sarProStateTotalPage: 1,
@@ -338,7 +346,7 @@ export default {
}, // }, //
querySarProStateZero () { querySarProStateZero () {
var form = this.sarProStateEO var form = this.sarProStateEO
form.standId = this.standId // form.standId = this.standId
form.current = this.sarProStateTotalPage form.current = this.sarProStateTotalPage
form.size = this.sarProStatePageSize form.size = this.sarProStatePageSize
this.$http.get('sarStandardComplianceAssessResult/product', form, { this.$http.get('sarStandardComplianceAssessResult/product', form, {
@@ -354,11 +362,13 @@ export default {
}, // }, //
clearSearchProState () { clearSearchProState () {
this.sarProStateEO.productName = '' this.sarProStateEO.productName = ''
this.sarProStateEO.standId = ''
this.sarProStateTotalPage = 1 this.sarProStateTotalPage = 1
this.querySarProStateZero() this.querySarProStateZero()
}, // }, //
clearSearchPro () { clearSearchPro () {
this.sarProStateEO.productName = '' this.sarProStateEO.productName = ''
this.sarProStateEO.standId = ''
this.showSarProStateModal = false this.showSarProStateModal = false
this.standId = '' this.standId = ''
}, // }, //
@@ -25,7 +25,7 @@
:maxlength="100"></el-input> :maxlength="100"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="责任部门" class="search-item"> <el-form-item label="责任部门" class="search-item">
<el-input v-model="historySearch.responseUnit" v-show="false" /> <el-input v-model="historySearch.responseUnitShow" v-show="false" />
<el-popover <el-popover
placement="bottom" placement="bottom"
popper-class="user-dept-popper" popper-class="user-dept-popper"
@@ -495,8 +495,19 @@ export default {
}) })
}, },
detailsStandard (item) { detailsStandard (item) {
this.$http.post('lawss/sarTestItem/validateStandNumber', { console.log(item);
standnumber: item.standNum let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
id: item.id,
pageType: 'INLAND_STAND'
// pageType: item.standType + '_STAND'
}
})
window.open(routeUrl.href, '_blank')
// 使
/*this.$http.post('lawss/sarTestItem/validateStandNumber', {
standNumber: item.standId
}, { }, {
_this: this _this: this
}, res => { }, res => {
@@ -510,7 +521,7 @@ export default {
}) })
window.open(routeUrl.href, '_blank') window.open(routeUrl.href, '_blank')
}, e => { }, e => {
}) })*/
}, },
getOrgTreeSource () { getOrgTreeSource () {
this.$http.get('sys/org/getTree', {}, {_this: this}, this.$http.get('sys/org/getTree', {}, {_this: this},
@@ -612,8 +623,9 @@ export default {
// }) // })
// }, // },
treeClickSearch (treeId, treeNode) { treeClickSearch (treeId, treeNode) {
this.historySearch.responseUnit = treeNode.id this.historySearch.responsibleUnit = treeNode.id
this.historySearch.responseUnitShow = treeNode.name this.historySearch.responseUnitShow = treeNode.name
this.$forceUpdate()
}, },
// //
clearAllSearch () { clearAllSearch () {
@@ -621,7 +633,8 @@ export default {
standNumOrName: '', standNumOrName: '',
quesType: '', quesType: '',
productName: '', productName: '',
responseUnit: '' responsibleUnit: '',
responseUnitShow:''
} }
this.getTableBtn() this.getTableBtn()
}, },
@@ -73,6 +73,9 @@
prop="endTime" prop="endTime"
label="征求意见周期" label="征求意见周期"
align="center"> align="center">
<template slot-scope="scope">
{{ scope.row.startTime + ' ~ ' + scope.row.endTime }}
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="startTime" prop="startTime"
@@ -11,7 +11,7 @@
<div v-show="heightShow" class="transition-box"> <div v-show="heightShow" class="transition-box">
<p class="transition-box-p"> <p class="transition-box-p">
<label class="transition-box-label">标准号</label> <label class="transition-box-label">标准号</label>
<span class="transition-box-span">{{ this.$route.query.item.categorg }}</span> <span class="transition-box-span">{{ this.$route.query.item.cid }}</span>
</p> </p>
<p class="transition-box-p"> <p class="transition-box-p">
<label class="transition-box-label">标准名称</label> <label class="transition-box-label">标准名称</label>
@@ -19,10 +19,11 @@
</p> </p>
<p class="transition-box-p"> <p class="transition-box-p">
<label class="transition-box-label">上传时间</label> <label class="transition-box-label">上传时间</label>
<span class="transition-box-span">{{ this.$route.query.item.starttime || '-' }}</span> <span class="transition-box-span" v-if="this.$route.query.item.startTime && this.$route.query.item.endTime">{{ this.$route.query.item.startTime + ' ~ ' + this.$route.query.item.endTime}}</span>
<span class="transition-box-span">-</span>
</p> <p class="transition-box-p"> </p> <p class="transition-box-p">
<label class="transition-box-label">征求意见周期</label> <label class="transition-box-label">征求意见周期</label>
<span class="transition-box-span">{{ this.$route.query.item.endtime || '-' }}</span> <span class="transition-box-span">{{ this.$route.query.item.endTime || '-' }}</span>
</p> </p>
</div> </div>
</transition> </transition>
@@ -105,8 +106,8 @@
</el-form> </el-form>
</div> </div>
<div class="demo-drawer-footer"> <div class="demo-drawer-footer">
<el-button :loading="isSubmit" class="common-button-primary" icon="el-icon-check" type="primary" @click="saveUserInfo">提交</el-button> <el-button :loading="isSubmit" size="mini" class="common-button-primary" icon="el-icon-check" type="primary" @click="saveUserInfo">提交</el-button>
<el-button class="common-button-default" icon="el-icon-close" @click="closeDrawer">取消</el-button> <el-button size="mini" class="common-button-default" icon="el-icon-close" @click="closeDrawer">取消</el-button>
</div> </div>
</div> </div>
</el-drawer> </el-drawer>
+63
View File
@@ -249,6 +249,15 @@ const routes = [
title: '标准清单发布/更新流程' title: '标准清单发布/更新流程'
} }
}, },
{
path: '/bzqdfbStep1-1',
name: 'bzqdfbStep1-1',
component: () => import('@/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue'),
meta: {
requireAuth: true,
title: '标准清单发布/更新流程'
}
},
{ {
path: '/bzqdfbStep2', path: '/bzqdfbStep2',
name: 'bzqdfbStep2', name: 'bzqdfbStep2',
@@ -393,6 +402,60 @@ const routes = [
title: '项目合规评估流程-项目' title: '项目合规评估流程-项目'
} }
}, },
{
path: '/xmpg2Step7',
name: 'xmpg2Step7',
component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step7.vue'),
meta: {
requireAuth: true,
title: '项目合规评估流程-项目'
}
},
{
path: '/xmpg2Step8',
name: 'xmpg2Step8',
component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step8.vue'),
meta: {
requireAuth: true,
title: '项目合规评估流程-项目'
}
},
{
path: '/xmpg2Step9',
name: 'xmpg2Step9',
component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step9.vue'),
meta: {
requireAuth: true,
title: '项目合规评估流程-项目'
}
},
{
path: '/xmpg2Step10',
name: 'xmpg2Step10',
component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step10.vue'),
meta: {
requireAuth: true,
title: '项目合规评估流程-项目'
}
},
{
path: '/xmpg2Step11',
name: 'xmpg2Step11',
component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step11.vue'),
meta: {
requireAuth: true,
title: '项目合规评估流程-项目'
}
},
{
path: '/xmpg2Step12',
name: 'xmpg2Step12',
component: () => import('@/pages/processCenter/pages/creatProcess/xmpg2/step12.vue'),
meta: {
requireAuth: true,
title: '项目合规评估流程-项目'
}
},
{ {
path: '/wfhxzgStep1', path: '/wfhxzgStep1',
name: 'wfhxzgStep1', name: 'wfhxzgStep1',