ccj 2 yıl önce
ebeveyn
işleme
cf3e4c7610
3 değiştirilmiş dosya ile 5 ekleme ve 5 silme
  1. 2 2
      config/index.js
  2. 2 2
      manifest.json
  3. 1 1
      pages/erpbusiness/quality_testing.vue

+ 2 - 2
config/index.js

@@ -4,13 +4,13 @@ const dev = {
 	// baseUrlNew: 'http://192.168.110.67:9100/',
 	// baseUrlNew: 'http://192.168.1.118:8090/',
 	// baseUrlNew: 'http://192.168.110.9:9100/',
-	baseUrlNew: 'http://192.168.110.138:8090/',
+	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// baseUrlNew: 'http://192.168.110.82:8099/',
 	 // baseUrlNew: 'http://192.168.110.82:8090/',
 	// baseUrlNew: 'http://192.168.110.202:8090/',
 	// baseUrlNew: 'http://192.168.110.138:8090/',
 	// 上传图片的
-	// baseUrlNew: 'https://api2.eliangeyun.com/',
+	baseUrlNew: 'https://api2.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false
 }

+ 2 - 2
manifest.json

@@ -2,8 +2,8 @@
     "name" : "易粮易运",
     "appid" : "__UNI__7297DA2",
     "description" : "易粮易运——为天下粮食人服务的App",
-    "versionName" : "2.1.144",
-    "versionCode" : 21144,
+    "versionName" : "2.1.145",
+    "versionCode" : 21145,
     "transformPx" : false,
     /* SDK配置 */
     "quickapp" : {},

+ 1 - 1
pages/erpbusiness/quality_testing.vue

@@ -68,7 +68,7 @@
 						@click.stop='del(item)' class='button'>删除</view>
 					<view v-if='getRoles("acquisitionQuality.qview")&&item.status=="待初检"&&managementType==1'
 							@click.stop='edit(item,3)' class='button'>钎样</view>
-					<view v-if='getRoles("acquisitionQuality.initial")&&item.status=="待初检"&&managementType==1'
+					<view v-if='getRoles("acquisitionQuality.initial")&&(!item.waterContent||item.status=="待初检")&&managementType==1'
 						@click.stop='edit(item,0)' class='button'>初检</view>
 					<view
 						v-if='getRoles("acquisitionQuality.con")&&item.confirm!="1"&&item.status=="已复检"&&managementType==1'