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

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

Browse Source
This commit is contained in:
zhutianqi
2022-03-07 16:54:32 +08:00
parent e3b54013ab cde1e47f48
commit 43a8a9fb9b
1 changed files with 87 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+87 -110
View File
@@ -559,14 +559,12 @@
<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
@@ -590,7 +588,6 @@
<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
@@ -598,7 +595,6 @@
</el-tooltip>
<el-input
v-else
disabled
v-model="form.bfbdtbzh"
placeholder="请输入部分代替标准号"
clearable
@@ -608,7 +604,6 @@
<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>
@@ -616,7 +611,6 @@
<el-input
v-else
v-model="form.cbbh"
disabled
placeholder="请输入采标编号"
clearable
></el-input>
@@ -625,7 +619,6 @@
<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>
@@ -633,7 +626,6 @@
<el-input
v-else
v-model="form.yybj"
disabled
placeholder="请输入引用标准"
clearable
></el-input>
@@ -644,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>
@@ -813,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";
@@ -842,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: [],
@@ -1232,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)
}
}
})
}
})
});
},
/**