曹鹤洋 1 жил өмнө
parent
commit
3ee15f35e6

+ 10 - 10
src/view/performance/Dayreportattached.vue

@@ -51,16 +51,16 @@
 			  @selection-change="handleSelectionChange" @row-click="Click"
 			  :show-overflow-tooltip="true" @row-dblclick="doubleClick">
               <!-- <el-table-column type="selection" width="55" /> -->
-              <el-table-column align="left" label="生产日期" prop="sczl_rq" width="120"/>
-              <el-table-column align="left" label="设备编号" prop="sczl_jtbh" width="120"/>
-              <el-table-column align="left" label="设备名称" prop="sczl_sbmc" width="340"/>
-              <el-table-column align="left" label="班组编号" prop="sczl_bzdh" width="120"/>
-              <el-table-column align="left" label="排班工时" prop="sczl_设备运行工时" width="120"/>
-              <el-table-column align="left" label="备注" prop="sczl_desc" width="120"/>
-              <el-table-column align="left" label="创建用户" prop="sys_id" width="120"/>
-              <el-table-column align="left" label="创建时间" prop="sys_rq" width="160"/>
-              <el-table-column align="left" label="修改时间" prop="mod_rq" width="160"/>
-              <el-table-column align="left" label="UNIQID" prop="UniqId" width="120"/>
+              <el-table-column align="left" sortable label="生产日期" prop="sczl_rq" width="105"/>
+              <el-table-column align="left" sortable label="设备编号" prop="sczl_jtbh" width="105"/>
+              <el-table-column align="left" sortable label="设备名称" prop="sczl_sbmc" width="250"/>
+              <el-table-column align="left" sortable label="班组编号" prop="sczl_bzdh" width="105"/>
+              <el-table-column align="left" sortable label="排班工时" prop="sczl_设备运行工时" width="105"/>
+              <el-table-column align="left" sortable label="备注" prop="sczl_desc" width="120"/>
+              <el-table-column align="left" sortable label="创建用户" prop="sys_id" width="120"/>
+              <el-table-column align="left" sortable label="创建时间" prop="sys_rq" width="160"/>
+              <el-table-column align="left" sortable label="修改时间" prop="mod_rq" width="160"/>
+              <el-table-column align="left" sortable label="UNIQID" prop="UniqId" width="120"/>
             </el-table>
             <!-- 分页 -->
             <div class="gva-pagination">

+ 40 - 40
src/view/performance/Dayreports.vue

@@ -35,8 +35,8 @@
             <el-form-item>
 			  <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="copy-document" @click="onCountByGdbh">切换显示方式</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="delete" @click="onDel">删除</el-button>
               <div style="margin-left: auto;">
                 <el-button type="primary" class="bt" icon="download" @click="exportExcel">导出到Excel</el-button>
@@ -51,45 +51,45 @@
 			  :show-overflow-tooltip="true" @row-click="Click"
 			  @selection-change="handleSelectionChange" @row-dblclick="doubleClick">
               <!-- <el-table-column type="selection" width="55" /> -->
-              <el-table-column fixed align="left" label="工单编号" prop="sczl_gdbh" width="90"/>
-              <el-table-column fixed align="left" label="产品名称" prop="Gd_cpmc"  width="250"/>
-              <el-table-column align="left" label="印件及工序" prop="jyno_gxmc"  width="120"/>
-              <el-table-column align="left" label="生产日期" prop="sczl_rq"  width="100"/>
-              <el-table-column align="left" label="机台" prop="sczl_jtbh"  width="80"/>
-              <el-table-column align="left" label="班组" prop="sczl_bzdh"  width="60"/>
-              <el-table-column align="left" label="流程单" prop="sczl_num"  width="80"/>
-              <el-table-column align="left" label="车头产量" prop="sczl_cl"  width="100"/>
-              <el-table-column align="left" label="色度数" prop="sczl_ms" width="80" />
-			  <el-table-column align="left" label="制程废" prop="sczl_zcfp" width="80" />
-			  <el-table-column align="left" label="次品" prop="sczl_zccp"  width="80"/>
-			  <el-table-column align="left" label="来料异常" prop="incomingerror"  width="90"/>
-			  <el-table-column align="left" label="装版工时" prop="sczl_装版工时"  width="90"/>
-			  <el-table-column align="left" label="保养工时" prop="sczl_保养工时"  width="90"/>
-			  <el-table-column align="left" label="打样工时" prop="sczl_打样工时"  width="90"/>
-			  <el-table-column align="left" label="异常停机工时" prop="sczl_异常停机工时"  width="120"/>
-			  <el-table-column align="left" label="设备运行工时" prop="sczl_设备运行工时"  width="120"/>
-			  <el-table-column align="left" label="组员编号1" prop="sczl_bh1" width="100"/>
-			  <el-table-column align="left" label="组员姓名1" prop="name1"  width="100"/>
-			  <el-table-column align="left" label="组员编号2" prop="sczl_bh2"  width="100"/>
-			  <el-table-column align="left" label="组员姓名2" prop="name2" width="100" />
-			  <el-table-column align="left" label="组员编号3" prop="sczl_bh3"  width="100"/>
-			  <el-table-column align="left" label="组员姓名3" prop="name3" width="100"/>
-			  <el-table-column align="left" label="组员编号4" prop="sczl_bh4" width="100"/>
-			  <el-table-column align="left" label="组员姓名4" prop="name4"width="100" />
-			  <el-table-column align="left" label="组员编号5" prop="sczl_bh5" width="100"/>
-			  <el-table-column align="left" label="组员姓名5" prop="name5" width="100"/>
-			  <el-table-column align="left" label="组员编号6" prop="sczl_bh6"width="100" />
-			  <el-table-column align="left" label="组员姓名6" prop="name6" width="100"/> 
-			  <el-table-column align="left" label="拆片联拼系数" prop="拆片联拼系数" width="120"/>
-			  <el-table-column align="left" label="拆片条小盒系数" prop="拆片条小盒系数" width="130"/>
-			  <el-table-column align="left" label="工价系数" prop="sczl_工价系数" width="100"/>
-			  <el-table-column align="left" label="日定额" prop="日定额" width="80"/>
-			  <el-table-column align="left" label="千件工价" prop="piecesprice " width="100"/>
-			  <el-table-column align="left" label="补产标准" prop="addstandards " width="100"/>
-			  <el-table-column align="left" label="创建用户" prop="sys_id" width="120"/>
-              <el-table-column align="left" label="创建时间" prop="sys_rq" width="160"/>
-              <el-table-column align="left" label="修改时间" prop="mod_rq" width="160"/>
-              <el-table-column align="left" label="UNIQID" prop="UniqId" width="100"/>
+              <el-table-column fixed align="left" sortable label="工单编号" prop="sczl_gdbh" width="105"/>
+              <el-table-column fixed align="left" sortable label="产品名称" prop="Gd_cpmc"  width="250"/>
+              <el-table-column align="left" sortable label="印件及工序" prop="jyno_gxmc"  width="120"/>
+              <el-table-column align="left" sortable label="生产日期" prop="sczl_rq"  width="120"/>
+              <el-table-column align="left" sortable label="机台" prop="sczl_jtbh"  width="77"/>
+              <el-table-column align="left" sortable label="班组" prop="sczl_bzdh"  width="77"/>
+              <el-table-column align="left" sortable label="流程单" prop="sczl_num"  width="91"/>
+              <el-table-column align="left" sortable label="车头产量" prop="sczl_cl"  width="120"/>
+              <el-table-column align="left" sortable label="色度数" prop="sczl_ms" width="91" />
+			  <el-table-column align="left" sortable label="制程废" prop="sczl_zcfp" width="91" />
+			  <el-table-column align="left" sortable label="次品" prop="sczl_zccp"  width="77"/>
+			  <el-table-column align="left" sortable label="来料异常" prop="incomingerror"  width="105"/>
+			  <el-table-column align="left" sortable label="装版工时" prop="sczl_装版工时"  width="105"/>
+			  <el-table-column align="left" sortable label="保养工时" prop="sczl_保养工时"  width="105"/>
+			  <el-table-column align="left" sortable label="打样工时" prop="sczl_打样工时"  width="105"/>
+			  <el-table-column align="left" sortable label="异常停机工时" prop="sczl_异常停机工时"  width="133"/>
+			  <el-table-column align="left" sortable label="设备运行工时" prop="sczl_设备运行工时"  width="133"/>
+			  <el-table-column align="left" sortable label="组员编号1" prop="sczl_bh1" width="113"/>
+			  <el-table-column align="left" sortable label="组员姓名1" prop="name1"  width="113"/>
+			  <el-table-column align="left" sortable label="组员编号2" prop="sczl_bh2"  width="113"/>
+			  <el-table-column align="left" sortable label="组员姓名2" prop="name2" width="113" />
+			  <el-table-column align="left" sortable label="组员编号3" prop="sczl_bh3"  width="113"/>
+			  <el-table-column align="left" sortable label="组员姓名3" prop="name3" width="113"/>
+			  <el-table-column align="left" sortable label="组员编号4" prop="sczl_bh4" width="113"/>
+			  <el-table-column align="left" sortable label="组员姓名4" prop="name4"width="113" />
+			  <el-table-column align="left" sortable label="组员编号5" prop="sczl_bh5" width="113"/>
+			  <el-table-column align="left" sortable label="组员姓名5" prop="name5" width="113"/>
+			  <el-table-column align="left" sortable label="组员编号6" prop="sczl_bh6"width="113" />
+			  <el-table-column align="left" sortable label="组员姓名6" prop="name6" width="113"/> 
+			  <el-table-column align="left" sortable label="拆片联拼系数" prop="拆片联拼系数" width="133"/>
+			  <el-table-column align="left" sortable label="拆片条小盒系数" prop="拆片条小盒系数" width="147"/>
+			  <el-table-column align="left" sortable label="工价系数" prop="sczl_工价系数" width="105"/>
+			  <el-table-column align="left" sortable label="日定额" prop="日定额" width="91"/>
+			  <el-table-column align="left" sortable label="千件工价" prop="piecesprice " width="105"/>
+			  <el-table-column align="left" sortable label="补产标准" prop="addstandards " width="105"/>
+			  <el-table-column align="left" sortable label="创建用户" prop="sys_id" width="120"/>
+              <el-table-column align="left" sortable label="创建时间" prop="sys_rq" width="160"/>
+              <el-table-column align="left" sortable label="修改时间" prop="mod_rq" width="160"/>
+              <el-table-column align="left" sortable label="UNIQID" prop="UniqId" width="100"/>
 			  <!-- <el-table-column align="left" label="table_type"  prop="table_type" width="120"/> -->
 			<tbody>
 			  <tr v-for="row in filteredRows" :key="row.sczl_gdbh">

