样式调整

src/view/job/rewards/rewards.vue

@@ -59,6 +59,11 @@
                   icon="search"
                   @click="onSubmit"
                 >查询</el-button>
+				<el-button
+				 icon="refresh"
+				 type="primary"
+				 @click="onReset"
+				>切换显示方式</el-button>
 				<el-button
 				  type="primary"
 				  icon="search"
@@ -69,10 +74,7 @@
 				  icon="search"
 				  @click="onDel"
 				>删除</el-button>
-                <el-button
-                  icon="refresh"
-                  @click="onReset"
-                >切换显示方式</el-button>
+                
               </el-form-item>
             </el-form>
           </div>
@@ -1378,8 +1380,10 @@ const closeDialog = () => {
 const enterDialog = async() => {
 	if (type.value === 'update') {
 		  SubmitDailyProduction()
+		  
 	} else if (type.value === 'create') {
 		  add()   
+		  
 	}
 	// SubmitDailyProduction()
   // elFormRef.value?.validate(async(valid) => {
@@ -1483,8 +1487,8 @@ const enterDialog = async() => {
  	    type: 'success',
  	    message: '成功'
  	  })
-   }
-   detailShow.value = false
+	  dialogFormVisible.value = false
+   } 
    getTableData()
  }
  const add = async () => {
@@ -1560,8 +1564,9 @@ const enterDialog = async() => {
  	 	    type: 'success',
  	 	    message: '成功'
  	 	  })
+		  dialogFormVisible.value = false
  	}
- 	detailShow.value = false
+ 	
  	getTableData()
  }
 //键盘 input框跳转

src/view/layout/index.vue

@@ -381,4 +381,4 @@ const changeShadow = () => {
   background-color: hsla(0,0%,100%,.9) !important;
 }
 
-</style>
+</style>

src/view/performance/09-workOrderVerification/index.vue

@@ -73,12 +73,12 @@
               >新增
               </el-button>
               <div style="margin-left: auto;">
-                <el-button
+                <!-- <el-button
                   type="primary"
                   :icon="Download"
 				  class="bt"
                   @click="exportExcel"
-                >导出到Excel</el-button>
+                >导出到Excel</el-button> -->
               </div>
             </div>
             <!-- 数据展示 -->

src/view/performance/14-overTimePayVerification/index.vue

@@ -53,18 +53,18 @@
                 @click="onSearch"
               >搜索
               </el-button>
-              <el-button
+              <!-- <el-button
                 type="primary"
                 :icon="Refresh"
               >重置
-              </el-button>
+              </el-button> -->
               <div style="margin-left: auto;">
-                <el-button
+                <!-- <el-button
                   type="primary"
                   :icon="Download"
                   @click="exportExcel"
                 >导出到Excel
-                </el-button>
+                </el-button> -->
               </div>
             </div>
             <!-- 上半数据展示 -->

src/view/performance/Manualdocuments.vue

@@ -38,7 +38,7 @@
               <el-input v-model="positionvalue" placeholder="输入工单编号或产品名称" style="width: 180px;" />
               <el-button type="primary" class="search" icon="search" @click="onSearch"></el-button>
 			  <el-button type="primary" class="bt" icon="plus" @click="onAdd">新增</el-button>
-			  <el-button type="primary" class="bt" icon="copy-document"  @click="onCountByGdbh">切换显示方式</el-button>
+			  <!-- <el-button type="primary" class="bt" icon="copy-document"  @click="onCountByGdbh">切换显示方式</el-button> -->
               <el-button type="primary" class="bt" icon="refresh"  @click="onRefresh">刷新质检系数</el-button>
               <el-button type="primary" class="bt" icon="delete" @click="onDel">删除</el-button>
               <div style="margin-left: auto;">
