|
|
@@ -10,6 +10,7 @@
|
|
|
<el-select v-model="formInline.status" placeholder="请选择">
|
|
|
<el-option label="已办" value="1"></el-option>
|
|
|
<el-option label="待办" value="2"></el-option>
|
|
|
+ <el-option label="修编" value="3"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="规划类型:">
|
|
|
@@ -85,12 +86,14 @@
|
|
|
<div class="">
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
+ size="mini"
|
|
|
@click="open(scope.row)"
|
|
|
style="display: inline-block"
|
|
|
>审批记录</el-button
|
|
|
>
|
|
|
<el-button
|
|
|
type="primary"
|
|
|
+ size="mini"
|
|
|
style="display: inline-block"
|
|
|
@click="download(scope.row)"
|
|
|
v-if="formInline.planType == '1'"
|
|
|
@@ -110,7 +113,7 @@
|
|
|
cell-class-name="cell-item"
|
|
|
height="100%"
|
|
|
tooltip-effect="dark"
|
|
|
- v-show="formInline.status == '2'"
|
|
|
+ v-show="formInline.status == '2' || formInline.status == '3'"
|
|
|
>
|
|
|
<el-table-column prop="id" label="记录主键" align="center">
|
|
|
</el-table-column>
|
|
|
@@ -131,20 +134,38 @@
|
|
|
align="center"
|
|
|
type="flex"
|
|
|
justity="space-between"
|
|
|
- width="120"
|
|
|
- v-if="
|
|
|
- $store.getters.roles.join(',').indexOf('qixian') > -1 ||
|
|
|
- $store.getters.roles.join(',').indexOf('shiji') > -1
|
|
|
- "
|
|
|
+ width="220"
|
|
|
>
|
|
|
<template #default="scope">
|
|
|
<div class="">
|
|
|
<el-button
|
|
|
+ v-if="formInline.status == '3'"
|
|
|
+ type="primary"
|
|
|
+ size="mini"
|
|
|
+ @click="open(scope.row)"
|
|
|
+ style="display: inline-block"
|
|
|
+ >审批记录</el-button
|
|
|
+ >
|
|
|
+ <el-button
|
|
|
+ v-if="formInline.status == '3'"
|
|
|
+ type="primary"
|
|
|
+ size="mini"
|
|
|
+ @click="xbUpload(scope.row)"
|
|
|
+ style="display: inline-block"
|
|
|
+ >修编</el-button
|
|
|
+ >
|
|
|
+ <el-button
|
|
|
+ v-if="
|
|
|
+ ($store.getters.roles.join(',').indexOf('qixian') > -1 ||
|
|
|
+ $store.getters.roles.join(',').indexOf('shiji') > -1) &&
|
|
|
+ scope.row &&
|
|
|
+ scope.row.nodeName == '补正'
|
|
|
+ "
|
|
|
type="primary"
|
|
|
+ size="mini"
|
|
|
@click="upload(scope.row)"
|
|
|
style="display: inline-block"
|
|
|
:disabled="instids.indexOf(scope.row.instId) > -1"
|
|
|
- v-if="scope.row && scope.row.nodeName == '补正'"
|
|
|
>上传</el-button
|
|
|
>
|
|
|
</div>
|
|
|
@@ -197,6 +218,43 @@
|
|
|
@refresh="changeForm"
|
|
|
@getlist="changeForm"
|
|
|
></XxghcgDialog>
|
|
|
+ <el-dialog
|
|
|
+ title="修编上传"
|
|
|
+ v-model="dialogVisible"
|
|
|
+ style="width: 360px; height: 300px"
|
|
|
+ :before-close="handleClose"
|
|
|
+ append-to-body
|
|
|
+ >
|
|
|
+ <div style="width: 100%; height: 100%">
|
|
|
+ <el-form label-width="100px">
|
|
|
+ <el-form-item label="选择文件">
|
|
|
+ <el-upload
|
|
|
+ ref="fileUploadBtn"
|
|
|
+ :limit="1"
|
|
|
+ :file-list="fileList"
|
|
|
+ :on-change="handleChangeFile"
|
|
|
+ :on-remove="handleRemove"
|
|
|
+ :auto-upload="false"
|
|
|
+ :show-file-list="true"
|
|
|
+ >
|
|
|
+ <el-button size="small" type="primary">点击上传</el-button>
|
|
|
+ </el-upload>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="流程主键">
|
|
|
+ <el-input
|
|
|
+ readonly
|
|
|
+ v-model="instid"
|
|
|
+ placeholder="请输入流程主键"
|
|
|
+ ></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-form>
|
|
|
+ </div>
|
|
|
+ <span slot="footer" class="dialog-footer">
|
|
|
+ <el-button type="primary" @click="xbSubmit()" size="small"
|
|
|
+ >修编</el-button
|
|
|
+ >
|
|
|
+ </span>
|
|
|
+ </el-dialog>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
@@ -210,6 +268,8 @@ import {
|
|
|
reportDownloadAction,
|
|
|
getInstIds,
|
|
|
getcgglInstIds,
|
|
|
+ getLandGetRevisePageData,
|
|
|
+ reuploadThirdpartyReviseData,
|
|
|
} from "@/api/ghcgysc/search.js";
|
|
|
import ShjlDialog from "@/components/ghcgscygl/ghcgsb/search/Shjl.vue";
|
|
|
import GhcgDialog from "@/components/ghcgscygl/ghcgsb/ztgh/ghcgDialog.vue";
|
|
|
@@ -237,6 +297,9 @@ export default {
|
|
|
divisionCode: "",
|
|
|
subject: "",
|
|
|
},
|
|
|
+ fileList: [],
|
|
|
+ xbfile: null,
|
|
|
+ dialogVisible: false,
|
|
|
xzqCode: [],
|
|
|
xzoptions: [],
|
|
|
instid: "",
|
|
|
@@ -286,6 +349,11 @@ export default {
|
|
|
qxyh.activeCg = activeCg;
|
|
|
qxyh.ckxqDialog = true;
|
|
|
},
|
|
|
+ handleClose() {
|
|
|
+ qxyh.dialogVisible = false;
|
|
|
+ qxyh.xbfile = null;
|
|
|
+ qxyh.fileList = [];
|
|
|
+ },
|
|
|
// 审核记录
|
|
|
open(row) {
|
|
|
let id = row.id;
|
|
|
@@ -302,6 +370,43 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
+ // 修编记录
|
|
|
+ xbUpload(row) {
|
|
|
+ let id = row.id;
|
|
|
+ let instId = row.instId;
|
|
|
+ qxyh.instid = instId;
|
|
|
+ qxyh.dialogVisible = true;
|
|
|
+ },
|
|
|
+ handleRemove() {
|
|
|
+ qxyh.xbfile = null;
|
|
|
+ qxyh.fileList = [];
|
|
|
+ },
|
|
|
+ handleChangeFile(file, fileList) {
|
|
|
+ qxyh.xbfile = file.raw;
|
|
|
+ qxyh.fileList = fileList;
|
|
|
+ },
|
|
|
+ xbSubmit() {
|
|
|
+ if (!qxyh.instid) {
|
|
|
+ ElMessage.error("请输入流程主键");
|
|
|
+ } else if (!qxyh.xbfile) {
|
|
|
+ ElMessage.error("请选择修编文件");
|
|
|
+ } else {
|
|
|
+ console.log("开始修编上传");
|
|
|
+ const formdata = new FormData();
|
|
|
+ formdata.append("file", qxyh.xbfile);
|
|
|
+ formdata.append("instid", qxyh.instid);
|
|
|
+ reuploadThirdpartyReviseData(formdata).then((res) => {
|
|
|
+ if (res.success) {
|
|
|
+ ElMessage.success("修编上传成功");
|
|
|
+ qxyh.dialogVisible = false;
|
|
|
+ qxyh.xbfile = null;
|
|
|
+ qxyh.fileList = [];
|
|
|
+ } else {
|
|
|
+ ElMessage.error("修编上传失败");
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
+ },
|
|
|
setXzqdm() {
|
|
|
if (qxyh.xzqCode && qxyh.xzqCode.length > 0) {
|
|
|
qxyh.formInline.divisionCode = qxyh.xzqCode[qxyh.xzqCode.length - 1];
|
|
|
@@ -366,6 +471,11 @@ export default {
|
|
|
qxyh.tableData1 = res.data.records;
|
|
|
qxyh.formInline.total = res.data.total || 999;
|
|
|
});
|
|
|
+ } else if (qxyh.formInline.status == 3) {
|
|
|
+ getLandGetRevisePageData(qxyh.formInline).then((res) => {
|
|
|
+ qxyh.tableData2 = res.data.records;
|
|
|
+ qxyh.formInline.total = res.data.total || 999;
|
|
|
+ });
|
|
|
} else if (qxyh.formInline.status == 2) {
|
|
|
getLandGetAllTasks(qxyh.formInline).then((res) => {
|
|
|
qxyh.formInline.total = res.data.total || 999;
|
|
|
@@ -417,6 +527,12 @@ export default {
|
|
|
});
|
|
|
}
|
|
|
});
|
|
|
+ } else if (qxyh.formInline.status == 3) {
|
|
|
+ getLandGetRevisePageData(qxyh.formInline).then((res) => {
|
|
|
+ qxyh.formInline.current = 1;
|
|
|
+ qxyh.tableData2 = res.data.records;
|
|
|
+ qxyh.formInline.total = res.data.total || 999;
|
|
|
+ });
|
|
|
} else {
|
|
|
ElMessage.error("请选择规划类型");
|
|
|
}
|
|
|
@@ -485,4 +601,10 @@ export default {
|
|
|
position: absolute;
|
|
|
right: -40px;
|
|
|
}
|
|
|
+.dialog-footer {
|
|
|
+ width: 100%;
|
|
|
+ text-align: center;
|
|
|
+ position: absolute;
|
|
|
+ bottom: 30px;
|
|
|
+}
|
|
|
</style>
|
