优化

src/view/performance/chejianbaogong.vue

@@ -15,55 +15,39 @@
 			<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>
+		</div>
+	</header>
+	
     <el-container>
-      <!-- <el-aside width="200px">
-        <div class="JKWTree-tree">
-          <h3  > 车间报工</h3>
-          <el-tree :data="treeData" :props="defaultProps" :default-expand-all="true" @node-click="handleNodeClick"></el-tree>
-        </div>
-      </el-aside> -->
       <el-container>
-<!--        <el-header>dd</el-header>-->
         <el-main>
-
 <div class="gva-search-box" style=" overflow: hidden; padding: 0; margin-top:20px;display: flex;">
-	<div style="flex: 1; border: 0px magenta solid; margin: 0; padding: 0; margin-left: 20px; margin-top: 20px; color: red;">
+		<div style="flex: 1; border: 0px magenta solid; margin: 0; padding: 0; margin-left: 20px; margin-top: 20px; color: red;">
+	  
 	  <el-row :gutter="20">
 		<el-col :span="5">
-		  <el-form-item label="机台号" prop="id" label-width="60" class="zy-label">
-			<el-input v-model="formData.机台号"  placeholder=""/>
-		  </el-form-item>
+		  <el-form-item label="机台号" prop="id" label-width="60" class="zy-label"><el-input v-model="formData.机台号"  placeholder=""/></el-form-item>
 		</el-col>
 		<el-col :span="6">
-		  <el-form-item label="工单编号" prop="id">
-			<el-input v-model="formData.工单编号"  placeholder=""  />
-		  </el-form-item>
+		  <el-form-item label="工单编号" prop="id"><el-input v-model="formData.工单编号"  placeholder=""  /></el-form-item>
 		</el-col>
 		<el-col :span="12">
-		  <el-form-item label=" "prop="name">
-			<el-input v-model="formData.产品名称"  placeholder="" />
-		  </el-form-item>
+		  <el-form-item label=" "prop="name"><el-input v-model="formData.产品名称"  placeholder="" /></el-form-item>
 		</el-col>
 	  </el-row>
+	  
 	  <el-row :gutter="20">
 		<el-col :span="7">
-		 <el-form-item label="印件编号" style="font-size: 1.5vh;" prop="id">
-		   <el-input v-model="formData.印件号"  placeholder="" />
-		 </el-form-item>
+		 <el-form-item label="印件编号" style="font-size: 1.5vh;" prop="id"><el-input v-model="formData.印件号"  placeholder="" /></el-form-item>
 		</el-col>
 	  <el-col :span="15">
-		 <el-form-item label="工序名称" prop="name">
-		   <el-input v-model="formData.工序名称"  placeholder="" />
-		 </el-form-item>
+		 <el-form-item label="工序名称" prop="name"><el-input v-model="formData.工序名称"  placeholder="" /></el-form-item>
 		</el-col>
 	  </el-row>
 
 	  <el-row :gutter="20">
 		<el-col :span="4">
-		 <el-form-item label="班组成员" prop="id">
-		 </el-form-item>
+		 <el-form-item label="班组成员" prop="id"></el-form-item>
 		</el-col>
 	  </el-row>
 
@@ -90,20 +74,13 @@
 	   <el-table-column prop="completed" label="已完成板数" width="160" />
 	 </el-table>
 	</div>
-
 </div>
 
-          <div class="gva-table-box" style="margin-top: 20px;">
-            <el-tabs v-model="activName" type="card" @tab-click="duohandleClick"   >
+	<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' }"
+				<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"
@@ -189,43 +166,23 @@
               <el-table-column align="left" label="色度数" prop="色度" width="100" />
             </el-table>
 		</el-tab-pane>