@@ -1722,7 +1722,13 @@ function doubleClick(row, column, event) {
 }
 // 单击表格操作
 function Click(row, column, event) {
-    lastCellValue= row['UniqId'];
+    lastCellValue= row['UniqId'];
+	console.log(row)
+	const parts = row['sczl_yjgx'].split('-')
+	ScrapFactor.yjno=parts[0]
+	ScrapFactor.gdbh=row['sczl_gdbh']
+	ScrapFactor.type=row['sczl_检验类别']
+	ScrapFactor.gxh=parts[1]
    console.log(lastCellValue)
 
 }

src/view/performance/Packagingoutput.vue

@@ -36,8 +36,7 @@
               <el-input v-model="positionvalue" placeholder="输入工单编号或产品名称" style="width: 180px;" />
               <el-button type="primary" class="search" icon="search" @click="onSearch"></el-button>
               <el-button type="primary" class="bt" icon="plus" @click="onAdd">新增</el-button>
-              <el-button type="primary" class="bt" icon="search" @click="positioningVisible">定位</el-button>
-              <el-button type="primary" class="bt" icon="refresh">重置</el-button>
+              <!-- <el-button type="primary" class="bt" icon="search" @click="positioningVisible">定位</el-button> -->
 			  <el-button type="primary" class="bt" icon="delete" @click="Del">删除</el-button>
               <div style="margin-left: auto;">
                 <el-button type="primary" :icon="Download" @click="exportExcel">导出到Excel</el-button>

src/view/performance/chejianbaogong.vue

@@ -2,16 +2,16 @@
   <div>
 	<header>
 		<div style="height: 50px;">
-			<el-button type="primary" size="large" @click="onBZ" >班组维护</el-button>
-			<el-button type="primary" size="large" @click="onchanliang"  v-if="zdtreeType === true" >日产量上报</el-button>
-			<el-button type="primary" size="large" @click="onOver" >完工</el-button>
-			<el-button type="primary" size="large" @click="onzhicheng"  >制程检验</el-button>
-			<el-button type="primary" size="large" @click="ondianjian"  >设备点检</el-button>
-			<el-button type="primary" size="large" @click="onxuncha" >管理巡查</el-button>
-			<el-button type="primary" size="large" @click="onstatus" >设置机台状态</el-button>
-			<el-button type="primary" size="large" @click="onyinban">印版领退</el-button>
-			<el-button type="primary" size="large" @click="onClear" >换型清场</el-button>
-			<el-button type="primary" size="large" @click="oncomplaints" >客诉记录</el-button>
+			<el-button type="primary" size="large"class="bt" @click="onBZ" >班组维护</el-button>
+			<el-button type="primary" size="large"class="bt" @click="onchanliang"  v-if="zdtreeType === true" >日产量上报</el-button>
+			<el-button type="primary" size="large"class="bt" @click="onOver" >完工</el-button>
+			<el-button type="primary" size="large"class="bt" @click="onzhicheng"  >制程检验</el-button>
+			<el-button type="primary" size="large"class="bt" @click="ondianjian"  >设备点检</el-button>
+			<el-button type="primary" size="large"class="bt" @click="onxuncha" >管理巡查</el-button>
+			<el-button type="primary" size="large"class="bt" @click="onstatus" >设置机台状态</el-button>
+			<el-button type="primary" size="large"class="bt" @click="onyinban">印版领退</el-button>
+			<el-button type="primary" size="large"class="bt" @click="onClear" >换型清场</el-button>
+			<el-button type="primary" size="large"class="bt" @click="oncomplaints" >客诉记录</el-button>
 
 		</div>
 		</header>
@@ -59,7 +59,7 @@
               </el-row>
 						  <el-row :gutter="20">
 							<el-col :span="6">
-							 <el-form-item label="印件编号" prop="id">
+							 <el-form-item label="印件编号" style="font-size: 1.5vh;" prop="id">
 							   <el-input v-model="formData.印件号"  placeholder="" />
 							 </el-form-item>
 							</el-col>
