houjianlan
/
kams4_test_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

main
HUOJIN\92525 2024-09-20 14:41:34 +08:00
parent 733ba7b15c
commit 4d6cfa8f18
4 changed files with 467 additions and 409 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/components/Crud/CRUD.operation.vue
View File

@ -130,15 +130,21 @@ export default {
props: {
permission: {
type: Object,
default: () => { return {} }
default: () => {
return {}
}
},
ignoreColumns: {
type: Array,
default: () => { return [] }
default: () => {
return []
}
},
tableKey: {
type: String,
default: () => { return '' }
default: () => {
return ''
}
}
},
data() {
@ -185,49 +191,55 @@ export default {
this.updateTableColumns()
const strHidden = sessionStorage.getItem(this.tableKey)
this.hiddenColumns = JSON.parse(strHidden);
if(this.hiddenColumns.length>0){
console.log("------移除---------------")
if (this.hiddenColumns) {
const table = this.crud.props.table
if (table) { // 添加检查
this.table_configs_xs.forEach((column, index) => {
const vm = table.$children.find(e => e.label === column.label)
if (vm) { // 再次检查
const columnConfig = vm.columnConfig
console.log(columnConfig)
vm.owner.store.commit('removeColumn', columnConfig, null)
}
})
}
this.ignoreNextTableColumnsChange = false
console.log("--------移除完成-------------")
setTimeout(() => {
// 方法区
this.showcolumn();
}, 200)
}
//vm.owner.store.commit('insertColumn', columnConfig, newIndex+myindex + 1 , null)
},
showcolumn() {
console.log("------显示列------")
try {
// 从sessionStorage安全地获取并解析hiddenColumns
const strHidden = sessionStorage.getItem(this.tableKey)
if (strHidden) {
this.hiddenColumns = JSON.parse(strHidden);
const table = this.crud.props.table
this.hiddenColumns.forEach((column,index) => {
const vm = table.$children.find(e => e.prop === column.property)
const columnConfig = vm.columnConfig
console.log(columnConfig.label)
if(column.visible){
columnConfig.width=column.width
columnConfig.visible=column.visible
vm.owner.store.commit('insertColumn', columnConfig, index+1 , null)
} else {
// 如果没有找到相应的存储信息，可以初始化为空数组或相应的默认值
this.hiddenColumns = [];
}
})
console.log("------显示列完成------")
const table = this.crud.props.table
// 优化循环中的条件判断和错误处理
this.hiddenColumns.forEach((column, index) => {
const vm = table.$children.find(e => e && e.prop === column.property)
if (vm) {
const columnConfig = vm.columnConfig;
// 确保columnConfig存在
if (columnConfig) {
if (column.visible) {
// 仅当列需要显示时，才更新其配置
columnConfig.width = column.width;
columnConfig.visible = column.visible;
vm.owner.store.commit('insertColumn', columnConfig, index + 1, null);
}
}
}
});
this.updateTableColumns();
} catch (error) {
}
},
//列拖拽
columnDrop() {
@ -431,9 +443,11 @@ export default {
display: flex;
align-items: center;
}
.crud-opts .crud-opts-right {
margin-left: auto;
}
.crud-opts .crud-opts-right span {
float: left;
}

1
src/components/Crud/crud.js
View File

@ -147,7 +147,6 @@ function CRUD(options) {
}
crud.page.total = data.totalElements
crud.data = data.content
crud.tableHeight = window.innerHeight -table.$el.offsetTop - 60;
crud.resetDataStatus()
// time 毫秒后显示表格
setTimeout(() => {

34
src/views/business-asn/asn/index.vue
View File

@ -110,6 +110,8 @@
<!-- 明细-->
<!-- </el-button>-->
</crudOperation>
<!--自己定义新增表单组件-->
<el-dialog :visible.sync="inserAsnOnOff" :title="(this.updateAsnOnOff ? '修改 ':'新增 ')+'收货管理'" width="900px"
>
@ -214,6 +216,7 @@
<el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
</div>
</el-dialog>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;"
@selection-change="crud.selectionChangeHandler" :height="crud.tableHeight" @select="invVerifySTFM" @select-all="invVerifySTFAll" border
@ -271,6 +274,8 @@
</template>
</el-table-column>
</el-table>
<viewAsnDetail ref="viewAsnDetail" />
<!--分页组件-->
<div style="float: right;">
<pagination/>
@ -294,6 +299,7 @@ import { queryPointList } from '@/api/point'
import { queryItemAll } from '@/api/item'
import { formatDate } from '@/utils/commonUtils'
import {xbjsOut} from "@/api/pickOut";
import viewAsnDetail from "@/views/business-asn/asn/viewAsnDetail.vue"
const defaultForm = {
id: null,
@ -325,7 +331,7 @@ const defaultForm = {
}
export default {
name: 'Asn',
components: { pagination, crudOperation, rrOperation, udOperation,DateRangePicker },
components: { pagination, crudOperation, rrOperation, udOperation,DateRangePicker,viewAsnDetail },
mixins: [presenter(), header(), form(defaultForm), crud()],
dicts: ['asn_status'],
cruds() {
@ -481,24 +487,9 @@ export default {
})
},
//新政的开关
inserAsnOnOffM(data) {
this.$router.push({path:'/business-asn/viewAsnDetail'})
// this.inserAsnOnOff = true
// let no = null
// for (const billTypDateElement of this.billTypeOptions) {
// if (billTypDateElement.code === data) {
// this.asnFrom.billType = billTypDateElement
// no = billTypDateElement.code
// }
// }
// if (this.asnFrom.billType === null) {
// this.$message.error('billType 没有加载 或没有ZC_CK数据')
// return
// }
// getCodeNo(no).then(res => {
// this.asnFrom.code = res
// })
// this.asnFrom.orderDate = this.getNewDate()
inserAsnOnOffM() {
this.$refs.viewAsnDetail.dialogInsertAsn=true
//this.$router.push({path:'/business-asn/viewAsnDetail'})
},
//获取当前时间
getNewDate() {
@ -544,7 +535,10 @@ export default {
})
},
asnDetailRouter(datas){
this.$router.push({path:'/business-asn/viewAsnDetail',query: {ids:datas.id}})
this.$refs.viewAsnDetail.dialogInsertAsn=true
this.$refs.viewAsnDetail.asnFrom=datas
this.$refs.viewAsnDetail.queryAsnDetail(datas.id)
//this.$router.push({path:'/business-asn/viewAsnDetail',query: {ids:datas.id}})
},
//入库批量确认
invVerifyS(data){

385
src/views/business-asn/asn/viewAsnDetail.vue
View File

@ -1,23 +1,30 @@
<template>
<div class="app-container">
<el-card class="box-card">
<div slot="header" class="clearfix">
<!-- 卡片头 -->
<div style="width: 100%;height: 180px;position: relative;">
<el-form ref="asnFromRes" :model="asnFrom" :rules="rules" size="small" label-width="80px">
<div style="width: 60%;height: 180px;float: left">
<el-form-item label="库区" prop="area">
<el-select v-model="asnFrom.area" prop="area" value-key="id" style="width: 100%"
placeholder="请选择出库库区" clearable
<el-dialog :visible.sync="dialogInsertAsn"
center
top="0.5vh"
:fullscreen="fullscreen"
width="80%"
:before-close="handleClose"
>
<el-option v-for="item in areaOptions" :key="item.id" :label="item.code" :value="item"/>
</el-select>
</el-form-item>
<div style="width: 100%;position: relative;height: 45px;">
<div style="width: 50%;float: left">
<template #title>
<div style="display: flex; align-items: center; justify-content: space-between;">
<span style="flex: 1; text-align: center;">新增入库单</span>
<div>
<i class="el-icon-full-screen" @click="fullscreen = !fullscreen"
style="cursor: pointer; margin-right: 20px;font-size: 13px;"></i>
</div>
</div>
</template>
<el-form ref="asnFromRes" :model="asnFrom" :rules="rules" size="small" label-width="80px">
<el-row>
<el-col :span="12">
<el-form-item label="单据类型" prop="billType">
<el-select v-model="asnFrom.billType" value-key="id" style="width:100%"
placeholder="请选择单据类型" clearable
<el-select v-model="asnFrom.billType" value-key="id"
placeholder="请选择单据类型" clearable style="width: 100%"
>
<el-option
v-for="item in billTypeOptions"
@ -26,9 +33,10 @@
:value="item"
/>
</el-select>
</el-form-item>
</div>
<div style="width: 50%;float: right">
</el-col>
<el-col :span="12">
<el-form-item label="订单日期" prop="orderDate">
<el-date-picker
style="width: 100%"
@ -39,39 +47,30 @@
>
</el-date-picker>
</el-form-item>
</div>
</div>
<div style="width: 100%;position: relative;height: 45px;">
<div style="width: 50%;float: left">
<el-form-item label="单号" prop="code">
<el-input :disabled="true" v-model="asnFrom.code" style="width: 100%"/>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="凭证号" prop="code">
<el-input v-model="asnFrom.code"/>
</el-form-item>
</div>
<div style="width: 50%;float: right">
</el-col>
<el-col :span="12">
<el-form-item label="订单数量">
<el-input :disabled="true" v-model="asnFrom.orderQuantity" style="width: 100%;"/>
<el-input :disabled="true" v-model.number="asnFrom.orderQuantity"/>
</el-form-item>
</div>
</div>
<div style="width: 100%;position: relative;">
<div style="width: 50%;float: left">
<el-button type="primary" :disabled="asnFrom.code != null" @click="submitFromAsn(asnFrom)">提交
</el-button>
</div>
</div>
</div>
<div style="width: 40%;height: 180px;float: right">
</el-col>
</el-row>
<el-form-item label="备注:">
</el-form-item>
<el-input v-model="asnFrom.description" type="textarea" :autosize="{ minRows: 5, maxRows: 8}"
placeholder="请输入备注" style="width: 90%;height: 100%;float: right"
<el-input v-model="asnFrom.description" type="textarea" :autosize="{ minRows: 3, maxRows: 5}"
placeholder="请输入备注"
/>
</div>
</el-form-item>
<el-button type="primary" size="small" @click="submitFromAsn(asnFrom)">提交
</el-button>
</el-form>
</div>
</div>
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="订单明细信息" name="first">
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" :tableKey="this.$options.name">
<el-button
@ -120,101 +119,9 @@
<el-button size="mini" type="success" icon="el-icon-upload">导入</el-button>
</el-upload>
</crudOperation>
<!-- 单一入库 -->
<el-dialog title="单一入库" :visible.sync="dyrkTf" width="500px">
<!-- <el-dialog-->
<!-- width="30%"-->
<!-- title="内层 Dialog"-->
<!-- :visible.sync="innerVisible"-->
<!-- append-to-body>-->
<!-- </el-dialog>-->
<el-form ref="formdyrk" :model="asnDetailButton" label-width="80px">
<el-form-item label="数量" prop="oneRNumber" :rules="[
{ required: true, message: '数量不能为空'},
{ type: 'number', message: '数量必须为数字值'}
]"
>
<el-input v-model.number="asnDetailButton.oneRNumber" placeholder="请输入数量" style="width: 250px"/>
</el-form-item>
<el-form-item label="库位" prop="oneRPoint" :rules="[
{ required: true, message: '库位不能为空'}
]"
>
<el-select v-model="asnDetailButton.oneRPoint" value-key="id" placeholder="请选择库位" style="width: 250px">
<el-option
v-for="(item,index) in pointOptions"
:key="item.id+''+item.code"
:label="item.code"
:value="item"
>
</el-option>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dyrkTf = false">取 消</el-button>
<el-button type="primary" @click="rkAndQxButtonM(2)">确认</el-button>
</div>
</el-dialog>
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0"
:title="crud.status.title" width="400px"
>
<el-form ref="form" :rules="asnDetailRules" :model="form" size="small" label-width="80px"
style="height: 200px"
>
<el-form-item label="物料" prop="item" style="float: left">
<el-select v-model="form.item" value-key="id" filterable placeholder="请选择品番" style="width: 200px;"
@change="getPointList(form.item,$event.code,asn)"
clearable
>
<el-option
v-for="item in itemOptions"
:key="item.id"
:label="item.code"
:value="item"
>
<span style="float: left">{{ item.code }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="订单数量" prop="orderQty" style="float: left">
<el-input v-model="form.orderQty" style="width: 200px;"/>
</el-form-item>
<el-form-item v-if="pointTF" label="库位" prop="point" style="float: left">
<el-select v-model="form.point" value-key="id" filterable placeholder="请选择库位" clearable
style="width: 200px;"
>
<el-option
v-for="item in pointOptions"
:key="item.id"
:label="item.code"
:value="item"
/>
</el-select>
</el-form-item>
<el-form-item v-if="viewPropC1" label="批次号" prop="propC1" style="float: left">
<el-input v-model="form.propC1" style="width: 200px;"/>
</el-form-item>
<el-form-item v-if="viewPropC2" label="序列号" prop="propC2" style="float: left">
<el-input v-model="form.propC2" style="width: 200px;"/>
</el-form-item>
<el-form-item label="备注" prop="remark" style="float: left">
<el-input type="textarea" :rows="2" v-model="form.remark" style="width: 200px;"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
</div>
</el-dialog>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;"
@selection-change="crud.selectionChangeHandler" :height="crud.tableHeight"
@selection-change="crud.selectionChangeHandler" height="35vh"
>
<el-table-column type="selection" width="55"/>
<el-table-column prop="item.code " label="品番号" width="100px">
@ -263,7 +170,8 @@
<div>{{ scope.row.remark }}</div>
</template>
</el-table-column>
<el-table-column v-if="checkPer(['admin','asnDetail:edit','asnDetail:del'])" label="操作" width="150px"
<el-table-column v-if="checkPer(['admin','asnDetail:edit','asnDetail:del'])" label="操作"
width="150px"
align="center"
>
<template slot-scope="scope">
@ -275,8 +183,108 @@
</el-table-column>
</el-table>
<!--分页组件-->
<div style="float: right">
<pagination/>
</el-card>
</div>
</el-tab-pane>
</el-tabs>
</el-dialog>
<!-- 单一入库 -->
<el-dialog title="单一入库" :visible.sync="dyrkTf" width="500px">
<!-- <el-dialog-->
<!-- width="30%"-->
<!-- title="内层 Dialog"-->
<!-- :visible.sync="innerVisible"-->
<!-- append-to-body>-->
<!-- </el-dialog>-->
<el-form ref="formdyrk" :model="asnDetailButton" label-width="80px">
<el-form-item label="数量" prop="oneRNumber" :rules="[
{ required: true, message: '数量不能为空'},
{ type: 'number', message: '数量必须为数字值'}
]"
>
<el-input v-model.number="asnDetailButton.oneRNumber" placeholder="请输入数量" style="width: 250px"/>
</el-form-item>
<el-form-item label="库位" prop="oneRPoint" :rules="[
{ required: true, message: '库位不能为空'}
]"
>
<el-select v-model="asnDetailButton.oneRPoint" value-key="id" placeholder="请选择库位"
style="width: 250px">
<el-option
v-for="(item,index) in pointOptions"
:key="item.id+''+item.code"
:label="item.code"
:value="item"
>
</el-option>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="dyrkTf = false">取 消</el-button>
<el-button type="primary" @click="rkAndQxButtonM(2)">确认</el-button>
</div>
</el-dialog>
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0"
:title="crud.status.title" width="400px"
>
<el-form ref="form" :rules="asnDetailRules" :model="form" size="small" label-width="80px"
style="height: 200px"
>
<el-form-item label="物料" prop="item" style="float: left">
<el-select v-model="form.item" value-key="id" filterable placeholder="请选择品番" style="width: 200px;"
@change="getPointList(form.item,$event.code,asn)"
clearable
>
<el-option
v-for="item in itemOptions"
:key="item.id"
:label="item.code"
:value="item"
>
<span style="float: left">{{ item.code }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="订单数量" prop="orderQty" style="float: left">
<el-input v-model="form.orderQty" style="width: 200px;"/>
</el-form-item>
<el-form-item v-if="pointTF" label="库位" prop="point" style="float: left">
<el-select v-model="form.point" value-key="id" filterable placeholder="请选择库位" clearable
style="width: 200px;"
>
<el-option
v-for="item in pointOptions"
:key="item.id"
:label="item.code"
:value="item"
/>
</el-select>
</el-form-item>
<el-form-item v-if="viewPropC1" label="批次号" prop="propC1" style="float: left">
<el-input v-model="form.propC1" style="width: 200px;"/>
</el-form-item>
<el-form-item v-if="viewPropC2" label="序列号" prop="propC2" style="float: left">
<el-input v-model="form.propC2" style="width: 200px;"/>
</el-form-item>
<el-form-item label="备注" prop="remark" style="float: left">
<el-input type="textarea" :rows="2" v-model="form.remark" style="width: 200px;"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="crud.cancelCU">取消</el-button>
<el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
</div>
</el-dialog>
</div>
</template>
@ -300,6 +308,7 @@ import crudAsn from '@/api/asn'
import {queryBomAccountList} from '@/api/bomAccount'
import {mapGetters} from "vuex";
const defaultForm = {
id: null,
asn: null,
@ -337,7 +346,15 @@ const asnQuery = {
}
export default {
name: 'viewAsnDetail',
components: { DateRangePicker, AsnTask, Search, pagination, crudOperation, rrOperation, udOperation },
components: {
DateRangePicker,
AsnTask,
Search,
pagination,
crudOperation,
rrOperation,
udOperation
},
mixins: [presenter(), header(), form(defaultForm), crud()],
dicts: ['asn_status'],
cruds() {
@ -345,7 +362,7 @@ export default {
title: '收货数据',
url: 'api/asnDetail',
idField: 'id',
query: { asnId: 0 },
query: {asnId: this.asnFrom == null ? 0 : this.asnFrom.id},
sort: 'id,desc',
crudMethod: {...crudAsnDetail},
optShow: {
@ -357,19 +374,6 @@ export default {
}
})
},
created() {
//判断是否有数据
this.crud.query = asnQuery
let ids = this.$route.query.ids
if (ids != null) {
this.crud.query.asnId = ids
this.asnId = ids
} else {
this.crud.query.asnId = 0
this.asnId = 0
}
this.crud.refresh()
},
computed: {
...mapGetters([
'baseApi'
@ -377,6 +381,14 @@ export default {
},
data() {
return {
fullscreen: false,
activeName: 'first',
dialogInsertAsn: false,
isResizing: false,
initialWidth: 0,
initialHeight: 0,
initialX: 0,
initialY: 0,
fileList: [],
headers: {'Authorization': getToken()},
permission: {
@ -393,6 +405,9 @@ export default {
}],
billType: [{
required: true, message: '单据类型不能为空', trigger: 'blur'
}],
code: [{
required: true, message: '凭证号不能为空', trigger: 'blur'
}]
},
asnDetailRules: {
@ -469,6 +484,7 @@ export default {
// clearInterval(this.clearTimeSet);
// },
mounted() {
//查询公用的下拉数据
this.getOnceOptionAll()
//判断是否是新增主表和是查看明细新政附表
@ -487,6 +503,23 @@ export default {
this.asnTF()
return true
},
queryAsnDetail(ansId) {
this.asnFrom.id = ansId
this.crud.query = {asnId: ansId}
this.crud.toQuery()
},
handleClick(tab, event) {
},
handleClose(done) {
// 清空表单数据
this.asnFrom = {};
// 清空表格数据
this.crud.data = [];
//还原默认值
this.fullscreen = false
// 执行关闭操作
done();
},
setTime() { //设置定时器
// this.clearTimeSet=setInterval(() => {
// this.asnTF();
@ -500,7 +533,8 @@ export default {
const day = date.getDate().toString().padStart(2, '0')
//存当前时间
this.asnFrom.orderDate = `${year}-${month}-${day}`
},
}
,
//查询库位
getPointList(itObj, code, data) {
console.log(itObj)
@ -540,7 +574,8 @@ export default {
this.pointOptions = re
})
}
},
}
,
//过滤重复数据
filterListObj(listObj) {
let date = []
@ -557,7 +592,8 @@ export default {
}
})
return date
},
}
,
//查询公用的下拉数据
getOnceOptionAll() {
//物料数据
@ -579,7 +615,8 @@ export default {
this.billTypeOptions = res
})
},
}
,
//判断是否是新增主表和是查看明细新政附表
asnTF() {
@ -600,7 +637,8 @@ export default {
} else {
this.getNewDate()
}
},
}
,
//新增主表数据
submitFromAsn(data) {
//校验
@ -612,16 +650,21 @@ export default {
//加载数据
this.asnTF()
this.$message.success('添加成功')
// this.crud.toQuery()
this.$router.push({ path: '/business-asn/viewAsnDetail', query: { ids: res.id } })
this.crud.toQuery()
//this.$router.push({path: '/business-asn/viewAsnDetail', query: {ids: res.id}})
})
} else {
return false
}
})
},
}
,
rkAndQxButtonM(num) {
if (num === 1) { //整单入库
console.log()
if (this.asnFrom.id <= 0) {
this.crud.notify('请先提交入库单', CRUD.NOTIFICATION_TYPE.ERROR)
}
this.logining1 = true
let data = this.asnDetailButton
data.button = num
@ -666,7 +709,8 @@ export default {
this.logining3 = false
})
}
},
}
,
//单一入库
dyrkM(data) {
this.detailId = data[0].id;
@ -674,19 +718,22 @@ export default {
console.log(data[0].item.code)
this.getPointList(null, data[0].item.code, this.asn)
this.asnDetailButton.asnDetailData = data[0]
},
}
,
//取消收货
qxshM(data) {
this.asnDetailButton.asnDetailDataS = data
this.rkAndQxButtonM(3)
},
}
,
handleSuccess(response, file, fileList) {
this.crud.notify('上传成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
this.$refs.upload.clearFiles()
this.crud.status.add = CRUD.STATUS.NORMAL
this.crud.resetForm()
this.crud.toQuery()
},
}
,
// 监听上传失败
handleError(e, file, fileList) {
const msg = JSON.parse(e.message)
@ -702,5 +749,9 @@ export default {
</script>
<style scoped>
.vue-draggable-resizable {
border: 1px solid #ccc;
background-color: white;
box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
}
</style>