ssff

config/config.js

@@ -2,4 +2,4 @@
 export const devDomain = "http://erp.ilechuan.com";
 //export const devDomain = "http://xy.x-embers.com";
 //线上环境域名 
-export const prdDomain = "http://erp.ilechuan.com";
+export const prdDomain = "http://xy.x-embers.com";

pages/assembleBadProdct/assembleBadProdct.vue

@@ -95,11 +95,11 @@
 				status: 1
 			}).then(res => {
 				this.reason = res;
-
+this.getInfo();
 			});
 			const index = this.reason.findIndex((role) => role.id === id)
 			console.log("是三手", this.reason[index])
-			this.getInfo();
+			
 			this.power = this.userInfo.power;
 			this.getArr();
 			this.isMenu();
@@ -107,7 +107,7 @@
 		},
 		data() {
 			return {
-				methodList:["返修","报装"],
+				methodList:["返修","报废"],
 				methodIds:0,
 				type:0,
 				planInfo: {},

pages/assembleRecordList/assembleRecordList.vue

@@ -23,6 +23,11 @@
 						<view>物料编号:</view><text>{{item.product_number}}</text>
 					</view>
 				</view>
+				<view class="card-up-list">
+					<view class="card-up-list-list">
+						<view>生产时间:</view><text>{{item.production}}{{item.week}}</text>
+					</view>
+				</view>
 				<!-- <view class="card-up-list">
 					<view class="card-up-list-list">
 						<view>工时投入:</view><text>{{item.tr?item.tr:'0'}}</text>

pages/badProduct/badProduct.vue

@@ -95,11 +95,11 @@
 				status: 1
 			}).then(res => {
 				this.reason = res;
-
+this.getInfo();
 			});
 			const index = this.reason.findIndex((role) => role.id === id)
 			console.log("是三手", this.reason[index])
-			this.getInfo();
+			
 			this.power = this.userInfo.power;
 			this.getArr();
 			this.isMenu();