@@ -100,9 +100,10 @@
 	   row-key="ID"
 	   highlight-current-row="true"
 	   border
-     :row-style="{ height: '20px' }"
+	
+     :row-style="{ height: '20px'}"
      :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
-	   style="width:100%;height: 30vh;"
+	   style="width:100%;height: 30vh; "
 	   @row-dblclick="handleSelectClick"
 	 >
 	   <el-table-column
@@ -121,31 +122,30 @@
 </div>
           <div class="gva-table-box">
             <el-tabs v-model="activName" type="card" @tab-click="duohandleClick"   >
-                        <el-tab-pane label="设备作业清单"  @click="showTable('印件资料')"   name="first">
-<!--                          highlight-current-row="true"-->
-                          <el-table ref="multipleTable"
-                                    :show-overflow-tooltip="true"
-                                    :row-style="{ height: '20px' }"
-                                    :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
-                                    :header-cell-style="{ padding: '0px' }"
-                                    @row-click="yjupdateCompanyFunc"
-                                    :cell-class-name="sbzyqdplanUsageCellClass"
-                                    style="width: 100%;height: 330px" 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="yj_yjno"  width="80"/>
-                            <el-table-column align="left" label="工单编号|质量信息" prop="工单编号|质量信息" width="180" />
-							<el-table-column align="left" label="印件资料" prop="印件资料" width="240" />
-                            <el-table-column align="left" label="工序名称" prop="工序名称" width="100" />
-                            <el-table-column align="left" label="计划产量/已完成" prop="计划产量/已完成" width="180"/>
-                            <el-table-column align="left" label="装版时数" prop="装版时数" width="100"/>
-                            <el-table-column align="left" label="工序产能" prop="工序产能" width="100"/>
-                            <el-table-column align="left" label="计划工时" prop="计划工时" width="100"/>
-                            <el-table-column align="left" label="计划生产时段" prop="计划生产时段" width="240" />
-                            <el-table-column align="left" label="排产备注" prop="排产备注" width="100" />
-                            <el-table-column align="left" label="产品名称" prop="产品名称" width="240" />
-                          </el-table>
+                        <el-tab-pane label="设备作业清单" @click="showTable('印件资料')" name="first" style="font-size: 14px;">
+                            <el-table ref="multipleTable"
+                                      :show-overflow-tooltip="true"
+                                      :row-style="{ height: '20px' }"
+                                      :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
+                                      :header-cell-style="{ padding: '0px' }"
+                                      @row-click="yjupdateCompanyFunc"
+                                      :cell-class-name="sbzyqdplanUsageCellClass"
+                                      style="width: 100%; height: 330px; font-size: 14px;" border tooltip-effect="dark" :data="sbzyData" row-key="ID" @selection-change="handleSelectionChange">
+                                <el-table-column align="left" label="选择" prop="yj_yjno" width="80"/>
+                                <el-table-column align="left" label="工单编号|质量信息" prop="工单编号|质量信息" width="180" />
+                                <el-table-column align="left" label="印件资料" prop="印件资料" width="240" />
+                                <el-table-column align="left" label="工序名称" prop="工序名称" width="100" />
+                                <el-table-column align="left" label="计划产量/已完成" prop="计划产量/已完成" width="180"/>
+                                <el-table-column align="left" label="装版时数" prop="装版时数" width="100"/>
+                                <el-table-column align="left" label="工序产能" prop="工序产能" width="100"/>
+                                <el-table-column align="left" label="计划工时" prop="计划工时" width="100"/>
+                                <el-table-column align="left" label="计划生产时段" prop="计划生产时段" width="240" />
+                                <el-table-column align="left" label="排产备注" prop="排产备注" width="100" />
+                                <el-table-column align="left" label="产品名称" prop="产品名称" width="240" />
+                            </el-table>
                         </el-tab-pane>
 
