Browse Source

Merge branch 'dev-chaxun' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-chaxun

shibei_master
13176889840 4 years ago
parent
commit
0312a9e04b
  1. 297
      src/views/components/resiChangeRecord.vue
  2. 479
      src/views/components/resiTransfer.vue
  3. 42
      src/views/main.vue
  4. 3
      src/views/modules/base/category/addCategory.vue
  5. 4
      src/views/modules/base/category/main.vue
  6. 78
      src/views/modules/base/resi.vue
  7. 8
      src/views/modules/communityParty/regionalParty/finishList.vue

297
src/views/components/resiChangeRecord.vue

@ -0,0 +1,297 @@
<template>
<div class="div_main">
<el-table class="table"
:data="tableData"
border
:height="tableHeight"
v-loading="tableLoading"
:header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
style="width: 100%">
<el-table-column label="序号"
header-align="center"
align="center"
type="index"
width="50"></el-table-column>
<el-table-column prop="typeName"
header-align="center"
align="center"
label="变更类型"
width="80">
</el-table-column>
<el-table-column prop="beforeChangeName"
header-align="center"
align="center"
label="变更前"
width="230">
</el-table-column>
<el-table-column prop="afterChanegName"
header-align="center"
align="center"
label="变更后"
min-width="230">
</el-table-column>
<el-table-column prop="changeTime"
header-align="center"
align="center"
label="调整时间"
width="160">
</el-table-column>
<el-table-column prop="operatorName"
header-align="center"
align="center"
label="操作人"
width="80">
</el-table-column>
<el-table-column prop="remark"
header-align="center"
align="center"
label="备注"
width="120">
</el-table-column>
</el-table>
<div>
<el-pagination @size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page.sync="pageNo"
:page-sizes="[10, 20, 50]"
:page-size="pageSize"
layout="sizes, prev, pager, next, total"
:total="total">
</el-pagination>
</div>
</div>
</template>
<script>
import util from '@js/util.js';
import { requestPost } from "@/js/dai/request";
import { mapGetters } from 'vuex'
import { Loading } from 'element-ui' // Loading
let loading //
export default {
data () {
return {
loading: false,
total: 0,
pageSize: 10,
pageNo: 0,
tableLoading: false,
tableData: [],
icUserId: '',
}
},
async mounted () {
},
methods: {
async initForm (row) {
this.icUserId = row.icResiUserId
//
await this.loadTable()
},
handleSearch () {
this.loadTable()
},
async loadTable () {
this.tableLoading = true
const url = "/epmetuser/icuserchangerecord/list"
let params = {
icUserId: this.icUserId,
pageSize: this.pageSize,
pageNo: this.pageNo,
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.total = data.total
this.tableData = data.list
} else {
this.$message.error(msg)
}
this.tableLoading = false
},
//
initDate () {
let yesterday = new Date((new Date).getTime() - 24 * 60 * 60 * 1000)
let year = yesterday.getFullYear()
let month = yesterday.getMonth() + 1 //
let day = yesterday.getDate() //
let days = new Date(year, month, 0);
days = days.getDate(); //
let year2 = year;
let month2 = parseInt(month) - 1;
if (month2 == 0) {
year2 = parseInt(year2) - 1;
month2 = 12;
}
let day2 = day;
let days2 = new Date(year2, month2, 0);
days2 = days2.getDate();
if (day2 > days2) {
day2 = days2;
}
if (month2 < 10) {
month2 = '0' + month2;
}
if (month < 10) {
month = '0' + month;
}
if (day < 10) {
day = '0' + day;
}
if (day2 < 10) {
day2 = '0' + day2;
}
let t2 = year2 + '-' + month2 + '-' + day2;
let t1 = year + '-' + month + '-' + day;
// let t3 = formate(t2, style);
this.formData.startTime = t2 + ' 00:00:00'
this.formData.endTime = t1 + ' 23:59:59'
this.timeRange = [t2, t1]
},
handleTimeChange (time) {
if (time) {
const startTimeArray = util.dateFormatter(time[0], 'date').split('-')
const endTimeArray = util.dateFormatter(time[1], 'date').split('-')
this.formData.startTime = startTimeArray[0] + '-' + startTimeArray[1] + '-' + startTimeArray[2] + ' 00:00:00'
this.formData.endTime = endTimeArray[0] + '-' + endTimeArray[1] + '-' + endTimeArray[2] + ' 23:59:59'
// this.startTimeShow = startTimeArray[0] + '' + startTimeArray[1] + '' + startTimeArray[2] + ''
// this.endTimeShow = endTimeArray[0] + '' + endTimeArray[1] + '' + endTimeArray[2] + ''
} else {
this.formData.startTime = ''
this.formData.endTime = ''
// this.startTimeShow = ''
// this.endTimeShow = ''
}
this.loadTable()
},
handleSizeChange (val) {
this.pageSize = val
this.pageNo = 1
this.loadTable()
},
handleCurrentChange (val) {
this.pageNo = val
this.loadTable()
},
//
startLoading () {
loading = Loading.service({
lock: true, //
text: '正在加载……', //
background: 'rgba(0,0,0,.7)' //
})
},
//
endLoading () {
// clearTimeout(timer);
if (loading) {
loading.close()
}
}
},
computed: {
tableHeight () {
return (this.clientHeight - 460)
},
rowHeight () {
return (this.clientHeight - 200) + 'px'
},
...mapGetters(['clientHeight'])
},
watch: {
},
props: {
serviceType: {
type: String,
default: ''
}
}
}
</script>
<style lang="scss" scoped >
@import "@/assets/scss/buttonstyle.scss";
.div_main {
background: #ffffff;
box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
border-radius: 4px;
margin-top: 15px;
padding: 23px 30px 10px;
}
.div_search {
background: #ffffff;
border-radius: 4px;
padding: 30px 20px 5px;
box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
}
.item_width_1 {
width: 260px;
}
.item_width_2 {
width: 495px;
}
.div_table {
background: #ffffff;
box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
border-radius: 4px;
margin-top: 15px;
padding: 23px 30px 10px;
.table {
margin-top: 20px;
}
}
.el-row {
/* margin-bottom: 20px; */
display: flex;
flex-wrap: wrap;
margin-top: 10px;
margin-right: 50px;
}
</style>

