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

feat: There is no way the,

Browse Source
This commit is contained in:
super_liu
2022-01-05 17:53:53 +08:00
parent b7be041a71
commit ad906769e6
23 changed files with 696 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue
+7 -7
View File
@@ -40,13 +40,6 @@
<!-- placeholder="请输入标准年份"--> <!-- placeholder="请输入标准年份"-->
<!-- clearable></el-input>--> <!-- clearable></el-input>-->
<!-- </el-form-item>--> <!-- </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"
:editable="false"
placeholder="请选择企标实施日期"
value-format="yyyy-MM-dd"
></el-datePicker>
</el-form-item>
<!-- <el-form-item v-show="verifySarStandard" label="复审日期" prop="FSRQBUSS" class="add-form-item form-item-disabled">--> <!-- <el-form-item v-show="verifySarStandard" label="复审日期" prop="FSRQBUSS" class="add-form-item form-item-disabled">-->
<!-- <el-datePicker v-model="form.FSRQBUSS"--> <!-- <el-datePicker v-model="form.FSRQBUSS"-->
<!-- :editable="false"--> <!-- :editable="false"-->
@@ -82,6 +75,13 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </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"
: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-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">-->
<!-- <el-datePicker v-model="form.issueTime"--> <!-- <el-datePicker v-model="form.issueTime"-->
<!-- :editable="false"--> <!-- :editable="false"-->
src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue
+24 -4
View File
@@ -1022,7 +1022,7 @@
import ProcessHeader from '../../components/ProcessHeader' import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter' import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId} from "api/process"; import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,taskDel} from "api/process";
import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
import treeSelectModule from "@/components/treeSelect/treeSelectModule.vue"; import treeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
@@ -2651,9 +2651,17 @@
json.applyUpdUserId = this.form.applyUpdUserId json.applyUpdUserId = this.form.applyUpdUserId
json.prcCreateUser = this.form.prcCreateUser json.prcCreateUser = this.form.prcCreateUser
json.prcCreateUserName = this.form.prcCreateUserName json.prcCreateUserName = this.form.prcCreateUserName
this.$http.get('lawss/activiti/startProcess', {type: 'buss2'}, { this.$http.post('lawss/activiti/startProcessRollBack', {
_this: this id: this.$route.query.bpnId || '',
}, res => { createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
type: 'buss2',
json: JSON.stringify({
form: this.form,
roleForm: this.roleForm,
commentText: this.commentText
})
}, {}, res => {
if (res.ok) { if (res.ok) {
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
taskIds: res.data, taskIds: res.data,
@@ -2665,12 +2673,24 @@
if (res.success) { if (res.success) {
this.$message.success(res.message) this.$message.success(res.message)
this.isSubmit = false this.isSubmit = false
if (this.$route.query.bpnId !== '') {
let taskId = {
id: this.$route.query.bpnId
}
taskDel(taskId).then(res=>{
return res
})
}
// 流程提交之后，应该流转至待办任务页面 // 流程提交之后，应该流转至待办任务页面
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
} }
}) })
} }
}) })
// this.$http.get('lawss/activiti/startProcess', {type: 'buss2'}, {
// _this: this
// }, res => {
// })
}else { }else {
this.$message.warning('请检查人员信息表单是否填写完整') this.$message.warning('请检查人员信息表单是否填写完整')
} }
src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue
+39 -15
View File
@@ -68,24 +68,48 @@
<el-table-column <el-table-column
prop="commentText" prop="commentText"
label="会签意见" label="会签意见"
min-width="70%" min-width="35%"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column
prop="commentText"
label="会签意见文件"
min-width="35%"
align="left">
<template slot-scope="scope">
<el-form-item
style="margin-left: 0;margin-bottom:0;"
>
<div v-if="scope.row.summaryList.length>0" v-for="(value,index) in scope.row.summaryList" :title="value.name" :key="index" style="margin-left: -210px;cursor: pointer;color: #00b7ee" @click="downloadFile(value)">
<!-- {{ value.name }} -->
{{value.name | ellipsis}}
</div>
<div v-else>
- -
</div>
</el-form-item>
</template>
</el-table-column>
<el-table-column
label="意见是否采纳"
min-width="15%"
align="center">
<template slot-scope="scope">
<el-form-item
style="margin-left: 0;margin-bottom:0;"
>
<el-select style="margin-left: -223px;" v-model="scope.row.opinionsAdopted" filterable clearable>
<el-option
v-for="item in opinionsAdoptedOptions"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
</template>
</el-table-column>
</el-table> </el-table>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="汇总意见是否采纳" prop="opinionsAdopted" class="add-form-item form-item-disabled">
<el-select v-model="form.opinionsAdopted" filterable clearable>
<el-option
v-for="item in opinionsAdoptedOptions"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</div> </div>
</template> </template>
<div> <div>
src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue
+178 -158
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">
@@ -19,44 +19,44 @@
> >
<div style="flex: auto;" v-show="active === '1'"> <div style="flex: auto;" v-show="active === '1'">
<formEditList <formEditList
:key = "formKey" :key = "formKey"
:formSub = "form" :formSub = "form"
:FBGBUSSFileListSub = "FBGBUSSFileList" :FBGBUSSFileListSub = "FBGBUSSFileList"
:LSBBBUSSFileListSub = "LSBBBUSSFileList" :LSBBBUSSFileListSub = "LSBBBUSSFileList"
:BZSMBUSSFileListSub = "BZSMBUSSFileList" :BZSMBUSSFileListSub = "BZSMBUSSFileList"
:QTWJBUSSFileListSub = "QTWJBUSSFileList" :QTWJBUSSFileListSub = "QTWJBUSSFileList"
:GLWJBUSSFileListSub = "GLWJBUSSFileList" :GLWJBUSSFileListSub = "GLWJBUSSFileList"
:disabledState = "disabledState" :disabledState = "disabledState"
:verifySarStandard = "verifySarStandard" :verifySarStandard = "verifySarStandard"
:fileMadelSub = "fileMadel" :fileMadelSub = "fileMadel"
:fbgDown = "false" :fbgDown = "false"
@formCancel="formCancel" @formCancel="formCancel"
@formSelectLawsCancel = "formSelectLawsCancel" @formSelectLawsCancel = "formSelectLawsCancel"
@formChoiceZRRListCancel = "formChoiceZRRListCancel" @formChoiceZRRListCancel = "formChoiceZRRListCancel"
@formChoiceQCDW = "formChoiceQCDW" @formChoiceQCDW = "formChoiceQCDW"
/> />
<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: auto;position: relative;">
<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:auto;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'}"
:data="form.fileModelList" :data="form.fileModelList"
border border
default-expand-all> default-expand-all>
<!-- <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">-->
<!-- {{scope.$index + 1}}--> <!-- {{scope.$index + 1}}-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column <el-table-column
prop="footFileName" prop="footFileName"
label="编写文件名称" label="编写文件名称"
@@ -91,6 +91,14 @@
ref="formTongGuo" ref="formTongGuo"
:model="formTongGuo" :model="formTongGuo"
:rules="rules"> :rules="rules">
<!-- <el-form-item-->
<!-- prop="approvalOpinion"-->
<!-- >-->
<!-- <el-select @change="getRule" v-model="formTongGuo.approvalOpinion" placeholder="请审批" style="margin-bottom: 20px;">-->
<!-- <el-option label="驳回" value="1"></el-option>-->
<!-- <el-option label="通过" value="0"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item <el-form-item
prop="commentText" prop="commentText"
> >
@@ -108,85 +116,85 @@
</el-collapse> </el-collapse>
</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>--> <!-- <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-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'">
<div class="flow-list"> <div class="flow-list">
<el-table <el-table
@@ -1642,8 +1650,20 @@
} }
}, },
choiceZRRList (type, title, id) { choiceZRRList (type, title, id) {
this.nodeList = [] this.nodeList2 = []
this.nodeList.push(id) if(type === 'bussUser2'){
if ( this.roleForm.bussUser2.length > 0) {
this.nodeList2 = this.roleForm.bussUser2.split(',')
}
}else if(type === 'bussUser5'){
if ( this.roleForm.bussUser5.length > 0) {
this.nodeList2 = this.roleForm.bussUser5.split(',')
}
}else if(type === 'QCRBUSS'){
if ( this.form.QCRBUSSID.length > 0) {
this.nodeList2 = this.form.QCRBUSSID.split(',')
}
}
this.userType = type this.userType = type
this.drawerTitle = title this.drawerTitle = title
this.modalShowRoleFlag = true this.modalShowRoleFlag = true
@@ -1979,7 +1999,7 @@
const fileObj = {} const fileObj = {}
fileObj.id = file.response.data.id fileObj.id = file.response.data.id
fileObj.name = file.response.data.name fileObj.name = file.response.data.name
switch (this.fileType){ switch (this.fileType){
case 'FBGBUSS': case 'FBGBUSS':
this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined); this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined);
this.FBGBUSSFileList.push(fileObj) this.FBGBUSSFileList.push(fileObj)
@@ -2339,55 +2359,55 @@
// } // }
this.fileInfoHandle() this.fileInfoHandle()
this.$refs['form'].validate((valid) => { this.$refs['form'].validate((valid) => {
if (valid) { if (valid) {
this.$refs['formTongGuo'].validate((valid) => { this.$refs['formTongGuo'].validate((valid) => {
if (valid) { if (valid) {
this.isSubmit = true this.isSubmit = true
this.saveLoading = true this.saveLoading = true
this.form.commentText = this.formTongGuo.commentText this.form.commentText = this.formTongGuo.commentText
this.form.approvalOpinion = this.formTongGuo.approvalOpinion this.form.approvalOpinion = this.formTongGuo.approvalOpinion
const json = JSON.stringify(this.form); const json = JSON.stringify(this.form);
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds, taskIds: this.taskIds,
userId : this.userId, userId : this.userId,
json: json json: json
}, { }, {
_this: this _this: this
}, res => { }, res => {
if (res.success) { if (res.success) {
this.$message.success(res.message) this.$message.success(res.message)
// 流程提交之后，应该流转至待办任务页面 // 流程提交之后，应该流转至待办任务页面
this.isSubmit = false this.isSubmit = false
this.saveLoading = false this.saveLoading = false
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
// if(this.formTongGuo.approvalOpinion === '1'){ // if(this.formTongGuo.approvalOpinion === '1'){
// this.$message.warning("驳回成功") // this.$message.warning("驳回成功")
// this.isSubmit = false // this.isSubmit = false
// // 流程提交之后，应该流转至待办任务页面 // // 流程提交之后，应该流转至待办任务页面
// this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) // this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
// }else{ // }else{
// this.processCreateLaws(json) // this.processCreateLaws(json)
// } // }
}else { }else {
this.$message.success(res.message) this.$message.success(res.message)
} }
}) })
// this.processModelHisOneCount(this.pId) // this.processModelHisOneCount(this.pId)
// .then(res => { // .then(res => {
// if(res){ // if(res){
// const editFileInfo = res // const editFileInfo = res
// if(editFileInfo && editFileInfo.editStatus === '1'){ // if(editFileInfo && editFileInfo.editStatus === '1'){
// }else { // }else {
// this.$message.warning('请先在线编辑,再提交流程') // this.$message.warning('请先在线编辑,再提交流程')
// } // }
// //
// } // }
// }).catch(e => { // }).catch(e => {
// console.log(e) // console.log(e)
// // this.$message.warning('文件不存在,预览失败') // // this.$message.warning('文件不存在,预览失败')
// }) // })
}}) }})
} }
}) })
}, },
busVsFunc(){ busVsFunc(){
src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue
+55 -19
View File
@@ -39,11 +39,11 @@
<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: auto;position: relative;">
<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:auto;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"
@@ -68,24 +68,48 @@
<el-table-column <el-table-column
prop="commentText" prop="commentText"
label="会签意见" label="会签意见"
min-width="70%" min-width="35%"
align="center"> align="center">
</el-table-column> </el-table-column>
<el-table-column
prop="commentText"
label="会签意见文件"
min-width="35%"
align="left">
<template slot-scope="scope">
<el-form-item
style="margin-left: 0;margin-bottom:0;"
>
<div v-if="scope.row.summaryList.length>0" v-for="(value,index) in scope.row.summaryList" :title="value.name" :key="index" style="margin-left: -210px;cursor: pointer;color: #00b7ee" @click="downloadFile(value)">
<!-- {{ value.name }} -->
{{value.name | ellipsis}}
</div>
<div v-else>
- -
</div>
</el-form-item>
</template>
</el-table-column>
<el-table-column
label="意见是否采纳"
min-width="15%"
align="center">
<template slot-scope="scope">
<el-form-item
style="margin-left: 0;margin-bottom:0;"
>
<el-select style="margin-left: -223px;" v-model="scope.row.opinionsAdopted" filterable clearable>
<el-option
v-for="item in opinionsAdoptedOptions"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
</template>
</el-table-column>
</el-table> </el-table>
<el-row :gutter="24">
<el-col :span="12">
<el-form-item label="汇总意见是否采纳" prop="opinionsAdopted" class="add-form-item form-item-disabled">
<el-select v-model="form.opinionsAdopted" filterable clearable>
<el-option
v-for="item in opinionsAdoptedOptions"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
</div> </div>
</template> </template>
<div> <div>
@@ -1655,8 +1679,20 @@
} }
}, },
choiceZRRList (type, title, id) { choiceZRRList (type, title, id) {
this.nodeList = [] this.nodeList2 = []
this.nodeList.push(id) if(type === 'bussUser2'){
if ( this.roleForm.bussUser2.length > 0) {
this.nodeList2 = this.roleForm.bussUser2.split(',')
}
}else if(type === 'bussUser5'){
if ( this.roleForm.bussUser5.length > 0) {
this.nodeList2 = this.roleForm.bussUser5.split(',')
}
}else if(type === 'QCRBUSS'){
if ( this.form.QCRBUSSID.length > 0) {
this.nodeList2 = this.form.QCRBUSSID.split(',')
}
}
this.userType = type this.userType = type
this.drawerTitle = title this.drawerTitle = title
this.modalShowRoleFlag = true this.modalShowRoleFlag = true
src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
+65 -24
View File
@@ -330,33 +330,33 @@
@click="selectLaws('DTQBBHBUSS'),config.attrName = '代替企标编号'" @click="selectLaws('DTQBBHBUSS'),config.attrName = '代替企标编号'"
>{{'手动查找'}}</el-button> >{{'手动查找'}}</el-button>
</el-form-item> </el-form-item>
<el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled"> <el-form-item label="采用标准" prop="CYBZ" class="add-form-item form-item-disabled">
<el-input <el-input
disabled v-model="form.CYBZ"
style="display: none;" placeholder="请输入采用标准"
v-model="form.GLWJBUSSName"
clearable clearable
></el-input> ></el-input>
<div style="display: flex;justify-content: space-between"> <el-button
<div style="width: 80%;"> type="primary"
<div v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass"> class="common-button-primary"
<span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span> size="mini"
<span style="width: 20%;margin-left: 15px;"> style="position:absolute;top: 10px;right: 0;"
<el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreview(item,'down')"></el-button> @click="selectLaws('CYBZ'),config.attrName = '采用标准'"
</span> >{{'手动查找'}}</el-button>
</div> </el-form-item>
</div> <el-form-item label="引用标准" prop="YYBZ" class="add-form-item form-item-disabled">
<div style="width: 20%;"> <el-input
<el-button v-model="form.YYBZ"
type="primary" placeholder="请输入引用标准"
class="common-button-primary" clearable
size="mini" ></el-input>
style="margin-left: 10px; margin-top: 11px; float: right;" <el-button
@click="fileUpload('GLWJBUSS')"> type="primary"
<i class="el-icon-upload"></i> class="common-button-primary"
</el-button> size="mini"
</div> style="position:absolute;top: 10px;right: 0;"
</div> @click="selectLaws('YYBZ'),config.attrName = '引用标准'"
>{{'手动查找'}}</el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@@ -382,6 +382,46 @@
:disabled="true" :disabled="true"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="采标程度" prop="CBCD" class="add-form-item form-item-disabled">
<el-select v-model="form.CBCD" filterable clearable
placeholder="请先选择采标程度"
>
<el-option
v-for="item in cbcdOptions"
: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
disabled
style="display: none;"
v-model="form.GLWJBUSSName"
clearable
></el-input>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
<span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<span style="width: 20%;margin-left: 15px;">
<el-button type="primary" size="mini" plain icon="el-icon-download" @click="handleFilePreview(item,'down')"></el-button>
</span>
</div>
</div>
<div style="width: 20%;">
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
@click="fileUpload('GLWJBUSS')">
<i class="el-icon-upload"></i>
</el-button>
</div>
</div>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@@ -680,6 +720,7 @@ export default {
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.gkglbmOptions=res.data.GKGLBM;//归口管理部门 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度
this.setMap(this.standStateOptions) this.setMap(this.standStateOptions)
}) })
this.busVsFunc() this.busVsFunc()
src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue
+32 -9
View File
@@ -174,7 +174,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-input v-model="form.QCRBUSS" :disabled="disabledState" clearable></el-input> <el-input v-model="form.QCRBUSS" :title="form.QCRBUSS" :disabled="disabledState" clearable></el-input>
</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>
@@ -220,14 +220,17 @@
clearable clearable
></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="CYBZ" class="add-form-item form-item-disabled">
<div v-if="GLWJBUSSFileList.length>0" v-for="(value,index) in this.GLWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile(value)"> <el-input
<!-- {{ value.name }} --> v-model="form.CYBZ" :disabled="disabledState"
{{value.name}} clearable
</div> ></el-input>
<div v-else> </el-form-item>
- - <el-form-item label="引用标准" prop="YYBZ" class="add-form-item form-item-disabled">
</div> <el-input
v-model="form.YYBZ" :disabled="disabledState"
clearable
></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@@ -244,6 +247,25 @@
:disabled="true" :disabled="true"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="采标程度" prop="CBCD" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.CBCD" placeholder="" :disabled="disabledState" multiple>
<el-option
v-for="item in cbcdOptions"
: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">
<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}}
</div>
<div v-else>
- -
</div>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@@ -498,6 +520,7 @@ export default {
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.gkglbmOptions=res.data.GKGLBM;//归口管理部门 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度
this.setMap(this.standStateOptions) this.setMap(this.standStateOptions)
}) })
this.busVsFunc() this.busVsFunc()
src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue
+31 -8
View File
@@ -226,14 +226,17 @@
clearable clearable
></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="CYBZ" class="add-form-item form-item-disabled">
<div v-if="GLWJBUSSFileList.length>0" v-for="(value,index) in this.GLWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile(value)"> <el-input
<!-- {{ value.name }} --> v-model="form.CYBZ" :disabled="disabledState"
{{value.name}} clearable
</div> ></el-input>
<div v-else> </el-form-item>
- - <el-form-item label="引用标准" prop="YYBZ" class="add-form-item form-item-disabled">
</div> <el-input
v-model="form.YYBZ" :disabled="disabledState"
clearable
></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@@ -250,6 +253,25 @@
:disabled="true" :disabled="true"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="采标程度" prop="CBCD" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.CBCD" placeholder="" :disabled="disabledState" multiple>
<el-option
v-for="item in cbcdOptions"
: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">
<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}}
</div>
<div v-else>
- -
</div>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@@ -504,6 +526,7 @@ export default {
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.gkglbmOptions=res.data.GKGLBM;//归口管理部门 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度
this.setMap(this.standStateOptions) this.setMap(this.standStateOptions)
}) })
this.busVsFunc() this.busVsFunc()
src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+138 -27
View File
@@ -281,6 +281,7 @@
<el-input <el-input
v-model="form.QCRBUSS" v-model="form.QCRBUSS"
placeholder="选择起草人" placeholder="选择起草人"
:title="form.QCRBUSS"
readonly="readonly" readonly="readonly"
@click.native="choiceZRRList('QCRBUSS', '选择起草人', form.QCRBUSS)"> @click.native="choiceZRRList('QCRBUSS', '选择起草人', form.QCRBUSS)">
</el-input> </el-input>
@@ -339,28 +340,33 @@
@click="selectLaws('DTQBBHBUSS'),config.attrName = '代替企标编号'" @click="selectLaws('DTQBBHBUSS'),config.attrName = '代替企标编号'"
>{{'手动查找'}}</el-button> >{{'手动查找'}}</el-button>
</el-form-item> </el-form-item>
<el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled"> <el-form-item label="采用标准" prop="CYBZ" class="add-form-item form-item-disabled">
<el-input <el-input
disabled v-model="form.CYBZ"
style="display: none;" placeholder="请输入采用标准"
v-model="form.GLWJBUSSName"
clearable clearable
></el-input> ></el-input>
<div style="display: flex;justify-content: space-between"> <el-button
<div style="width: 80%;"> type="primary"
<div v-for="(item,index) in GLWJBUSSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div> class="common-button-primary"
</div> size="mini"
<div style="width: 20%;"> style="position:absolute;top: 10px;right: 0;"
<el-button @click="selectLaws('CYBZ'),config.attrName = '采用标准'"
type="primary" >{{'手动查找'}}</el-button>
class="common-button-primary" </el-form-item>
size="mini" <el-form-item label="引用标准" prop="YYBZ" class="add-form-item form-item-disabled">
style="margin-left: 10px; margin-top: 11px; float: right;" <el-input
@click="fileUpload('GLWJBUSS')"> v-model="form.YYBZ"
<i class="el-icon-upload"></i> placeholder="请输入引用标准"
</el-button> clearable
</div> ></el-input>
</div> <el-button
type="primary"
class="common-button-primary"
size="mini"
style="position:absolute;top: 10px;right: 0;"
@click="selectLaws('YYBZ'),config.attrName = '引用标准'"
>{{'手动查找'}}</el-button>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
@@ -386,6 +392,41 @@
:disabled="true" :disabled="true"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="采标程度" prop="CBCD" class="add-form-item form-item-disabled">
<el-select v-model="form.CBCD" filterable clearable
placeholder="请先选择采标程度"
>
<el-option
v-for="item in cbcdOptions"
: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
disabled
style="display: none;"
v-model="form.GLWJBUSSName"
clearable
></el-input>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in GLWJBUSSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px; margin-top: 11px; float: right;"
@click="fileUpload('GLWJBUSS')">
<i class="el-icon-upload"></i>
</el-button>
</div>
</div>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@@ -1038,7 +1079,7 @@
import ProcessHeader from '../../components/ProcessHeader' import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter' import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId} from "api/process"; import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,taskDel} from "api/process";
import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
import treeSelectModule from "@/components/treeSelect/treeSelectModule.vue"; import treeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
@@ -1055,6 +1096,15 @@
TreeSelectNew, TreeSelectNew,
treeSelectModule treeSelectModule
}, },
filters: {
ellipsis (value) {
if (!value) return ''
if (value.length > 35) {
return value.slice(0,35) + '...'
}
return value
}
},
data () { data () {
const validateZrUserIdName = (rule, value, callback) => { const validateZrUserIdName = (rule, value, callback) => {
if(this.FBGBUSSFileList.length === 0){ if(this.FBGBUSSFileList.length === 0){
@@ -1321,6 +1371,10 @@
GLWJBUSS: '', GLWJBUSS: '',
GLWJBUSSName: '', GLWJBUSSName: '',
XCSJBUSS: '', XCSJBUSS: '',
CBCD:'',
CYBZ:'',
YYBZ:'',
standNum:'',
}, // 标准信息 }, // 标准信息
roleForm:{ roleForm:{
hzUserId: this.$store.getters.userInfo.userId, hzUserId: this.$store.getters.userInfo.userId,
@@ -1425,6 +1479,9 @@
issueTime: [ issueTime: [
{ required: false, message: '请选择企标发布日期', trigger: 'change' } { required: false, message: '请选择企标发布日期', trigger: 'change' }
], ],
putTime: [
{ required: false, message: '请选择企标实施日期', trigger: 'change' }
],
FBGBUSSName: [ FBGBUSSName: [
{ required: false, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' } { required: false, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
], ],
@@ -1806,6 +1863,16 @@
XCSJBUSS: '', XCSJBUSS: '',
} // 标准信息 } // 标准信息
}, },
filterDate(data){
if(data === undefined || data === null || data === '' || data === 'null'){
return ""
}else if (data.toString().indexOf(",") !== -1){
data = data.toString().split(",")
}else {
data = data.toString()
}
return data
},
handleProcessStandardNext(status) { handleProcessStandardNext(status) {
switch (status) { switch (status) {
// 新增 // 新增
@@ -1824,6 +1891,18 @@
this.form.planId = this.standardCheckedList[0].id this.form.planId = this.standardCheckedList[0].id
this.form.planStatus = this.standardCheckedList[0].planStatus this.form.planStatus = this.standardCheckedList[0].planStatus
this.form.reviseStatus = this.standardCheckedList[0].reviseStatus this.form.reviseStatus = this.standardCheckedList[0].reviseStatus
// 代替企标编号
this.form.DTQBBHBUSS = this.filterDate(this.standardCheckedList[0].rqbName)
// 标准编号
this.form.standNum = this.filterDate(this.standardCheckedList[0].standNum)
// 适用车型
this.form.SYCXCLASS = this.filterDate(this.standardCheckedList[0].area)
// 采标程度
this.form.CBCD = this.filterDate(this.standardCheckedList[0].useLevel)
// 采用标准
this.form.CYBZ = this.filterDate(this.standardCheckedList[0].esStandRelations)
// 引用标准
this.form.YYBZ = this.filterDate(this.standardCheckedList[0].esMatingRelations)
this.standardDrawer = false this.standardDrawer = false
this.verifySarStandard = true this.verifySarStandard = true
this.planDisabled = false this.planDisabled = false
@@ -2220,10 +2299,10 @@
// 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖 // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
if(this.replaceLawType === 'DTQBBHBUSS'){ if(this.replaceLawType === 'DTQBBHBUSS'){
this.form.DTQBBHBUSS = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',') this.form.DTQBBHBUSS = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'yybj'){ }else if(this.replaceLawType === 'CYBZ'){
this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',') this.form.CYBZ = this.form.CYBZ ? this.form.CYBZ + ',' +textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'cbbh'){ }else if(this.replaceLawType === 'YYBZ'){
this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',') this.form.YYBZ = this.form.YYBZ ? this.form.YYBZ + ',' +textArr.join(',') : textArr.join(',')
}else if(this.replaceLawType === 'bfbdtbzh'){ }else if(this.replaceLawType === 'bfbdtbzh'){
this.form.bfbdtbzh = this.form.bfbdtbzh ? this.form.bfbdtbzh + ',' +textArr.join(',') : textArr.join(',') this.form.bfbdtbzh = this.form.bfbdtbzh ? this.form.bfbdtbzh + ',' +textArr.join(',') : textArr.join(',')
}else { }else {
@@ -2440,6 +2519,17 @@
this.form.QCDW = nameList this.form.QCDW = nameList
this.form.QCDWID = idList this.form.QCDWID = idList
if(this.form.QCDWID !== undefined && this.form.QCDWID && this.form.QCDWID.length > 0){
this.$http.get('SarInstitution/institution/getInstitutionIdToDept', {institutionIds:this.form.QCDWID}, {
_this: this,
}, res=> {
if(res){
this.form.QCRBUSSID = res.map(item => item.id).join(",")
this.form.QCRBUSS = res.map(item => item.name).join(",")
}
})
}
}, },
popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) { popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
if(checkedData) { if(checkedData) {
@@ -2698,9 +2788,17 @@
json.applyUpdUserId = this.form.applyUpdUserId json.applyUpdUserId = this.form.applyUpdUserId
json.prcCreateUser = this.form.prcCreateUser json.prcCreateUser = this.form.prcCreateUser
json.prcCreateUserName = this.form.prcCreateUserName json.prcCreateUserName = this.form.prcCreateUserName
this.$http.get('lawss/activiti/startProcess', {type: 'buss1'}, { this.$http.post('lawss/activiti/startProcessRollBack', {
_this: this id: this.$route.query.bpnId || '',
}, res => { createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
type: 'buss1',
json: JSON.stringify({
form: this.form,
roleForm: this.roleForm,
commentText: this.commentText
})
}, {}, res => {
if (res.ok) { if (res.ok) {
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
taskIds: res.data, taskIds: res.data,
@@ -2721,6 +2819,14 @@
if (res.data === '操作成功') { if (res.data === '操作成功') {
this.submitLoading = false this.submitLoading = false
this.isSubmit = false this.isSubmit = false
if (this.$route.query.bpnId !== '') {
let taskId = {
id: this.$route.query.bpnId
}
taskDel(taskId).then(res=>{
return res
})
}
// 流程提交之后，应该流转至待办任务页面 // 流程提交之后，应该流转至待办任务页面
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) } else { this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) } else {
} }
@@ -2732,6 +2838,10 @@
}) })
} }
}) })
// this.$http.get('lawss/activiti/startProcess', {type: 'buss1'}, {
// _this: this
// }, res => {
// })
}else { }else {
this.$message.warning('请检查人员信息表单是否填写完整') this.$message.warning('请检查人员信息表单是否填写完整')
} }
@@ -2797,6 +2907,7 @@
this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师 this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
this.zrbmOptions = res.data.ZRBMCLASS // 责任部门 this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
this.gkglbmOptions=res.data.GKGLBM;//归口管理部门 this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
this.cbcdOptions=res.data.DEGREESTANDARD;//采标程度
this.setMap(this.standStateOptions) this.setMap(this.standStateOptions)
}) })
this.busVsFunc() this.busVsFunc()
src/pages/processCenter/pages/creatProcess/qbrk/step10.vue
+4
View File
@@ -853,6 +853,10 @@
GLWJBUSS: '', GLWJBUSS: '',
GLWJBUSSName: '', GLWJBUSSName: '',
XCSJBUSS: '', XCSJBUSS: '',
CBCD:'',
CYBZ:'',
YYBZ:'',
standNum:'',
}, // 标准信息 }, // 标准信息
roleForm:{ roleForm:{
hzUserId: this.$store.getters.userInfo.userId, hzUserId: this.$store.getters.userInfo.userId,
src/pages/processCenter/pages/creatProcess/qbrk/step11.vue
+4
View File
@@ -852,6 +852,10 @@
GLWJBUSS: '', GLWJBUSS: '',
GLWJBUSSName: '', GLWJBUSSName: '',
XCSJBUSS: '', XCSJBUSS: '',
CBCD:'',
CYBZ:'',
YYBZ:'',
standNum:'',
}, // 标准信息 }, // 标准信息
roleForm:{ roleForm:{
hzUserId: this.$store.getters.userInfo.userId, hzUserId: this.$store.getters.userInfo.userId,
src/pages/processCenter/pages/creatProcess/qbrk/step12.vue
+31 -14
View File
@@ -843,6 +843,10 @@
commentText:'', commentText:'',
prcName:'', prcName:'',
standType: '', standType: '',
CBCD:'',
CYBZ:'',
YYBZ:'',
standNum:'',
}, // 标准信息 }, // 标准信息
roleForm:{ roleForm:{
hzUserId: this.$store.getters.userInfo.userId, hzUserId: this.$store.getters.userInfo.userId,
@@ -2324,21 +2328,34 @@
}) })
} }
}, },
regDate(data){
if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== null && this.form.DTQBBHBUSS.indexOf(data) !== -1){
data = data + ' X'
}
return data
},
getStandInfoByReviseStatus() { getStandInfoByReviseStatus() {
this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:this.form.reviseStatus}, { let date = new Date();
_this: this let year = date.getFullYear();
}, res => { if(this.form.reviseStatus === '2'){
const obj = res.data this.form.standSn = this.form.standNum
let standSn = (obj === null || obj.newStandSn === null) ? '001' : obj.newStandSn this.form.standNumber = this.form.standNum
let date = new Date(); this.form.standYear = this.regDate(year)
let year = date.getFullYear(); this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
this.form.standSn = standSn }else {
this.form.standNumber = standSn this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss1_'+this.form.reviseStatus}, {
this.form.standYear = this.form.reviseStatus === '1' ? year : (year + ' X') // 待带入立项标准 _this: this
this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) }, res => {
}, e => { const obj = res.data
}) let standSn = (obj === null || obj.newStandSn === null) ? '2280' : obj.newStandSn
this.form.standSn = standSn
this.form.standNumber = standSn
this.form.standYear = year // 待带入立项标准
this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear )
}, e => {
})
}
}, },
processTable () { processTable () {
this.$nextTick(() => { this.$nextTick(() => {
src/pages/processCenter/pages/creatProcess/qbrk/step2.vue
+4
View File
@@ -843,6 +843,10 @@
GLWJBUSS: '', GLWJBUSS: '',
GLWJBUSSName: '', GLWJBUSSName: '',
XCSJBUSS: '', XCSJBUSS: '',
CBCD:'',
CYBZ:'',
YYBZ:'',
standNum:'',
}, // 标准信息 }, // 标准信息
roleForm:{ roleForm:{
hzUserId: this.$store.getters.userInfo.userId, hzUserId: this.$store.getters.userInfo.userId,
src/pages/processCenter/pages/creatProcess/qbrk/step3.vue
+17
View File
@@ -909,6 +909,10 @@
GLWJBUSS: '', GLWJBUSS: '',
GLWJBUSSName: '', GLWJBUSSName: '',
XCSJBUSS: '', XCSJBUSS: '',
CBCD:'',
CYBZ:'',
YYBZ:'',
standNum:'',
}, // 标准信息 }, // 标准信息
roleForm:{ roleForm:{
hzUserId: this.$store.getters.userInfo.userId, hzUserId: this.$store.getters.userInfo.userId,
@@ -1012,6 +1016,9 @@
issueTime: [ issueTime: [
{ required: false, message: '请选择企标发布日期', trigger: 'change'} { required: false, message: '请选择企标发布日期', trigger: 'change'}
], ],
putTime: [
{ required: false, message: '请选择企标实施日期', trigger: 'change' }
],
FBGBUSSName: [ FBGBUSSName: [
{ required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' } { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
], ],
@@ -1122,6 +1129,16 @@
}) })
this.form.QCDW = nameList this.form.QCDW = nameList
this.form.QCDWID = idList this.form.QCDWID = idList
if(this.form.QCDWID !== undefined && this.form.QCDWID && this.form.QCDWID.length > 0){
this.$http.get('SarInstitution/institution/getInstitutionIdToDept', {institutionIds:this.form.QCDWID}, {
_this: this,
}, res=> {
if(res){
this.form.QCRBUSSID = res.map(item => item.id).join(",")
this.form.QCRBUSS = res.map(item => item.name).join(",")
}
})
}
this.formKey++ this.formKey++
}, },
choiceQCDW(type, title, id) { choiceQCDW(type, title, id) {
src/pages/processCenter/pages/creatProcess/qbrk/step4.vue
+4
View File
@@ -848,6 +848,10 @@
GLWJBUSS: '', GLWJBUSS: '',
GLWJBUSSName: '', GLWJBUSSName: '',
XCSJBUSS: '', XCSJBUSS: '',
CBCD:'',
CYBZ:'',
YYBZ:'',
standNum:'',
}, // 标准信息 }, // 标准信息
roleForm:{ roleForm:{
hzUserId: this.$store.getters.userInfo.userId, hzUserId: this.$store.getters.userInfo.userId,
src/pages/processCenter/pages/creatProcess/qbrk/step5.vue
+4
View File
@@ -985,6 +985,10 @@
GLWJBUSS: '', GLWJBUSS: '',
GLWJBUSSName: '', GLWJBUSSName: '',
XCSJBUSS: '', XCSJBUSS: '',
CBCD:'',
CYBZ:'',
YYBZ:'',
standNum:'',
}, // 标准信息 }, // 标准信息
roleForm:{ roleForm:{
hzUserId: this.$store.getters.userInfo.userId, hzUserId: this.$store.getters.userInfo.userId,
src/pages/processCenter/pages/creatProcess/qbrk/step6.vue
+17
View File
@@ -983,6 +983,10 @@
GLWJBUSS: '', GLWJBUSS: '',
GLWJBUSSName: '', GLWJBUSSName: '',
XCSJBUSS: '', XCSJBUSS: '',
CBCD:'',
CYBZ:'',
YYBZ:'',
standNum:'',
}, // 标准信息 }, // 标准信息
roleForm:{ roleForm:{
hzUserId: this.$store.getters.userInfo.userId, hzUserId: this.$store.getters.userInfo.userId,
@@ -1089,6 +1093,9 @@
issueTime: [ issueTime: [
{ required: false, message: '请选择企标发布日期', trigger: 'change'} { required: false, message: '请选择企标发布日期', trigger: 'change'}
], ],
putTime: [
{ required: false, message: '请选择企标实施日期', trigger: 'change' }
],
FBGBUSSName: [ FBGBUSSName: [
{ required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' } { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
], ],
@@ -1203,6 +1210,16 @@
}) })
this.form.QCDW = nameList this.form.QCDW = nameList
this.form.QCDWID = idList this.form.QCDWID = idList
if(this.form.QCDWID !== undefined && this.form.QCDWID && this.form.QCDWID.length > 0){
this.$http.get('SarInstitution/institution/getInstitutionIdToDept', {institutionIds:this.form.QCDWID}, {
_this: this,
}, res=> {
if(res){
this.form.QCRBUSSID = res.map(item => item.id).join(",")
this.form.QCRBUSS = res.map(item => item.name).join(",")
}
})
}
this.formKey++ this.formKey++
}, },
choiceQCDW(type, title, id) { choiceQCDW(type, title, id) {
src/pages/processCenter/pages/creatProcess/qbrk/step7.vue
+4
View File
@@ -971,6 +971,10 @@
GLWJBUSS: '', GLWJBUSS: '',
GLWJBUSSName: '', GLWJBUSSName: '',
XCSJBUSS: '', XCSJBUSS: '',
CBCD:'',
CYBZ:'',
YYBZ:'',
standNum:'',
}, // 标准信息 }, // 标准信息
roleForm:{ roleForm:{
hzUserId: this.$store.getters.userInfo.userId, hzUserId: this.$store.getters.userInfo.userId,
src/pages/processCenter/pages/creatProcess/qbrk/step8.vue
+4
View File
@@ -973,6 +973,10 @@
GLWJBUSS: '', GLWJBUSS: '',
GLWJBUSSName: '', GLWJBUSSName: '',
XCSJBUSS: '', XCSJBUSS: '',
CBCD:'',
CYBZ:'',
YYBZ:'',
standNum:'',
}, // 标准信息 }, // 标准信息
roleForm:{ roleForm:{
hzUserId: this.$store.getters.userInfo.userId, hzUserId: this.$store.getters.userInfo.userId,
src/pages/processCenter/pages/creatProcess/qbrk/step9.vue
+4
View File
@@ -973,6 +973,10 @@
GLWJBUSS: '', GLWJBUSS: '',
GLWJBUSSName: '', GLWJBUSSName: '',
XCSJBUSS: '', XCSJBUSS: '',
CBCD:'',
CYBZ:'',
YYBZ:'',
standNum:'',
}, // 标准信息 }, // 标准信息
roleForm:{ roleForm:{
hzUserId: this.$store.getters.userInfo.userId, hzUserId: this.$store.getters.userInfo.userId,
src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue
+13
View File
@@ -1012,6 +1012,9 @@
issueTime: [ issueTime: [
{ required: false, message: '请选择企标发布日期', trigger: 'change'} { required: false, message: '请选择企标发布日期', trigger: 'change'}
], ],
putTime: [
{ required: false, message: '请选择企标实施日期', trigger: 'change' }
],
FBGBUSSName: [ FBGBUSSName: [
{ required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' } { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
], ],
@@ -1122,6 +1125,16 @@
}) })
this.form.QCDW = nameList this.form.QCDW = nameList
this.form.QCDWID = idList this.form.QCDWID = idList
if(this.form.QCDWID !== undefined && this.form.QCDWID && this.form.QCDWID.length > 0){
this.$http.get('SarInstitution/institution/getInstitutionIdToDept', {institutionIds:this.form.QCDWID}, {
_this: this,
}, res=> {
if(res){
this.form.QCRBUSSID = res.map(item => item.id).join(",")
this.form.QCRBUSS = res.map(item => item.name).join(",")
}
})
}
this.formKey++ this.formKey++
}, },
choiceQCDW(type, title, id) { choiceQCDW(type, title, id) {
src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue
+13
View File
@@ -1089,6 +1089,9 @@
issueTime: [ issueTime: [
{ required: false, message: '请选择企标发布日期', trigger: 'change'} { required: false, message: '请选择企标发布日期', trigger: 'change'}
], ],
putTime: [
{ required: false, message: '请选择企标实施日期', trigger: 'change' }
],
FBGBUSSName: [ FBGBUSSName: [
{ required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' } { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
], ],
@@ -1203,6 +1206,16 @@
}) })
this.form.QCDW = nameList this.form.QCDW = nameList
this.form.QCDWID = idList this.form.QCDWID = idList
if(this.form.QCDWID !== undefined && this.form.QCDWID && this.form.QCDWID.length > 0){
this.$http.get('SarInstitution/institution/getInstitutionIdToDept', {institutionIds:this.form.QCDWID}, {
_this: this,
}, res=> {
if(res){
this.form.QCRBUSSID = res.map(item => item.id).join(",")
this.form.QCRBUSS = res.map(item => item.name).join(",")
}
})
}
this.formKey++ this.formKey++
}, },
choiceQCDW(type, title, id) { choiceQCDW(type, title, id) {
src/pages/processCenter/pages/creatProcess/qbrk/stepDetail.vue
+4
View File
@@ -834,6 +834,10 @@
GLWJBUSS: '', GLWJBUSS: '',
GLWJBUSSName: '', GLWJBUSSName: '',
XCSJBUSS: '', XCSJBUSS: '',
CBCD:'',
CYBZ:'',
YYBZ:'',
standNum:'',
}, // 标准信息 }, // 标准信息
roleForm:{ roleForm:{
hzUserId: this.$store.getters.userInfo.userId, hzUserId: this.$store.getters.userInfo.userId,