页面优化

src/view/job/job/job.vue

@@ -55,43 +55,47 @@
             </div> -->
             <el-table
                 ref="multipleTable"
+				border
                 style="width: 100%"
                 tooltip-effect="dark"
                 :data="tableData"
                 row-key="ID"
                 @selection-change="handleSelectionChange"
+				@row-dblclick="updateCompanyFunc"
+				:show-overflow-tooltip="true"
+				highlight-current-row="true"
             >
               <!-- <el-table-column type="selection" width="55" /> -->
-              <el-table-column align="left" label="设备编号" prop="设备编号" width="80" />
-              <el-table-column align="left" label="设备名称" prop="设备名称" width="120" />
-              <el-table-column align="left" label="生产工序" prop="生产工序" width="80" />
+              <el-table-column align="left" fixed="left" label="设备编号" prop="设备编号" width="90" />
+              <el-table-column align="left" fixed="left" label="设备名称" prop="设备名称" width="200" />
+              <el-table-column align="left" label="生产工序" prop="生产工序" width="160" />
               <el-table-column align="left" label="日定额" prop="日定额" width="100" />
-              <el-table-column align="left" label="千件工价" prop="千件工价" width="80" />
-              <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="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="100" />
-              <el-table-column align="left" label="分切1" prop="分切1" width="100" />
-              <el-table-column align="left" label="分切2" prop="分切2" 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="sys_id" width="120" />
+              <el-table-column align="left" label="千件工价" prop="千件工价" width="90" />
+              <el-table-column align="left" label="机长" prop="机长" width="80" />
+              <el-table-column align="left" label="副机" prop="副机" width="80" />
+              <el-table-column align="left" label="调墨" prop="调墨" width="80" />
+              <el-table-column align="left" label="二手" prop="二手" width="80" />
+              <el-table-column align="left" label="飞达" prop="飞达" width="80" />
+              <el-table-column align="left" label="辅助" prop="辅助" width="80" />
+              <el-table-column align="left" label="放卷" prop="放卷" width="80" />
+              <el-table-column align="left" label="分切1" prop="分切1" width="80" />
+              <el-table-column align="left" label="分切2" prop="分切2" width="80" />
+              <el-table-column align="left" label="检验" prop="检验" width="80" />
+              <el-table-column align="left" label="使用部门" prop="使用部门" width="90" />
+              <el-table-column align="left" label="设备编组" prop="" width="90" />
               <el-table-column align="left" label="创建用户" prop="sys_id" width="120" />
-              <el-table-column align="left" label="创建时间" prop="mod_rq" width="120" />
-              <el-table-column align="left" label="修改时间" prop="sys_rq" width="120" />
-              <el-table-column align="left" label="UNIQID" prop="UniqId" width="75" />
-              <el-table-column align="center" fixed="right" label="操作"  min-width="100">
-                <template #default="scope">
+              <el-table-column align="left" label="创建时间" prop="mod_rq" width="160" />
+              <el-table-column align="left" label="修改时间" prop="sys_rq" width="160" />
+              <el-table-column align="left" label="UNIQID" prop="UniqId" width="75" >
+              <!-- <el-table-column align="center" fixed="right" label="操作"  min-width="100"> -->
+               <!-- <template #default="scope">
                   <el-button type="primary" link class="table-button" @click="getDetails(scope.row)">
                     <el-icon style="margin-right: 5px"><InfoFilled /></el-icon>
                     查看详情
-                  </el-button>
+                  </el-button> -->
                   <!-- <el-button type="primary" link icon="edit" class="table-button" @click="updateCompanyFunc(scope.row)">变更</el-button>
                   <el-button type="primary" link icon="delete" @click="deleteRow(scope.row)">删除</el-button> -->
-                </template>
+                <!-- </template> -->
               </el-table-column>
             </el-table>
             <div class="gva-pagination">
@@ -109,61 +113,65 @@
           <el-dialog v-model="dialogFormVisible" :before-close="closeDialog" :title="type==='create'?'添加':'修改'" destroy-on-close>
             <el-scrollbar height="340px">
               <el-form :model="formData" :inline="true" label-position="right" ref="elFormRef" :rules="rule" label-width="75px">
-                <el-form-item label="员工编号:"  prop="address" >
-                  <el-input v-model="formData.address" :clearable="true"  placeholder="请输入员工编号" />
-                </el-form-item>
-                <el-form-item prop="image" >
-                  <el-input v-model="formData.image" :clearable="true"  placeholder="请输入员工姓名" />
+                <el-form-item label="使用部门:"  prop="address" >
+                  <el-input v-model="formData.address" :clearable="true" />
                 </el-form-item>
               </el-form>
 			  <el-form :model="formData" :inline="true" label-position="right" ref="elFormRef" :rules="rule" label-width="75px">
