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

Merge branch 'fix_foton_20231213' into 'master'

Browse Source 
Fix foton 20231213

See merge request laws-foton-slrs/foton-laws-system-front!140
This commit is contained in:
高嵩
2023-12-29 10:07:43 +00:00
parent c1050d1ffc cdf80001bc
commit 4996614bae
21 changed files with 36373 additions and 34954 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/hzwlComponents/Import.vue
+57 -19
View File
@@ -1,29 +1,45 @@
<template>
<div>
<!-- 导入模态窗 -->
<el-dialog width='400px'
<el-dialog
v-if="visible"
:visible="visible"
@close="onClose"
title="导入文件"
v-dragDialogWidth
class="dialog"
width="400px"
:visible="visible"
title="导入文件"
:close-on-click-modal="false"
append-to-body>
append-to-body
@close="onClose"
>
<el-upload
ref="importfile"
multiple
drag
:action="action"
ref="importfile"
:headers="headers"
name="file"
:accept="accept"
:auto-upload="autoUpload"
:before-upload="beforeUpload"
:on-success="onSuccess"
:show-file-list="true"
>
<i class="el-icon-upload" style="color: #3399ff"></i>
<i class="el-icon-upload" style="color: #3399ff" />
<div class="el-upload__text">点击或拖拽上传文件</div>
</el-upload>
<div slot="footer" class="dialog-footer">
<slot />
<el-button
v-if="manualUpload"
type="primary"
size="mini"
class="common-button-default"
@click="ManualUpload"
>
提交
</el-button>
</div>
</el-dialog>
<!-- 导入失败-->
<el-dialog :visible.sync="importFailed" :close-on-click-modal="false" width="400px">
@@ -31,10 +47,16 @@
<span>导入失败</span>
</p>
<div style="max-height: 300px;overflow: auto;padding: 10px 0;">
<p v-html="importForm.content"></p>
<p v-html="importForm.content" />
</div>
<div slot="footer" class="demo-drawer-footer">
<el-button type="primary" round class="common-button-default" icon="el-icon-check" @click="importFailed = false">
<el-button
type="primary"
round
class="common-button-default"
icon="el-icon-check"
@click="importFailed = false"
>
确认
</el-button>
</div>
@@ -44,16 +66,7 @@
<script>
export default {
name: "import",
data () {
return {
headers:{
token: JSON.parse(localStorage.getItem('userInfo')).token
},
importFailed: false,
importForm: {}
}
},
name: 'Import',
props: {
accept: {
type: String,
@@ -71,6 +84,25 @@ export default {
type: Number,
default: 200
},
// 是否自动上传
autoUpload: {
type: Boolean,
default: true
},
// 手动上传按钮
manualUpload: {
type: Boolean,
default: false
}
},
data () {
return {
headers: {
token: JSON.parse(localStorage.getItem('userInfo')).token
},
importFailed: false,
importForm: {}
}
},
methods: {
onClose () {
@@ -112,6 +144,9 @@ export default {
this.importForm.content = response.message
}
},
ManualUpload () {
this.$refs.importfile.submit();
}
}
}
</script>
@@ -124,4 +159,7 @@ export default {
width: 100% !important;
}
/deep/ .el-dialog__body {
padding: 10px 20px !important;
}
</style>
src/components/hzwlComponents/SelectFormItem.vue
+11 -3
View File
@@ -6,20 +6,21 @@
:placeholder="placeholder"
:filterable="filterable"
:clearable="clearable"
@change="handleChange">
@change="handleChange"
>
<el-option
v-for="item in options"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
/>
</el-select>
</el-form-item>
</template>
<script>
export default {
name: "SelectFormItem",
name: 'SelectFormItem',
props: {
value: {
required: true
@@ -47,9 +48,16 @@ export default {
type: Boolean,
default: true
},
customPlaceholder: {
type: String,
default: ''
},
},
computed: {
placeholder () {
if (this.customPlaceholder !== '') {
return this.customPlaceholder
}
return `请选择${this.label}`
},
},
src/components/hzwlComponents/UploadFormItem.vue
+44 -18
View File
@@ -5,16 +5,23 @@
style="display: none;"
:value="ids"
clearable
></el-input>
/>
<div style="display: flex;justify-content: space-between">
<div style="margin-top: 13px" :style="{width: view ? '100%' : '80%'}">
<template v-if="FileList.length > 0">
<div v-for="file in FileList"
<div
v-for="file in FileList"
:key="file.id"
@click="onPreview(file)"
style="color: #409eff;cursor:pointer"
class="fileClass">
class="fileClass"
@click="onPreview(file)"
>
{{ file.name }}
<template v-if="down">
<span v-if="file.id !== ''" style="margin-left: 7px;">
<i class="el-icon-download" title="下载" @click="onPreview(file, 'down')" />
</span>
</template>
</div>
</template>
<template v-else>
@@ -22,24 +29,31 @@
</template>
</div>
<div v-if="!view" style="width: 20%;">
<el-button :disabled="disabled"
<el-button
:disabled="disabled"
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
@click="showUpload"
style="margin-left: 10px; margin-top: 11px; float: right;">
<i class="el-icon-upload"></i>
>
<i class="el-icon-upload" />
</el-button>
</div>
</div>
<el-dialog width='400px' :visible.sync="fileMadel" title="上传文件" v-dragDialogWidth
:close-on-click-modal="false">
<el-dialog
v-dragDialogWidth
width="400px"
:visible.sync="fileMadel"
title="上传文件"
:close-on-click-modal="false"
>
<el-upload
ref="importfile"
multiple
drag
:file-list="fileList"
:action="fileUrl"
ref="importfile"
name="file"
:accept="accept"
:before-upload="beforeUpload"
@@ -49,7 +63,7 @@
:show-file-list="true"
>
<div style="padding: 20px 0">
<i class="el-icon-upload" style="color: #3399ff"></i>
<i class="el-icon-upload" style="color: #3399ff" />
<p>点击或拖拽上传文件</p>
</div>
</el-upload>
@@ -59,7 +73,7 @@
<script>
export default {
name: "UploadFormItem",
name: 'UploadFormItem',
props: {
ids: {
required: true,
@@ -95,10 +109,11 @@ export default {
view: {
type: Boolean,
default: false
}
},
created () {
this.initFileList()
down: {
type: Boolean,
default: false
},
},
data () {
return {
@@ -107,13 +122,16 @@ export default {
FileList: [], // 用于回显
}
},
created () {
this.initFileList()
},
methods: {
showUpload () {
this.fileMadel = true;
},
initFileList () {
if (this.ids && this.ids !== '' && this.names && this.names !== '') {
let fileList = []
const fileList = []
const idArr = this.ids.split(',')
const nameArr = this.names.split(',')
for (let i = 0; i < idArr.length; i++) {
@@ -199,14 +217,22 @@ export default {
this.$emit('update:names', names)
},
// 文件预览及下载
onPreview(file) {
let attId = ""
onPreview (file, type) {
let attId = ''
if(file && file.id) {
attId = file.id
}else {
attId = file.response.data.id
}
if (type === 'down') {
if (attId) {
window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + attId)
} else {
this.$message.warning('文件不存在,下载失败')
}
} else {
this.$preview(attId)
}
},
}
}
src/components/hzwlComponents/personFormItem.vue
+13 -8
View File
@@ -7,25 +7,29 @@
:clearable="clearable"
:disabled="disabled"
readonly
@click.native="choice('role', placeholder, value)">
></el-input>
@click.native="choice('role', placeholder, value)"
/>
</el-form-item>
<Role-tree
:is-title="choiceTitle"
:is-visible.sync="modalShowRoleFlag"
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
@checkedRole="checkedRole"
/>
</div>
</template>
<script>
export default {
name: "personFormItem",
name: 'PersonFormItem',
props: {
value: {
required: true
},
id: {
type: String,
default: ''
},
prop: {
type: String
},
@@ -60,7 +64,7 @@ export default {
choice (type, title, nameId) {
this.nodeList = []
if (nameId) {
let nameId1 = nameId.split(',')
const nameId1 = nameId.split(',')
let idList = []
nameId1.forEach(item => {
let a, b
@@ -87,9 +91,10 @@ export default {
nameList += item.name
})
this.$emit('input', nameList)
this.$emit('update:id', idList)
this.$emit('change', {
ids: this.unique(data.map(item => item.topUnitId)).join(","),
names: this.unique(data.map(item => item.topUnit)).join(",")
ids: this.unique(data.map(item => item.institutionId)).join(','),
names: this.unique(data.map(item => item.institutionCascade)).join(',')
})
},
unique (newArr) {
src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
+2
View File
@@ -1,3 +1,4 @@
<!-- eslint-disable -->
<template><div class="bzrkStep1">
<!-- 标准入库流程-->
<ProcessHeader toggle>
@@ -996,6 +997,7 @@
</template>
<script>
/* eslint-disable */
import { onlyOfficeUrl } from '@/sysConfig'
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
src/pages/processCenter/pages/creatProcess/qbrk-product/step7.vue
+276 -235
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
+351 -241
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue
+274 -214
View File
@@ -1,4 +1,3 @@
<!-- eslint-disable -->
<template>
<form>
<ProcessTitle>
@@ -8,18 +7,24 @@
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="企标类别" prop="standSort" class="add-form-item form-item-disabled">
<el-select v-model="form.standSort" filterable clearable @change="standSortChange" disabled>
<el-select
v-model="form.standSort"
filterable
clearable
disabled
@change="standSortChange"
>
<el-option
v-for="item in standSortOptions"
placeholder="请选择企标类别"
:key="item.value"
placeholder="请选择企标类别"
:value="item.value"
:label="item.label"
></el-option>
/>
</el-select>
</el-form-item>
<el-form-item label="制修订类型" prop="reviseStatus" class="add-form-item form-item-disabled">
<el-select v-model="form.reviseStatus" filterable @change="reveseStatusChange" disabled>
<el-select v-model="form.reviseStatus" filterable disabled @change="reveseStatusChange">
<!--:disabled="form.reviseStatus === '3'">-->
<el-option
v-for="item in opinionsStand"
@@ -27,7 +32,7 @@
:value="item.value"
:label="item.label"
:disabled="item.value ==='3'"
></el-option>
/>
</el-select>
<!--<template>-->
<!-- <div style="padding-left: 10px; color: #666666;" v-if="form.reviseStatus === '1'">制定</div>-->
@@ -38,16 +43,18 @@
</el-form-item>
<el-form-item label="中文名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.standName"
disabled
placeholder="请输入中文名称"
clearable
></el-input>
/>
</el-form-item>
<el-form-item v-show="fbNode" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">
<el-datePicker v-model="form.issueTime" :disabled="disabledState"
<el-datePicker
v-model="form.issueTime"
:disabled="disabledState"
:editable="false"
></el-datePicker>
/>
</el-form-item>
<!-- <el-form-item label="标准状态" prop="textStatusBuss" class="add-form-item form-item-disabled">-->
<!-- <el-select :popper-append-to-body="false" v-model="form.textStatusBuss" placeholder="请选择标准状态">-->
@@ -88,9 +95,10 @@
<!-- </el-form-item>-->
<el-form-item v-show="fbNode" label="企业标准号" prop="standCode" class="add-form-item form-item-disabled">
<el-input
v-model="form.standCode" :disabled="disabledState"
v-model="form.standCode"
:disabled="disabledState"
clearable
></el-input>
/>
</el-form-item>
<!--<el-form-item v-show="form.reviseStatus === '1'" label="企标顺序号" :prop="form.reviseStatus === '1'?standNum : ''" class="add-form-item form-item-disabled">-->
<el-form-item v-show="form.reviseStatus === '1' || form.reviseStatus === '2'" label="企标顺序号" :prop="form.reviseStatus === '1'? 'standNum' : ''" class="add-form-item form-item-disabled standNum">
@@ -100,7 +108,7 @@
placeholder="请输入企标顺序号"
clearable
@input="standNumChange"
></el-input>
/>
<span style="position: absolute;right: 0;color: rgb(64, 158, 255);cursor: pointer" @click="queryOrder">当前顺序号查询</span>
</el-form-item>
<el-form-item label="英文名称" prop="standEnName" class="add-form-item form-item-disabled">
@@ -108,14 +116,15 @@
v-model="form.standEnName"
placeholder="请输入英文名称"
clearable
></el-input>
/>
</el-form-item>
<el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
<el-datePicker v-model="form.putTime"
<el-datePicker
v-model="form.putTime"
:editable="false"
placeholder="请选择企标实施日期"
value-format="yyyy-MM-dd"
></el-datePicker>
/>
</el-form-item>
<!-- <el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">-->
<!-- <el-datePicker v-model="form.issueTime"-->
@@ -135,50 +144,67 @@
<ProcessTitle v-show="verifySarStandard">
<template slot="title">过程稿件</template>
</ProcessTitle>
<div class="prc-content-border" v-show="verifySarStandard">
<div v-show="verifySarStandard" class="prc-content-border">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled uploadBtnFormItem">
<el-input
v-model="form.FBGBUSSName"
disabled
style="display: none;"
v-model="form.FBGBUSSName"
clearable
></el-input>
/>
<div style="display: flex;justify-content: space-between;margin-left: 12px;">
<div style="width: 80%;margin-top: 13px" v-if="isTrue">
<div v-for="(item,index) in FBGBUSSFileList" :key="index"
<div v-if="isTrue" style="width: 80%;margin-top: 13px">
<div
v-for="(item,index) in FBGBUSSFileList"
:key="index"
style="color: #409eff;cursor:pointer"
class="fileClass fileClassName">
<span style="width: 80%;"
class="fileClass fileClassName"
>
<span
v-if="index == 0 && !item.id.startsWith('ATT')"
@click="handleFilePreviewOne(item,'preview')">
style="width: 80%;"
@click="handleFilePreviewOne(item,'preview')"
>
{{ item.name }}
</span>
<span v-else @click="handleFilePreview(item,'preview')">
{{ item.name }}
</span>
<span style="width: 20%;margin-left: 15px;"
v-if="item.id !== '' && index == 0 && !item.id.startsWith('ATT')">
<el-button type="primary" size="mini"
plain icon="el-icon-edit"
@click="handleFilePreviewOne(item,'onlineEdit')"></el-button>
<span
v-if="item.id !== '' && index == 0 && !item.id.startsWith('ATT')"
style="width: 20%;margin-left: 15px;"
>
<el-button
type="primary"
size="mini"
plain
icon="el-icon-edit"
@click="handleFilePreviewOne(item,'onlineEdit')"
/>
</span>
<span style="margin-left: 7px;" v-if="item.id !== '' && item.id.startsWith('ATT')">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
<span v-if="item.id !== '' && item.id.startsWith('ATT')" style="margin-left: 7px;">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />
</span>
</div>
</div>
<div style="width: 80%;margin-top: 13px" v-if="!isTrue">
<div v-for="(item,index) in FBGBUSSFileList" :key="index"
<div v-if="!isTrue" style="width: 80%;margin-top: 13px">
<div
v-for="(item,index) in FBGBUSSFileList"
:key="index"
style="color: #409eff;cursor:pointer;"
class="fileClass">
<span style="" @click="handleFilePreview(item,'preview')"
:title="item.name">
class="fileClass"
>
<span
style=""
:title="item.name"
@click="handleFilePreview(item,'preview')"
>
{{ item.name }}
</span>
<span style="margin-left: 7px;" v-if="item.id !== '' && item.id.startsWith('ATT')">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
<span v-if="item.id !== '' && item.id.startsWith('ATT')" style="margin-left: 7px;">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />
</span>
</div>
</div>
@@ -188,25 +214,26 @@
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
@click="fileUpload('FBGBUSS')">
<i class="el-icon-upload"></i>
@click="fileUpload('FBGBUSS')"
>
<i class="el-icon-upload" />
</el-button>
</div>
</div>
</el-form-item>
<el-form-item label="历史版本" prop="LSBBBUSSName" class="add-form-item form-item-disabled">
<el-input
v-model="form.LSBBBUSSName"
disabled
style="display: none;"
v-model="form.LSBBBUSSName"
clearable
></el-input>
/>
<div style="display: flex;justify-content: space-between;margin-left: 12px;">
<div style="width: 80%;margin-top: 13px">
<div v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
<span style="" @click="handleFilePreview(item,'preview')" :title="item.name">{{ item.name }}</span>
<span style="margin-left: 7px;" v-if="item.id !== ''">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
<span style="" :title="item.name" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<span v-if="item.id !== ''" style="margin-left: 7px;">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />
</span>
</div>
</div>
@@ -216,8 +243,9 @@
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
@click="fileUpload('LSBBBUSS')">
<i class="el-icon-upload"></i>
@click="fileUpload('LSBBBUSS')"
>
<i class="el-icon-upload" />
</el-button>
</div>
</div>
@@ -226,17 +254,17 @@
<el-col :span="12">
<el-form-item label="编制说明" prop="BZSMBUSSName" class="add-form-item form-item-disabled uploadBtnFormItem">
<el-input
v-model="form.BZSMBUSSName"
disabled
style="display: none;"
v-model="form.BZSMBUSSName"
clearable
></el-input>
/>
<div style="display: flex;justify-content: space-between;margin-left: 12px;">
<div style="width: 80%;margin-top: 13px">
<div v-for="(item,index) in BZSMBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
<span style="" @click="handleFilePreview(item,'preview')" :title="item.name">{{ item.name }}</span>
<span style="margin-left: 7px;" v-if="item.id !== ''">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
<span style="" :title="item.name" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<span v-if="item.id !== ''" style="margin-left: 7px;">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />
</span>
</div>
</div>
@@ -246,25 +274,26 @@
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
@click="fileUpload('BZSMBUSS')">
<i class="el-icon-upload"></i>
@click="fileUpload('BZSMBUSS')"
>
<i class="el-icon-upload" />
</el-button>
</div>
</div>
</el-form-item>
<el-form-item label="其他文件" prop="QTWJBUSSName" class="add-form-item form-item-disabled">
<el-input
v-model="form.QTWJBUSSName"
disabled
style="display: none;"
v-model="form.QTWJBUSSName"
clearable
></el-input>
/>
<div style="display: flex;justify-content: space-between;margin-left: 12px;">
<div style="width: 80%;margin-top: 13px">
<div v-for="(item,index) in QTWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
<span style="" @click="handleFilePreview(item,'preview')" :title="item.name">{{ item.name }}</span>
<span style="margin-left: 7px;" v-if="item.id !== ''">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
<span style="" :title="item.name" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<span v-if="item.id !== ''" style="margin-left: 7px;">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />
</span>
</div>
</div>
@@ -274,29 +303,30 @@
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
@click="fileUpload('QTWJBUSS')">
<i class="el-icon-upload"></i>
@click="fileUpload('QTWJBUSS')"
>
<i class="el-icon-upload" />
</el-button>
</div>
</div>
</el-form-item>
</el-col>
</el-row>
</div>
<ProcessTitle v-show="verifySarStandard">
<template slot="title">适用范围</template>
</ProcessTitle>
<div class="prc-content-border" v-show="verifySarStandard">
<div v-show="verifySarStandard" class="prc-content-border">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="起草部门" prop="QCDW" class="add-form-item form-item-disabled">
<el-input
v-model="form.QCDW"
disabled
placeholder="选择起草部门"
readonly="readonly"
@click.native="choiceQCDW('QCDWId', '起草部门', form.QCDW)">
</el-input>
@click.native="choiceQCDW('QCDWId', '起草部门', form.QCDW)"
/>
</el-form-item>
<el-form-item label="文件上传人员" prop="WJSCRYBUSSName" class="add-form-item form-item-disabled">
<el-input
@@ -304,24 +334,24 @@
placeholder="请输入文件上传人员"
disabled
clearable
></el-input>
/>
</el-form-item>
<el-form-item label="能源类型" prop="NYLXCLASS" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.NYLXCLASS" placeholder="请选择能源类型" multiple>
<el-select v-model="form.NYLXCLASS" :popper-append-to-body="false" placeholder="请选择能源类型" multiple>
<el-option
v-for="item in categoryOptions"
placeholder="请选择"
:key="item.value"
placeholder="请选择"
:value="item.value"
:label="item.label"
></el-option>
/>
</el-select>
</el-form-item>
<el-form-item label="关联模块--乘用车VPPS编码" title="关联模块--乘用车VPPS编码" class="add-form-item form-item-disabled">
<el-input v-model="form.CYCVPPSBMBUSS" readonly="readonly" placeholder="选择关联模块--乘用车VPPS编码" @click.native="choiceZRR2('car', '关联模块--乘用车VPPS编码', form.CYCVPPSBMBUSS,true)"></el-input>
<el-input v-model="form.CYCVPPSBMBUSS" readonly="readonly" placeholder="选择关联模块--乘用车VPPS编码" @click.native="choiceZRR2('car', '关联模块--乘用车VPPS编码', form.CYCVPPSBMBUSS,true)" />
</el-form-item>
<el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
<el-input v-model="form.KCVPPSBMBUSS" readonly="readonly" placeholder="选择关联模块--卡车VPPS编码" @click.native="choiceZRR3('struck', '关联模块--卡车VPPS编码', form.KCVPPSBMBUSS,false)"></el-input>
<el-input v-model="form.KCVPPSBMBUSS" readonly="readonly" placeholder="选择关联模块--卡车VPPS编码" @click.native="choiceZRR3('struck', '关联模块--卡车VPPS编码', form.KCVPPSBMBUSS,false)" />
</el-form-item>
<!-- <el-form-item label="模块结构单元变型号(卡车)" title="模块结构单元变型号(卡车)" class="add-form-item form-item-disabled">-->
<!-- <el-input v-model="form.DYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号(卡车)" @click.native="choiceZRR4('TRUCK', '模块结构单元变型号(卡车)', form.DYBXHBUSS,false)"></el-input>-->
@@ -330,7 +360,13 @@
<!-- <el-input v-model="form.CYCDYBXHBUSS" readonly="readonly" placeholder="选择模块结构单元变型号(乘用车)" @click.native="choiceZRR5('CAR', '模块结构单元变型号(乘用车)', form.CYCDYBXHBUSS,false)"></el-input>-->
<!-- </el-form-item>-->
<el-form-item label="标准体系" prop="TXLBBUSS" class="add-form-item form-item-disabled">
<el-input readonly v-model="form.TXLBBUSS" placeholder="选择标准体系" clearable @click.native="choiceZRR1('TXLBBUSS', '标准体系', form.TXLBBUSS)"></el-input>
<el-input
v-model="form.TXLBBUSS"
readonly
placeholder="选择标准体系"
clearable
@click.native="choiceZRR1('TXLBBUSS', '标准体系', form.TXLBBUSS)"
/>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -339,36 +375,36 @@
v-model="form.QCRBUSS"
placeholder="选择起草人"
readonly="readonly"
@click.native="choiceZRRList('QCRBUSS', '选择起草人', form.QCRBUSS)">
</el-input>
@click.native="choiceZRRList('QCRBUSS', '选择起草人', form.QCRBUSS)"
/>
</el-form-item>
<el-form-item label="适用车型" prop="SYCXCLASS" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.SYCXCLASS" placeholder="请选择适用车型" multiple>
<el-select v-model="form.SYCXCLASS" :popper-append-to-body="false" placeholder="请选择适用车型" multiple>
<el-option
v-for="item in applyArcticOptions"
placeholder="请选择"
:key="item.value"
placeholder="请选择"
:value="item.value"
:label="item.label"
></el-option>
/>
</el-select>
</el-form-item>
<el-form-item label="适用产品线" prop="SYCPXCLASS" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.SYCPXCLASS" placeholder="请选择适用认证" multiple>
<el-select v-model="form.SYCPXCLASS" :popper-append-to-body="false" placeholder="请选择适用认证" multiple>
<el-option
v-for="item in sycpxOptions"
placeholder="请选择"
:key="item.value"
placeholder="请选择"
:value="item.value"
:label="item.label"
></el-option>
/>
</el-select>
</el-form-item>
<el-form-item label="关联模块--乘用车vpps中文名称" prop="CYCVPPSCNBUSS" class="add-form-item form-item-disabled">
<el-input v-model="form.CYCVPPSCNBUSS" placeholder="请输入模块中文名称" clearable disabled></el-input>
<el-input v-model="form.CYCVPPSCNBUSS" placeholder="请输入模块中文名称" clearable disabled />
</el-form-item>
<el-form-item label="关联模块--卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
<el-input v-model="form.KCVPPSCNBUSS" placeholder="关联模块--卡车VPPS编码" clearable disabled></el-input>
<el-input v-model="form.KCVPPSCNBUSS" placeholder="关联模块--卡车VPPS编码" clearable disabled />
</el-form-item>
<!-- <el-form-item label="模块结构单元名称(卡车)" prop="DYMCBUSS" class="add-form-item form-item-disabled">-->
<!-- <el-input v-model="form.DYMCBUSS" placeholder="模块结构单元名称(卡车)" clearable disabled></el-input>-->
@@ -382,53 +418,60 @@
<ProcessTitle v-show="verifySarStandard">
<template slot="title">关联信息</template>
</ProcessTitle>
<div class="prc-content-border" v-show="verifySarStandard">
<div v-show="verifySarStandard" class="prc-content-border">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item
label="代替企标编号"
prop="DTQBBHBUSS"
class="add-form-item form-item-disabled">
class="add-form-item form-item-disabled"
>
<el-input
v-model="form.DTQBBHBUSS"
placeholder="请输入代替标准号"
clearable
></el-input>
/>
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="position:absolute;top: 10px;right: 0;"
@click="selectLaws('DTQBBHBUSS','代替企标编号')"
>{{'手动查找'}}</el-button>
>
{{ '手动查找' }}
</el-button>
</el-form-item>
<el-form-item label="采用标准" prop="CYBZ" class="add-form-item form-item-disabled">
<el-input
v-model="form.CYBZ"
placeholder="请输入采用标准"
clearable
></el-input>
/>
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="position:absolute;top: 10px;right: 0;"
@click="selectLaws('CYBZ','采用标准')"
>{{'手动查找'}}</el-button>
>
{{ '手动查找' }}
</el-button>
</el-form-item>
<el-form-item label="引用标准" prop="YYBZ" class="add-form-item form-item-disabled">
<el-input
v-model="form.YYBZ"
placeholder="请输入引用标准"
clearable
></el-input>
/>
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="position:absolute;top: 10px;right: 0;"
@click="selectLaws('YYBZ','引用标准')"
>{{'手动查找'}}</el-button>
>
{{ '手动查找' }}
</el-button>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -452,10 +495,13 @@
placeholder=""
clearable
disabled
></el-input>
/>
</el-form-item>
<el-form-item label="采标程度" prop="CYCD" class="add-form-item form-item-disabled cbcd">
<el-select v-model="form.CYCD" filterable clearable
<el-select
v-model="form.CYCD"
filterable
clearable
placeholder="请先选择采标程度"
>
<el-option
@@ -463,22 +509,22 @@
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
/>
</el-select>
</el-form-item>
<el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
<el-input
v-model="form.GLWJBUSSName"
disabled
style="display: none;"
v-model="form.GLWJBUSSName"
clearable
></el-input>
/>
<div style="display: flex;justify-content: space-between;margin-left: 12px;">
<div style="width: 80%;margin-top: 13px">
<div v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
<span style="" @click="handleFilePreview(item,'preview')" :title="item.name">{{ item.name }}</span>
<span style="margin-left: 7px;" v-if="item.id !== ''">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
<span style="" :title="item.name" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<span v-if="item.id !== ''" style="margin-left: 7px;">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />
</span>
</div>
</div>
@@ -488,8 +534,9 @@
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
@click="fileUpload('GLWJBUSS')">
<i class="el-icon-upload"></i>
@click="fileUpload('GLWJBUSS')"
>
<i class="el-icon-upload" />
</el-button>
</div>
</div>
@@ -500,7 +547,7 @@
<ProcessTitle v-show="opinionsShow">
<template slot="title">意见信息</template>
</ProcessTitle>
<div class="prc-content-border" v-show="opinionsShow">
<div v-show="opinionsShow" class="prc-content-border">
<el-table
ref="selection"
tooltip-effect="dark"
@@ -510,11 +557,13 @@
row-key="id"
:data="form.infoList"
border
default-expand-all>
default-expand-all
>
<el-table-column
label="序号"
min-width="5%"
align="center">
align="center"
>
<template slot-scope="scope">
{{ scope.$index + 1 }}
</template>
@@ -524,13 +573,13 @@
label="条款号"
min-width="8%"
align="center"
>
</el-table-column>
/>
<el-table-column
prop="modelUpdBefore"
label="修改前"
align="center"
min-width="20%">
min-width="20%"
>
<!-- <template slot-scope="scope">-->
<!-- <el-form-item-->
<!-- style="margin-left: 0;margin-bottom:0;"-->
@@ -543,7 +592,8 @@
prop="modelUpdAfter"
label="修改后"
align="center"
min-width="20%">
min-width="20%"
>
<!-- <template slot-scope="scope">-->
<!-- <el-form-item-->
<!-- style="margin-left: 0;margin-bottom:0;"-->
@@ -556,7 +606,8 @@
prop="modelContent"
label="修改理由"
align="center"
min-width="20%">
min-width="20%"
>
<!-- <template slot-scope="scope">-->
<!-- <el-form-item-->
<!-- style="margin-left: 0;margin-bottom:0;"-->
@@ -569,7 +620,8 @@
prop="zrDeptIdName"
label="提出部门"
align="center"
min-width="15%">
min-width="15%"
>
<!-- <template slot-scope="scope">-->
<!-- <el-form-item-->
<!-- style="margin-left: 0;margin-bottom:0;"-->
@@ -582,7 +634,8 @@
prop="zrUserIdName"
label="责任人"
min-width="15%"
align="center">
align="center"
>
<!-- <template slot-scope="scope">-->
<!-- <el-form-item-->
<!-- style="margin-left: 0;margin-bottom:0;"-->
@@ -594,7 +647,8 @@
<el-table-column
label="意见是否采纳"
min-width="15%"
align="center">
align="center"
>
<template slot-scope="scope">
{{ filterOp(scope.row.opinionsAdopted) }}
<!-- <el-form-item-->
@@ -615,7 +669,8 @@
prop="opinionsAdoptedCont"
label="采纳理由"
align="center"
min-width="15%">
min-width="15%"
>
<!-- <template slot-scope="scope">-->
<!-- <el-form-item-->
<!-- style="margin-left: 0;margin-bottom:0;"-->
@@ -628,10 +683,16 @@
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="汇总评审意见文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
<div v-if="summaryFileList.length > 0" v-for="(item,index) in summaryFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
<div
v-for="(item,index) in summaryFileList"
v-if="summaryFileList.length > 0"
:key="index"
style="color: #409eff;cursor:pointer"
class="fileClass"
>
<span style="" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<span style="margin-left: 7px;" v-if="item.id !== ''">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
<span v-if="item.id !== ''" style="margin-left: 7px;">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />
</span>
</div>
</el-form-item>
@@ -641,22 +702,22 @@
<ProcessTitle v-show="opinionsShow">
<template slot="title">培训信息</template>
</ProcessTitle>
<div class="prc-content-border" v-show="opinionsShow">
<div v-show="opinionsShow" class="prc-content-border">
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="培训文件" prop="madelSubName" class="add-form-item form-item-disabled uploadBtnFormItem">
<el-input
v-model="form.madelSubName"
disabled
style="display: none;"
v-model="form.madelSubName"
clearable
></el-input>
/>
<div style="display: flex;justify-content: left;margin-top: 5px;padding-left: 20px;">
<div style="width: 80%;margin-top: 13px">
<div v-for="(item,index) in madelSubList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
<span style="" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<span style="margin-left: 7px;">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />
</span>
</div>
</div>
@@ -666,8 +727,9 @@
class="common-button-primary"
size="mini"
style="margin-top: 6px; float: right;"
@click="fileUpload('madelSub')">
<i class="el-icon-upload"></i>
@click="fileUpload('madelSub')"
>
<i class="el-icon-upload" />
</el-button>
</div>
</div>
@@ -675,22 +737,37 @@
</el-col>
</el-row>
</div>
<CurrentOrder ref="CurrentOrderRef"></CurrentOrder>
<CurrentOrder ref="CurrentOrderRef" />
</form>
</template>
<script>
/* eslint-disable */
import { mapGetters } from 'vuex'
import ProcessTitle from '../../../components/ProcessTitle'
import CurrentOrder from '@/pages/processCenter/pages/components/CurrentOrder';
export default {
name: 'formEditList',
name: 'FormEditList',
components: {
ProcessTitle,
CurrentOrder,
},
filters: {
ellipsis (value) {
if (!value) return ''
if (value.length > 35) {
return value.slice(0, 35) + '...'
}
return value
},
ellipsis2 (value) {
if (!value) return ''
if (value.length > 12) {
return value.slice(0, 12) + '...'
}
return value
}
},
props: {
// formSub: {
// type: Object,
@@ -757,22 +834,6 @@ export default {
default: false
},
},
filters: {
ellipsis (value) {
if (!value) return ''
if (value.length > 35) {
return value.slice(0,35) + '...'
}
return value
},
ellipsis2 (value) {
if (!value) return ''
if (value.length > 12) {
return value.slice(0,12) + '...'
}
return value
}
},
data () {
return {
opinionsStand: [
@@ -853,6 +914,66 @@ export default {
computed: {
...mapGetters([ 'userInfo' ])
},
watch: {
form: {
handler: function (val) {
if(val) {
this.$emit('formCancel', this.form, this.FBGBUSSFileList, this.LSBBBUSSFileList, this.BZSMBUSSFileList, this.QTWJBUSSFileList, this.GLWJBUSSFileList, false, this.fileList, '', this.madelSubList);
}
},
deep: true // 对象的深度验证
},
'form.standName': {
handler: function (val) {
console.log(val);
if (val && val !== '') {
if (this.FBGBUSSFileList.length > 0 && !this.FBGBUSSFileList[0].id.startsWith('ATT_FILE')) {
this.FBGBUSSFileList[0].name = val
}
} else {
if (this.FBGBUSSFileList.length > 0) {
this.FBGBUSSFileList[0].name = '企业标准'
}
}
}
},
// 'form.reviseStatus':{
// handler(val) {
// this.$emit('reveseStatusChange',val)
// }
// }
// 'form.standNum': {
// handler: function(val){
// this.$emit('standNumChange',val)
// }
// }
},
mounted () {
/*
if(this.formSub && this.formSub.standSort && this.formSub.standSort !== ''){
this.getDataAsync()
this.form = this.formSub
console.log(this.form)
this.FBGBUSSFileList= this.FBGBUSSFileListSub
this.BZSMBUSSFileList= this.BZSMBUSSFileListSub
this.LSBBBUSSFileList= this.LSBBBUSSFileListSub
this.QTWJBUSSFileList= this.QTWJBUSSFileListSub
this.GLWJBUSSFileList= this.GLWJBUSSFileListSub
this.summaryFileList= this.summaryFileListSub
this.madelSubList= this.madelSubListSub
}
*/
if(this.form && this.form.standSort && this.form.standSort !== '') {
this.getDataAsync()
this.FBGBUSSFileList = this.FBGBUSSFileListSub
this.BZSMBUSSFileList = this.BZSMBUSSFileListSub
this.LSBBBUSSFileList = this.LSBBBUSSFileListSub
this.QTWJBUSSFileList = this.QTWJBUSSFileListSub
this.GLWJBUSSFileList = this.GLWJBUSSFileListSub
this.summaryFileList = this.summaryFileListSub
this.madelSubList = this.madelSubListSub
}
},
methods: {
queryOrder () {
this.$refs.CurrentOrderRef.open(this.form.standSort, this.form.standNum)
@@ -862,12 +983,12 @@ export default {
},
filterOp (data) {
if(!data) {
return ""
return ''
}
const map = new Map();
map.set("1","采纳");
map.set("2","部分采纳");
map.set("3","不采纳");
map.set('1', '采纳');
map.set('2', '部分采纳');
map.set('3', '不采纳');
return map.get(data)
},
choiceZRR1 (type, title, id) {
@@ -950,7 +1071,7 @@ export default {
case 'madelSub':
this.fileList = this.madelSubList
break;
default : ;
default :
}
this.fileMadel = true;
this.$emit('formCancel', this.form, this.FBGBUSSFileList, this.LSBBBUSSFileList, this.BZSMBUSSFileList, this.QTWJBUSSFileList, this.GLWJBUSSFileList, this.fileMadel, this.fileList, fileType, this.madelSubList);
@@ -965,15 +1086,15 @@ export default {
},
// 文件预览及下载
handleFilePreview (file, type) {
let attId = ""
let attId = ''
if(file && file.id) {
attId = file.id
}else {
attId = file.response.data.id
}
if (type === 'preview' && file.name == this.form.standName) {
let fileName = ""
let fileNam2 = ""
let fileName = ''
let fileNam2 = ''
if (this.form.standName && this.form.standName !== '') {
fileName = this.form.standName + '-企业标准.docx'
fileNam2 = this.form.standName
@@ -981,7 +1102,7 @@ export default {
fileName = '企业标准.docx'
fileNam2 = '企业标准'
}
let form = JSON.parse(JSON.stringify(this.form))
const form = JSON.parse(JSON.stringify(this.form))
form.standCode = ''
form.issueDate = ''
if (file.id.startsWith('ATT')) {
@@ -1000,9 +1121,9 @@ export default {
}
},
handleFilePreviewOne (file, type) {
let id = ""
let fileName = ""
let fileNam2 = ""
let id = ''
let fileName = ''
let fileNam2 = ''
if (this.form.standName && this.form.standName !== '') {
fileName = this.form.standName + '-企业标准.docx'
fileNam2 = this.form.standName
@@ -1032,7 +1153,6 @@ export default {
data.forEach(item => {
this.$set(this.textStatusMap, item.value, item.label)
})
},
busVsFunc () {
this.$http.get('sarVppsTree/list', '', {
@@ -1051,7 +1171,7 @@ export default {
})
},
async getDataAsync () {
let res = await this.getDicTypeListCode()
const res = await this.getDicTypeListCode()
console.log(res)
if(res && res.data) {
this.countryOptions = res.data.COUNTRY
@@ -1100,66 +1220,6 @@ export default {
standNumChange (val) {
this.$emit('standNumChange', val)
}
},
mounted () {
/*
if(this.formSub && this.formSub.standSort && this.formSub.standSort !== ''){
this.getDataAsync()
this.form = this.formSub
console.log(this.form)
this.FBGBUSSFileList= this.FBGBUSSFileListSub
this.BZSMBUSSFileList= this.BZSMBUSSFileListSub
this.LSBBBUSSFileList= this.LSBBBUSSFileListSub
this.QTWJBUSSFileList= this.QTWJBUSSFileListSub
this.GLWJBUSSFileList= this.GLWJBUSSFileListSub
this.summaryFileList= this.summaryFileListSub
this.madelSubList= this.madelSubListSub
}
*/
if(this.form && this.form.standSort && this.form.standSort !== ''){
this.getDataAsync()
this.FBGBUSSFileList= this.FBGBUSSFileListSub
this.BZSMBUSSFileList= this.BZSMBUSSFileListSub
this.LSBBBUSSFileList= this.LSBBBUSSFileListSub
this.QTWJBUSSFileList= this.QTWJBUSSFileListSub
this.GLWJBUSSFileList= this.GLWJBUSSFileListSub
this.summaryFileList= this.summaryFileListSub
this.madelSubList= this.madelSubListSub
}
},
watch: {
form: {
handler: function (val) {
if(val){
this.$emit('formCancel', this.form, this.FBGBUSSFileList,this.LSBBBUSSFileList,this.BZSMBUSSFileList,this.QTWJBUSSFileList,this.GLWJBUSSFileList,false,this.fileList,'',this.madelSubList);
}
},
deep: true //对象的深度验证
},
'form.standName': {
handler: function (val) {
console.log(val);
if (val && val !== '') {
if (this.FBGBUSSFileList.length > 0 && !this.FBGBUSSFileList[0].id.startsWith('ATT_FILE')) {
this.FBGBUSSFileList[0].name = val
}
} else {
if (this.FBGBUSSFileList.length > 0) {
this.FBGBUSSFileList[0].name = '企业标准'
}
}
}
},
// 'form.reviseStatus':{
// handler(val) {
// this.$emit('reveseStatusChange',val)
// }
// }
// 'form.standNum': {
// handler: function(val){
// this.$emit('standNumChange',val)
// }
// }
}
}
</script>
src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
+834 -499
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+873 -514
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
+329 -262
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/qbrk/step13.vue
+336 -293
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
+316 -262
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
+357 -292
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue
+340 -288
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
+314 -260
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
+359 -293
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/processDetail/index.vue
+53 -42
View File
@@ -4,7 +4,7 @@
<div class="flow-chart">
<div class="flow-header">
<div class="back" title="返回" @click="back">
<i class="el-icon-back"></i>
<i class="el-icon-back" />
</div>
<!-- <span class="flow-chart-title">{{ $route.params.processNumber }} {{ $route.params.processTypeName }} 流程图</span>-->
</div>
@@ -16,26 +16,35 @@
<el-button
class="common-button-default export-button"
round
@click="exportStandard"
icon="export"
title="不勾选时默认导出所有筛选项；勾选时仅导出勾选项"
>导出</el-button>
@click="exportStandard"
>
导出
</el-button>
<el-button
class="common-button-default"
round
@click="seeProcessLast"
>查看流程数据</el-button>
>
查看流程数据
</el-button>
<el-button
v-if="tzclrEnable"
class="common-button-default"
round
@click="adjustmentHandler"
round
>调整处理人</el-button>
<el-button v-if="approveShow"
>
调整处理人
</el-button>
<el-button
v-if="approveShow"
class="common-button-default"
@click="approveHandler"
round
>汇总流程</el-button>
@click="approveHandler"
>
汇总流程
</el-button>
<!--临时屏蔽 start-->
<!--<el-button-->
<!-- class="common-button-default"-->
@@ -51,8 +60,8 @@
</div>
<div class="flow-list">
<el-table
height="100%"
ref="selection"
height="100%"
:data="detailData"
tooltip-effect="dark"
style="width: 100%"
@@ -66,28 +75,27 @@
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
align="center"
/>
<el-table-column type="index" width="55" label="序号" align="center" />
<el-table-column
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
/>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
/>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
align="center"
>
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template>
@@ -95,7 +103,8 @@
<el-table-column
prop="endTime"
label="完成时间"
align="center">
align="center"
>
<template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template>
@@ -103,7 +112,8 @@
<el-table-column
prop="comment"
label="流程信息"
align="center">
align="center"
>
<template slot-scope="scope">
<span>{{ scope.row.commentText }}</span>
</template>
@@ -111,7 +121,8 @@
<el-table-column
prop="completeFlag"
label="状态"
align="center">
align="center"
>
<template slot-scope="scope">
<span>{{ scope.row.endTime ? '已完成' : scope.row.receiveStatus ? '已接收' : '未完成' }}</span>
</template>
@@ -123,9 +134,9 @@
check-box
:is-title="drawerTitle"
:is-visible.sync="drawerModal"
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
@checkedRole="checkedRole"
/>
<!-- <org-table-->
<!-- title="调整处理人"-->
<!-- :visible.sync="drawerModal"-->
@@ -147,7 +158,7 @@ import axios from 'axios'
import eventBus from '@/common/eventHub'
export default {
name: 'processDetail',
name: 'ProcessDetail',
data () {
return {
approveShow: false,
@@ -206,8 +217,8 @@ export default {
},
// 汇总流程
approveHandler () {
let index = this.detailData.length - 1 // 当前流程任务最后一步index
let isEnd = true
const index = this.detailData.length - 1 // 当前流程任务最后一步index
const isEnd = true
let row = { ...this.detailData[this.approveRowIndex + 1] }// 汇总页下一步拿到数据
if(this.approveRowIndex === this.detailData.length - 1) { // 最后一步
row = { ...this.detailData[this.approveRowIndex] }
@@ -216,13 +227,13 @@ export default {
row.taskInfo = row.name
row.tabsName = this.$route.query.tabsName
let currentItem = this.detailData[this.approveRowIndex]
const currentItem = this.detailData[this.approveRowIndex]
row.currentItem = currentItem
let prcType = this.detailData[index].prcType // 流程类型
const prcType = this.detailData[index].prcType // 流程类型
if (isEnd) {
if (this.$store.state.detailMap !== '') {
let lastDetailMap = this.$store.getters.getLastDetailMap
const lastDetailMap = this.$store.getters.getLastDetailMap
lastDetailMap.push(this.$store.state.detailMap)
this.$store.commit('setLastDetailMap', JSON.stringify(lastDetailMap))
}
@@ -278,7 +289,7 @@ export default {
// 企标制修订计划立项 1
this.toProcessDetail('qbzxdlxStep1-1', row)
} else if (prcType === '33') {
let data = []
const data = []
this.detailData.forEach(res => {
if (res.taskDefinitionKey == 'PolicySolicitOpinionProcessKey11') {
data.push(res)
@@ -297,7 +308,7 @@ export default {
}
})
} else if (prcType === '34') {
let data = []
const data = []
this.detailData.forEach(res => {
if (res.taskDefinitionKey == 'PolicyComplianceProgramReviewProcessKey11') {
data.push(res)
@@ -324,13 +335,13 @@ export default {
* @Description: 查看流程最后一步
*/
seeProcessLast () {
let index = this.detailData.length - 1 // 当前流程任务最后一步index
let isEnd = true
let row = {...this.detailData[0]}
const index = this.detailData.length - 1 // 当前流程任务最后一步index
const isEnd = true
const row = { ...this.detailData[0] }
row.taskIds = row.id
row.taskInfo = row.name
row.tabsName = this.$route.query.tabsName
let prcType = this.detailData[index].prcType // 流程类型
const prcType = this.detailData[index].prcType // 流程类型
console.log(prcType);
// 判断当前流程是否已全部办理完成
// this.detailData.map(item => {
@@ -340,7 +351,7 @@ export default {
// })
if (isEnd) {
if (this.$store.state.detailMap !== '') {
let lastDetailMap = this.$store.getters.getLastDetailMap
const lastDetailMap = this.$store.getters.getLastDetailMap
lastDetailMap.push(this.$store.state.detailMap)
this.$store.commit('setLastDetailMap', JSON.stringify(lastDetailMap))
}
@@ -492,7 +503,7 @@ export default {
})
},
toProcessDetail (componentName, row, unShowReceipt) {
let data = {
const data = {
name: componentName,
query: {
bpnId: row.bpnId,
@@ -513,8 +524,8 @@ export default {
if (unShowReceipt) {
data.query.unShowReceipt = true
}
let routeUrl =this.$router.resolve(data)
window.open(routeUrl.href, "_blank")
const routeUrl = this.$router.resolve(data)
window.open(routeUrl.href, '_blank')
// this.$router.push(data)
},
// table行选择事件
@@ -526,13 +537,13 @@ export default {
// 判断选中一条数据、未完成数据、当前登陆人数据
if (this.tableRow.length === 1 && !this.tableRow[0].endTime && this.tableRow[0].assigneeId === this.$store.getters.userInfo.userId) {
if (this.$store.state.detailMap !== '') {
let lastDetailMap = this.$store.getters.getLastDetailMap
const lastDetailMap = this.$store.getters.getLastDetailMap
lastDetailMap.push(this.$store.state.detailMap)
this.$store.commit('setLastDetailMap', JSON.stringify(lastDetailMap))
}
// this.tableRow[0].processType = this.$route.params.processType
this.$store.commit('setDetailMap', this.$route.path)
let row = {
const row = {
taskIds: this.tableRow[0].id,
prcId: this.tableRow[0].processDefinitionId,
prcNum: this.tableRow[0].prcNum,
@@ -1213,7 +1224,7 @@ export default {
},
// 导出事件
exportStandard () {
let ids = []
const ids = []
if (this.tableRow.length > 0) {
this.tableRow.map(item => {
ids.push(item.id)
@@ -1231,7 +1242,7 @@ export default {
if (sortObj.column.order !== 'normal') {
this.shunxu = ''
this.paixu = ''
let order = sortObj.column.order
const order = sortObj.column.order
switch (sortObj.column.property) {
// 任务步骤
case 'name' :
src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+53 -277
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+38 -70
View File
@@ -2,7 +2,7 @@
<template>
<div class="task-draft v-class">
<div class="search-area">
<el-form :inline="true" :model="searchForm" ref="processSearch" class="label-input-form">
<el-form ref="processSearch" :inline="true" :model="searchForm" class="label-input-form">
<div class="search-area-item">
<!-- <el-form-item label="流程名称" class="search-item" @keyup.enter.native="selectProcessBtn">-->
<!-- <el-input-->
@@ -29,51 +29,61 @@
>
<el-option
v-for="item in processTypeList"
:value="item.value"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
/>
</el-select>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
v-btn-permission="'255351d90836fad911d347da0e8c65b5'"
type="primary"
class="common-button-primary"
size="mini"
v-btn-permission="'255351d90836fad911d347da0e8c65b5'"
@click="selectProcessBtn">查询</el-button>
@click="selectProcessBtn"
>
查询
</el-button>
<el-button
v-btn-permission="'568cc2a4431e8ea0d1f65bd0c0805907'"
class="common-button-default"
size="mini"
v-btn-permission="'568cc2a4431e8ea0d1f65bd0c0805907'"
@click="resetSelect">清空</el-button>
<el-button size="mini" type="danger"
@click="resetSelect"
>
清空
</el-button>
<el-button
v-btn-permission="'de85dfbf1ca4fff1f47d4908af13c284'"
size="mini"
type="danger"
@click="dataDel"
>删除</el-button>
>
删除
</el-button>
</el-form-item>
</div>
<div class="search-area-item">
</div>
<div class="search-area-item" />
</el-form>
</div>
<div class="content">
<div class="table-wrap">
<el-table
height="100%"
ref="selection"
height="100%"
:data="processList"
tooltip-effect="dark"
style="width: 100%; flex: auto;"
border
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="handleSelectionChange">
@selection-change="handleSelectionChange"
>
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
align="center"
/>
<!-- <el-table-column-->
<!-- prop="prcNum"-->
<!-- label="流程编号"-->
@@ -86,7 +96,8 @@
fixed="left"
width="55"
label="序号"
align="center">
align="center"
>
<template slot-scope="{scope, column, $index}">
{{ ($index + 1) + (pageNo - 1) * pageSize }}
</template>
@@ -97,7 +108,7 @@
align="center"
>
<template slot-scope="scope">
<a @click="dealWith(scope.row)" class="table-jump">{{ scope.row.prcName|| getPrcName(scope.row.prcType) }}</a>
<a class="table-jump" @click="dealWith(scope.row)">{{ scope.row.prcName|| getPrcName(scope.row.prcType) }}</a>
</template>
</el-table-column>
<!-- <el-table-column-->
@@ -112,8 +123,7 @@
prop="creatUserName"
label="发起人"
align="center"
>
</el-table-column>
/>
<el-table-column
prop="creatTime"
label="创建日期"
@@ -144,7 +154,8 @@
:page="pageNo"
:total="total"
@pageChange="pageChange"
@pageSizeChange="pageSizeChange"></pagination>
@pageSizeChange="pageSizeChange"
/>
<loading :loading="loading">数据获取中</loading>
</div>
</div>
@@ -213,12 +224,12 @@ export default {
/** 删除按钮 */
dataDel () {
if (this.processListSelect.length > 0) {
let msgIds = []
const msgIds = []
for (let i = 0; i < this.processListSelect.length; i++) {
let msgId = this.processListSelect[i].id
const msgId = this.processListSelect[i].id
msgIds.push(msgId)
}
let delId = {
const delId = {
id: msgIds.join(',')
}
this.$confirm('确定删除这些数据?', '提示', {
@@ -276,7 +287,6 @@ export default {
verifySarStandard: true,
}
})
} else if (mes.taskInfo === '申请人修订') {
routeUrl = this.$router.resolve({
name: 'bzrkStep4',
@@ -286,7 +296,6 @@ export default {
bpnId: id
}
})
}
}else {
routeUrl = this.$router.resolve({
@@ -298,7 +307,6 @@ export default {
verifySarStandard: true,
}
})
}
break
case 'buss1':
@@ -313,7 +321,6 @@ export default {
verifySarStandard: true,
}
})
}else if (mes.taskInfo === '起草') {
routeUrl = this.$router.resolve({
name: 'bussLibrary1',
@@ -324,7 +331,6 @@ export default {
verifySarStandard: true,
}
})
}else if (mes.taskInfo === '重新起草') {
routeUrl = this.$router.resolve({
name: 'bussLibraryC1',
@@ -336,7 +342,6 @@ export default {
verifySarStandard: true,
}
})
}else if (mes.taskInfo === '企标编写汇总') {
routeUrl = this.$router.resolve({
name: 'bussLibrary3',
@@ -348,7 +353,6 @@ export default {
verifySarStandard: true,
}
})
}else if (mes.taskInfo === '标准化初审') {
routeUrl = this.$router.resolve({
name: 'bussLibrary4',
@@ -359,7 +363,6 @@ export default {
verifySarStandard: true,
}
})
}else if (mes.taskInfo === '重新企标编写汇总') {
routeUrl = this.$router.resolve({
name: 'bussLibraryC3',
@@ -371,7 +374,6 @@ export default {
verifySarStandard: true,
}
})
}else if (mes.taskInfo === '征求意见') {
routeUrl = this.$router.resolve({
name: 'bussLibrary5',
@@ -383,7 +385,6 @@ export default {
verifySarStandard: true,
}
})
}else if (mes.taskInfo === '技术委员会评审、评审意见修改') {
routeUrl = this.$router.resolve({
name: 'bussLibrary6',
@@ -395,7 +396,6 @@ export default {
verifySarStandard: true,
}
})
}else if (mes.taskInfo === '标准化复审') {
routeUrl = this.$router.resolve({
name: 'bussLibrary7',
@@ -407,7 +407,6 @@ export default {
verifySarStandard: true,
}
})
}else if (mes.taskInfo === '重新技术委员会评审、评审意见修改') {
routeUrl = this.$router.resolve({
name: 'bussLibraryC6',
@@ -419,7 +418,6 @@ export default {
verifySarStandard: true,
}
})
}else if (mes.taskInfo === '起草单位高级经理审核') {
routeUrl = this.$router.resolve({
name: 'bussLibrary8',
@@ -431,7 +429,6 @@ export default {
verifySarStandard: true,
}
})
}else if (mes.taskInfo === '标准法规部高级经理审核') {
routeUrl = this.$router.resolve({
name: 'bussLibrary9',
@@ -443,7 +440,6 @@ export default {
verifySarStandard: true,
}
})
}else if (mes.taskInfo === '审定') {
routeUrl = this.$router.resolve({
name: 'bussLibrary10',
@@ -454,7 +450,6 @@ export default {
verifySarStandard: true,
}
})
}else if (mes.taskInfo === '批准') {
routeUrl = this.$router.resolve({
name: 'bussLibrary11',
@@ -465,7 +460,6 @@ export default {
verifySarStandard: true,
}
})
}else if (mes.taskInfo === '主起草人培训') {
routeUrl = this.$router.resolve({
name: 'bussLibrary12',
@@ -476,7 +470,6 @@ export default {
verifySarStandard: true,
}
})
}else if (mes.taskInfo === '发布') {
routeUrl = this.$router.resolve({
name: 'bussLibrary13',
@@ -488,7 +481,6 @@ export default {
}
})
}
}else {
routeUrl = this.$router.resolve({
name: 'bussLibrary1',
@@ -499,7 +491,6 @@ export default {
verifySarStandard: true,
}
})
}
break
case 'buss2':
@@ -514,7 +505,6 @@ export default {
verifySarStandard: true,
}
})
}else if (mes.taskInfo === '起草') {
routeUrl = this.$router.resolve({
name: 'bussLibraryProduct1',
@@ -525,7 +515,6 @@ export default {
verifySarStandard: true,
}
})
}else if (mes.taskInfo === '企标编写汇总') {
routeUrl = this.$router.resolve({
name: 'bussLibraryProduct3',
@@ -536,7 +525,6 @@ export default {
verifySarStandard: true,
}
})
}else if (mes.taskInfo === '重新企标编写汇总') {
routeUrl = this.$router.resolve({
name: 'bussLibraryProductC3',
@@ -547,7 +535,6 @@ export default {
verifySarStandard: true,
}
})
}else if (mes.taskInfo === '征求意见') {
routeUrl = this.$router.resolve({
name: 'bussLibraryProduct5',
@@ -558,7 +545,6 @@ export default {
verifySarStandard: true,
}
})
}else if (mes.taskInfo === '意见汇总及标准修改') {
routeUrl = this.$router.resolve({
name: 'bussLibraryProduct6',
@@ -569,7 +555,6 @@ export default {
verifySarStandard: true,
}
})
}else if (mes.taskInfo === '重新意见汇总及标准修改') {
routeUrl = this.$router.resolve({
name: 'bussLibraryProductC6',
@@ -580,7 +565,6 @@ export default {
verifySarStandard: true,
}
})
}else if (mes.taskInfo === '发布') {
routeUrl = this.$router.resolve({
name: 'bussLibraryProduct13',
@@ -592,7 +576,6 @@ export default {
}
})
}
}else {
routeUrl = this.$router.resolve({
name: 'bussLibraryProduct1',
@@ -603,7 +586,6 @@ export default {
verifySarStandard: true,
}
})
}
break
case 'buss3':
@@ -618,7 +600,6 @@ export default {
verifySarStandard: true,
}
})
}else if (mes.taskInfo === '汇总') {
routeUrl = this.$router.resolve({
name: 'bussFs2',
@@ -629,7 +610,6 @@ export default {
verifySarStandard: true,
}
})
}else if (mes.taskInfo === '重新汇总') {
routeUrl = this.$router.resolve({
name: 'bussFsC2',
@@ -640,7 +620,6 @@ export default {
verifySarStandard: true,
}
})
}else if (mes.taskInfo === '复审') {
routeUrl = this.$router.resolve({
name: 'qbfsStepSub2',
@@ -652,7 +631,6 @@ export default {
}
})
}
}else {
routeUrl = this.$router.resolve({
name: 'qbfsStep1',
@@ -663,7 +641,6 @@ export default {
verifySarStandard: true,
}
})
}
break
// 法规入库及评估流程
@@ -702,7 +679,6 @@ export default {
verifySarStandard: true,
}
})
} else if (mes.taskInfo === '根据会签意见修订') {
routeUrl = this.$router.resolve({
name: 'bzqdfbStep1-3',
@@ -713,7 +689,6 @@ export default {
}
})
}
}else {
routeUrl = this.$router.resolve({
name: 'bzqdfbStep1-1',
@@ -724,7 +699,6 @@ export default {
verifySarStandard: true,
}
})
}
break
case '5':
@@ -824,7 +798,7 @@ export default {
bpnId: id
}
})
window.open(routeUrl10.href, "_blank");
window.open(routeUrl10.href, '_blank');
break
case '15':
if(mes !== null && mes.taskInfo !== null) {
@@ -838,7 +812,6 @@ export default {
verifySarStandard: true,
}
})
}else if(mes.taskInfo === '入会信息填报') {
routeUrl = this.$router.resolve({
name: 'jrbzhxhStep2',
@@ -848,7 +821,6 @@ export default {
bpnId: id,
}
})
}
}else{
routeUrl = this.$router.resolve({
@@ -859,7 +831,6 @@ export default {
bpnId: id
}
})
}
break
case '16':
@@ -871,7 +842,7 @@ export default {
bpnId: id
}
})
window.open(routeUrl11.href, "_blank");
window.open(routeUrl11.href, '_blank');
break
case '20':
routeUrl = this.$router.resolve({
@@ -882,7 +853,7 @@ export default {
bpnId: id
}
})
window.open(routeUrl12.href, "_blank");
window.open(routeUrl12.href, '_blank');
break
// 政策入库、
case 'laws1':
@@ -988,7 +959,6 @@ export default {
verifySarStandard: true,
}
})
}else {
routeUrl = this.$router.resolve({
name: 'qbzxdjhgkStep1',
@@ -998,7 +968,6 @@ export default {
bpnId: id
}
})
}
}else{
routeUrl = this.$router.resolve({
@@ -1009,7 +978,6 @@ export default {
bpnId: id
}
})
}
break
@@ -1102,7 +1070,7 @@ export default {
break
}
window.open(routeUrl.href,"_blank")
window.open(routeUrl.href, '_blank')
},
...mapMutations([ 'setProcess', 'setHandleInfo' ]),
...mapActions([ 'setMenu' ])
src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue
+524 -245
View File
File diff suppressed because it is too large Load Diff