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

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

Browse Source
This commit is contained in:
zhutianqi
2021-12-24 17:57:43 +08:00
parent 5c6c8f3a54 563080b435
commit 4cd8a6e59b
4 changed files with 431 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/components/ProcessFooter.vue
+35
View File
@@ -4,6 +4,25 @@
<div class="footer-line"></div> <div class="footer-line"></div>
<div class="btn-group-wrap"> <div class="btn-group-wrap">
<slot></slot> <slot></slot>
<el-button
type="warning"
icon="el-icon-edit-outline"
size="small"
class="common-button-warning"
:loading="submitLoading"
@click="handleUploadFile"
v-if="uploadFile">文件上传</el-button>
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
:loading="submitLoading"
@click="handleUploadedFile"
v-if="uploadedFile">
<i class="el-icon-upload el-icon--right"></i>
查看文件
</el-button>
<el-button <el-button
type="warning" type="warning"
icon="el-icon-edit-outline" icon="el-icon-edit-outline"
@@ -254,6 +273,16 @@ export default {
showEdit: { showEdit: {
type: Boolean, type: Boolean,
default: false default: false
},
// 是否显示文件上传按钮
uploadFile: {
type: Boolean,
default: false
},
// 是否显示已上传文件按钮
uploadedFile: {
type: Boolean,
default: false
}, },
// 标准编号(在线编辑) // 标准编号(在线编辑)
standNo: { standNo: {
@@ -322,6 +351,12 @@ export default {
handleOnLineReEdit(){ handleOnLineReEdit(){
this.$emit('onLineEdit') this.$emit('onLineEdit')
}, },
handleUploadFile(){
this.$emit('uploadFile')
},
handleUploadedFile(){
this.$emit('uploadedFile')
},
handleSendEmail() { handleSendEmail() {
this.$emit('sendEmail') this.$emit('sendEmail')
}, },
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+1 -31
View File
@@ -1807,37 +1807,7 @@
// 文件预览 // 文件预览
filePreview(item) { filePreview(item) {
const attId = item.response.data.id const attId = item.response.data.id
this.getBusStandFileByAttId(attId) this.$preview(attId)
.then(res => {
console.log(res)
if(res){
const editFileInfo = res
console.log(editFileInfo)
if(editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG'){
window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl)
}else {
const nowTime = new Date().getTime()
// window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)));
window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)
}
// window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
}
// switch (res.convertState) {
// case 'ERROR':
// this.$message.warning('文档转换失败')
// break
// case 'LODING':
// this.$message.info('文档转换中，请稍后查看')
// break
// case 'SUCCESS':
// const { convertFileInfo } = res
// window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + convertFileInfo.id))
// break
// }
}).catch(e => {
console.log(e)
this.$message.warning('文件不存在,预览失败')
})
}, },
// choiceZRRS () { // choiceZRRS () {
// if (this.userType === 'zrUserId') { // if (this.userType === 'zrUserId') {
src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+306 -285
View File
@@ -6,7 +6,7 @@
</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 === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</div> <!-- <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">模块信息</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"> <div class="content">
@@ -137,28 +137,21 @@
v-model="form.FBGBUSSName" v-model="form.FBGBUSSName"
clearable clearable
></el-input> ></el-input>
<div v-if="FBGBUSSFileList.length>0"> <div style="display: flex;justify-content: space-between">
<!-- {{ form.fbgbjbdName }}--> <div style="width: 80%;">
<el-button <div v-for="(item,index) in FBGBUSSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
type="primary" </div>
class="common-button-primary" <div style="width: 20%;">
size="mini" <el-button
style="margin-left: 10px" type="primary"
@click="fileUpload('FBGBUSS')"> class="common-button-primary"
<i class="el-icon-upload el-icon--right"></i> size="mini"
查看已上传的文件 style="margin-left: 10px; margin-top: 11px; float: right;"
</el-button> @click="fileUpload('FBGBUSS')">
</div> <i class="el-icon-upload"></i>
<div v-else> </el-button>
<el-button </div>
type="primary" </div>
class="common-button-primary"
size="mini"
@click="fileUpload('FBGBUSS')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
</div>
</el-form-item> </el-form-item>
<el-form-item label="历史版本" prop="LSBBBUSSName" class="add-form-item form-item-disabled"> <el-form-item label="历史版本" prop="LSBBBUSSName" class="add-form-item form-item-disabled">
<el-input <el-input
@@ -167,28 +160,21 @@
v-model="form.LSBBBUSSName" v-model="form.LSBBBUSSName"
clearable clearable
></el-input> ></el-input>
<div v-if="LSBBBUSSFileList.length>0"> <div style="display: flex;justify-content: space-between">
<!-- {{ form.caName }}--> <div style="width: 80%;">
<el-button <div v-for="(item,index) in LSBBBUSSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
type="primary" </div>
class="common-button-primary" <div style="width: 20%;">
size="mini" <el-button
style="margin-left: 10px" type="primary"
@click="fileUpload('LSBBBUSS')"> class="common-button-primary"
<i class="el-icon-upload el-icon--right"></i> size="mini"
查看已上传的文件 style="margin-left: 10px; margin-top: 11px; float: right;"
</el-button> @click="fileUpload('LSBBBUSS')">
</div> <i class="el-icon-upload"></i>
<div v-else> </el-button>
<el-button </div>
type="primary" </div>
class="common-button-primary"
size="mini"
@click="fileUpload('LSBBBUSS')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@@ -199,27 +185,20 @@
v-model="form.BZSMBUSSName" v-model="form.BZSMBUSSName"
clearable clearable
></el-input> ></el-input>
<div v-if="BZSMBUSSFileList.length>0"> <div style="display: flex;justify-content: space-between">
<!-- {{ form.ssgName }}--> <div style="width: 80%;">
<el-button <div v-for="(item,index) in BZSMBUSSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
type="primary" </div>
class="common-button-primary" <div style="width: 20%;">
size="mini" <el-button
style="margin-left: 10px" type="primary"
@click="fileUpload('BZSMBUSS')"> class="common-button-primary"
<i class="el-icon-upload el-icon--right"></i> size="mini"
查看已上传的文件 style="margin-left: 10px; margin-top: 11px; float: right;"
</el-button> @click="fileUpload('BZSMBUSS')">
</div> <i class="el-icon-upload"></i>
<div v-else> </el-button>
<el-button </div>
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('BZSMBUSS')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="其他文件" prop="QTWJBUSSName" class="add-form-item form-item-disabled"> <el-form-item label="其他文件" prop="QTWJBUSSName" class="add-form-item form-item-disabled">
@@ -229,27 +208,20 @@
v-model="form.QTWJBUSSName" v-model="form.QTWJBUSSName"
clearable clearable
></el-input> ></el-input>
<div v-if="QTWJBUSSFileList.length>0"> <div style="display: flex;justify-content: space-between">
<!-- {{ form.ssgName }}--> <div style="width: 80%;">
<el-button <div v-for="(item,index) in QTWJBUSSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
type="primary" </div>
class="common-button-primary" <div style="width: 20%;">
size="mini" <el-button
style="margin-left: 10px" type="primary"
@click="fileUpload('QTWJBUSS')"> class="common-button-primary"
<i class="el-icon-upload el-icon--right"></i> size="mini"
查看已上传的文件 style="margin-left: 10px; margin-top: 11px; float: right;"
</el-button> @click="fileUpload('QTWJBUSS')">
</div> <i class="el-icon-upload"></i>
<div v-else> </el-button>
<el-button </div>
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('QTWJBUSS')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
</div> </div>
</el-form-item> </el-form-item>
@@ -263,15 +235,12 @@
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="起草部门" prop="QCDW" class="add-form-item form-item-disabled"> <el-form-item label="起草部门" prop="QCDW" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.QCDW" placeholder="请选择起草部门" multiple> <el-input
<el-option clearable
v-for="item in qcdwOptions" v-model="form.QCDW"
placeholder="请选择" placeholder="选择起草部门"
:key="item.value" @click.native="choiceQCDW('QCDWId', '起草部门', form.QCDW)">
:value="item.value" </el-input>
:label="item.label"
></el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="文件上传人员" prop="WJSCRYBUSSName" class="add-form-item form-item-disabled"> <el-form-item label="文件上传人员" prop="WJSCRYBUSSName" class="add-form-item form-item-disabled">
<el-input <el-input
@@ -301,15 +270,12 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled"> <el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.QCRBUSS" placeholder="请选择起草人"> <el-input
<el-option v-model="form.QCRBUSS"
v-for="item in qcrOptions" placeholder="选择起草人"
placeholder="请选择" clearable
:key="item.value" @click.native="choiceZRRList('QCRBUSS', '选择起草人', form.QCRBUSS)">
:value="item.value" </el-input>
:label="item.label"
></el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="适用车型" prop="SYCXCLASS" class="add-form-item form-item-disabled"> <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 :popper-append-to-body="false" v-model="form.SYCXCLASS" placeholder="请选择适用车型" multiple>
@@ -366,49 +332,42 @@
v-model="form.GLWJBUSSName" v-model="form.GLWJBUSSName"
clearable clearable
></el-input> ></el-input>
<div v-if="GLWJBUSSFileList.length>0"> <div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<el-button <div v-for="(item,index) in GLWJBUSSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
type="primary" </div>
class="common-button-primary" <div style="width: 20%;">
size="mini" <el-button
@click="fileUpload('GLWJBUSS')"> type="primary"
<i class="el-icon-upload el-icon--right"></i> class="common-button-primary"
查看已上传文件 size="mini"
</el-button> style="margin-left: 10px; margin-top: 11px; float: right;"
<!-- {{ form.glwjName }}--> @click="fileUpload('GLWJBUSS')">
</div> <i class="el-icon-upload"></i>
<div v-else> </el-button>
<el-button </div>
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('GLWJLAWS')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="被代替企标编号" prop="BDTWJHLAWS" class="add-form-item form-item-disabled"> <!-- <el-form-item label="被代替企标编号" prop="BDTWJHLAWS" class="add-form-item form-item-disabled">-->
<el-input <!-- <el-input-->
v-model="form.BDTWJHLAWS" <!-- v-model="form.BDTWJHLAWS"-->
placeholder="请输入被代替企标编号" <!-- placeholder="请输入被代替企标编号"-->
clearable <!-- clearable-->
></el-input> <!-- ></el-input>-->
<el-button <!-- <el-button-->
type="primary" <!-- type="primary"-->
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('bfbdtbzh'),config.attrName = '被代替企标编号'" <!-- @click="selectLaws('bfbdtbzh'),config.attrName = '被代替企标编号'"-->
>{{'手动查找'}}</el-button> <!-- >{{'手动查找'}}</el-button>-->
</el-form-item> <!-- </el-form-item>-->
<el-form-item label="上传时间" prop="XCSJBUSS" class="add-form-item form-item-disabled"> <el-form-item label="上传时间" prop="XCSJBUSS" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="form.XCSJBUSS" v-model="form.XCSJBUSS"
placeholder="请输入代替标准号" placeholder=""
clearable clearable
:disabled="true" :disabled="true"
></el-input> ></el-input>
@@ -417,85 +376,85 @@
</el-row> </el-row>
</div> </div>
</div> </div>
<div class="block" id="active2" v-show="active === '2'"> <!-- <div class="block" id="active2" v-show="active === '2'">-->
<ProcessTitle> <!-- <ProcessTitle>-->
<template slot="title">模块信息</template> <!-- <template slot="title">模块信息</template>-->
</ProcessTitle> <!-- </ProcessTitle>-->
<template> <!-- <template>-->
<div class="prc-content-border" style="height: 66vh;position: relative;"> <!-- <div class="prc-content-border" style="height: 66vh;position: relative;">-->
<div class="action-bar"> <!-- <div class="action-bar">-->
<el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')"> <!-- <el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">-->
批量编辑 <!-- 批量编辑-->
</el-button> <!-- </el-button>-->
<el-button <!-- <el-button-->
type="primary" <!-- type="primary"-->
size="mini" <!-- size="mini"-->
class="common-button-primary add-button" <!-- class="common-button-primary add-button"-->
@click="createRow" <!-- @click="createRow"-->
>创建模块</el-button> <!-- >创建模块</el-button>-->
</div> <!-- </div>-->
<el-table <!-- <el-table-->
ref="selection" <!-- ref="selection"-->
tooltip-effect="dark" <!-- tooltip-effect="dark"-->
style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:56vh;border-bottom: 1px solid #EBEEF5;" <!-- style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:56vh;border-bottom: 1px solid #EBEEF5;"-->
: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"-->
row-key="id" <!-- row-key="id"-->
:data="form.modelData" <!-- :data="form.modelData"-->
border <!-- border-->
default-expand-all <!-- default-expand-all-->
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"> <!-- :tree-props="{children: 'children', hasChildren: 'hasChildren'}">-->
<el-table-column type="selection" min-width="5%" :selectable="checkSelect" align="center"/> <!-- <el-table-column type="selection" min-width="5%" :selectable="checkSelect" align="center"/>-->
<el-table-column <!-- <el-table-column-->
prop="modelNum" <!-- prop="modelNum"-->
label="序号" <!-- label="序号"-->
min-width="15%" <!-- min-width="15%"-->
align="center" <!-- align="center"-->
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"> <!-- :tree-props="{children: 'children', hasChildren: 'hasChildren'}">-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column <!-- <el-table-column-->
label="名称" <!-- label="名称"-->
align="center" <!-- align="center"-->
min-width="30%"> <!-- min-width="30%">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<el-form-item <!-- <el-form-item-->
style="margin-left: 0;margin-bottom:0;" <!-- style="margin-left: 0;margin-bottom:0;"-->
> <!-- >-->
<el-input v-model="scope.row.modelName" :disabled="scope.row.disabled" placeholder="请维护模块名称" @blur="modelNameFunc(scope.row)"/> <!-- <el-input v-model="scope.row.modelName" :disabled="scope.row.disabled" placeholder="请维护模块名称" @blur="modelNameFunc(scope.row)"/>-->
</el-form-item> <!-- </el-form-item>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column <!-- <el-table-column-->
label="责任人" <!-- label="责任人"-->
min-width="15%" <!-- min-width="15%"-->
align="center"> <!-- align="center">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<el-form-item <!-- <el-form-item-->
style="margin-left: 0;margin-bottom:0;" <!-- style="margin-left: 0;margin-bottom:0;"-->
> <!-- >-->
<el-input v-model="scope.row.zrUserIdName" v-if="scope.row.pid === '0'" placeholder="请选择责任人" @click.native="choiceZRRS(scope.row.zrUserId, 1, scope.$index)"/> <!-- <el-input v-model="scope.row.zrUserIdName" v-if="scope.row.pid === '0'" placeholder="请选择责任人" @click.native="choiceZRRS(scope.row.zrUserId, 1, scope.$index)"/>-->
</el-form-item> <!-- </el-form-item>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="操作" align="center" min-width="5%"> <!-- <el-table-column label="操作" align="center" min-width="5%">-->
<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 :command="[scope.$index,scope.row, '新增']" v-btn-permission="''">新增</el-dropdown-item>--> <!--&lt;!&ndash; <el-dropdown-item :command="[scope.$index,scope.row, '新增']" v-btn-permission="''">新增</el-dropdown-item>&ndash;&gt;-->
<el-dropdown-item :command="[scope.$index,scope.row, '维护']" v-btn-permission="''">维护</el-dropdown-item> <!-- <el-dropdown-item :command="[scope.$index,scope.row, '维护']" v-btn-permission="''">维护</el-dropdown-item>-->
<el-dropdown-item :command="[scope.$index,scope.row, '删除']" v-btn-permission="''">删除</el-dropdown-item> <!-- <el-dropdown-item :command="[scope.$index,scope.row, '删除']" v-btn-permission="''">删除</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>-->
</template> <!-- </template>-->
</div> <!-- </div>-->
<div class="block" style="padding-top: 20px;" v-show="active === '3'"> <div class="block" style="padding-top: 20px;" v-show="active === '3'">
<el-timeline> <el-timeline>
<el-form <el-form
@@ -513,22 +472,22 @@
</el-form-item> </el-form-item>
</el-card> </el-card>
</el-timeline-item> </el-timeline-item>
<!-- <el-timeline-item timestamp="选择其他起草人" prop="qcUserName" placement="top" :color="roleForm.qcUserName ? '#66b1ff' : ''">--> <el-timeline-item timestamp="选择其他起草人" prop="qcUserName" placement="top" :color="roleForm.qcUserName ? '#66b1ff' : ''">
<!-- <el-card>--> <el-card>
<!-- <el-form-item prop="qcUserName" style="margin-bottom: 0">--> <el-form-item prop="qcUserName" 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.qcUserName" placeholder="其他起草人" @click.native="choiceZRRList('qcUserId', '选择其他起草人', roleForm.qcUserId)"></el-input>--> <el-input v-model="roleForm.qcUserName" clearable placeholder="其他起草人" @click.native="choiceZRR('qcUserId', '选择其他起草人', roleForm.qcUserId)"></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.hzUserName ? '#66b1ff' : ''"> <el-timeline-item timestamp="主起草人汇总修订" placement="top" :color="roleForm.hzUserName ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="hzUserName" style="margin-bottom: 0"> <el-form-item prop="hzUserName" style="margin-bottom: 0">
<h4>主起草人汇总修订人</h4> <h4>主起草人汇总修订人</h4>
<div style="margin-top: 10px;width: 300px;"> <div style="margin-top: 10px;width: 300px;">
<el-input disabled v-model="roleForm.hzUserName" placeholder="主起草人汇总修订人"></el-input> <el-input disabled v-model="roleForm.hzUserName" clearable placeholder="主起草人汇总修订人"></el-input>
</div> </div>
</el-form-item> </el-form-item>
</el-card> </el-card>
@@ -573,12 +532,12 @@
</el-form-item> </el-form-item>
</el-card> </el-card>
</el-timeline-item> </el-timeline-item>
<el-timeline-item timestamp="选择技术委员会负责刃/起草中心主任" prop="fggcsUserName" placement="top" :color="roleForm.jsfzrUserName ? '#66b1ff' : ''"> <el-timeline-item timestamp="选择技术委员会负责人/起草中心主任" prop="fggcsUserName" placement="top" :color="roleForm.jsfzrUserName ? '#66b1ff' : ''">
<el-card> <el-card>
<el-form-item prop="jsfzrUserName" style="margin-bottom: 0"> <el-form-item prop="jsfzrUserName" 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.jsfzrUserName" placeholder="选择技术委员会负责刃/起草中心主任" @click.native="choiceZRR('jsfzrUserId', '选择技术委员会负责刃/起草中心主任', roleForm.jsfzrUserId)"></el-input> <el-input v-model="roleForm.jsfzrUserName" placeholder="选择技术委员会负责人/起草中心主任" @click.native="choiceZRR('jsfzrUserId', '选择技术委员会负责人/起草中心主任', roleForm.jsfzrUserId)"></el-input>
</div> </div>
</el-form-item> </el-form-item>
</el-card> </el-card>
@@ -776,7 +735,7 @@
</div> </div>
</el-dialog> </el-dialog>
<Role-tree <Role-tree
is-title="选择责任部门对接人" :is-title="drawerTitle"
:is-visible.sync="modalShowRoleFlag" :is-visible.sync="modalShowRoleFlag"
@checkedRole="checkedRole2" @checkedRole="checkedRole2"
:nodeList="nodeList2" :nodeList="nodeList2"
@@ -968,6 +927,12 @@
@click="handleProcessStandardNext(3)">取消</el-button> @click="handleProcessStandardNext(3)">取消</el-button>
</div> </div>
</el-drawer> </el-drawer>
<Mechanism-tree
is-title="选择部门信息"
:is-visible.sync="modalShowFlagZRBM"
:nodeList="nodeListZRBM"
@checkedRole="drawerCheckZRBM"
/>
<!-- 组件树--> <!-- 组件树-->
<tree-select-new <tree-select-new
:multiple=false :multiple=false
@@ -1066,6 +1031,7 @@
}] }]
}, },
fileList: [], fileList: [],
footFileList: [],
FBGBUSSFileList: [], FBGBUSSFileList: [],
BZSMBUSSFileList: [], BZSMBUSSFileList: [],
LSBBBUSSFileList: [], LSBBBUSSFileList: [],
@@ -1159,6 +1125,8 @@
children: 'children', children: 'children',
label: 'model' label: 'model'
}, },
modalShowFlagZRBM: false,
nodeListZRBM: [],
nodeList: [], nodeList: [],
nodeList2: [], nodeList2: [],
zrType: '', zrType: '',
@@ -1202,6 +1170,8 @@
modelData:[], modelData:[],
modelDataNameVerify:[], modelDataNameVerify:[],
modelDataZrUserVerify:[], modelDataZrUserVerify:[],
footFile:'',
footFileName:'',
// 基础信息 // 基础信息
country:[], country:[],
// 基础信息 // 基础信息
@@ -1226,7 +1196,9 @@
QTWJBUSSName: '', QTWJBUSSName: '',
// 适用范围 // 适用范围
QCDW: '', QCDW: '',
QCDWID: '',
QCRBUSS: '', QCRBUSS: '',
QCRBUSSID: '',
WJSCRYBUSS: this.$store.getters.userInfo.userId, WJSCRYBUSS: this.$store.getters.userInfo.userId,
WJSCRYBUSSName: this.$store.getters.userInfo.userName, WJSCRYBUSSName: this.$store.getters.userInfo.userName,
SYCXCLASS: '', SYCXCLASS: '',
@@ -1295,7 +1267,7 @@
{ required: true, message: '请选择会签责任人', trigger: 'blur' }, { required: true, message: '请选择会签责任人', trigger: 'blur' },
], ],
fggcsUserName: [ fggcsUserName: [
{ required: true, message: '选择技术委员会负责刃/起草中心主任', trigger: 'blur' }, { required: true, message: '选择标准法规工程师', trigger: 'blur' },
], ],
jsfzrUserName: [ jsfzrUserName: [
{ required: true, message: '选择技术委员会负责人/起草中心主任', trigger: 'blur' }, { required: true, message: '选择技术委员会负责人/起草中心主任', trigger: 'blur' },
@@ -1342,7 +1314,7 @@
{ required: true, message: '请选择文本状态', trigger: 'change' } { required: true, message: '请选择文本状态', trigger: 'change' }
], ],
issueTime: [ issueTime: [
{ required: true, message: '请选择企标发布日期', trigger: 'change' } { required: false, message: '请选择企标发布日期', trigger: 'change' }
], ],
FBGBUSSName: [ FBGBUSSName: [
{ required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' } { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
@@ -1582,6 +1554,9 @@
}else if(this.userType === 'hqUserId'){ }else if(this.userType === 'hqUserId'){
this.roleForm.hqUserId=idList; this.roleForm.hqUserId=idList;
this.roleForm.hqUserName=nameList; this.roleForm.hqUserName=nameList;
}else if(this.userType === 'QCRBUSS'){
this.form.QCRBUSSID=idList;
this.form.QCRBUSS=nameList;
} }
}, },
checkedRole (data) { checkedRole (data) {
@@ -1619,6 +1594,9 @@
}else if(this.userType === 'zhrUserId'){ }else if(this.userType === 'zhrUserId'){
this.roleForm.zhrUserId = data[0].id this.roleForm.zhrUserId = data[0].id
this.roleForm.zhrUserName = data[0].name this.roleForm.zhrUserName = data[0].name
}else if(this.userType === 'qcUserId'){
this.roleForm.qcUserId = data[0].id
this.roleForm.qcUserName = data[0].name
} }
this.modalShowFlag = false this.modalShowFlag = false
}, },
@@ -1636,6 +1614,7 @@
let mes = JSON.parse(res.mes) let mes = JSON.parse(res.mes)
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
this.form = mes.form this.form = mes.form
this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName); this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName); this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName); this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
@@ -1938,8 +1917,8 @@
} }
}, },
choiceZRRList (type, title, id) { choiceZRRList (type, title, id) {
this.nodeList = [] this.nodeList2 = []
this.nodeList.push(id) this.nodeList2.push(id)
this.userType = type this.userType = type
this.drawerTitle = title this.drawerTitle = title
this.modalShowRoleFlag = true this.modalShowRoleFlag = true
@@ -1984,6 +1963,19 @@
// this.drawerTitle = title // this.drawerTitle = title
// this.modalShowRoleFlag = true // this.modalShowRoleFlag = true
// }, // },
choiceQCR (type, title, id) {
this.nodeList = []
this.nodeList.push(id)
this.userType = type
this.drawerTitle = title
this.modalShowRoleFlag = true
},
choiceQCDW(type, title, id) {
this.nodeListZRBM = []
this.nodeListZRBM.push(id)
this.drawerTitle = title
this.modalShowFlagZRBM = true
},
choiceZRR1 (type, title, id) { choiceZRR1 (type, title, id) {
this.drawerTitle = title this.drawerTitle = title
this.modalShowFlag1 = true this.modalShowFlag1 = true
@@ -2266,6 +2258,9 @@
case 'GLWJBUSS': case 'GLWJBUSS':
this.GLWJBUSSFileList = fileList this.GLWJBUSSFileList = fileList
break; break;
case 'footFile':
this.footFileList = fileList
break;
default : ; default : ;
} }
this.$message({ this.$message({
@@ -2297,6 +2292,9 @@
case 'GLWJBUSS': case 'GLWJBUSS':
this.fileList=this.GLWJBUSSFileList this.fileList=this.GLWJBUSSFileList
break; break;
case 'footFile':
this.fileList=this.footFileList
break;
default : ; default : ;
} }
this.fileMadel = true; this.fileMadel = true;
@@ -2320,9 +2318,29 @@
case 'GLWJBUSS': case 'GLWJBUSS':
this.GLWJBUSSFileList = fileList this.GLWJBUSSFileList = fileList
break; break;
case 'footFile':
this.footFileList = fileList
break;
default : ; default : ;
} }
}, },
drawerCheckZRBM(data) {
let idList = ''
let nameList = ''
data.forEach(item => {
// if (item.hasChild === '0') {
if (nameList.length > 0) {
nameList += ','
idList += ','
}
idList += item.id
nameList += item.name
// }
})
this.form.QCDW = nameList
this.form.QCDWID = idList
},
popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) { popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData) { if(checkedData) {
if(checkedData.length > 0){ if(checkedData.length > 0){
@@ -2446,6 +2464,9 @@
fileInfoHandle(){ fileInfoHandle(){
//拼接文件名和id 提交到流程Activity //拼接文件名和id 提交到流程Activity
this.form.footFile=this.footFileList.map(item => item.response.data.id).join(",")
this.form.footFileName=this.footFileList.map(item => item.name).join(",")
this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.response.data.id).join(",") this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.response.data.id).join(",")
this.form.FBGBUSSName=this.FBGBUSSFileList.map(item => item.name).join(",") this.form.FBGBUSSName=this.FBGBUSSFileList.map(item => item.name).join(",")
@@ -2531,54 +2552,54 @@
// this.form.country=this.countryArr; // this.form.country=this.countryArr;
// test // test
this.isSubmit = false this.isSubmit = false
this.changeTree(this.form.modelData) // this.changeTree(this.form.modelData)
this.$refs['form'].validate((valid) => { this.$refs['form'].validate((valid) => {
if (valid) { if (valid) {
if(this.form.modelData === undefined || this.form.modelData.length === 0){ // if(this.form.modelData === undefined || this.form.modelData.length === 0){
this.$message.warning('请检查模块信息是否填写完整') // this.$message.warning('请检查模块信息是否填写完整')
}else if( this.modelDataNameVerify !== undefined && this.modelDataNameVerify.length > 0){ // }else if( this.modelDataNameVerify !== undefined && this.modelDataNameVerify.length > 0){
this.$message.warning('请检查模块信息模块名称是否填写完整') // this.$message.warning('请检查模块信息模块名称是否填写完整')
}else if( this.modelDataZrUserVerify !== undefined && this.modelDataZrUserVerify.length > 0){ // }else if( this.modelDataZrUserVerify !== undefined && this.modelDataZrUserVerify.length > 0){
this.$message.warning('请检查模块信息责任人是否填写完整') // this.$message.warning('请检查模块信息责任人是否填写完整')
}else { // }else {
this.$refs['userForm'].validate((valid) => { // }
if (valid) { this.$refs['userForm'].validate((valid) => {
this.fileInfoHandle() if (valid) {
this.isSubmit = true this.fileInfoHandle()
this.form.country=this.countryArr; this.isSubmit = true
this.form.standCode = this.form.standSort + ' ' + this.form.standNumber + ( this.form.standYear === '' ? '' : '-' + this.form.standYear) +' X' this.form.country=this.countryArr;
var json = Object.assign(this.form, this.roleForm) this.form.standCode = this.form.standSort + ' ' + this.form.standNumber + ( this.form.standYear === '' ? '' : '-' + this.form.standYear) +' X'
json.zrUserId = this.form.zrUserId var json = Object.assign(this.form, this.roleForm)
json.jlUserId = this.form.jlUserId json.zrUserId = this.form.zrUserId
json.commentText = this.commentText json.jlUserId = this.form.jlUserId
json.applyUpdUserId = this.form.applyUpdUserId json.commentText = this.commentText
json.prcCreateUser = this.form.prcCreateUser json.applyUpdUserId = this.form.applyUpdUserId
json.prcCreateUserName = this.form.prcCreateUserName json.prcCreateUser = this.form.prcCreateUser
this.$http.get('lawss/activiti/startProcess', {type: 'buss1'}, { json.prcCreateUserName = this.form.prcCreateUserName
_this: this this.$http.get('lawss/activiti/startProcess', {type: 'buss1'}, {
}, 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.isSubmit = false this.$message.success(res.message)
// 流程提交之后，应该流转至待办任务页面 this.isSubmit = false
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) // 流程提交之后，应该流转至待办任务页面
} this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
}) }
} })
}) }
}else { })
this.$message.warning('请检查人员信息表单是否填写完整') }else {
} this.$message.warning('请检查人员信息表单是否填写完整')
}) }
} })
} else { } else {
this.$message.warning('请检查基础信息表单是否填写完整') this.$message.warning('请检查基础信息表单是否填写完整')
} }
src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
+89 -79
View File
@@ -158,14 +158,7 @@
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="起草部门" prop="QCDW" class="add-form-item form-item-disabled"> <el-form-item label="起草部门" prop="QCDW" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.QCDW" placeholder="" :disabled="disabledState" multiple> <el-input v-model="form.QCDW" :disabled="disabledState" clearable></el-input>
<el-option
v-for="item in qcdwOptions"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="文件上传人员" prop="WJSCRYBUSSName" class="add-form-item form-item-disabled"> <el-form-item label="文件上传人员" prop="WJSCRYBUSSName" class="add-form-item form-item-disabled">
<el-input <el-input
@@ -193,14 +186,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled"> <el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.QCRBUSS" placeholder="" :disabled="disabledState" > <el-input v-model="form.QCRBUSS" :disabled="disabledState" clearable></el-input>
<el-option
v-for="item in qcrOptions"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="适用车型" prop="SYCXCLASS" class="add-form-item form-item-disabled"> <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="" :disabled="disabledState" multiple> <el-select :popper-append-to-body="false" v-model="form.SYCXCLASS" placeholder="" :disabled="disabledState" multiple>
@@ -241,7 +227,7 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled"> <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
<div v-if="QTWJBUSSFileList.length>0" v-for="(value,index) in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile(value)"> <div v-if="GLWJBUSSFileList.length>0" v-for="(value,index) in this.GLWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile(value)">
<!-- {{ value.name }} --> <!-- {{ value.name }} -->
{{value.name}} {{value.name}}
</div> </div>
@@ -455,10 +441,12 @@
v-show="verifySarStandard" v-show="verifySarStandard"
show-save show-save
show-submit show-submit
show-edit :uploadFile="uploadFileStatus"
:uploadedFile="!uploadFileStatus"
:submitLoading="isSubmit" :submitLoading="isSubmit"
:saveLoading="saveLoading" :saveLoading="saveLoading"
@onLineEdit="handleOnLineEdit" @uploadFile="handleUploadFile"
@uploadedFile="handleUploadedFile"
@save="handleSave" @save="handleSave"
@submit="handleSubmit" @submit="handleSubmit"
> >
@@ -887,6 +875,7 @@
prcName: this.$route.query.prcName, prcName: this.$route.query.prcName,
detailData: [], detailData: [],
fileList: [], fileList: [],
footFileList: [],
FBGBUSSFileList: [], FBGBUSSFileList: [],
BZSMBUSSFileList: [], BZSMBUSSFileList: [],
LSBBBUSSFileList: [], LSBBBUSSFileList: [],
@@ -971,6 +960,7 @@
ListModel: false, // 新增编辑抽屉开关 ListModel: false, // 新增编辑抽屉开关
active: '1', // 默认显示 active: '1', // 默认显示
isSubmit: false, isSubmit: false,
uploadFileStatus: true,
saveLoading: false, saveLoading: false,
defaultProps: { defaultProps: {
children: 'children', children: 'children',
@@ -1027,6 +1017,8 @@
modelData:[], modelData:[],
modelDataNameVerify:[], modelDataNameVerify:[],
modelDataZrUserVerify:[], modelDataZrUserVerify:[],
footFile:'',
footFileName:'',
// 基础信息 // 基础信息
country:[], country:[],
// 基础信息 // 基础信息
@@ -1169,7 +1161,7 @@
{ required: true, message: '请选择文本状态', trigger: 'change' } { required: true, message: '请选择文本状态', trigger: 'change' }
], ],
issueTime: [ issueTime: [
{ required: true, message: '请选择企标发布日期', trigger: 'change' } { required: false, message: '请选择企标发布日期', trigger: 'change' }
], ],
FBGBUSSName: [ FBGBUSSName: [
{ required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' } { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
@@ -1468,6 +1460,7 @@
let mes = JSON.parse(res.mes) let mes = JSON.parse(res.mes)
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
this.form = mes.form this.form = mes.form
this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName); this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName); this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName); this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
@@ -2071,22 +2064,7 @@
this.$message.warning('文件不存在,下载失败') this.$message.warning('文件不存在,下载失败')
} }
} else { } else {
this.getBusStandFileByAttId(attId) this.$preview(attId)
.then(res => {
if(res){
const editFileInfo = res
if(editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG'){
window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl)
}else {
const nowTime = new Date().getTime()
// window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)));
window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)
}
}
}).catch(e => {
console.log(e)
this.$message.warning('文件不存在,预览失败')
})
} }
}, },
// 导入标准数据成功后执行 // 导入标准数据成功后执行
@@ -2113,6 +2091,10 @@
case 'GLWJBUSS': case 'GLWJBUSS':
this.GLWJBUSSFileList = fileList this.GLWJBUSSFileList = fileList
break; break;
case 'footFile':
this.footFileList = fileList
this.uploadFileStatus = this.footFileList !== undefined ? (this.footFileList.length <= 0) : true
break;
default : ; default : ;
} }
this.$message({ this.$message({
@@ -2148,6 +2130,9 @@
case 'GLWJBUSS': case 'GLWJBUSS':
this.fileList=this.GLWJBUSSFileList this.fileList=this.GLWJBUSSFileList
break; break;
case 'footFile':
this.fileList=this.footFileList
break;
default : ; default : ;
} }
this.fileMadel = true; this.fileMadel = true;
@@ -2171,6 +2156,10 @@
case 'GLWJBUSS': case 'GLWJBUSS':
this.GLWJBUSSFileList = fileList this.GLWJBUSSFileList = fileList
break; break;
case 'footFile':
this.footFileList = fileList
this.uploadFileStatus = this.footFileList !== undefined ? (this.footFileList.length <= 0) : true
break;
default : ; default : ;
} }
}, },
@@ -2282,6 +2271,17 @@
}) })
}) })
}, },
handleUploadFile(){
this.fileType = '';
this.fileType = 'footFile';
this.fileList=this.footFileList
this.fileMadel = true;
},
handleUploadedFile(){
this.fileMadel = true
},
// 在线编辑 // 在线编辑
handleOnLineEdit(){ handleOnLineEdit(){
this.isSubmit = true this.isSubmit = true
@@ -2335,6 +2335,9 @@
fileInfoHandle(){ fileInfoHandle(){
//拼接文件名和id 提交到流程Activity //拼接文件名和id 提交到流程Activity
this.form.footFile=this.footFileList.map(item => item.response.data.id).join(",")
this.form.footFileName=this.footFileList.map(item => item.name).join(",")
this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.response.data.id).join(",") this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.response.data.id).join(",")
this.form.FBGBUSSName=this.FBGBUSSFileList.map(item => item.name).join(",") this.form.FBGBUSSName=this.FBGBUSSFileList.map(item => item.name).join(",")
@@ -2438,50 +2441,54 @@
// } // }
this.$refs['formTongGuo'].validate((valid) => { this.$refs['formTongGuo'].validate((valid) => {
if (valid) { if (valid) {
this.processModelHisOne(this.pId,this.taskIds) if(this.footFileList !== undefined && this.footFileList.length > 0){
.then(res => { this.isSubmit = true
if(res){ this.saveLoading = true
const editFileInfo = res this.form.commentText = this.formTongGuo.commentText
if(editFileInfo && editFileInfo.editStatus === '1'){ this.form.approvalOpinion = this.formTongGuo.approvalOpinion
this.isSubmit = true const json = JSON.stringify(this.form);
this.saveLoading = true this.$http.post('lawss/activiti/completeTask', {
this.form.commentText = this.formTongGuo.commentText taskIds: this.taskIds,
this.form.approvalOpinion = this.formTongGuo.approvalOpinion userId : this.userId,
const json = JSON.stringify(this.form); json: json
this.$http.post('lawss/activiti/completeTask', { }, {
taskIds: this.taskIds, _this: this
userId : this.userId, }, res => {
json: json if (res.success) {
}, { this.$message.success(res.message)
_this: this // 流程提交之后，应该流转至待办任务页面
}, res => { this.isSubmit = false
if (res.success) { this.saveLoading = false
this.$message.success(res.message) this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
// 流程提交之后，应该流转至待办任务页面 // if(this.formTongGuo.approvalOpinion === '1'){
this.isSubmit = false // this.$message.warning("驳回成功")
this.saveLoading = false // this.isSubmit = false
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) // // 流程提交之后，应该流转至待办任务页面
// if(this.formTongGuo.approvalOpinion === '1'){ // this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
// this.$message.warning("驳回成功") // }else{
// this.isSubmit = false // this.processCreateLaws(json)
// // 流程提交之后，应该流转至待办任务页面 // }
// this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) }else {
// }else{ this.$message.success(res.message)
// this.processCreateLaws(json)
// }
}else {
this.$message.success(res.message)
}
})
}else {
this.$message.warning('请先在线编辑,再提交流程')
}
} }
}).catch(e => { })
console.log(e) }else {
// this.$message.warning('文件不存在,预览失败') this.$message.warning('请先上传文件,再提交流程')
}) }
// this.processModelHisOne(this.pId,this.taskIds)
// .then(res => {
// if(res){
// const editFileInfo = res
// if(editFileInfo && editFileInfo.editStatus === '1'){
// }else {
// this.$message.warning('请先在线编辑,再提交流程')
// }
//
// }
// }).catch(e => {
// console.log(e)
// // this.$message.warning('文件不存在,预览失败')
// })
}}) }})
}, },
busVsFunc(){ busVsFunc(){
@@ -2547,11 +2554,13 @@
} }
this.getFormFieldList(processForm) this.getFormFieldList(processForm)
this.footFileList=this.assemble(processForm.footFile,processForm.footFileName);
this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName); this.FBGBUSSFileList=this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName);
this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName); this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName);
this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName); this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName);
this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName); this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName);
this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName); this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName);
this.uploadFileStatus = this.footFileList !== undefined ? (this.footFileList.length <= 0) : true
} }
}).catch(e => { }).catch(e => {
}) })
@@ -2590,6 +2599,7 @@
}, },
}, },
mounted () { mounted () {
this.getTaskId()
this.getData() this.getData()
this.processTable() this.processTable()
this.$http.get('sys/dictype/getDicTypeListCode', '', { this.$http.get('sys/dictype/getDicTypeListCode', '', {