+ 312 - 318
src/view/performance/MachineDocuments.vue

@@ -11,21 +11,10 @@
       </el-aside> -->
 	  
 	  
-	  <layout-sider
-	     :resize-directions="['right']"
-	     :width="220"
-	     style="margin-right: 10px;"
-	   >
-	     <div
-	       class="JKWTree-tree"
-	       style="height: 70vh;"
-	     >
+	  <layout-sider :resize-directions="['right']" :width="220" style="margin-right: 10px;" >
+	     <div class="JKWTree-tree" style="height: 70vh;" >
 	       <h3>机器检验计件单据维护</h3>
-	       <el-tree
-	         :data="treeData"
-	         highlight-current
-	         @node-click="handleNodeClick"
-	       />
+	       <el-tree :data="treeData" highlight-current @node-click="handleNodeClick" />
 	     </div>
 	   </layout-sider>
       <el-container>
@@ -33,46 +22,43 @@
         <el-main>
           <!-- 按钮区域 -->
           <div class="gva-table-box">
-            <div class="gva-btn-list">
-              <el-row :span="6">
-                <el-input v-model="positionvalue" placeholder="输入工单编号或产品名称" />
-              </el-row>
-              <el-button type="primary" :icon="Search" @click="onSearch">搜索</el-button>
-              <el-button type="primary" :icon="Refresh" @click="onRefresh">刷新质检系数</el-button>
-			   <el-button type="primary"  @click="onCountByGdbh">切换显示方式</el-button>
-			   <el-button type="primary" :icon="Refresh" @click="onAdd">新增</el-button>
-			  <el-button type="primary" :icon="Refresh" @click="onDel">删除</el-button>
+            <el-form-item>
+              <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="refresh" @click="onRefresh">刷新质检系数</el-button>
+			  <el-button type="primary" class="bt" icon="delete" @click="onDel">删除</el-button>
               <div style="margin-left: auto;">
                 <el-button type="primary" :icon="Download" @click="exportExcel">导出到Excel</el-button>
               </div>
-            </div>
+            </el-form-item>
             <!-- 数据展示 -->
             <el-table ref="multipleTable" style="width: 100%" tooltip-effect="dark" :data="tableData" row-key="ID"
               highlight-current-row="true" border @selection-change="handleSelectionChange"  @row-click="Click"
 			  :show-overflow-tooltip="true" @row-dblclick="doubleClick">
