ssff

api/user.js

@@ -658,3 +658,41 @@ export function mfExamine(data) {
 		data
 	});
 }
+/**
+ * 不良品审核
+ * @param {Object} data
+ */
+export function noExamine(data) {
+	console.log(data)
+	return request({
+		url: `${functions.getDomain()}/api/no-examine`,
+		method: "post",
+		data
+	});
+}
+
+/**
+ * 下线审核
+ * @param {Object} data
+ */
+export function xxExamine(data) {
+	console.log(data)
+	return request({
+		url: `${functions.getDomain()}/api/xx-examine`,
+		method: "post",
+		data
+	});
+}
+
+/**
+ * 下线详情
+ * @param {Object} data
+ */
+export function offlineDetail(data) {
+	console.log(data)
+	return request({
+		url: `${functions.getDomain()}/api/offline-detail`,
+		method: "get",
+		data
+	});
+}

pages/assembleInfo/assembleInfo.vue

@@ -88,7 +88,7 @@
 				</view>
 				<view class="cyxj-content-card" v-else>
 					<view class="tx-ul">
-						<view class="tx-title"><text v-if="value.val" style="color: #007AFF;margin-right: 30upx;">规格:  {{value.val}}</text> {{ value.title }}</view>
+						<view class="tx-title"><text v-if="value.val" style="color: #007AFF;margin-right: 30upx;">规格: {{value.val}} ±{{((value.top - value.bottom)/2).toFixed(2)}}</text> {{ value.title }}</view>
 						<view class="tx-in-nav">
 							<view>{{value.bottom}}</view>
 							<input :class="value.inputState==false?'re-bor':''" :disabled="type==2?true:false" type="number" @input="inputListener($event,index, idx)" v-model="value.input"

pages/badProduct/badProduct.vue

@@ -58,8 +58,11 @@
 			<image src="../../static/jia.png"></image>
 			<text>添加</text>
 		</view>
-		<view class="submit-btn"><button :disabled="buttonState==false?true:false" type="primary"
+		<view class="submit-btn" ><button :disabled="buttonState==false?true:false" type="primary"
 				@tap="submit">提交</button></view>
+		<view class="submit-btn" v-if="ifEdit!=0"><button :disabled="buttonState==false?true:false" type="primary"
+				@tap="examine">
+				审核</button></view>		
 	</view>
 </template>
 
@@ -69,7 +72,8 @@
 		badReasons
 	} from '../../api/index.js';
 	import {
-		noDetail
+		noDetail,
+		noExamine
 	} from "../../api/user.js";
 	export default {
 		onLoad(e) {
@@ -125,6 +129,20 @@
 					frequency: 0
 				});
 			},
