|
@@ -377,7 +377,8 @@
|
|
|
</view>
|
|
|
<u-modal v-model="isShowAlert" :title-style="{fontSize: '18px',fontWeight:'500'}"
|
|
|
:content-style="{fontSize: '14px',fontWeight:'400'}" confirm-color='#22C572' confirm-text='确定' title='提示'
|
|
|
- showCancelButton='false' :content="content" @confirm="alertBtn" @cancel="cancelClick"></u-modal>
|
|
|
+ showCancelButton='false' :content="content" @cancel="cancelClick"></u-modal>
|
|
|
+ <!-- @confirm="alertBtn" -->
|
|
|
<u-popup v-model="isShowPrint" class="popup" @close="close" mode="bottom" border-radius="30" :closeable="true">
|
|
|
<view class="buns_item">
|
|
|
<view class="but_css" @click="print">打印小票</view>
|
|
@@ -903,13 +904,23 @@
|
|
|
number = number.substring(number.length - 4, number.length)
|
|
|
this.gridList.qualityNo = 'SGRK' + this.getdate() + this.commonWarehouseNo + number
|
|
|
}
|
|
|
+ uni.showLoading({
|
|
|
+ title: '加载中',
|
|
|
+ mask: true
|
|
|
+ });
|
|
|
this.$api.doRequest('get', '/warehouseBaseInfo/selectContractNoList', {
|
|
|
flag: this.contractFlag,
|
|
|
}).then(res => {
|
|
|
+
|
|
|
if (res.data.data) {
|
|
|
this.contractNolist = res.data.data
|
|
|
+ uni.hideLoading()
|
|
|
}
|
|
|
- })
|
|
|
+
|
|
|
+ }).catch(error => {
|
|
|
+ uni.hideLoading()
|
|
|
+ // this.$emit('on-error', error);
|
|
|
+ });
|
|
|
this.$api.doRequest('get', '/inOutWarehouseTask/selectInOutWarehouseNo', {
|
|
|
flag: this.flag,
|
|
|
warehouseName: this.gridList.warehouseName
|
|
@@ -1050,7 +1061,6 @@
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
this.gridList.goodsNameKey = this.contractNolist[i].goodsNameKey
|
|
|
this.gridList.grade = this.contractNolist[i].grade
|
|
|
this.gridList.inOutType = this.contractNolist[i].inOutType
|
|
@@ -1135,6 +1145,7 @@
|
|
|
}
|
|
|
|
|
|
}
|
|
|
+ this.$forceUpdate()
|
|
|
console.log(this.gridList)
|
|
|
},
|
|
|
print() {
|