ccjgmwz 3 lat temu
rodzic
commit
2bd2e7bfb9

+ 2 - 2
config/index.js

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

+ 2 - 2
manifest.json

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

+ 3 - 5
pages/erpbusiness/edit_quality_testing.vue

@@ -99,7 +99,7 @@
 					<input v-model='gridList.dryGrainPrice' placeholder="请输入干粮单价" name="input"></input>
 				</view>
 			</view>
-			<view class="c-row-fj" v-if="flag==2">
+			<view class="c-row-fj" v-if="flag==2||flag==1">
 				<view style="margin: 0px 0px 30rpx 10rpx;">复检备注</view>
 					<textarea class='textarea-style' v-model='gridList.reMemo' placeholder="请输入复检备注" maxlength="300"></textarea>
 			</view>
@@ -378,10 +378,8 @@
 			},
 			alertBtn() {
 				var that = this
-				this.$api.doRequest('post', '/qualityInspectionManagement/api/editQualityInspection', {
-					id: this.id,
-					flag:2
-				}).then(res => {
+				that.gridList.flag = 2
+				this.$api.doRequest('post', '/qualityInspectionManagement/api/editQualityInspection',that.gridList).then(res => {
 					if(res.data.code=="200"){
 						that.gridList.flag=1
 						that.$api.doRequest('post', '/qualityInspectionManagement/api/editQualityInspection', that.gridList).then(res => {

+ 1 - 1
pages/erpbusiness/quality_testing.vue

@@ -63,7 +63,7 @@
 						@click.stop='edit(item,0)' class='button'>初检</view>
 					<view
 						v-if='getRoles("acquisitionQuality.con")&&item.confirm!="1"&&item.status=="已复检"&&managementType==1'
-						@click.stop='edit(item,1)' class='button'>确认</view>
+						@click.stop='edit(item,2)' class='button'>确认</view>
 					<view v-if='getRoles("acquisitionQuality.again")&&item.confirm!="1"&&managementType==1'
 						@click.stop='edit(item,1)' class='button'>复检</view>
 					<view v-if='getRoles("acquisitionQualityOut.edit")&&item.status=="已称毛重"&&managementType==3'