日产量上报设置流程标牌为空

src/view/performance/chejianbaogong.vue

@@ -2,19 +2,19 @@
   <div>
 	<header>
 		<div style="height: 50px;">
-			<el-button type="primary" size="large" class="bt" style="color:white;font-size: 15px;font-weight: bold;width: 70px"  @click="onBZ" >班组维护</el-button>
-			<el-button type="primary" size="large" class="bt" style="color:white;font-size: 15px;font-weight: bold;width: 90px"  @click="onchanliang"  v-if="zdtreeType === true" >日产量上报</el-button>
-			<el-button type="primary" size="large" class="bt" style="color:white;font-size: 15px;font-weight: bold;width: 60px"  @click="onOver" title="完工按钮" >完工</el-button>
-			<el-button type="primary" size="large" class="bt" style="color:white;font-size: 15px;font-weight: bold;width: 70px"  @click="onzhicheng"  >制程检验</el-button>
-			<el-button type="primary" size="large" class="bt" style="color:white;font-size: 15px;font-weight: bold;width: 70px"  @click="ondianjian"  >设备点检</el-button>
-			<el-button type="primary" size="large" class="bt" style="color:white;font-size: 15px;font-weight: bold;width: 70px"  @click="onxuncha" >管理巡查</el-button>
-			<el-button type="primary" size="large" class="bt" style="color:white;font-size: 15px;font-weight: bold;width: 95px"  @click="onstatus" >设置机台状态</el-button>
-			<el-button type="primary" size="large" class="bt" style="color:white;font-size: 15px;font-weight: bold;width: 70px"  @click="onyinban">印版领退</el-button>
-			<el-button type="primary" size="large" class="bt" style="color:white;font-size: 15px;font-weight: bold;width: 70px"  @click="onClear" >换型清场</el-button>
-			<el-button type="primary" size="large" class="bt" style="color:white;font-size: 15px;font-weight: bold;width: 70px"  @click="pd_gdprintonClick" >工单打印</el-button>
-			<el-button type="primary" size="large" class="bt" style="color:white;font-size: 15px;font-weight: bold;width: 95px"  @click="gzSel" >员工工资查询</el-button>
-			<el-button type="primary" size="large" class="bt" style="color:white;font-size: 15px;font-weight: bold;width: 70px"  @click="oncomplaints" >客诉记录</el-button>
-			<el-button type="primary" size="large" class="bt" style="color:white;font-size: 15px;font-weight: bold;width: 120px" @click="deldbcl_onclick" :disabled="dbclSelection === ''"   title="当班产量明细" >当班产量明细删除</el-button>
+			<el-button type="primary" size="large" class="bt" style="color:white;font-size: 15px;font-weight: bold;width: 70px" @click="onBZ" >班组维护</el-button>
+			<el-button type="primary" size="large" class="bt" style="color:white;font-size: 15px;font-weight: bold;width: 90px" @click="onchanliang"  v-if="zdtreeType === true" >日产量上报</el-button>
+			<el-button type="primary" size="large" class="bt" style="color:white;font-size: 15px;font-weight: bold;width: 60px" title="完工按钮" @click="onOver" >完工</el-button>
+			<el-button type="primary" size="large" class="bt" style="color:white;font-size: 15px;font-weight: bold;width: 70px" @click="onzhicheng"  >制程检验</el-button>
+			<el-button type="primary" size="large" class="bt" style="color:white;font-size: 15px;font-weight: bold;width: 70px" @click="ondianjian"  >设备点检</el-button>
+			<el-button type="primary" size="large" class="bt" style="color:white;font-size: 15px;font-weight: bold;width: 70px" @click="onxuncha" >管理巡查</el-button>
+			<el-button type="primary" size="large" class="bt" style="color:white;font-size: 15px;font-weight: bold;width: 95px" @click="onstatus" >设置机台状态</el-button>
+			<el-button type="primary" size="large" class="bt" style="color:white;font-size: 15px;font-weight: bold;width: 70px" @click="onyinban">印版领退</el-button>
+			<el-button type="primary" size="large" class="bt" style="color:white;font-size: 15px;font-weight: bold;width: 70px" @click="onClear" >换型清场</el-button>
+			<el-button type="primary" size="large" class="bt" style="color:white;font-size: 15px;font-weight: bold;width: 70px" @click="pd_gdprintonClick" >工单打印</el-button>
+			<el-button type="primary" size="large" class="bt" style="color:white;font-size: 15px;font-weight: bold;width: 95px" @click="gzSel" >员工工资查询</el-button>
+			<el-button type="primary" size="large" class="bt" style="color:white;font-size: 15px;font-weight: bold;width: 70px" @click="oncomplaints" >客诉记录</el-button>
+      <el-button type="primary" size="large" class="bt" style="color:white;font-size: 15px;font-weight: bold;width: 120px" @click="deldbcl_onclick" :disabled="dbclSelection === ''"   title="当班产量明细" >当班产量明细删除</el-button>
     </div>
 		</header>
     <el-container>
@@ -81,9 +81,10 @@
 		  </el-col>
 		</el-row>
 	</div>