-              <el-table-column type="selection" width="55" />
-              <el-table-column align="left" label="分类" prop="sczl_单据类型" width="120"/>
-              <el-table-column align="left" label="工单印件" prop="combinedProp"width="340"/>
-              <el-table-column align="left" label="印件工序" prop="combinedProp2" width="220"/>
-              <el-table-column align="left" label="机台编号" prop="sczl_jtbh" width="120"/>
-              <el-table-column align="left" label="机台" prop="sczl_jtbh" width="120"/>
-              <el-table-column align="left" label="日期" prop="sczl_rq" width="120"/>
-              <el-table-column align="left" label="计件产量" prop="sczl_cl" width="120"/>
-              <el-table-column align="left" label="检验类别" prop="sczl_检验类别" width="120"/>
-              <el-table-column align="left" label="废品率系数" prop="sczl_废品率系数" width="120"/>
-			  <el-table-column align="left" label="日定额" prop="日定额" width="120"/>
-			  <el-table-column align="left" label="员工姓名1" prop="sczl_bh1_name" width="120"/>
-			  <el-table-column align="left" label="员工姓名2" prop="sczl_bh2_name"width="120" />
-			  <el-table-column align="left" label="员工姓名3" prop="sczl_bh3_name" width="120"/>
-			  <el-table-column align="left" label="员工姓名4" prop="sczl_bh4_name"width="120" />
-			  <el-table-column align="left" label="班组代号" prop="sczl_bzdh" width="120"/>
-			  <el-table-column align="left" label="千件工价" prop="千件工价" width="120"/>
-			  <el-table-column align="left" label="日通电工时" prop="sczl_设备运行工时" width="120"/>
-			  <el-table-column align="left" label="流程单备注" prop="qczl_NumDesc" width="120"/>			
-			  <el-table-column align="left" label="创建用户" prop="sys_id" width="120"/>
-              <el-table-column align="left" label="创建时间" prop="sys_rq" width="160"/>
-              <el-table-column align="left" label="修改时间" prop="mod_rq" width="160"/>
-              <el-table-column align="left" label="UNIQID" prop="UniqId" width="120"/>			
+              <el-table-column align="left" sortable label="分类" prop="sczl_单据类型" width="77"/>
+              <el-table-column align="left" sortable label="工单印件" prop="combinedProp"width="250"/>
+              <el-table-column align="left" sortable label="印件工序" prop="combinedProp2" width="120"/>
+              <el-table-column align="left" sortable label="机台编号" prop="sczl_jtbh" width="105"/>
+              <el-table-column align="left" sortable label="机台" prop="sczl_jtbh" width="77"/>
+              <el-table-column align="left" sortable label="日期" prop="sczl_rq" width="105"/>
+              <el-table-column align="left" sortable label="计件产量" prop="sczl_cl" width="105"/>
+              <el-table-column align="left" sortable label="检验类别" prop="sczl_检验类别" width="105"/>
+              <el-table-column align="left" sortable label="废品率系数" prop="sczl_废品率系数" width="120"/>
+			  <el-table-column align="left" sortable label="日定额" prop="日定额" width="91"/>
+			  <el-table-column align="left" sortable label="员工姓名1" prop="sczl_bh1_name" width="113"/>
+			  <el-table-column align="left" sortable label="员工姓名2" prop="sczl_bh2_name"width="113" />
+			  <el-table-column align="left" sortable label="员工姓名3" prop="sczl_bh3_name" width="113"/>
+			  <el-table-column align="left" sortable label="员工姓名4" prop="sczl_bh4_name"width="113" />
+			  <el-table-column align="left" sortable label="班组代号" prop="sczl_bzdh" width="105"/>
+			  <el-table-column align="left" sortable label="千件工价" prop="千件工价" width="105"/>
+			  <el-table-column align="left" sortable label="日通电工时" prop="sczl_设备运行工时" width="120"/>
+			  <el-table-column align="left" sortable label="流程单备注" prop="qczl_NumDesc" width="120"/>			
+			  <el-table-column align="left" sortable label="创建用户" prop="sys_id" width="120"/>
+              <el-table-column align="left" sortable label="创建时间" prop="sys_rq" width="160"/>
+              <el-table-column align="left" sortable label="修改时间" prop="mod_rq" width="160"/>
+              <el-table-column align="left" sortable label="UNIQID" prop="UniqId" width="120"/>			
             </el-table>
             <!-- 分页 -->
             <div class="gva-pagination">
@@ -84,270 +70,136 @@
           </div>
           <!-- 弹出框 -->
           <el-dialog v-model="dialogFormVisible" :before-close="closeDialog" :title="type === 'create' ? '添加' : '修改'"
-            destroy-on-close width="1200px">
+            destroy-on-close width="1000px">
             <!-- <el-scrollbar height="500px"> -->
-             <el-form :model="formData" label-position="left" ref="elFormRef" :rules="rule">
-				 
-				 
-				 
-			  <el-row :gutter="20">
-					 <el-col :span="4">
-					   <el-form-item label="日期" prop="id">
-						 <el-input v-model="formData.sczl_rq" id="日期"  @keydown="ent($event, '其他备注', '日期', '组别')" :clearable="true" placeholder="" />
-					   </el-form-item>
-					 </el-col>
-					 <el-col :span="6">
-					   <el-form-item label="组别" prop="name">
-						 <el-row :gutter="20">
-						   <el-col :span="12">
-							 <el-input v-model="formData.sczl_bzdh" id="组别"  @keydown="ent($event, '日期', '组别', '工单编号')" :clearable="true" placeholder="" />
-						   </el-col>                      
-						 </el-row>
-					   </el-form-item>
-					 </el-col>
-				   </el-row> 
-				   
-				   
-				<el-row :gutter="20">
-					 <el-col :span="4">
-					   <el-form-item label="工单编号" prop="id">
-						 <el-input v-model="formData.sczl_gdbh"id="工单编号"  @keydown="ent($event, '日期', '工单编号', 'sczl_yjgx')"  @keyup.enter.native="getMachineGxMcsubmit" :clearable="true" placeholder="" />
-					   </el-form-item>
-					 </el-col>
-					 <el-col :span="20">
-					   <!-- <el-form-item label="组别" prop="name"> -->
-						 <el-row :gutter="20">
-						   <el-col :span="5">
-							 <el-input v-model="formData.sczl_yjgx" id="sczl_yjgx"  @keydown="ent($event, '工单编号', 'sczl_yjgx', 'sczl_gxmc')" :clearable="true" placeholder="" />
-						   </el-col>
-							<el-col :span="5">
-							 <el-input v-model="formData.sczl_gxmc" id="sczl_gxmc"  @keydown="ent($event, 'sczl_yjgx', 'sczl_gxmc', 'yj_yjmc')" :clearable="true" placeholder="" />
-							</el-col>  
-							<el-col :span="5">
-							 <el-input v-model="formData.yj_yjmc" id="yj_yjmc"  @keydown="ent($event, 'sczl_gxmc', 'yj_yjmc', '机台编号')" :clearable="true" placeholder="" />
-							</el-col>  					 
-						 </el-row>
-					   <!-- </el-form-item> -->
-					 </el-col>					 
-				   </el-row>
+             <el-form :model="formData" label-position="right" ref="elFormRef" :rules="rule" label-width="70px" >
+			  <el-row :gutter="24">
+				 <el-col :span="4">
+				   <el-form-item label="日期" prop="id" class="mab">
+					 <el-input type="date" max="9999-12-31" v-model="formData.sczl_rq" id="日期"  @keydown="ent1($event, '其他备注', '日期', '组别')"   />
+				   </el-form-item>
+				 </el-col>
+				 <el-col :span="4">
+				   <el-form-item label="组别" prop="name" label-width="90px" class="mab">
+						 <el-input v-model="formData.sczl_bzdh" id="组别"  @keydown="ent1($event, '日期', '组别', '工单编号')"   />
+				   </el-form-item>
+				 </el-col>
+			   </el-row>  
+				<el-row :gutter="24">
+					<el-col :span="24">
+						  <el-form-item label="工单编号" prop="id" class="mab">
+							<el-input v-model="formData.sczl_gdbh" id="工单编号"  @keydown="ent1($event, '每箱数', '工单编号', 'yjgx')" @blur="getGxMcsubmit" style="width: 118px; margin-right: 5px;"/>
+							<el-input v-model="formData.sczl_yjgx" id="yjgx"  @keydown="ent1($event, '工单编号', 'yjgx', 'gxmc')" style="width: 80px; margin-right: 5px;"/>
+							<el-input v-model="formData.sczl_gxmc" id="gxmc"  @keydown="ent1($event, 'yjgx', 'gxmc', 'yjmc')" style="width: 135px; margin-right: 5px;"/>
+							<el-input v-model="formData.yj_yjmc" id="yjmc"  @keydown="ent1($event, 'gxmc', 'yjmc', '产量合计')" style="width: 542px;"/>
+						  </el-form-item>
+					</el-col>	 
+				</el-row>
 						   
-  
-					<el-row :gutter="20">
-					 <el-col :span="4">
-					   <el-form-item label="机台编号" prop="id">
-						 <el-input v-model="formData.sczl_jtbh" id="机台编号"  @keydown="ent($event, 'yj_yjmc', '机台编号', '检验类型')" @keyup.enter.native="getJtbhsubmit" :clearable="true" placeholder="" />
+					<el-row :gutter="24">
+					 <el-col :span="6">
+					   <el-form-item label="机台编号" prop="id" class="mab">
+						 <el-input v-model="formData.sczl_jtbh" id="机台编号"  @keydown="ent1($event, 'yj_yjmc', '机台编号', '检验类型')" @keyup.enter.native="getJtbhsubmit" style="width: 80px;" />
 					   </el-form-item>
 					 </el-col>
