zhongtianhaoyuan 2 лет назад
Родитель
Сommit
75607fb646
3 измененных файлов с 16 добавлено и 4 удалено
  1. 1 1
      config/index.js
  2. 14 3
      pages/erpbusiness/add_quality_testing.vue
  3. 1 0
      pages/user/report.vue

+ 1 - 1
config/index.js

@@ -3,7 +3,7 @@ const dev = {
 	// baseUrl: 'http://localhost:8080/',
 	// baseUrlNew: 'http://192.168.110.67:9100/',
 	// baseUrlNew: 'http://192.168.1.118:8090/',
-	// baseUrlNew: 'http://192.168.110.9:9888/',
+	// baseUrlNew: 'http://192.168.110.9:9100/',
 	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// baseUrlNew: 'http://192.168.110.82:8099/',
 	 // baseUrlNew: 'http://192.168.110.82:8090/',

+ 14 - 3
pages/erpbusiness/add_quality_testing.vue

@@ -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() {

+ 1 - 0
pages/user/report.vue

@@ -830,6 +830,7 @@
 							this.moneyList = res.data.data[i].biViewInfoList
 							console.log('收入', this.moneyList)
 						} 
+						this.$forceUpdate()
 					}
 					this.chartlist = _list
 					// this.scroll()