zhongtianhaoyuan преди 3 години
родител
ревизия
d87327e5f4
променени са 2 файла, в които са добавени 14 реда и са изтрити 7 реда
  1. 2 2
      config/index.js
  2. 12 5
      pages/erpbusiness/sm/sm.vue

+ 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.117:8090/',
 	// baseUrlNew: 'http://api1.eliangeyun.com/',
 	h5Appid: 'wxb66b599f7f61b46f',
 	debug: false

+ 12 - 5
pages/erpbusiness/sm/sm.vue

@@ -44,12 +44,12 @@
 					去初检
 				</view>
 				<view class="but_css" @click="skip(2)"
-					v-if="getRoles('acquisitionQuality.again') && (status == '已初检'|| status == '已复检')">去复检</view>
+					v-if="getRoles('acquisitionQuality.again') && !payStatus && (status == '已初检'|| status == '已复检')">去复检</view>
 				<view class="but_css" @click="skip(3)"
 					v-if="getRoles('acquisitionWeight.mao') && weightStatus != '已称皮重' && (weightStatus == '已质检'|| weightStatus == '已称毛重')">
 					去称毛重</view>
 				<view class="but_css" @click="skip(4)"
-					v-if="getRoles('acquisitionWeight.weight') && (weightStatus == '已称毛重' || weightStatus == '已称皮重')">
+					v-if="getRoles('acquisitionWeight.weight') && !payStatus && (weightStatus == '已称毛重' || weightStatus == '已称皮重')">
 					去称皮重
 				</view>
 				<view class="but_css" @click="skip(5)"
@@ -91,6 +91,7 @@
 				weightStatus: "", //检斤状态
 				qualityNo: "",
 				confirm: "", //确认初检确认状态
+				payStatus:"",//结算状态
 				detailData: {},
 				userName: "", //仓库负责人
 				companyId: "",
@@ -112,17 +113,20 @@
 			//#ifdef APP-PLUS
 			this.user.title = options.data.split(',')[2]
 			this.user.companyId = options.data.split(',')[1]
-			this.compId = options.data.split(",")[1]
+			this.compId = options.data
 			this.qualityNo = _list[1]
 			this.cangid = _list[2]
 			//#endif
 		},
 		onShow() {
 			// this.compId = "2710b21efc1e4393930c5dc800010dc4"
-			// this.qualityNo = "SGRK202112040001"
-			// this.cangid = "1c9949fa0dc04c5e84f9bea9c809856c"
+			// this.qualityNo = "SGRK202112200080001"
+			// this.cangid = "715d87adeea548cc9a70d03f72952816"
 			console.log("查看",this.qualityNo,this.compId,this.cangid)
 			if (this.cangid) { //判断是在哪扫码进入的
+				if(this.compId.indexOf(",") != -1){
+					this.compId = this.compId.split(",")[1]
+				}
 				this.show = false
 				this.show1 = true
 				this.companyId = uni.getStorageSync('pcUserInfo').compId
@@ -149,6 +153,8 @@
 							})
 						}
 					}).catch(res => {});
+				}else{
+				    this.$api.msg('当前身份不可操作!')
 				}
 			} else {//邀请客户
 				this.show = true
@@ -179,6 +185,7 @@
 						this.status = this.detailData.qualityInspectionManagement.status
 						this.confirm = this.detailData.qualityInspectionManagement.confirm
 						this.weightStatus = this.detailData.status
+						this.payStatus = this.detailData.paymentManagement.approveStatus
 					})
 					.catch(res => {
 						if (res.message) {