需求修改

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,13 +3,13 @@
<nav-bar title="收货确认"></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">
<zxz-uni-data-select placeholder="请选择仓库名称" v-model="value1" filterable :localdata="range1"></zxz-uni-data-select>
<view class="zd-col-24 zd-row jcflexstart">
<view class="zd-col-7"><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>
<button class="confirm-button" @tap="toSearch">查询</button>
</view>
<button class="confirm-button" @tap="toSearch">查询</button>
</view>
</view>
<view class="zd-row jcflexstart table-title_wraper">收货确认</view>
@@ -124,17 +124,15 @@
</tbody>
</table>
</view>
<view class="zd-row jcenter mgt10 mgb20">
<view class="zd-col-21 zd-row jcenter">
<view v-if="pkObj.djzt !== '审核后'" class="zd-col-1 zd-row jcenter">
<view class="zd-checkbox" :class="{'zd-checkbox_active': checkArrActive}" @tap="selectAll"></view>
</view>
<view v-if="pkObj.djzt !== '审核后'" class="zd-col-11 zd-row jcflexstart">
<button class="confirm-button" :class="{'confirm-button_disabled': checkArr.length === 0}" :disabled="disabled" @tap="_receiptBillConfirm">确认收货</button>
</view>
<view class="zd-col-12 zd-row jcflexend">
<view v-if="pkObj.djzt !== '审核后'" class="zd-row jcflexstart mgt10 mgb20">
<view class="zd-col-1 zd-row jcenter mgl52">
<view class="zd-checkbox" :class="{'zd-checkbox_active': checkArrActive}" @tap="selectAll"></view>
</view>
<button class="confirm-button" :class="{'confirm-button_disabled': checkArr.length === 0}" :disabled="disabled" @tap="_receiptBillConfirm">确认收货</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>
@@ -171,7 +169,7 @@
import ScanInput from '@/components/ScanInput.vue'
import Pagination from '@/components/Pagination.vue'
import GridDetail from '@/components/GridDetail.vue'
import {getWarehouseInfo, receiptPage, receiptBillPage, receiptBillUpdate, receiptBillConfirm} from '@/utils/getData2.js'
import {getWarehouseInfo, getOrganizationInfo, receiptPage, receiptBillPage, receiptBillUpdate, receiptBillConfirm} from '@/utils/getData2.js'
export default {
components: {
NavBar,
@@ -214,6 +212,7 @@
},
created () {
this._getWarehouseInfo()
this._getOrganizationInfo()
},
methods: {
// 仓库下拉框
@@ -225,7 +224,18 @@
this.$set(e, 'text', e.ckmc)
this.$set(e, 'value', e.ckbm)
})
this.range1 = [...this.range]
this.toSearch()
}
},
// 组织信息下拉框
async _getOrganizationInfo () {
let res = await getOrganizationInfo()
if (res.code === 1) {
this.range1 = [...res.result]
this.range1.map(e => {
this.$set(e, 'text', e.kczzmc)
this.$set(e, 'value', e.kczzbm)
})
this.toSearch()
}
},