-					 <el-col :span="6">          
-						 <el-row :gutter="20">
-						   <el-col :span="12">
-							<el-form-item label="检验类型" prop="id">
-							 <el-input v-model="formData.sczl_单据类型" id="检验类型"  @keydown="ent($event, '机台编号', '检验类型', '检验类别')" :clearable="true" placeholder="" />
-							</el-form-item>
-						   </el-col>
-						 </el-row>
+					 <el-col :span="6">
+						<el-form-item label="检验类型" prop="id" class="mab">
+						 <el-input v-model="formData.sczl_单据类型" id="检验类型"  @keydown="ent1($event, '机台编号', '检验类型', '检验类别')" style="width: 150px;" />
+						</el-form-item>
 					 </el-col>
-					 <el-col :span="3">
-					   <el-form-item label="检验类别" prop="name">
-						 <el-input v-model="formData.sczl_检验类别" id="检验类别"  @keydown="ent($event, '检验类型', '检验类别', '废品率系数')" :clearable="true" placeholder="" />
+					 <el-col :span="6">
+					   <el-form-item label="检验类别" prop="name" class="mab">
+						 <el-input v-model="formData.sczl_检验类别" id="检验类别"  @keydown="ent1($event, '检验类型', '检验类别', '废品率系数')" style="width: 150px;" />
 					   </el-form-item>
 					 </el-col>
-					 <el-col :span="3">
-					   <el-form-item label="废品率系数" prop="name">
-						 <el-input v-model="formData.sczl_废品率系数" id="废品率系数"  @keydown="ent($event, '检验类别', '废品率系数', '计件箱数')" :clearable="true" placeholder="" />
+					 <el-col :span="6">
+					   <el-form-item label="废品率系数" prop="name" class="mab" label-width="100px">
+						 <el-input v-model="formData.sczl_废品率系数" id="废品率系数"  @keydown="ent1($event, '检验类别', '废品率系数', '计件箱数')" style="width: 150px;" />
 					   </el-form-item>
 					 </el-col>
 				   </el-row>
 						   
-					   <el-row :gutter="20">
-					   <el-col :span="4">
-						 <el-form-item label="计件箱数" prop="id">
-						   <el-input v-model="formData.sczl_cl" id="计件箱数"  @keydown="ent($event, '废品率系数', '计件箱数', '每箱数量')" :clearable="true" placeholder="" />
-						 </el-form-item>
-					   </el-col>
-					 <el-col :span="3">
-						 <el-form-item label="每箱数量" prop="name">
-						   <el-input v-model="formData.sczl_PgCl" id="每箱数量"  @keydown="ent($event, '计件箱数', '每箱数量', '定额代号')" :clearable="true" placeholder="" />
+					<el-row :gutter="24">
+					   <el-col :span="6">
+						 <el-form-item label="计件箱数" prop="id" class="mab">
+						   <el-input v-model="formData.sczl_cl" id="计件箱数"  @keydown="ent1($event, '废品率系数', '计件箱数', '每箱数量')" style="width: 118px;"/>
 						 </el-form-item>
 					   </el-col>
-					   <el-col :span="3">
-						 <el-form-item label="定额代号"   prop="name">
-						   <el-input v-model="formData.sczl_dedh" @keyup.enter.native="getMachineDedhsubmit"  id="定额代号"  @keydown="ent($event, '计件箱数', '定额代号', '流程单号')" :clearable="true" placeholder="" />
+					 <el-col :span="6">
+						 <el-form-item label="每箱数量" prop="name" class="mab">
+						   <el-input v-model="formData.sczl_PgCl" id="每箱数量"  @keydown="ent1($event, '计件箱数', '每箱数量', '定额代号')"   />
 						 </el-form-item>
+					   </el-col>
+					   <el-col :span="6">
+							<el-form-item label="定额代号" prop="id" class="mab">
+								<el-input v-model="formData.sczl_dedh" id="定额代号"  @keydown="ent1($event, '产量合计', '定额代号', '检验类别')" @blur="getDedhsubmit" style="width: 150px;" />
+							</el-form-item>
 					   </el-col>
-					 </el-row>
+					</el-row>
 					 
 					 
 					 
