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-03-08 16:57:10 +08:00
parent 97d1941e3f c0ef14dcd8
commit a7d19ead3b
13 changed files with 183 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/home2/components/todoList/index.vue
+1 -1
View File
@@ -1674,7 +1674,7 @@ export default {
prcType: row.prcType
}
})
}else if(row.taskInfo === '企标制修订计划整改') {
}else if(row.taskInfo === '重新起草') {
this.$router.push({
name: 'qbzxdjhgkStep1',
query: {
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+18 -1
View File
@@ -1456,6 +1456,7 @@ export default {
callback()
}
return {
gdType: '', //归档位置的赋值
standTypeModel: 'INLAND',
submitType: '',
nodeList3: [],
@@ -2223,6 +2224,7 @@ export default {
switch (status) {
// 新增
case 1:
this.gdType = '新增'
this.selectedList = []
this.standardCheckedList = []
this.standardDrawer = false
@@ -2231,6 +2233,7 @@ export default {
break
// 带入（确认）
case 2:
this.gdType = '带入'
if (this.standardCheckedList.length === 1) {
this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoUpdateById', {id: this.standardCheckedList[0].id}, {
_this: this
@@ -2368,7 +2371,7 @@ export default {
}, {}, res => {
if (res.ok) {
this.treeListOptions = res.data
if(bringData.standNumber){
if(this.gdType === '带入'){
this.$http.get('sarStandardsInfo/sar-standards-info/getStandMenuId', {
standId: bringData.id,
}, {}, reson => {
@@ -2388,6 +2391,20 @@ export default {
this.form.treeListId = treeListId
}
})
}else{
let treeList = ''
let treeListId = ''
reson.data.forEach(item=>{
this.treeCheckedKeys.push(item.menuId)
if (treeList.length > 0) {
treeList += ','
treeListId += ','
}
treeList += item.menuName
treeListId += item.menuId
})
this.form.treeListName = treeList
this.form.treeListId = treeListId
}
}
})
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+87 -102
View File
@@ -636,33 +636,16 @@
</el-form>
</div>
<div>
<el-collapse accordion v-model="activeName">
<el-collapse-item title="审批意见" name="1">
<el-collapse accordion>
<el-collapse-item title="审批意见">
<div style="margin: 10px 0;">
<el-form
ref="formTongGuo"
:model="formTongGuo"
: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
prop="commentText"
>
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="formTongGuo.commentText">
</el-input>
</el-form-item>
</el-form>
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
@@ -805,11 +788,11 @@
</template>
<script>
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail, processCreateStand, changeAssigneeNew } from 'api/process'
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { changeAssigneeNew, inboundLiaisonDetail, processCreateStand } from "api/process";
import TreeSelect from "@/components/treeSelect/treeSelect.vue";
import CusTomDataPickerGroup
from "@/pages/regulatoryRepository/localProductsOrProjectLibrary/components/DatePickerGroup";
@@ -834,22 +817,23 @@ export default {
drawerModal: false,
drawerTitle: '',
nodeList: [],
selectPeople: '',
xgdFileId: '',
fbgbjbdFileId: '',
bpgFileId: '',
ssgFileId: '',
zqyjgFileId: '',
jdwjFileId: '',
kwjFileId: '',
glwjFileId: '',
caFileId: '',
zbjbdFileId: '',
selectPeople: "",
xgdFileId: "",
fbgbjbdFileId: "",
bpgFileId: "",
ssgFileId: "",
zqyjgFileId: "",
jdwjFileId: "",
kwjFileId: "",
glwjFileId: "",
caFileId: "",
commentText: "",
zbjbdFileId: "",
rules: {
commentText: [{required: true, message: '请输入意见', trigger: 'blur'}],
approvalOpinion: [{required: true, message: '请选择审批意见', trigger: 'change'}]
commentText: [{ required: true, message: "请输入意见", trigger: "blur" }],
approvalOpinion: [{ required: true, message: "请选择审批意见", trigger: "change" }]
},
activeName: '1',
activeName: "1",
// 当前流程类型(1待办/2已办)
processType: 1,
detailData: [],
@@ -1224,76 +1208,77 @@ export default {
},
handleSave() {
},
//流程驳回按钮
handle1() {
this.formTongGuo.approvalOpinion = 1
this.handleSubmit()
if (this.commentText) {
this.formTongGuo.approvalOpinion = 1;
this.handleSubmit();
} else {
this.$message.warning("请填写审批意见");
}
},
//流程提交按钮
handle2() {
this.formTongGuo.approvalOpinion = 0
this.handleSubmit()
this.formTongGuo.approvalOpinion = 0;
this.handleSubmit();
},
handleSubmit() {
this.getRule()
const val = this.form.country;
if (val !== '' && val !== null && typeof (val) !== 'undefined') {
if (val !== "" && val !== null && typeof (val) !== "undefined") {
if (val instanceof Array) {
this.form.country = val.join(",");
} else {
this.form.country = val
this.form.country = val;
}
} else if (val === '') {
this.form.country = []
} else if (val === "") {
this.form.country = [];
}
this.$refs['formTongGuo'].validate((valid) => {
if (valid) {
this.isSubmit = true
this.form.commentText = this.formTongGuo.commentText
this.form.approvalOpinion = this.formTongGuo.approvalOpinion
console.log(this.form)
if (this.form.syrz.length === 0) {
this.form.syrz = ''
this.isSubmit = true;
this.form.commentText = this.commentText;
this.form.approvalOpinion = this.formTongGuo.approvalOpinion;
console.log(this.form);
if (this.form.syrz.length === 0) {
this.form.syrz = "";
}
if (this.form.nylx.length === 0) {
this.form.nylx = "";
}
if (this.form.zrbm.length === 0) {
this.form.zrbm = "";
}
if (this.form.qcdw.length === 0) {
this.form.qcdw = "";
}
if (this.form.cllx.length === 0) {
this.form.cllx = "";
}
if (this.form.sycpx.length === 0) {
this.form.sycpx = "";
}
if (this.form.zrgcs.length === 0) {
this.form.zrgcs = "";
}
this.form.menuIds = this.form.treeListId;
const json = JSON.stringify(this.form);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
if (this.formTongGuo.approvalOpinion == "1") {
this.$message.warning("驳回成功");
this.isSubmit = false;
this.formTongGuo.commentText = "";
// 流程提交之后，应该流转至待办任务页面
this.$router.push({ path: "/processCenter?tabsName=ProcessCenter" });
} else {
this.processCreateStand(json);
}
if (this.form.nylx.length === 0) {
this.form.nylx = ''
}
if (this.form.zrbm.length === 0) {
this.form.zrbm = ''
}
if (this.form.qcdw.length === 0) {
this.form.qcdw = ''
}
if (this.form.cllx.length === 0) {
this.form.cllx = ''
}
if (this.form.sycpx.length === 0) {
this.form.sycpx = ''
}
if (this.form.zrgcs.length === 0) {
this.form.zrgcs = ''
}
this.form.menuIds = this.form.treeListId
const json = JSON.stringify(this.form);
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
if (this.formTongGuo.approvalOpinion == '1') {
this.$message.warning("驳回成功")
this.isSubmit = false
this.formTongGuo.commentText = ''
// 流程提交之后，应该流转至待办任务页面
this.$router.push({path: '/processCenter?tabsName=ProcessCenter'})
} else {
this.processCreateStand(json)
}
}
})
}
})
});
},
/**
src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+10 -1
View File
@@ -67,6 +67,7 @@
<el-tooltip v-if="form.standName" effect="dark" :content=form.standName placement="top-start">
<el-input
v-model="form.standName"
disabled
placeholder="请输入标准中文名称"
clearable
></el-input>
@@ -510,6 +511,7 @@
<el-tooltip v-if="form.dtbjh" effect="dark" :content=form.dtbjh placement="top-start">
<el-input
v-model="form.dtbjh"
disabled
placeholder="请输入代替标准号"
clearable
></el-input>
@@ -517,6 +519,7 @@
<el-input
v-else
v-model="form.dtbjh"
disabled
placeholder="请输入代替标准号"
clearable
></el-input>
@@ -547,6 +550,7 @@
<el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
<el-tooltip v-if="form.bfbdtbzh" effect="dark" :content=form.bfbdtbzh placement="top-start">
<el-input
disabled
v-model="form.bfbdtbzh"
placeholder="请输入部分代替标准号"
clearable
@@ -554,6 +558,7 @@
</el-tooltip>
<el-input
v-else
disabled
v-model="form.bfbdtbzh"
placeholder="请输入部分代替标准号"
clearable
@@ -563,6 +568,7 @@
<el-tooltip v-if="form.cbbh" effect="dark" :content=form.cbbh placement="top-start">
<el-input
v-model="form.cbbh"
disabled
placeholder="请输入采标编号"
clearable
></el-input>
@@ -570,6 +576,7 @@
<el-input
v-else
v-model="form.cbbh"
disabled
placeholder="请输入采标编号"
clearable
></el-input>
@@ -578,12 +585,14 @@
<el-tooltip v-if="form.yybj" effect="dark" :content=form.yybj placement="top-start">
<el-input
v-model="form.yybj"
disabled
placeholder="请输入引用标准"
clearable
></el-input>
</el-tooltip>
<el-input
v-else
disabled
v-model="form.yybj"
placeholder="请输入引用标准"
clearable
@@ -1186,10 +1195,10 @@ export default {
},
handleSubmit() {
this.isSubmit = true
this.form.submitType = this.submitType
this.form.commentText = this.commentText
this.form.approvalOpinion = this.approvalOpinion
const json = JSON.stringify(this.form);
json.submitType = this.submitType
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId : this.userId,
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+19 -8
View File
@@ -10,7 +10,7 @@
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
<!-- <div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">审批历史</div>-->
</div>
<div class="content" v-if="active === '1'">
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto;">
<el-form
ref="form"
@@ -875,10 +875,11 @@
:lazy=true
:multiple=true
:check-strictly=true
:show-checkBox=true
:modalShowFlag="modalShowFlag4"
:drawerTitle="drawerTitle"
:url="url"
:type="'TRUCK'"
:show-checkBox="showCheckBox"
:urlChild="urlChild"
:defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel"></tree-select-module>
@@ -895,6 +896,7 @@
:drawerTitle="drawerTitle"
:url="url"
:type="'CAR'"
:show-checkBox="showCheckBox"
:urlChild="urlChild"
:defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3"
:nodeKey="nodeKeyModel" @popoverHide="popoverHideModel2" @popoverHideCancel="popoverHideModelCancel2"></tree-select-module>
@@ -1258,7 +1260,7 @@
</el-collapse>
</div>
</div>
<div class="content" v-if="active === '2'">
<div class="content" v-show="active === '2'">
<div class="block" style="padding-top: 20px;">
<el-timeline>
<el-timeline-item timestamp="发起流程" placement="top" :color="user1 ? '#66b1ff' : ''">
@@ -1305,7 +1307,7 @@
</el-timeline>
</div>
</div>
<div class="content" v-if="active === '3'">
<div class="content" v-show="active === '3'">
<div class="flow-list">
<el-table
height="100%"
@@ -1596,6 +1598,7 @@ export default {
commentText: '', // 意见
title: '', // 新增编辑抽屉标题
ListModel: false, // 新增编辑抽屉开关
showCheckBox: true, // 树形控件是否展示多选框
active: '1', // 默认显示
isSubmit: false,
saveLoading: false,
@@ -1988,11 +1991,19 @@ export default {
this.modalShowFlag4 = true
this.url = ''
this.urlChild = ''
this.url = "sarModelTree/list"
this.url = "sarModelTree/listByType"
this.urlChild = "sarModelTree/childByList"
this.key3++
},
choiceZRR5(type, title, id) {
this.drawerTitle = title
this.modalShowFlag5 = true
this.url = ''
this.urlChild = ''
this.url = "sarModelTree/listByType"
this.urlChild = "sarModelTree/childByList"
this.key4++
},
choiceTree(type, title, id) {
this.drawerTitle = title
this.getListTree(this.form)
@@ -2801,10 +2812,10 @@ export default {
if (res.ok) {
this.fileInfoHandle();
this.isSubmit = true
this.form.submitType = this.submitType
this.form.commentText = this.commentText
this.form.approvalOpinion = this.approvalOpinion
const json = JSON.stringify(this.form);
json.submitType = this.submitType
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId: this.userId,
@@ -2829,10 +2840,10 @@ export default {
} else {
this.fileInfoHandle();
this.isSubmit = true
this.form.submitType = this.submitType
this.form.commentText = this.commentText
this.form.approvalOpinion = this.approvalOpinion
const json = JSON.stringify(this.form);
json.submitType = this.submitType
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId: this.userId,
src/pages/processCenter/pages/creatProcess/bzrk/step5.vue
+9
View File
@@ -52,6 +52,7 @@
<el-tooltip v-if="form.standName" effect="dark" :content=form.standName placement="top-start">
<el-input
v-model="form.standName"
disabled
placeholder="请输入标准中文名称"
clearable
></el-input>
@@ -468,12 +469,14 @@
<el-tooltip v-if="form.dtbjh" effect="dark" :content=form.dtbjh placement="top-start">
<el-input
v-model="form.dtbjh"
disabled
placeholder="请输入代替标准号"
clearable
></el-input>
</el-tooltip>
<el-input
v-else
disabled
v-model="form.dtbjh"
placeholder="请输入代替标准号"
clearable
@@ -507,12 +510,14 @@
<el-tooltip v-if="form.bfbdtbzh" effect="dark" :content=form.bfbdtbzh placement="top-start">
<el-input
v-model="form.bfbdtbzh"
disabled
placeholder="请输入部分代替标准号"
clearable
></el-input>
</el-tooltip>
<el-input
v-else
disabled
v-model="form.bfbdtbzh"
placeholder="请输入部分代替标准号"
clearable
@@ -522,6 +527,7 @@
<el-tooltip v-if="form.cbbh" effect="dark" :content=form.cbbh placement="top-start">
<el-input
v-model="form.cbbh"
disabled
placeholder="请输入采标编号"
clearable
></el-input>
@@ -529,6 +535,7 @@
<el-input
v-else
v-model="form.cbbh"
disabled
placeholder="请输入采标编号"
clearable
></el-input>
@@ -537,6 +544,7 @@
<el-tooltip v-if="form.yybj" effect="dark" :content=form.yybj placement="top-start">
<el-input
v-model="form.yybj"
disabled
placeholder="请输入引用标准"
clearable
></el-input>
@@ -544,6 +552,7 @@
<el-input
v-else
v-model="form.yybj"
disabled
placeholder="请输入引用标准"
clearable
></el-input>
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+1 -1
View File
@@ -786,7 +786,7 @@ export default {
_this: this
}, res => {
this.workData = res.data.records;
this.total = res.data.total;
this.totalNo = res.data.total;
}, e => {
});
},
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue
+33 -23
View File
@@ -275,6 +275,7 @@ export default {
},
data() {
return {
submitFlag: '',
toggleType: '5',
comFlag: 1,
active: "1",
@@ -338,7 +339,8 @@ export default {
if(this.taskId){
this.approvalFlag = true
this.processTable()
this.getData();
//被驳回时调用
this.getHistoryData()
}
},
methods: {
@@ -355,16 +357,6 @@ export default {
}, e => {
})
},
getDatas(){
queryTaskFirst({
bpnId: this.$route.query.bpnId
}).then(res => {
let mes = JSON.parse(res.mes)
this.roleForm = mes.roleForm
this.qbfsForm = mes.qbfsForm
this.commentText = mes.commentText
});
},
getData() {
this.formLoading = true
this.showFlag = false
@@ -375,11 +367,29 @@ export default {
this.getFormFieldList(mes);
});
},
getHistoryData() {
this.submitFlag = '重新起草'
this.showFlag = false
this.formLoading = true
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
taskIds: this.$route.query.taskIds,
pId: this.$route.query.prcId,
}).then(res => {
if (res) {
const processForm = JSON.parse(res.mesg)
this.getFormFieldList(processForm)
}
}).catch(e => {
})
})
},
/**
* @description: 动态表单读取
*/
getFormFieldList(item) {
let type = item.qbfsForm.type
console.log(item);
let type = item.type || item.qbfsForm.type
this.$nextTick(() => {
switch (type){
case '1':
@@ -398,18 +408,18 @@ export default {
this.comName = "establish"
break
}
this.qbfsForm = item.qbfsForm;
this.qbfsForm = item.qbfsForm || item;
this.formLoading = false;
this.roleForm.dockUser = item.roleForm.dockUser;
this.roleForm.dockUserName = item.roleForm.dockUserName;
this.roleForm.countersigner = item.roleForm.countersigner;
this.roleForm.countersignerName = item.roleForm.countersignerName;
this.roleForm.approver = item.roleForm.approver;
this.roleForm.approverName = item.roleForm.approverName;
this.roleForm.engineer = item.roleForm.engineer;
this.roleForm.engineerName = item.roleForm.engineerName;
this.roleForm.examine = item.roleForm.examine;
this.roleForm.examineName = item.roleForm.examineName;
this.roleForm.dockUser = item.dockUser || item.roleForm.dockUser;
this.roleForm.dockUserName = item.dockUserName || item.roleForm.dockUserName;
this.roleForm.countersigner = item.countersigner || item.roleForm.countersigner;
this.roleForm.countersignerName = item.countersignerName || item.roleForm.countersignerName;
this.roleForm.approver = item.approver ||item.roleForm.approver;
this.roleForm.approverName = item.approverName || item.roleForm.approverName;
this.roleForm.engineer = item.engineer || item.roleForm.engineer;
this.roleForm.engineerName = item.engineerName || item.roleForm.engineerName;
this.roleForm.examine = item.examine || item.roleForm.examine;
this.roleForm.examineName = item.examineName || item.roleForm.examineName;
});
},
handleTabs(name) {
src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue
+2 -1
View File
@@ -531,6 +531,7 @@ export default {
this.$http.postData('importWkExcel/importData', _formData,{
_this: this
}, res => {
console.log(res);
if(res.ok){
if(res.data.length){
this.qblx_pageData.qblxData = res.data
@@ -539,7 +540,7 @@ export default {
this.$message.warning('请勿上传为空的文件')
}
}else{
this.$confirm(res.message, "提示", {
this.$confirm(res.data, "提示", {
confirmButtonText: "确认",
confirmButtonClass: "common-button-primary",
cancelButtonText: "取消",
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+1
View File
@@ -87,6 +87,7 @@
</el-table-column>
<el-table-column
align="center"
width="180"
label="标准号"
>
<template slot-scope="scope">
src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+1 -1
View File
@@ -40,7 +40,7 @@
@selection-change="selectStandChange">
<el-table-column align="center" type="selection" width="55">
</el-table-column>
<el-table-column label="标准号" prop="standNumber">
<el-table-column label="标准号" width="180" prop="standNumber">
<template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump"
@click="handlePreview(scope.row)">{{ scope.row.standSort }} {{ scope.row.standNumber
src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+1 -1
View File
@@ -2184,7 +2184,7 @@ export default {
prcType: row.prcType
}
})
}else if(row.taskInfo === '企标制修订计划整改') {
}else if(row.taskInfo === '重新起草') {
this.$router.push({
name: 'qbzxdjhgkStep1',
query:{
src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
-18
View File
@@ -119,18 +119,6 @@
align="center"
label="责任工程师">
</el-table-column>
<el-table-column
prop="authEngineer"
width="150"
align="center"
label="认证工程师">
</el-table-column>
<el-table-column
prop="qaEngineer"
width="150"
align="center"
label="质量工程师">
</el-table-column>
<el-table-column
prop="actualCloseTime"
width="130"
@@ -194,12 +182,6 @@
<el-form-item class="add-form-item" label="责任工程师:">
<div class="seeItem">{{historySeeForm.dutyEngineer}}</div>
</el-form-item>
<el-form-item class="add-form-item" label="认证工程师:">
<div class="seeItem">{{historySeeForm.authEngineer}}</div>
</el-form-item>
<el-form-item class="add-form-item" label="质量工程师:">
<div class="seeItem">{{historySeeForm.qaEngineer}}</div>
</el-form-item>
<el-form-item class="add-form-item" label="要求关闭时间:">
<div class="seeItem">{{historySeeForm.actualCloseTime ? historySeeForm.actualCloseTime.substring(0, 11) : '-'}}</div>
</el-form-item>