yunxi
/
ningxiaWeb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

回收桶部分修复

Browse Source
master
mhsnet 5 months ago
parent 9f57687914
commit e03bc6dd4d
4 changed files with 1351 additions and 1442 deletions
Show Stats Download Patch File Download Diff File

6
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/recyclebucket/RecycleBucketConstant.java
View File

File diff suppressed because one or more lines are too long

500
jnpf-java-boot/jnpf-web/src/views/recyclebucket/Detail.vue
Unescape View File

@ -1,283 +1,253 @@
<template>
<transition name="el-zoom-in-center">
<div class="JNPF-preview-main">
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
<div class="JNPF-common-page-header">
<el-page-header @back="goBack"
content="详情"/>
<div class="options">
<el-button @click="goBack">取 消</el-button>
<transition name="el-zoom-in-center">
<div class="JNPF-preview-main">
<Detail v-if="detailVisible" ref="Detail" @close="detailVisible = false" />
<div class="JNPF-common-page-header">
<el-page-header @back="goBack" content="详情" />
<div class="options">
<el-button @click="goBack">取 消</el-button>
</div>
</div>
<el-row :gutter="15" class=" main" :style="{ margin: '0 auto', width: '100%' }">
<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right">
<template v-if="!loading">
<el-col :span="8">
<jnpf-form-tip-item label="显示别名" prop="showName">
<p>{{ dataForm.showName }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="门号" prop="doorNum">
<p>{{ dataForm.doorNum }} </p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="所属设备" prop="deviceCode">
<p>{{ dataForm.deviceCode }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="是否显示" prop="isShow">
<p>{{ dataForm.isShow }} </p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="显示顺序" prop="showOrd">
<JnpfNumber v-model="dataForm.showOrd" placeholder="数字文本" disabled :step="1">
</JnpfNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="回收品大类" prop="productCode">
<p>{{ dataForm.productCode }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="回收品子类" prop="productSubCode">
<p>{{ dataForm.productSubCode }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="价格" prop="price">
<JnpfNumber v-model="dataForm.price" placeholder="数字文本" disabled :step="1"
:precision="2">
</JnpfNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="满溢状态" prop="fullStatus">
<p>{{ dataForm.fullStatus }} </p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="满溢设置" prop="fullSet">
<p>{{ dataForm.fullSet }} </p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="烟雾状态" prop="smogStauts">
<p>{{ dataForm.smogStauts }} </p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="烟雾设置" prop="smogSet">
<p>{{ dataForm.smogSet }} </p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="容器重量" prop="containerWeight">
<JnpfNumber v-model="dataForm.containerWeight" placeholder="数字文本" disabled :step="1"
:precision="2" addonAfter="KG">
</JnpfNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="当前重量" prop="currentWeight">
<JnpfNumber v-model="dataForm.currentWeight" placeholder="数字文本" disabled :step="1"
:precision="2" addonAfter="KG">
</JnpfNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="重量上限" prop="warningWeight">
<JnpfNumber v-model="dataForm.warningWeight" placeholder="数字文本" disabled :step="1"
:precision="2" addonAfter="KG">
</JnpfNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="关闭延时" prop="closeDelay" tip-label="投递门关闭延时">
<p>{{ dataForm.closeDelay }}秒</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="投递门" prop="deliveryDoorStatus" tip-label="投递门状态">
<p>{{ dataForm.deliveryDoorStatus }} </p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="清运门" prop="cleanDoorStatus" tip-label="清运门状态">
<p>{{ dataForm.cleanDoorStatus }} </p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="垃圾袋编码" prop="bagNo">
<p>{{ dataForm.bagNo }}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24">
<jnpf-form-tip-item label="桶身图片" prop="bucketImg">
<JnpfUploadImg v-model="dataForm.bucketImg" disabled detailed :fileSize="10"
sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0">
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="状态" prop="status">
<p>{{ dataForm.status }} </p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8">
<jnpf-form-tip-item label="租户" prop="tenantId">
<p>{{ dataForm.tenantId }}</p>
</jnpf-form-tip-item>
</el-col>
</template>
</el-form>
</el-row>
</div>
</div>
<el-row :gutter="15" class=" main" :style="{margin: '0 auto',width: '100%'}">
<el-form ref="formRef" :model="dataForm" size="small" label-width="100px" label-position="right" >
<template v-if="!loading">
<el-col :span="8" >
<jnpf-form-tip-item label="显示别名"
prop="showName" >
<p>{{dataForm.showName}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="门号"
prop="doorNum" >
<p>{{ dataForm.doorNum }} </p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="所属设备"
prop="deviceCode" >
<p>{{dataForm.deviceCode}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="是否显示"
prop="isShow" >
<p>{{ dataForm.isShow }} </p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="显示顺序"
prop="showOrd" >
<JnpfNumber v-model="dataForm.showOrd"
placeholder="数字文本" disabled
:step="1" >
</JnpfNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="回收品大类"
prop="productCode" >
<p>{{dataForm.productCode}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="回收品子类"
prop="productSubCode" >
<p>{{dataForm.productSubCode}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="价格"
prop="price" >
<JnpfNumber v-model="dataForm.price"
placeholder="数字文本" disabled
:step="1" :precision="2" >
</JnpfNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="满溢状态"
prop="fullStatus" >
<p>{{ dataForm.fullStatus }} </p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="满溢设置"
prop="fullSet" >
<p>{{ dataForm.fullSet }} </p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="烟雾状态"
prop="smogStauts" >
<p>{{ dataForm.smogStauts }} </p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="烟雾设置"
prop="smogSet" >
<p>{{ dataForm.smogSet }} </p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="容器重量"
prop="containerWeight" >
<JnpfNumber v-model="dataForm.containerWeight"
placeholder="数字文本" disabled
:step="1" :precision="2" addonAfter="KG" >
</JnpfNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="当前重量"
prop="currentWeight" >
<JnpfNumber v-model="dataForm.currentWeight"
placeholder="数字文本" disabled
:step="1" :precision="2" addonAfter="KG" >
</JnpfNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="重量上限"
prop="warningWeight" >
<JnpfNumber v-model="dataForm.warningWeight"
placeholder="数字文本" disabled
:step="1" :precision="2" addonAfter="KG" >
</JnpfNumber>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="关闭延时"
prop="closeDelay" tip-label="投递门关闭延时" >
<p>{{dataForm.closeDelay}}秒</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="投递门"
prop="deliveryDoorStatus" tip-label="投递门状态" >
<p>{{ dataForm.deliveryDoorStatus }} </p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="清运门"
prop="cleanDoorStatus" tip-label="清运门状态" >
<p>{{ dataForm.cleanDoorStatus }} </p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="垃圾袋编码"
prop="bagNo" >
<p>{{dataForm.bagNo}}</p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="24" >
<jnpf-form-tip-item label="桶身图片"
prop="bucketImg" >
<JnpfUploadImg v-model="dataForm.bucketImg"
disabled
detailed :fileSize="10" sizeUnit="MB" :limit="9" pathType="defaultPath" :isAccount="0" >
</JnpfUploadImg>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="状态"
prop="status" >
<p>{{ dataForm.status }} </p>
</jnpf-form-tip-item>
</el-col>
<el-col :span="8" >
<jnpf-form-tip-item label="租户"
prop="tenantId" >
<p>{{dataForm.tenantId}}</p>
</jnpf-form-tip-item>
</el-col>
</template>
</el-form>
</el-row>
</div>
</transition>
</transition>
</template>
<script>
import request from '@/utils/request'
import request from '@/utils/request'
import { getConfigData } from '@/api/onlineDev/visualDev'
import jnpf from '@/utils/jnpf'
import Detail from '@/views/basic/dynamicModel/list/detail'
import { thousandsFormat } from "@/components/Generator/utils/index"
export default {
components: { Detail},
props: [],
data() {
return {
visible: false,
detailVisible: false,
loading: false,
import { getConfigData } from '@/api/onlineDev/visualDev'
import jnpf from '@/utils/jnpf'
import Detail from '@/views/basic/dynamicModel/list/detail'
import { thousandsFormat } from "@/components/Generator/utils/index"
export default {
components: { Detail },
props: [],
data() {
return {
visible: false,
detailVisible: false,
loading: false,
dataForm: {
id :'',
bucketCode : '',
showName : '',
doorNum : "",
deviceCode : "",
isShow : "1",
showOrd : 0,
productCode : "542987705491919312",
productSubCode : "",
price : '',
fullStatus : '',
fullSet : '',
smogStauts : '',
smogSet : '',
containerWeight : '',
currentWeight : '',
warningWeight : '',
closeDelay : '',
deliveryDoorStatus : '',
cleanDoorStatus : '',
bagNo : '',
bucketImg : [],
status : '',
tenantId : [],
id: '',
bucketCode: '',
showName: '',
doorNum: "",
deviceCode: "",
isShow: "1",
showOrd: 0,
productCode: "542987705491919312",
productSubCode: "",
price: '',
fullStatus: '',
fullSet: '',
smogStauts: '',
smogSet: '',
containerWeight: '',
currentWeight: '',
warningWeight: '',
closeDelay: '',
deliveryDoorStatus: '',
cleanDoorStatus: '',
bagNo: '',
bucketImg: [],
status: '',
tenantId: [],
},
doorNumOptions:[{"fullName":"1号","id":"1"},{"fullName":"2号","id":"2"},{"fullName":"3号","id":"3"},{"fullName":"4号","id":"4"},{"fullName":"5号","id":"5"},{"fullName":"6号","id":"6"},{"fullName":"7号","id":"7"},{"fullName":"8号","id":"8"},{"fullName":"9号","id":"9"},{"fullName":"10号","id":"10"},{"fullName":"11号","id":"11"},{"fullName":"12号","id":"12"}],
doorNumProps:{"label":"fullName","value":"id" },
isShowOptions:[{"fullName":"关闭","id":"0"},{"fullName":"显示","id":"1"}],
isShowProps:{"label":"fullName","value":"id" },
productCodeProps:{"label":"name","value":"id" },
productSubCodeProps:{"label":"name","value":"id" },
fullStatusOptions:[{"fullName":"未满","id":"0"},{"fullName":"满","id":"1"}],
fullStatusProps:{"label":"fullName","value":"id" },
fullSetOptions:[{"fullName":"关闭","id":"0"},{"fullName":"开启","id":"1"}],
fullSetProps:{"label":"fullName","value":"id" },
smogStautsOptions:[{"fullName":"正常","id":"0"},{"fullName":"报警","id":"1"}],
smogStautsProps:{"label":"fullName","value":"id" },
smogSetOptions:[{"fullName":"关闭","id":"0"},{"fullName":"开启","id":"1"}],
smogSetProps:{"label":"fullName","value":"id" },
deliveryDoorStatusOptions:[{"fullName":"关闭","id":"0"},{"fullName":"开启","id":"2"}],
deliveryDoorStatusProps:{"label":"fullName","value":"id" },
cleanDoorStatusOptions:[{"fullName":"关闭","id":"0"},{"fullName":"开启","id":"1"}],
cleanDoorStatusProps:{"label":"fullName","value":"id" },
statusOptions:[{"fullName":"停用","id":"0"},{"fullName":"启用","id":"1"}],
statusProps:{"label":"fullName","value":"id" },
doorNumOptions: [{ "fullName": "1号", "id": "1" }, { "fullName": "2号", "id": "2" }, { "fullName": "3号", "id": "3" }, { "fullName": "4号", "id": "4" }, { "fullName": "5号", "id": "5" }, { "fullName": "6号", "id": "6" }, { "fullName": "7号", "id": "7" }, { "fullName": "8号", "id": "8" }, { "fullName": "9号", "id": "9" }, { "fullName": "10号", "id": "10" }, { "fullName": "11号", "id": "11" }, { "fullName": "12号", "id": "12" }],
doorNumProps: { "label": "fullName", "value": "id" },
isShowOptions: [{ "fullName": "关闭", "id": 0 }, { "fullName": "显示", "id": 1 }],
isShowProps: { "label": "fullName", "value": "id" },
productCodeProps: { "label": "name", "value": "id" },
productSubCodeProps: { "label": "name", "value": "id" },
fullStatusOptions: [{ "fullName": "未满", "id": 0 }, { "fullName": "满", "id": 1 }],
fullStatusProps: { "label": "fullName", "value": "id" },
fullSetOptions: [{ "fullName": "关闭", "id": 0 }, { "fullName": "开启", "id": 1 }],
fullSetProps: { "label": "fullName", "value": "id" },
smogStautsOptions: [{ "fullName": "正常", "id": 0 }, { "fullName": "报警", "id": 1 }],
smogStautsProps: { "label": "fullName", "value": "id" },
smogSetOptions: [{ "fullName": "关闭", "id": 0 }, { "fullName": "开启", "id": 1 }],
smogSetProps: { "label": "fullName", "value": "id" },
deliveryDoorStatusOptions: [{ "fullName": "关闭", "id": 0 }, { "fullName": "开启", "id": 1 }],
deliveryDoorStatusProps: { "label": "fullName", "value": "id" },
cleanDoorStatusOptions: [{ "fullName": "关闭", "id": 0 }, { "fullName": "开启", "id": 1 }],
cleanDoorStatusProps: { "label": "fullName", "value": "id" },
statusOptions: [{ "fullName": "停用", "id": 0 }, { "fullName": "启用", "id":1 }],
statusProps: { "label": "fullName", "value": "id" },
}
},
computed: {},
watch: {},
created() {
},
mounted() { },
methods: {
toDetail(defaultValue, modelId) {
if (!defaultValue) return
getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return
let formData = JSON.parse(res.data.formData)
formData.popupType = 'general'
this.detailVisible = true
this.$nextTick(() => {
this.$refs.Detail.init(formData, modelId, defaultValue)
})
})
},
dataInfo(dataAll) {
let _dataAll = dataAll
this.dataForm = _dataAll
},
computed: {},
watch: {},
created() {
goBack() {
this.$emit('refresh')
},
mounted() {},
methods: {
toDetail(defaultValue, modelId) {
if (!defaultValue) return
getConfigData(modelId).then(res => {
if (!res.data || !res.data.formData) return
let formData = JSON.parse(res.data.formData)
formData.popupType = 'general'
this.detailVisible = true
this.$nextTick(() => {
this.$refs.Detail.init(formData, modelId, defaultValue)
init(id) {
this.dataForm.id = id || 0;
this.visible = true;
this.$nextTick(() => {
if (this.dataForm.id) {
this.loading = true
request({
url: '/api/scm/RecycleBucket/detail/' + this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
this.loading = false
})
})
},
dataInfo(dataAll){
let _dataAll =dataAll
this.dataForm = _dataAll
},
goBack() {
this.$emit('refresh')
},
init(id) {
this.dataForm.id = id || 0;
this.visible = true;
this.$nextTick(() => {
if(this.dataForm.id){
this.loading = true
request({
url: '/api/scm/RecycleBucket/detail/'+this.dataForm.id,
method: 'get'
}).then(res => {
this.dataInfo(res.data)
this.loading = false
})
}
}
})
},
})
},
}
},
}
</script>

1275
jnpf-java-boot/jnpf-web/src/views/recyclebucket/form.vue
View File

File diff suppressed because it is too large Load Diff

1012
jnpf-java-boot/jnpf-web/src/views/recyclebucket/index.vue
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save