diff --git a/pages/WarehouseManage/CheckDtl.vue b/pages/WarehouseManage/CheckDtl.vue
index 2c2ae04..6f71210 100644
--- a/pages/WarehouseManage/CheckDtl.vue
+++ b/pages/WarehouseManage/CheckDtl.vue
@@ -63,7 +63,7 @@
{{el.struct_name}} |
{{el.material_code}} |
{{el.material_name}} |
- |
+ |
{{el.quanlity_in_box}} |
{{el.check_result}} |
{{el.check_optname}} |
@@ -82,6 +82,20 @@
+
+
+
+ 备注
+
+
+
+
+
+
+
+
+
+
@@ -96,22 +110,35 @@
},
data() {
return {
+ modelShow: false,
+ rkvalue: '222',
value: '1',
+ val0: '',
val1: '',
val2: '',
val3: '',
checkCode: '',
dataList: [],
+ dataList : [{
+ checked: false,
+ storagevehicle_code: '1',
+ status: '1',
+ net_qty: '1',
+ sect_name: '1',
+ struct_name: '1',
+ material_code: '1',
+ material_name: '1',
+ remark: '3342',
+ }],
checkArr: [],
- disabled1: false
+ disabled1: false,
+ obj: {}
};
},
created () {
},
onLoad (option) {
this.checkCode = option.checkcode
- this.val2 = option.checknum
- this.val3 = option.unchecknum
// this._checkQueryDtl()
},
methods: {
@@ -123,6 +150,19 @@
handleChange (e) {
this._checkQueryDtl(e)
},
+ toRemark (e) {
+ this.val0 = e.remark
+ this.obj = e
+ this.modelShow = true
+ },
+ toSurerk () {
+ this.modelShow = false
+ this.dataList.map(el => {
+ if (this.obj.storagevehicle_code === el.storagevehicle_code) {
+ el.remark = this.val0
+ }
+ })
+ },
toXq (code) {
uni.navigateTo({
url: '/pages/WarehouseManage/Details?storagevehicle_code=' + code + '&checkcode=' + this.checkCode
@@ -134,7 +174,9 @@
},
/** 初始化查询 */
async _checkQueryDtl () {
- let res = await checkQueryDtl(this.checkCode, this.val1, this.val2, this.val3)
+ let res = await checkQueryDtl(this.checkCode, this.val1)
+ this.val2 = res.check_num
+ this.val3 = res.uncheck_num
res.data.map(el => {
this.$set(el, 'checked', false)
})
@@ -186,4 +228,81 @@
// // left 89rpx
// // z-index 102
// // box-shadow 1px 0 2px rgba(0,0,0,.12)
+ .msg_wrapper
+ position fixed
+ top 0
+ bottom 0
+ left 0
+ right 0
+ text-align center
+ z-index 10000
+ &::after
+ content ""
+ display inline-block
+ height 100%
+ width 0
+ vertical-align middle
+ .msg_box
+ display inline-block
+ width calc(100% - 30rpx)
+ padding 30rpx
+ vertical-align middle
+ background-color #fff
+ border-radius 8rpx
+ border 1px solid #ebeef5
+ font-size 36rpx
+ box-shadow 0 2px 12px 0 rgb(0 0 0 / 10%)
+ text-align left
+ overflow hidden
+ backface-visibility hidden
+ .buttonbox
+ width 100px
+ height 30px
+ margin-top 20px
+ margin 0 auto
+ .mask
+ position fixed
+ top 0
+ left 0
+ width 100%
+ height 100%
+ opacity .6
+ background #000
+ z-index 9999
+ .msg_item
+ display flex
+ justify-content: space-between
+ align-items: center
+ width 100%
+ height 80rpx
+ line-height 80rpx
+ margin 0 auto
+ margin-bottom 14rpx
+ .label_item
+ display inline-block
+ width 180rpx
+ font-size 32rpx
+ line-height inherit
+ color #606266
+ .from_item
+ display inline-block
+ width calc(100% - 200rpx)
+ line-height inherit
+ .msg_input
+ width 100%
+ height 80rpx
+ padding 0 30rpx
+ border-radius 4px
+ border 1px solid #DCDFE6
+ font-size 28rpx
+ line-height 80rpx
+ color #606266
+ .msg_btns
+ width 600rpx
+ height 70rpx
+ line-height 70rpx
+ margin 40rpx auto 0
+ display flex
+ justify-content: center
+ align-items: center
diff --git a/utils/getData1.js b/utils/getData1.js
index ba1ae01..8243e9e 100644
--- a/utils/getData1.js
+++ b/utils/getData1.js
@@ -258,13 +258,11 @@ export const checkQuery = (ccode, sid) => request({
// let res = {data:[{"base_qty":"1","check_id":"1611290097423093760","checkdtl_id":"1611290097481814016","remark":"","check_optname":"","check_result":"","storagevehicle_code":"441510009000030@MX221127050","check_code":"PD20230106005","qty_unit_name":"箱","sect_name":"虚拟区","struct_name":"01排0011列-01层","material_name":"铜箔|双面光|6微米","fac_qty":"","status":"生成","material_code":"741011000000075","check_time":""},{"base_qty":"1","check_id":"1611290097423093760","checkdtl_id":"1611290097490202624","remark":"","check_optname":"","check_result":"","storagevehicle_code":"441510009000037@MX221127065","check_code":"PD20230106005","qty_unit_name":"箱","sect_name":"虚拟区","struct_name":"01排0012列-01层","material_name":"铜箔|双面光|6微米","fac_qty":"","status":"生成","material_code":"741011000000075","check_time":""},{"base_qty":"1","check_id":"1611290097423093760","checkdtl_id":"1611290097494396928","remark":"","check_optname":"","check_result":"","storagevehicle_code":"441510009000037@MX221127058","check_code":"PD20230106005","qty_unit_name":"箱","sect_name":"虚拟区","struct_name":"01排0013列-01层","material_name":"铜箔|双面光|6微米","fac_qty":"","status":"生成","material_code":"741011000000075","check_time":""},{"base_qty":"1","check_id":"1611290097423093760","checkdtl_id":"1611290097502785536","remark":"","check_optname":"","check_result":"","storagevehicle_code":"441510009000037@MX221127064","check_code":"PD20230106005","qty_unit_name":"箱","sect_name":"虚拟区","struct_name":"01排0014列-01层","material_name":"铜箔|双面光|6微米","fac_qty":"","status":"生成","material_code":"741011000000075","check_time":""},{"base_qty":"1","check_id":"1611290097423093760","checkdtl_id":"1611290097506979840","remark":"","check_optname":"","check_result":"","storagevehicle_code":"441510009000037@MX221127063","check_code":"PD20230106005","qty_unit_name":"箱","sect_name":"虚拟区","struct_name":"01排0015列-01层","material_name":"铜箔|双面光|6微米","fac_qty":"","status":"生成","material_code":"741011000000075","check_time":""},{"base_qty":"1","check_id":"1611290097423093760","checkdtl_id":"1611290097515368448","remark":"","check_optname":"","check_result":"","storagevehicle_code":"441510009000042@MX221126002","check_code":"PD20230106005","qty_unit_name":"箱","sect_name":"虚拟区","struct_name":"01排0016列-01层","material_name":"铜箔|双面光|6微米","fac_qty":"","status":"生成","material_code":"741011000000075","check_time":""},{"base_qty":"1","check_id":"1611290097423093760","checkdtl_id":"1611290097523757056","remark":"","check_optname":"","check_result":"","storagevehicle_code":"441510009000042@MX221126000","check_code":"PD20230106005","qty_unit_name":"箱","sect_name":"虚拟区","struct_name":"01排0017列-01层","material_name":"铜箔|双面光|6微米","fac_qty":"","status":"生成","material_code":"741011000000075","check_time":""},{"base_qty":"1","check_id":"1611290097423093760","checkdtl_id":"1611290097527951360","remark":"","check_optname":"","check_result":"","storagevehicle_code":"441510009000042@MX221126001","check_code":"PD20230106005","qty_unit_name":"箱","sect_name":"虚拟区","struct_name":"01排0018列-01层","material_name":"铜箔|双面光|6微米","fac_qty":"","status":"生成","material_code":"741011000000075","check_time":""},{"base_qty":"1","check_id":"1611290097423093760","checkdtl_id":"1611290097536339968","remark":"","check_optname":"","check_result":"","storagevehicle_code":"441510009000061@MX221227000009","check_code":"PD20230106005","qty_unit_name":"箱","sect_name":"虚拟区","struct_name":"01排0019列-01层","material_name":"铜箔|双面光|6微米","fac_qty":"","status":"生成","material_code":"741011000000075","check_time":""},{"base_qty":"1","check_id":"1611290097423093760","checkdtl_id":"1611290097540534272","remark":"","check_optname":"","check_result":"","storagevehicle_code":"441510009000061@MX221231000015","check_code":"PD20230106005","qty_unit_name":"箱","sect_name":"虚拟区","struct_name":"01排0020列-01层","material_name":"铜箔|双面光|6微米","fac_qty":"","status":"生成","material_code":"741011000000075","check_time":""}],"message":"查询成功!"}
// return res
// }
-export const checkQueryDtl = (ccode, bno, checknum, unchecknum) => request({
+export const checkQueryDtl = (ccode, bno) => request({
url: 'api/pda/check/checkQueryDtl',
data: {
check_code: ccode,
- box_no: bno,
- check_num: checknum,
- uncheck_num: unchecknum
+ box_no: bno
}
})