479
src/views/components/resiTransfer.vue

@ -0,0 +1,479 @@
<template>
<div>
<div>
<el-form ref="ref_form"
:inline="false"
:model="dataForm"
:rules="dataRule"
class="form">
<el-form-item label="当前组织"
label-width="150px"
style="display: block">
<span>{{ gridName }}</span>
</el-form-item>
<el-form-item label="迁出类型"
prop="type"
label-width="150px"
style="display: block">
<el-radio-group v-model="dataForm.type">
<el-radio :label="'in'">{{'迁往'+rootAgency.rootAgencyName+'内其他区域'}}</el-radio>
<el-radio :label="'out'">其他</el-radio>
</el-radio-group>
</el-form-item>
<div v-if="dataForm.type==='in'">
<el-form-item label="迁出至"
prop='newAgencyId'
label-width="150px">
<el-cascader ref="myCascader"
v-model="agencyIdArray"
style="width:480px"
:key="iscascaderShow"
:options="casOptions"
:props="optionProps"
@change="handleChangeAgency"
clearable></el-cascader>
</el-form-item>
<el-form-item label="所属家庭"
label-width="150px"
prop="newNeighborHoodId"
required>
<div class="resi-cell-col">
<el-select v-model.trim="dataForm.newNeighborHoodId"
placeholder="请选择小区"
clearable
class="item_width_1"
@change="handleChangeCommunity">
<el-option v-for="item in communityList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<el-select v-model.trim="dataForm.newBuildingId"
placeholder="请选择楼号"
clearable
class="item_width_1 margin_left10"
@change="handleChangeBuilding">
<el-option v-for="item in buildingList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<el-select v-model.trim="dataForm.newBuildingUnitId"
placeholder="请选择单元"
clearable
class="item_width_1 margin_left10"
@change="handleChangeUnit">
<el-option v-for="item in unitList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<el-select v-model.trim="dataForm.newHouseId"
placeholder="请选择房号"
clearable
class="item_width_1 margin_left10">
<el-option v-for="item in roomList"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</div>
</el-form-item>
</div>
<el-form-item label="备注"
prop="remark"
label-width="150px">
<el-input type="textarea"
:autosize="{ minRows: 4, maxRows: 7}"
:rows="5"
resize="none"
style="width:600px"
placeholder='请输入备注'
v-model="dataForm.remark">
</el-input>
</el-form-item>
</el-form>
</div>
<div class="div_btn">
<el-button @click="handleCancle"> </el-button>
<el-button type="primary"
:disabled="btnDisable"
@click="handleComfirm"> </el-button>
</div>
</div>
</template>
<script>
import util from '@js/util.js';
import { Loading } from 'element-ui' // Loading
import { requestPost } from '@/js/dai/request'
let loading //
export default {
data () {
return {
btnDisable: false,
communityList: [],
buildingList: [],
unitList: [],
roomList: [],
dataForm: {
icUserId: '', // ID
type: 'in',//out,in
newAgencyId: '',//Id
newGridId: '',//Id
newNeighborHoodId: '',//ID
newBuildingId: '',//Id
newBuildingUnitId: '',//Id
newHouseId: '', //Id
transferTime: '', //
remark: '' //
},
staffId: '',//id
userId: '',//id
gridName: '',
rootAgency: {},
casOptions: [],
agencyIdArray: [],
customerList: [],
iscascaderShow: 0,
optionProps: {
multiple: false,
value: 'agencyId',
label: 'agencyName',
children: 'subAgencyList',
checkStrictly: true
},
selGrid: {},
}
},
components: {},
mounted () {
},
methods: {
async initForm (row) {
this.staffId = localStorage.getItem("staffId");
this.$refs.ref_form.resetFields();
// this.icUserId = row.icResiUserId
this.gridName = row.GRID_ID
this.dataForm.icUserId = row.icResiUserId
await this.loadRootAgency()
await this.getAgencylist()
},
//id
async loadRootAgency () {
const url = '/gov/org/customeragency/root-orglist-by-staffid'
let params = {
staffId: this.staffId
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
if (data && data.length > 0) {
this.rootAgency = data[0]
}
} else {
this.$message.error(msg)
}
},
async getAgencylist () {
const url = '/gov/org/customeragency/rootagencygridtree'
const params = {
agencyId: this.rootAgency.rootAgencyId
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
++this.iscascaderShow
this.casOptions = []
this.agencyIdArray.length = []
// this.tableParams.agencyId = ''
if (data) {
this.casOptions.push(data)
}
} else {
this.$message.error(msg)
}
},
handleChangeAgency () {
console.log(this.$refs["myCascader"].getCheckedNodes()[0].data)
this.selGrid = this.$refs["myCascader"].getCheckedNodes()[0].data
this.dataForm.newAgencyId = this.selGrid.pid
this.dataForm.newGridId = this.selGrid.agencyId
this.loadCommunityList()
this.dataForm.newNeighborHoodId = ''//ID
this.dataForm.newBuildingId = ''//Id
this.dataForm.newBuildingUnitId = ''//Id
this.dataForm.newHouseId = '' //Id
},
async loadCommunityList () {
const url = '/gov/org/icneighborhood/neighborhoodoption'
let params = {
gridId: this.dataForm.newGridId,
agencyId: this.dataForm.newAgencyId
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.communityList = []
this.communityList = [...data]
} else {
this.$message.error(msg)
}
},
async handleChangeCommunity () {
const url = '/gov/org/icbuilding/buildingoption'
let params = {
neighborHoodId: this.dataForm.newNeighborHoodId
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.buildingList = []
this.buildingList = [...data]
this.dataForm.newBuildingId = ''//Id
this.dataForm.newBuildingUnitId = ''//Id
this.dataForm.newHouseId = '' //Id
} else {
this.$message.error(msg)
}
},
async handleChangeBuilding () {
const url = '/gov/org/icbuildingunit/unitoption'
let params = {
buildingId: this.dataForm.newBuildingId
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.unitList = []
this.unitList = [...data]
this.dataForm.newBuildingUnitId = ''//Id
this.dataForm.newHouseId = '' //Id
} else {
this.$message.error(msg)
}
},
async handleChangeUnit () {
const url = '/gov/org/ichouse/houseoption'
let params = {
unitId: this.dataForm.newBuildingUnitId
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.roomList = []
this.roomList = [...data]
this.dataForm.newHouseId = '' //Id
} else {
this.$message.error(msg)
}
},
async handleComfirm () {
this.btnDisable = true
setTimeout(() => {
this.btnDisable = false
}, 2000)
this.$refs['ref_form'].validate((valid, messageObj) => {
if (!valid) {
app.util.validateRule(messageObj)
} else {
if (this.dataForm.type === 'in') {
if (!this.dataForm.newBuildingId) {
this.$message.warning('请选择楼宇')
return false
}
if (!this.dataForm.newBuildingUnitId) {
this.$message.warning('请选择单元')
return false
}
if (!this.dataForm.newHouseId) {
this.$message.warning('请选择房间')
return false
}
}
this.saveForm()
}
})
},
async saveForm () {
const url = '/epmetuser/icusertransferrecord/add'
let noData = new Date()
noData = util.dateFormatter(noData, 'time')
this.dataForm.transferTime = noData
const { data, code, msg } = await requestPost(url, this.dataForm)
if (code === 0) {
this.$message.success('调动成功')
this.handleCancle()
} else {
this.$message.error(msg)
}
},
handleCancle () {
this.resetData()
this.$emit('dialogCancle')
},
resetData () {
this.dataForm = {
icUserId: '', // ID
type: 'in',//out,in
newAgencyId: '',//Id
newGridId: '',//Id
newNeighborHoodId: '',//ID
newBuildingId: '',//Id
newBuildingUnitId: '',//Id
newHouseId: '', //Id
transferTime: '', //
remark: '' //
}
this.staffId = ''//id
this.userId = ''//id
this.gridName = ''
this.rootAgency = {}
this.selGrid = {}
},
//
startLoading () {
loading = Loading.service({
lock: true, //
text: '正在加载……', //
background: 'rgba(0,0,0,.7)' //
})
},
//
endLoading () {
// clearTimeout(timer);
if (loading) {
loading.close()
}
}
},
computed: {
dataRule () {
return {
type: [
{ required: true, message: '操作类型不能为空', trigger: 'blur' },
],
newAgencyId: [
{ required: true, message: '所选组织不能为空', trigger: 'blur' }
],
newNeighborHoodId: [
{ required: true, message: '所属家庭不能为空', trigger: 'blur' }
],
}
},
},
props: {}
}
</script>
<style lang="scss" scoped>
.item_width_1 {
width: 150px;
}
.item_width_2 {
width: 400px;
}
.item_width_3 {
margin-left: 10px;
width: 200px;
}
.div_btn {
display: flex;
justify-content: flex-end;
}
.resi-cell-col {
width: 750px;
display: flex;
justify-content: start;
}
.margin_left10 {
margin-left: 10px;
}
</style>
<style>
.el-dialog__body {
padding: 0 10px 20px !important;
}
</style>

