mt-ck/mt-qj-wms-ui
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update

Browse Source
This commit is contained in:
gtz217
2021-12-10 17:07:29 +08:00
parent 9f3c13f893
commit f445045cc4
29 changed files with 539 additions and 868 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/views/basic/components/alarmInfo-add.vue
View File

@@ -1,8 +1,8 @@
<!--
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: zwq
* @LastEditTime: 2021-12-08 11:15:12
* @LastEditors: gtz
* @LastEditTime: 2021-12-09 11:21:14
* @Description:
-->
<template>
@@ -57,7 +57,7 @@
this.$refs['dataForm'].resetFields()
if (this.dataForm.id) {
this.$http({
url: this.$http.adornUrl(`alarmBase/get`),
url: this.$http.adornUrl(`/alarmBase/get`),
method: 'post',
data: this.$http.adornData({id})
}).then(({data}) => {
@@ -67,7 +67,7 @@
})
} else {
this.$http({
url: this.$http.adornUrl(`alarmBase/codeGenerator`),
url: this.$http.adornUrl(`/alarmBase/codeGenerator`),
method: 'post',
data: this.$http.adornData()
}).then((data) => {
@@ -81,7 +81,7 @@
this.$refs['dataForm'].validate((valid) => {
if (valid) {
this.$http({
url: this.$http.adornUrl(`alarmBase/${!this.dataForm.id ? 'add' : 'update'}`),
url: this.$http.adornUrl(`/alarmBase/${!this.dataForm.id ? 'add' : 'update'}`),
method: 'post',
data: this.$http.adornData({
'id': this.dataForm.id || undefined,

33
src/views/basic/components/cache-add.vue
View File

@@ -1,8 +1,8 @@
<!--
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: zwq
* @LastEditTime: 2021-12-08 14:03:15
* @LastEditors: gtz
* @LastEditTime: 2021-12-10 11:33:59
* @Description:
-->
<template>
@@ -16,7 +16,7 @@
:rules="dataRule"
ref="dataForm"
@keyup.enter.native="dataFormSubmit()"
label-width="80px"
label-width="100px"
>
<el-form-item label="缓存区编码" prop="code">
<el-input v-model="dataForm.code" placeholder="缓存区编码"></el-input>
@@ -27,14 +27,14 @@
placeholder="缓存区名称"
></el-input>
</el-form-item>
<el-form-item label="英文名称" prop="alarmInfo">
<el-form-item label="英文名称" prop="englishName">
<el-input
v-model="dataForm.alarmInfo"
v-model="dataForm.englishName"
placeholder="英文名称"
></el-input>
</el-form-item>
<el-form-item label="缩写" prop="alarmInfo">
<el-input v-model="dataForm.alarmInfo" placeholder="缩写"></el-input>
<el-form-item label="缩写" prop="aliasName">
<el-input v-model="dataForm.aliasName" placeholder="缩写"></el-input>
</el-form-item>
<el-form-item label="规格描述" prop="spec">
<el-input
@@ -42,9 +42,9 @@
placeholder="规格描述"
></el-input>
</el-form-item>
<el-form-item label="库位数量" prop="alarmInfo">
<el-form-item label="库位数量" prop="number">
<el-input
v-model="dataForm.alarmInfo"
v-model="dataForm.number"
placeholder="库位数量"
></el-input>
</el-form-item>
@@ -79,9 +79,18 @@ export default {
code: '',
description: '',
spec: '',
number: null,
englishName: '',
aliasName: '',
warehouseName: ''
},
dataRule: {
code: [
{ required: true, message: '编码不能为空', trigger: 'blur' }
],
warehouseName: [
{ required: true, message: '缓存区名称不能为空', trigger: 'blur' }
]
}
}
},
@@ -93,7 +102,7 @@ export default {
this.$refs['dataForm'].resetFields()
if (this.dataForm.id) {
this.$http({
url: this.$http.adornUrl(`warehouse/get`),
url: this.$http.adornUrl(`/warehouse/get`),
method: 'post',
data: this.$http.adornData({ id })
}).then(({ data }) => {
@@ -103,7 +112,7 @@ export default {
})
} else {
this.$http({
url: this.$http.adornUrl(`warehouse/codeGenerator`),
url: this.$http.adornUrl(`/warehouse/codeGenerator`),
method: 'post',
data: this.$http.adornData()
}).then(data => {
@@ -118,7 +127,7 @@ export default {
if (valid) {
this.$http({
url: this.$http.adornUrl(
`warehouse/${!this.dataForm.id ? 'add' : 'update'}`
`/warehouse/${!this.dataForm.id ? 'add' : 'update'}`
),
method: 'post',
data: this.$http.adornData({

10
src/views/basic/components/carInfo-add.vue
View File

@@ -1,8 +1,8 @@
<!--
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: zwq
* @LastEditTime: 2021-12-08 11:22:54
* @LastEditors: gtz
* @LastEditTime: 2021-12-09 11:21:23
* @Description:
-->
<template>
@@ -53,7 +53,7 @@
this.$refs['dataForm'].resetFields()
if (this.dataForm.id) {
this.$http({
url: this.$http.adornUrl(`vehicle/get`),
url: this.$http.adornUrl(`/vehicle/get`),
method: 'post',
data: this.$http.adornData({id})
}).then(({data}) => {
@@ -63,7 +63,7 @@
})
} else {
this.$http({
url: this.$http.adornUrl(`vehicle/codeGenerator`),
url: this.$http.adornUrl(`/vehicle/codeGenerator`),
method: 'post',
data: this.$http.adornData()
}).then((data) => {
@@ -77,7 +77,7 @@
this.$refs['dataForm'].validate((valid) => {
if (valid) {
this.$http({
url: this.$http.adornUrl(`vehicle/${!this.dataForm.id ? 'add' : 'update'}`),
url: this.$http.adornUrl(`/vehicle/${!this.dataForm.id ? 'add' : 'update'}`),
method: 'post',
data: this.$http.adornData({
'id': this.dataForm.id || undefined,

87
src/views/basic/components/equipmentInfo-add.vue
View File

@@ -1,17 +1,37 @@
<!--
* @Author: gtz
* @Date: 2021-11-19 10:10:52
* @LastEditors: gtz
* @LastEditTime: 2021-12-10 16:35:33
* @Description: file content
* @FilePath: \mt-qj-wms-ui\src\views\basic\components\equipmentInfo-add.vue
-->
<template>
<el-dialog
:title="!dataForm.id ? '新增' : '修改'"
:close-on-click-modal="false"
:visible.sync="visible">
<el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()" label-width="80px">
<el-form-item label="参数名" prop="paramKey">
<el-input v-model="dataForm.paramKey" placeholder="参数名"></el-input>
<el-form-item label="名称" prop="kilnName">
<el-input v-model="dataForm.kilnName" placeholder="名称"></el-input>
</el-form-item>
<el-form-item label="参数值" prop="paramValue">
<el-input v-model="dataForm.paramValue" placeholder="参数值"></el-input>
<el-form-item label="编码" prop="code">
<el-input v-model="dataForm.code" placeholder="编码"></el-input>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="dataForm.remark" placeholder="备注"></el-input>
<el-form-item label="别名" prop="kilnAlias">
<el-input v-model="dataForm.kilnAlias" placeholder="别名"></el-input>
</el-form-item>
<el-form-item label="英文名" prop="en">
<el-input v-model="dataForm.en" placeholder="英文名"></el-input>
</el-form-item>
<el-form-item label="ip" prop="ip">
<el-input v-model="dataForm.ip" placeholder="ip"></el-input>
</el-form-item>
<el-form-item label="端口号" prop="portNumber">
<el-input v-model="dataForm.portNumber" placeholder="端口号"></el-input>
</el-form-item>
<el-form-item label="备注" prop="note">
<el-input v-model="dataForm.note" placeholder="备注"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -28,16 +48,24 @@
visible: false,
dataForm: {
id: 0,
paramKey: '',
paramValue: '',
remark: ''
code: null,
description: null,
en: null,
ip: null,
kilnAlias: null,
kilnName: null,
note: null,
portNumber: null
},
dataRule: {
paramKey: [
{ required: true, message: '参数名不能为空', trigger: 'blur' }
kilnName: [
{ required: true, message: '名称不能为空', trigger: 'blur' }
],
paramValue: [
{ required: true, message: '参数值不能为空', trigger: 'blur' }
ip: [
{ required: true, message: 'ip不能为空', trigger: 'blur' }
],
portNumber: [
{ required: true, message: '端口号不能为空', trigger: 'blur' }
]
}
}
@@ -50,16 +78,22 @@
this.$refs['dataForm'].resetFields()
if (this.dataForm.id) {
this.$http({
url: this.$http.adornUrl(`/sys/config/info/${this.dataForm.id}`),
method: 'get',
params: this.$http.adornParams()
}).then(({data}) => {
url: this.$http.adornUrl(`/kilnInfo/get`),
method: 'post',
data: this.$http.adornData({ id })
}).then(({ data }) => {
if (data && data.code === 0) {
this.dataForm.paramKey = data.config.paramKey
this.dataForm.paramValue = data.config.paramValue
this.dataForm.remark = data.config.remark
this.dataForm = data.data
}
})
} else {
this.$http({
url: this.$http.adornUrl(`/kilnInfo/codeGenerator`),
method: 'post',
data: this.$http.adornData()
}).then(data => {
this.dataForm.code = data.data
})
}
})
},
@@ -68,13 +102,18 @@
this.$refs['dataForm'].validate((valid) => {
if (valid) {
this.$http({
url: this.$http.adornUrl(`/sys/config/${!this.dataForm.id ? 'save' : 'update'}`),
url: this.$http.adornUrl(`/kilnInfo/${!this.dataForm.id ? 'add' : 'update'}`),
method: 'post',
data: this.$http.adornData({
'id': this.dataForm.id || undefined,
'paramKey': this.dataForm.paramKey,
'paramValue': this.dataForm.paramValue,
'remark': this.dataForm.remark
'code': this.dataForm.code,
'description': this.dataForm.description,
'en': this.dataForm.en,
'ip': this.dataForm.ip,
'kilnAlias': this.dataForm.kilnAlias,
'kilnName': this.dataForm.kilnName,
'note': this.dataForm.note,
'portNumber': this.dataForm.portNumber
})
}).then(({data}) => {
if (data && data.code === 0) {

36
src/views/basic/components/location-add.vue
View File

@@ -1,8 +1,8 @@
<!--
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: zwq
* @LastEditTime: 2021-12-08 14:11:44
* @LastEditors: gtz
* @LastEditTime: 2021-12-10 11:17:20
* @Description:
-->
<template>
@@ -17,22 +17,19 @@
<el-form-item label="库位编码" prop="code">
<el-input v-model="dataForm.code" placeholder="库位编码"></el-input>
</el-form-item>
<el-form-item label="当前状态" prop="alarmInfo"
><el-switch
v-model="dataForm.alarmInfo"
active-color="#13ce66"
inactive-color="#ff4949"
active-value="1"
inactive-value="0"
>
</el-switch>
<el-form-item label="当前状态" prop="status">
<el-radio-group v-model="dataForm.status">
<el-radio :label="0">空闲</el-radio>
<el-radio :label="1">使用</el-radio>
<el-radio :label="2">不可用</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="库位别名" prop="locationNameAlias">
<el-input v-model="dataForm.locationNameAlias" placeholder="库位别名"></el-input>
</el-form-item>
<el-form-item label="英文名称" prop="alarmInfo">
<el-input v-model="dataForm.alarmInfo" placeholder="英文名称"></el-input>
</el-form-item>
<!-- <el-form-item label="英文名称" prop="englishName">
<el-input v-model="dataForm.englishName" placeholder="英文名称"></el-input>
</el-form-item> -->
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false">取消</el-button>
@@ -49,8 +46,10 @@
dataForm: {
id: '',
code: '',
status: 0,
locationName: '',
locationNameAlias: '',
englishName: '',
warehouseId: ''
},
dataRule: {
@@ -69,7 +68,7 @@
this.$refs['dataForm'].resetFields()
if (this.dataForm.id) {
this.$http({
url: this.$http.adornUrl(`locationInfo/get`),
url: this.$http.adornUrl(`/locationInfo/get`),
method: 'post',
data: this.$http.adornData({id})
}).then(({data}) => {
@@ -79,7 +78,7 @@
})
} else {
this.$http({
url: this.$http.adornUrl(`locationInfo/codeGenerator`),
url: this.$http.adornUrl(`/locationInfo/codeGenerator`),
method: 'post',
data: this.$http.adornData()
}).then((data) => {
@@ -93,14 +92,15 @@
this.$refs['dataForm'].validate((valid) => {
if (valid) {
this.$http({
url: this.$http.adornUrl(`locationInfo/${!this.dataForm.id ? 'add' : 'update'}`),
url: this.$http.adornUrl(`/locationInfo/${!this.dataForm.id ? 'add' : 'update'}`),
method: 'post',
data: this.$http.adornData({
'id': this.dataForm.id || undefined,
'code': this.dataForm.code,
'locationName': this.dataForm.locationName,
'warehouseId': this.dataForm.warehouseId,
'locationNameAlias': this.dataForm.locationNameAlias
'locationNameAlias': this.dataForm.locationNameAlias,
'status': this.dataForm.status
})
}).then(({data}) => {
if (data && data.code === 0) {

10
src/views/basic/components/location.vue
View File

@@ -42,12 +42,12 @@
align="center"
label="别名">
</el-table-column>
<el-table-column
prop="ename"
<!-- <el-table-column
prop="englishName"
header-align="center"
align="center"
label="英文名称">
</el-table-column>
</el-table-column> -->
<el-table-column
prop="status"
header-align="center"
@@ -112,7 +112,7 @@
getDataList () {
this.dataListLoading = true
this.$http({
url: this.$http.adornUrl('locationInfo/page'),
url: this.$http.adornUrl('/locationInfo/page'),
method: 'post',
data: this.$http.adornData({
'current': this.pageIndex,
@@ -159,7 +159,7 @@
type: 'warning'
}).then(() => {
this.$http({
url: this.$http.adornUrl('locationInfo/delete'),
url: this.$http.adornUrl('/locationInfo/delete'),
method: 'post',
data: this.$http.adornData({id})
}).then(({data}) => {

10
src/views/basic/components/processInfo-add.vue
View File

@@ -1,8 +1,8 @@
<!--
* @Author: zwq
* @Date: 2021-11-18 14:16:25
* @LastEditors: zwq
* @LastEditTime: 2021-12-08 14:21:48
* @LastEditors: gtz
* @LastEditTime: 2021-12-09 11:21:56
* @Description:
-->
<template>
@@ -71,7 +71,7 @@
this.$refs['dataForm'].resetFields()
if (this.dataForm.id) {
this.$http({
url: this.$http.adornUrl(`alarmBase/get`),
url: this.$http.adornUrl(`/alarmBase/get`),
method: 'post',
data: this.$http.adornData({id})
}).then(({data}) => {
@@ -81,7 +81,7 @@
})
} else {
this.$http({
url: this.$http.adornUrl(`alarmBase/codeGenerator`),
url: this.$http.adornUrl(`/alarmBase/codeGenerator`),
method: 'post',
data: this.$http.adornData()
}).then((data) => {
@@ -95,7 +95,7 @@
this.$refs['dataForm'].validate((valid) => {
if (valid) {
this.$http({
url: this.$http.adornUrl(`alarmBase/${!this.dataForm.id ? 'add' : 'update'}`),
url: this.$http.adornUrl(`/alarmBase/${!this.dataForm.id ? 'add' : 'update'}`),
method: 'post',
data: this.$http.adornData({
'id': this.dataForm.id || undefined,