+			examine(){
+				this.$functions.confirm("是否进行此操作?").then(() => {
+					noExamine({id: this.planInfo.n_id,status:1,remark:''}).then(res=>{
+						
+					}).then(res => {
+						this.$functions.success('审核成功').then(() => {
+							uni.navigateBack();
+						})
+					}).catch(res => {
+						this.buttonState = true;
+					});
+				})
+				
+			},
 			getInfo() {
 				noDetail({
 					plan_id: this.planInfo.plan_id

pages/hardwareInfo/hardwareInfo.vue

@@ -105,7 +105,7 @@
 				</view>
 				<view class="cyxj-content-card" v-else>
 					<view class="tx-ul">
-						<view class="tx-title"><text v-if="value.val" style="color: #007AFF;margin-right: 30upx;">规格:  {{value.val}}</text> {{ value.title }}</view>
+						<view class="tx-title"><text v-if="value.val" style="color: #007AFF;margin-right: 30upx;">规格:  {{value.val}} ±{{((value.top - value.bottom)/2).toFixed(2)}}</text> {{ value.title }}</view>
 						<view class="tx-in-nav">
 							<view>{{value.bottom}}</view>
 							<input :class="value.inputState==false?'re-bor':''" :disabled="type==2?true:false" type="number" @input="inputListener($event,index, idx)" v-model="value.input"

pages/offLine/offLine.vue

@@ -74,7 +74,8 @@
 
 		</view>
 		<view class="submit-btn">
-			<button type="primary" :disabled="buttonState==false?true:false" @tap="offLine()">提交</button>
+			<button type="primary" v-if="CyInfo.o_id==null" :disabled="buttonState==false?true:false" @tap="offLine()">提交</button>
+			<button type="primary" v-if="CyInfo.o_id!=null" :disabled="buttonState==false?true:false" @tap="offLineExam()">审核</button>
 		</view>
 	</view>
 </template>
@@ -83,6 +84,7 @@
 	import {
 		offline
 	} from "../../api/index.js"
+	import {offlineDetail,xxExamine} from "../../api/user.js"
 	export default {
 		data() {
 			return {
@@ -110,6 +112,10 @@
 		onLoad(e) {
 			this.from.plan_id = e.plan_id;
 			this.CyInfo = JSON.parse(decodeURIComponent(e.planInfo));
+			console.log("是三手11",e)
+			if(e.type==2){
+				this.getDetail()
+			}
 		},
 		methods: {
 			bindline: function(e) {
@@ -126,6 +132,11 @@
 			bindmouldIds(e) {
 				this.mouldIds = e.target.value
 			},
+			getDetail(){
+				offlineDetail({id:this.CyInfo.o_id}).then(res=>{
+					this.from=res
+				})
+			},
 			offLine() {
 				
 				this.from.frequency=this.CyInfo.frequency
@@ -140,6 +151,17 @@
 					console.log("失败", this.from);
 					this.buttonState = true;
 				});
+			},
+			offLineExam(){
+				this.$functions.confirm("是否进行此操作?").then(() => {
+					xxExamine({id: this.CyInfo.o_id,status:1,remark:''}).then(res => {
+						this.$functions.success('提交成功').then(() => {
+							uni.navigateBack();
+						})
+					}).catch(res => {
+						this.buttonState = true;
+					});
+				})
 			}
 		}
 	}

pages/sprayInfo/sprayInfo.vue

@@ -89,7 +89,7 @@
 				</view>
 				<view class="cyxj-content-card" v-else>
 					<view class="tx-ul">
-						<view class="tx-title"><text v-if="value.val" style="color: #007AFF;margin-right: 30upx;">规格:  {{value.val}}</text> {{ value.title }}</view>
+						<view class="tx-title"><text v-if="value.val" style="color: #007AFF;margin-right: 30upx;">规格:  {{value.val}} ±{{((value.top - value.bottom)/2).toFixed(2)}}</text> {{ value.title }}</view>
 						<view class="tx-in-nav">
 							<view>{{value.bottom}}</view>
 							<input :class="value.inputState==false?'re-bor':''" :disabled="type==2?true:false" type="number" @input="inputListener($event,index, idx)" v-model="value.input"

pages/stampingInspectionInfo/stampingInspectionInfo.vue

@@ -70,7 +70,7 @@
 				</view>
 				<view class="cyxj-content-card" v-else>
 					<view class="tx-ul">
-						<view class="tx-title"><text v-if="value.val" style="color: #007AFF;margin-right: 30upx;">规格:  {{value.val}}</text> {{ value.title }}  </view>
+						<view class="tx-title"><text v-if="value.val" style="color: #007AFF;margin-right: 30upx;">规格:  {{value.val}} ±{{((value.top - value.bottom)/2).toFixed(2)}}</text> {{ value.title }}  </view>
 						<view class="tx-in-nav">
 							<view>{{value.bottom}}</view>
 							<input :class="value.inputState==false?'re-bor':''" :disabled="type==2?true:false" type="number" @input="inputListener($event,index, idx)" v-model="value.input"

pages/stampingRecordList/index.scss

@@ -62,6 +62,7 @@
 		@include wh(690upx,auto);
 		margin-top: 30upx;
 		@include flex(center,flex-start);
+		flex-wrap: wrap;
 		border-top: 1upx solid #F1F1F1;
 		padding-top: 30upx;
 		

pages/stampingRecordList/stampingRecordList.vue

@@ -38,11 +38,12 @@
 				</view>
 			</view>
 			<view class="btn-grounp">
-				<view :class="item.status!=1?'':'dis-btn'" v-if="" @tap="openLine(item.plan_id,item)">开线</view>
-				<view class="btn-tx" @tap="stopLine(item)">停线</view>
-				<view v-if="item.status==1" class="btn-xx" @tap="offLine(item.plan_id,item)">下线</view>
-				<view class="btn-blp" @tap="badProduct(item)">不良品统计</view>
-				<view class="btn-back" @tap="rework(item)">返修</view>
+				<view :class="item.status!=1?'':'dis-btn'" v-if="isMenu(59)" @tap="openLine(item.plan_id,item)">开线</view>
+				<view class="btn-tx" v-if="isMenu(61)" @tap="stopLine(item)">停线</view>
+				<view v-if="item.status==1&&item.o_id==null&&isMenu(52)" class="btn-xx" @tap="offLine(item.plan_id,item)">下线</view>
+				<view v-if="item.o_id!=null&&isMenu(55)" class="btn-xx" @tap="offLineExeam(item)">下线审核</view>
+				<view class="btn-blp" v-if="isMenu(53)" @tap="badProduct(item)">不良品统计</view>
+				<view class="btn-back" v-if="isMenu(56)" @tap="rework(item)">返修</view>
 			</view>
 		</view>
 		<uni-popup ref="popup" type="center">
@@ -84,7 +85,8 @@
 		openLine,
 		trtj,
 		putInDetail,
-		noDetail
+		noDetail,
+		xxExamine
 	} from "../../api/user.js";
 	import {
 		mapGetters,
@@ -94,12 +96,15 @@
 	export default {
 		computed: {
 			...mapGetters(['userInfo', 'roleType'])
+		
 		},
 		onLoad() {
 
+			this.power = this.userInfo.power
+			this.getTime()
 			this.getArr();
 			this.isMenu();
-			this.getTime()
+			
 		},
 		onShow() {
 			this.getData()
@@ -124,21 +129,18 @@
 		},
 		methods: {
 			getArr() {
-				let newArr = this.power.map(item => {
-					if (item.children) {
-
-						item.children.map(items => {
-							this.jurisdiction.push(items.title)
-							return items
-						})
-					}
-
-				})
-				console.log("xinshuzu", this.jurisdiction)
-			},
-			isMenu(title) {
-				return this.jurisdiction.includes(title);
-			},
+							if (this.power.length > 0) {
+								let newArr = this.power.map(item => {
+									this.jurisdiction.push(item.id)
+								})
+								
+							}	
+						console.log("id",this.jurisdiction)
+						},
+						isMenu(id) {
+							
+							return this.jurisdiction.includes(id);
+						},
 			// bindline: function(e) {
 			// 	this.froms.frequency = e.target.value
 			// },
@@ -196,6 +198,11 @@
 					url: `../badProduct/badProduct?badProduct=${encodeURIComponent(JSON.stringify(item))}`
 				});
 			},
+			offLineExeam(item){
+				uni.navigateTo({
+					url: `../offLine/offLine?planInfo=${encodeURIComponent(JSON.stringify(item))}&type=2`
+				});
+			},
 			rework(item) {
 				uni.navigateTo({
 					url: `../rework/rework?badProduct=${encodeURIComponent(JSON.stringify(item))}`

pages/tcqInfo/index.scss

@@ -440,7 +440,7 @@
 				@include fonts(24upx,#666,400);
 			}
 			.tx-in-nav{
-				width:500upx;
+				width:250upx;
 				@include flex(center,space-between);
 				input{
 					//width: 200upx;

pages/tcqInfo/tcqInfo.vue

@@ -88,7 +88,7 @@
 				</view>
 				<view class="cyxj-content-card" v-else>
 					<view class="tx-ul">
-						<view class="xx-title" style="font-size: 26upx;">规格:{{ value.spec }}</view>
+						<view class="xx-title" style="font-size: 26upx;color: #007AFF;">规格:{{ value.spec }} ±{{((value.top - value.bottom)/2).toFixed(2)}}</view>
 						<view class="tx-in-nav">
 							<view>{{value.bottom}}</view>
 							<input :class="value.inputState==false?'re-bor':''" :disabled="type==2?true:false"

unpackage/cache/wgt/__UNI__E896C30/manifest.json

@@ -1 +1 @@
-{"@platforms":["android","iPhone","iPad"],"id":"__UNI__E896C30","name":"Erp","version":{"name":"1.0.0","code":"100"},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"light","background":"#007aff"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"distribute":{"google":{"permissions":["<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-feature android:name=\"android.hardware.camera\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"],"packagename":"uni.UNIE896C30","password":"","aliasname":"","keystore":"html5plus://test","custompermissions":true},"apple":{"devices":"universal"},"plugins":{"ad":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}},"orientation":["portrait-primary"],"icons":{"ios":{"prerendered":"false","iphone":{"app@2x":"","app@3x":"","spotlight@2x":"","spotlight@3x":"","settings@2x":"","settings@3x":"","notification@2x":"","notification@3x":""},"appstore":"","ipad":{"app":"","app@2x":"","proapp@2x":"","spotlight":"","spotlight@2x":"","settings":"","settings@2x":"","notification":"","notification@2x":""}},"android":{"hdpi":"icon-android-hdpi.png","xhdpi":"icon-android-xhdpi.png","xxhdpi":"icon-android-xxhdpi.png","xxxhdpi":"icon-android-xxxhdpi.png"}},"splashscreen":{}},"allowsInlineMediaPlayback":true,"safearea":{"background":"#FFFFFF","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"3.2.3","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"backgroundColor":"#FFFFFF","color":"#C3C3C3","selectedColor":"#419CFF","list":[{"pagePath":"pages/index/index","text":"首页","iconPath":"./static/shouye-g.png","selectedIconPath":"./static/shouye.png"},{"pagePath":"pages/user/user","text":"我的","iconPath":"./static/wode-g.png","selectedIconPath":"./static/wode.png"}],"borderStyle":"rgba(0,0,0,0.4)","height":"50px","child":["lauchwebview"],"selected":0},"launch_path":"__uniappview.html","adid":"120101120012"}}
+{"@platforms":["android","iPhone","iPad"],"id":"__UNI__E896C30","name":"Erp","version":{"name":"1.0.0","code":"100"},"description":"","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"light","background":"#007aff"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"distribute":{"google":{"permissions":["<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-feature android:name=\"android.hardware.camera\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"],"packagename":"uni.UNIE896C30","password":"","aliasname":"","keystore":"html5plus://test","custompermissions":true},"apple":{"devices":"universal"},"plugins":{"ad":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}},"orientation":["portrait-primary"],"icons":{"ios":{"prerendered":"false","iphone":{"app@2x":"","app@3x":"","spotlight@2x":"","spotlight@3x":"","settings@2x":"","settings@3x":"","notification@2x":"","notification@3x":""},"appstore":"","ipad":{"app":"","app@2x":"","proapp@2x":"","spotlight":"","spotlight@2x":"","settings":"","settings@2x":"","notification":"","notification@2x":""}},"android":{"hdpi":"icon-android-hdpi.png","xhdpi":"icon-android-xhdpi.png","xxhdpi":"icon-android-xxhdpi.png","xxxhdpi":"icon-android-xxxhdpi.png"}},"splashscreen":{}},"allowsInlineMediaPlayback":true,"safearea":{"background":"#FFFFFF","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"3.2.3","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"backgroundColor":"#FFFFFF","color":"#C3C3C3","selectedColor":"#419CFF","list":[{"pagePath":"pages/index/index","text":"首页","iconPath":"./static/shouye-g.png","selectedIconPath":"./static/shouye.png"},{"pagePath":"pages/user/user","text":"我的","iconPath":"./static/wode-g.png","selectedIconPath":"./static/wode.png"}],"borderStyle":"rgba(0,0,0,0.4)","height":"50px","child":["lauchwebview"],"selected":0},"launch_path":"__uniappview.html"}}