需求修改

This commit is contained in:
2024-06-06 18:26:25 +08:00
parent 371736a109
commit 1493f62889
7 changed files with 344 additions and 115 deletions

View File

@@ -3,21 +3,16 @@
<nav-bar :title="crType === 'IN' ? '入库' : '出库'"></nav-bar>
<view class="search-confirm-wrap">
<view class="zd-row">
<view class="zd-col-19 zd-row">
<view class="zd-col-10"><search-box v-model="val1" /></view>
<view class="zd-col-10 select_wraper">
<view class="zd-col-24 zd-row jcflexstart">
<view class="zd-col-8"><search-box v-model="val1" /></view>
<view class="zd-col-8 select_wraper mgl10">
<zxz-uni-data-select placeholder="请选择仓库名称" v-model="value1" filterable :localdata="range1"></zxz-uni-data-select>
</view>
<!-- <view class="zd-col-7 select_wraper">
<uni-data-select
placeholder="请选择状态"
v-model="value"
:localdata="range"
></uni-data-select>
</view> -->
<button class="confirm-button" @tap="toSearch">查询</button>
<view v-if="crType === 'OUT'" class="zd-col-8 select_wraper mgl10">
<zxz-uni-data-select placeholder="请选择仓管员" v-model="value2" filterable :localdata="range2"></zxz-uni-data-select>
</view>
</view>
<!-- <button class="confirm-button" :class="{'confirm-button_disabled': checkArr1.length === 0 || btnActive1}" :disabled="disabled1" @tap="toSure">单据审核</button> -->
<button class="confirm-button" @tap="toSearch">查询</button>
<button class="confirm-button" :class="{'confirm-button_disabled': checkArr1.length === 0}" :disabled="disabled1" @tap="toSure">单据审核</button>
</view>
</view>
@@ -37,6 +32,7 @@
<view class="zd-col-2 zd-th nowrap"><text>业务日期</text></view>
<view class="zd-col-2 zd-th nowrap"><text>操作日期</text></view>
<view class="zd-col-2 zd-th"><text>操作人</text></view>
<view v-if="crType === 'OUT'" class="zd-col-2 zd-th"><text>仓管员</text></view>
<view class="zd-col-2 zd-th">更多</view>
</view>
<view class="zd-td-wraper" v-for="(e, i) in dataList1" :key="e.id">
@@ -50,62 +46,75 @@
<view class="zd-col-2 zd-td"><text>{{e.zzmc}}</text></view>
<view class="zd-col-2 zd-td"><text>{{e.ckmc}}</text></view>
<view class="zd-col-2 zd-td"><text class="fontbg1">{{e.djzt}}</text></view>
<view class="zd-col-2 zd-td nowrap"><text>{{e.cjsj}}</text></view>
<view class="zd-col-2 zd-td"><text>{{e.cjsj}}</text></view>
<view class="zd-col-2 zd-td"><text>{{e.cjr}}</text></view>
<view class="zd-col-2 zd-td nowrap"><text>{{e.ywrq}}</text></view>
<view class="zd-col-2 zd-td nowrap"><text>{{e.update_time}}</text></view>
<view class="zd-col-2 zd-td"><text>{{e.ywrq}}</text></view>
<view class="zd-col-2 zd-td"><text>{{e.update_time}}</text></view>
<view class="zd-col-2 zd-td"><text>{{e.update_name}}</text></view>
<view v-if="crType === 'OUT'" class="zd-col-2 zd-td"><text>{{e.cgymc}}</text></view>
<view class="zd-col-2 zd-td" @tap.stop="getDetails(1,e)">
<uni-icons type="more-filled" size="14" color="#fff"></uni-icons>
</view>
</view>
<!-- 二级表格start -->
<view v-if="pkId === e.djid" class="zd-sec-wraper">
<view class="zd-row zd-sec-th-wraper">
<view class="zd-col-1 zd-sec-th"><text>序号</text></view>
<view class="zd-col-1 zd-sec-th"><text>选择</text></view>
<view class="zd-col-2 zd-sec-th"><text>仓库名称</text></view>
<view class="zd-col-2 zd-sec-th"><text>物料编</text></view>
<view class="zd-col-3 zd-sec-th"><text>物料名称</text></view>
<view class="zd-col-1 zd-sec-th"><text>单位</text></view>
<view class="zd-col-2 zd-sec-th"><text>库位</text></view>
<view class="zd-col-1 zd-sec-th"><text>数量</text></view>
<view class="zd-col-2 zd-sec-th"><text>{{crType === 'IN'? '已入数量':'已出数量'}}</text></view>
<view class="zd-col-2 zd-sec-th"><text>剩余数量</text></view>
<view class="zd-col-2 zd-sec-th"><text>库存</text></view>
<view class="zd-col-2 zd-sec-th"><text>操作人</text></view>
<view class="zd-col-2 zd-sec-th"><text>操作日期</text></view>
<view class="zd-col-1 zd-sec-th"><text>更多</text></view>
<view v-if="pkId === e.djid" class="zd-sec-wraper pd0">
<view class="table-wrap">
<table class="grid-table">
<thead>
<tr>
<th></th>
<th>选择</th>
<th>仓库名称</th>
<th>物料编号</th>
<th>物料名称</th>
<th>单位</th>
<th>库位</th>
<th>数量</th>
<th>{{crType === 'IN'? '已入数量':'已出数量'}}</th>
<th>剩余数量</th>
<th>库存</th>
<th>操作人</th>
<th v-if="crType === 'OUT'">仓管员</th>
<th>操作日期</th>
<th>更多</th>
</tr>
</thead>
<tbody>
<tr v-for="(el, j) in dataList2" :key="el.id">
<td>{{j+1}}</td>
<td @tap="toCheck2(el)">
<view class="zd-row jcenter">
<view class="zd-checkbox" :class="{'zd-checkbox_active': el.checked}"></view>
</view>
</td>
<td>{{el.ckmc}}</td>
<td>{{el.wlbm}}</td>
<td>{{el.wlmc}}</td>
<td>{{el.jldw}}</td>
<td>{{el.kwbm}}</td>
<td>{{el.sl}}</td>
<td>{{el.czsl}}</td>
<td>{{el.sysl}}</td>
<td>{{el.kcsl}}</td>
<td>{{el.update_name}}</td>
<td v-if="crType === 'OUT'">{{el.cgymc}}</td>
<td>{{el.update_time}}</td>
<td @tap.stop="getDetails(2,el)">
<uni-icons type="more-filled" size="14" color="#fff"></uni-icons>
</td>
</tr>
</tbody>
</table>
</view>
<view class="zd-row zd-td-wraper" v-for="(el, j) in dataList2" :key="el.id">
<view class="zd-col-1 zd-sec-td"><text>{{j+1}}</text></view>
<view class="zd-col-1 zd-sec-td" @tap="toCheck2(el)"><view class="zd-checkbox" :class="{'zd-checkbox_active': el.checked}"></view></view>
<view class="zd-col-2 zd-sec-td"><text>{{el.ckmc}}</text></view>
<view class="zd-col-2 zd-sec-td"><text>{{el.wlbm}}</text></view>
<view class="zd-col-3 zd-sec-td"><text>{{el.wlmc}}</text></view>
<view class="zd-col-1 zd-sec-td nowrap"><text>{{el.jldw}}</text></view>
<view class="zd-col-2 zd-sec-td"><text>{{el.kwbm}}</text></view>
<view class="zd-col-1 zd-sec-td"><text>{{el.sl}}</text></view>
<view class="zd-col-2 zd-sec-td"><text>{{el.czsl}}</text></view>
<view class="zd-col-2 zd-sec-td"><text>{{el.sysl}}</text></view>
<view class="zd-col-2 zd-sec-td"><text>{{el.kcsl}}</text></view>
<view class="zd-col-2 zd-sec-td"><text>{{el.update_name}}</text></view>
<view class="zd-col-2 zd-sec-td nowrap"><text>{{el.update_time}}</text></view>
<view class="zd-col-1 zd-sec-td" @tap.stop="getDetails(2,el)">
<uni-icons type="more-filled" size="14" color="#fff"></uni-icons>
<view class="zd-row jcflexstart mgt20 mgb20">
<view class="zd-col-1 zd-row jcenter mgl52">
<view class="zd-checkbox" :class="{'zd-checkbox_active': checkArrActive}" @tap="selectAll"></view>
</view>
</view>
<view class="zd-row jcenter mgt20 mgb20">
<view class="zd-col-22 zd-row">
<view class="zd-col-1 zd-row jcenter">
<view class="zd-checkbox" :class="{'zd-checkbox_active': checkArrActive}" @tap="selectAll"></view>
</view>
<view class="zd-col-11 zd-row jcflexstart">
<button class="confirm-button" :class="{'confirm-button_disabled': checkArr2.length === 0}" @tap="kuwConfirm">{{crType === 'IN' ? '入库' : '出库'}}</button>
</view>
<view class="zd-col-12 zd-row jcflexend">
<button class="confirm-button" :class="{'confirm-button_disabled': checkArr2.length === 0}" @tap="kuwConfirm">{{crType === 'IN' ? '入库' : '出库'}}</button>
<view class="zd-col-10">
<!-- <view class="zd-col-12 zd-row jcflexend">
<pagination :total="totalCount2" :page-size="queryParams2.pageSize" :current-page="currentPage2" @page-change="handlePageChange2" />
</view>
</view> -->
</view>
</view>
</view>
@@ -175,7 +184,8 @@
import ScanInput from '@/components/ScanInput.vue'
import Pagination from '@/components/Pagination.vue'
import GridDetail from '@/components/GridDetail.vue'
import {getWarehouseInfo, easOutInBillPage, easOutInBillDetailPage, easOutInBillUpdate, easOutInBillDetailUpdate, queryInventoryInfo} from '@/utils/getData2.js'
// import {getWarehouseInfo, getUserInfo} from '@/utils/mork2.js'
import {getWarehouseInfo, getUserInfo, easOutInBillPage, easOutInBillDetailPage, easOutInBillUpdate, easOutInBillDetailUpdate, queryInventoryInfo} from '@/utils/getData2.js'
export default {
components: {
NavBar,
@@ -206,7 +216,7 @@
currentPage1: 1,
totalCount2: 0,
queryParams2:{
pageSize: 10,
pageSize: 500,
pageNum: 1
},
currentPage2: 1,
@@ -219,10 +229,10 @@
checkArr3: [],
delShow: false,
detailObj: {},
value: '',
range:[{value: 1, text: '提交'}, {value: 2, text: '审核'}],
value1: '',
range1: []
range1: [],
value2: '',
range2: []
};
},
onShow() {
@@ -240,6 +250,7 @@
},
created () {
this._getWarehouseInfo()
this._getUserInfo()
},
methods: {
// 仓库下拉框
@@ -254,6 +265,17 @@
this.toSearch()
}
},
// 仓管员下拉框
async _getUserInfo () {
let res = await getUserInfo()
if (res.code === 1) {
this.range2 = [...res.result]
this.range2.map(e => {
this.$set(e, 'text', e.cgymc)
this.$set(e, 'value', e.cgybm)
})
}
},
// 查询一级表格
toSearch () {
this.queryParams1 = {
@@ -267,7 +289,7 @@
},
// 一级表格接口
async _easOutInBillPage () {
let res = await easOutInBillPage(this.val1, this.id, this.value, this.value1, this.queryParams1.pageNum + '', this.queryParams1.pageSize + '')
let res = await easOutInBillPage(this.val1, this.id, this.value1, this.value2, this.queryParams1.pageNum + '', this.queryParams1.pageSize + '')
if (res.code === 1) {
this.checkArr1 = []
res.result.map(el => {
@@ -325,7 +347,7 @@
this.dataList2 = []
if (this.pkId === e.djid) {
this.queryParams2 = {
pageSize: 10,
pageSize: 500,
pageNum: 1
}
this.currentPage2 = 1
@@ -504,7 +526,7 @@
this.disabled2 = false
this.show = false
this.queryParams2 = {
pageSize: 10,
pageSize: 500,
pageNum: 1
}
this.currentPage2 = 1