+
                         <el-tab-pane label="班组人员及分配比例" @click="showTable('工艺资料')" name="second">
                           <el-table ref="multipleTable"
                                     :show-overflow-tooltip="true"
@@ -321,7 +321,9 @@
           </el-tabs>
           </el-dialog>
 
-          <el-dialog v-model="detailShow" style="width: 105vh" lock-scroll :before-close="closeDetailShow" title="机台班组维护" destroy-on-close>
+          <el-dialog v-model="detailShow"
+		   fullscreen
+		   style="font-size: 50px;font-weight: bold;" lock-scroll :before-close="closeDetailShow" title="机台班组维护" destroy-on-close>
             <el-table ref="multipleTable"
                         :row-style="{ height: '20px' }"
                         :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
@@ -569,8 +571,8 @@
 			</div>
 			<div style="height: 17vh; width: 15vh;margin-top: 5vh;">
 				<el-button type="text"></el-button>
-				 <el-button style="margin-bottom: 1vh; width:10vh" @click="addBz" >新         增</el-button>
-				 <el-button  style="margin-bottom: 1vh;width:10vh" @click="selectBz" >更新当前班组</el-button>
+				 <el-button style="margin-bottom: 1vh; width:15vh;background-color:cornflowerblue;" @click="addBz" >新         增</el-button>
+				 <el-button  style="margin-bottom: 1vh;width:15vh;background-color:cornflowerblue;" @click="selectBz" >更新当前班组</el-button>
 <!--				 <el-button style="margin-bottom: 1vh;" @click="delBz" >删除当前班组</el-button>-->
 			</div>
 			</div>
@@ -579,7 +581,11 @@
 
 
 
-		<el-dialog v-model="complaintsShow" style="width: 100vh; height:78vh;" lock-scroll :before-close="closecomplaintsShow" title="产品客诉查询" destroy-on-close>
+		<el-dialog v-model="complaintsShow" 
+		fullscreen
+		style="font-size: 50px;font-weight: bold;"
+		lock-scroll :before-close="closecomplaintsShow" 
+		title="产品客诉查询" destroy-on-close>
 		  <el-table ref="multipleTable"
 		           :row-style="{ height: '20px' }"
 		           :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
@@ -686,8 +692,8 @@
 		  v-model="dianjianVisible"
 		  title="设备点检记录"
 		  destroy-on-close
-		  width="150vh"
-		  style="width: 100vh; height:78vh;"
+		  fullscreen
+		  style="font-size: 50px;font-weight: bold;"
 		>
 		  <el-row :gutter="24" style="margin-bottom: 0px;margin-top: 0px;">
 		    <el-col :span="4" style="margin-bottom: 0px;margin-top: 0px;">
@@ -721,7 +727,7 @@
 		        highlight-current-row="true"
 				:show-overflow-tooltip="true"
 		        border  @row-click="dianjianhandle"
-		        style="width:70vh; height:45vh; margin-top: 5px;"
+		        style="width:119vh; height:45vh; margin-top: 5px;"
 		        @row-dblclick="handleSelectClick"
 		        :row-class-name="rowClassName"
 		      >
@@ -767,7 +773,7 @@
 		        </el-table-column>
 		      </el-table>
 			  <el-row :gutter="24">
-			    <el-col :span="24">
+			    <el-col :span="17">
 			        <el-input v-model="pandingfangfa" style="margin-top=0px; height: 40px; margin-bottom: 0px;"   />
 			    </el-col>
 			  </el-row>
@@ -785,8 +791,8 @@
 		  v-model="zhichengVisible"
 		  title="制程检验记录"
 		  destroy-on-close
-		  width="160vh"
-		  style="width: 100vh; height:78vh;"
+		 fullscreen
+		 style="font-size: 50px;font-weight: bold;"
 		>
 		  <el-row :gutter="24" style="margin-top=0px; margin-bottom: 1px;">
 		    <el-col :span="5" style="margin-top=0px; margin-bottom: 0px;">
