liuhairui 1 year ago
parent
commit
327820b3ec
2 changed files with 22 additions and 7 deletions
  1. 9 0
      src/api/jixiaoguanli/jitairibaobiao.js
  2. 13 7
      src/view/performance/chejianbaogong.vue

+ 9 - 0
src/api/jixiaoguanli/jitairibaobiao.js

@@ -1135,4 +1135,13 @@ export const JpUploade = (data) => {
     method: 'post',
     data
   })
+}
+
+
+export const JPmachineDetail = (params) => {
+  return service({
+    url: '/mes_server/facility/JPmachineDetail',
+    method: 'get',
+    params
+  })
 }

+ 13 - 7
src/view/performance/chejianbaogong.vue

@@ -2393,6 +2393,11 @@ const FacilityProduction = async (addr) => {
 }
 //设备工作清单
 const FacilityWorklist = async () => {
+	console.log(JTMC)
+	console.log(23123131232131312321)
+	if (!JTMC.endsWith('#')) {
+	  JTMC += '#';
+	}
   const response = await facilityWorklist({machine:JTMC});
   if (response.code === 0) {
 	sbzyData.splice(0, sbzyData.length, ...response.data);
@@ -2666,6 +2671,9 @@ const FacilityDetail = async () => {
 	console.log("machine--->"+JTMC)
 	console.log("Gd_gdbh--->"+formData.value.工单编号)
 	console.log("team--->"+BZMC.value)
+	if (!JTMC.endsWith('#')) {
+	  JTMC += '#';
+	}
 	const response = await facilityDetail({ machine: JTMC, Gd_gdbh: formData.value.工单编号, team:BZMC.value });
 	console.log(response)
 	console.log("↑↑↑↑facilityDetail_01 ↑↑↑↑↑↑")
@@ -3252,7 +3260,6 @@ const JPformdata = reactive({
 //班组产量提报 JP检品机 班组产量提报确定
 const JPchanliangenterDialog = async() => {
 	// console.log(JPformdata)
-	
 	const JPformattedData = {
 	  sczl_jtbh:JTMC+'#',
 	  sczl_gdbh: JPformdata['工单编号'],
@@ -3558,17 +3565,16 @@ const isSubmitting = ref(false)
 //日产量上报 按钮
 //班组产量提报 打开新增页面
 const onchanliang = async() => {
-// function onADD(){
-	console.log(JTMC)
+	// console.log(JTMC)
 	//判断是否为JP 检品机器【是检品机独立页面】
 	if (JTMC.startsWith('JP')) {
+		// JP日产量上报开启
 		JPchanliangVisible.value = true
 		//获取当天日期接口
 		getTimelistsss();
 		//获取产量上报数据信息接口
 		getMachineReportInfos();
 	} else{
-		console.log(JTMC)
 		//日产量上报弹窗开启
 		isSubmitting.value = false
 		ReportInfo();
@@ -4486,6 +4492,9 @@ const getSpotCheckItem = async (machineName) => {
 // 班组人员及分配比例
 const FacilityTeam = async (value) => {
   console.log('班组人员及分配比例:'+value)
+  if (!value.endsWith('#')) {
+    value += '#';
+  }
   const response = await facilityTeam({ machine: value });
   if (response.code === 0) {
     // 清空 bzData 数组
@@ -4553,8 +4562,6 @@ const FacilityTeam = async (value) => {
     FPData.splice(0, FPData.length, ...updatedData)
     // 将更新后的数据添加到 bzData 数组
     bzData.push(...updatedData);
-	// FPData.push(...updatedData)
-	// console.log(FPData)
   }
 };
 //班组维护
@@ -4562,7 +4569,6 @@ function onBZ() {
 	FacilityTeam(JTMC)
 	fetchData()
 	detailShow.value=true
-	// console.log('2222')
 }