42
src/views/main.vue

@ -1,8 +1,7 @@
<template> <template>
<div <div v-loading.fullscreen.lock="loading"
v-loading.fullscreen.lock="loading" :element-loading-text="$t('loading')"
:element-loading-text="$t('loading')" :class="[
:class="[
'aui-wrapper', 'aui-wrapper',
{ 'aui-sidebar--fold': $store.state.sidebarFold }, { 'aui-sidebar--fold': $store.state.sidebarFold },
{ {
@ -10,16 +9,14 @@
$store.state.sidebarActiveSubMenuList.length == 0, $store.state.sidebarActiveSubMenuList.length == 0,
}, },
{ 'z-iframe': $store.state.inIframe }, { 'z-iframe': $store.state.inIframe },
]" ]">
>
<template v-if="!loading"> <template v-if="!loading">
<main-navbar ref="ref_navbar" v-if="!$store.state.inIframe" /> <main-navbar ref="ref_navbar"
v-if="!$store.state.inIframe" />
<main-sidebar v-if="!$store.state.inIframe" /> <main-sidebar v-if="!$store.state.inIframe" />
<div class="aui-content__wrapper"> <div class="aui-content__wrapper">
<main-content <main-content v-if="!$store.state.contentIsNeedRefresh"
v-if="!$store.state.contentIsNeedRefresh" @changeCustomerName="changeCustomerName" />
@changeCustomerName="changeCustomerName"
/>
</div> </div>
<main-theme-tools v-if="!$store.state.inIframe" /> <main-theme-tools v-if="!$store.state.inIframe" />
</template> </template>
@ -36,10 +33,10 @@ import { mapGetters } from "vuex";
import nextTick from "dai-js/tools/nextTick"; import nextTick from "dai-js/tools/nextTick";
export default { export default {
provide() { provide () {
return { return {
// //
refresh() { refresh () {
this.$store.state.contentIsNeedRefresh = true; this.$store.state.contentIsNeedRefresh = true;
this.$nextTick(() => { this.$nextTick(() => {
this.$store.state.contentIsNeedRefresh = false; this.$store.state.contentIsNeedRefresh = false;
@ -47,7 +44,7 @@ export default {
}, },
}; };
}, },
data() { data () {
return { return {
loading: true, loading: true,
userType: localStorage.getItem("userType"), userType: localStorage.getItem("userType"),
@ -63,7 +60,7 @@ export default {
watch: { watch: {
$route: "routeHandle", $route: "routeHandle",
}, },
async created() { async created () {
this.windowResizeHandle(); this.windowResizeHandle();
this.routeHandle(this.$route); this.routeHandle(this.$route);
if (localStorage.getItem("userType") === "work") { if (localStorage.getItem("userType") === "work") {
@ -78,11 +75,11 @@ export default {
}, },
computed: {}, computed: {},
methods: { methods: {
changeCustomerName(customerName) { changeCustomerName (customerName) {
this.$refs["ref_navbar"].changeCustomerName(customerName); this.$refs["ref_navbar"].changeCustomerName(customerName);
}, },
// //
windowResizeHandle() { windowResizeHandle () {
this.$store.state.sidebarFold = this.$store.state.sidebarFold =
document.documentElement["clientWidth"] <= 992 || false; document.documentElement["clientWidth"] <= 992 || false;
window.addEventListener( window.addEventListener(
@ -94,7 +91,7 @@ export default {
); );
}, },
// , // ,
routeHandle(route) { routeHandle (route) {
if (!route.meta.isTab) { if (!route.meta.isTab) {
return false; return false;
} }
@ -117,7 +114,7 @@ export default {
this.$store.state.contentTabsActiveName = tab.name; this.$store.state.contentTabsActiveName = tab.name;
this.syncLevelOneMenuActive(tab.menuId); this.syncLevelOneMenuActive(tab.menuId);
}, },
async syncLevelOneMenuActive(menuId) { async syncLevelOneMenuActive (menuId) {
await nextTick(); await nextTick();
console.log( console.log(
"*******************************", "*******************************",
@ -140,7 +137,7 @@ export default {
idx !== -1 ? this.$store.state.sidebarMenuList[idx].children : []; idx !== -1 ? this.$store.state.sidebarMenuList[idx].children : [];
}, },
// //
getUserInfo() { getUserInfo () {
const url = "/epmetuser/operuser/queryOperUserDto"; const url = "/epmetuser/operuser/queryOperUserDto";
return this.$http return this.$http
@ -156,10 +153,10 @@ export default {
this.$store.state.user.gender = data.gender; this.$store.state.user.gender = data.gender;
localStorage.setItem("customerId", ""); localStorage.setItem("customerId", "");
}) })
.catch(() => {}); .catch(() => { });
}, },
// //
getWorkUserInfo() { getWorkUserInfo () {
const url = "/epmetuser/customerstaff/staffbasicinfo"; const url = "/epmetuser/customerstaff/staffbasicinfo";
let params = {}; let params = {};
window.app.ajax.post( window.app.ajax.post(
@ -174,6 +171,7 @@ export default {
// this.$store.state.user.gender = data.gender // this.$store.state.user.gender = data.gender
localStorage.setItem("roleList", data.roleList); localStorage.setItem("roleList", data.roleList);
localStorage.setItem("customerId", data.customerId); localStorage.setItem("customerId", data.customerId);
localStorage.setItem("staffId", data.id);
// this.$store.state.user.roleList = data.roleList // this.$store.state.user.roleList = data.roleList
// this.$store.state.user.customerId = data.customerId // this.$store.state.user.customerId = data.customerId
}, },

3
src/views/modules/base/category/addCategory.vue

@ -67,8 +67,9 @@ export default {
}, },
methods: { methods: {
async initData () { async initData () {
this.startLoading()
await this.getDefaultCategoryList() await this.getDefaultCategoryList()
this.endLoading()
this.addList = [...this.categoryList] this.addList = [...this.categoryList]
this.addList.pop() this.addList.pop()
}, },

4
src/views/modules/base/category/main.vue

@ -71,7 +71,9 @@ export default {
} }
}, },
async mounted () { async mounted () {
this.getCategoryList() this.startLoading()
await this.getCategoryList()
this.endLoading()
}, },
methods: { methods: {

78
src/views/modules/base/resi.vue

@ -1,6 +1,5 @@
<template> <template>
<div <div class="resi-container">
class="resi-container">
<resi-search v-if="searchList.length > 0" <resi-search v-if="searchList.length > 0"
ref="resiSearch" ref="resiSearch"
:form-list="searchList" :form-list="searchList"
@ -57,12 +56,20 @@
<el-table-column fixed="right" <el-table-column fixed="right"
label="操作" label="操作"
align="center" align="center"
width="120"> width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button @click="handleLook(scope.row)" <el-button @click="handleLook(scope.row)"
type="text" type="text"
size="small" size="small"
class="btn-color-look">查看</el-button> class="btn-color-look">查看</el-button>
<el-button @click="handleTransfer(scope.row)"
type="text"
size="small"
class="btn-color-look">调动</el-button>
<el-button @click="handleChangeRecord(scope.row)"
type="text"
size="small"
class="btn-color-look">调动记录</el-button>
<template v-if="filterEdit(scope.row.ORG_ID)"> <template v-if="filterEdit(scope.row.ORG_ID)">
<el-button @click="handleEdit(scope.row)" <el-button @click="handleEdit(scope.row)"
type="text" type="text"
@ -178,19 +185,49 @@
@click="handleEditSUbmit">提交</el-button> @click="handleEditSUbmit">提交</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!-- 调动 -->
<el-dialog :visible.sync="tranferShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="'人员调动'"
width="950px"
top="5vh"
@closed="diaClose">
<resi-transfer ref="ref_transfer"
@dialogCancle="transferClose"></resi-transfer>
</el-dialog>
<!-- 变更记录 -->
<el-dialog :visible.sync="changeRecordShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="'变更记录'"
width="1150px"
top="5vh"
@closed="diaClose">
<resi-change-record ref="ref_changerecord"></resi-change-record>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import nextTick from 'dai-js/tools/nextTick'
import resiSearch from '../../components/resiSearch.vue' import resiSearch from '../../components/resiSearch.vue'
import resiForm from '../../components/resiForm.vue' import resiForm from '../../components/resiForm.vue'
import editResi from '../../components/editResi.vue' import editResi from '../../components/editResi.vue'
import axios from 'axios' import axios from 'axios'
import resiTransfer from '../../components/resiTransfer.vue'
import resiChangeRecord from '../../components/resiChangeRecord.vue'
export default { export default {
components: { components: {
resiSearch, resiSearch,
resiForm, resiForm,
editResi editResi,
resiTransfer,
resiChangeRecord
}, },
data () { data () {
return { return {
@ -226,7 +263,10 @@ export default {
tableHeader: [], tableHeader: [],
tabsList: [], tabsList: [],
defaultCategotyKey: '' defaultCategotyKey: '',
tranferShow: false,
changeRecordShow: false,
} }
}, },
props: { props: {
@ -237,6 +277,7 @@ export default {
this.searchList = [] this.searchList = []
let query = this.$route.query let query = this.$route.query
this.defaultCategotyKey = query.columnName this.defaultCategotyKey = query.columnName
console.log(this.defaultCategotyKey)
await this.getSearchList() await this.getSearchList()
this.$refs.resiSearch.handleSearch() this.$refs.resiSearch.handleSearch()
} }
@ -260,6 +301,33 @@ export default {
console.log('storeoooo----0000', this.$store) console.log('storeoooo----0000', this.$store)
}, },
methods: { methods: {
//
async handleTransfer (row) {
this.tranferShow = true
await nextTick(200)
this.$refs.ref_transfer.initForm(row)
},
//
async handleChangeRecord (row) {
this.changeRecordShow = true
await nextTick(200)
this.$refs.ref_changerecord.initForm(row)
},
diaClose () {
this.tranferShow = false
this.changeRecordShow = false
},
transferClose () {
this.tranferShow = false
this.getTableData()
},
computedWidth (label) { computedWidth (label) {
const wd = 20 * label.length const wd = 20 * label.length
return wd > 80 ? wd : 80 return wd > 80 ? wd : 80

8
src/views/modules/communityParty/regionalParty/finishList.vue

@ -122,11 +122,13 @@
min-width="150"> min-width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.isEdit"> <div v-if="scope.row.isEdit">
<el-input-number class="item_width_1" <el-input class="item_width_2"
v-model.trim="scope.row.score"></el-input>
<!-- <el-input-number class="item_width_1"
v-model="scope.row.score" v-model="scope.row.score"
:precision="1" :precision="1"
:step="0.1" :step="0.1"
:max="100"></el-input-number> :max="100"></el-input-number> -->
</div> </div>
<span v-else>{{scope.row.score}}</span> <span v-else>{{scope.row.score}}</span>
</template> </template>
@ -338,7 +340,7 @@ export default {
timeShow: '', timeShow: '',
status: '', status: '',
unitId: '', unitId: '',
score: 0.0 score: null
} }
this.tableData.push(obj) this.tableData.push(obj)
}, },

Loading…
Cancel
Save