MES——> PDA 字段maser 更新 master

src/pages/index/index.vue

@@ -91,7 +91,7 @@ import { useCountStore } from '@/store'
 					uni.hideLoading()
 					if (res.menus.length > 0) {
 						var menus = res.menus.filter(item => item.name == "PDA菜单管理")
-						console.log(11,menus)
+						//console.log(11,menus)
 						if (menus.length > 0) {
 							var tab = menus[0].children.filter(res => res.visible == true)
 							tab.forEach(res => {
@@ -106,7 +106,7 @@ import { useCountStore } from '@/store'
 							this.tabbar.forEach(res => {
 								res.children.forEach(res => {
 									i++
-									console.log(res.name, i)
+									//console.log(res.name, i)
 								})
 							})
 							this.getDictory()
@@ -170,7 +170,7 @@ import { useCountStore } from '@/store'
 				var that = this;
 				this.timer = setInterval(function() {
 					that.getMainMessage();
-					console.log('刷新菜单');
+					//console.log('刷新菜单');
 				}, 1000 * 60)
 			},
 			stopRefresh() {

src/pages/mes/productOffline/createProductOffline.vue

@@ -165,7 +165,7 @@
 	function findProductByCode(productCode) {
 	    productItem.value = list.value.find(item => item.productCode === productCode);
 		form.value.workBillno = productItem.value.schedulingCode
-		form.value.planCode = productItem.value.planMaserCode
+		form.value.planCode = productItem.value.planMasterCode
 		form.value.processCode = productItem.value.workingNode
 		form.value.stationCode = productItem.value.currentWorkstation
 	}
@@ -182,7 +182,7 @@
 		if (option.obj) {
 		    paramData.value = JSON.parse(decodeURIComponent(option.obj)); // 将字符串转换为对象并存入paramData
 			form.value.workBillno = paramData.value.schedulingCode
-			form.value.planCode = paramData.value.planMaserCode
+			form.value.planCode = paramData.value.planMasterCode
 			form.value.processCode = paramData.value.workingNode
 			form.value.stationCode = paramData.value.currentWorkstation
 			form.value.productCode = paramData.value.currentWorkstation

src/pages/mes/reworkSingle/create.vue

@@ -224,7 +224,7 @@
 	function findProductByCode(productCode) {
 	    productItem.value = list.value.find(item => item.productCode === productCode);
 		form.value.workBillno = productItem.value.schedulingCode
-		form.value.planCode = productItem.value.planMaserCode
+		form.value.planCode = productItem.value.planMasterCode
 		form.value.processCode = productItem.value.workingNode
 		form.value.stationCode = productItem.value.currentWorkstation
 	}
@@ -241,7 +241,7 @@
 		if (option.obj) {
 		    paramData.value = JSON.parse(decodeURIComponent(option.obj)); // 将字符串转换为对象并存入paramData
 			form.value.workBillno = paramData.value.schedulingCode
-			form.value.planCode = paramData.value.planMaserCode
+			form.value.planCode = paramData.value.planMasterCode
 			form.value.processCode = paramData.value.workingNode
 			form.value.stationCode = paramData.value.currentWorkstation
 			form.value.productCode = paramData.value.currentWorkstation

src/pages/mes/workScheduling/bomInspect.vue

@@ -45,7 +45,7 @@ const list = ref([])
 const params = ref({
   pageNo: 1,
   pageSize: 10,
-  planMaserCode: ''
+  planMasterCode: ''
 })
 
 function getBomInspectList() {
@@ -55,8 +55,6 @@ function getBomInspectList() {
 	proxy.$modal.loading('加载中')
 	orderDayPlanListApi.getBomInfoList(params.value).then((res) => {
 		proxy.$modal.closeLoading()
-		console.log(params.value.pageNo)
-		console.log(res.data.list.length)
 		if (res.data.list.length > 0) {
 			list.value = list.value.concat(res.data.list)
 			params.value.pageNo++
@@ -78,8 +76,9 @@ onReachBottom(() => {
 
 
 onLoad((option) => {
-  if (option.planMaserCode) {
-    params.value.planMaserCode = option.planMaserCode
+  console.log(option)	
+  if (option.planMasterCode) {
+    params.value.planMasterCode = option.planMasterCode
   }
 })
 onShow(() => {

src/pages/mes/workScheduling/equipmentInspect.vue

@@ -45,7 +45,7 @@ const list = ref([])
 const params = ref({
   pageNo: 1,
   pageSize: 10,
-  planMaserCode: ''
+  planMasterCode: ''
 })
 
 function getEquipmentInspectList() {
@@ -78,8 +78,8 @@ onReachBottom(() => {
 
 
 onLoad((option) => {
-  if (option.planMaserCode) {
-    params.value.planMaserCode = option.planMaserCode
+  if (option.planMasterCode) {
+    params.value.planMasterCode = option.planMasterCode
   }
 })
 onShow(() => {

src/pages/mes/workScheduling/inspectionItems.vue

@@ -17,7 +17,7 @@
 			</view>	
 			<view class="dec-item">
 				<view v-if="item == 'bom'" >
-					<u-button type="primary" size="default" style="background-color: #5599FF" @click="openDetail(number,item)">明 细</u-button>
+					<u-button type="primary" size="default" style="background-color: #5599FF" @click="openDetail(item)">明 细</u-button>
 					<u-radio-group v-model="bomRadioValue" @change="radioGroupChange">
 						<u-radio  @change="radioChange" v-for="(item, index) in listRadio" :key="index" 
 									:name="item.name"
@@ -27,7 +27,7 @@
 					</u-radio-group>
 				</view>	
 				<view v-if="item == 'worker'" >
-					<u-button type="primary" size="default" style="background-color: #5599FF" @click="openDetail(number,item)">明 细</u-button>
+					<u-button type="primary" size="default" style="background-color: #5599FF" @click="openDetail(item)">明 细</u-button>
 					<u-radio-group v-model="workerRadioValue" @change="radioGroupChange">
 						<u-radio  @change="radioChange" v-for="(item, index) in listRadio" :key="index" 
 									:name="item.name"
@@ -37,7 +37,7 @@
 					</u-radio-group>
 				</view>
 				<view v-if="item == 'equipment'" >
-					<u-button type="primary" size="default" style="background-color: #5599FF" @click="openDetail(number,item)">明 细</u-button>
+					<u-button type="primary" size="default" style="background-color: #5599FF" @click="openDetail(item)">明 细</u-button>
 					<u-radio-group v-model="equipmentRadioValue" @change="radioGroupChange">
 						<u-radio  @change="radioChange" v-for="(item, index) in listRadio" :key="index" 
 									:name="item.name"
@@ -60,7 +60,7 @@
 	  <view>质检模板号：{{ quaifyFormNo}}</view>
 	</view>
 	<view class="dec-item">
-	  <view>质检模板号：{{ bomInspectFlag}}</view>
+	  <view>主计划单号：{{ number}}</view>
 	</view>
 	<view class="dec-item">
 	  <view>质检模板号：{{ bomRadioValue}}</view>
@@ -111,7 +111,7 @@ const equipmentRadioValue = ref('')
 
 
 const mesSchedulingParams = ref({
-  planMaserCode: '',
+  planMasterCode: '',
   status: '',
   qualityFormNo: '',
   reason: ''
@@ -135,7 +135,7 @@ function submit(index) {
 	}
 	if(mesSchedulingParams.value.status == '0'){
 		proxy.$modal.confirm("是否确认提交").then(()=>{
-			mesSchedulingParams.value.planMaserCode = number.value
+			mesSchedulingParams.value.planMasterCode = number.value
 			mesSchedulingParams.value.qualityFormNo = quaifyFormNo.value
 			workSchedulingListApi.updateWorkSchedulingInfo(mesSchedulingParams.value).then((res) => {
 				console.log(res.data)
@@ -150,7 +150,7 @@ function submit(index) {
 function confirmReason() {
 	mesSchedulingParams.value.reason = reasons.value
 	proxy.$modal.confirm("是否确认提交").then(()=>{
-		mesSchedulingParams.value.planMaserCode = number.value
+		mesSchedulingParams.value.planMasterCode = number.value
 		mesSchedulingParams.value.qualityFormNo = quaifyFormNo.value
 		console.log(mesSchedulingParams)
 		workSchedulingListApi.updateWorkSchedulingInfo(mesSchedulingParams.value).then((res) => {
@@ -165,22 +165,22 @@ function confirmReason() {
 }
 
 //打开明细
-function openDetail(index,itemVal) {
+function openDetail(itemVal) {
   if(itemVal == 'bom'){
-	proxy.$tab.navigateTo(`/pages/mes/workScheduling/bomInspect?planMaserCode=${index}`)
+	proxy.$tab.navigateTo(`/pages/mes/workScheduling/bomInspect?planMasterCode=${number.value}`)
   }
   if(itemVal == 'worker'){
-  	proxy.$tab.navigateTo(`/pages/mes/workScheduling/workerInspect?planMaserCode=${index}`)
+  	proxy.$tab.navigateTo(`/pages/mes/workScheduling/workerInspect?planMasterCode=${number.value}`)
   }
   if(itemVal == 'equipment'){
-  	proxy.$tab.navigateTo(`/pages/mes/workScheduling/equipmentInspect?planMaserCode=${index}`)
+  	proxy.$tab.navigateTo(`/pages/mes/workScheduling/equipmentInspect?planMasterCode=${number.value}`)
   }
 }
 
 
 onLoad((option) => {
   if (option.obj) {
-    number.value = JSON.parse(option.obj).planMaserCode
+    number.value = JSON.parse(option.obj).planMasterCode
 	planDayId.value = JSON.parse(option.obj).id
 	if( JSON.parse(option.obj).status == '-1'){
 		completeInspectStatus.value = true

src/pages/mes/workScheduling/workScheduling.vue

@@ -13,7 +13,7 @@
       <view class="item" v-for="(item, index) in list" :key="index" @click="openDetail(item)">
         <view class="title">
         	<view class="title-txt">
-        		{{item.planMasterCode}}
+        		{{item.schedulingCode}}
         	</view>
         	<view class="time">
         		{{`${$time.formatDate(item.createTime)}`}}

src/pages/mes/workScheduling/workerInspect.vue

@@ -44,7 +44,7 @@ const list = ref([])
 const params = ref({
   pageNo: 1,
   pageSize: 10,
-  planMaserCode: ''
+  planMasterCode: ''
 })
 
 function getWorkerInspectList() {
@@ -77,8 +77,8 @@ onReachBottom(() => {
 
 
 onLoad((option) => {
-  if (option.planMaserCode) {
-    params.value.planMaserCode = option.planMaserCode
+  if (option.planMasterCode) {
+    params.value.planMasterCode = option.planMasterCode
   }
 })
 onShow(() => {