@@ -921,8 +927,8 @@
 		  v-model="huanxingVisible"
 		  title="换型清场"
 		  destroy-on-close
-		  width="145vh"
-		  style="width: 100vh; height:78vh;"
+		  fullscreen
+		  style="font-size: 50px;font-weight: bold;"
 		>
       <header>
         <div style="height: 50px;margin-left: 1vh;">
@@ -1220,8 +1226,8 @@
 		  v-model="yinbanVisible"
 		  title="印版领退"
 		  destroy-on-close
-		  width="130vh"
-		  style="width: 120vh; height:78vh;"
+		 fullscreen
+		 style="font-size: 50px;font-weight: bold;"
 		>
       <header>
         <div style="height: 50px;margin-left: 1vh;">
@@ -1262,9 +1268,9 @@
 		        :data="yinbanselectData"
 		        row-key="ID"
 		        highlight-current-row="true"
-				    :show-overflow-tooltip="true"
+				:show-overflow-tooltip="true"
 		        border  @row-click="dianjianhandle"
-		        style="width:90vh; height:50vh;"
+		        style="width:150vh; height:50vh;"
 		        @row-dblclick="handleSelectClick"
 		        :row-class-name="rowClassName"
             @selection-change="handleybSelectionChange"
@@ -1343,8 +1349,8 @@
 		  v-model="xunchaVisible"
 		  title="管理人员现场巡查记录"
 		  destroy-on-close
-		  width="162vh"
-		  style="width: 120vh; height:78vh;"
+		  fullscreen
+		  style="font-size: 50px;font-weight: bold;"
 		>
 		  <el-row :gutter="24" style="margin-top=0px; margin-bottom: 1px;">
 		    <el-col :span="4" style="margin-top=0px; margin-bottom: 0px;">
@@ -1420,10 +1426,10 @@
 		        row-key="ID"
 		        highlight-current-row="true"
 		        border  @row-click="dianjianhandle"
-		        style="width:90vh; height:42vh;"
+		        style="width:170vh; height:42vh;"
 		        @row-dblclick="handleSelectClick"
 		        :row-class-name="rowClassName"
-			    	:show-overflow-tooltip="true"
+			    :show-overflow-tooltip="true"
 		      >
 		        <el-table-column
 		          prop="工单编号"
@@ -1500,10 +1506,9 @@
 
 		<el-dialog
 		  v-model="chanliangVisible"
-		  title="日产量上报"
-		  destroy-on-close
-		  width="130vh"
-		  style="height: 110vh;"
+		  title="日产量上报"		  
+		  fullscreen
+		  style="font-size: 2vh;font-weight: bold;"
 		>
 		  <el-row :gutter="24" style="margin-top=0px; margin-bottom: 1px;">
 		          <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