-					 <el-row :gutter="1">
-					 			     <el-col :span="4">
-					 			       <el-form-item label="流程单号" prop="id">
-					 			         <el-input v-model="formData.address" id="流程单号"  @keydown="ent($event, '定额代号', '流程单号', '流程单号1')" :clearable="true" placeholder="" />
-					 			       </el-form-item>
-					 			     </el-col>
-					 							 <el-col :span="1">
-					 							   <el-input v-model="formData.流程单号1" id="流程单号1"  @keydown="ent($event, '流程单号', '流程单号1', '流程单号2')" :clearable="true" placeholder="" />
-					 							 </el-col>
-					 				            <el-col :span="1">
-					 				              <el-input v-model="formData.流程单号2" id="流程单号2"  @keydown="ent($event, '流程单号1', '流程单号2', '流程单号3')" :clearable="true" placeholder="" />
-					 				            </el-col>
-					 			  				  <el-col :span="1">			  			
-					 			  				    <el-input v-model="formData.流程单号3" id="流程单号3"  @keydown="ent($event, '流程单号2', '流程单号3', '流程单号4')" :clearable="true" placeholder="" />
-					 			  				  </el-col>
-					 							  
-					 			  				  <el-col :span="1">
-					 			  				    <el-input v-model="formData.流程单号4" id="流程单号4"  @keydown="ent($event, '流程单号3', '流程单号4', '流程单号5')" :clearable="true" placeholder="" />
-					 			  				  </el-col>
-					 			  				  <el-col :span="1">
-					 			  				    <el-input v-model="formData.流程单号5" id="流程单号5"  @keydown="ent($event, '流程单号4', '流程单号5', '流程单号6')" :clearable="true" placeholder="" />
-					 			  				  </el-col>
-					 			  				  <el-col :span="1">
-					 			  				    <el-input v-model="formData.流程单号6" id="流程单号6"  @keydown="ent($event, '流程单号5', '流程单号6', '流程单号7')" :clearable="true" placeholder="" />
-					 			  				  </el-col>
-					 			  				  <el-col :span="1">
-					 			  				    <el-input v-model="formData.流程单号7" id="流程单号7"  @keydown="ent($event, '流程单号6', '流程单号7', '流程单号8')" :clearable="true" placeholder="" />
-					 			  				  </el-col>
-					 			  				  <el-col :span="1">
-					 			  				    <el-input v-model="formData.流程单号8" id="流程单号8"  @keydown="ent($event, '流程单号7', '流程单号8', '流程单号9')" :clearable="true" placeholder="" />
-					 			  				  </el-col>
-					 							  <el-col :span="1">
-					 			  				    <el-input v-model="formData.流程单号9" id="流程单号9"  @keydown="ent($event, '流程单号8', '流程单号9', '备注')" :clearable="true" placeholder="" />
-					 			  				  </el-col>
-					 			     <el-col :span="6">          
-					 			         <el-row :gutter="20">
-					 			           <el-col :span="12">
-					 			  						 <el-form-item label="备注" prop="id">
-					 			             <el-input v-model="formData.qczl_NumDesc" id="备注"  @keydown="ent($event, '流程单号9', '备注', '换模补产工时')" :clearable="true" placeholder="" />
-					 			  						 </el-form-item>
-					 			           </el-col>
-					 			         </el-row>
-					 			     </el-col>
-					 			   </el-row>
+					 <el-row :gutter="24">
+						 <el-col :span="17">
+						   <el-form-item label="流程单号" prop="id" class="mab">
+								<!-- <el-input v-model="formData.address" id="流程单号"  @keydown="ent1($event, '定额代号', '流程单号', '流程单号1')" style="width: 60px; margin-right: 5px;"/> -->
+								<el-input v-model="formData.流程单号1" id="流程单号1"  @keydown="ent1($event, '冲月定额', '流程单号1', '流程单号2')" style="width: 60px; margin-right: 5px;"/>
+								<el-input v-model="formData.流程单号2" id="流程单号2"  @keydown="ent1($event, '流程单号1', '流程单号2', '流程单号3')" style="width: 60px; margin-right: 5px;"/>
+								<el-input v-model="formData.流程单号3" id="流程单号3"  @keydown="ent1($event, '流程单号2', '流程单号3', '流程单号4')" style="width: 60px; margin-right: 5px;"/>
+								<el-input v-model="formData.流程单号4" id="流程单号4"  @keydown="ent1($event, '流程单号3', '流程单号4', '流程单号5')" style="width: 60px; margin-right: 5px;"/>
+								<el-input v-model="formData.流程单号5" id="流程单号5"  @keydown="ent1($event, '流程单号4', '流程单号5', '流程单号6')" style="width: 60px; margin-right: 5px;"/>
+								<el-input v-model="formData.流程单号6" id="流程单号6"  @keydown="ent1($event, '流程单号5', '流程单号6', '流程单号7')" style="width: 60px; margin-right: 5px;"/>
+								<el-input v-model="formData.流程单号7" id="流程单号7"  @keydown="ent1($event, '流程单号6', '流程单号7', '流程单号8')" style="width: 60px; margin-right: 5px;"/>
+								<el-input v-model="formData.流程单号8" id="流程单号8"  @keydown="ent1($event, '流程单号7', '流程单号8', '流程单号9')" style="width: 60px; margin-right: 5px;"/>
+								<el-input v-model="formData.流程单号9" id="流程单号9"  @keydown="ent1($event, '流程单号8', '流程单号9', '备注')" style="width: 60px;"/>
+							</el-form-item>			  			
+						 </el-col>
+						 <el-col :span="7">
+							<el-form-item label="备注" prop="id" class="mab" label-width="50px">
+								<el-input v-model="formData.qczl_NumDesc" id="备注"  @keydown="ent1($event, '流程单号9', '备注', 'bh1')"   />
+							</el-form-item>
+						 </el-col>
+					   </el-row>
 								   
 								   
-				<el-row :gutter="20">
-							     <el-col :span="4">
-							       <el-form-item label="换模补产工时" prop="id">
-							         <el-input v-model="formData.sczl_装版工时" id="换模补产工时"  @keydown="ent($event, '备注', '换模补产工时', '设备保养工时')" :clearable="true" placeholder="" />
-							       </el-form-item>
-							     </el-col>
-							     <el-col :span="6">          
-							         <el-row :gutter="20">
-							           <el-col :span="12">
-							  						<el-form-item label="设备保养工时" prop="id">
-							             <el-input v-model="formData.sczl_保养工时" id="设备保养工时"  @keydown="ent($event, '换模补产工时', '设备保养工时', '异常停机')" :clearable="true" placeholder="" />
-							  						</el-form-item>
-							           </el-col>
-							         </el-row>
-							     </el-col>
-							     <el-col :span="3">
-							       <el-form-item label="异常停机" prop="name">
-							         <el-input v-model="formData.sczl_异常停机工时" id="异常停机"  @keydown="ent($event, '设备保养工时', '异常停机', '设备通电工时')" :clearable="true" placeholder="" />
-							       </el-form-item>
-							     </el-col>
-								 <el-col :span="3">
-								   <el-form-item label="设备通电工时" prop="name">
-									 <el-input v-model="formData.sczl_设备运行工时" id="设备通电工时"  @keydown="ent($event, '异常停机', '设备通电工时', 'sczl_bh1')" :clearable="true" placeholder="" />
-								   </el-form-item>
-								 </el-col>
-							   </el-row>				   
-						   
-				             <el-row :gutter="10" style="margin-top: 10px;">
-								 <el-col :span="2">
-								   <span>组员信息</span>
-								 </el-col>
-				                <el-col :span="2">
-				                  <el-input v-model="formData.sczl_bh1"id="sczl_bh1"  @keydown="ent($event, '异常停机', 'sczl_bh1', 'sczl_bh2')" @keyup.enter.native="getGxMcsubmit($event, '1')" :clearable="true" placeholder="" />
-				                </el-col>
-				                <el-col :span="2">
-				                  <el-input v-model="formData.sczl_bh2" id="sczl_bh2"  @keydown="ent($event, 'sczl_bh1', 'sczl_bh2', 'sczl_bh3')" @keyup.enter.native="getGxMcsubmit($event, '2')" :clearable="true" placeholder="" />
-				                </el-col>
-				                <el-col :span="2">
-				                  <el-input v-model="formData.sczl_bh3" id="sczl_bh3"  @keydown="ent($event, 'sczl_bh2', 'sczl_bh3', 'sczl_bh4')" @keyup.enter.native="getGxMcsubmit($event, '3')" :clearable="true" placeholder="" />
-				                </el-col>
-				                <el-col :span="2">
-				                  <el-input v-model="formData.sczl_bh4" id="sczl_bh4"  @keydown="ent($event, 'sczl_bh3', 'sczl_bh4', 'sczl_bh5')" @keyup.enter.native="getGxMcsubmit($event, '4')" :clearable="true" placeholder="" />
-				                </el-col>
-				                <el-col :span="2">
-				                  <el-input v-model="formData.sczl_bh5" id="sczl_bh5"  @keydown="ent($event, 'sczl_bh4', 'sczl_bh5', 'sczl_bh6')" @keyup.enter.native="getGxMcsubmit($event, '5')" :clearable="true" placeholder="" />
-				                </el-col>
-								<el-col :span="2">
-								  <el-input v-model="formData.sczl_bh6" id="sczl_bh6"  @keydown="ent($event, 'sczl_bh5', 'sczl_bh6', 'sczl_bh7')" @keyup.enter.native="getGxMcsubmit($event, '6')" :clearable="true" placeholder="" />
-								</el-col>
-								<el-col :span="2">
-								  <el-input v-model="formData.sczl_bh7" id="sczl_bh7"  @keydown="ent($event, 'sczl_bh6', 'sczl_bh7', 'sczl_bh8')" @keyup.enter.native="getGxMcsubmit($event, '7')" :clearable="true" placeholder="" />
-								</el-col>
-								<el-col :span="2">
-								  <el-input v-model="formData.sczl_bh8" id="sczl_bh8"  @keydown="ent($event, 'sczl_bh7', 'sczl_bh8', 'name1')" @keyup.enter.native="getGxMcsubmit($event, '8')" :clearable="true" placeholder="" />
-								</el-col>
-				              </el-row>
-										 
-				<el-row :gutter="10" style="margin-top: 10px;">
-								 <el-col :span="2">
-								   <span></span>
-								 </el-col>
-							    <el-col :span="2">
-							      <el-input v-model="formData.sczl_bh1_name" id="name1"  @keydown="ent($event, 'sczl_bh8', 'name1', 'name2')"  :clearable="true" placeholder="" />
-							    </el-col>
-							    <el-col :span="2">
-							      <el-input v-model="formData.sczl_bh2_name" id="name2"  @keydown="ent($event, 'name1', 'name2', 'name3')"  :clearable="true" placeholder="" />
-							    </el-col>
-							    <el-col :span="2">
-							      <el-input v-model="formData.sczl_bh3_name" id="name3"  @keydown="ent($event, 'name2', 'name3', 'name4')" :clearable="true" placeholder="" />
-							    </el-col>
-							    <el-col :span="2">
-							      <el-input v-model="formData.sczl_bh4_name" id="name4"  @keydown="ent($event, 'name3', 'name4', 'name5')" :clearable="true" placeholder="" />
-							    </el-col>
-							    <el-col :span="2">
-							      <el-input v-model="formData.sczl_bh5_name" id="name5"  @keydown="ent($event, 'name4', 'name5', 'name6')" :clearable="true" placeholder="" />
-							    </el-col>
-								<el-col :span="2">
-								  <el-input v-model="formData.sczl_bh6_name" id="name6"  @keydown="ent($event, 'name5', 'name6', 'name7')" :clearable="true" placeholder="" />
-								</el-col>
-								<el-col :span="2">
-								  <el-input v-model="formData.sczl_bh7_name" id="name7"  @keydown="ent($event, 'name6', 'name7', 'name8')" :clearable="true" placeholder="" />
-								</el-col>
-								<el-col :span="2">
-								  <el-input v-model="formData.sczl_bh8_name" id="name8"  @keydown="ent($event, 'name7', 'name8', 'NumDesc1')" :clearable="true" placeholder="" />
-								</el-col>
-							  </el-row>
-													   
-													   
-				<el-row :gutter="10" style="margin-top: 10px;">
-								 <el-col :span="2">
-								   <span></span>
-								 </el-col>
-							    <el-col :span="2">
-							      <el-input v-model="formData.qczl_NumDesc" id="NumDesc1"  @keydown="ent($event, 'name8', 'NumDesc1', 'NumDesc2')" :clearable="true" placeholder="" />
-							    </el-col>
-							    <el-col :span="2">
-							      <el-input v-model="formData.qczl_NumDesc" id="NumDesc2"  @keydown="ent($event, 'NumDesc1', 'NumDesc2', 'NumDesc3')" :clearable="true" placeholder="" />
-							    </el-col>
-							    <el-col :span="2">
-							      <el-input v-model="formData.qczl_NumDesc" id="NumDesc3"  @keydown="ent($event, 'NumDesc2', 'NumDesc3', 'NumDesc4')" :clearable="true" placeholder="" />
-							    </el-col>
-							    <el-col :span="2">
-							      <el-input v-model="formData.qczl_NumDesc" id="NumDesc4"  @keydown="ent($event, 'NumDesc3', 'NumDesc4', 'NumDesc5')" :clearable="true" placeholder="" />
-							    </el-col>
-							    <el-col :span="2">
-							      <el-input v-model="formData.qczl_NumDesc" id="NumDesc5"  @keydown="ent($event, 'NumDesc4', 'NumDesc5', 'NumDesc6')" :clearable="true" placeholder="" />
-							    </el-col>
-								<el-col :span="2">
-								  <el-input v-model="formData.qczl_NumDesc" id="NumDesc6"  @keydown="ent($event, 'NumDesc5', 'NumDesc6', 'NumDesc7')" :clearable="true" placeholder="" />
-								</el-col>
-								<el-col :span="2">
-								  <el-input v-model="formData.qczl_NumDesc" id="NumDesc7"  @keydown="ent($event, 'NumDesc6', 'NumDesc7', 'NumDesc8')" :clearable="true" placeholder="" />
-								</el-col>
-								<el-col :span="2">
-								  <el-input v-model="formData.qczl_NumDesc" id="NumDesc8"  @keydown="ent($event, 'NumDesc7', 'NumDesc8', '其他备注')" :clearable="true" placeholder="" />
-								</el-col>
-							  </el-row>
-																	 
-																	 
-				<el-row :gutter="20">
-			   <el-col :span="20">
+				<el-row :gutter="24">
+					 <el-col :span="6">
+					   <el-form-item label="换模补产工时" prop="id" class="mab" label-width="96px">
+						 <el-input v-model="formData.sczl_装版工时" id="换模补产工时"  @keydown="ent1($event, '备注', '换模补产工时', '设备保养工时')"   />
+					   </el-form-item>
+					 </el-col>
+					 <el-col :span="6">
+						<el-form-item label="设备保养工时" prop="id" class="mab" label-width="100px">
+							<el-input v-model="formData.sczl_保养工时" id="设备保养工时"  @keydown="ent1($event, '换模补产工时', '设备保养工时', '异常停机')"   />
+						</el-form-item>
+					 </el-col>
+					 <el-col :span="6">
+					   <el-form-item label="异常停机" prop="name" class="mab" >
+						 <el-input v-model="formData.sczl_异常停机工时" id="异常停机"  @keydown="ent1($event, '设备保养工时', '异常停机', '设备通电工时')"   />
+					   </el-form-item>
+					 </el-col>
+					 <el-col :span="6">
+					   <el-form-item label="设备通电工时" prop="name" class="mab" label-width="100px">
+						 <el-input v-model="formData.sczl_设备运行工时" id="设备通电工时"  @keydown="ent1($event, '异常停机', '设备通电工时', 'sczl_bh1')"   />
+					   </el-form-item>
+					 </el-col>
+				</el-row>				   
+						   
+				<el-row :gutter="24" class="mab" >
+					<el-col :span="2"><span>组员信息</span></el-col>
+					<div v-for="index in 8" :key="index">
+					  <div style="width: 50px;margin-right: 50px;">
+						<el-input style="width: 90px; margin-right: 5px; margin-bottom: 5px;" v-model="formData['sczl_bh' + index]" :id="'bh' + index" @keydown="ent1($event, index.toString())" />
+						<el-input style="width: 90px; margin-right: 5px; margin-bottom: 5px; color: red;" :readonly="true" :value="formData['sczl_bh' + index + '_name']" :id="'name' + index" @keydown="ent1($event)"/>
+						<el-input style="width: 90px; margin-right: 5px;" v-model="formData['sczl_rate' + index]" :id="'rate' + index" @keydown="ent1($event)"/>
+					  </div>
+					</div>
+				</el-row>	
+																 
+				<el-row :gutter="24">
+			   <el-col :span="24">
 			     <el-form-item label="其他备注" prop="id">
