|
|
@@ -1,139 +1,134 @@
|
|
|
<template>
|
|
|
- <div class="workersList-container">
|
|
|
- <simple-form
|
|
|
- :form="table_form"
|
|
|
- :handle="table_handle"
|
|
|
- @search="handleSearch"
|
|
|
- @summary="handleVisible('summary')"
|
|
|
- @add="handleVisible('add')"
|
|
|
+ <div class="workersList-container">
|
|
|
+ <simple-form
|
|
|
+ :form="table_form"
|
|
|
+ :handle="table_handle"
|
|
|
+ @search="handleSearch"
|
|
|
+ @summary="handleVisible('summary')"
|
|
|
+ @add="handleVisible('add')"
|
|
|
+ >
|
|
|
+ </simple-form>
|
|
|
+ <simple-table
|
|
|
+ :list="table_list"
|
|
|
+ :config="table_config"
|
|
|
+ :loading="table_loading"
|
|
|
+ :multiple="true"
|
|
|
+ :handle-row="table_handle_row"
|
|
|
+ @selection="handleaaa"
|
|
|
+ @check="handleCheck"
|
|
|
+ @edit="handleEdit"
|
|
|
+ ></simple-table>
|
|
|
+ <simple-pagination
|
|
|
+ :page="page"
|
|
|
+ :total="total"
|
|
|
+ @change="handleChange"
|
|
|
+ ></simple-pagination>
|
|
|
+ <simple-dialog
|
|
|
+ :title="title"
|
|
|
+ :fullscreen="true"
|
|
|
+ @cancel="handleVisible('add')"
|
|
|
+ :visible="add_visible"
|
|
|
+ >
|
|
|
+ <el-form
|
|
|
+ label-width="120px"
|
|
|
+ :model="add_form"
|
|
|
+ ref="add_ref"
|
|
|
>
|
|
|
- </simple-form>
|
|
|
- <simple-table
|
|
|
- :list="table_list"
|
|
|
- :config="table_config"
|
|
|
- :loading="table_loading"
|
|
|
- :multiple="true"
|
|
|
- :handle-row="table_handle_row"
|
|
|
- @selection="handleaaa"
|
|
|
- @check="handleCheck"
|
|
|
- @edit="handleEdit"
|
|
|
- ></simple-table>
|
|
|
- <simple-pagination
|
|
|
- :page="page"
|
|
|
- :total="total"
|
|
|
- @change="handleChange"
|
|
|
- ></simple-pagination>
|
|
|
- <simple-dialog
|
|
|
- :title="title"
|
|
|
- :fullscreen="true"
|
|
|
- @cancel="handleVisible('add')"
|
|
|
- :visible="add_visible"
|
|
|
- >
|
|
|
- <el-form
|
|
|
- label-width="120px"
|
|
|
- :model="add_form"
|
|
|
- ref="add_ref"
|
|
|
- >
|
|
|
- <el-form-item
|
|
|
- label="提出人"
|
|
|
- prop="proposer"
|
|
|
- :rules="{
|
|
|
+ <el-form-item
|
|
|
+ label="提出人"
|
|
|
+ prop="proposer"
|
|
|
+ :rules="{
|
|
|
required: true,
|
|
|
message: '提出人不能为空',
|
|
|
trigger: 'blur',
|
|
|
}"
|
|
|
- >
|
|
|
- <el-input v-model="add_form.proposer"></el-input>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item
|
|
|
- label="联系电话"
|
|
|
- prop="telephone"
|
|
|
- :rules="{
|
|
|
+ >
|
|
|
+ <el-input v-model="add_form.proposer"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item
|
|
|
+ label="联系电话"
|
|
|
+ prop="telephone"
|
|
|
+ :rules="{
|
|
|
required: true,
|
|
|
message: '联系电话不能为空',
|
|
|
trigger: 'blur',
|
|
|
}"
|
|
|
- >
|
|
|
- <el-input v-model="add_form.telephone"></el-input>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item
|
|
|
- label="网格划分需求"
|
|
|
- prop="wanggeText"
|
|
|
- :rules="{
|
|
|
+ >
|
|
|
+ <el-input v-model="add_form.telephone"></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item
|
|
|
+ label="网格划分需求"
|
|
|
+ prop="wanggeText"
|
|
|
+ :rules="{
|
|
|
required: true,
|
|
|
message: '网格划分需求不能为空',
|
|
|
trigger: 'blur',
|
|
|
}"
|
|
|
- >
|
|
|
- <el-input
|
|
|
- type="textarea"
|
|
|
- v-model="add_form.wanggeText"
|
|
|
- ></el-input>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item
|
|
|
- label="附件上传"
|
|
|
- prop="file"
|
|
|
- >
|
|
|
- <myUpload
|
|
|
- @uploadBack="uploadBack"
|
|
|
- :fileInfo="fileInfo"
|
|
|
- :fileList="fileInfo.fileList"
|
|
|
- ></myUpload>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item
|
|
|
- label="审批轨迹"
|
|
|
- prop=""
|
|
|
- v-if="edit_visible"
|
|
|
- >
|
|
|
- <simple-table
|
|
|
- :list="table_list_approve"
|
|
|
- :config="table_config_approve"
|
|
|
- :loading="table_loading_approve"
|
|
|
- ></simple-table>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item
|
|
|
- label="审批意见"
|
|
|
- prop="desc"
|
|
|
- v-if="edit_visible"
|
|
|
- :rules="{
|
|
|
- required: true,
|
|
|
- message: '审批意见不能为空',
|
|
|
- trigger: 'blur',
|
|
|
- }"
|
|
|
- >
|
|
|
- <el-input
|
|
|
- type="textarea"
|
|
|
- v-model="add_form.desc"
|
|
|
- ></el-input>
|
|
|
- </el-form-item>
|
|
|
- </el-form>
|
|
|
- <template v-slot:footer>
|
|
|
- <div v-if="!isCheck">
|
|
|
- <el-button
|
|
|
- @click="handleSubmit"
|
|
|
- type="primary"
|
|
|
- >保存</el-button>
|
|
|
- <el-button
|
|
|
- @click="handleVisible('add')"
|
|
|
- type="default"
|
|
|
- >取消</el-button>
|
|
|
- </div>
|
|
|
- <div v-else></div>
|
|
|
- </template>
|
|
|
- </simple-dialog>
|
|
|
- <simple-dialog
|
|
|
- title="工单汇总"
|
|
|
- width="40%"
|
|
|
- @cancel="handleVisible('summary')"
|
|
|
- @confirm="handleSummary"
|
|
|
- :visible="summary_visible"
|
|
|
- >
|
|
|
- <div class="summary">
|
|
|
- <p>是否要对所选工单进行汇总？</p>
|
|
|
- <p class="summary-tip">可对未审批的区县网格划分审批工单合并为同一条工单，由相关审批人员进行审批，减少审批工作量</p>
|
|
|
+ >
|
|
|
+ <el-input
|
|
|
+ type="textarea"
|
|
|
+ v-model="add_form.wanggeText"
|
|
|
+ ></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item
|
|
|
+ label="附件上传"
|
|
|
+ prop="file"
|
|
|
+ >
|
|
|
+ <myUpload
|
|
|
+ @uploadBack="uploadBack"
|
|
|
+ :fileInfo="fileInfo"
|
|
|
+ :fileList="fileInfo.fileList"
|
|
|
+ ></myUpload>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item
|
|
|
+ label="审批轨迹"
|
|
|
+ prop=""
|
|
|
+ v-if="edit_visible"
|
|
|
+ >
|
|
|
+ <simple-table
|
|
|
+ :list="table_list_approve"
|
|
|
+ :config="table_config_approve"
|
|
|
+ :loading="table_loading_approve"
|
|
|
+ ></simple-table>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item
|
|
|
+ label="审批意见"
|
|
|
+ prop="desc"
|
|
|
+ v-if="edit_visible"
|
|
|
+ >
|
|
|
+ <el-input
|
|
|
+ type="textarea"
|
|
|
+ v-model="add_form.desc"
|
|
|
+ ></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-form>
|
|
|
+ <template v-slot:footer>
|
|
|
+ <div v-if="!isCheck">
|
|
|
+ <el-button
|
|
|
+ @click="handleSubmit"
|
|
|
+ type="primary"
|
|
|
+ >保存</el-button>
|
|
|
+ <el-button
|
|
|
+ @click="handleVisible('add')"
|
|
|
+ type="default"
|
|
|
+ >取消</el-button>
|
|
|
</div>
|
|
|
- </simple-dialog>
|
|
|
- </div>
|
|
|
+ <div v-else></div>
|
|
|
+ </template>
|
|
|
+ </simple-dialog>
|
|
|
+ <simple-dialog
|
|
|
+ title="工单汇总"
|
|
|
+ width="40%"
|
|
|
+ @cancel="handleVisible('summary')"
|
|
|
+ @confirm="handleSummary"
|
|
|
+ :visible="summary_visible"
|
|
|
+ >
|
|
|
+ <div class="summary">
|
|
|
+ <p>是否要对所选工单进行汇总？</p>
|
|
|
+ <p class="summary-tip">可对未审批的区县网格划分审批工单合并为同一条工单，由相关审批人员进行审批，减少审批工作量</p>
|
|
|
+ </div>
|
|
|
+ </simple-dialog>
|
|
|
+ </div>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
@@ -163,9 +158,9 @@ export default {
|
|
|
rows: 10,
|
|
|
total: 0,
|
|
|
// 模态框标题
|
|
|
- title:'',
|
|
|
+ title: "",
|
|
|
// 是否为查看状态
|
|
|
- isCheck:false,
|
|
|
+ isCheck: false,
|
|
|
table_search: {},
|
|
|
// 新建模态框
|
|
|
add_visible: false,
|
|
|
@@ -301,6 +296,7 @@ export default {
|
|
|
mounted() {
|
|
|
this.handleInit({
|
|
|
...this.table_search,
|
|
|
+ type: "0",
|
|
|
page: this.page,
|
|
|
pageSize: this.rows,
|
|
|
});
|
|
|
@@ -328,15 +324,21 @@ export default {
|
|
|
handleSearch(data) {
|
|
|
this.table_search = data;
|
|
|
this.page = 1;
|
|
|
- this.handleInit({ ...data, page: this.page, pageSize: this.rows });
|
|
|
+ this.handleInit({
|
|
|
+ ...data,
|
|
|
+ type: "0",
|
|
|
+ page: this.page,
|
|
|
+ pageSize: this.rows,
|
|
|
+ });
|
|
|
},
|
|
|
handleVisible(props) {
|
|
|
switch (props) {
|
|
|
case "add":
|
|
|
this.add_visible = !this.add_visible;
|
|
|
this.edit_visible = false;
|
|
|
- this.title = '新建'
|
|
|
- this.isCheck = false
|
|
|
+ this.title = "新建";
|
|
|
+ this.isCheck = false;
|
|
|
+ this.add_form = {};
|
|
|
break;
|
|
|
case "summary":
|
|
|
this.summary_visible = !this.summary_visible;
|
|
|
@@ -345,14 +347,14 @@ export default {
|
|
|
case "edit":
|
|
|
this.edit_visible = !this.edit_visible;
|
|
|
this.add_visible = !this.add_visible;
|
|
|
- this.title = '发起人处理'
|
|
|
- this.isCheck = false
|
|
|
+ this.title = "发起人处理";
|
|
|
+ this.isCheck = false;
|
|
|
break;
|
|
|
case "check":
|
|
|
this.edit_visible = !this.edit_visible;
|
|
|
this.add_visible = !this.add_visible;
|
|
|
- this.title = '查看'
|
|
|
- this.isCheck = true
|
|
|
+ this.title = "查看";
|
|
|
+ this.isCheck = true;
|
|
|
break;
|
|
|
}
|
|
|
},
|
|
|
@@ -366,38 +368,56 @@ export default {
|
|
|
},
|
|
|
// 查看按钮
|
|
|
handleCheck(row) {
|
|
|
- // console.log(row, "row");
|
|
|
- this.handleVisible("check");
|
|
|
- this.add_form = {
|
|
|
- proposer: row.proposer,
|
|
|
- telephone: row.telephone,
|
|
|
- wanggeText: row.wanggeText,
|
|
|
- desc: row.desc,
|
|
|
- };
|
|
|
- // this.visible = true;
|
|
|
- // this.edit_visible = false;
|
|
|
- // this.edit_form = row;
|
|
|
- // this.edit_visible = !this.edit_visible
|
|
|
- // this.add_visible = !this.add_visible
|
|
|
+ let id = row.id;
|
|
|
+ this.handleVisible('check')
|
|
|
+ this.$http({
|
|
|
+ url: "/mkWangge/getMkWanggeById",
|
|
|
+ method: "get",
|
|
|
+ headers: {
|
|
|
+ "Content-Type": "application/json",
|
|
|
+ },
|
|
|
+ params:{
|
|
|
+ id
|
|
|
+ }
|
|
|
+ }).then(({data})=>{
|
|
|
+ console.log(data);
|
|
|
+ this.add_form = {
|
|
|
+ id: data.id,
|
|
|
+ proposer: data.proposer,
|
|
|
+ telephone: data.telephone,
|
|
|
+ wanggeText: data.wanggeText,
|
|
|
+ }
|
|
|
+ })
|
|
|
},
|
|
|
// 编辑按钮
|
|
|
handleEdit(row) {
|
|
|
- this.handleVisible("edit");
|
|
|
- this.add_form = {
|
|
|
- proposer: row.proposer,
|
|
|
- telephone: row.telephone,
|
|
|
- wanggeText: row.wanggeText,
|
|
|
- desc: row.desc,
|
|
|
- id: row.id,
|
|
|
- };
|
|
|
- console.log(this.add_form);
|
|
|
+ let id = row.id;
|
|
|
+ this.handleVisible('edit')
|
|
|
+ this.$http({
|
|
|
+ url: "/mkWangge/getMkWanggeById",
|
|
|
+ method: "get",
|
|
|
+ headers: {
|
|
|
+ "Content-Type": "application/json",
|
|
|
+ },
|
|
|
+ params:{
|
|
|
+ id
|
|
|
+ }
|
|
|
+ }).then(({data})=>{
|
|
|
+ console.log(data);
|
|
|
+ this.add_form = {
|
|
|
+ id: data.id,
|
|
|
+ proposer: data.proposer,
|
|
|
+ telephone: data.telephone,
|
|
|
+ wanggeText: data.wanggeText,
|
|
|
+ }
|
|
|
+ })
|
|
|
},
|
|
|
handleSubmit() {
|
|
|
console.log(this.add_form);
|
|
|
// let _this = this;
|
|
|
this.$refs.add_ref.validate((valid) => {
|
|
|
if (valid) {
|
|
|
- let reqdata = [this.add_form];
|
|
|
+ let reqdata = [{ ...this.add_form, processId: "729294602773110788" }];
|
|
|
this.$http({
|
|
|
url: "/mkWangge/saveOrUpdateList",
|
|
|
method: "post",
|
|
|
@@ -423,6 +443,7 @@ export default {
|
|
|
this.page = page;
|
|
|
this.handleInit({
|
|
|
...this.table_search,
|
|
|
+ type: "0",
|
|
|
page: this.page,
|
|
|
pageSize: this.rows,
|
|
|
});
|
