root/pad-nl-three-uni
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

同步

Browse Source
This commit is contained in:
蔡玲
2024-11-25 10:03:21 +08:00
parent 8852de5c11
commit c70c544b20
5 changed files with 77 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/style/layout.css
View File

@@ -97,7 +97,7 @@ uni-toast .uni-toast {
background-color: #e1e1e1; background-color: #e1e1e1;
} }
.confirm-button{ .confirm-button{
min-width: 80px; min-width: 65px;
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
color: #fff; color: #fff;

29
pages/management/alloc-maintenance_new.vue
View File

@@ -3,16 +3,19 @@
<nav-bar title="调拨维护"></nav-bar> <nav-bar title="调拨维护"></nav-bar>
<view class="search-confirm-wrap"> <view class="search-confirm-wrap">
<view class="zd-row"> <view class="zd-row">
<view class="zd-col-24 zd-row jcflexstart"> <view class="zd-col-15 zd-row jcflexstart">
<view class="zd-col-7"><search-box placeholder="请输入查询条件" v-model="val1" /></view> <view class="zd-col-10"><search-box placeholder="输入查询条件" v-model="val1" /></view>
<view class="zd-col-8 select_wraper mgl10"> <view class="zd-col-7 select_wraper mgl10">
<zxz-uni-data-select placeholder="选择调出组织信息" v-model="value2" filterable :localdata="range1"></zxz-uni-data-select> <zxz-uni-data-select placeholder="选择调出组织信息" v-model="value2" filterable :localdata="range1"></zxz-uni-data-select>
</view> </view>
<view class="zd-col-8 select_wraper mgl10"> <view class="zd-col-7 select_wraper mgl10">
<zxz-uni-data-select placeholder="选择调入组织信息" v-model="value1" filterable :localdata="range1"></zxz-uni-data-select> <zxz-uni-data-select placeholder="选择调入组织信息" v-model="value1" filterable :localdata="range1"></zxz-uni-data-select>
</view> </view>
</view> </view>
<button class="confirm-button" @tap="toSearch">查询</button> <view class="zd-col-9 zd-row jcflexend">
<button class="confirm-button" @tap="toSearch">查询</button>
<button class="confirm-button" :disabled="disabled1" @tap="_easOutInBillSync">同步</button>
</view>
</view> </view>
</view> </view>
<view class="zd-row jcflexstart table-title_wraper">调拨单</view> <view class="zd-row jcflexstart table-title_wraper">调拨单</view>
@@ -151,7 +154,7 @@
import ScanInput from '@/components/ScanInput.vue' import ScanInput from '@/components/ScanInput.vue'
import Pagination from '@/components/Pagination.vue' import Pagination from '@/components/Pagination.vue'
import GridDetail from '@/components/GridDetail.vue' import GridDetail from '@/components/GridDetail.vue'
import {getWarehouseInfo, getOrganizationInfo, allocationPage, allocationBillDetail, allocationBillConfirm, allocationBillDetailUpdate} from '@/utils/getData2.js' import {getWarehouseInfo, getOrganizationInfo, allocationPage, allocationBillDetail, allocationBillConfirm, allocationBillDetailUpdate, easOutInBillSync} from '@/utils/getData2.js'
export default { export default {
components: { components: {
NavBar, NavBar,
@@ -405,6 +408,20 @@
getDetails (type,e) { getDetails (type,e) {
this.delShow = !this.delShow this.delShow = !this.delShow
this.detailObj = {type: type, data:e} this.detailObj = {type: type, data:e}
},
// 同步
async _easOutInBillSync () {
this.disabled1 = true
try {
let res = await easOutInBillSync('ALLO')
uni.showToast({
title: res.desc,
icon: 'none'
})
this.disabled1 = false
} catch (e) {
this.disabled1 = false
}
} }
} }
} }

36
pages/management/in-storage_new.vue
View File

@@ -3,7 +3,7 @@
<nav-bar :title="crType === 'IN' ? '入库' : '出库'"></nav-bar> <nav-bar :title="crType === 'IN' ? '入库' : '出库'"></nav-bar>
<view class="search-confirm-wrap"> <view class="search-confirm-wrap">
<view class="zd-row"> <view class="zd-row">
<view class="zd-col-24 zd-row jcflexstart"> <view class="zd-col-13 zd-row jcflexstart">
<view :class="crType === 'OUT' ? 'zd-col-10' : 'zd-col-16'"><search-box placeholder="输入查询条件" v-model="val1" /></view> <view :class="crType === 'OUT' ? 'zd-col-10' : 'zd-col-16'"><search-box placeholder="输入查询条件" v-model="val1" /></view>
<view class="select_wraper mgl10":class="crType === 'OUT' ? 'zd-col-8' : 'zd-col-16'"> <view class="select_wraper mgl10":class="crType === 'OUT' ? 'zd-col-8' : 'zd-col-16'">
<zxz-uni-data-select placeholder="选择仓库" v-model="value1" filterable :localdata="range1"></zxz-uni-data-select> <zxz-uni-data-select placeholder="选择仓库" v-model="value1" filterable :localdata="range1"></zxz-uni-data-select>
@@ -12,10 +12,13 @@
<zxz-uni-data-select placeholder="选择仓管员" v-model="value2" filterable :localdata="range2"></zxz-uni-data-select> <zxz-uni-data-select placeholder="选择仓管员" v-model="value2" filterable :localdata="range2"></zxz-uni-data-select>
</view> </view>
</view> </view>
<button class="confirm-button" @tap="toSearch">查询</button> <view class="zd-col-11 zd-row jcflexend">
<button class="confirm-button" :class="{'confirm-button_disabled': !subCheckData.length}" @tap="showPop(2, '', '')">库位分配</button> <button class="confirm-button" @tap="toSearch">查询</button>
<button class="confirm-button" :class="{'confirm-button_disabled': !subCheckData.length}" @tap="inWarehouseSure">库存提交</button> <button class="confirm-button" :disabled="disabled1" @tap="_easOutInBillSync">同步</button>
<button class="confirm-button" :class="{'confirm-button_disabled': checkData.length === 0}" :disabled="disabled1" @tap="_easOutInBillUpdate">单据审核</button> <button v-if="id !== 'CGRKD'" class="confirm-button" :class="{'confirm-button_disabled': !subCheckData.length}" @tap="showPop(2, '', '')">库位分配</button>
<button v-if="id !== 'CGRKD'" class="confirm-button" :class="{'confirm-button_disabled': !subCheckData.length}" @tap="inWarehouseSure">库存提交</button>
<button class="confirm-button" :class="{'confirm-button_disabled': checkData.length === 0}" :disabled="disabled1" @tap="_easOutInBillUpdate">单据审核</button>
</view>
</view> </view>
</view> </view>
<view class="zd-row jcflexstart table-title_wraper">{{title}}</view> <view class="zd-row jcflexstart table-title_wraper">{{title}}</view>
@@ -93,7 +96,8 @@
<view class="zd-checkbox zd-checkbox_i" :class="{'zd-checkbox_active': el.checked}"></view> <view class="zd-checkbox zd-checkbox_i" :class="{'zd-checkbox_active': el.checked}"></view>
</view> </view>
</td> </td>
<td class="underline fontcol1" @tap="showPop(1, e, el)">{{el.wlbm}}</td> <td v-if="id !== 'CGRKD'" class="underline fontcol1" @tap="showPop(1, e, el)">{{el.wlbm}}</td>
<td v-if="id === 'CGRKD'" class="fontcol1">{{el.wlbm}}</td>
<td>{{el.wlmc}}</td> <td>{{el.wlmc}}</td>
<td>{{el.gzhbm}}</td> <td>{{el.gzhbm}}</td>
<td>{{el.ckmc}}</td> <td>{{el.ckmc}}</td>
@@ -196,8 +200,8 @@
import ScanInput from '@/components/ScanInput.vue' import ScanInput from '@/components/ScanInput.vue'
import Pagination from '@/components/Pagination.vue' import Pagination from '@/components/Pagination.vue'
import GridDetail from '@/components/GridDetail.vue' import GridDetail from '@/components/GridDetail.vue'
import {getWarehouseInfo, getUserInfo, easOutInBillPage, easOutInBillDetailPage, viewAssignDtl, inWarehouseAssignLocation, updateAssignDtl, addAssignDtl, inWarehouseCommit, easOutInBillUpdate} from '@/utils/getData2.js' import {getWarehouseInfo, getUserInfo, easOutInBillPage, easOutInBillDetailPage, viewAssignDtl, inWarehouseAssignLocation, updateAssignDtl, addAssignDtl, inWarehouseCommit, easOutInBillUpdate, easOutInBillSync} from '@/utils/getData2.js'
// import {updateAssignDtl, addAssignDtl, inWarehouseCommit, easOutInBillUpdate} from '@/utils/getData2.js' // import {updateAssignDtl, addAssignDtl, inWarehouseCommit, easOutInBillUpdate, easOutInBillSync} from '@/utils/getData2.js'
// import {getWarehouseInfo, getUserInfo, easOutInBillPage, easOutInBillDetailPage, viewAssignDtl, inWarehouseAssignLocation} from '@/utils/mork2.js' // import {getWarehouseInfo, getUserInfo, easOutInBillPage, easOutInBillDetailPage, viewAssignDtl, inWarehouseAssignLocation} from '@/utils/mork2.js'
export default { export default {
components: { components: {
@@ -497,6 +501,7 @@
}) })
this.popdisabled = false this.popdisabled = false
} catch (e) { } catch (e) {
this.popdisabled = false
} }
}, },
// 点击单据审核按钮 // 点击单据审核按钮
@@ -529,6 +534,21 @@
getDetails (type,e) { getDetails (type,e) {
this.delShow = !this.delShow this.delShow = !this.delShow
this.detailObj = {type: type, data:e} this.detailObj = {type: type, data:e}
},
// 同步
async _easOutInBillSync () {
this.disabled1 = true
try {
let type = this.id === 'CGRKD' ? 'SRMINOUT' : 'EASINOUT'
let res = await easOutInBillSync(type)
uni.showToast({
title: res.desc,
icon: 'none'
})
this.disabled1 = false
} catch (e) {
this.disabled1 = false
}
} }
} }
} }

