master
lion 3 years ago
parent 69cb7acb7e
commit da9a050438

@ -6,7 +6,8 @@
<div slot="content"></div> <div slot="content"></div>
<slot> <slot>
<div> <div>
<Input class="vm10" style="width: 200px; margin-right: 10px" v-model="searchFields.keyword" placeholder="关键字搜索" /> <Input class="vm10" style="width: 200px; margin-right: 10px" v-model="searchFields.keyword"
placeholder="关键字搜索" />
<el-select class="vm10" filterable v-model="searchFields.area_id" placeholder="请选择所属片区"> <el-select class="vm10" filterable v-model="searchFields.area_id" placeholder="请选择所属片区">
<el-option v-for="item in selects.areaList" :key="item.id" :label="item.name" :value="item.id"> <el-option v-for="item in selects.areaList" :key="item.id" :label="item.name" :value="item.id">
</el-option> </el-option>
@ -38,8 +39,8 @@
:label="column.title" :width="column.width" :fixed="column.fixed"> :label="column.title" :width="column.width" :fixed="column.fixed">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="column.type=='opt'"> <div v-if="column.type=='opt'">
<Button v-if="scope.row['accept_status']==4" ghost size="small" @click="edit(scope.row,'pd')" type="primary" <Button v-if="scope.row['accept_status']==4" ghost size="small" @click="edit(scope.row,'pd')"
style="margin-left: 10px;">审核</Button> type="primary" style="margin-left: 10px;">审核</Button>
<!-- <Button v-if="scope.row['accept_status']==0&&scope.row['user_id']!=0" ghost size="small" @click="edit(scope.row,'pd')" type="primary" <!-- <Button v-if="scope.row['accept_status']==0&&scope.row['user_id']!=0" ghost size="small" @click="edit(scope.row,'pd')" type="primary"
style="margin-left: 10px;">改派单</Button> --> style="margin-left: 10px;">改派单</Button> -->
<Button ghost size="small" @click="info(scope.row,'ck')" type="primary" <Button ghost size="small" @click="info(scope.row,'ck')" type="primary"
@ -47,7 +48,8 @@
<!-- <Button ghost size="small" @click="del(scope.row)" type="error" style="margin-left: 10px;">删除</Button> --> <!-- <Button ghost size="small" @click="del(scope.row)" type="error" style="margin-left: 10px;">删除</Button> -->
</div> </div>
<div v-else-if="column.type=='accept_status'"> <div v-else-if="column.type=='accept_status'">
<el-tag v-if="scope.row['accept_status']==0&&scope.row['user_id']==0||scope.row['user_id']==null" type="info"></el-tag> <el-tag v-if="scope.row['accept_status']==0&&scope.row['user_id']==0||scope.row['user_id']==null"
type="info">待派单</el-tag>
<el-tag v-if="scope.row['accept_status']==0&&scope.row['user_id']>0"></el-tag> <el-tag v-if="scope.row['accept_status']==0&&scope.row['user_id']>0"></el-tag>
<el-tag v-if="scope.row['accept_status']==1" type="warning"></el-tag> <el-tag v-if="scope.row['accept_status']==1" type="warning"></el-tag>
<el-tag v-if="scope.row['accept_status']==2" type="success"></el-tag> <el-tag v-if="scope.row['accept_status']==2" type="success"></el-tag>
@ -73,11 +75,7 @@
<el-col :span="24"> <el-col :span="24">
<el-form-item label="处理人" prop="user_id"> <el-form-item label="处理人" prop="user_id">
<el-select filterable style="width:100%" v-model="form.user_id" placeholder="请选择或输入查找处理人"> <el-select filterable style="width:100%" v-model="form.user_id" placeholder="请选择或输入查找处理人">
<el-option <el-option v-for="item in personList" :key="item.id" :label="item.name" :value="item.id">
v-for="item in personList"
:key="item.id"
:label="item.name"
:value="item.id">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -110,16 +108,16 @@
<img width="100%" :src="dialogImageUrl" alt=""> <img width="100%" :src="dialogImageUrl" alt="">
</el-dialog> </el-dialog>
<!-- <maintainInfo @update="updeatshow" ref="maintain" :dialogFormDetailVisible='showinfo'></maintainInfo> --> <maintainInfo ref="maintain"></maintainInfo>
<!-- // --> <!-- // -->
<showRainEquipmentInfo ref="showRainEquipmentInfo"></showRainEquipmentInfo> <showRainEquipmentInfo ref="showRainEquipmentInfo"></showRainEquipmentInfo>
<showRainSiteInfo ref="showRainSiteInfo"></showRainSiteInfo> <showRainSiteInfo ref="showRainSiteInfo"></showRainSiteInfo>
<!-- 查看 审核 办结 --> <!-- 查看 审核 办结 -->
<showCirculationInfo ref="showCirculationInfo" @auditSuccess="load"></showCirculationInfo> <!-- <showCirculationInfo ref="showCirculationInfo" @auditSuccess="load"></showCirculationInfo>
<showDischargeInfo ref="showDischargeInfo" @auditSuccess="load"></showDischargeInfo> <showDischargeInfo ref="showDischargeInfo" @auditSuccess="load"></showDischargeInfo>
<showMireInfo ref="showMireInfo" @auditSuccess="load"></showMireInfo> <showMireInfo ref="showMireInfo" @auditSuccess="load"></showMireInfo> -->
@ -128,7 +126,6 @@
</template> </template>
<script> <script>
import { import {
listsend, listsend,
getsend, getsend,
@ -139,8 +136,12 @@
import { import {
listarea listarea
} from '../../../api/basic/area.js' } from '../../../api/basic/area.js'
import {listCommonuser} from"../../../api/common.js" import {
import {listaccount} from "../../../api/basic/account.js" listCommonuser
} from "../../../api/common.js"
import {
listaccount
} from "../../../api/basic/account.js"
import LxHeader from "@/components/LxHeader/index.vue"; import LxHeader from "@/components/LxHeader/index.vue";
import maintainInfo from '@/views/rain/order/components/maintainInfo' import maintainInfo from '@/views/rain/order/components/maintainInfo'
import showRainEquipmentInfo from '@/views/rain/inspection/components/showRainEquipmentInfo' import showRainEquipmentInfo from '@/views/rain/inspection/components/showRainEquipmentInfo'
@ -161,23 +162,23 @@
}, },
data() { data() {
return { return {
showinfo:false, showinfo: false,
maintainid:0, maintainid: 0,
tableHeight: 0, tableHeight: 0,
dialogOrderFormVisible:false, dialogOrderFormVisible: false,
dialogxcFormDetailVisible:false, dialogxcFormDetailVisible: false,
dialogFormVisible: false, dialogFormVisible: false,
formLabelWidth: "120px", formLabelWidth: "120px",
dialogImageUrl: "", dialogImageUrl: "",
dialogVisible: false, dialogVisible: false,
tableData: [], tableData: [],
personList:[], personList: [],
rainEquipmentEndFiles:[], rainEquipmentEndFiles: [],
rainEquipmentFiles:[], rainEquipmentFiles: [],
worksheetFiles:[], worksheetFiles: [],
tableHeight: 0, tableHeight: 0,
searchFields: { searchFields: {
has_user_id:4 has_user_id: 4
}, },
paginations: { paginations: {
page: 1, page: 1,
@ -185,68 +186,67 @@
total: 0 total: 0
}, },
form: { form: {
user_id:"", user_id: "",
type:"1" type: "1"
}, },
rules: { rules: {
}, },
tableList:{ tableList: {
rain_inspection_info:{}, rain_inspection_info: {},
worksheet_info:{} worksheet_info: {}
}, },
rainEquipmentInfo:{}, rainEquipmentInfo: {},
acceptTime:"", acceptTime: "",
endTime:"", endTime: "",
selects:{ selects: {
nameList:[{ nameList: [{
id:"", id: "",
value:"所有" value: "所有"
},{ }, {
id:1, id: 1,
value:"工单派单" value: "工单派单"
},{ }, {
id:2, id: 2,
value:"巡查派单" value: "巡查派单"
},{ }, {
id:3, id: 3,
value:"养护派单" value: "养护派单"
}], }],
areaList:[{ areaList: [{
id:"", id: "",
name:"所有" name: "所有"
}], }],
sendList:[{ sendList: [{
id:"", id: "",
value:"所有" value: "所有"
},{ }, {
id:0, id: 0,
value:"待派单" value: "待派单"
},{ }, {
id:1, id: 1,
value:"已派单" value: "已派单"
},{ }, {
id:2, id: 2,
value:"已签收" value: "已签收"
},{ }, {
id:3, id: 3,
value:"已完成" value: "已完成"
},{ }, {
id:4, id: 4,
value:"待审核" value: "待审核"
},{ }, {
id:5, id: 5,
value:"审核不通过" value: "审核不通过"
}] }]
}, },
columns: [ columns: [{
{
field: "name", field: "name",
title: "转办来源", title: "转办来源",
type: "string", type: "string",
align: "left", align: "left",
width:180 width: 180
}, },
// { // {
// field: "fromName", // field: "fromName",
@ -267,21 +267,21 @@
title: "所属片区", title: "所属片区",
type: "string", type: "string",
align: "center", align: "center",
width:180 width: 180
}, },
{ {
field: "content", field: "content",
title: "工作内容", title: "工作内容",
type: "string", type: "string",
align: "left", align: "left",
width:240 width: 240
}, },
{ {
field: "address", field: "address",
title: "位置地址", title: "位置地址",
type: "string", type: "string",
align: "left", align: "left",
width:240 width: 240
}, },
// { // {
// field: "dealName", // field: "dealName",
@ -295,35 +295,35 @@
title: "要求完成时间", title: "要求完成时间",
type: "string", type: "string",
align: "center", align: "center",
width:180 width: 180
}, },
{ {
field: "accept_status", field: "accept_status",
title: "状态", title: "状态",
type: "accept_status", type: "accept_status",
align: "center", align: "center",
width:180 width: 180
}, },
{ {
field: "adminName", field: "adminName",
title: "提交人", title: "提交人",
type: "string", type: "string",
align: "center", align: "center",
width:180 width: 180
}, },
{ {
field: "created_at", field: "created_at",
title: "提交日期", title: "提交日期",
type: "string", type: "string",
align: "center", align: "center",
width:180 width: 180
}, },
{ {
field: "操作", field: "操作",
title: "操作", title: "操作",
width: 220, width: 220,
type: "opt", type: "opt",
fixed:"right" fixed: "right"
} }
], ],
} }
@ -333,7 +333,7 @@
this.load(); this.load();
}, },
watch:{ watch: {
acceptTime(newVal, oldVal) { acceptTime(newVal, oldVal) {
if (newVal) { if (newVal) {
this.searchFields.start_accept_date = newVal[0] this.searchFields.start_accept_date = newVal[0]
@ -360,9 +360,9 @@
this.dialogImageUrl = file.url; this.dialogImageUrl = file.url;
this.dialogVisible = true; this.dialogVisible = true;
}, },
updeatshow(e){ updeatshow(e) {
this.showinfo = e this.showinfo = e
}, },
initLoad() { initLoad() {
var that = this; var that = this;
var clientHeight = document.documentElement.clientHeight var clientHeight = document.documentElement.clientHeight
@ -386,10 +386,10 @@ updeatshow(e){
page: 1, page: 1,
page_size: 999, page_size: 999,
}).then(response => { }).then(response => {
for(var m of response.data){ for (var m of response.data) {
that.selects.areaList.push({ that.selects.areaList.push({
id:m.id, id: m.id,
name:m.name name: m.name
}) })
} }
}).catch(error => { }).catch(error => {
@ -408,13 +408,13 @@ updeatshow(e){
...this.searchFields ...this.searchFields
}).then(response => { }).then(response => {
var that = this var that = this
for(var m of response.data){ for (var m of response.data) {
for(var k in that.tableList){ for (var k in that.tableList) {
if(m[k]){ if (m[k]) {
m.areaName = m[k].area ? m[k].area.name : (m[k].area_info?m[k].area_info.name:"") m.areaName = m[k].area ? m[k].area.name : (m[k].area_info ? m[k].area_info.name : "")
m.adminName = m.admin?m.admin.name:"" m.adminName = m.admin ? m.admin.name : ""
m.address = m[k].address m.address = m[k].address
m.end_time =m[k].end_time m.end_time = m[k].end_time
m.content = m[k].content m.content = m[k].content
} }
} }
@ -426,22 +426,22 @@ updeatshow(e){
reject(error) reject(error)
}); });
}, },
showsfalse(val){ showsfalse(val) {
console.log(val) console.log(val)
this.showinfo = false this.showinfo = false
}, },
info(obj,what) { info(obj, what) {
var that = this; var that = this;
if(obj.rain_inspection_id){ if (obj.rain_inspection_id) {
// //
if(obj.rain_inspection_info.type==1){ if (obj.rain_inspection_info.type == 1) {
this.$refs.showRainEquipmentInfo.isShow = true this.$refs.showRainEquipmentInfo.isShow = true
this.$refs.showRainEquipmentInfo.getEquipmentInfo(obj.rain_inspection_id) this.$refs.showRainEquipmentInfo.getEquipmentInfo(obj.rain_inspection_id)
this.$refs.showRainEquipmentInfo.infoId = obj.rain_inspection_id this.$refs.showRainEquipmentInfo.infoId = obj.rain_inspection_id
this.$refs.showRainEquipmentInfo.formType = 'showform' this.$refs.showRainEquipmentInfo.formType = 'showform'
} }
// //
if(obj.rain_inspection_info.type==2){ if (obj.rain_inspection_info.type == 2) {
this.$refs.showRainSiteInfo.isShow = true this.$refs.showRainSiteInfo.isShow = true
this.$refs.showRainSiteInfo.getSiteInfo(obj.rain_inspection_id) this.$refs.showRainSiteInfo.getSiteInfo(obj.rain_inspection_id)
this.$refs.showRainSiteInfo.infoId = obj.rain_inspection_id this.$refs.showRainSiteInfo.infoId = obj.rain_inspection_id
@ -453,7 +453,11 @@ updeatshow(e){
// this.$refs.maintain.info(obj.rain_maintain_id) // this.$refs.maintain.info(obj.rain_maintain_id)
// } // }
if(obj.rain_maintain_id>0){ if (obj.rain_maintain_id > 0) {
this.$refs.maintain.dialogFormDetailVisible = true
// this.showinfo = true
this.$refs.maintain.info(obj.rain_maintain_id)
return
if (obj.old_type == 1 || obj.old_type == 2 || obj.old_type == 6 || obj.old_type == 7 || obj.old_type == 5) { if (obj.old_type == 1 || obj.old_type == 2 || obj.old_type == 6 || obj.old_type == 7 || obj.old_type == 5) {
this.$refs.showCirculationInfo.isShow = true this.$refs.showCirculationInfo.isShow = true
this.$refs.showCirculationInfo.infoId = obj.rain_maintain_id this.$refs.showCirculationInfo.infoId = obj.rain_maintain_id
@ -481,8 +485,8 @@ updeatshow(e){
// this.$set(that.form,res); // this.$set(that.form,res);
that.form = result; that.form = result;
// that.dialogFormVisible = true // that.dialogFormVisible = true
that.form.user_id = result.user_id==0 ? "":result.user_id that.form.user_id = result.user_id == 0 ? "" : result.user_id
that.form.type = result.type==0 ? 1:result.type that.form.type = result.type == 0 ? 1 : result.type
that.form.accept_status = 0 that.form.accept_status = 0
this.$Modal.confirm({ this.$Modal.confirm({
title: '确认审核该条数据?', title: '确认审核该条数据?',
@ -514,18 +518,22 @@ updeatshow(e){
.dialogConcent { .dialogConcent {
overflow-y: auto; overflow-y: auto;
} }
.width100{
width:100%; .width100 {
width: 100%;
} }
.files_check .el-upload.el-upload--picture-card { .files_check .el-upload.el-upload--picture-card {
display: none; display: none;
} }
.vm10{
margin-right:10px; .vm10 {
margin-bottom:10px; margin-right: 10px;
margin-bottom: 10px;
height: 32px; height: 32px;
vertical-align: bottom; vertical-align: bottom;
} }
.vm10 input { .vm10 input {
height: 32px; height: 32px;
vertical-align: middle; vertical-align: middle;
@ -534,10 +542,13 @@ updeatshow(e){
.vm10 .el-select__caret.el-input__icon.el-icon-arrow-up { .vm10 .el-select__caret.el-input__icon.el-icon-arrow-up {
line-height: 30px; line-height: 30px;
} }
.vm10 .el-input__icon.el-range__icon.el-icon-date,.vm10 .el-range-separator{
.vm10 .el-input__icon.el-range__icon.el-icon-date,
.vm10 .el-range-separator {
line-height: 25px; line-height: 25px;
} }
.selerchcontent button{
.selerchcontent button {
vertical-align: top; vertical-align: top;
} }
</style> </style>

Loading…
Cancel
Save