-	<!-- overflow: hidden;flex: 1;  -->
+<!-- overflow: hidden;flex: 1;  -->
 	<div style="border: 0px lawngreen solid; margin: 0; padding: 0;width:34%;">
-	 <el-table tooltip-effect="dark" :data="selectData" row-key="ID" highlight-current-row="true" border
+	 <el-table tooltip-effect="dark" :data="selectData" row-key="ID"
+	   highlight-current-row="true" border
       :row-style="{ height: '20px'}" :cell-style="{ padding: '0px'}"
 	  :header-row-style="{ height: '20px'}" style="width:100%;height: 30vh;"  @row-dblclick="handleSelectClick" >
 	   <el-table-column prop="process" label="印件及工序"width="280" />
@@ -93,23 +94,22 @@
 
 </div>
 
+
+
+
+
           <div class="gva-table-box" style="margin-top: 20px;">
             <el-tabs v-model="activName" type="card" @tab-click="duohandleClick"   >
-			<el-tab-pane label="设备作业清单" @click.native="showTable('设备作业清单', 'first')" name="first"  :class="{ 'active-tab': activeTab === 'first' }" style="font-size: 16px;">
-				<el-table ref="multipleTable" 
-					:show-overflow-tooltip="true" 
-					highlight-current-row="true"
-					:cell-class-name="sbzyqdsatusCellClass"
-					:row-style="{ height: '40px' }" 
-					:cell-style="{ padding: '0px' }" 
-					:header-row-style="{ height: '40px' }"
-					:header-cell-style="{ padding: '0px' }"
-					@contextmenu.prevent="yjonRightClick" 
-					@row-click="yjupdateCompanyFunc"
-					style="width: 100%;height: 330px;color:purple;font-weight: bold;" border tooltip-effect="dark"
-					:data="sbzyData" 
-					row-key="ID" 
-					@selection-change="handleSelectionChange">
+			<el-tab-pane label="设备作业清单" @click="showTable('设备作业清单')" name="first"  :class="{ 'active-tab': activeTab === 'first' }" style="font-size: 16px;">
+				<el-table ref="multipleTable"
+						:show-overflow-tooltip="true"
+						highlight-current-row="true"
+						:row-style="{ height: '40px' }"
+						:cell-style="{ padding: '0px' }" :header-row-style="{ height: '40px' }"
+						:header-cell-style="{ padding: '0px' }"
+            @contextmenu.prevent="yjonRightClick"
+						@row-click="yjupdateCompanyFunc"
+						style="width: 100%;height: 330px;color:purple;font-weight: bold;" border tooltip-effect="dark" :data="sbzyData" row-key="ID" @selection-change="handleSelectionChange">
 <!--                <el-table-column type="selection" width="55" />-->
 				<!-- <el-table-column align="left" label="选择" prop="bh"  width="80"/> -->
 				<el-table-column align="left" sortable label="工单编号|质量信息" prop="工单编号|质量信息" width="168"/>
@@ -127,43 +127,42 @@
 
 
         <el-tab-pane label="班组人员及分配比例" @click="showTable('班组人员及分配比例')" name="second">
