mt-ck-00a/mt-ck-wms-ui
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

'基础+报表'

Browse Source
This commit is contained in:
Fanzink
2022-03-05 19:43:42 +08:00
parent b5081ba279
commit 82f44b5a62
20 changed files with 1198 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/views/basicData/Cache/components/location-add.vue
View File

@@ -2,15 +2,22 @@
* @Author: zwq
* @Date: 2020-12-29 15:41:11
* @LastEditors: fzq
* @LastEditTime: 2022-03-03 19:37:48
* @LastEditTime: 2022-03-04 19:08:00
* @Description:
-->
<template>
<div class="app-container">
<div style="margin:10px 50px">
<!-- <div style="margin:10px 50px">
<el-button type="success" @click="goback()">{{ 'btn.back' | i18nFilter }}</el-button>
<el-button type="primary" @click="addNew()">{{ 'btn.add' | i18nFilter }}</el-button>
</div>
</div> -->
<head-form
:placeholder-name="placeholderName"
:key-name="keyNameAdd"
@getDataList="getList"
@add="addNew"
/>
<el-button type="success" @click="goback()">{{ 'btn.back' | i18nFilter }}</el-button>
<base-table
:page="listQuery.current"
:limit="listQuery.size"
@@ -30,6 +37,7 @@
</template>
<script>import i18n from '@/lang'
import HeadForm from '@/components/basicData/HeadForm'
import { locationList, locationDelete } from '@/api/basicData/Cache/location'
import locationAttrAdd from './locationAttr-add.vue'
import BaseTable from '@/components/BaseTable'
@@ -83,7 +91,7 @@ const tableProps = [
align: 'center'
},
{
prop: 'rowNum',
prop: 'layers',
label: i18n.t('module.basicData.cache.rowMark'),
align: 'center'
},
@@ -106,7 +114,7 @@ const tableProps = [
export default {
name: 'Location',
components: { BaseTable, MethodBtn, locationAttrAdd },
components: { BaseTable, MethodBtn, locationAttrAdd, HeadForm },
filters: {
statusFilter(status) {
const statusMap = {
@@ -120,6 +128,8 @@ export default {
data() {
return {
addOrUpdateVisible: false,
keyNameAdd: i18n.t('module.basicData.visual.keyword'),
placeholderName: this.$t('module.basicData.cache.LocationName'),
tableBtn,
trueWidth: 200,
tableProps,
@@ -128,7 +138,8 @@ export default {
listQuery: {
current: 1,
size: 990,
shelfId: ''
shelfId: '',
id: ''
}
}
},
@@ -163,6 +174,8 @@ export default {
getList(key) {
this.listLoading = true
this.listQuery.name = key
// shelfId与查询参数id关联
this.listQuery.id = this.listQuery.shelfId
locationList(this.listQuery).then(response => {
if (response.data.records) {
this.list = response.data.records

8
src/views/basicData/Cache/components/locationAttr-add.vue
View File

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2020-12-29 16:37:56
* @LastEditors: fzq
* @LastEditTime: 2022-03-03 19:42:43
* @LastEditTime: 2022-03-04 18:59:53
* @Description:
-->
<template>
@@ -26,6 +26,9 @@
<el-form-item :label="$t('module.basicData.cache.columnMark')" prop="columns">
<el-input v-model="dataForm.columns" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.columnMark')])" clearable />
</el-form-item>
<el-form-item :label="$t('module.basicData.cache.locationType')" prop="locationType">
<el-input v-model="dataForm.locationType" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.locationType')])" clearable />
</el-form-item>
<el-form-item :label="$t('module.basicData.cache.status')" prop="status">
<el-input v-model="dataForm.status" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.cache.status')])" clearable />
</el-form-item>
@@ -119,7 +122,8 @@ export default {
})
} else {
locationAdd(data).then(res => {
// console.log(data)
console.log(data)
console.log(res)
this.$message({
message: this.$t('module.basicData.visual.success'),
type: 'success',

10
src/views/basicData/Cache/shelf.vue
View File

@@ -2,17 +2,17 @@
* @Author: zwq
* @Date: 2020-12-29 15:41:11
* @LastEditors: fzq
* @LastEditTime: 2022-03-03 20:47:18
* @LastEditTime: 2022-03-04 19:00:14
* @Description:
-->
<template>
<div class="app-container">
<head-form
<!-- <head-form
:placeholder-name="placeholderName"
:key-name="keyName"
@getDataList="getList"
@add="addNew"
/>
/> -->
<base-table
:page="listQuery.current"
:limit="listQuery.size"
@@ -39,7 +39,7 @@
</template>
<script>import i18n from '@/lang'
import HeadForm from '@/components/basicData/HeadForm'
// import HeadForm from '@/components/basicData/HeadForm'
import BaseTable from '@/components/BaseTable'
import Pagination from '@/components/Pagination' // Secondary package based on el-pagination
import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
@@ -108,7 +108,7 @@ const tableProps = [
export default {
name: 'Area',
components: { Pagination, BaseTable, MethodBtn, HeadForm, shelfAttrAdd },
components: { Pagination, BaseTable, MethodBtn, shelfAttrAdd },
filters: {
statusFilter(status) {
const statusMap = {

132
src/views/basicData/Equipment/components/equipmentInfo-add.vue
View File

@@ -37,7 +37,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('module.basicData.equipment.EquipmentType')" prop="equipmentType">
<!-- <el-form-item :label="$t('module.basicData.equipment.EquipmentType')" prop="equipmentType">
<el-select
v-model="dataForm.equipmentType"
:disabled="isdetail"
@@ -53,9 +53,25 @@
:disabled="item.disabled"
/>
</el-select>
</el-form-item> -->
<el-form-item :label="$t('module.basicData.equipment.EquipmentType')" prop="equipmentType">
<el-input v-model="dataForm.equipmentType" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.equipment.EquipmentType')])" clearable :style="{width: '100%'}" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('module.basicData.visual.enterTime')" prop="enterTime">
<el-date-picker
v-model="dataForm.enterTime"
:disabled="isdetail"
format="yyyy-MM-dd"
value-format="yyyy-MM-ddT00:00:00"
:style="{width: '100%'}"
:placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.enterTime')])"
clearable
/>
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item :label="$t('module.basicData.equipment.EquipmentGrouping')" prop="groupId">
<el-select
v-model="dataForm.groupId"
@@ -73,10 +89,10 @@
/>
</el-select>
</el-form-item>
</el-col>
</el-col> -->
</el-row>
<el-row>
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item :label="$t('module.basicData.visual.Specs')" prop="spec">
<el-input v-model="dataForm.spec" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.Specs')])" clearable :style="{width: '100%'}" />
</el-form-item>
@@ -93,23 +109,10 @@
clearable
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('module.basicData.visual.enterTime')" prop="enterTime">
<el-date-picker
v-model="dataForm.enterTime"
:disabled="isdetail"
format="yyyy-MM-dd"
value-format="yyyy-MM-dd"
:style="{width: '100%'}"
:placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.enterTime')])"
clearable
/>
</el-form-item>
</el-col>
</el-col> -->
</el-row>
<el-row>
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item :label="$t('module.basicData.visual.debugTime')" prop="debugTime">
<el-date-picker
v-model="dataForm.debugTime"
@@ -126,7 +129,7 @@
<el-form-item :label="$t('module.basicData.equipment.DebugPeriod')" prop="debugPeriod">
<el-input v-model="dataForm.debugPeriod" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.equipment.DebugPeriod')])" clearable :style="{width: '100%'}" />
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="8">
<el-form-item :label="$t('module.basicData.visual.Manufacturer')" prop="manufacturer">
<el-input
@@ -138,9 +141,19 @@
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('module.basicData.visual.Remarks')" prop="remark">
<el-input v-model="dataForm.remark" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.Remarks')])" clearable :style="{width: '100%'}" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('module.basicData.visual.Description')" prop="description">
<el-input v-model="dataForm.description" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.Description')])" clearable :style="{width: '100%'}" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<!-- <el-col :span="8">
<el-form-item :label="$t('module.basicData.equipment.intellectualProperty')" prop="intellectualProperty">
<el-input
v-model="dataForm.intellectualProperty"
@@ -162,20 +175,8 @@
:style="{width: '100%'}"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item :label="$t('module.basicData.visual.Remarks')" prop="remark">
<el-input v-model="dataForm.remark" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.Remarks')])" clearable :style="{width: '100%'}" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item :label="$t('module.basicData.visual.Description')" prop="description">
<el-input v-model="dataForm.description" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.Description')])" clearable :style="{width: '100%'}" />
</el-form-item>
</el-col>
<el-col :span="8">
</el-col> -->
<!-- <el-col :span="8">
<el-form-item :label="$t('module.basicData.equipment.plcVersion')" prop="plcVersion">
<el-input v-model="dataForm.plcVersion" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.equipment.plcVersion')])" clearable :style="{width: '100%'}" />
</el-form-item>
@@ -184,9 +185,9 @@
<el-form-item :label="$t('module.basicData.equipment.eapVersion')" prop="eapVersion">
<el-input v-model="dataForm.eapVersion" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.equipment.eapVersion')])" clearable :style="{width: '100%'}" />
</el-form-item>
</el-col>
</el-col> -->
</el-row>
<el-row>
<!-- <el-row>
<el-col :span="8">
<el-form-item :label="$t('module.basicData.equipment.maintenanceCycle')" prop="maintenanceCycle">
<el-input v-model="dataForm.maintenanceCycle" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.equipment.maintenanceCycle')])" clearable :style="{width: '100%'}" />
@@ -197,9 +198,9 @@
<el-input v-model="dataForm.maintenanceTime" :disabled="isdetail" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.equipment.maintenanceTime')])" clearable :style="{width: '100%'}" />
</el-form-item>
</el-col>
</el-row>
</el-row> -->
<el-row>
<el-col :span="4">
<!-- <el-col :span="4">
<el-form-item :label="$t('module.basicData.equipment.E10Status')" prop="estatus">
<el-switch
v-model="dataForm.estatus"
@@ -248,11 +249,11 @@
inactive-color="#AAAAAA"
/>
</el-form-item>
</el-col>
</el-col> -->
</el-row>
<el-row>
<el-col :span="9">
<el-form-item v-if="listQuery.equipmentId && !isdetail" :label="$t('module.basicData.equipment.equipmentImg')" prop="eImg">
<!-- <el-form-item v-if="listQuery.equipmentId && !isdetail" :label="$t('module.basicData.equipment.equipmentImg')" prop="eImg">
<el-upload
ref="eImg"
name="files"
@@ -265,7 +266,7 @@
>
<el-button size="small" type="primary" icon="el-icon-upload">{{ 'btn.upload' | i18nFilter }}</el-button>
</el-upload>
</el-form-item>
</el-form-item> -->
<el-form-item v-if="isdetail" :label="$t('module.basicData.equipment.equipmentImg')" prop="upInfo">
<div v-for="item in imgList" :key="item.id">
{{ item.fileName }} <el-button size="small" type="primary" icon="el-icon-upload" @click="downloadFile(item.fileId)">{{ 'btn.download' | i18nFilter }}</el-button>
@@ -332,9 +333,7 @@ import {
equipmentInfoCode,
equipmentInfoFileAdd
} from '@/api/basicData/Equipment/equipmentInfo'
import { equipmentGroupList } from '@/api/basicData/Equipment/equipmentGroup'
import { equipmentInfoAttrList, equipmentInfoAttrDelete } from '@/api/basicData/Equipment/equipmentInfoAttr'
import { equipmentTypeList } from '@/api/basicData/Equipment/equipmentType'
import BaseTable from '@/components/BaseTable'
import MethodBtn from '@/components/BaseTable/subcomponents/MethodBtn'
import equipmentInfoAttrAdd from './equipmentInfoAttr-add'
@@ -364,15 +363,15 @@ const tableProps = [
align: 'center'
},
{
prop: 'attrValue',
prop: 'attrContent',
label: i18n.t('module.basicData.visual.AttributeValue'),
align: 'center'
},
{
prop: 'remark',
label: i18n.t('module.basicData.visual.Remarks'),
align: 'center'
}
// {
// prop: 'remark',
// label: i18n.t('module.basicData.visual.Remarks'),
// align: 'center'
// }
]
export default {
@@ -428,17 +427,17 @@ export default {
required: true,
message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.equipment.EquipmentType')]),
trigger: 'change'
}],
maintenanceCycle: [{
required: true,
message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.equipment.maintenanceCycle')]),
trigger: 'blur'
}],
maintenanceTime: [{
required: true,
message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.equipment.maintenanceTime')]),
trigger: 'blur'
}]
// maintenanceCycle: [{
// required: true,
// message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.equipment.maintenanceCycle')]),
// trigger: 'blur'
// }],
// maintenanceTime: [{
// required: true,
// message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.equipment.maintenanceTime')]),
// trigger: 'blur'
// }]
},
typeCode: {},
eImgAction: uploadPath,
@@ -461,6 +460,7 @@ export default {
created() {
this.listQuery.equipmentId = this.$route.query.id
this.init()
this.getList()
},
methods: {
init() {
@@ -484,12 +484,12 @@ export default {
// })
// }
// this.list.splice(0, this.list.length)
equipmentTypeList(this.listQuery).then(response => {
this.equipmentTypeOption = response.data.records
})
equipmentGroupList(this.listQuery).then(response => {
this.equipmentGroupOption = response.data.records
})
// equipmentTypeList(this.listQuery).then(response => {
// this.equipmentTypeOption = response.data.records
// })
// equipmentGroupList(this.listQuery).then(response => {
// this.equipmentGroupOption = response.data.records
// })
this.$nextTick(() => {
this.$refs['dataForm'].resetFields()
if (this.listQuery.equipmentId) {
@@ -514,7 +514,9 @@ export default {
},
getList() {
this.listLoading = true
console.log(this.listQuery)
equipmentInfoAttrList(this.listQuery).then(response => {
console.log(response)
if (response.data.records) {
this.list = response.data.records
} else {

19
src/views/basicData/Equipment/components/equipmentInfoAttr-add.vue
View File

@@ -1,8 +1,8 @@
<!--
* @Author: zwq
* @Date: 2020-12-29 16:37:56
* @LastEditors: zwq
* @LastEditTime: 2021-03-25 16:31:46
* @LastEditors: fzq
* @LastEditTime: 2022-03-05 14:08:41
* @Description:
-->
<template>
@@ -19,12 +19,12 @@
<el-form-item :label="$t('module.basicData.visual.AttributeName')" prop="attrName">
<el-input v-model="dataForm.attrName" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.AttributeName')])" clearable />
</el-form-item>
<el-form-item :label="$t('module.basicData.visual.AttributeValue')" prop="attrValue">
<el-input v-model="dataForm.attrValue" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.AttributeValue')])" clearable />
<el-form-item :label="$t('module.basicData.visual.AttributeValue')" prop="attrContent">
<el-input v-model="dataForm.attrContent" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.AttributeValue')])" clearable />
</el-form-item>
<el-form-item :label="$t('module.basicData.visual.Remarks')" prop="remark">
<!-- <el-form-item :label="$t('module.basicData.visual.Remarks')" prop="remark">
<el-input v-model="dataForm.remark" :placeholder="$i18nForm(['placeholder.input', $t('module.basicData.visual.Remarks')])" clearable />
</el-form-item>
</el-form-item> -->
</el-form>
<div class="drawer-footer">
<el-button @click="visible = false">{{ 'btn.cancel' | i18nFilter }}</el-button>
@@ -52,14 +52,14 @@ export default {
dataForm: {
id: 0,
attrName: '',
attrValue: '',
attrContent: '',
remark: ''
},
dataRule: {
attrName: [
{ required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.visual.AttributeName')]), trigger: 'blur' }
],
attrValue: [
attrContent: [
{ required: true, message: this.$i18nForm(['placeholder.input', this.$t('module.basicData.visual.AttributeValue')]), trigger: 'blur' }
]
}
@@ -74,6 +74,7 @@ export default {
this.$refs['dataForm'].resetFields()
if (this.dataForm.id) {
equipmentInfoAttrDetail(this.dataForm.id).then(res => {
console.log(res)
this.dataForm = res.data
})
}
@@ -86,7 +87,7 @@ export default {
if (valid) {
const data = {
'attrName': this.dataForm.attrName,
'attrValue': this.dataForm.attrValue,
'attrContent': this.dataForm.attrContent,
'remark': this.dataForm.remark,
'equipmentId': this.equipmentId,
'id': this.dataForm.id

2
src/views/basicData/Equipment/equipmentInfo.vue
View File

@@ -2,7 +2,7 @@
* @Author: zwq
* @Date: 2020-12-29 15:41:11
* @LastEditors: fzq
* @LastEditTime: 2022-03-03 20:28:43
* @LastEditTime: 2022-03-05 11:01:57
* @Description:
-->
<template>