elink-star
/
epmet-work-pc-chengyang
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

物品类型等等

chengyang
是小王呀\24601 9 months ago
parent
a4066f453b
commit
53fa6a5c81
6 changed files with 79 additions and 51 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/views/components/editResi.vue
  2. 3
      src/views/modules/shequzhili/itemsActual/add.vue
  3. 98
      src/views/modules/shequzhili/itemsActual/event.vue
  4. 18
      src/views/modules/shequzhili/itemsActual/index.vue
  5. 8
      src/views/modules/shequzhili/videomonitoring/add.vue
  6. 2
      src/views/modules/shequzhili/videomonitoring/index.vue

1
src/views/components/editResi.vue
View File

@ -712,6 +712,7 @@ export default {
deathFlag:0,//死亡
deathDate:null,//死亡日期
categoryInfo: {
customerId:this.$store.state.user.customerId,
partyFlag: 0,
subsistenceAllowanceFlag: 0,
ensureHouseFlag: 0,

3
src/views/modules/shequzhili/itemsActual/add.vue
View File

@ -23,7 +23,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="物品类型" prop="objectTypeCode1" label-width="150px">
<el-form-item label="物品类型" prop="objectTypeCode" label-width="150px">
<el-select v-model.trim="formData.objectTypeCode" placeholder="请选择" size="small" @change="changeType"
clearable class="u-item-width-normal">
<el-option v-for="item in equipmentCategoryCodeArray" :key="item.value" :label="item.label"
@ -237,6 +237,7 @@ export default {
}else{
this.showobjectTypeCode=true
this.orgTypeChiderList=selectedItem.children
this.formData.objectTypeSubCode=""
}
// console.log(value,"DSKLJFSKLDG");

98
src/views/modules/shequzhili/itemsActual/event.vue
View File

@ -1,7 +1,7 @@
<template>
<div>
<div class="dialog-h-content scroll-h">
<div v-if="initLoading" class="m-detail-main">
<div class="m-detail-main">
<div class="m-info">
<div style="display: flex;">
<div class="m-info-prop" style="flex: 0 0 50%;">
@ -15,91 +15,105 @@
<div class="m-info-prop" style="flex: 0 0 50%;">
<span class="u-info-title-2">物品名称: </span>
<span style="margin-right: 10px;">&nbsp;</span>
<span>{{ formData.monitorName || "--" }}</span>
<span>{{ formData.objectName || "--" }}</span>
</div>
</div>
<div style="display: flex;">
<div class="m-info-prop" style="flex: 0 0 50%;">
<span class="u-info-title-2">物品分类: </span>
<span style="margin-right: 10px;">&nbsp;</span>
<span>{{ formData.monitorType || "--" }}</span>
{{ formData.belongType === 'citizen' ? '居民物品' : formData.belongType === 'company' ? '企业物品' : '' }}
</div>
</div>
<div style="display: flex;" >
<div class="m-info-prop" style="flex: 0 0 50%;">
<span class="u-info-title-2">物品类型: </span>
<span style="margin-right: 10px;">&nbsp;</span>
{{ formData.objectTypeCodeName }}
</div>
</div>
<div style="display: flex;" v-if="formData.objectTypeCodeSubName">
<div class="m-info-prop" style="flex: 0 0 50%;">
<span class="u-info-title-2">种类: </span>
<span style="margin-right: 10px;">&nbsp;</span>
{{ formData.objectTypeCodeSubName }}
</div>
</div>
<div style="display: flex;">
<div class="m-info-prop" style="flex: 0 0 50%;">
<span class="u-info-title-2">所属单位: </span>
<span style="margin-right: 10px;">&nbsp;</span>
<span>{{ formData.monitorCompany || "--" }}</span>
<span>{{ formData.affiliatedUnit || "--" }}</span>
</div>
</div>
<div style="display: flex;">
<div class="m-info-prop" style="flex: 0 0 50%;">
<span class="u-info-title-2">所有人姓名: </span>
<span style="margin-right: 10px;">&nbsp;</span>
<span>{{ formData.monitorOwnerName || "--" }}</span>
<span>{{ formData.ownerName || "--" }}</span>
</div>
</div>
<div style="display: flex;">
<div class="m-info-prop" style="flex: 0 0 50%;">
<span class="u-info-title-2">所有人电话: </span>
<span style="margin-right: 10px;">&nbsp;</span>
<span>{{ formData.monitorOwnerMobile || "--" }}</span>
<span>{{ formData.ownerPhone || "--" }}</span>
</div>
</div>
<div style="display: flex;">
<div class="m-info-prop" style="flex: 0 0 50%;">
<span class="u-info-title-2">所有人证件号: </span>
<span style="margin-right: 10px;">&nbsp;</span>
<span>{{ formData.monitorAddress || "--" }}</span>
<span>{{ formData.ownerIdCard || "--" }}</span>
</div>
</div>
<div style="display: flex;">
<div class="m-info-prop" style="flex: 0 0 50%;">
<span class="u-info-title-2">物品数量: </span>
<span style="margin-right: 10px;">&nbsp;</span>
<span>{{ formData.monitorAddress || "--" }}</span>
<span>{{ formData.num || "--" }}</span>
</div>
</div>
<div style="display: flex;">
<div class="m-info-prop" style="flex: 0 0 50%;">
<span class="u-info-title-2">规格单位: </span>
<span style="margin-right: 10px;">&nbsp;</span>
<span>{{ formData.monitorAddress || "--" }}</span>
<span>{{ formData.scale || "--" }}</span>
</div>
</div>
<div style="display: flex;">
<div class="m-info-prop" style="flex: 0 0 50%;">
<span class="u-info-title-2">物品来源: </span>
<span style="margin-right: 10px;">&nbsp;</span>
<span>{{ formData.monitorAddress || "--" }}</span>
<span>{{ formData.source || "--" }}</span>
</div>
</div>
<div style="display: flex;">
<div class="m-info-prop" style="flex: 0 0 50%;">
<span class="u-info-title-2">物品用途: </span>
<span style="margin-right: 10px;">&nbsp;</span>
<span>{{ formData.monitorAddress || "--" }}</span>
<span>{{ formData.purpose || "--" }}</span>
</div>
</div>
<div style="display: flex;">
<div class="m-info-prop" style="flex: 0 0 50%;">
<span class="u-info-title-2">采集人: </span>
<span style="margin-right: 10px;">&nbsp;</span>
<span>{{ formData.monitorAddress || "--" }}</span>
<span>{{ formData.collectorName || "--" }}</span>
</div>
</div>
<div style="display: flex;">
<div class="m-info-prop" style="flex: 0 0 50%;">
<span class="u-info-title-2">采集日期: </span>
<span style="margin-right: 10px;">&nbsp;</span>
<span>{{ formData.monitorAddress || "--" }}</span>
<span>{{ formData.collectorDate || "--" }}</span>
</div>
</div>
<div style="display: flex;">
<div class="m-info-prop" style="flex: 0 0 50%;">
<span class="u-info-title-2">备注: </span>
<span style="margin-right: 10px;">&nbsp;</span>
<span>{{ formData.reamrk || "--" }}</span>
<span>{{ formData.remark || "--" }}</span>
</div>
</div>
@ -125,7 +139,11 @@ let loading; // 加载动画
export default {
data() {
return {
equipmentCategoryCodeArray:[],
formData: {
objectTypeCodeSubName:"",
objectTypeCodeName:"",
objectTypeCodeName:"",
coordinatePosition: ''
},
initLoading: false,
@ -134,22 +152,20 @@ export default {
components: {},
created() { },
mounted () {
},
methods: {
async activityType () {
const url = "/actual/base/videoMonitoring/page"
//分类
async loadCategory() {
const url = '/sys/dict/data/dictTree';
let params = {
// agencyId: this.agencyId
pageSize: 20,
pageNo: 1,
typeName: "",
enabled: 0
}
const { data, code, msg } = await requestPost(url, params)
dictType: 'OBJECT_TYPE_CODE'
};
const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
this.typeList = data.list
this.equipmentCategoryCodeArray = data;
} else {
this.$message.error(msg)
this.$message.error(msg);
}
},
handleCancle() {
@ -162,18 +178,34 @@ export default {
}
},
async initForm(row) {
await this.loadCategory()
let url = '/actual/base/objectManage/getDetail'
let params ={
id:row.id
}
const { data, code, msg } = await requestPost(url, params)
this.formData=data
// const selectedItem= this.equipmentCategoryCodeArray.find(item => item.value === this.formData.objectTypeCode)
// console.log(selectedItem,"dslkjglksd");
// if (selectedItem.children) {
// this.orgTypeChiderList=selectedItem.children
// this.showobjectTypeCode=true
// }
console.log("sdl;jglk;sdgj");
await requestPost(url, params).then(res=>{
this.formData=res.data
console.log(this.formData,"dklsjglk");
})
const selectedItem = this.equipmentCategoryCodeArray.find(item => item.value === this.formData.objectTypeCode)
console.log(selectedItem, "dslkjglksd");
if (selectedItem) {
this.formData.objectTypeCodeName=selectedItem.label
// this.orgTypeChiderList = selectedItem.children
// this.showobjectTypeCode = true
}
if(selectedItem.children){
const selectedItemchildren = selectedItem.children.find(item => item.value === this.formData.objectTypeSubCode)
console.log(selectedItemchildren,"孩子的孩子");
this.formData.objectTypeCodeSubName=selectedItemchildren.label
}
console.log(this.formData);
},

18
src/views/modules/shequzhili/itemsActual/index.vue
View File

@ -68,7 +68,7 @@
</div>
<el-table class="table" :data="tableData" border v-loading="tableLoading" style="width: 100%">
<el-table-column prop="agencyId" label="所属组织" header-align="center" align="center"></el-table-column>
<el-table-column prop="agencyName" label="所属组织" header-align="center" align="center"></el-table-column>
<el-table-column prop="objectTypeCodeLabel" label="物品类型" header-align="center" align="center"></el-table-column>
<el-table-column prop="objectName" label="物品名称" header-align="center" align="center"></el-table-column>
<!-- <el-table-column prop="monitorAddress" label="安装地点" header-align="center" align="center"></el-table-column> -->
@ -100,7 +100,7 @@
width="950px" top="5vh" class="dialog-h" @closed="diaClose">
<add ref="ref_form" v-if="formShow" @dialogCancle="addFormCancle" @dialogOk="addFormOk"></add>
</el-dialog>
<el-dialog :visible.sync="detailShow" :close-on-click-modal="false" :close-on-press-escape="false" :title="'活动详情'"
<el-dialog :visible.sync="detailShow" ref="ref_detail" :close-on-click-modal="false" :close-on-press-escape="false" :title="formTitle"
width="950px" top="5vh" class="dialog-h" @closed="eventForm">
<event ref="ref_detail" @dialogCancle="eventForm"></event>
</el-dialog>
@ -365,13 +365,13 @@
if (code === 0) {
this.total = data.total
this.tableData = data.list
this.tableData.forEach((item=>{
this.adverTagList.forEach((item1)=>{
if(item.tagId==item1.id){
item.tagName=item1.tagName
}
})
}))
// this.tableData.forEach((item=>{
// this.adverTagList.forEach((item1)=>{
// if(item.tagId==item1.id){
// item.tagName=item1.tagName
// }
// })
// }))
} else {
this.$message.error(msg)
}

8
src/views/modules/shequzhili/videomonitoring/add.vue
View File

@ -79,12 +79,6 @@
</div>
</el-form-item>
<!-- <el-form-item label="安装位置" prop="monitorAddress" label-width="150px" style="display: block">
<div class="item_width_1">
<el-input type="textarea" v-if="formType != 'detail'" v-model.trim="formData.monitorAddress" :row='4'
placeholder="在这里输入文字" />
</div>
</el-form-item> -->
</el-form>
</div>
@ -194,7 +188,7 @@ export default {
const url = '/sys/dict/data/dictlist';
let params = {
dictType: 'safety_equipment_category'
dictType: 'device_category'
};
const { data, code, msg } = await requestPost(url, params);
if (code === 0) {

2
src/views/modules/shequzhili/videomonitoring/index.vue
View File

@ -160,7 +160,7 @@
const url = '/sys/dict/data/dictlist';
let params = {
dictType: 'safety_equipment_category'
dictType: 'device_category'
};
const { data, code, msg } = await requestPost(url, params);
if (code === 0) {

Write Preview
Loading…
Cancel
Save