UDI
/
udiwms-vue-frame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

8/17 页面优化

Browse Source
20240912_adapter_z
wangwei 8 months ago
parent 76bd5b2f81
commit 89bacd4fc4
2 changed files with 76 additions and 43 deletions
Show Stats Download Patch File Download Diff File

75
src/views/basic/collectPoint/gatherOrderType.vue
Unescape Escape View File

@ -3,11 +3,11 @@
<el-card> <el-card>
<el-form :model="query" label-width="auto" v-show="showSearch" size="mini" class="order-el-form"> <el-form :model="query" label-width="auto" v-show="showSearch" size="mini" class="order-el-form">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="8"> <!--<el-col :span="8">-->
<el-form-item label="当前仓库:" class="query-form-item"> <!-- <el-form-item label="当前仓库:" class="query-form-item">-->
<invSelect :value.sync="query.invCode" :params.sync="filterBadInv" :changeValue.sync="invChange"/> <!-- <invSelect :value.sync="query.invCode" :params.sync="filterBadInv" :changeValue.sync="invChange"/>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!--</el-col>-->
<el-col :span="8"> <el-col :span="8">
<el-form-item label="编码/名称:" class="query-form-item"> <el-form-item label="编码/名称:" class="query-form-item">
<el-input v-model="query.key" placeholder="请输入单据编号/单据名称" clearable> <el-input v-model="query.key" placeholder="请输入单据编号/单据名称" clearable>
@ -44,6 +44,8 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="来源系统" prop="fromType"></el-table-column> <el-table-column label="来源系统" prop="fromType"></el-table-column>
<el-table-column label="来源单据类型" prop="fromDocumentType"></el-table-column>
<el-table-column label="来源接口地址" prop="fromInterAddress"></el-table-column>
<el-table-column label="备注" prop="remark"></el-table-column> <el-table-column label="备注" prop="remark"></el-table-column>
<el-table-column label="操作" fixed="right" width="100"> <el-table-column label="操作" fixed="right" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
@ -113,6 +115,24 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<!--<el-row :gutter="24" class="el-row">-->
<!-- <el-col :span="12" class="el-col">-->
<!-- <el-form-item label="出入库类型:" prop="mainAction" class="query-form-item">-->
<!-- <el-select v-model="formData.mainAction" style="width: 80%" placeholder="请选择出入库类型" clearable>-->
<!-- <el-option label="出库" :value="mainActionMap.out"></el-option>-->
<!-- <el-option label="入库" :value="mainActionMap.in"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="12" class="el-col">-->
<!-- <el-form-item label="是否内单据:" prop="innerOrder" class="query-form-item">-->
<!-- <el-select v-model="formData.innerOrder" style="width: 80%" placeholder="请选择" clearable>-->
<!-- <el-option label="否" :value="0"></el-option>-->
<!-- <el-option label="是" :value="1"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!--</el-row>-->
<el-row :gutter="24" class="el-row"> <el-row :gutter="24" class="el-row">
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<el-form-item label="来源系统:" prop="name" class="query-form-item"> <el-form-item label="来源系统:" prop="name" class="query-form-item">
@ -124,13 +144,26 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<!--<el-col :span="12" class="el-col">--> <el-col :span="12" class="el-col">
<!-- <el-form-item label="所属仓库:" prop="invCode" class="query-form-item">--> <el-form-item label="来源单据类型:" prop="fromDocumentType" class="query-form-item">
<!-- <invSelect :value.sync="formData.invCode" :params.sync="filterBadInv" :changeValue.sync="invChange"--> <el-input
<!-- style="width: 80%"--> placeholder="请输入来源单据类型"
<!-- />--> v-model="formData.fromDocumentType" style="width: 80%"
<!-- </el-form-item>--> auto-complete="off"
<!--</el-col>--> ></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="24" class="el-row">
<el-col :span="12" class="el-col">
<el-form-item label="来源接口地址:" prop="fromInterAddress" class="query-form-item">
<el-input
placeholder="请输入来源接口地址"
v-model="formData.fromInterAddress" style="width: 80%"
auto-complete="off"
></el-input>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row :gutter="24" class="el-row"> <el-row :gutter="24" class="el-row">
<el-col :span="22" class="el-col"> <el-col :span="22" class="el-col">
@ -171,7 +204,6 @@ export default {
data() { data() {
return { return {
query: { query: {
invCode: this.$store.getters.locInvCode,
page: 1, page: 1,
limit: 10 limit: 10
}, },
@ -190,18 +222,15 @@ export default {
total: 0, total: 0,
busTypes: [], busTypes: [],
formRules: { formRules: {
code: [
{ required: true, message: '请输入采集点编号', trigger: 'blur' }
],
name: [ name: [
{ required: true, message: '请输入采集点名称', trigger: 'blur' } { required: true, message: '请输入单据类型名称', trigger: 'blur' }
], ],
fromType: [ fromType: [
{ required: true, message: '请选择来源', trigger: 'blur' } { required: true, message: '请选择来源', trigger: 'blur' }
], ],
invCode: [ // invCode: [
{ required: true, message: '请选择单据所属仓库', trigger: 'blur' } // { required: true, message: '请选择单据所属仓库', trigger: 'blur' }
], // ],
mainAction: [ mainAction: [
{ required: true, message: '请选择出入库类型', trigger: 'blur' } { required: true, message: '请选择出入库类型', trigger: 'blur' }
], ],
@ -234,7 +263,6 @@ export default {
this.query = { this.query = {
page: 1, page: 1,
limit: 10, limit: 10,
invCode: this.$store.getters.locInvCode
} }
this.getList() this.getList()
}, },
@ -290,7 +318,7 @@ export default {
this.addCollectionPointsDialogVisible = false this.addCollectionPointsDialogVisible = false
}, },
formSubmit() { formSubmit() {
this.formData.invCode = this.$store.getters.locInvCode // this.formData.invCode = this.$store.getters.locInvCode
if (this.fromName == 'add') { if (this.fromName == 'add') {
this.$refs['dataForm'].validate((valid) => { this.$refs['dataForm'].validate((valid) => {
if (valid) { if (valid) {
@ -333,6 +361,9 @@ export default {
if (res.code == 20000) { if (res.code == 20000) {
this.$message.success('删除成功') this.$message.success('删除成功')
this.getList() this.getList()
}else {
this.$message.error(res.message)
this.getList()
} }
}).catch(() => { }).catch(() => {

44
src/views/basic/workplace/workplaceManage.vue
Unescape Escape View File

@ -409,7 +409,7 @@
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">
<el-form-item label="往来类型标题:" prop="remake" class="query-form-item"> <el-form-item label="往来类型标题:" prop="unitTittle" class="query-form-item">
<el-input <el-input
v-model="formData.unitTittle" style="width: 80%" v-model="formData.unitTittle" style="width: 80%"
auto-complete="off" auto-complete="off"
@ -430,7 +430,7 @@
<!--</el-col>--> <!--</el-col>-->
<el-row :gutter="24" class="el-row"> <el-row :gutter="24" class="el-row">
<el-col :span="22" class="el-col"> <el-col :span="22" class="el-col">
<el-form-item label="备注:" prop="unitTittle" class="query-form-item"> <el-form-item label="备注:" prop="remake" class="query-form-item">
<el-input <el-input
v-model="formData.remake" style="width: 100%" v-model="formData.remake" style="width: 100%"
auto-complete="off" auto-complete="off"
@ -572,21 +572,24 @@ export default {
workplaceName: [ workplaceName: [
{ required: true, message: '请输入工位名称', trigger: 'blur' } { required: true, message: '请输入工位名称', trigger: 'blur' }
], ],
// operationType: [ operationType: [
// { required: true, message: '请选择作业方式', trigger: 'blur' } { required: true, message: '请选择作业方式', trigger: 'blur' }
// ], ],
// checkInsert: [ checkInsert: [
// { required: true, message: '处理结果是否插入', trigger: 'blur' } { required: true, message: '处理结果不能为空', trigger: 'blur' }
// ], ],
// warnType: [ warnType: [
// { required: true, message: '提醒方式', trigger: 'blur' } { required: true, message: '请选择提醒方式', trigger: 'blur' }
// ], ],
// invCode: [ corpType: [
// { required: true, message: '请选择仓库', trigger: 'blur' } { required: true, message: '请选择往来单位类型', trigger: 'blur' }
// ], ],
// orderId: [ orderId: [
// { required: true, message: '请选择单据类型', trigger: 'blur' } { required: true, message: '请选择单据类型', trigger: 'blur' }
// ], ],
unitTittle: [
{ required: true, message: '请输入往来类型标题', trigger: 'blur' }
],
}, },
invQuery: { invQuery: {
invCode: '' invCode: ''
@ -720,11 +723,8 @@ export default {
// this.formData.constituencies = this.groupData.code // this.formData.constituencies = this.groupData.code
if (this.fromName == 'add') { if (this.fromName == 'add') {
this.$refs['dataForm'].validate((valid) => { this.$refs['dataForm'].validate((valid) => {
if (!valid) { if (valid) {
this.$message.error('请完善必填信息')
} else {
addWorkplace(this.formData).then(res => { addWorkplace(this.formData).then(res => {
console.log('res', res)
if (res.code != 20000) { if (res.code != 20000) {
return this.$message.error('新增错误') return this.$message.error('新增错误')
} }
@ -738,6 +738,8 @@ export default {
}).catch(() => { }).catch(() => {
}) })
} else {
// this.$message.error('请完善必填信息')
} }
}) })
} else { } else {

Write Preview
Loading…
Cancel
Save