-			       <el-input v-model="formData.流程单号" id="其他备注"  @keydown="ent($event, 'NumDesc8', '其他备注', '日期')" :clearable="true" placeholder="" />
+			       <el-input v-model="formData.sczl_desc" id="其他备注"  @keydown="ent1($event, 'NumDesc8', '其他备注', '日期')"   />
 			     </el-form-item>
 			   </el-col>
 			 </el-row>													 
@@ -468,7 +320,7 @@ import {
 import { getDictFunc, formatDate, formatBoolean, filterDict, ReturnArrImg, onDownloadFile } from '@/utils/format'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Search, Refresh, Download } from '@element-plus/icons-vue'
-import { ref, reactive, onMounted, onBeforeMount } from 'vue'
+import { ref, reactive, nextTick, onMounted, onBeforeMount } from 'vue'
 import { getPackingSideTable, getPackingTable } from '@/api/mes_api_gty/myapi'
 import { login } from '@/api/user'
 import { Layout, LayoutContent, LayoutHeader, LayoutSider } from '@arco-design/web-vue'
@@ -519,15 +371,7 @@ const formData = ref({
           sczl_设备运行工时: '',
           sczl_废品率系数: '',
           sczl_检验类别: '',
-          sczl_bh1: '',
-          sczl_bh2: '',
-          sczl_bh3: '',
-          sczl_bh4: '',
-          sczl_bh5: '',
-          sczl_bh6: '',
-          sczl_bh7: '',
-          sczl_bh8: '',
-          流程单号 :'',
+          流程单号1 :'',
           流程单号2: '',
           流程单号3: '',
           流程单号4: '',
@@ -537,7 +381,14 @@ const formData = ref({
           流程单号8: '',
           流程单号9:'',
           qczl_NumDesc:'',
-          sczl_desc:'',                                           
+		  sczl_bh1: '',
+		  sczl_bh2: '',
+		  sczl_bh3: '',
+		  sczl_bh4: '',
+		  sczl_bh5: '',
+		  sczl_bh6: '',
+		  sczl_bh7: '',
+		  sczl_bh8: '',
           sczl_bh1_name:'',
           sczl_bh2_name:'',
           sczl_bh3_name: '',
@@ -545,7 +396,16 @@ const formData = ref({
           sczl_bh5_name: '',
           sczl_bh6_name: '',
           sczl_bh7_name: '',
-          sczl_bh8_name: '',
+          sczl_bh8_name: '',
+		  sczl_rate1: '',
+		  sczl_rate2: '',
+		  sczl_rate3: '',
+		  sczl_rate4: '',
+		  sczl_rate5: '',
+		  sczl_rate6: '',
+		  sczl_rate7: '',
+		  sczl_rate8: '',
+          sczl_desc:'',
           yj_yjmc: '',
 })
 
@@ -671,7 +531,105 @@ const GetMachineInfo = async (value) => {
   if (response.code === 0) {
 	formData.value=response.data;
   }
-}
+}
+
+//键盘 input框跳转
+const ent1 = (event) => {
+  const inputs = document.getElementsByTagName('input');
+  const currentIndex = Array.from(inputs).indexOf(event.target);
+  if (event.keyCode === 13 || event.keyCode === 40) { // Enter 或向下箭头
+	  if(event.target.id=='其他备注'){
+		  ElMessageBox.confirm('数据存盘?', '提示', {
+					confirmButtonText: '确定',
+					cancelButtonText: '取消',
+					type: 'warning'
+				  }).then(() => {
+					enterDialog()
+				})
+	  }
+    for (let i = currentIndex + 1; i < inputs.length; i++) {
+      if (!inputs[i].readOnly) {
+		  nextTick(()=>{
+			  inputs[i].focus();
+			  inputs[i].select();
+		  })
+        break;
+      }
+    }
+	if(event.target.id.substring(0, 2)=='cl' || event.target.id.substring(0, 2)=='fp'){
+		ent_sum()
+	}
+  } else if (event.keyCode === 38) { // 向上箭头
+    for (let i = currentIndex - 1; i >= 0; i--) {
+      if (!inputs[i].readOnly) {
+        nextTick(()=>{
+        	inputs[i].focus();
+			inputs[i].select();
+        })
+        break;
+      }
+    }
+	if(event.target.id.substring(0, 2)=='cl' || event.target.id.substring(0, 2)=='fp'){
+		ent_sum()
+	}
+  } else if (event.keyCode === 8) { // 删除箭头
+    if (event.target.selectionStart === 0) {
+      for (let i = currentIndex - 1; i >= 0; i--) {
+        if (!inputs[i].readOnly) {
+          nextTick(()=>{
+          	inputs[i].focus();
+			inputs[i].setSelectionRange(0, 0);
+          })
+          break;
+        }
+      }
+	  if(event.target.id.substring(0, 2)=='cl' || event.target.id.substring(0, 2)=='fp'){
+	  	ent_sum()
+	  }
+    }
+  } else if (event.keyCode === 37) { // 向左箭头
+    if (event.target.selectionStart === 0) {
+      for (let i = currentIndex - 1; i >= 0; i--) {
+        if (!inputs[i].readOnly) {
+          nextTick(()=>{
+          	inputs[i].focus();
+			inputs[i].select();
+          })
+          break;
+        }
+      }
+	  if(event.target.id.substring(0, 2)=='cl' || event.target.id.substring(0, 2)=='fp'){
+	  	ent_sum()
+	  }
+    }
+  } else if (event.keyCode === 39) { // 向右箭头
+	  if(event.target.id=='其他备注'){
+		  ElMessageBox.confirm('数据存盘?', '提示', {
+					confirmButtonText: '确定',
+					cancelButtonText: '取消',
+					type: 'warning'
+				  }).then(() => {
+					enterDialog()
+				})
+	  }
+    if (event.target.selectionStart === event.target.value.length) {
+      for (let i = currentIndex + 1; i < inputs.length; i++) {
+        if (!inputs[i].readOnly) {
+          nextTick(()=>{
+          	inputs[i].focus();
+			inputs[i].select();
+          })
+          break;
+        }
+      }
+    }
+	if(event.target.id.substring(0, 2)=='cl' || event.target.id.substring(0, 2)=='fp'){
+		ent_sum()
+	}
+  }
+}
+
+
 //获取员工信息
 const GetYg = async (value,inputName) => {
   const response = await getYg({sczl_bh:value});
@@ -864,17 +822,17 @@ const updateDetailData = async() => {
 	sczl_废品率系数: formData.value.sczl_废品率系数,
 	sczl_cl: formData.value.sczl_cl,
 	sczl_PgCl: formData.value.sczl_PgCl,
-	sczl_dedh: formData.value.sczl_desc,
-	qczl_Num: formData.value.qczl_NumDesc,
-	qczl_NumDesc1: formData.value.流程单号1,
-	qczl_NumDesc2: formData.value.流程单号2,
-	qczl_NumDesc3: formData.value.流程单号3,
-	qczl_NumDesc4: formData.value.流程单号4,
-	qczl_NumDesc5: formData.value.流程单号5,
-	qczl_NumDesc6: formData.value.流程单号6,
-	qczl_NumDesc7: formData.value.流程单号7,
-	qczl_NumDesc8: formData.value.流程单号8,
-	qczl_NumDesc: formData.value.流程单号9,
+	sczl_dedh: formData.value.sczl_dedh,
+	qczl_Num: formData.value.流程单号1,
+	qczl_NumDesc1: formData.value.流程单号2,
+	qczl_NumDesc2: formData.value.流程单号3,
+	qczl_NumDesc3: formData.value.流程单号4,
+	qczl_NumDesc4: formData.value.流程单号5,
+	qczl_NumDesc5: formData.value.流程单号6,
+	qczl_NumDesc6: formData.value.流程单号7,
+	qczl_NumDesc7: formData.value.流程单号8,
+	qczl_NumDesc8: formData.value.流程单号9,
+	qczl_NumDesc: formData.value.qczl_NumDesc,
 	sczl_装版工时: formData.value.sczl_装版工时,
 	sczl_保养工时: formData.value.sczl_保养工时,
 	sczl_异常停机工时: formData.value.sczl_异常停机工时,
@@ -886,7 +844,15 @@ const updateDetailData = async() => {
 	sczl_bh5: formData.value.sczl_bh5,
 	sczl_bh6: formData.value.sczl_bh6,
 	sczl_bh7: formData.value.sczl_bh7,
-	sczl_bh8: formData.value.sczl_bh8,
+	sczl_bh8: formData.value.sczl_bh8,
+	sczl_rate1: formData.value.sczl_rate1,
+	sczl_rate2: formData.value.sczl_rate2,
+	sczl_rate3: formData.value.sczl_rate3,
+	sczl_rate4: formData.value.sczl_rate4,
+	sczl_rate5: formData.value.sczl_rate5,
+	sczl_rate6: formData.value.sczl_rate6,
+	sczl_rate7: formData.value.sczl_rate7,
+	sczl_rate8: formData.value.sczl_rate8,
 	sczl_desc: formData.value.sczl_desc,
 	sys_id:'[1008/姜剑娟]',
   }
@@ -983,9 +949,11 @@ function onRefresh() {
 const ADD=ref('0')
 //新增
 function onAdd() {
-	GetMachineInfo(lastCellValue)
-	ADD.value='新增'
-	console.log(ADD.value)
+	ADD.value='新增'
+	type.value = 'create'
+	if(typeof(lastCellValue)=='number'){
+		GetMachineInfo(lastCellValue)
+	}
 	dialogFormVisible.value = true
 	// Productionadd()
 }
@@ -1263,4 +1231,30 @@ onMounted(async () => {
   background: #ff80ff !important;
   /* 背景颜色 */
 }
+</style>
+<style scoped>
+:deep(.el-table td .cell) {
+  line-height: 20px !important;
+}
+:deep(.el-tabs__header){
+  margin-bottom: 0;
+}
+.search{
+  margin-left: 0px !important;
+  margin-right: 10px !important;
+}
+.bt{
+  margin-left: 2px !important;
+  padding: 3px !important;
+  font-size: 12px;
+}
+.el-tabs__header{
+  margin: 0px !important;
+}
+.gva-table-box{
+  padding: 0px !important;
+}
+.mab{
+  margin-bottom: 5px;
+}
 </style>

+ 17 - 17
src/view/performance/Manualdocuments.vue

@@ -38,8 +38,8 @@
               <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="refresh"  @click="onRefresh">刷新质检系数</el-button>
-			  <el-button type="primary" class="bt" icon="thumb"  @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;">
                 <el-button type="primary" :icon="Download" @click="exportExcel">导出到Excel</el-button>
@@ -50,21 +50,21 @@
               highlight-current-row="true" border @selection-change="handleSelectionChange"  @row-click="Click"
 			  :show-overflow-tooltip="true" @row-dblclick="doubleClick">
               <el-table-column type="selection" width="55" />
-              <el-table-column align="left" label="工单印件" prop="combinedProp" width="340"/>
-              <el-table-column align="left" label="印件工序" prop="combinedProp2" width="340"/>
-              <el-table-column align="left" label="日期" prop="sczl_rq" width="120" />
-              <el-table-column align="left" label="产量" prop="sczl_cl" width="120" />
-              <el-table-column align="left" label="千件工价" prop="千件工价" width="120" />
-              <el-table-column align="left" label="检验类别" prop="sczl_检验类别" width="120" />
-              <el-table-column align="left" label="废品率系数" prop="sczl_废品率系数" width="120" />
-              <el-table-column align="left" label="日定额" prop="日定额" width="120" />
-              <el-table-column align="left" label="组长编号" prop="sczl_bh0" width="120" />
-			  <el-table-column align="left" label="组长姓名" prop="员工姓名" width="120" />
-			  <el-table-column align="left" label="流程单备注" prop="qczl_NumDesc" width="120" />
-			  <el-table-column align="left" label="创建用户" prop="sys_id" width="120" />
-              <el-table-column align="left" label="创建时间" prop="sys_rq" width="160" />
-              <el-table-column align="left" label="修改时间" prop="mod_rq" width="160" />
-              <el-table-column align="left" label="UNIQID" prop="UniqId" width="120" />
+              <el-table-column align="left" sortable label="工单印件" prop="combinedProp" width="340"/>
+              <el-table-column align="left" sortable label="印件工序" prop="combinedProp2" width="150"/>
+              <el-table-column align="left" sortable label="日期" prop="sczl_rq" width="120" />
+              <el-table-column align="left" sortable label="产量" prop="sczl_cl" width="77" />
+              <el-table-column align="left" sortable label="千件工价" prop="千件工价" width="105" />
+              <el-table-column align="left" sortable label="检验类别" prop="sczl_检验类别" width="105" />
+              <el-table-column align="left" sortable label="废品率系数" prop="sczl_废品率系数" width="120" />
+              <el-table-column align="left" sortable label="日定额" prop="日定额" width="91" />
+              <el-table-column align="left" sortable label="组长编号" prop="sczl_bh0" width="105" />
+			  <el-table-column align="left" sortable label="组长姓名" prop="员工姓名" width="105" />
+			  <el-table-column align="left" sortable label="流程单备注" prop="qczl_NumDesc" width="120" />
+			  <el-table-column align="left" sortable label="创建用户" prop="sys_id" width="120" />
+              <el-table-column align="left" sortable label="创建时间" prop="sys_rq" width="160" />
+              <el-table-column align="left" sortable label="修改时间" prop="mod_rq" width="160" />
+              <el-table-column align="left" sortable label="UNIQID" prop="UniqId" width="120" />
             </el-table>
             <!-- 分页 -->
             <div class="gva-pagination">

+ 17 - 24
src/view/performance/Packagingoutput.vue

@@ -63,7 +63,8 @@
 				  :key="column.prop"
 				  :prop="column.prop"
 				  :label="column.label"
-				  :width="column.width"
+				  :width="column.width"
+				  sortable
 				  show-overflow-tooltip="true"
 				/>
             </el-table>
@@ -93,23 +94,15 @@
                   </el-form-item>
                 </el-col>
               </el-row>
-
-
-								<el-table
-                               :data="detailData.table"
-                               border
-                               tooltip-effect="dark"
-                               :row-style="{ height: '20px' }"
-                               :cell-style="{ padding: '0px' }"
-                               :header-row-style="{ height: '20px' }"
-                               :header-cell-style="{ padding: '0px' }"
-                             >
-                               <el-table-column
-                                 label="工单编号"
-                                 width="100"
-                               >
-                                 <template #default="{ row, $index }">
-                                   <el-input
+				<el-table :data="detailData.table" border
+                    tooltip-effect="dark" :row-style="{ height: '20px' }"
+                    :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
+                    :header-cell-style="{ padding: '0px' }"
+					>
+					
+                    <el-table-column label="工单编号" width="100" >
+                    <template #default="{ row, $index }">
+						<el-input
                                      v-model="row.sczl_gdbh"
 									 id="工单编号"  @keydown="ent($event, '零头', '工单编号', '印件工序')"
                                      @keyup.enter="handleEnter($index, row)"
@@ -552,13 +545,13 @@ const tableData = reactive([])
 const GxMctableData = reactive([])
 
 const tableColumns = [
-  { label: '创建用户', prop: 'sys_id', width: '240' },
+  { label: '创建用户', prop: 'sys_id', width: '120' },
   { label: '日期', prop: 'sczl_rq', width: '100' },
-  { label: '包装产量', prop: 'sczl_cl', width: '100' },
-  { label: '包装数量', prop: 'sczl_PgCl', width: '100' },
-  { label: '创建时间', prop: 'sys_rq', width: '180' },
-  { label: '修改时间', prop: 'mod_rq', width: '180' },
-  { label: 'UNIQID', prop: 'UniqId', width: '100' },
+  { label: '包装产量', prop: 'sczl_cl', width: '105' },
+  { label: '包装数量', prop: 'sczl_PgCl', width: '105' },
+  { label: '创建时间', prop: 'sys_rq', width: '160' },
+  { label: '修改时间', prop: 'mod_rq', width: '160' },
+  { label: 'UNIQID', prop: 'UniqId', width: '120' },
 ]
 
 const detailData = reactive([])