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:
super_liu
2022-04-13 18:39:01 +08:00
parent 848d20b305 fa4d167cec
commit 1c3946c963
30 changed files with 827 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
+3 -1
View File
@@ -661,13 +661,14 @@ export default {
bpnId: this.$route.query.bpnId
}).then(res => {
let mes = JSON.parse(res.mes)
console.log(mes);
this.bpnId = this.$route.query.bpnId
if (mes.form.endTime) {
mes.form.endTime = new Date(this.$moment(mes.form.endTime).format('YYYY-MM-DD'))
} else {
mes.form.endTime = ''
}
this.addFjList = mes.filesId
this.addFjList = mes.filesId || mes.form.filesId || ''
this.form.fjListName = mes.filesName
this.form = mes.form
this.roleForm = mes.roleForm
@@ -878,6 +879,7 @@ export default {
handleSave () {
this.saveLoading = true
let _formData = new FormData()
this.form.filesId = this.addFjList
_formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.userName)
src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
-13
View File
@@ -169,19 +169,6 @@
</el-table-column>
</el-table>
</div>
<el-collapse accordion>
<el-collapse-item title="审批意见">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
<div class="content" v-show="active === '2'">
<el-table
src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
+6
View File
@@ -205,6 +205,7 @@ export default {
data() {
return {
commentText2: '',
onlyKey: '',
drawerModal: false,
histortData: [],
commentText: "",
@@ -329,6 +330,7 @@ export default {
handleSave() {
this.saveLoading = true;
let _formData = new FormData();
this.form.onlyKey = this.onlyKey
_formData.append("id", this.bpnId || "");
_formData.append("prcType", "3");
_formData.append("taskIds", this.taskIds);
@@ -349,9 +351,12 @@ export default {
if (valid) {
this.isSubmit = true;
var json = this.json;
json.onlyKey = this.onlyKey
json.commentText = this.commentText2;
json.responUserList = this.form.responUserList;
json.responUserListName = this.form.responUserListName;
json.presidentUser = this.form.presidentUser
json.presidentUserName = this.form.presidentUserName
json.introduce = false;
this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json),
@@ -376,6 +381,7 @@ export default {
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.onlyKey = data.form ? data.form.onlyKey : data.onlyKey
this.commentText2 = data.commentText2 || ''
this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+11 -2
View File
@@ -349,6 +349,7 @@ export default {
data() {
return {
standId: '',
onlyKey: '',
modaltitle2: '',
addType: '',
commentText4: '',
@@ -623,6 +624,7 @@ export default {
let _formData = new FormData();
let json = this.json
json.info = this.data
json.onlyKey = this.onlyKey
json.spId = this.form.spId
json.spName = this.form.spName
_formData.append("id", this.bpnId || "");
@@ -630,8 +632,9 @@ export default {
_formData.append("taskIds", this.taskIds);
_formData.append("json", JSON.stringify({
form: json,
commentText: this.commentText4
commentText4: this.commentText4
}));
console.log(json);
saveTaskForPub(_formData).then(res => {
this.saveLoading = false;
this.$message.success("保存成功");
@@ -649,6 +652,7 @@ export default {
json.commentText = this.commentText4
json.spId = this.form.spId
json.info = this.data
json.onlyKey = this.onlyKey
json.spName = this.form.spName
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
@@ -702,7 +706,12 @@ export default {
this.acceptShow = false
this.submitShow = true
}
this.commentText4 = data.commentText || data.commentText4 || ''
this.commentText4 = data.commentText4 || ''
if(data.onlyKey){
this.onlyKey = data.onlyKey
}else{
this.onlyKey = data.form.onlyKey
}
this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
this.form.fjList = data.fjList || data.form.fjList
src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+4 -1
View File
@@ -351,6 +351,7 @@
return {
clickFlag: false,
commentText5: '',
onlyKey: '',
options: [],
itemId: '',
modalshowflag2: false,
@@ -557,6 +558,7 @@
let _formData = new FormData();
let json = this.form;
json.data = this.data;
json.onlyKey = this.onlyKey
_formData.append("id", this.bpnId || "");
_formData.append("prcType", "3");
_formData.append("taskIds", this.taskIds);
@@ -593,6 +595,7 @@
this.isSubmit = true;
var json = this.json;
json.oldinfo = this.oldData;
json.onlyKey = this.onlyKey
json.commentText = this.commentText5;
json.introduce = true;
this.$http.post("lawss/activiti/completeTask", {
@@ -617,8 +620,8 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg);
console.log(data);
this.commentText5 = data.commentText5 || ''
this.onlyKey = data.form ? data.form.onlyKey :data.onlyKey
this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
this.form.fjList = data.form ? data.form.fjList : (data.fjList ? data.fjList : [] )
src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue
+2 -2
View File
@@ -16,7 +16,7 @@
<el-table
:data="dataList"
border
height="80%"
height="95%"
style="width: 100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
@@ -394,7 +394,7 @@ export default {
display: flex;
flex-direction: column;
justify-content: space-between;
height: calc(~'100% - 103px');
height: calc(~'100% - 53px');
overflow: auto;
}
}
src/pages/processCenter/pages/phone/bzrk/step2.vue
+30 -133
View File
@@ -10,12 +10,12 @@
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
<div class="content" v-if="active === '1'">
<div style="flex: auto; overflow: auto;">
<div style="flex: auto; ">
<el-form
ref="qbkwForm"
:model="form"
class="label-input-form"
label-width="180px"
label-width="100px"
>
<ProcessTitle>
<template slot="title">基础信息</template>
@@ -27,14 +27,7 @@
<el-radio label="1">海外标准入库</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.standNumber"
placeholder="请输入标准编号"
clearable
></el-input>
</el-form-item>
<van-field label="标准编号" v-model="form.standNumber" readonly />
<el-form-item v-if="form.standInData=='1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区" multiple disabled>
<el-option
@@ -46,7 +39,6 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="标准类别" v-show="form.standInData === '0'" prop="standSort" class="add-form-item form-item-disabled">
<el-select v-model="form.standSort" placeholder="请选择标准类别" disabled>
<el-option
@@ -58,37 +50,15 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
<el-input
disabled
v-model.number="form.standYear"
placeholder="请输入标准标准年份"
clearable
></el-input>
</el-form-item>
<el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.standName"
placeholder="请输入标准中文名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.standEnName"
placeholder="请输入标准英文名称"
clearable
></el-input>
</el-form-item>
<van-field label="标准年份" v-model="form.standYear" readonly />
<van-field label="标准中文名称" v-model="form.standName" readonly />
<van-field label="标准英文名称" v-model="form.standEnName" readonly placeholder="请输入标准英文名称" />
<el-form-item label="是否需要会签" prop="signFlag" class="add-form-item form-item-disabled">
<el-radio-group v-model="form.signFlag" disabled>
<el-radio label="1">是</el-radio>
<el-radio label="2">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-show="form.standInData === '0'" label="标准性质" prop="standNature" class="add-form-item form-item-disabled">
<el-select v-model="form.standNature" placeholder="请选择标准性质" disabled>
<el-option
@@ -100,17 +70,7 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="文本状态" prop="textStatus" class="add-form-item form-item-disabled">
<el-select v-model="form.textStatus" placeholder="请选择文本状态" disabled>
<el-option
v-for="item in standStateOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>
</el-form-item>
<van-field label="文本状态" v-model="textStatusMap[form.textStatus]" readonly />
<el-form-item label="标准发布日期" prop="issueTime" class="add-form-item form-item-disabled">
<el-date-picker
disabled
@@ -129,14 +89,7 @@
<el-form-item v-if="form.standInData === '0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
<el-input v-model="form.standSystem" disabled></el-input>
</el-form-item>
<el-form-item v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.gxhbq"
placeholder="请输入标签"
clearable
></el-input>
</el-form-item>
<van-field label="标签" v-model="form.gxhbq" readonly placeholder="请输入标签" />
</div>
<ProcessTitle>
<template slot="title">实施日期</template>
@@ -277,36 +230,12 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="关联模块--乘用车VPPS编码" prop="cycvppsbm" label-width="190px" class="add-form-item form-item-disabled">
<el-input v-model="form.cycvppsbm" disabled></el-input>
</el-form-item>
<el-form-item label="关联模块--卡车VPPS编码" prop="kccvppsbm" class="add-form-item form-item-disabled">
<el-input v-model="form.kccvppsbm" disabled></el-input>
</el-form-item>
<el-form-item label="关联模块--乘用车vpps中文名称" prop="cycvppscn" label-width="210px" class="add-form-item form-item-disabled">
<el-input
v-model="form.cycvppscn"
disabled
clearable
></el-input>
</el-form-item>
<el-form-item label="关联模块--卡车vpps中文名称" prop="kccvppscn" label-width="210px" class="add-form-item form-item-disabled">
<el-input
v-model="form.kccvppscn"
disabled
clearable
></el-input>
</el-form-item>
<el-form-item label="模块结构单元变型号" prop="dybxh" class="add-form-item form-item-disabled">
<el-input v-model="form.dybxh" disabled></el-input>
</el-form-item>
<el-form-item label="模块结构单元名称" prop="dymc" class="add-form-item form-item-disabled">
<el-input
v-model="form.dymc"
disabled
clearable
></el-input>
</el-form-item>
<van-field label="关联模块--乘用车VPPS编码" v-model="form.cycvppsbm" readonly placeholder="请输入乘用车VPPS编码"/>
<van-field label="关联模块--卡车VPPS编码" v-model="form.kccvppsbm" readonly placeholder="请输入卡车VPPS编码"/>
<van-field label="关联模块--乘用车vpps中文名称" v-model="form.cycvppscn" readonly placeholder="请输入乘用车vpps中文名称" />
<van-field label="关联模块--卡车vpps中文名称" v-model="form.kccvppscn" placeholder="请输入卡车vpps中文名称" readonly />
<van-field label="模块结构单元变型号" v-model="form.dybxh" readonly placeholder="请输入模块结构单元变型号"/>
<van-field label="模块结构单元名称" v-model="form.dymc" readonly placeholder="请输入模块结构单元名称" />
<el-form-item v-if="form.standInData === '0'" label="归口管理部门" prop="gkdw" class="add-form-item form-item-disabled">
<el-select :popper-append-to-body="false" v-model="form.gkdw" placeholder="请选择归口管理部门" disabled>
<el-option v-for="item in gkglbmOptions" :value="item.value" :key="item.value" :label="item.label"></el-option>
@@ -367,18 +296,7 @@
></el-option>
</el-select>
</el-form-item>-->
<el-form-item v-if="form.standInData === '0'" label="我司署名人" prop="wssmr" class="add-form-item form-item-disabled">
<span>{{ form.wssmr }}</span>
<!--<el-select v-model="form.wssmr" placeholder="请选择我司署名人" multiple disabled>
<el-option
v-for="item in wssmrOptions"
placeholder="请选择"
:key="item.value"
:value="item.value"
:label="item.label"
></el-option>
</el-select>-->
</el-form-item>
<van-field v-if="form.standInData === '0'" label="我司署名人" v-model="form.wssmr" readonly placeholder="请选择我司署名人"/>
<el-form-item v-if="form.standInData === '0'" label="我司参与深度" prop="cysd" class="add-form-item form-item-disabled">
<el-select v-model="form.cysd" placeholder="请选择我司参与深度" disabled>
<el-option
@@ -395,14 +313,7 @@
<template slot="title">关联信息</template>
</ProcessTitle>
<div class="prc-content-border">
<el-form-item label="代替标准号" prop="dtbjh" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.dtbjh"
placeholder="请输入代替标准号"
clearable
></el-input>
</el-form-item>
<van-field label="代替标准号" v-model="form.dtbjh" readonly placeholder="请输入代替标准号"/>
<el-form-item v-if="form.standInData === '0'" label="采标程度" prop="cbcd" class="add-form-item form-item-disabled">
<el-select v-model="form.cbcd" placeholder="请选择采标程度" disabled>
<el-option v-for="item in cbcdOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
@@ -412,34 +323,13 @@
<div v-if="glwjFileMap.length>0" v-for="(value,index) in this.glwjFileMap" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile('glwj',value.id)">
{{ value.name }}
</div>
<div v-else>
<div v-else style="color: #323233">
- -
</div>
</el-form-item>
<el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.bfbdtbzh"
placeholder="请输入部分代替标准号"
clearable
></el-input>
</el-form-item>
<el-form-item v-if="form.standInData === '0'" label="采标编号" prop="cbbh" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cbbh"
placeholder="请输入采标编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="引用标准" prop="yybj" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.yybj"
placeholder="请输入引用标准"
clearable
></el-input>
</el-form-item>
<van-field label="部分代替标准号" v-model="form.bfbdtbzh" readonly placeholder="请输入部分代替标准号"/>
<van-field v-if="form.standInData === '0'" label="采标编号" v-model="form.cbbh" readonly placeholder="请输入采标编号"/>
<van-field label="引用标准" v-model="form.yybj" readonly placeholder="请输入引用标准"/>
</div>
</el-form>
</div>
@@ -516,6 +406,7 @@ export default {
name: "phoneBzrkStep2",
data() {
return {
textStatusMap: {}, // 文本状态id与name对应
xgdFileMap: [],
fbgbjbdFileMap: [],
bpgFileMap: [],
@@ -701,6 +592,13 @@ export default {
TreeSelect
},
methods: {
// 将文本状态的id与name对应
setMap(data){
data.forEach(item => {
this.$set(this.textStatusMap, item.value, item.label)
})
},
checkedRole(data) {
this.assigneeNewLoading = true
changeAssigneeNew({
@@ -1013,6 +911,7 @@ export default {
this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
this.standNatureOptions = res.data.SARPROPERTY // 标准性质
this.standStateOptions = res.data.WBZTCLASS // 文本状态
this.setMap(this.standStateOptions)
this.standSystemOptions = res.data.BZTXCLASS // 标准体系
this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
this.categoryOptions = res.data.NYLXCLASS // 能源类型
@@ -1041,11 +940,9 @@ export default {
/deep/.el-select .el-input .el-select__caret {
font-size: 0;
}
/deep/.prc-content-border {
width: 600px;
}
/deep/ .el-drawer__container {
.prc-content-border {
overflow: auto;
border: none;
padding: 0 20px 0;
}
src/pages/processCenter/pages/phone/bzzqyj/step2.vue
+52 -44
View File
@@ -253,51 +253,59 @@
this.saveLoading = false;
});
},
handleSubmit() {
this.$refs["bzzqyjForm"].validate((valid) => {
if (valid) {
this.isSubmit = true;
var json = this.json;
json.commentText = this.commentText2;
json.responUserList = this.form.responUserList;
json.responUserListName = this.form.responUserListName;
json.introduce = false;
this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json),
taskId: this.taskIds,
userId: this.$store.getters.userInfo.account
}, {}, res => {
if (res.success) {
this.$message.success("提交成功");
this.$router.push("/processCenter");
}
this.isSubmit = false;
});
} else {
return this.$message.warning("请完善基础信息");
}
handleSubmit() {
this.$refs["bzzqyjForm"].validate((valid) => {
if (valid) {
this.isSubmit = true;
var json = this.json;
json.onlyKey = this.onlyKey
json.commentText = this.commentText2;
json.responUserList = this.form.responUserList;
json.responUserListName = this.form.responUserListName;
json.presidentUser = this.form.presidentUser
json.presidentUserName = this.form.presidentUserName
json.introduce = false;
this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json),
taskId: this.taskIds,
userId: this.$store.getters.userInfo.account
}, {}, res => {
if (res.success) {
this.$message.success("提交成功");
this.$router.push("/processCenter");
}
this.isSubmit = false;
});
},
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.commentText2 = data.commentText2 || ''
this.form.cid = data.form ? data.form.cid : data.cid
this.form.endTime = data.form ? data.form.endTime : data.endTime
this.form.fjList = data.form ? data.form.fjList : data.fjList
this.form.textType = data.form ? data.form.textType : data.textType
this.form.modelList = data.form ? data.form.modelList : data.modelList
this.form.responUserListName = data.form ? data.form.responUserListName : (data.responUserListName ? data.responUserListName : '')
this.form.responUserList = data.form ? data.form.responUserList : (data.responUserList ? data.responUserList : '')
this.json = data
}).catch(e => {
});
});
}
} else {
return this.$message.warning("请完善基础信息");
}
});
},
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.onlyKey = data.form ? data.form.onlyKey : data.onlyKey
this.commentText2 = data.commentText2 || ''
this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
this.form.startUserName = data.form ? data.form.startUserName : data.startUserName
this.form.startUser = data.form ? data.form.startUser : data.startUser
this.form.cid = data.form ? data.form.cid : data.cid
this.form.endTime = data.form ? data.form.endTime : data.endTime
this.form.fjList = data.form ? data.form.fjList : data.fjList
this.form.textType = data.form ? data.form.textType : data.textType
this.form.modelList = data.form ? data.form.modelList : data.modelList
this.form.responUserListName = data.form ? data.form.responUserListName : (data.responUserListName ? data.responUserListName : '')
this.form.responUserList = data.form ? data.form.responUserList : (data.responUserList ? data.responUserList : '')
this.json = data
}).catch(e => {
});
});
}
},
mounted() {
this.getHistoryData();
src/pages/processCenter/pages/phone/bzzqyj/step4-1.vue
+25 -26
View File
@@ -314,34 +314,34 @@
handleTabs(name) {
this.active = name
},
handleSubmit() {
this.$refs['bzzqyjForm'].validate((valid) => {
if (valid) {
this.isSubmit = true
var json = this.json
json.commentText = this.commentText41
json.bzfgId = this.form.bzfgId
json.bzfgName = this.form.bzfgName
json.spFlag = '0'
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
userId: this.$store.getters.userInfo.account
}, {}, res => {
if (res.success) {
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
} else {
this.$message.warning('请选择标准法规工程师分线管理员')
}
handleSubmit() {
this.$refs['bzzqyjForm'].validate((valid) => {
if (valid) {
this.isSubmit = true
let json = this.json
json.info = this.data
json.commentText = this.commentText41
json.bzfgId = this.form.bzfgId
json.bzfgName = this.form.bzfgName
json.spFlag = '0'
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
userId: this.$store.getters.userInfo.account
}, {}, res => {
if (res.success) {
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
},
} else {
this.$message.warning('请选择标准法规工程师分线管理员')
}
})
},
handleSubmitNo() {
if (this.commentText41) {
this.isSubmit = true
var json = this.json
json.spFlag = '1'
json.commentText = this.commentText41
@@ -353,7 +353,6 @@
if (res.success) {
this.$message.success('提交成功')
this.$router.push('/processCenter')
this.isSubmit = false
}
})
} else {
src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue
+58 -62
View File
@@ -305,70 +305,66 @@
handleTabs(name) {
this.active = name
},
handleSubmit() {
this.isSubmit = true
var json = this.json
json.commentText = this.commentText42
json.bzFlag = '0'
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
userId: this.$store.getters.userInfo.account
}, {}, res => {
if (res.success) {
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
},
handleSubmitNo() {
if (this.commentText42) {
var json = this.json
json.bzFlag = '1'
json.commentText = this.commentText42
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
userId: this.$store.getters.userInfo.account
}, {}, res => {
if (res.success) {
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
})
} else {
this.$message.warning('请输入反馈意见')
handleSubmit() {
this.isSubmit = true
let json = this.json
json.info = this.data
json.commentText = this.commentText42
json.bzFlag = '0'
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
userId: this.$store.getters.userInfo.account
}, {}, res => {
if (res.success) {
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
this.isSubmit = false
})
},
handleSubmitNo() {
if (this.commentText42) {
var json = this.json
json.bzFlag = '1'
json.commentText = this.commentText42
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
userId: this.$store.getters.userInfo.account
}, {}, res => {
if (res.success) {
this.$message.success('提交成功')
this.$router.push('/processCenter')
}
})
} else {
this.$message.warning('请输入反馈意见')
}
},
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.fjList = data.fjList || data.form.fjList
if (data.fjListId === '') {
this.form.fjListId = ''
} else {
this.form.fjListId = data.form.fjListId || data.fjListId
}
this.commentText42 = data.commentText42 || ''
this.form.cid = data.cid || data.form.cid
this.form.endTime = data.endTime || data.form.endTime
this.form.cname = data.cname || data.form.cname
this.form.textType = data.textType || data.form.textType
this.form.modelList = data.modelList || data.form.modelList
this.form.modelNameList = data.modelNameList || data.form.modelNameList
this.form.bzfgId = data.bzfgId || ''
this.json = data
this.data = data.info || data.data
}).catch(e => {
})
})
},
},
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.fjList = data.fjList || data.form.fjList
this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
this.commentText42 = data.commentText42 || ''
this.form.cid = data.cid || data.form.cid
this.form.endTime = data.endTime || data.form.endTime
this.form.textType = data.textType || data.form.textType
this.form.modelList = data.modelList || data.form.modelList
this.form.bzfgId = data.bzfgId || ''
this.json = data
this.data = data.info || data.data
}).catch(e => {
})
})
},
},
mounted() {
this.getHistoryData()
src/pages/processCenter/pages/phone/wfhxzg/step2.vue
+46
View File
@@ -89,6 +89,7 @@
<ProcessFooter
show-save
show-submit
show-back
show-transfer
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@@ -96,6 +97,7 @@
@transfer="handleTurnTo"
@save="handleSave"
@submit="handleSubmit"
@back="beforeBack"
>
</ProcessFooter>
<phone-role
@@ -263,6 +265,50 @@ export default {
this.saveLoading = false
})
},
//驳回按钮
beforeBack(){
if(!this.commentInfo){
this.$message.warning('请填写审批意见')
}else{
let zqa = new Map();
for (let lastDataListElement of this.dataList) {
let a = zqa.get(lastDataListElement.dutyPeopleInfoId)
if( a == null){
a = {
id: lastDataListElement.dutyPeopleInfoId,
name: lastDataListElement.dutyPeopleInfo,
standardInfoList: []
}
}
a.standardInfoList.push(lastDataListElement);
zqa.set(a.id, a);
}
let list = [];
for(let item of zqa) {
list.push(item[1])
}
let json = {
dockUserList: list,
passInfo: this.passInfo,
passFlag: '1',
commentText: this.commentInfo
}
const params = new FormData();
params.set('json', JSON.stringify(json))
params.set('userId', this.$store.getters.userInfo.account)
params.set('taskIds', this.taskIds)
completeTask(params).then(res => {
if(res.success === true) {
this.$message.success('提交成功')
this.$router.push("/processCenter");
}
this.isSubmit = false
}).catch(e => {
this.isSubmit = false
})
}
},
// 提交按钮
handleSubmit() {
this.isSubmit = true