-			  <el-table ref="multipleTable" 
-					:show-overflow-tooltip="true" 
-					highlight-current-row="true"
-					:row-style="{ height: '40px' }" 
-					:cell-style="{ padding: '0px' }" 
-					:header-row-style="{ height: '40px' }"
-					:header-cell-style="{ padding: '0px' }" 
-					@contextmenu.prevent="bzonRightClick"
-					@row-dblclick="gyupdateCompanyFunc" 
-					:row-class-name="rowClassStyle"
-					:cell-class-name="bzryplanUsageCellClass"
-					style="width: 100%;height: 400px;color:purple;font-weight: bold;" 
-					border 
-					tooltip-effect="dark" 
-					:data="FPData" 
-					row-key="ID" 
-					@selection-change="handleSelectionChange"
-					@row-click="clickybupdate">
-			    <el-table-column type="selection" label="选择" width="55" />
-				<el-table-column align="left" label="班组号" prop="班组号" width="80" />
-				<el-table-column align="left" label="组员1" prop="0" width="240" />
-				<el-table-column align="left" label="组员2" prop="1" width="240" />
-				<el-table-column align="left" label="组员3" prop="2" width="240" />
-				<el-table-column align="left" label="组员4" prop="3" width="240" />
-				<el-table-column align="left" label="组员5" prop="4" width="220" />
-				<el-table-column align="left" label="组员6" prop="5" width="100" />
-				<el-table-column align="left" label="组员7" prop="6" width="100" />
-				<el-table-column align="left" label="组员8" prop="7" width="100" />
-				<el-table-column align="left" label="组员9" prop="8" width="100" />
-				<el-table-column align="left" label="组员10" prop="9_正品版" width="120" />
-			  </el-table>
-			</el-tab-pane>
-
-		<el-tab-pane label="当班产量明细" @click="showsTable('当班产量明细')" name="third">
-            <el-table ref="multipleTable" highlight-current-row="true" :show-overflow-tooltip="true" :row-style="{ height: '40px' }"
-                      :cell-style="{ padding: '0px'}" :header-row-style="{ height: '40px' }" :header-cell-style="{ padding: '0px' }"
-                      @row-dblclick="ybupdateCompanyFunc" style="width: 100%;height: 400px;color:purple;font-weight: bold;" border tooltip-effect="dark"
+						  <el-table ref="multipleTable"
+									:show-overflow-tooltip="true"
+                        highlight-current-row="true"
+									:row-style="{ height: '40px' }"
+									:cell-style="{ padding: '0px' }" :header-row-style="{ height: '40px' }"
+									:header-cell-style="{ padding: '0px' }"
+                        @contextmenu.prevent="bzonRightClick"
+									@row-dblclick="gyupdateCompanyFunc"
+									:row-class-name="rowClassStyle"
+									:cell-class-name="bzryplanUsageCellClass"
+									style="width: 100%;height: 400px;color:purple;font-weight: bold;" border tooltip-effect="dark" :data="FPData" row-key="ID" @selection-change="handleSelectionChange"
+									@row-click="clickybupdate">
+						   <el-table-column type="selection" label="选择" width="55" />
+							<el-table-column align="left" label="班组号" prop="班组号" width="80" />
+							<el-table-column align="left" label="组员1" prop="0" width="240" />
+							<el-table-column align="left" label="组员2" prop="1" width="240" />
+							<el-table-column align="left" label="组员3" prop="2" width="240" />
+							<el-table-column align="left" label="组员4" prop="3" width="240" />
+							<el-table-column align="left" label="组员5" prop="4" width="220" />
+							<el-table-column align="left" label="组员6" prop="5" width="100" />
+							<el-table-column align="left" label="组员7" prop="6" width="100" />
+							<el-table-column align="left" label="组员8" prop="7" width="100" />
+							<el-table-column align="left" label="组员9" prop="8" width="100" />
+							<el-table-column align="left" label="组员10" prop="9_正品版" width="120" />
+						  </el-table>
+						</el-tab-pane>
+
+            <el-tab-pane label="当班产量明细" @click="showsTable('当班产量明细')" name="third">
+            <el-table ref="multipleTable"
+                      highlight-current-row="true"
+                      :show-overflow-tooltip="true"
+                      :row-style="{ height: '40px' }"
+                      :cell-style="{ padding: '0px'}" :header-row-style="{ height: '40px' }"
+                      :header-cell-style="{ padding: '0px' }"
+                      @row-dblclick="ybupdateCompanyFunc"
+                      style="width: 100%;height: 400px;color:purple;font-weight: bold;" border tooltip-effect="dark"
                       :data="CLMXData" row-key="ID" @selection-change="dbclmxSelectionChange">
               <el-table-column type="selection" width="55" />
               <el-table-column align="left" label="生产时段" prop="生产时间段"  width="180"/>
@@ -188,7 +187,7 @@
               <el-table-column align="left" label="辅电表" prop="辅电表" width="100" />
               <el-table-column align="left" label="色度数" prop="色度" width="100" />
             </el-table>
-		</el-tab-pane>
+            </el-tab-pane>
 
                         <el-tab-pane label="检验记录" @click="showTable('检验记录')" name="fourth">
                         <el-table ref="multipleTable"
@@ -213,6 +212,7 @@
                            ></el-table-column>
                         </el-table>
                         </el-tab-pane>
+
                       </el-tabs>
             <!-- <div class="gva-pagination">
               <el-pagination
@@ -616,7 +616,7 @@
 
 		  <div style="display: flex;margin-top: 20px;">
 		    <div style="flex: 0.1;">
-		      <el-aside width="32vh" style="margin: 0;">
+		      <el-aside width="25vh" style="margin: 0;">
 		        <div class="JKWTree-tree" style="height: 100%; border-right: 1px solid #ebeef5;">
 		          <el-tree :data="zhichengtreeData" :props="defaultProps" highlight-current="true"
 		            @node-click="zhichengNodeClick"></el-tree>
@@ -633,8 +633,9 @@
 		              highlight-current-row="true"
 		              :show-overflow-tooltip="true"
 		              border
-		              style="width:140vh; height:60vh;"
-		              :row-class-name="rowClassName">
+		              style="width:140vh; height:310px;"
+		              :row-class-name="rowClassName"
+		          >
 		              <el-table-column prop="检验项目" label="检验项目" width="110" />
 
 		              <el-table-column label="不检测" width="70">
@@ -668,35 +669,36 @@
 		        </el-tab-pane>
 
 		        <el-tab-pane label="附加检验记录"  @click="showTable('附加检验记录')"  name="second">
-		          <el-table tooltip-effect="dark"
+		          <el-table
+		            tooltip-effect="dark"
 		            :data="fujiaselectData"
 		            row-key="ID"
 		            highlight-current-row="true"
-		          	:show-overflow-tooltip="true"
+		          				:show-overflow-tooltip="true"
 		            border  @row-click="dianjianhandle"
-		            style="width:140vh; height:60vh;"
+		            style="width:70vh; height:40vh;"
 		            @row-dblclick="handleSelectClick"