-			    <el-form-item label="班组:"  prop="address" >
-			      <el-input v-model="formData.address" :clearable="true"  placeholder="请输入班组" />
-			    </el-form-item>
-			    <el-form-item label="日期:" prop="image" >
-			      <el-input v-model="formData.image" :clearable="true"  placeholder="请输入日期" />
+			    <el-form-item label="设备编号:"  prop="address" >
+			      <el-input v-model="formData.address" :clearable="true"  />
 			    </el-form-item>
 			  </el-form>
 			  <el-form :model="formData" :inline="true" label-position="right" ref="elFormRef" :rules="rule" label-width="75px">
-			    <el-form-item label="工单编号:"  prop="address" >
-			      <el-input v-model="formData.address" :clearable="true"  placeholder="请输入工单编号" />
-			    </el-form-item>
-			    <el-form-item prop="image" >
-			      <el-input v-model="formData.image" :clearable="true"  placeholder="请输入产品名称" />
+			    <el-form-item label="设备名称:"  prop="address" >
+			      <el-input v-model="formData.address" :clearable="true"  />
 			    </el-form-item>
 			  </el-form>
 			  <el-form :model="formData" :inline="true" label-position="right" ref="elFormRef" :rules="rule" label-width="75px">
-			    <el-form-item label="工序名称:"  prop="address" >
-			      <el-input v-model="formData.address" :clearable="true"  placeholder="请输入工序名称" style="width: 140px;" />
+			    <el-form-item label="日定额:"  prop="address" >
+			      <el-input v-model="formData.address" :clearable="true" />
 			    </el-form-item>
-			    <el-form-item prop="image" >
-			      <el-input v-model="formData.image" :clearable="true"  placeholder="请输入工序号" style="width: 140px;" />
-			    </el-form-item>
-			  	<el-form-item label="流程单号:"  prop="address" >
-			  	  <el-input v-model="formData.address" :clearable="true"  placeholder="请输入流程单号" style="width: 140px;" />
+			  	<el-form-item label="千元工价:"  prop="address" >
+			  	  <el-input v-model="formData.address" :clearable="true" />
 			  	</el-form-item>			
 			  </el-form>
-			  <el-form :model="formData" :inline="true" label-position="right" ref="elFormRef" :rules="rule" label-width="75px">
-			    <el-form-item label="抽检数量:"  prop="address" >
-			      <el-input v-model="formData.address" :clearable="true"  placeholder="请输入抽检数量" style="width: 123px;" />
-			    </el-form-item>			
-			  </el-form>
-			  <el-form :model="formData" :inline="true" label-position="right" ref="elFormRef" :rules="rule" label-width="75px">
-			    <el-form-item label="A类废品:"  prop="address" >
-			      <el-input v-model="formData.address" :clearable="true"  placeholder="请输入A类废品" style="width: 123px;" />
+			  <el-form :model="formData" :inline="true" label-position="right" ref="elFormRef" :rules="rule" label-width="60px">
+			    <el-form-item label="机长:" style="margin-right: 0%;" prop="address" >
+			      <el-input v-model="formData.address" :clearable="true"  style="width: 40px;" />
 			    </el-form-item>
-			    <el-form-item label="B类废品:"  prop="image" >
-			      <el-input v-model="formData.image" :clearable="true"  placeholder="请输入B类废品" style="width: 123px;" />
+			    <el-form-item label="副机:" style="margin-right: 0%;" prop="image" >
+			      <el-input v-model="formData.image" :clearable="true"  style="width: 40px;" />
 			    </el-form-item>
-			  	<el-form-item label="C类废品:"  prop="address" >
-			  	  <el-input v-model="formData.address" :clearable="true"  placeholder="请输入C类废品" style="width: 123px;" />
-			  	</el-form-item>			
+			  	<el-form-item label="调墨:" style="margin-right: 0%;" prop="address" >
+			  	  <el-input v-model="formData.address" :clearable="true"  style="width: 40px;" />
+			  	</el-form-item>	
+				<el-form-item label="二手:" style="margin-right: 0%;" prop="address" >
+				  <el-input v-model="formData.address" :clearable="true"  style="width: 40px;" />
+				</el-form-item>
+				<el-form-item label="飞达:" style="margin-right: 0%;" prop="image" >
+				  <el-input v-model="formData.image" :clearable="true"  style="width: 40px;" />
+				</el-form-item>
+				<el-form-item label="辅助:" style="margin-right: 0%;" prop="address" >
+				  <el-input v-model="formData.address" :clearable="true"  style="width: 40px;" />
+				</el-form-item>	
+				<el-form-item label="放卷:" style="margin-right: 0%;" prop="address" >
+				  <el-input v-model="formData.address" :clearable="true" style="width: 40px;" />
+				</el-form-item>
+				<el-form-item label="分切1:" style="margin-right: 0%;" prop="image" >
+				  <el-input v-model="formData.image" :clearable="true"  style="width: 40px;" />
+				</el-form-item>
+				<el-form-item label="分切2:" style="margin-right: 0%;" prop="address" >
+				  <el-input v-model="formData.address" :clearable="true" style="width: 40px;" />
+				</el-form-item>	
+				<el-form-item label="检验:" style="margin-right: 0%;" prop="address" >
+				  <el-input v-model="formData.address" :clearable="true"  style="width: 40px;" />
+				</el-form-item>
 			  </el-form>
