瀏覽代碼

Merge remote-tracking branch 'origin/master'

guoyujia 1 年之前
父節點
當前提交
27b04202aa
共有 1 個文件被更改,包括 12 次插入3 次删除
  1. 12 3
      pages/sortBatchReporting/index.vue

+ 12 - 3
pages/sortBatchReporting/index.vue

@@ -130,7 +130,9 @@
 
 
 <script setup>
 <script setup>
 	import {
 	import {
+		normalizeProps,
 		reactive,
 		reactive,
+		onMounted,
 		ref
 		ref
 	} from 'vue'
 	} from 'vue'
 	import {
 	import {
@@ -159,7 +161,6 @@
 		toHHmmss
 		toHHmmss
 	} from '@/utils/common.js'
 	} from '@/utils/common.js'
 
 
-
 	const turnoverApplicationDialog = ref(null)
 	const turnoverApplicationDialog = ref(null)
 	const selectProduction = ref(null)
 	const selectProduction = ref(null)
 	const lotDialog = ref(null)
 	const lotDialog = ref(null)
@@ -167,18 +168,24 @@
 	const curPlan = ref(null)
 	const curPlan = ref(null)
 	const bizDayworkObj = ref({})
 	const bizDayworkObj = ref({})
 	const bottomStatus = ref(false) // 底部按钮显示
 	const bottomStatus = ref(false) // 底部按钮显示
+	const paging = ref();
 	const reqParam = ref(null);
 	const reqParam = ref(null);
-	const normalStatus = ref(0)
+	const normalStatus = ref(true)
+	const isLoading = ref(false);
 	const curDayworkItem = ref({}) // 当前报工记录,回显是否显示取消周转的状态	
 	const curDayworkItem = ref({}) // 当前报工记录,回显是否显示取消周转的状态	
 	const keywords = ref(null)
 	const keywords = ref(null)
 	const tempList = ref([])
 	const tempList = ref([])
 	const wasteRecyclingList = ref([]) //废品回用批次
 	const wasteRecyclingList = ref([]) //废品回用批次
+	// 在数据中定义一个变量来控制遮罩层的显示
+	const isMaskShow = ref(false);
+
 	const notPreProcess = ref(true)
 	const notPreProcess = ref(true)
 	const curProcessAfte = ref([])
 	const curProcessAfte = ref([])
 	const showRight = ref(null) // 抽屉
 	const showRight = ref(null) // 抽屉
 
 
 	onLoad(() => {
 	onLoad(() => {
 		curPlan.value = store.planDetails;
 		curPlan.value = store.planDetails;
+		normalStatus.value = true;
 		console.log(curPlan.value)
 		console.log(curPlan.value)
 		//废品回用的领料部门如果是当前工段,也要可以开始新批次
 		//废品回用的领料部门如果是当前工段,也要可以开始新批次
 		//查找当前计划单下的批次废品回用是当前工段
 		//查找当前计划单下的批次废品回用是当前工段
@@ -251,7 +258,7 @@
 	})
 	})
 
 
 	function reflush() {
 	function reflush() {
-		normalStatus.value = true;
+		// normalStatus.value = true;
 		init(store.planDetails.id);
 		init(store.planDetails.id);
 	}
 	}
 
 
@@ -277,6 +284,8 @@
 	}
 	}
 
 
 	function handleStartNewBatch() {
 	function handleStartNewBatch() {
+		store.normalStatus = normalStatus.value;
+		// console.log(normalStatus.value)
 		uni.navigateTo({
 		uni.navigateTo({
 			url: "/pages/addNewBatch/index"
 			url: "/pages/addNewBatch/index"
 		})
 		})