-					
-		            :row-class-name="rowClassName">
-				    <el-table-column v-slot="scope" label="不检测" width="75" >
+		            :row-class-name="rowClassName"
+		          >
+				    <el-table-column
+				      v-slot="scope"
+				      label="不检测"
+				      width="75"
+				    >
 				       <el-checkbox v-model="scope.row.notjc"></el-checkbox>
 				    </el-table-column>
-					
-					 <!-- 缺陷及记录列，转换为输入框 -->
-					    <el-table-column label="缺陷及记录" width="720">
-					      <template #default="scope">
-					        <el-input v-model="scope.row['缺陷备注']" placeholder="请输入缺陷及记录"></el-input>
-					      </template>
-					    </el-table-column>
-						
-						
-		            <!-- <el-table-column prop="缺陷备注" label="缺陷及记录" width="720" /> -->
-					
-		            <el-table-column  prop="编号" label="编号" width="80" />
-					
+		            <el-table-column
+		              prop="缺陷备注"
+		              label="缺陷及记录"
+		              width="720"
+		            />
+		            <el-table-column
+		              prop="编号"
+		              label="编号"
+		              width="80"
+		            />
 		          </el-table>
 		        </el-tab-pane>
-				
 		      </el-tabs>
 		    </div>
 		  </div>
@@ -2047,7 +2049,6 @@ import {
   facilityProcedure,
   dailysearch,
   dailygetGzByYgbh,
-  MachineChanliangDetail
 } from '@/api/jixiaoguanli/jitairibaobiao'
 
 import {
@@ -2298,7 +2299,7 @@ const FacilityWorklist = async () => {
 			formData.value.productCode=item.产品代号
 		}
 	})
-	selectData.value=[]
+	  selectData.value=[]
     console.log(formData.value.工单编号)
     const res = await facilityProcedure({ Gd_gdbh: formData.value.工单编号 })
   	console.log(res)
