ccjgmwz пре 3 година
родитељ
комит
5325db9be3
3 измењених фајлова са 35 додато и 8 уклоњено
  1. 2 2
      config/index.js
  2. 9 6
      pages/erpbusiness/add_quality_testing.vue
  3. 24 0
      pages/user/report.vue

+ 2 - 2
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
 }

+ 9 - 6
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) {

+ 24 - 0
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>