-			  <el-form :model="formData" label-position="right" ref="elFormRef" :rules="rule" label-width="80px">
+			  <!-- <el-form :model="formData" label-position="right" ref="elFormRef" :rules="rule" label-width="80px">
 			    <el-form-item label="其他备注:"  prop="address" >
 			      <el-input v-model="formData.address" :clearable="true"  placeholder="请输入其他备注" />
 			    </el-form-item>
-			  </el-form>
+			  </el-form> -->
             </el-scrollbar>
             <template #footer>
               <div class="dialog-footer">
@@ -410,12 +418,12 @@ const type = ref('')
 
 // 更新行
 const updateCompanyFunc = async(row) => {
-    const res = await findCompany({ ID: row.ID })
+    // const res = await findCompany({ ID: row.ID })
     type.value = 'update'
-    if (res.code === 0) {
-        formData.value = res.data.recompany
+    // if (res.code === 0) {
+        // formData.value = res.data.recompany
         dialogFormVisible.value = true
-    }
+    // }
 }
 
 
@@ -518,7 +526,10 @@ const enterDialog = async () => {
 .JKWTree-container {
   display: flex;
 }
-
+/* 选中某行时的背景色*/
+.el-table__body tr.current-row>td {
+  background: #ff80ff !important;
+}
 .JKWTree-tree {
   width: 300px;
   background-color: #fff;

src/view/job/piece/piece.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-container>
-      <el-aside width="200px">
+      <el-aside width="350px">
         <div class="JKWTree-tree">
           <h3>计件定额管理</h3>
           <el-tree :data="treeData" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
@@ -527,7 +527,7 @@ const enterDialog = async () => {
 }
 
 .JKWTree-tree {
-  width: 300px;
+  width: 350px;
   background-color: #fff;
   padding: 10px;
   margin-right: 20px;

src/view/job/process/process.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-container>
-      <el-aside width="200px">
+      <el-aside width="320px">
         <div class="JKWTree-tree">
           <h3>工序损耗管理</h3>
           <el-tree :data="treeData" :props="defaultProps" @node-click="handleNodeClick"></el-tree>

src/view/job/processSheet/processSheet.vue

@@ -0,0 +1,355 @@
+<template>
+	<el-container>
+	  <el-main>
+		  <form method="POST" action="{:U('NewBarCodeNew/add_bach')}" style="margin-bottom:50px;" id="form">
+		                      <input name="userid" id="userid" value="{$session_config[uid]}" type="hidden">
+		                      <!--  <eq name="session_config.addtype" value="1">
+		                            <fieldset class="newlabel">
+		                                <legend style="width:auto;margin-left:20px;">生成厂商信息</legend>
+		                                <ul class="firm">
+		                                    <li>
+		                                        <ul>
+		                                            <li>
+		                                                <span>生产厂商：</span>
+		                                                <input id="company_code" type="hidden" name="supplier_code" value="{$userinfo[printer_code]}" readonly style="background:#EBEBE4" >
+		                                                <input id="supplier_id" type="hidden"  name="supplier_id" value="{$userinfo[id]}">
+		                                                <input  id="company_name"  type="text"  name="supplier_name"  value="{$userinfo[nickname]}" readonly style="background:#EBEBE4" >
+		                                                &lt;!&ndash;<input name="company_name" readonly="readonly" id="company_name"   value="浙江美浓世纪集团有限公司">&ndash;&gt;
+		                                            </li>
+		                                            <li>
+		                                                <span>编码:</span><input name="barcode_large" type="text" id="postcode" value="{$userinfo[barcode_large]}" readonly style="background:#EBEBE4">
+		                                            </li>
+		                                            <li>
+		                                                <span>代码:</span><input name="barcode_small" type="text" id="phone" value="{$userinfo[barcode_small]}" readonly  style="background:#EBEBE4">
+		                                            </li>
+		                                        </ul>
+		                                        <ul>
+		                                            <li>
+		                                                地&ensp;&ensp;&ensp;&ensp;址：<input class="company_addres" name="company_addres" type="text" id="company_address" value="{$userinfo[company_address]}" readonly style="background:#EBEBE4" >
+		                                            </li>
+		                                        </ul>
+		                                    </li>
+		                                </ul>
+		                            </fieldset>
+		                            <else/>
+		                            <fieldset class="newlabel">
+		                                <legend style="width:auto;margin-left:20px;">生成厂商信息</legend>
+		                                <ul class="firm">
+		                                    <li>
+		                                        <ul>
+		                                            <li>
+		                                                <span>生产厂商：</span>
+		                                                <select name="supplier_id" id="company_name1"  style="width:200px;height:35px;">
+		                                                    <volist name="companylist" id="vo">
+		                                                        <option value="{$vo.id}">{$vo.nickname}</option>
+		                                                    </volist>
+		                                                </select>
+		                                                <input id="company_code" type="hidden" name="supplier_code" value="{$companylist[0][printer_code]}" readonly  style="background:#EBEBE4">
+		                                                <input id="company_id" type="hidden"  name="supplier_id" value="{$companylist[0][id]}">
+		                                                <input  id="company_name"  type="hidden"  name="supplier_name"  value="{$companylist[0][nickname]}" readonly  style="background:#EBEBE4">
+		                                                &lt;!&ndash;<input name="company_name" readonly="readonly" id="company_name"   value="浙江美浓世纪集团有限公司">&ndash;&gt;
+		                                            </li>
+		                                            <li>
+		                                                <span>编码：</span><input name="barcode_large" type="text" id="barcode_large" value="{$companylist[0][barcode_large]}" readonly style="background:#EBEBE4">
+		                                            </li>
+		                                            <li>
+		                                                <span>代码：</span><input name="barcode_small" type="text" id="barcode_small" value="{$companylist[0][barcode_small]}" readonly  style="background:#EBEBE4">
+		                                            </li>
+		                                        </ul>
+		                                        <ul>
+		                                            <li>
+		                                                地&ensp;&ensp;&ensp;&ensp;址：<input class="company_addres" name="company_addres" type="text" id="company_address" value="{$companylist[0][company_address]}" readonly  style="background:#EBEBE4">
+		                                            </li>
+		                                        </ul>
+		                                    </li>
+		                                </ul>
+		                            </fieldset>
+		                        </eq>-->
+		                      <!-- <fieldset class="newlabel">
+		                           <legend style="width:auto;margin-left:20px;">辅料信息</legend>
+		                           <ul class="product">
+		                               <li>
+		                                   <ul>
+		                                       <li>
+		                                           <span>材料名称：</span>
+		                                           <select name="matter_id" id="product_name1" style="width:200px;height:35px;">
+		                                               <option value="0">============选择=============</option>
+		                                               <volist name="productlist" id="val" >
+		                                                   <option value="{$val.id}"  >{$val.title}</option>
+		                                               </volist>
+		                                           </select>
+		                                           <input name=" " type="hidden" readonly="readonly" id="product_num" value="{$productlist[0][product_num]}">
+		                                           <input id="matter_type" type="hidden"  name="matter_type" value="{$productlist[0][box_type]}">
+		                                           <input id="product_name" type="hidden" name="matter_name" value="{$productlist[0][title]}">
+		                                       </li>
+		  
+		                                       <li>
+		                                           <span>产品规格：</span><input name="matter_size" readonly="readonly" id="product_size" value="" style="background:#EBEBE4">
+		                                       </li>
+		                                       <li>
+		                                           <span>产品编码：</span>
+		                                           <input id="product_code" type="text"  name="matter_no" value="" readonly style="background:#EBEBE4">
+		                                           &lt;!&ndash;<span>产品编号：</span>&ndash;&gt;
+		                                       </li>
+		                                   </ul>
+		                                   <ul>
+		                                       <li>
+		                                           产品编号： <input name="code1" type="text" id="code1" readonly value="" style="background:#EBEBE4">
+		                                       </li>
+		                                       <li>
+		                                           存货编码： <input name="inventory_code" type="text" id="inventory_code" readonly value="" style="background:#EBEBE4">
+		                                       </li>
+		                                   </ul>
+		                               </li>
+		                           </ul>
+		                       </fieldset>-->
+		                      <fieldset class="newlabel">
+		                          <legend style="width:auto;margin-left:20px;">标记参数</legend>
+		                          <!--  <button  class="submitbtn"  id="copy_bach" onclick="return false;" style="margin-left: 0;">复制批次信息</button>-->
+		                          <table width="100%" border="1">
+		                              <caption>标签序列配置</caption>
+		                              <tr>
+		                                  <th style="width:40%;"><span>字段</span> </th>
+		                                  <th><span>值</span></th>
+		                              </tr>
+		                              <tr >
+		                                  <td><span>生产批次号</span></td>
+		                                  <td><input name="Gd_gdbh" type="text" id="Gd_gdbh" value=""   class="required" style="width: 380px;height: 30px;"></td>
+		                              </tr>
+		                              <tr>
+		                                  <td><span>纸张名称</span></td>
+		                                  <td>
+		                                      <select name="maobao" id="maobao" style="width: 380px;height: 30px;">
+		  
+		                                      </select>
+		                                  </td>
+		                              </tr>
+		                              <tr >
+		                                  <td><span style="color: red">码包</span></td>
+		                                  <td><input name="mabao" type="text" id="mabao" value=""   class="" style="width: 380px;height: 30px;" placeholder="利群(新版)专用，不是利群(新版)不要填"></td>
+		                              </tr>
+		                              <tr style="display: none" class="peijian">
+		                                  <td><span style="color: red">配件名称</span></td>
+		                                  <td>
+		                                      <select name="peijian" id="peijian" style="width: 380px;height: 30px; color: red" >
+		  
+		                                      </select>
+		                                  </td>
+		                              </tr>
+		                              <tr>
+		                                  <td><span>单个流程包含的件数</span></td>
+		                                  <td><input name="tldx" type="text" id="tldx" value="3000" class="required" style="width: 380px;height: 30px;"></td>
+		                              </tr>
+		                              <tr>
+		                                  <td><span>总投纸数</span></td>
+		                                  <td>
+		                                      <input name="num"  id="num" value="" style="width: 380px;height: 30px;">
+		                                  </td>
+		                              </tr>
+		                              <tr>
+		                                  <td><span>总流程</span></td>
+		                                  <td><input name="liucheng_total" type="number" id="liucheng_total" value="" class="required" style="width: 380px;height: 30px;"></td>
+		                              </tr>
+		                              <tr>
+		                              <td><span>版本号标识</span></td>
+		                              <td><input name="version" type="text" id="version" value="" class="required" style="width: 380px;height: 30px;"></td>
+		                              </tr>
+		                              <tr>
+		                              <td><span>起始流程号</span></td>
+		                              <td><input name="start_liucheng" type="text" id="start_liucheng" value="1" class="required" style="width: 380px;height: 30px;"></td>
+		                              </tr>
+		                              <tr>
+		                              <td><span>本次打印流程数量</span></td>
+		                              <td><input name="liucheng_num" type="text" id="liucheng_num" value="1" class="required" style="width: 380px;height: 30px;"></td>
+		                              </tr>
+		                              <tr>
+		                              <td>
+		                                  <span>备注</span></td>
+		                              <td>
+		                                  <input name="remark" type="text" id="remark" style="width: 380px;height: 30px;"></td>
+		                              </tr>
+		  <!--                            <tr>-->
+		  <!--                                <td><span style="color: red">工艺所属部门</span></td>-->
+		  <!--                                <td>-->
+		  <!--                                    <select name="department" id="department" style="width: 380px;height: 30px;" >-->
+		  <!--                                        <option value="1">胶印车间</option>-->
+		  <!--                                        <option value="2">凹印车间</option>-->
+		  <!--                                        <option value="3">模切车间</option>-->
+		  <!--                                    </select>-->
+		  <!--                                </td>-->
+		  <!--                            </tr>-->
+		                              <tr>
+		                                  <td>
+		                                      <span>左右偏移量</span></td>
+		                                  <td>
+		                                      <input name="x_offset" type="number" id="x_offset" value="0" style="width: 380px;height: 30px;"></td>
+		                              </tr>
+		                              <tr>
+		                                  <td>
+		                                      <span>上下偏移量</span></td>
+		                                  <td>
+		                                      <input name="y_offset" type="number" id="y_offset" value="0" style="width: 380px;height: 30px;"></td>
+		                              </tr>
+		                          </table>
+		                      </fieldset>
+		                      <div id="daima">
+		                          <table width="100%" border="1">
+		                              <caption>产品代号</caption>
+		                              <tr>
+		                                  <th style="width:40%;"><span>字段</span> </th>
+		                                  <th><span>值</span></th>
+		                              </tr>
+		                              <tr >
+		                                  <td><span>产品名称</span></td>
+		                                  <td>
+		                                      <select name="productname" id="product_name" style="width: 380px;height: 30px;">
+		  
+		                                      </select>
+		                                  </td>
+		                              </tr>
+		                              <tr>
+		                                  <td><span>产品代号</span></td>
+		                                  <td>
+		                                      <textarea name="product_number" id="product_number" rows="10" cols="51" >
+		  
+		                                      </textarea>
+		                                  </td>
+		                              </tr>
+		                          </table>
+		                          <button type='button' style="margin-top: 10px;"  class="submitbtn" id="numbtn">提交</button>
+		                      </div>
+		                     <div id="liucheng">
+		                         <fieldset class="newlabel">
+		                         <caption>工艺</caption>
+		                         <table width="100%" border="1" class="new_craft" id="new_craft">
+		  
+		  
+		                         </table>
+		                         </fieldset>
+		                     </div>
+		                      <div style="position:fixed;bottom:0;width:100%;height:50px;line-height:50px;">
+								  <button type='button' onsubmit='return false' class="submitbtn" id="send">打印</button>
+		                      </div>
+		                  </form>
+	  </el-main>
+	</el-container>
+</template>
+
+<script>
+
+</script>
+
+<style>
+	.newlabel{
+	    display: block;
+	    -webkit-margin-start: 2px;
+	    -webkit-margin-end: 2px;
+	    -webkit-padding-before: 0.35em;
+	    -webkit-padding-start: 0.75em;
+	    -webkit-padding-end: 0.75em;
+	    -webkit-padding-after: 0.625em;
+	    min-width: -webkit-min-content;
+	    border-width: 2px;
+	    border-style: groove;
+	    border-color: threedface;
+	    border-image: initial;
+	    width:870px;
+	    padding:10px;
+	    margin:10px;
+	    float: left;
+	}
+	.legend{
+	    display: block;
+	    -webkit-padding-start: 2px;
+	    -webkit-padding-end: 2px;
+	    border-width: initial;
+	    border-style: none;
+	    border-color: initial;
+	    border-image: initial;
+	}
+	#daima{
+	    display: block;
+	    border-width: 2px;
+	    border-style: groove;
+	    border-color: initial;
+	    border-image: initial;
+	    float: left;
+	    margin-left: 950px;
+	    margin-top: 18px;
+	    width: 550px;
+	    padding: 10px;
+	    position: fixed;
+	}
+	#daima table{
+	
+	}
+	.firm  ul,.product  ul,.tag ul{
+	    width:100%;
+	    padding:10px;
+	    font-size:0;
+	}
+	.firm li,.product li,.tag li{
+	    font-size:12px;
+	}
+	.firm li:first-child ul li,.product li:first-child ul li,.tag li:first-child ul li{
+	    display:inline-block;
+	    width:33.3333%;
+	    height:20px;
+	    line-height:20px;
+	}
+	.firm input,.product input,.tag input{
+	    width:200px;
+	    padding:5px;
+	}
+	.tag select{
+	    width:198px;
+	    padding:5px;
+	}
+	.firm li ul:last-child li{
+	    width:580px;
+	}
+	.firm li ul:last-child li input{
+	    width:476px;
+	}
+	.newlabel table{
+	    margin-top:20px;
+	    min-height: 25px; line-height: 25px;border-collapse: collapse;
+	}
+	.newlabel caption{
+	    padding:5px 0;
+	}
+	.newlabel table,.newlabel table tr th,.newlabel table tr td { border:1px dashed #ddd;padding:5px;}
+	#daima table,#daima table tr th,#daima table tr td { border:1px dashed #ddd;padding:5px;}
+	#createcode{
+	    display:inline-block;
+	    width:100px;
+	    height:30px;
+	    line-height:30px;
+	    margin-left:290px;
+	    border-radius:10px;
+	    background:#0fa2f1;
+	    color:#fff;
+	    text-align:center;
+	    cursor: pointer;
+	    opacity:0.8;
+	    filter:80%;
+	}
+	.submitbtn{
+	    width:100px;
+	    height:30px;
+	    line-height:30px;
+	    background:#0fa2f1;
+	    margin-left:30%;
+	    text-align:center;
+	    outline:none;
+	    border:0;
+	    color:#fff;
+	    border-radius:10px;
+	    opacity:0.8;
+	    filter:80%;
+	}
+	.high{ color: red; }
+	.msg{ font-size: 13px; }
+	.onError{ color: red; }
+	.onSuccess{ color: green; }
+</style>

src/view/job/rewards/rewards.vue

@@ -2,7 +2,7 @@
   <div>
 
     <el-container>
-      <el-aside width="200px">
+      <el-aside width="230px">
         <div class="JKWTree-tree">
 
           <h3  >工序大废品奖惩记录</h3>
@@ -39,7 +39,7 @@
             </el-form>
           </div>
           <div class="gva-table-box">
-            <div class="gva-btn-list">
+            <!-- <div class="gva-btn-list">
               <el-button type="primary" icon="plus" @click="openDialog">新增</el-button>
               <el-popover v-model:visible="deleteVisible" :disabled="!multipleSelection.length" placement="top" width="160">
                 <p>确定要删除吗？</p>
@@ -51,33 +51,37 @@
                   <el-button icon="delete" style="margin-left: 10px;" :disabled="!multipleSelection.length" @click="deleteVisible = true">删除</el-button>
                 </template>
               </el-popover>
-            </div>
+            </div> -->
             <el-table
                 ref="multipleTable"
                 style="width: 100%"
+				border
                 tooltip-effect="dark"
                 :data="tableData"
                 row-key="ID"
                 @selection-change="handleSelectionChange"
+				:show-overflow-tooltip="true"
+				highlight-current-row="true"
+				@row-dblclick="updateCompanyFunc"
             >
               <el-table-column type="selection" width="55" />
-              <el-table-column align="left" label="工单编号" prop="sczl_gdbh" width="120" />
-              <el-table-column align="left" label="印件名称" prop="Gd_cpmc" width="120" />
-			  <el-table-column align="left" label="日期" prop="sczl_rq" width="120" />
-			  <el-table-column align="left" label="流程单备注" prop="sczl_numDesc" width="120" />
-			  <el-table-column align="left" label="联数" prop="sczl_ls" width="120" />
-			  <el-table-column align="left" label="责任部门" prop="责任部门" width="120" />
-			  <el-table-column align="left" label="大废品数" prop="sczl_cl" width="120" />
-			  <el-table-column align="left" label="废品类型" prop="sczl_fplxA" width="120" />
-			  <el-table-column align="left" label="废品来源" prop="sczl_fplxB" width="120" />
-			  <el-table-column align="left" label="奖励班组" prop="Jl_bzdh" width="120" />
-              <el-table-column align="left" label="检验员工" prop="JL_bh1" width="120" />
-			  <el-table-column align="left" label="责任班组" prop="sczl_bzdh" width="120" />
-			  <el-table-column align="left" label="责任员工1" prop="sczl_bh1" width="120" />
-			  <el-table-column align="left" label="责任员工2" prop="sczl_bh2" width="120" />
+              <el-table-column align="left" fixed="left" label="工单编号" prop="sczl_gdbh" width="90" />
+              <el-table-column align="left" fixed="left" label="印件名称" prop="Gd_cpmc" width="210" />
+			  <el-table-column align="left" label="日期" prop="sczl_rq" width="100" />
+			  <el-table-column align="left" label="流程单备注" prop="sczl_numDesc" width="100" />
+			  <el-table-column align="left" label="联数" prop="sczl_ls" width="70" />
+			  <el-table-column align="left" label="责任部门" prop="责任部门" width="90" />
+			  <el-table-column align="left" label="大废品数" prop="sczl_cl" width="90" />
+			  <el-table-column align="left" label="废品类型" prop="sczl_fplxA" width="100" />
+			  <el-table-column align="left" label="废品来源" prop="sczl_fplxB" width="90" />
+			  <el-table-column align="left" label="奖励班组" prop="Jl_bzdh" width="90" />
+              <el-table-column align="left" label="检验员工" prop="JL_bh1" width="90" />
+			  <el-table-column align="left" label="责任班组" prop="sczl_bzdh" width="90" />
+			  <el-table-column align="left" label="责任员工1" prop="sczl_bh1" width="90" />
+			  <el-table-column align="left" label="责任员工2" prop="sczl_bh2" width="90" />
 			  <el-table-column align="left" label="创建用户" prop="sys_id" width="120" />
-			  <el-table-column align="left" label="创建时间" prop="sys_rq" width="120" />
-			  <el-table-column align="left" label="UNIQID" prop="UniqId" width="120" />
+			  <el-table-column align="left" label="创建时间" prop="sys_rq" width="160" />
+			  <el-table-column align="left" label="UNIQID" prop="UniqId" width="80" />
               <el-table-column align="left" label="操作" min-width="250">
                 <template #default="scope">
                   <el-button type="primary" link class="table-button" @click="getDetails(scope.row)">
@@ -520,12 +524,12 @@ const type = ref('')
 
 // 更新行
 const updateCompanyFunc = async(row) => {
-    const res = await findCompany({ ID: row.ID })
+    // const res = await findCompany({ ID: row.ID })
     type.value = 'update'
-    if (res.code === 0) {
-        formData.value = res.data.recompany
+    // if (res.code === 0) {
+        // formData.value = res.data.recompany
         dialogFormVisible.value = true
-    }
+    // }
 }
 
 
@@ -628,7 +632,10 @@ const enterDialog = async () => {
 .JKWTree-container {
   display: flex;
 }
-
+/* 选中某行时的背景色*/
+.el-table__body tr.current-row>td {
+  background: #ff80ff !important;
+}
 .JKWTree-tree {
   width: 300px;
   background-color: #fff;

src/view/job/sampling/sampling.vue

@@ -2,9 +2,8 @@
   <div>
 
     <el-container>
-      <el-aside width="200px">
+      <el-aside width="260px">
         <div class="JKWTree-tree">
-
           <h3  > 工单抽检记录维护</h3>
           <el-tree :data="treeData" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
         </div>
@@ -40,7 +39,7 @@
             </el-form>
           </div>
           <div class="gva-table-box">
-            <div class="gva-btn-list">
+            <!-- <div class="gva-btn-list">
               <el-button type="primary" icon="plus" @click="openDialog">新增</el-button>
               <el-popover v-model:visible="deleteVisible" :disabled="!multipleSelection.length" placement="top" width="160">
                 <p>确定要删除吗？</p>
@@ -52,31 +51,39 @@
                   <el-button icon="delete" style="margin-left: 10px;" :disabled="!multipleSelection.length" @click="deleteVisible = true">删除</el-button>
                 </template>
               </el-popover>
-            </div>
+            </div> -->
             <el-table
                 ref="multipleTable"
+				border
                 style="width: 100%"
                 tooltip-effect="dark"
                 :data="tableData"
                 row-key="ID"
                 @selection-change="handleSelectionChange"
+				highlight-current-row="true"
+				:show-overflow-tooltip="true"
+				@row-dblclick="updateCompanyFunc"
             >
               <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_bh" width="120" />
-              <el-table-column align="left" label="印件号" prop="Sczl_gdbh" width="120" />
-			  <el-table-column align="left" label="工序号" prop="sczl_gxh" width="120" />
-			  <el-table-column align="left" label="流程单号" prop="Sczl_num" width="120" />
-			  <el-table-column align="left" label="抽检数" prop="Sczl_抽检数" width="120" />
-			  <el-table-column align="left" label="A类废" prop="sczl_A类废" width="120" />
-			  <el-table-column align="left" label="B类废" prop="sczl_B类废" width="120" />
-			  <el-table-column align="left" label="C类废" prop="sczl_C类废" width="120" />
-			  <el-table-column align="left" label="备注" prop="Sczl_desc" width="120" />
+              <el-table-column align="center" fixed="left" label="日期" prop="Sczl_rq" width="100" />
+              <el-table-column align="left" fixed="left" label="员工编号" prop="Sczl_bh" width="90" />
+			  <el-table-column align="left" label="员工姓名" prop="name" width="90" />
+			  <el-table-column align="left" label="工单编号" prop="Sczl_gdbh" width="90" />
+			  <el-table-column align="left" label="产品名称" prop="Gd_cpmc" width="130" />
+			  <el-table-column align="left" label="工序名称" prop="Sczl_gxmc" width="95" />
+              <el-table-column align="left" label="印件号" prop="sczl_yjno" width="70" />
+			  <el-table-column align="left" label="工序号" prop="sczl_gxh" width="70" />
+			  <el-table-column align="left" label="流程单号" prop="Sczl_num" width="85" />
+			  <el-table-column align="left" label="抽检数" prop="Sczl_抽检数" width="70" />
+			  <el-table-column align="left" label="A类废" prop="sczl_A类废" width="70" />
+			  <el-table-column align="left" label="B类废" prop="sczl_B类废" width="70" />
+			  <el-table-column align="left" label="C类废" prop="sczl_C类废" width="70" />
+			  <el-table-column align="left" label="备注" prop="Sczl_desc" width="80" />
 			  <el-table-column align="left" label="创建用户" prop="Sys_id" width="120" />
-			  <el-table-column align="left" label="创建时间" prop="Sys_rq" width="120" />
+			  <el-table-column align="left" label="创建时间" prop="Sys_rq" width="160" />
 			  <el-table-column align="left" label="修改时间" prop="Mod_rq" width="120" />
-			  <el-table-column align="left" label="UNIQID" prop="UniqId" width="120" />
-              <el-table-column align="center" fixed="right" label="操作"  min-width="250">
+			  <el-table-column align="left" label="UNIQID" prop="UniqId" width="75" />
+              <el-table-column align="center" label="操作"  min-width="250">
                 <template #default="scope">
                   <el-button type="primary" link class="table-button" @click="getDetails(scope.row)">
                     <el-icon style="margin-right: 5px"><InfoFilled /></el-icon>
@@ -400,12 +407,12 @@ const type = ref('')
 
 // 更新行
 const updateCompanyFunc = async(row) => {
-    const res = await findCompany({ ID: row.ID })
-    type.value = 'update'
-    if (res.code === 0) {
-        formData.value = res.data.recompany
+    // const res = await findCompany({ ID: row.ID })
+    // type.value = 'update'
+    // if (res.code === 0) {
+        // formData.value = res.data.recompany
         dialogFormVisible.value = true
-    }
+    // }
 }
 
 
@@ -508,7 +515,10 @@ const enterDialog = async () => {
 .JKWTree-container {
   display: flex;
 }
-
+/* 选中某行时的背景色*/
+.el-table__body tr.current-row>td {
+  background: #ff80ff !important;
+}
 .JKWTree-tree {
   width: 300px;
   background-color: #fff;