@@ -107,7 +107,7 @@
 		},
 		data() {
 			return {
-				methodList:["返修","报装"],
+				methodList:["返修","报废"],
 				methodIds:0,
 				type:0,
 				planInfo: {},
@@ -230,6 +230,7 @@
 				})
 			},
 			submit() {
+				console.log("是三手",this.froms);
 				let params = JSON.parse(JSON.stringify(this.froms));
 				params = params.map(item => {
 					item.reason_no_id = this.reason[item.reasonIndex].id;

pages/offLine/offLine.vue

@@ -23,7 +23,7 @@
 			<view class="list-list">
 				<view class="list-title">班次</view>
 				<view class="list-right">
-					<text>{{CyInfo.line_title==0?'夜班':'白班'}}</text>
+					<text>{{CyInfo.frequency==0?'夜班':'白班'}}</text>
 				</view>
 			</view>		
 		</view>
@@ -132,13 +132,13 @@
 		},
 		methods: {
 			getArr() {
-							if (this.power.length > 0) {
-								let newArr = this.power.map(item => {
-									this.jurisdiction.push(item.id)
-			
-								})
-								
-							}
+				if (this.power.length > 0) {
+					let newArr = this.power.map(item => {
+						this.jurisdiction.push(item.id)
+
+					})
+					
+				}
 			console.log("xinshuzu", this.jurisdiction) 
 							
 						},

pages/rawMaterialList/rawMaterialList.vue

@@ -31,8 +31,8 @@
 			<view class="lists" v-for="(item,index) in list" :key="index">
 				<view class="list-left">
 					<view class="list-left-up">
-						<view class="list-left-up-left">巡检人:{{item.check_name}}</view>
-						<view class="list-left-up-mid">巡检时间:{{item.create_time}}</view>
+						<view class="list-left-up-left">检验人员:{{item.check_name}}</view>
+						<view class="list-left-up-mid">检验时间:{{item.create_time}}</view>
 						<view class="list-left-up-right-ok" v-if="item.result==1">OK</view>
 						<view class="list-left-up-right-no" v-if="item.result==2">NG</view>
 					</view>
@@ -48,12 +48,12 @@
 						</view>
 					</view>
 				</view>
-				<view class="list-right" v-if="list.length==1||index==0">
+				<!-- <view class="list-right" v-if="list.length==1||index==0">
 					首
 				</view>
 				<view class="list-right" v-if="list.length>=2&&list.length-1==index">
 					末
-				</view>
+				</view> -->
 			</view>
 			<view class="submit-btn">
 				<button type="primary" v-if="isMenu(29)" @tap="addRecord(CyInfo)">新增检验记录</button>

pages/repairExeam/repairExeam.vue

@@ -33,6 +33,12 @@
 						</view>
 					</view>
 				</view>
+				<view class="content-box-card-ul-two">
+					<view class="content-box-card-list">
+						<view class="content-box-card-title">不良原因:</view>
+						<text>{{ cyInfo.no_reason }}</text>
+					</view>
+				</view>
 			</view>
 		</view>
 		<view>

pages/repairRecordList/index.scss

@@ -21,7 +21,7 @@
 			.card-up-list-list{
 				@include flex(center,flex-start);
 				view{
-					width:300upx;
+					width:150upx;
 					@include fonts(26upx,#333,500);
 				}
 				text{

pages/sprayBadProdoct/sprayBadProdoct.vue

@@ -92,14 +92,14 @@
 			this.planInfo = JSON.parse(decodeURIComponent(e.badProduct));
 			this.froms[0].plan_id = this.planInfo.plan_id;
 			reasonNo({
-				status: 1
+				status: 2
 			}).then(res => {
 				this.reason = res;
-
+this.getInfo();
 			});
 			const index = this.reason.findIndex((role) => role.id === id)
 			console.log("是三手", this.reason[index])
-			this.getInfo();
+			
 			this.power = this.userInfo.power;
 			this.getArr();
 			this.isMenu();
@@ -107,7 +107,7 @@
 		},
 		data() {
 			return {
-				methodList:["返修","报装"],
+				methodList:["返修","报废"],
 				methodIds:0,
 				type:0,
 				planInfo: {},

pages/sprayRecordList/sprayRecordList.vue

@@ -28,6 +28,11 @@
 						<view>工时投入:</view><text>{{item.tr?item.tr:'0'}}</text>
 					</view>
 				</view> -->
+				<view class="card-up-list">
+					<view class="card-up-list-list">
+						<view>生产时间:</view><text>{{item.production}}{{item.week}}</text>
+					</view>
+				</view>
 				<view class="card-dow-list">
 					<view class="card-up-list-list">
 						<view>班次:</view>

pages/stampingRecordList/stampingRecordList.vue

@@ -23,11 +23,11 @@
 						<view>物料编号:</view><text>{{item.product_number}}</text>
 					</view>
 				</view>
-				<!-- <view class="card-up-list">
+				<view class="card-up-list">
 					<view class="card-up-list-list">
-						<view>工时投入:</view><text>{{item.tr?item.tr:'0'}}</text>
+						<view>生产时间:</view><text>{{item.production}}{{item.week}}</text>
 					</view>
-				</view> -->
+				</view>
 				<view class="card-dow-list">
 					<view class="card-up-list-list">
 						<view>班次:</view>

pages/stopLine/stopLine.vue

@@ -376,16 +376,16 @@
 			};
 		},
 		onLoad(e) {
+			
+			this.CyInfo = JSON.parse(decodeURIComponent(e.planInfo));
+			this.froms.plan_id = this.CyInfo.plan_id;
+			this.crrentReson = "设备维修"
 			this.getReson();
 			this.getDevice();
 			this.getMode()
 			if (e.id) {
 				this.stopId = e.id
 			}
-			this.CyInfo = JSON.parse(decodeURIComponent(e.planInfo));
-			this.froms.plan_id = this.CyInfo.plan_id;
-			this.crrentReson = "设备维修"
-			console.log('picker发送选择改变，携带值为', this.CyInfo)
 			this.getdeviceException(); //获取设备异常现象
 			this.getModeException(); //获取模具异常现象
 			this.getDecYyfx(); //获取设备异常原因分析
@@ -437,7 +437,14 @@
 				})
 			},
 			getStaff() {
-				staff().then(res => {
+				let  position=""
+				if(this.reasonIds=="1"){
+					position="钳工"
+				}
+				if(this.reasonIds=="0"){
+					position="开线员"
+				}
+				staff({position:position}).then(res => {
 					this.staffList = res;
 					this.modestaffList = res;
 
@@ -445,9 +452,8 @@
 				})
 			},
 			getDevice() {
-				device().then(res => {
+				device({line_id:this.CyInfo.line_id}).then(res => {
 					this.deviceNo = res
-					console.log("设备编号11", this.deviceNo)
 				})
 			},
 			getDeviceRepairDescription() {
@@ -483,7 +489,7 @@
 				})
 			},
 			getMode() {
-				mode().then(res => {
+				mode({number:this.CyInfo.product_number}).then(res => {
 					this.mould = res
 					console.log("mode", this.mould)
 				})
@@ -599,7 +605,7 @@
 				if(this.reasonIds=="0"){
 					this.getDecYyfx()
 				}
-
+				this.getStaff() 
 			},
 			bindmouldIds(e, item) {
 				if (item.length > 0) {

pages/user/user.vue

@@ -16,6 +16,14 @@
 				<image class="next-icon"  src="../../static/next.png"></image>
 			</view>
 		</view>
+		<view>
+			<view class="list">
+				<view class="left">
+					<view>版本号</view>
+				</view>
+				<text>{{versionCode}}</text>
+			</view>
+		</view>
 		<button class="logout" type="primary" v-if="userInfo.name" @tap="logout">退出登录</button>
 	</view>
 </template>
@@ -32,11 +40,14 @@
 			
 		},
 		onLoad() {
+			
 		},
 		data() {
 			return {
 				status:0,
 				ifJump:0,
+				versionNo:'',
+				versionCode:'1.0.1'
 			};
 		},methods:{
 			...mapMutations(['setToken', 'setUserInfo']),
@@ -56,6 +67,7 @@
 					complete: () => {}
 				});
 			},
+			
 			logout(){
 				this.$functions.confirm("是否确认退出登录").then(()=>{
 					this.setToken("");
@@ -64,7 +76,7 @@
 						url:"../login/login"
 					})
 				})
-			}
+			},
 		}
 	}
 </script>