@@ -3136,6 +3141,7 @@ const yinbanNodeClick = (node, check, nodeData) => {
 };
 const onyinban = async() => {
 	const res = await facilityPrintGetTab({productCode:formData.value.productCode})
+	// const res = await facilityPrintGetTab({productCode:'104601001'})
 	if(res.code===0){
 		yinbantreeData.value=[{
 			label:'产品印版库',
@@ -3232,8 +3238,8 @@ function oncomplaints() {
 const Complaints = async() => {
 	complaintsData.value=[]
 	selectedRowData.value={}
-    // const res = await ComplaintRecord({productCode :formData.value.productCode})
-	const res = await ComplaintRecord({productCode :100601011})
+    const res = await ComplaintRecord({productCode :formData.value.productCode})
+	// const res = await ComplaintRecord({productCode :100601011})
     if (res.msg === '成功') {
 		complaintsData.value=res.data;
 		selectedRowData.value=complaintsData.value[0]
@@ -3599,7 +3605,7 @@ const ReportInfo = async () => {
       上机时间:formData.value.上机时间,
       装版总时长:0,
       定额代号:formData.value.定额代号,
-      sczl_jtbh: classInfo.sczl_jtbh.split('#')[0],
+      sczl_jtbh: JTMC,
       sczl_bzdh: classInfo.sczl_bzdh,
       sys_id: classInfo.sys_id,
       sys_rq: classInfo.sys_rq,
@@ -4718,6 +4724,14 @@ const bzryplanUsageCellClass = ({row, column, rowIndex, columnIndex}) =>{
      width:150px;
      text-align:center;
      background-color:white}
+	 .bt {
+	   height: 5vh;
+	   width: 14vh;
+	   font-size:2vh;
+	 }
+	  .gva-table-box{
+	   font-size: 15px;
+	}
 /* 选中某行时的背景色*/
 :deep(.el-table__body tr.current-row)>td {
   background: #ff80ff !important;

src/view/yunyin/renliziyuan/renyuanjibenziliao.vue

@@ -46,9 +46,9 @@
                       highlight-current-row="true" @row-dblclick="updateCompanyFunc"
                       @row-click="tableRowClick" :show-overflow-tooltip="true"
                       @selection-change="handleSelectionChange">
-              <el-table-column  sortable align="center" label="员工编号" prop="员工编号"  width="80" />
-              <el-table-column  sortable align="left" label="员工姓名" prop="员工姓名"  width="80"/>
-              <el-table-column  sortable  align="center" label="性别" prop="性别" width="45"/>
+              <el-table-column  sortable align="center" label="员工编号" prop="员工编号"  width="120" />
+              <el-table-column  sortable align="left" label="员工姓名" prop="员工姓名"  width="120"/>
+              <el-table-column  sortable  align="center" label="性别" prop="性别" width="120"/>
               <el-table-column  sortable  align="left" label="聘用日期" prop="聘用日期" width="110" />
               <el-table-column  sortable  align="left" label="转正日期" prop="转正日期" width="110" />
               <el-table-column  sortable  align="left" label="所在部门" prop="所在部门" width="110"  />
@@ -56,13 +56,13 @@
               <el-table-column  sortable  align="left" label="身份证号" prop="身份证号" width="160" />
               <el-table-column  sortable  align="left" label="出生日期" prop="出生日期" width="110" />
               <el-table-column  sortable  align="left" label="人员性质" prop="人员性质" width="110" />
-              <el-table-column  sortable  align="left" label="人员类别" prop="人员类别" width="90" />
+              <el-table-column  sortable  align="left" label="人员类别" prop="人员类别" width="120" />
               <el-table-column  sortable  align="left" label="班次类型" prop="班次类型" width="120" />
-              <el-table-column  sortable  align="left" label="工资表类别" prop="工资表类别" width="160" />
-              <el-table-column  sortable  align="left" label="薪酬核算分组" prop="薪酬核算分组" width="110" />
-              <el-table-column  sortable  align="left" label="MES在职" prop="在职状态" width="80" />
-              <el-table-column  sortable  align="left" label="U8在职" prop="U8在职" width="80" />
-              <el-table-column  sortable  align="left" label="U8离职日期" prop="U8离职日期" width="110" />
+              <el-table-column  sortable  align="left" label="工资表类别" prop="工资表类别" width="140" />
+              <el-table-column  sortable  align="left" label="薪酬核算分组" prop="薪酬核算分组" width="140" />
+              <el-table-column  sortable  align="left" label="MES在职" prop="在职状态" width="120" />
+              <el-table-column  sortable  align="left" label="U8在职" prop="U8在职" width="120" />
+              <el-table-column  sortable  align="left" label="U8离职日期" prop="U8离职日期" width="120" />
               <el-table-column  sortable  align="left" label="创建用户" prop="sys_id" width="110" />
               <el-table-column  sortable  align="left" label="创建时间" prop="sys_rq" width="110" />
               <el-table-column  sortable  align="left" label="修改时间" prop="mod_rq" width="110" />