@@ -2436,6 +2437,30 @@ const clickybupdate = async (row) => {
   console.log(row)
   roww.value = row
   console.log('班组人员及分配比例单机')
+  // ElMessageBox.confirm('确定切换当前班组人员为工作班组人员吗?', '提示', {
+  //     confirmButtonText: '确定',
+  //     cancelButtonText: '取消',
+  //     type: 'warning'
+  // }).then(() => {
+  //         setTeams(row)
+  //     })
+  // const response = await facilityWorklist({machine:JTMC});
+  // if (response.code === 0) {
+  //   sbzyData.splice(0, sbzyData.length, ...response.data);
+  //   // formData.value.productCode= response.data[0]['产品代号']
+  //   response.data.map(item=>{
+  //     if(item['工单编号|质量信息'].substring(0, 7)==formData.value.工单编号){
+  //       formData.value.productCode=item.产品代号
+  //     }
+  //   })
+  //   selectData.value=[]
+  //   const res = await facilityProcedure({ Gd_gdbh: sbzyData[0]['工单编号|质量信息'].substring(0, 7) })
+  //   // formData.value.productCode= response.data[0]['产品代号']
+  //   // console.log(res)
+  //   if (res.code === 0) {
+  //     selectData.value = res.data
+  //   }
+  // }
 }
 //班组人员及分配比例双击
 const gyupdateCompanyFunc = async (row) => {
@@ -2538,48 +2563,20 @@ const InspectionRecord = async () => {
 }
 //当班产量明细
 const FacilityDetail = async () => {
-	const today = new Date();
-	const year = today.getFullYear();
-	const month = String(today.getMonth() + 1).padStart(2, '0'); // 月份从 0 开始，需要补零
-	const day = String(today.getDate()).padStart(2, '0');
-	const hours = String(today.getHours()).padStart(2, '0');
-	const minutes = String(today.getMinutes()).padStart(2, '0');
-	const seconds = String(today.getSeconds()).padStart(2, '0');
-	
-	const currentHour = today.getHours(); // 获取当前的小时
-	let currentDate = `${year}-${month}-${day}`;
-	
-	
   formData.value.production_now=0
   formData.value.production_all=0
-  
   console.log("machine--->"+JTMC)
   console.log("Gd_gdbh--->"+formData.value.工单编号)
   console.log("team--->"+BZMC.value)
   const response = await facilityDetail({ machine: JTMC, Gd_gdbh: formData.value.工单编号, team:BZMC.value });
+  console.log("facilityDetail--》返回的数据")
   console.log(response)
-  console.log("facilityDetail_01")
-  // 日产量上报上机时间
   if (response.code === 0) {
     if(response.data === null){
-         if (currentHour < 8 || (currentHour === 8 && minutes < 30)) {
-                // 如果当前时间早于08:30, 则设置为前一天的晚班时间20:30
-                // 需要将日期减一天
-                const yesterDay = new Date(today.getTime() - 86400000); // 减去一天的毫秒数
-                const yearYesterday = yesterDay.getFullYear();
-                const monthYesterday = String(yesterDay.getMonth() + 1).padStart(2, '0');
-                const dayYesterday = String(yesterDay.getDate()).padStart(2, '0');
-                formData.value.上机时间 = `${yearYesterday}-${monthYesterday}-${dayYesterday} 20:30:00`;
-            } else {
-                // 如果当前时间晚于或等于08:30, 则设置为当天的白班时间08:30
-                formData.value.上机时间 = `${currentDate} 08:30:00`;
-            }
+      formData.value.上机时间=currentDate+' 08:30:00'
     }else{
-		// formData.value.上机时间 = response.data.sj1
-      formData.value.上机时间 = currentDate.split('-')[0]+'-'+response.data[0]['生产时间段'].split('>')[1]+':00'
+      formData.value.上机时间=currentDate.split('-')[0]+'-'+response.data[0]['生产时间段'].split('>')[1]+':00'
     }
-	
-	
     CLMXData.splice(0, CLMXData.length, ...Object.values(response.data));
     formData.value.production_now=response.data[0].产量
     formData.value.production_all=response.data.total.产量
@@ -3168,9 +3165,9 @@ const deldbcl_onclick = async () => {
 		const response = await facilityDetail({ machine: JTMC, Gd_gdbh: formData.value.工单编号, team: BZMC.value });
 		console.log(response);
 		// if (response.code === 0) {
-
+		 
 		// }
-
+		
 		if (response.data === null) {
 				CLMXData.splice(0, CLMXData.length, ...Object.values([]));
 			return false;
@@ -3264,6 +3261,7 @@ const tableCols2 = [
 
 //员工工资查询
 const gzSel = () =>{
+  console.log(formData)
 	if(formData.value.班组成员.length==0){
 		ElMessage({ type: 'warning', message: '未获取到员工' });
 		return
@@ -3415,9 +3413,8 @@ const dianjianDialog = async () => {
 		  dianjianVisible.value=false
 	}
 }
-//制程检验记录提交按钮
 const zhichengDialog = async () => {
-	// console.log(fujiaselectData.value)
+	console.log(fujiaselectData.value)
 	let arr =[]
 	zhibiaoselectData.value.map(item=>{
 		if(item.zc==true){
@@ -3465,9 +3462,8 @@ const zhichengDialog = async () => {
 			// arr.push(item)
 			return item
 		}
+
 	})
-	console.log(fujiaselectData.value)
-	
 	let arrs=[]
 	let fujiastatus=0
 	fujiaselectData.value.map(item=>{
@@ -3482,17 +3478,13 @@ const zhichengDialog = async () => {
 			arrs.push(item)
 			return item
 		}
+
 	})
-	console.log(arrs)
 	if(fujiastatus==1){
 		const responses = await AdditionalInspectionRecordAdd(arrs);
 		fujiastatus=0
 	}
-	
-	// 使用filter方法过滤掉所有result为"不检测"的对象
-	const filteredData = zhibiaoselectData.value.filter(item => item.selected !== "不检测");
-	console.log(filteredData);
-	const response = await ProcessInspectionRecordsItemAdd(filteredData);
+	const response = await ProcessInspectionRecordsItemAdd(zhibiaoselectData.value);
 	if (response.code === 0) {
 		  ElMessage({type: 'success',message: '成功'})
 		  InspectionRecord()
@@ -3636,106 +3628,87 @@ const SubmitPatrolRecord = async () => {
 //日产量上报提交按钮默认开启
 const isSubmitting = ref(false)
 
-// 获取当前日期
-// const today = new Date();
-// const year = today.getFullYear();
-// const month = String(today.getMonth() + 1).padStart(2, '0'); // 月份从 0 开始，需要补零
-// const day = String(today.getDate()).padStart(2, '0');
-// const hours = String(today.getHours()).padStart(2, '0');
-// const minutes = String(today.getMinutes()).padStart(2, '0');
-// const seconds = String(today.getSeconds()).padStart(2, '0');
-// const currentDate = `${year}-${month}-${day}`;
-// const currentTime = `${year}-${month}-${day} ${hours}:${minutes}`;
-// const currenttime = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
-
-//日产量上报 按钮
+//日产量上报按钮
 function onchanliang() {
-	//日产量上报弹窗开启
-	isSubmitting.value = false
-	ReportInfo();
+  ReportInfo();
+  //日产量上报提交按钮默认开启
+  isSubmitting.value = false
 }
 
+// 获取当前日期
+const today = new Date();
+const year = today.getFullYear();
+const month = String(today.getMonth() + 1).padStart(2, '0'); // 月份从 0 开始，需要补零
+const day = String(today.getDate()).padStart(2, '0');
+const hours = String(today.getHours()).padStart(2, '0');
+const minutes = String(today.getMinutes()).padStart(2, '0');
+const seconds = String(today.getSeconds()).padStart(2, '0');
+const currentDate = `${year}-${month}-${day}`;
+const currentTime = `${year}-${month}-${day} ${hours}:${minutes}`;
+const currenttime = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
 //日产量详情获取
 const ReportInfo = async () => {
-	console.log(formData)
-	// 获取当前日期
-	const today = new Date();
-	const year = today.getFullYear();
-	const month = String(today.getMonth() + 1).padStart(2, '0'); // 月份从 0 开始，需要补零
-	const day = String(today.getDate()).padStart(2, '0');
-	const hours = String(today.getHours()).padStart(2, '0');
-	const minutes = String(today.getMinutes()).padStart(2, '0');
-	const seconds = String(today.getSeconds()).padStart(2, '0');
-	const currentDate = `${year}-${month}-${day}`;
-	const currentTime = `${year}-${month}-${day} ${hours}:${minutes}`;
-	const currenttimes = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
-	
-	//4.1获取报工单其他信息接口
-	const response = await reportInfo({ machine: JTMC.split("#")[0] });
-	console.log(response)
-	console.log("reportInfo_01")
-	
-	// 日产量上报上机时间
-	if (response.code === 0) {
-	const { order_info, class: classInfo } = response.data;
-		
-		// console.log(response.classInfo.UniqId)
-	const newData = {
-	  order: order_info.order,
-	  yjno: order_info.yjno,
-	  gxh: order_info.gxh,
-	  gxmc: order_info.gxmc,
-	  product_name: order_info.product_name,
-	  yj_name: order_info.yj_name,
-	  gy_name: order_info.gy_name,
-	  日期:currentDate,
-	  下机时间:currenttimes,
-	  上机时间:formData.value.上机时间,
-	  装版总时长:0,
-	  定额代号:formData.value.定额代号,
-	  sczl_jtbh: JTMC.split("#")[0],
-	  sczl_bzdh: classInfo.sczl_bzdh,
-	  sys_id: classInfo.sys_id,
-	  sys_rq: classInfo.sys_rq,
-	  mod_rq: classInfo.mod_rq,
-	  UniqId: classInfo.UniqId,
-	  sczl_bh1: classInfo.sczl_bh1,
-	  sczl_bh2: classInfo.sczl_bh2,
-	  sczl_bh3: classInfo.sczl_bh3,
-	  sczl_bh4: classInfo.sczl_bh4,
-	  sczl_bh5: classInfo.sczl_bh5,
-	  sczl_bh6: classInfo.sczl_bh6,
-	  sczl_bh7: classInfo.sczl_bh7,
-	  sczl_bh8: classInfo.sczl_bh8,
-	  sczl_bh9: classInfo.sczl_bh9,
-	  sczl_bh10: classInfo.sczl_bh10,
-	  sczl_name1: classInfo.sczl_name1,
-	  sczl_name2: classInfo.sczl_name2,
-	  sczl_name3: classInfo.sczl_name3,
-	  sczl_name4: classInfo.sczl_name4,
-	  sczl_name5: classInfo.sczl_name5,
-	  sczl_name6: classInfo.sczl_name6,
-	  sczl_name7: classInfo.sczl_name7,
-	  sczl_name8: classInfo.sczl_name8,
-	  sczl_name9: classInfo.sczl_name9,
-	  sczl_name10: classInfo.sczl_name10,
-	  sczl_rate1: classInfo.sczl_rate1,
-	  sczl_rate2: classInfo.sczl_rate2,
-	  sczl_rate3: classInfo.sczl_rate3,
-	  sczl_rate4: classInfo.sczl_rate4,
-	  sczl_rate5: classInfo.sczl_rate5,
-	  sczl_rate6: classInfo.sczl_rate6,
-	  sczl_rate7: classInfo.sczl_rate7,
-	  sczl_rate8: classInfo.sczl_rate8,
-	  sczl_rate9: classInfo.sczl_rate9,
-	  sczl_rate10: classInfo.sczl_rate10,
-	  Gy0_ms:order_info.Gy0_ms,
-	  Gy0_ls:order_info.Gy0_ls,
-	};
-	formData3.value = { ...formData3.value, ...newData };
-	chanliangselectData.splice(0, chanliangselectData.length, ...response.data.bom)
-	chanliangVisible.value = true
-	}
+  //4.1获取报工单其他信息接口
+  const response = await reportInfo({ machine: JTMC.split("#")[0] });
+  if (response.code === 0) {
+    const { order_info, class: classInfo } = response.data;
+    const newData = {
+      order: order_info.order,
+      yjno: order_info.yjno,
+      gxh: order_info.gxh,
+      gxmc: order_info.gxmc,
+      product_name: order_info.product_name,
+      yj_name: order_info.yj_name,
+      gy_name: order_info.gy_name,
+      日期:currentDate,
+      下机时间:currenttime,
+      上机时间:formData.value.上机时间,
+      装版总时长:0,
+      定额代号:formData.value.定额代号,
+      sczl_jtbh: JTMC.split("#")[0],
+      sczl_bzdh: classInfo.sczl_bzdh,
+      sys_id: classInfo.sys_id,
+      sys_rq: classInfo.sys_rq,
+      mod_rq: classInfo.mod_rq,
+      UniqId: classInfo.UniqId,
+      sczl_bh1: classInfo.sczl_bh1,
+      sczl_bh2: classInfo.sczl_bh2,
+      sczl_bh3: classInfo.sczl_bh3,
+      sczl_bh4: classInfo.sczl_bh4,
+      sczl_bh5: classInfo.sczl_bh5,
+      sczl_bh6: classInfo.sczl_bh6,
+      sczl_bh7: classInfo.sczl_bh7,
+      sczl_bh8: classInfo.sczl_bh8,
+      sczl_bh9: classInfo.sczl_bh9,
+      sczl_bh10: classInfo.sczl_bh10,
+      sczl_name1: classInfo.sczl_name1,
+      sczl_name2: classInfo.sczl_name2,
+      sczl_name3: classInfo.sczl_name3,
+      sczl_name4: classInfo.sczl_name4,
+      sczl_name5: classInfo.sczl_name5,
+      sczl_name6: classInfo.sczl_name6,
+      sczl_name7: classInfo.sczl_name7,
+      sczl_name8: classInfo.sczl_name8,
+      sczl_name9: classInfo.sczl_name9,
+      sczl_name10: classInfo.sczl_name10,
+      sczl_rate1: classInfo.sczl_rate1,
+      sczl_rate2: classInfo.sczl_rate2,
+      sczl_rate3: classInfo.sczl_rate3,
+      sczl_rate4: classInfo.sczl_rate4,
+      sczl_rate5: classInfo.sczl_rate5,
+      sczl_rate6: classInfo.sczl_rate6,
+      sczl_rate7: classInfo.sczl_rate7,
+      sczl_rate8: classInfo.sczl_rate8,
+      sczl_rate9: classInfo.sczl_rate9,
+      sczl_rate10: classInfo.sczl_rate10,
+      Gy0_ms:order_info.Gy0_ms,
+      Gy0_ls:order_info.Gy0_ls,
+    };
+    formData3.value = { ...formData3.value, ...newData };
+	formData3.value.流程标牌 = ''
+    chanliangselectData.splice(0, chanliangselectData.length, ...response.data.bom)
+    chanliangVisible.value = true
+  }
   // getTableData()
 }
 
@@ -3864,7 +3837,7 @@ const dianjianselectData = reactive([])
 
 const dianjianNodeClick = (node, check, nodeData) => {
 
-	// console.log('111')
+	console.log('111')
   if (node.children && node.children.length > 0) {
     // 点击的是父节点，且有子节点
     // 执行相应的父节点单击事件处理逻辑
@@ -3885,7 +3858,6 @@ const zhichengNodeClick = (node, check) => {
 };
 const processInspectionRecordsItem = async (value) => {
   const response = await ProcessInspectionRecordsItem({ process: xunchaData.value.gxmc });
-  
   if (response.code === 0) {
 	zhibiaoselectData.value=response.data.首件.指标检验.map(item=>{
 		 item.notjc=true;
@@ -3978,24 +3950,13 @@ const rowClassName = (row, column) => {
     return '';
   }
 };
-//点击label获取表格数据
 function duohandleClick(table) {
   console.log(table.props.label)
-  if(table.props.label === '设备作业清单'){
-	  FacilityWorklist();
-  }
-  if(table.props.label === '班组人员及分配比例'){
-  	 FacilityTeam(JTMC)
-  }
   if(table.props.label=='当班产量明细'){
-	  FacilityDetail()
 	  zdtreeType.value=true
   }else{
 	  zdtreeType.value=false
   }
-  if(table.props.label === '检验记录'){
-  	  InspectionRecord()
-  }
 }
 
 // 异步函数，用于获取指定设备的巡检项目，并且将结果格式化为树形结构数据
@@ -4037,7 +3998,7 @@ const getSpotCheckItem = async (machineName) => {
 
 // 班组人员及分配比例
 const FacilityTeam = async (value) => {
-  console.log('班组人员及分配比例：'+value)
+  console.log('机台班组维护机台获取：'+value)
   const response = await facilityTeam({ machine: value });
   if (response.code === 0) {
     // 清空 bzData 数组
@@ -4095,7 +4056,7 @@ const FacilityTeam = async (value) => {
             }
           }
         }
-        // console.log(formDatas)
+        console.log(formDatas)
       }
     })
     // 遍历接口返回的数据，并给每个对象添加 JTMC 属性
@@ -4106,7 +4067,7 @@ const FacilityTeam = async (value) => {
     // 将更新后的数据添加到 bzData 数组
     bzData.push(...updatedData);
 	// FPData.push(...updatedData)
-	// console.log(FPData)
+	console.log(FPData)
   }
 };
 //班组维护
@@ -4114,7 +4075,7 @@ function onBZ() {
 	FacilityTeam(JTMC)
 	fetchData()
 	detailShow.value=true
-	// console.log('2222')
+	console.log('2222')
 }
 
 
@@ -4340,7 +4301,7 @@ const BZhandle = (val) => {
       }
     }
   }
-  // console.log(formDatas)
+  console.log(formDatas)
   // for (const key in val) {
   //   if (val[key] === 0) {
   //     break;
@@ -4591,10 +4552,9 @@ const handleSelectionChange = (val) => {
 const zdtreeType = ref(false)
 const selectData = ref([])
 const showsTable = (val,tab) => {}
-// 点击showTable 行数据时出发点击事件
 const showTable = (val,tab) => {
+	// zdtreeType.value=false
 }
-
 // 删除行
 const deleteRow = (row) => {
     ElMessageBox.confirm('确定要删除吗?', '提示', {
@@ -4668,6 +4628,8 @@ const yjonRightClick = async(row) => {
 
 const setMachineTeams = async(row) => {
 	console.log(row)
+	// console.log(row['印件资料'].split('-')[0].split('0')[1])
+	// console.log(row.UniqId)
     const res = await setMachineTeam({
 			machine: JTMC.split("#")[0],
 			order:row['工单编号|质量信息'].split('|')[0],
@@ -4681,6 +4643,7 @@ const setMachineTeams = async(row) => {
 			})
 	MachineWorkOrderEdits(row)
     if (res.code === 0) {
+      // EquipmentSchedulingEdits(row)
       ElMessage({
 		        type: 'success',
 		        message: '成功'
@@ -4727,17 +4690,6 @@ const SetMachineStatus = async (row) => {
   }
 }
 const EquipmentSchedulingEdits = async(row) => {
-	const today = new Date();
-	const year = today.getFullYear();
-	const month = String(today.getMonth() + 1).padStart(2, '0'); // 月份从 0 开始，需要补零
-	const day = String(today.getDate()).padStart(2, '0');
-	const hours = String(today.getHours()).padStart(2, '0');
-	const minutes = String(today.getMinutes()).padStart(2, '0');
-	const seconds = String(today.getSeconds()).padStart(2, '0');
-	const currentDate = `${year}-${month}-${day}`;
-	const currentTime = `${year}-${month}-${day} ${hours}:${minutes}`;
-	const currenttime = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
-	
   console.log(row)
   const res = await EquipmentSchedulingEdit([{
     capacity:row.工序产能,
@@ -4796,11 +4748,22 @@ const getDetails = async (row) => {
 // 关闭详情弹窗
 const closeDetailShow = () => {
   detailShow.value = false
+  // formData.value = {
+  //         address: '',
+  //         image: '',
+  //         name: '',
+  //         }
 }
 
 
 // 打开弹窗
-const openDialog = () => {}
+const openDialog = () => {
+    // type.value = 'create'
+
+	// console.log('222')
+	// FacilityInspect()
+ //    dialogFormVisible.value = true
+}
 let drzcData=[]
 let columnNames=[]
 //当日制程检验记录
@@ -4846,6 +4809,12 @@ const FacilityInspect = async () => {
 // 关闭弹窗
 const closeDialog = () => {
 	chanliangVisible.value=false
+  // dialogFormVisible.value = false
+  //   formData.value = {
+  //       address: '',
+  //       image: '',
+  //       name: '',
+  //       }
 }
 const equipmentCode=ref('JY01')
 const equipmentName=ref('海德堡对开')
@@ -4853,61 +4822,50 @@ const workOrder=ref('2312117')
 const number=ref('1907')
 // 弹窗确定
 const enterDialog = async () => {
- elFormRef.value?.validate( async (valid) => {
-	 if (!valid) return
-	  let res
-	  switch (type.value) {
-		case 'create':
-		  res = await createCompany(formData.value)
-		  break
-		case 'update':
-		  res = await updateCompany(formData.value)
-		  break
-		default:
-		  res = await createCompany(formData.value)
-		  break
-	  }
-	  if (res.code === 0) {
-		ElMessage({
-		  type: 'success',
-		  message: '创建/更改成功'
-		})
-		closeDialog()
-		getTableData()
-	  }
-  })
+     elFormRef.value?.validate( async (valid) => {
+             if (!valid) return
+              let res
+              switch (type.value) {
+                case 'create':
+                  res = await createCompany(formData.value)
+                  break
+                case 'update':
+                  res = await updateCompany(formData.value)
+                  break
+                default:
+                  res = await createCompany(formData.value)
+                  break
+              }
+              if (res.code === 0) {
+                ElMessage({
+                  type: 'success',
+                  message: '创建/更改成功'
+                })
+                closeDialog()
+                getTableData()
+              }
+      })
 }
 
-// const sbzyqdplanUsageCellClass = ({row, column, rowIndex, columnIndex}) =>{
-//   if(formData.value['工单编号'] === row['工单编号|质量信息'].split('|')[0]){
-//     return 'back-color-row';
-//   }
-// }
-// 班组人员及分配比例
+const sbzyqdplanUsageCellClass = ({row, column, rowIndex, columnIndex}) =>{
+  if(formData.value['工单编号'] === row['工单编号|质量信息'].split('|')[0]){
+    return 'back-color-row';
+  }
+}
 const bzryplanUsageCellClass = ({row, column, rowIndex, columnIndex}) =>{
   if(formData.value['班组Id'] === row.ID){
     return 'back-color-row';
   }
 }
-// 组员及分配比例
 const blplanUsageCellClass = ({row, column, rowIndex, columnIndex}) =>{
   if (column.property === '员工编号' || column.property === 'ygxm') {
     return 'plan-usage-low';
   }
 }
-//设备作业清单 正在生产中 背景颜色
-const sbzyqdsatusCellClass = ({row, column, rowIndex, columnIndex}) =>{
-  if (row.status === 1) {
-    return 'status-plan-usage-low';
-  }
-}
+
 </script>
+
 <style scoped>
-/* 设备作业清单 正在生产中 背景颜色 */
-:deep(.status-plan-usage-low ) {
-  background: yellow !important;
-}
-	
 .JKWTree-container {
   display: flex;
 }