23
pages/management/receive-confirm_new.vue
View File

@@ -3,13 +3,16 @@
<nav-bar title="收货确认"></nav-bar> <nav-bar title="收货确认"></nav-bar>
<view class="search-confirm-wrap"> <view class="search-confirm-wrap">
<view class="zd-row"> <view class="zd-row">
<view class="zd-row zd-col-14"> <view class="zd-col-14 zd-row jcflexstart">
<view class="zd-col-12"><search-box placeholder="请输入查询条件" v-model="val1" /></view> <view class="zd-col-12"><search-box placeholder="请输入查询条件" v-model="val1" /></view>
<view class="zd-col-12 select_wraper mgl10"> <view class="zd-col-12 select_wraper mgl10">
<zxz-uni-data-select placeholder="请选择收货组织信息" v-model="value1" filterable :localdata="range1"></zxz-uni-data-select> <zxz-uni-data-select placeholder="请选择收货组织信息" v-model="value1" filterable :localdata="range1"></zxz-uni-data-select>
</view> </view>
</view> </view>
<button class="confirm-button" @tap="toSearch">查询</button> <view class="zd-col-10 zd-row jcflexend">
<button class="confirm-button" @tap="toSearch">查询</button>
<button class="confirm-button" :disabled="disabled1" @tap="_easOutInBillSync">同步</button>
</view>
</view> </view>
</view> </view>
<view class="zd-row jcflexstart table-title_wraper">收货确认</view> <view class="zd-row jcflexstart table-title_wraper">收货确认</view>
@@ -210,7 +213,7 @@
import ScanInput from '@/components/ScanInput.vue' import ScanInput from '@/components/ScanInput.vue'
import Pagination from '@/components/Pagination.vue' import Pagination from '@/components/Pagination.vue'
import GridDetail from '@/components/GridDetail.vue' import GridDetail from '@/components/GridDetail.vue'
import {getOrganizationInfo, getWarehouseInfo, receiptPage, receiptBillDetailPage, receiptBillDetailUpdate, receiptBillDetailSetStor, receiptBillConfirm, viewAssignDtl, inWarehouseAssignLocation, updateAssignDtl, addAssignDtl} from '@/utils/getData2.js' import {getOrganizationInfo, getWarehouseInfo, receiptPage, receiptBillDetailPage, receiptBillDetailUpdate, receiptBillDetailSetStor, receiptBillConfirm, viewAssignDtl, inWarehouseAssignLocation, updateAssignDtl, addAssignDtl, easOutInBillSync} from '@/utils/getData2.js'
export default { export default {
components: { components: {
NavBar, NavBar,
@@ -589,6 +592,20 @@
getDetails (type,e) { getDetails (type,e) {
this.delShow = !this.delShow this.delShow = !this.delShow
this.detailObj = {type: type, data:e} this.detailObj = {type: type, data:e}
},
// 同步
async _easOutInBillSync () {
this.disabled1 = true
try {
let res = await easOutInBillSync('RECE')
uni.showToast({
title: res.desc,
icon: 'none'
})
this.disabled1 = false
} catch (e) {
this.disabled1 = false
}
} }
} }
} }

5
utils/getData2.js
View File

@@ -308,3 +308,8 @@ export const stIvtCheckdtlBasedOnFinance = (arr) => request({
url:'api/stIvtCheckdtl/basedOnFinance', url:'api/stIvtCheckdtl/basedOnFinance',
data: arr data: arr
}) })
// 同步
export const easOutInBillSync = (type) => request({
url:'api/easOutInBill/sync',
data: {type: type}
})