Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

config/index.js

@@ -1,7 +1,7 @@
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
-	baseUrlNew: 'http://192.168.1.107:8090/',
-	// baseUrlNew: 'http://api1.eliangeyun.com/',
+	// baseUrlNew: 'http://192.168.1.107:8090/',
+	baseUrlNew: 'http://api1.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

pages/erpbusiness/add_quality_testing.vue

@@ -330,12 +330,15 @@
 			waterContentChange() {
 				var that = this
 				if(this.gridList.goodsName && this.cangid){
-					this.$api.doRequest('get', '/purchasePrice/dryGrainPrice',{
-						warehouseId:this.cangid,
-						goodsName:this.gridList.goodsName
-					}).then(res => {
-						that.gridList.dryGrainPrice = res.data.data
-					})
+					if(!this.gridList.dryGrainPrice||this.gridList.dryGrainPrice == 0){
+						this.$api.doRequest('get', '/purchasePrice/dryGrainPrice',{
+							warehouseId:this.cangid,
+							goodsName:this.gridList.goodsName
+						}).then(res => {
+							that.gridList.dryGrainPrice = res.data.data
+						})
+					}
+					
 				}
 				
 				if (this.gridList.goodsName) {

pages/erpbusiness/index.vue

@@ -78,15 +78,15 @@
 						url: '/pages/erpbusiness/quality_testing?managementType=1',
 						show: true
 					},
-					{
-						num: 2,
-						name: '收购检斤',
-						// icon: 'cuIcon-copy',
-						src:'../../static/img/erp/shougoujianjin@3x.png',
-						tips: 0,
-						url: '/pages/erpbusiness/acquisitionInspection/acquisitionInspection',
-						show: true
-					}
+					// {
+					// 	num: 2,
+					// 	name: '收购检斤',
+					// 	// icon: 'cuIcon-copy',
+					// 	src:'../../static/img/erp/shougoujianjin@3x.png',
+					// 	tips: 0,
+					// 	url: '/pages/erpbusiness/acquisitionInspection/acquisitionInspection',
+					// 	show: false
+					// }
 					// {
 					// 	num: 5,
 					// 	name: '设置',
@@ -98,15 +98,15 @@
 					// }
 				],
 				gridList1: [
-					{
-						num: 0,
-						name: '出库检斤',
-						// icon: 'cuIcon-apps',
-						src:'../../static/img/erp/chukujianjin@3x.png',
-						tips: 0,
-						url: '/pages/erpbusiness/acquisitionInspection/warehouseWeighing',
-						show: true
-					},
+					// {
+					// 	num: 0,
+					// 	name: '出库检斤',
+					// 	// icon: 'cuIcon-apps',
+					// 	src:'../../static/img/erp/chukujianjin@3x.png',
+					// 	tips: 0,
+					// 	url: '/pages/erpbusiness/acquisitionInspection/warehouseWeighing',
+					// 	show: false
+					// },
 					{
 						num: 1,
 						name: '出库质检',

pages/user/report.vue

@@ -0,0 +1,24 @@
+<template>
+    <web-view :src="url"></web-view>
+</template>
+
+<script>
+	export default {
+        data() {
+            return {
+                url:"https://datav.aliyuncs.com/share/235518097ffd673bc1eb05011b9a02b6"
+            }
+        },
+        onLoad: function(option) {
+            // this.url = option.url;
+        },
+        methods: {
+        }
+    }
+</script>
+    
+
+
+<style>
+
+</style>