-
-                        <el-tab-pane label="检验记录" @click="showTable('检验记录')" name="fourth">
-                        <el-table ref="multipleTable"
-                                  :row-style="{ height: '40px' }"
-                                  :cell-style="{ padding: '0px'}" :header-row-style="{ height: '40px' }"
-                                  :header-cell-style="{ padding: '0px' }"
-                                  :show-overflow-tooltip="true"
-                                  highlight-current-row="true"
-                                  style="width: 100%;height: 400px;color:purple;font-weight: bold;" border tooltip-effect="dark" :data="JYData" row-key="ID" @selection-change="handleSelectionChange">
-            <!--              <el-table-column type="selection" width="55" />-->
-                          <el-table-column align="left" label="工单编号" prop="工单编号"  width="120"/>
-                          <el-table-column align="left" label="印件号" prop="印件号" width="120" />
-                          <el-table-column align="left" label="工序名称" prop="工序名称" width="430" />
-                          <el-table-column align="left" label="检验项目" prop="检验项目" width="1140"/>
-                          <el-table-column
-                             v-for="time in columnNames"
-                             :key="time"
-                             :label="time"
-                             :prop="time"
-                             align="center"
-                             width="120"
-                           ></el-table-column>
-                        </el-table>
-                        </el-tab-pane>
-                      </el-tabs>
-            <!-- <div class="gva-pagination">
-              <el-pagination
-                  layout="total, sizes, prev, pager, next, jumper"
-                  :current-page="page"
-                  :page-size="pageSize"
-                  :page-sizes="[10, 30, 50, 100]"
-                  :total="total"
-                  @current-change="handleCurrentChange"
-                  @size-change="handleSizeChange"
-              />
-            </div> -->
-          </div>
+		
+			<el-tab-pane label="检验记录" @click="showTable('检验记录')" name="fourth">
+			<el-table ref="multipleTable" :row-style="{ height: '40px' }" :cell-style="{ padding: '0px'}" :header-row-style="{ height: '40px' }"
+					  :header-cell-style="{ padding: '0px' }" :show-overflow-tooltip="true" highlight-current-row="true"
+					  style="width: 100%;height: 400px;color:purple;font-weight: bold;" border tooltip-effect="dark" :data="JYData" row-key="ID" @selection-change="handleSelectionChange">
+			  <!--<el-table-column type="selection" width="55" />-->
+			  <el-table-column align="left" label="工单编号" prop="工单编号"  width="120"/>
+			  <el-table-column align="left" label="印件号" prop="印件号" width="120" />
+			  <el-table-column align="left" label="工序名称" prop="工序名称" width="430" />
+			  <el-table-column align="left" label="检验项目" prop="检验项目" width="1140"/>
+			  <el-table-column v-for="time in columnNames" :key="time" :label="time" :prop="time" align="center" width="120"></el-table-column>
+			</el-table>
+			</el-tab-pane>
+		</el-tabs>
+	</div>
+		  
+		  
           <el-dialog v-model="dialogFormVisible" :before-close="closeDialog" :title="type==='create'?'添加':'修改'" destroy-on-close>
           <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
             <el-tab-pane label="当日上报产量"  @click="showTable('工艺资料')"  name="first">
@@ -2047,7 +2004,8 @@ import {
   facilityProcedure,
   dailysearch,
   dailygetGzByYgbh,
-  MachineChanliangDetail
+  MachineChanliangDetail,
+  getTimelist
 } from '@/api/jixiaoguanli/jitairibaobiao'
 
 import {
@@ -3550,17 +3508,6 @@ const FieldInspectionRecord = async () => {
 const GetMachineMac = async (addr) => {
   console.log(addr);
   const response = await getMachineMac({ addr: addr });
-  // const response = await getMachineMac({ addr: '68-ED-A4-26-60-84' });
-  // const response = await getMachineMac({ addr: '68-ED-A4-26-5D-90' });
-  // const response = await getMachineMac({ addr: '68-ED-A4-26-5E-50' });
-  // const response = await getMachineMac({ addr: '68-ED-A4-26-60-CC' });
-  // const response = await getMachineMac({ addr: '68-ED-A4-26-5F-8E' });
-  // const response = await getMachineMac({ addr: '68-ED-A4-26-60-C8' });
-  // const response = await getMachineMac({ addr: '40-62-31-21-4E-15' });
-  // const response = await getMachineMac({ addr: '68-ED-A4-26-5F-42' });
-  // const response = await getMachineMac({ addr: '68-ED-A4-26-60-E5' });
-  // const response = await getMachineMac({ addr: '68-ED-A4-26-5E-4E' });
-  // const response = await getMachineMac({ addr: '68-ED-A4-26-60-D1' });
   if (response.code === 0) {
     if(response.data===null){
       // JTMC = 'JY01#';
@@ -3646,18 +3593,6 @@ 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() {
 	//日产量上报弹窗开启
@@ -3667,29 +3602,31 @@ function onchanliang() {
 
 //日产量详情获取
 const ReportInfo = async () => {
-	console.log(formData)
+	const getTimelistss = await getTimelist();
+	console.log(getTimelistss)
+	console.log("获取下机时间")
+	
+	// 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}`;
+	// 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")
+	// 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,
@@ -3698,8 +3635,8 @@ const ReportInfo = async () => {
 	  product_name: order_info.product_name,
 	  yj_name: order_info.yj_name,
 	  gy_name: order_info.gy_name,
-	  日期:currentDate,
-	  下机时间:currenttimes,
+	  日期:getTimelistss.data.date,
+	  下机时间:getTimelistss.data.hours,
 	  上机时间:formData.value.上机时间,
 	  装版总时长:0,
 	  定额代号:formData.value.定额代号,
@@ -3747,7 +3684,6 @@ const ReportInfo = async () => {
 	chanliangselectData.splice(0, chanliangselectData.length, ...response.data.bom)
 	chanliangVisible.value = true
 	}
-  // getTableData()
 }
 
 //日产量上报提交按钮