Browse Source

前端gjy

gjy 3 years ago
parent
commit
0a7cb85c22

+ 2 - 2
config/index.js

@@ -1,9 +1,9 @@
 const dev = {
 const dev = {
 	baseUrl: 'https://www.zthymaoyi.com',
 	baseUrl: 'https://www.zthymaoyi.com',
-	// baseUrlNew: 'http://192.168.1.120:8090/',
+	baseUrlNew: 'http://192.168.1.120:8090/',
 	// baseUrlNew: 'http://192.168.1.103:9100/',
 	// baseUrlNew: 'http://192.168.1.103:9100/',
 	// baseUrlNew: 'https://apitest.eliangeyun.com/',
 	// baseUrlNew: 'https://apitest.eliangeyun.com/',
-	baseUrlNew: 'http://api1.eliangeyun.com/',
+	// baseUrlNew: 'http://api1.eliangeyun.com/',
 	// baseUrlNew: 'http://api1.eliangeyun.com/',
 	// baseUrlNew: 'http://api1.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 	debug: false

+ 1 - 1
pages/erpbusiness/acquisitionInspection/acquisitionInspection.vue

@@ -29,7 +29,7 @@
 							<view class="bottom">{{item.updateDate}}</view>
 							<view class="bottom">{{item.updateDate}}</view>
 						</view>
 						</view>
 					</view>
 					</view>
-					<view class="right">{{item.customer}}</view>
+					<view class="right">{{item.secretaryWeigher}}</view>
 				</view>
 				</view>
 				<view class="row2" v-if="item.paymentManagement">
 				<view class="row2" v-if="item.paymentManagement">
 					<view>{{item.paymentManagement.customerName}}</view>
 					<view>{{item.paymentManagement.customerName}}</view>

+ 1 - 2
pages/erpbusiness/quality_testing.vue

@@ -41,8 +41,7 @@
 						</view>
 						</view>
 					</view>
 					</view>
 					<view class="right">{{item.customer}}</view>
 					<view class="right">{{item.customer}}</view>
-					<view v-if='item.status=="已质检"' class='right'>{{item.qualityInspector}}</view>
-					<view v-else></view>
+					<view class='right'>{{item.qualityInspector}}</view>
 				</view>
 				</view>
 				<view class="row2" >
 				<view class="row2" >
 					<view v-if='managementType==1'>{{item.customerName}}</view>
 					<view v-if='managementType==1'>{{item.customerName}}</view>