Merge branch 'master' of https://git.7in6.com/Minong/mes-admin-backend-ui

src/api/jixiaoguanli/jitairibaobiao.js

@@ -84,3 +84,8 @@ export const getproductionaddList = (params) => {
 }
 
 
+
+
+
+
+

src/api/mes/job.js

@@ -73,4 +73,33 @@ export const getRewardList = (params) => {
     method: 'get',
     params
   })
+}
+
+export const getDocumentData = (params) => {
+  return service({
+    url: '/mes_server/process_document/getData',
+    method: 'get',
+    params
+  })
+}
+export const getDocumentHistory = (params) => {
+  return service({
+    url: '/mes_server/process_document/getHistory',
+    method: 'get',
+    params
+  })
+}
+export const saveDocumentData = (data) => {
+  return service({
+    url: '/mes_server/process_document/saveData',
+    method: 'post',
+    data
+  })
+}
+export const getDocumentInfo = (data) => {
+  return service({
+    url: '/mes_server/process_document/getInfo',
+    method: 'post',
+    data
+  })
 }

src/api/yunyin/yunying.js

@@ -158,19 +158,19 @@ export const Project = (data) => {
     })
 }
 //计划中工单->工艺资料
-export const projectCraft = (data) => {
+export const projectCraft = (params) => {
     return service({
         url: '/mes_server/manufacture/projectCraft',
         method: 'get',
-        data
+        params
     })
 }
 //计划中工单->印件资料
-export const projectPrint = (data) => {
+export const projectPrint = (params) => {
     return service({
         url: '/mes_server/manufacture/projectPrint',
         method: 'get',
-        data
+        params
     })
 }
 //生产中工单工序接口

src/view/job/processSheet/processSheet.vue

@@ -1,242 +1,182 @@
 <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>
+		  <form method="POST" :model="workData" action="{:U('NewBarCodeNew/add_bach')}" style="margin-bottom:50px;" id="form">
+		        <input name="userid" id="userid" value="{$session_config[uid]}" type="hidden">
+		        <fieldset class="newlabel">
+		            <legend style="width:auto;margin-left:20px;">标记参数</legend>
+		            <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" v-model="workData.Gd_gdbh" @input="propertyChange" class="required" style="width: 380px;height: 30px;"></td>
+		                </tr>
+		                <tr>
+		                    <td><span>纸张名称</span></td>
+		                    <td>
+		                        <select name="maobao" v-model="workData.maobao" style="width: 380px;height: 30px;">
+		        		  
+		                        </select>
+		                    </td>
+		                </tr>
+		                <tr >
+		                    <td><span style="color: red">码包</span></td>
+		                    <td><input name="mabao" type="text" v-model="workData.mabao" 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" v-model="workData.peijian" style="width: 380px;height: 30px; color: red" >
+		        		  
+		                        </select>
+		                    </td>
+		                </tr>
+		                <tr>
+		                    <td><span>单个流程包含的件数</span></td>
+		                    <td><input name="tldx" type="text" v-model="workData.tldx" value="3000" class="required" style="width: 380px;height: 30px;"></td>
+		                </tr>
+		                <tr>
+		                    <td><span>总投纸数</span></td>
+		                    <td>
+		                        <input name="num"  v-model="workData.num" value="" style="width: 380px;height: 30px;">
+		                    </td>
+		                </tr>
+		                <tr>
+		                    <td><span>总流程</span></td>
+		                    <td><input name="liucheng_total" type="number" v-model="workData.liucheng_total" value="" class="required" style="width: 380px;height: 30px;"></td>
+		                </tr>
+		                <tr>
+		                <td><span>版本号标识</span></td>
+		                <td><input name="version" type="text" v-model="workData.version" class="required" style="width: 380px;height: 30px;"></td>
+		                </tr>
+		                <tr>
+		                <td><span>起始流程号</span></td>
+		                <td><input name="start_liucheng" type="text" v-model="workData.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" v-model="workData.liucheng_num" value="1" class="required" style="width: 380px;height: 30px;"></td>
+		                </tr>
+		                <tr>
+		                <td>
+		                    <span>备注</span></td>
+		                <td>
+		                    <input name="remark" type="text" v-model="workData.remark" style="width: 380px;height: 30px;"></td>
+		                </tr>
+		                <tr>
+		                    <td>
+		                        <span>左右偏移量</span></td>
+		                    <td>
+		                        <input name="x_offset" type="number" v-model="workData.x_offset" value="0" style="width: 380px;height: 30px;"></td>
+		                </tr>
+		                <tr>
+		                    <td>
+		                        <span>上下偏移量</span></td>
+		                    <td>
+		                        <input name="y_offset" type="number" v-model="workData.y_offset" value="0" style="width: 380px;height: 30px;"></td>
+		                </tr>
+		            </table>
+		        </fieldset>
+	             <div id="liucheng">
+	                 <fieldset class="newlabel">
+	                 <table width="100%" border="1" class="new_craft" id="new_craft">
+	             	   <caption>工艺</caption>	  
+	             		  <tr>
+							  <td>上次<span style="color: red">{{department}}</span>工艺更新时间：<span style="color: red">{{update}}</span></td>
+							  <td> 
+							      <input type="button" style="margin-left: 1px;" value="增加工艺" @click="addInput"/>
+							  </td>
+						  </tr>
+							  <tr v-for="(item,index) in gyData">
+							      <td></td>
+							      <td><input type="text" v-model="item.gy"></td>
+							  </tr>
+	                 </table>
+	                 </fieldset>
+	             </div>
+		         <div style="position:fixed;bottom:0;width:100%;height:50px;line-height:50px;">
+		         	 <button type='button' onsubmit='return false' class="submitbtn" @click="sendClick" id="send">打印</button>
+		         </div>
+		    </form>
 	  </el-main>
 	</el-container>
 </template>
 
-<script>
-
+<script setup>
+	import {
+	  getDocumentData,
+	  getDocumentHistory,
+	  saveDocumentData,
+	  getDocumentInfo
+	} from '@/api/mes/job'
+	import { getDictFunc, formatDate, formatBoolean, filterDict, ReturnArrImg, onDownloadFile } from '@/utils/format'
+	import { ElMessage, ElMessageBox } from 'element-plus'
+	import { ref, reactive } from 'vue'
+	const workData = ref({
+		Gd_gdbh:'',
+		maobao:'',
+		mabao:'',
+		peijian:'',
+		tldx:'',
+		num:'',
+		liucheng_total:'',
+		version:'',
+		start_liucheng:'',
+		liucheng_num:'',
+		remark:'',
+		x_offset:'',
+		y_offset:''
+	})
+	const department = ref()
+	const update = ref()
+	const data = ref()
+	const gyData = ref([])
+	const datas = ref([])
+	const propertyChange = () => {
+		if(workData.value.Gd_gdbh.length!==7){
+			return false;
+		}
+		const getDocument = async() => {
+		  const getDocumentDatas = await getDocumentData({order:workData.value.Gd_gdbh})
+		  if (getDocumentDatas.code === 0) {
+			  workData.value.version=getDocumentDatas.data.paper[0].产品版本号;
+			  const getHistory = async() => {
+			    const getDocumentHistorys = await getDocumentHistory({order:2109722,peijian:0})
+			    if (getDocumentHistorys.code === 0) {
+					department.value=getDocumentHistorys.data.department
+					update.value=getDocumentHistorys.data.update
+					gyData.value=getDocumentHistorys.data.data.map((item)=>({
+						gy:item
+					}))			  	  
+			    }
+			  }
+			  getHistory()
+		  }
+		}
+		getDocument()
+		
+	}
+	const addInput = () => {
+	 gyData.value.push({gy:''})
+	}
+	const sendClick = () => {
+		// console.log(datas)
+		// console.log(gyData.value)
+		const saveDocument = async() => {
+			datas.value = gyData.value.map((item)=>(item.gy))
+			data.value= datas.value.join(",")
+			// console.log(data.value)
+		  const saveDocumentDatas = await saveDocumentData({order:2109722,data:data.value,peijian:0})
+		  if (saveDocumentDatas.code === 0) {
+		  	  console.log(saveDocumentDatas)
+		  }
+		}
+		saveDocument()
+	}
 </script>
 
 <style>

src/view/performance/Dayreportattached.vue

@@ -4,7 +4,7 @@
     <el-container>
       <el-aside width="250px">
         <div class="JKWTree-tree">
-          <h3>包装计件单据维护</h3>
+          <h3>机台生产日报表附加维护</h3>
           <el-tree :data="treeData" :props="defaultProps" highlight-current="true"
             @node-click="handleNodeClick"></el-tree>
         </div>
@@ -26,18 +26,18 @@
             </div>
             <!-- 数据展示 -->
             <el-table ref="multipleTable" style="width: 100%" tooltip-effect="dark" :data="tableData" row-key="ID"
-              highlight-current-row="true" border @selection-change="handleSelectionChange" @row-dblclick="doubleClick">
+              highlight-current-row="true" border @selection-change="handleSelectionChange" :show-overflow-tooltip="true" @row-dblclick="doubleClick">
               <el-table-column type="selection" width="55" />
-              <el-table-column align="left" label="生产日期" prop="sczl_rq" />
-              <el-table-column align="left" label="设备编号" prop="sczl_jtbh" />
-              <el-table-column align="left" label="设备名称" prop="sczl_sbmc" />
-              <el-table-column align="left" label="班组编号" prop="sczl_bzdh" />
-              <el-table-column align="left" label="排班工时" prop="sczl_设备运行工时" />
-              <el-table-column align="left" label="备注" prop="sczl_desc" />
-              <el-table-column align="left" label="创建用户" prop="sys_id" />
-              <el-table-column align="left" label="创建时间" prop="sys_rq" />
-              <el-table-column align="left" label="修改时间" prop="mod_rq" />
-              <el-table-column align="left" label="UNIQID" prop="UniqId" />
+              <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>
             <!-- 分页 -->
             <div class="gva-pagination">

src/view/performance/Dayreports.vue

@@ -4,7 +4,7 @@
     <el-container>
       <el-aside width="250px">
         <div class="JKWTree-tree">
-          <h3>包装计件单据维护</h3>
+          <h3>机台生产日报表维护</h3>
           <el-tree :data="treeData" :props="defaultProps" highlight-current="true"
             @node-click="handleNodeClick"></el-tree>
         </div>
@@ -26,47 +26,58 @@
             </div>
             <!-- 数据展示 -->
             <el-table ref="multipleTable" style="width: 100%" tooltip-effect="dark" :data="tableData" row-key="ID"
-              highlight-current-row="true" border @selection-change="handleSelectionChange" @row-dblclick="doubleClick">
+              highlight-current-row="true" border 
+			  :show-overflow-tooltip="true"
+			  @selection-change="handleSelectionChange" @row-dblclick="doubleClick">
               <el-table-column type="selection" width="55" />
-              <el-table-column align="left" label="工单编号" prop="sczl_gdbh" />
-              <el-table-column align="left" label="产品名称" prop="Gd_cpmc"/>
-              <el-table-column align="left" label="印件及工序" prop="jyno_gxmc" />
-              <el-table-column align="left" label="生产日期" prop="sczl_rq" />
-              <el-table-column align="left" label="机台" prop="sczl_jtbh" />
-              <el-table-column align="left" label="班组" prop="sczl_bzdh" />
-              <el-table-column align="left" label="流程单" prop="sczl_num" />
-              <el-table-column align="left" label="车头产量" prop="sczl_cl" />
-              <el-table-column align="left" label="色度数" prop="sczl_ms" />
-			  <el-table-column align="left" label="制程废" prop="sczl_zcfp" />
-			  <el-table-column align="left" label="次品" prop="sczl_zccp" />
-			  <el-table-column align="left" label="来料异常" prop="incomingerror" />
-			  <el-table-column align="left" label="装版工时" prop="sczl_装版工时" />
-			  <el-table-column align="left" label="保养工时" prop="sczl_保养工时" />
-			  <el-table-column align="left" label="打样工时" prop="sczl_打样工时" />
-			  <el-table-column align="left" label="异常停机工时" prop="sczl_异常停机工时" />
-			  <el-table-column align="left" label="设备运行工时" prop="sczl_设备运行工时" />
-			  <el-table-column align="left" label="组员编号1" prop="sczl_bh1" />
-			  <el-table-column align="left" label="组员姓名1" prop="name1" />
-			  <el-table-column align="left" label="组员编号2" prop="sczl_bh2" />
-			  <el-table-column align="left" label="组员姓名2" prop="name1" />
-			  <el-table-column align="left" label="组员编号3" prop="sczl_bh3" />
-			  <el-table-column align="left" label="组员姓名3" prop="name3" />
-			  <el-table-column align="left" label="组员编号4" prop="sczl_bh4" />
-			  <el-table-column align="left" label="组员姓名4" prop="name4" />
-			  <el-table-column align="left" label="组员编号5" prop="sczl_bh5" />
-			  <el-table-column align="left" label="组员姓名5" prop="name5" />
-			  <el-table-column align="left" label="组员编号6" prop="sczl_bh6" />
-			  <el-table-column align="left" label="组员姓名6" prop="name6" /> 
-			  <el-table-column align="left" label="拆片联拼系数" prop="拆片联拼系数" />
-			  <el-table-column align="left" label="拆片条小盒系数" prop="拆片条小盒系数" />
-			  <el-table-column align="left" label="工价系数" prop="sczl_工价系数" />
-			  <el-table-column align="left" label="日定额" prop="日定额" />
-			  <el-table-column align="left" label="千件工价" prop="piecesprice " />
-			  <el-table-column align="left" label="补产标准" prop="addstandards " />
-			  <el-table-column align="left" label="创建用户" prop="sys_id" />
-              <el-table-column align="left" label="创建时间" prop="sys_rq" />
-              <el-table-column align="left" label="修改时间" prop="mod_rq" />
-              <el-table-column align="left" label="UNIQID" prop="UniqId" />
+              <el-table-column align="left" label="工单编号" prop="sczl_gdbh" width="120"/>
+              <el-table-column align="left" label="产品名称" prop="Gd_cpmc"  width="340"/>
+              <el-table-column align="left" label="印件及工序" prop="jyno_gxmc"  width="120"/>
+              <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_bzdh"  width="120"/>
+              <el-table-column align="left" label="流程单" prop="sczl_num"  width="120"/>
+              <el-table-column align="left" label="车头产量" prop="sczl_cl"  width="120"/>
+              <el-table-column align="left" label="色度数" prop="sczl_ms" width="120" />
+			  <el-table-column align="left" label="制程废" prop="sczl_zcfp" width="120" />
+			  <el-table-column align="left" label="次品" prop="sczl_zccp"  width="120"/>
+			  <el-table-column align="left" label="来料异常" prop="incomingerror"  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="sczl_打样工时"  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="组员编号1" prop="sczl_bh1" width="120"/>
+			  <el-table-column align="left" label="组员姓名1" prop="name1"  width="120"/>
+			  <el-table-column align="left" label="组员编号2" prop="sczl_bh2"  width="120"/>
+			  <el-table-column align="left" label="组员姓名2" prop="name1" width="120" />
+			  <el-table-column align="left" label="组员编号3" prop="sczl_bh3"  width="120"/>
+			  <el-table-column align="left" label="组员姓名3" prop="name3" width="120"/>
+			  <el-table-column align="left" label="组员编号4" prop="sczl_bh4" width="120"/>
+			  <el-table-column align="left" label="组员姓名4" prop="name4"width="120" />
+			  <el-table-column align="left" label="组员编号5" prop="sczl_bh5" width="120"/>
+			  <el-table-column align="left" label="组员姓名5" prop="name5" width="120"/>
+			  <el-table-column align="left" label="组员编号6" prop="sczl_bh6"width="120" />
+			  <el-table-column align="left" label="组员姓名6" prop="name6" width="120"/> 
+			  <el-table-column align="left" label="拆片联拼系数" prop="拆片联拼系数" width="120"/>
+			  <el-table-column align="left" label="拆片条小盒系数" prop="拆片条小盒系数" width="120"/>
+			  <el-table-column align="left" label="工价系数" prop="sczl_工价系数" width="160"/>
+			  <el-table-column align="left" label="日定额" prop="日定额" width="120"/>
+			  <el-table-column align="left" label="千件工价" prop="piecesprice " width="120"/>
+			  <el-table-column align="left" label="补产标准" prop="addstandards " 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="160"/>
+			<tbody>
+			  <tr v-for="row in filteredRows" :key="row.sczl_gdbh">
+				<td>{{ row.sczl_gdbh }}</td>
+				<td>{{ row.sczl_rq }}</td>
+				<td>{{ row.sczl_bzdh }}</td>
+				<td>{{ row.sczl_cl }}</td>
+				<!-- 其他列 -->
+			  </tr>
+			</tbody>
             </el-table>
             <!-- 分页 -->
             <div class="gva-pagination">
@@ -656,7 +667,7 @@ const handleNodeClick = (node,check) => {
 
 // 搜索
 function onSearch() {
-
+return this.rows.filter(row => row.sczl_gdbh.includes(this.searchInfo));
 }
 // ============== 表格控制部分结束 ===============
 

src/view/performance/Packagingoutput.vue

@@ -1,128 +1,246 @@
 <template>
   <div>
-
+    <!-- 左侧树形结构 -->
     <el-container>
-      <el-aside width="200px">
+      <el-aside width="250px">
         <div class="JKWTree-tree">
-
-          <h3  > 组织列表</h3>
-          <el-tree :data="treeData" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
+          <h3>包装工序产量维护</h3>
+          <el-tree :data="treeData" :props="defaultProps" highlight-current="true"
+            @node-click="handleNodeClick"></el-tree>
         </div>
-
       </el-aside>
+
       <el-container>
-<!--        <el-header>dd</el-header>-->
         <el-main>
-
-          <div class="gva-search-box">
-            <el-form ref="elSearchFormRef" :inline="true" :model="searchInfo" class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
-              <el-form-item label="创建日期" prop="createdAt">
-                <template #label>
-        <span>
-          创建日期
-          <el-tooltip content="搜索范围是开始日期（包含）至结束日期（不包含）">
-            <el-icon><QuestionFilled /></el-icon>
-          </el-tooltip>
-        </span>
-                </template>
-                <el-date-picker v-model="searchInfo.startCreatedAt" type="datetime" placeholder="开始日期" :disabled-date="time=> searchInfo.endCreatedAt ? time.getTime() > searchInfo.endCreatedAt.getTime() : false"></el-date-picker>
-                —
-                <el-date-picker v-model="searchInfo.endCreatedAt" type="datetime" placeholder="结束日期" :disabled-date="time=> searchInfo.startCreatedAt ? time.getTime() < searchInfo.startCreatedAt.getTime() : false"></el-date-picker>
-              </el-form-item>
-              <el-form-item>
-                <el-button type="primary" icon="search" @click="onSubmit">查询</el-button>
-                <el-button icon="refresh" @click="onReset">重置</el-button>
-              </el-form-item>
-            </el-form>
-          </div>
+          <!-- 按钮区域 -->
           <div class="gva-table-box">
             <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>
-                <div style="text-align: right; margin-top: 8px;">
-                  <el-button type="primary" link @click="deleteVisible = false">取消</el-button>
-                  <el-button type="primary" @click="onDelete">确定</el-button>
-                </div>
-                <template #reference>
-                  <el-button icon="delete" style="margin-left: 10px;" :disabled="!multipleSelection.length" @click="deleteVisible = true">删除</el-button>
-                </template>
-              </el-popover>
+              <el-row :span="6">
+                <el-input v-model="searchInfo" placeholder="输入工单编号或产品名称" />
+              </el-row>
+              <el-button type="primary" :icon="Search" @click="onSearch">搜索</el-button>
+              <el-button type="primary" :icon="Refresh">重置</el-button>
+			  <el-button type="primary" :icon="Search">定位</el-button>
+			  <el-button type="primary" :icon="Search">查改</el-button>
+              <div style="margin-left: auto;">
+                <el-button type="primary" :icon="Download" @click="exportExcel">导出到Excel</el-button>
+              </div>
             </div>
-            <el-table
-              :data="tableData"
-				 height="300"
-				 border
-				 highlight-current-row
-				 show-summary
-              @current-change="handleCurrentChange"
-			  @row-dblclick="dbSelected"
-              style="width: 100%">
-              <el-table-column
-                prop="sys_id"
-                label="创建用户"
-                width="180">
-              </el-table-column>
-              <el-table-column
-                prop="sczl_rq"
-                label="日期"
-                width="180">
-              </el-table-column>
-              <el-table-column
-			    sortable
-                prop="sczl_cl"
-                label="包装产量"
-                width="180">
-              </el-table-column>
-              <el-table-column
-			    sortable
-                prop="sczl_PgCl"
-                label="包装数量"
-                width="180">
-              </el-table-column>
-             <el-table-column
-               prop="sys_rq"
-               label="创建时间"
-               width="180">
-             </el-table-column>
-			<el-table-column
-			  prop="mod_rq"
-			  label="修改时间"
-			  width="180">
-			</el-table-column>
-		 <el-table-column
-		   sum-text
-		   prop="UniqId"
-		   label="UniqId"
-		   width="180">
-		 </el-table-column>	
-            </el-table>		    
+            <!-- 数据展示 -->
+            <el-table ref="multipleTable" style="width: 100%" tooltip-effect="dark" :data="tableData" row-key="ID"
+              highlight-current-row="true" border @selection-change="handleSelectionChange" :show-overflow-tooltip="true" @row-dblclick="doubleClick">
+              <el-table-column type="selection" width="55" />
+			  <el-table-column align="left" label="创建用户" prop="sys_id" 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_PgCl" 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>
+            <!-- 分页 -->
             <div class="gva-pagination">
-              <el-pagination
-                  layout="total, sizes, prev, pager, next, jumper"
-                  :current-page="page"
-                  :page-size="limit"
-                  :page-sizes="[10, 30, 50, 100]"
-                  :total="total"
-                  @current-change="handleCurrentChange"
-                  @size-change="handleSizeChange"
-              />
+              <el-pagination layout="total, sizes, prev, pager, next, jumper" :current-page="page" :page-size="limit"
+                :page-sizes="[10, 30, 50, 100]" :total="total" @current-change="handleCurrentChange"
+                @size-change="handleSizeChange" />
             </div>
           </div>
-          <el-dialog v-model="dialogFormVisible" :before-close="closeDialog" :title="type==='create'?'添加':'修改'" destroy-on-close>
-            <el-scrollbar height="500px">
-              <el-form :model="formData" label-position="right" ref="elFormRef" :rules="rule" label-width="80px">
-                <el-form-item label="address字段:"  prop="address" >
-                  <el-input v-model="formData.address" :clearable="true"  placeholder="请输入address字段" />
-                </el-form-item>
-                <el-form-item label="image字段:"  prop="image" >
-                  <el-input v-model="formData.image" :clearable="true"  placeholder="请输入image字段" />
-                </el-form-item>
-                <el-form-item label="name字段:"  prop="name" >
-                  <el-input v-model="formData.name" :clearable="true"  placeholder="请输入name字段" />
-                </el-form-item>
-              </el-form>
-            </el-scrollbar>
+          <!-- 弹出框 -->
+          <el-dialog v-model="dialogFormVisible" :before-close="closeDialog" :title="type === 'create' ? '添加' : '修改'"
+            destroy-on-close width="1200px">
+            <!-- <el-scrollbar height="500px"> -->
+            <el-form :model="formData" label-position="left" ref="elFormRef" :rules="rule">
+
+              <el-row :gutter="20">
+
+                <el-col :span="6">
+                  <el-form-item label="日期" prop="name">
+                    <el-row :gutter="20">
+                      <el-col :span="12">
+                        <el-input v-model="formData.code" :clearable="true" placeholder="ZT01733" />
+                      </el-col>
+                    </el-row>
+                  </el-form-item>
+                </el-col>
+              </el-row>
+
+                            <!-- 标题栏 -->
+                            <el-row :gutter="10">
+                              <el-col :span="3">
+                                <span>工单编号</span>
+                              </el-col>
+                              <el-col :span="3">
+                                <span>印件工序</span>
+                              </el-col>
+                              <el-col :span="3">
+                                <span>工序名称</span>
+                              </el-col>
+                              <el-col :span="9">
+                                <span>印件名称</span>
+                              </el-col>
+                              <el-col :span="2">
+                                <span>包装产量</span>
+                              </el-col>
+							  <el-col :span="2">
+							    <span>每箱数量</span>
+							  </el-col>
+							  <el-col :span="2">
+							    <span>零头</span>
+							  </el-col>
+                            </el-row>
+              
+                            <!-- 员工1 -->
+                            <el-row :gutter="5" style="margin-top: 10px;">
+                              <el-col :span="3">
+                                <el-input v-model="formData.image" :clearable="true" placeholder="ZI00401" />
+                              </el-col>
+                              <el-col :span="3">
+                                <el-input v-model="formData.image" :clearable="true" placeholder="瞿春生" />
+                              </el-col>
+                              <el-col :span="3">
+                                <el-input v-model="formData.image" :clearable="true" placeholder="11.0" />
+                              </el-col>
+                              <el-col :span="9">
+                                <el-input v-model="formData.image" :clearable="true" placeholder="打包废纸" />
+                              </el-col>
+                              <el-col :span="2">
+                                <el-input v-model="formData.image" :clearable="true" placeholder="是" />
+                              </el-col>
+							  <el-col :span="2">
+							    <el-input v-model="formData.image" :clearable="true" placeholder="是" />
+							  </el-col>
+							  <el-col :span="2">
+							    <el-input v-model="formData.image" :clearable="true" placeholder="是" />
+							  </el-col>
+                            </el-row>
+              
+                            <!-- 员工2 -->
+                            <el-row :gutter="5" style="margin-top: 10px;">
+                              <el-col :span="3">
+                                <el-input v-model="formData.image" :clearable="true" placeholder="ZI00401" />
+                              </el-col>
+                              <el-col :span="3">
+                                <el-input v-model="formData.image" :clearable="true" placeholder="瞿春生" />
+                              </el-col>
+                              <el-col :span="3">
+                                <el-input v-model="formData.image" :clearable="true" placeholder="11.0" />
+                              </el-col>
+                              <el-col :span="9">
+                                <el-input v-model="formData.image" :clearable="true" placeholder="打包废纸" />
+                              </el-col>
+                              <el-col :span="2">
+                                <el-input v-model="formData.image" :clearable="true" placeholder="是" />
+                              </el-col>
+							  <el-col :span="2">
+							    <el-input v-model="formData.image" :clearable="true" placeholder="是" />
+							  </el-col>
+							  <el-col :span="2">
+							    <el-input v-model="formData.image" :clearable="true" placeholder="是" />
+							  </el-col>
+                            </el-row>
+              
+                            <!-- 员工3 -->
+                            <el-row :gutter="5" style="margin-top: 10px;">
+                              <el-col :span="3">
+                                <el-input v-model="formData.image" :clearable="true" placeholder="ZI00401" />
+                              </el-col>
+                              <el-col :span="3">
+                                <el-input v-model="formData.image" :clearable="true" placeholder="瞿春生" />
+                              </el-col>
+                              <el-col :span="3">
+                                <el-input v-model="formData.image" :clearable="true" placeholder="11.0" />
+                              </el-col>
+                              <el-col :span="9">
+                                <el-input v-model="formData.image" :clearable="true" placeholder="打包废纸" />
+                              </el-col>
+                              <el-col :span="2">
+                                <el-input v-model="formData.image" :clearable="true" placeholder="是" />
+                              </el-col>
+							  <el-col :span="2">
+							    <el-input v-model="formData.image" :clearable="true" placeholder="是" />
+							  </el-col>
+							  <el-col :span="2">
+							    <el-input v-model="formData.image" :clearable="true" placeholder="是" />
+							  </el-col>
+                            </el-row>
+              
+                            <!-- 员工4 -->
+                            <el-row :gutter="5" style="margin-top: 10px;">
+                              <el-col :span="3">
+                                <el-input v-model="formData.image" :clearable="true" placeholder="ZI00401" />
+                              </el-col>
+                              <el-col :span="3">
+                                <el-input v-model="formData.image" :clearable="true" placeholder="瞿春生" />
+                              </el-col>
+                              <el-col :span="3">
+                                <el-input v-model="formData.image" :clearable="true" placeholder="11.0" />
+                              </el-col>
+                              <el-col :span="9">
+                                <el-input v-model="formData.image" :clearable="true" placeholder="打包废纸" />
+                              </el-col>
+                              <el-col :span="2">
+                                <el-input v-model="formData.image" :clearable="true" placeholder="是" />
+                              </el-col>
+							  <el-col :span="2">
+							    <el-input v-model="formData.image" :clearable="true" placeholder="是" />
+							  </el-col>
+							  <el-col :span="2">
+							    <el-input v-model="formData.image" :clearable="true" placeholder="是" />
+							  </el-col>
+                            </el-row>
+              
+                            <!-- 员工5 -->
+                            <el-row :gutter="5" style="margin-top: 10px;">
+                              <el-col :span="3">
+                                <el-input v-model="formData.image" :clearable="true" placeholder="ZI00401" />
+                              </el-col>
+                              <el-col :span="3">
+                                <el-input v-model="formData.image" :clearable="true" placeholder="瞿春生" />
+                              </el-col>
+                              <el-col :span="3">
+                                <el-input v-model="formData.image" :clearable="true" placeholder="11.0" />
+                              </el-col>
+                              <el-col :span="9">
+                                <el-input v-model="formData.image" :clearable="true" placeholder="打包废纸" />
+                              </el-col>
+                              <el-col :span="2">
+                                <el-input v-model="formData.image" :clearable="true" placeholder="是" />
+                              </el-col>
+							  <el-col :span="2">
+							    <el-input v-model="formData.image" :clearable="true" placeholder="是" />
+							  </el-col>
+							  <el-col :span="2">
+							    <el-input v-model="formData.image" :clearable="true" placeholder="是" />
+							  </el-col>
+                            </el-row>
+              
+                            <!-- 员工6 -->
+                            <el-row :gutter="5" style="margin-top: 10px;">
+                              <el-col :span="3">
+                                <el-input v-model="formData.image" :clearable="true" placeholder="ZI00401" />
+                              </el-col>
+                              <el-col :span="3">
+                                <el-input v-model="formData.image" :clearable="true" placeholder="瞿春生" />
+                              </el-col>
+                              <el-col :span="3">
+                                <el-input v-model="formData.image" :clearable="true" placeholder="11.0" />
+                              </el-col>
+                              <el-col :span="9">
+                                <el-input v-model="formData.image" :clearable="true" placeholder="打包废纸" />
+                              </el-col>
+                              <el-col :span="2">
+                                <el-input v-model="formData.image" :clearable="true" placeholder="是" />
+                              </el-col>
+							  <el-col :span="2">
+							    <el-input v-model="formData.image" :clearable="true" placeholder="是" />
+							  </el-col>
+							  <el-col :span="2">
+							    <el-input v-model="formData.image" :clearable="true" placeholder="是" />
+							  </el-col>
+                            </el-row>
+			  
+            </el-form>
+            <!-- </el-scrollbar> -->
             <template #footer>
               <div class="dialog-footer">
                 <el-button @click="closeDialog">取 消</el-button>
@@ -131,44 +249,14 @@
             </template>
           </el-dialog>
 
-          <el-dialog v-model="detailShow" style="width: 800px" lock-scroll :before-close="closeDetailShow" title="查看详情" destroy-on-close>
-            <el-scrollbar height="550px">
-              <el-descriptions column="1" border>
-                <el-descriptions-item label="address字段">
-                  {{ formData.address }}
-                </el-descriptions-item>
-                <el-descriptions-item label="image字段">
-                  {{ formData.image }}
-                </el-descriptions-item>
-                <el-descriptions-item label="name字段">
-                  {{ formData.name }}
-                </el-descriptions-item>
-              </el-descriptions>
-            </el-scrollbar>
-          </el-dialog>
-
         </el-main>
-
       </el-container>
     </el-container>
 
-
-
-
-
   </div>
 </template>
 
 <script setup>
-import {
-  createCompany,
-  deleteCompany,
-  deleteCompanyByIds,
-  updateCompany,
-  findCompany,
-  getCompanyList
-} from '@/api/company'
-
 import {
   getList,
   getTab
@@ -177,15 +265,16 @@ import {
 // 全量引入格式化工具 请按需保留
 import { getDictFunc, formatDate, formatBoolean, filterDict, ReturnArrImg, onDownloadFile } from '@/utils/format'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { ref, reactive } from 'vue'
+import { Search, Refresh, Download } from '@element-plus/icons-vue'
+import { ref, reactive, onMounted, onBeforeMount } from 'vue'
+import { getPackingSideTable, getPackingTable } from '@/api/mes_api_gty/myapi'
 
 defineOptions({
-    name: 'Company'
+  name: '06-packingDocuments'
 })
 
-
-// 左侧树形结构
-const treeData = reactive([])
+// 侧边栏数据请求
+const treeData = reactive([]);
 
 const getTabdata = async () => {
     //接口调用函数
@@ -209,55 +298,160 @@ const getTabdata = async () => {
 	
 	}
 	
-	
-	
-   //  if(data.code === 0){
-   //    treeData.value = data.data
-	  // console.log(treeData)
-   //  }else {
-   //    console.error('Error in getDepartment:', data.msg);
-   //  }
 
 getTabdata();
 
-
 // 自动化生成的字典（可能为空）以及字段
 const formData = ref({
-        worknum: '',
-        dailyquota: '',
-        name: '',
-        })
-
+  id: '',
+  name: '',
+  date: '',
+  group: '',
+  packingOutput: '',
+  reworkOutput: '',
+  pieceOutput: '',
+  order: '',
+  user: '',
+  createTime: '',
+  updateTime: '',
+  uniqid: '',
+})
 
 // 验证规则
 const rule = reactive({
 })
 
-const searchRule = reactive({
-  createdAt: [
-    { validator: (rule, value, callback) => {
-      if (searchInfo.value.startCreatedAt && !searchInfo.value.endCreatedAt) {
-        callback(new Error('请填写结束日期'))
-      } else if (!searchInfo.value.startCreatedAt && searchInfo.value.endCreatedAt) {
-        callback(new Error('请填写开始日期'))
-      } else if (searchInfo.value.startCreatedAt && searchInfo.value.endCreatedAt && (searchInfo.value.startCreatedAt.getTime() === searchInfo.value.endCreatedAt.getTime() || searchInfo.value.startCreatedAt.getTime() > searchInfo.value.endCreatedAt.getTime())) {
-        callback(new Error('开始日期应当早于结束日期'))
-      } else {
-        callback()
-      }
-    }, trigger: 'change' }
-  ],
-})
-
 const elFormRef = ref()
 const elSearchFormRef = ref()
 
 // =========== 表格控制部分 ===========
-const page = ref(1)
+const tableData = reactive([])
+const detailData = reactive([
+  {
+    gdbh: '2311736',
+    yjgx: '01-15',
+    gxmc: '包装(圆切)',
+    yjmc: '利群(新)小《降焦改版)',
+    bzcl: '13.00',
+    fgcl: '0.00',
+    mxsl: '2500',
+    jcxs: '1.000',
+    ly: '',
+    dedh: '030002002',
+  },
+  {
+    gdbh: '2311736',
+    yjgx: '01-15',
+    gxmc: '包装(圆切)',
+    yjmc: '利群(新)小《降焦改版)',
+    bzcl: '13.00',
+    fgcl: '0.00',
+    mxsl: '2500',
+    jcxs: '1.000',
+    ly: '',
+    dedh: '030002002',
+  },
+  {
+    gdbh: '2311736',
+    yjgx: '01-15',
+    gxmc: '包装(圆切)',
+    yjmc: '利群(新)小《降焦改版)',
+    bzcl: '13.00',
+    fgcl: '0.00',
+    mxsl: '2500',
+    jcxs: '1.000',
+    ly: '',
+    dedh: '030002002',
+  },
+  {
+    gdbh: '2311736',
+    yjgx: '01-15',
+    gxmc: '包装(圆切)',
+    yjmc: '利群(新)小《降焦改版)',
+    bzcl: '13.00',
+    fgcl: '0.00',
+    mxsl: '2500',
+    jcxs: '1.000',
+    ly: '',
+    dedh: '030002002',
+  },
+  {
+    gdbh: '2311736',
+    yjgx: '01-15',
+    gxmc: '包装(圆切)',
+    yjmc: '利群(新)小《降焦改版)',
+    bzcl: '13.00',
+    fgcl: '0.00',
+    mxsl: '2500',
+    jcxs: '1.000',
+    ly: '',
+    dedh: '030002002',
+  },
+  {
+    gdbh: '2311736',
+    yjgx: '01-15',
+    gxmc: '包装(圆切)',
+    yjmc: '利群(新)小《降焦改版)',
+    bzcl: '13.00',
+    fgcl: '0.00',
+    mxsl: '2500',
+    jcxs: '1.000',
+    ly: '',
+    dedh: '030002002',
+  },
+  {
+    gdbh: '2311736',
+    yjgx: '01-15',
+    gxmc: '包装(圆切)',
+    yjmc: '利群(新)小《降焦改版)',
+    bzcl: '13.00',
+    fgcl: '0.00',
+    mxsl: '2500',
+    jcxs: '1.000',
+    ly: '',
+    dedh: '030002002',
+  },
+  {
+    gdbh: '2311736',
+    yjgx: '01-15',
+    gxmc: '包装(圆切)',
+    yjmc: '利群(新)小《降焦改版)',
+    bzcl: '13.00',
+    fgcl: '0.00',
+    mxsl: '2500',
+    jcxs: '1.000',
+    ly: '',
+    dedh: '030002002',
+  },
+  {
+    gdbh: '2311736',
+    yjgx: '01-15',
+    gxmc: '包装(圆切)',
+    yjmc: '利群(新)小《降焦改版)',
+    bzcl: '13.00',
+    fgcl: '0.00',
+    mxsl: '2500',
+    jcxs: '1.000',
+    ly: '',
+    dedh: '030002002',
+  },
+  {
+    gdbh: '2311736',
+    yjgx: '01-15',
+    gxmc: '包装(圆切)',
+    yjmc: '利群(新)小《降焦改版)',
+    bzcl: '13.00',
+    fgcl: '0.00',
+    mxsl: '2500',
+    jcxs: '1.000',
+    ly: '',
+    dedh: '030002002',
+  },
+])
 const total = ref(0)
+const page = ref(1)
 const limit = ref(10)
-const tableData = reactive([])
-const searchInfo = ref({})
+const searchInfo = ref('')
 const params = {
   date: '',
   sys_id: '',
@@ -265,32 +459,17 @@ const params = {
   limit: limit.value.toString(),
 }
 
-
-// 重置
-const onReset = () => {
-  searchInfo.value = {}
-  getTableData()
-}
-
-// 搜索
-const onSubmit = () => {
-  elSearchFormRef.value?.validate(async(valid) => {
-    if (!valid) return
-    page.value = 1
-    limit.value = 10
-    getTableData()
-  })
-}
-
-// 分页
+// 分页设置
 const handleSizeChange = (val) => {
-  limit.value = val
-  getTableData()
+  limit.value = val;
+  params.limit = val.toString();
+  getTableData();
 }
 
-// 修改页面容量
+// 页面跳转
 const handleCurrentChange = (val) => {
   page.value = val
+  params.page = val.toString();
   getTableData()
 }
 
@@ -305,7 +484,6 @@ const getTableData = async () => {
   }
 }
 
-// getTableData()
 const handleNodeClick = (node, check) => {
   //存放当前节点的nodeId
   if (node.params) {
@@ -316,179 +494,131 @@ const handleNodeClick = (node, check) => {
   }
 }
 
+// 搜索
+function onSearch() {
+
+}
 // ============== 表格控制部分结束 ===============
 
 // 获取需要的字典 可能为空 按需保留
-const setOptions = async () =>{
+const setOptions = async () => {
 }
 
 // 获取需要的字典 可能为空 按需保留
 setOptions()
 
-
 // 多选数据
 const multipleSelection = ref([])
 // 多选
 const handleSelectionChange = (val) => {
-    multipleSelection.value = val
+  multipleSelection.value = val
 }
 
-// 删除行
-const deleteRow = (row) => {
-    ElMessageBox.confirm('确定要删除吗?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-    }).then(() => {
-            deleteCompanyFunc(row)
-        })
-    }
-
-
 // 批量删除控制标记
 const deleteVisible = ref(false)
 
 // 多选删除
-const onDelete = async() => {
-      const ids = []
-      if (multipleSelection.value.length === 0) {
-        ElMessage({
-          type: 'warning',
-          message: '请选择要删除的数据'
-        })
-        return
-      }
-      multipleSelection.value &&
-        multipleSelection.value.map(item => {
-          ids.push(item.ID)
-        })
-      const res = await deleteCompanyByIds({ ids })
-      if (res.code === 0) {
-        ElMessage({
-          type: 'success',
-          message: '删除成功'
-        })
-        if (tableData.value.length === ids.length && page.value > 1) {
-          page.value--
-        }
-        deleteVisible.value = false
-        getTableData()
-      }
+const onDelete = async () => {
+  const ids = []
+  if (multipleSelection.value.length === 0) {
+    ElMessage({
+      type: 'warning',
+      message: '请选择要删除的数据'
+    })
+    return
+  }
+  multipleSelection.value &&
+    multipleSelection.value.map(item => {
+      ids.push(item.ID)
+    })
+  const res = await deleteCompanyByIds({ ids })
+  if (res.code === 0) {
+    ElMessage({
+      type: 'success',
+      message: '删除成功'
+    })
+    if (tableData.value.length === ids.length && page.value > 1) {
+      page.value--
     }
+    deleteVisible.value = false
+    getTableData()
+  }
+}
 
 // 行为控制标记（弹窗内部需要增还是改）
 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
-        dialogFormVisible.value = true
-    }
-}
-
-
-// 删除行
-const deleteCompanyFunc = async (row) => {
-    const res = await deleteCompany({ ID: row.ID })
-    if (res.code === 0) {
-        ElMessage({
-                type: 'success',
-                message: '删除成功'
-            })
-            if (tableData.value.length === 1 && page.value > 1) {
-            page.value--
-        }
-        getTableData()
-    }
-}
-
-// 弹窗控制标记
-const dialogFormVisible = ref(false)
-
-
-// 查看详情控制标记
-const detailShow = ref(false)
-
-
-// 打开详情弹窗
-const openDetailShow = () => {
-  detailShow.value = true
-}
-
-
-// 打开详情
-const getDetails = async (row) => {
-  // 打开弹窗
+const updateCompanyFunc = async (row) => {
   const res = await findCompany({ ID: row.ID })
+  type.value = 'update'
   if (res.code === 0) {
     formData.value = res.data.recompany
-    openDetailShow()
+    dialogFormVisible.value = true
   }
 }
 
-
-// 关闭详情弹窗
-const closeDetailShow = () => {
-  detailShow.value = false
-  formData.value = {
-          address: '',
-          image: '',
-          name: '',
-          }
-}
-
+// 弹窗控制标记
+const dialogFormVisible = ref(false)
 
 // 打开弹窗
 const openDialog = () => {
-    type.value = 'create'
-    dialogFormVisible.value = true
-}
-
-const dbSelected = () => {
-	
-    type.value = 'create'
-    dialogFormVisible.value = true
+  type.value = 'create'
+  dialogFormVisible.value = true
 }
 
 // 关闭弹窗
 const closeDialog = () => {
-    dialogFormVisible.value = false
-    formData.value = {
-        address: '',
-        image: '',
-        name: '',
-        }
+  dialogFormVisible.value = false
+  formData.value = {
+    address: '',
+    image: '',
+    name: '',
+  }
 }
 // 弹窗确定
 const enterDialog = async () => {
-     elFormRef.value?.validate( async (valid) => {
-             if (!valid) return
-              let res
-              switch (type.value) {
-                case 'create':
-                  res = await createCompany(formData.value)
-                  break
-                case 'update':
-                  res = await updateCompany(formData.value)
-                  break
-                default:
-                  res = await createCompany(formData.value)
-                  break
-              }
-              if (res.code === 0) {
-                ElMessage({
-                  type: 'success',
-                  message: '创建/更改成功'
-                })
-                closeDialog()
-                getTableData()
-              }
+  elFormRef.value?.validate(async (valid) => {
+    if (!valid) return
+    let res
+    switch (type.value) {
+      case 'create':
+        res = await createCompany(formData.value)
+        break
+      case 'update':
+        res = await updateCompany(formData.value)
+        break
+      default:
+        res = await createCompany(formData.value)
+        break
+    }
+    if (res.code === 0) {
+      ElMessage({
+        type: 'success',
+        message: '创建/更改成功'
       })
+      closeDialog()
+      getTableData()
+    }
+  })
 }
 
+// 双击表格操作
+function doubleClick(row, column, event) {
+  console.log(row, column, event);
+  // updateCompanyFunc(row);
+  type.value = 'update';
+  dialogFormVisible.value = true
+}
+
+// 导出excel
+function exportExcel() {
+  console.log('导出到excel');
+}
+
+// 生命周期钩子
+onMounted(async () => {
+});
 </script>
 
 <style>
@@ -512,4 +642,10 @@ const enterDialog = async () => {
 .JKWTree-content {
   flex: 1;
 }
+
+/* 选中某行时的背景色*/
+.el-table__body tr.current-row>td {
+  background: #ff80ff !important;
+  /* 背景颜色 */
+}
 </style>

src/view/yunyin/chanpinziliao/chanpinziliao.vue

@@ -2,10 +2,15 @@
   <div>
     <el-container>
       <!--    左侧树侧形结构-->
-      <el-aside width="270px">
-        <div class="JKWTree-tree" style="height: 600px">
+      <el-aside width="300px">
+        <div class="JKWTree-tree" style="height: 746px">
           <h3> 产品管理</h3>
-          <el-tree :data="treeData" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
+<!--          <el-tree :data="treeData" :props="defaultProps" @node-click="handleNodeClick"></el-tree>-->
+          <el-tree :data="treeData"  :props="defaultProps" @node-click="handleNodeClick" @node-expand="handleNodeExpand">
+            <template #default="{node,data}">
+              {{data['客户编号']}}【{{data['客户名称']}}】
+            </template>
+          </el-tree>
         </div>
       </el-aside>
 
@@ -18,17 +23,16 @@
             <el-form ref="elSearchFormRef" :inline="true" :model="searchInfo" class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
               <!--          左侧查询输入框 -->
               <el-form-item>
-                <el-input v-model="searchInfo.keyword" placeholder="请输入产品编号或产品名称" clearable style="width: 200px;"></el-input>
+                <el-input v-model="searchInfo.keyword" placeholder="搜索产品编号或产品名称" clearable style="width: 200px;"></el-input>
               </el-form-item>
               <!--        查询和重置按钮 -->
               <el-form-item>
                 <el-button type="primary" icon="search" @click="onSubmit">查询</el-button>
 <!--                <el-button icon="refresh" @click="onReset">重置</el-button>-->
-                <el-button type="primary" icon="plus" @click="openDialog">新增</el-button>
+<!--                <el-button type="primary" icon="plus" @click="openDialog">新增</el-button>-->
                 <el-button type="primary" icon="Download" @click="cpexportToExcel">导出产品资料</el-button>
                 <el-dialog v-model="cpdialogexportToExcel" title="导出产品资料" width="50%">
                   <!-- 在这里放入弹出页面的内容 -->
-                  <p>这是弹出页面的内容 导出产品资料</p>
 
                 </el-dialog>
 
@@ -47,7 +51,7 @@
           <div class="gva-table-box">
             <!--        数据表格 -->
             <el-table ref="multipleTable"
-                      style="width: 100%;height: 600px;"
+                      style="width: 100%;height: 580px;"
                       border
                       tooltip-effect="dark"
                       :data="tableData"
@@ -60,7 +64,7 @@
               <el-table-column type="selection" width="55" />
               <el-table-column align="left" label="客户编号" prop="客户编号" width="100" />
               <el-table-column align="left" label="产品编号" prop="产品编号" width="115" />
-              <el-table-column align="left" label="产品名称" prop="产品名称" width="500" />
+              <el-table-column align="left" label="产品名称" prop="产品名称" width="340" />
               <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"/>
@@ -79,65 +83,71 @@
               <el-table-column align="left" label="印件数" prop="yjData" width="100" />
             </el-table>
             <div class="gva-pagination">
-              <el-pagination layout="total, sizes, prev, pager, next, jumper" :current-page="page" :page-size="pageSize" :page-sizes="[10, 30, 50, 100]" :total="total" @current-change="handleCurrentChange" @size-change="handleSizeChange"/>
+              <el-pagination layout="total, sizes, prev, pager, next, jumper" :current-page="page"
+                             :page-size="pageSize" :page-sizes="[10, 30, 50, 100]" :total="total"
+                             @current-change="handleCurrentChange" @size-change="handleSizeChange" />
             </div>
-          </div>
 
-          <!--      印件资料、工艺资料、印版资料、技术资料附件【按钮】-->
-          <div>
-            <el-button type="primary" icon="" @click="showTable('印件资料')"  style="margin-right: 2px;">印件资料</el-button>
-            <el-button type="primary" icon="" @click="showTable('工艺资料')"  style="margin-right: 2px;">工艺资料</el-button>
-            <el-button type="primary" icon="" @click="showTable('印版资料')"  style="margin-right: 2px;">印版资料</el-button>
-            <el-button type="primary" icon="" @click="showTable('技术资料附件')" style="margin-right: 2px;">技术资料附件</el-button>
-          </div>
-
-          <div v-if="currentTable === '印件资料'">
-            <el-table ref="multipleTable" style="width: 100%;height: 400px" border tooltip-effect="dark" :data="yjtableData" row-key="ID" @selection-change="handleSelectionChange">
-              <el-table-column type="selection" width="55" />
-              <el-table-column align="left" label="印件号" prop="yj_yjno"  width="80"/>
-              <el-table-column align="left" label="印件代号" prop="yj_yjdh" width="100" />
-              <el-table-column align="left" label="印件名称" prop="yj_yjmc" width="563" />
-              <el-table-column align="left" label="纸张名称" prop="yj_zzdh" width="100"/>
-              <el-table-column align="left" label="投料规格" prop="yj_tlgg" width="240"/>
-              <el-table-column align="left" label="开料规格" prop="yj_klgg" width="100"/>
-              <el-table-column align="left" label="开数" prop="yj_ks" width="80" />
-              <el-table-column align="left" label="联数" prop="yj_ls" width="80" />
-              <el-table-column align="left" label="备注" prop="yj_desc" width="200" />
-              <el-table-column align="left" label="建档用户" prop="sys_id" width="130" />
-              <el-table-column align="left" label="建档日期" prop="sys_rq" width="160" />
-              <el-table-column align="left" label="更新日期" prop="mod_rq" width="160"/>
-            </el-table>
           </div>
 
-          <div v-if="currentTable === '工艺资料'">
-            <el-table ref="multipleTable" style="width: 100%;height: 400px" border tooltip-effect="dark" :data="gytableData" row-key="ID" @selection-change="handleSelectionChange">
-              <el-table-column type="selection" width="55" />
-              <el-table-column align="left" label="方案" prop="方案"  width="70"/>
-              <el-table-column align="left" label="印件" prop="Gy0_yjno" width="70" />
-              <el-table-column align="left" label="工序" prop="Gy0_gxh" width="70" />
-              <el-table-column align="left" label="工序名称" prop="gy0_gxmc" width="220" />
-              <el-table-column align="left" label="工序名称" prop="add_gxmc" width="530" />
-              <el-table-column align="left" label="开数" prop="Gy0_Ks" width="70" />
-              <el-table-column align="left" label="联数" prop="Gy0_ls" width="70" />
-              <el-table-column align="left" label="备注" prop="备注" width="150" />
-              <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="Gy0_Ms" width="100" />
-              <el-table-column align="left" label="人工检_正品版" prop="人工检_正品版" width="120" />
-              <el-table-column align="left" label="人工检_次品版" prop="人工检_正品版" width="120" />
-              <el-table-column align="left" label="人工检_废检" prop="人工检_废检" width="120"/>
-              <el-table-column align="left" label="机检_正品版" prop="机检_正品版" width="120"/>
-              <el-table-column align="left" label="机检_次品检" prop="机检_次品检" width="120"/>
-              <el-table-column align="left" label="机检_废检" prop="机检_废检" width="120"/>
-              <el-table-column align="left" label="设备编号" prop="Gy0_sbmc" width="100"/>
-              <el-table-column align="left" label="最后修改" prop="最后修改" width="160"/>
-              <el-table-column align="left" label="建档日期" prop="建档日期" width="160"/>
-              <el-table-column align="left" label="更新日期" prop="更新日期" width="160"/>
-            </el-table>
-          </div>
 
-          <div v-if="currentTable === '印版资料'">
-            <el-table ref="multipleTable" style="width: 100%;height: 400px" border tooltip-effect="dark" :data="ybtableData" row-key="ID" @selection-change="handleSelectionChange">
+          <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+
+            <el-tab-pane label="印件资料"  @click="showTable('印件资料')"  name="first">
+              <el-table ref="multipleTable"
+                        :show-overflow-tooltip="true"
+                        highlight-current-row="true"
+                        style="width: 100%;height: 400px" border tooltip-effect="dark" :data="yjtableData" row-key="ID" @selection-change="handleSelectionChange">
+                <el-table-column type="selection" width="55" />
+                <el-table-column align="left" label="印件号" prop="yj_yjno"  width="80"/>
+                <el-table-column align="left" label="印件代号" prop="yj_yjdh" width="100" />
+                <el-table-column align="left" label="印件名称" prop="yj_yjmc" width="340" />
+                <el-table-column align="left" label="纸张名称" prop="yj_zzdh" width="100"/>
+                <el-table-column align="left" label="投料规格" prop="yj_tlgg" width="240"/>
+                <el-table-column align="left" label="开料规格" prop="yj_klgg" width="100"/>
+                <el-table-column align="left" label="开数" prop="yj_ks" width="80" />
+                <el-table-column align="left" label="联数" prop="yj_ls" width="80" />
+                <el-table-column align="left" label="备注" prop="yj_desc" width="200" />
+                <el-table-column align="left" label="建档用户" prop="sys_id" width="130" />
+                <el-table-column align="left" label="建档日期" prop="sys_rq" width="160" />
+                <el-table-column align="left" label="更新日期" prop="mod_rq" width="160"/>
+              </el-table>
+            </el-tab-pane>
+
+            <el-tab-pane label="工艺资料" @click="showTable('工艺资料')" name="second">
+              <el-table ref="multipleTable"
+                        highlight-current-row="true"
+                        :show-overflow-tooltip="true"
+                        style="width: 100%;height: 400px" border tooltip-effect="dark" :data="gytableData" row-key="ID" @selection-change="handleSelectionChange">
+                <el-table-column type="selection" width="55" />
+                <el-table-column align="left" label="方案" prop="方案"  width="70"/>
+                <el-table-column align="left" label="印件" prop="Gy0_yjno" width="70" />
+                <el-table-column align="left" label="工序" prop="Gy0_gxh" width="70" />
+                <el-table-column align="left" label="工序名称" prop="gy0_gxmc" width="120" />
+                <el-table-column align="left" label="工序名称" prop="add_gxmc" width="340" />
+                <el-table-column align="left" label="开数" prop="Gy0_Ks" width="70" />
+                <el-table-column align="left" label="联数" prop="Gy0_ls" width="70" />
+                <el-table-column align="left" label="备注" prop="备注" width="150" />
+                <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="Gy0_Ms" width="100" />
+                <el-table-column align="left" label="人工检_正品版" prop="人工检_正品版" width="120" />
+                <el-table-column align="left" label="人工检_次品版" prop="人工检_正品版" width="120" />
+                <el-table-column align="left" label="人工检_废检" prop="人工检_废检" width="120"/>
+                <el-table-column align="left" label="机检_正品版" prop="机检_正品版" width="120"/>
+                <el-table-column align="left" label="机检_次品检" prop="机检_次品检" width="120"/>
+                <el-table-column align="left" label="机检_废检" prop="机检_废检" width="120"/>
+                <el-table-column align="left" label="设备编号" prop="Gy0_sbmc" width="100"/>
+                <el-table-column align="left" label="最后修改" prop="最后修改" width="160"/>
+                <el-table-column align="left" label="建档日期" prop="建档日期" width="160"/>
+                <el-table-column align="left" label="更新日期" prop="更新日期" width="160"/>
+              </el-table>
+            </el-tab-pane>
+
+            <el-tab-pane label="印版资料" @click="showTable('印版资料')" name="third">
+            <el-table ref="multipleTable"
+                      highlight-current-row="true"
+                      style="width: 100%;height: 400px" border tooltip-effect="dark" :data="ybtableData" row-key="ID" @selection-change="handleSelectionChange">
               <el-table-column type="selection" width="55" />
               <el-table-column align="left" label="方案" prop="YB_方案"  width="100"/>
               <el-table-column align="left" label="印件号" prop="YB_Yjno" width="100" />
@@ -149,10 +159,13 @@
               <el-table-column align="left" label="建档日期" prop="建档日期" width="160" />
               <el-table-column align="left" label="更新日期" prop="更新日期" width="160" />
             </el-table>
-          </div>
+            </el-tab-pane>
+
 
-          <div v-if="currentTable === '技术资料附件'">
-            <el-table ref="multipleTable" style="width: 100%;height: 400px" border tooltip-effect="dark" :data="jstableData" row-key="ID" @selection-change="handleSelectionChange">
+            <el-tab-pane label="技术资料附件" @click="showTable('技术资料附件')" name="fourth">
+            <el-table ref="multipleTable"
+                      highlight-current-row="true"
+                      style="width: 100%;height: 400px" border tooltip-effect="dark" :data="jstableData" row-key="ID" @selection-change="handleSelectionChange">
               <el-table-column type="selection" width="55" />
               <el-table-column align="left" label="序号" prop="序号"  width="100"/>
               <el-table-column align="left" label="适用工序" prop="适用工序" width="100" />
@@ -163,71 +176,64 @@
               <el-table-column align="left" label="建档日期" prop="建档日期" width="160" />
               <el-table-column align="left" label="更新日期" prop="更新日期" width="160" />
             </el-table>
-          </div>
+            </el-tab-pane>
+
+
+          </el-tabs>
 
           <!-- 弹窗 -->
           <el-dialog v-model="dialogFormVisible" :before-close="closeDialog" :title="type==='create'?'添加产品资料':'修改产品资料'" destroy-on-close>
             <el-row>
-              <!-- 左侧表单 -->
-              <el-col :span="8">
-                <el-scrollbar height="500px">
-                  <el-form :model="formData" label-position="right" ref="elFormRef" :rules="rule" label-width="100px">
-                    <el-form-item label="客户料号:" prop="address">
-                      <el-input v-model="formData.address" :clearable="true" placeholder="请输入客户料号" style="width: 180px;" />
-                    </el-form-item>
-                    <el-form-item label="产品编号:" prop="gender">
-                      <el-input v-model="formData.gender" :clearable="true" placeholder="请输入产品编号" style="width: 180px;" />
-                    </el-form-item>
-                    <el-form-item label="产品名称:" prop="idCard">
-                      <el-input v-model="formData.idCard" :clearable="true" placeholder="请输入产品名称" style="width: 180px;" />
-                    </el-form-item>
-                    <el-form-item label="版本号:" prop="department">
-                      <el-input v-model="formData.department" :clearable="true" placeholder="请输入版本号" style="width: 180px;" />
-                    </el-form-item>
-                    <el-form-item label="成品规格:" prop="joinDate">
-                      <el-input v-model="formData.joinDate" :clearable="true" placeholder="请输入成品规格" style="width: 180px;" />
-                    </el-form-item>
-                    <el-form-item label="单位:" prop="joinDate">
-                      <el-input v-model="formData.joinDate" :clearable="true" placeholder="请输入单位" style="width: 180px;" />
-                    </el-form-item>
-                    <el-form-item label="产品分类:" prop="joinDate">
-                      <el-input v-model="formData.joinDate" :clearable="true" placeholder="请输入产品分类" style="width: 180px;" />
-                    </el-form-item>
-                  </el-form>
-                </el-scrollbar>
-              </el-col>
-
-              <!-- 中间表单 -->
-              <el-col :span="8">
-                <el-scrollbar height="500px">
-                  <el-form :model="formData" label-position="right" ref="elFormRef" :rules="rule" label-width="100px">
-                    <el-form-item label="最近接单日期:" prop="name">
-                      <el-input v-model="formData.name" :clearable="true" placeholder="请输入最近接单日期:" style="width: 180px;" />
-                    </el-form-item>
-                    <el-form-item label="最近引用日期:" prop="birthDate">
-                      <el-input v-model="formData.birthDate" :clearable="true" placeholder="请输入最近引用日期" style="width: 180px;" />
-                    </el-form-item>
-                    <el-form-item label="印件数:" prop="position">
-                      <el-input v-model="formData.position" :clearable="true" placeholder="请输入印件数" style="width: 180px;" />
-                    </el-form-item>
-                    <el-form-item label="工艺:" prop="departmentId">
-                      <el-input v-model="formData.departmentId" :clearable="true" placeholder="请输入工艺" style="width: 180px;" />
-                    </el-form-item>
-                    <el-form-item label="当前状态:" prop="departmentId">
-                      <el-input v-model="formData.departmentId" :clearable="true" placeholder="请输入当前状态" style="width: 180px;" />
-                    </el-form-item>
-                    <el-form-item label="最后修改:" prop="departmentId">
-                      <el-input v-model="formData.departmentId" :clearable="true" placeholder="请输入最后修改:" style="width: 180px;" />
-                    </el-form-item>
-                    <el-form-item label="建档时间:" prop="departmentId">
-                      <el-input v-model="formData.departmentId" :clearable="true" placeholder="请输入建档时间" style="width: 180px;" />
-                    </el-form-item>
-                    <el-form-item label="更新时间:" prop="departmentId">
-                      <el-input v-model="formData.departmentId" :clearable="true" placeholder="请输入更新时间" style="width: 180px;" />
-                    </el-form-item>
-                  </el-form>
-                </el-scrollbar>
-              </el-col>
+              <el-scrollbar height="500px">
+                <el-form :model="formDataTest" label-position="right" ref="elFormRef" :rules="rule" label-width="100px">
+                  <el-row>
+                    <el-col :span="8">
+                      <el-form-item label="印品代号:" prop="address">
+                        <el-input v-model="formDataTest['U8UID']" :clearable="true" placeholder="" style="width: 120px;" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="6">
+                      <el-form-item label="版本号:" prop="gender">
+                        <el-input v-model="formDataTest['版本号']" :clearable="true" placeholder="" style="width: 100px;" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="10">
+                      <el-form-item label="客户料号:" prop="idCard">
+                        <el-input v-model="formDataTest['客户料号']" :clearable="true" placeholder="" style="width: 210px;" />
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col :span="24">
+                      <el-form-item label="产品名称:" prop="department">
+                        <el-input v-model="formDataTest['产品名称']" :clearable="true" placeholder=""  />
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col :span="12">
+                      <el-form-item label="产品类别:" prop="department">
+                        <el-input v-model="formDataTest['产品类别']" :clearable="true" placeholder="" style="width: 180px;" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                      <el-form-item label="单位:" prop="department">
+                        <el-input v-model="formDataTest['计量单位']" :clearable="true" placeholder="" style="width: 180px;" />
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                  <el-form-item label="成品规格:" prop="department">
+                    <el-input v-model="formDataTest['成品规格']" :clearable="true" placeholder="" />
+                  </el-form-item>
+
+                    <el-col :span="20">
+                      <el-form-item label="产品备注:" prop="remark">
+                        <el-input type="textarea" v-model="formDataTest['产品备注']" :rows="4" :clearable="true" placeholder=""  />
+                      </el-form-item>
+                    </el-col>
+                </el-form>
+              </el-scrollbar>
+
             </el-row>
 
             <template #footer>
@@ -238,62 +244,6 @@
             </template>
           </el-dialog>
 
-          <!-- 详情展示弹窗 -->
-          <el-dialog v-model="detailShow" style="width: 800px" lock-scroll :before-close="closeDetailShow" title="员工基本资料管理" destroy-on-close>
-            <el-scrollbar height="550px">
-              <el-descriptions column="2" border>
-                <!-- 左侧部分 -->
-                <el-descriptions-item label="客户料号" :min-width="labelMinWidth">
-                  {{ formData.employeeId }}
-                </el-descriptions-item>
-                <el-descriptions-item label="产品编号" :min-width="labelMinWidth">
-                  {{ formData.gender }}
-                </el-descriptions-item>
-                <el-descriptions-item label="产品名称" :min-width="labelMinWidth">
-                  {{ formData.idCard }}
-                </el-descriptions-item>
-                <el-descriptions-item label="版本号" :min-width="labelMinWidth">
-                  {{ formData.sectionName }}
-                </el-descriptions-item>
-                <el-descriptions-item label="成品规格" :min-width="labelMinWidth">
-                  {{ formData.employeeId }}
-                </el-descriptions-item>
-                <el-descriptions-item label="单位" :min-width="labelMinWidth">
-                  {{ formData.gender }}
-                </el-descriptions-item>
-                <el-descriptions-item label="产品分类" :min-width="labelMinWidth">
-                  {{ formData.idCard }}
-                </el-descriptions-item>
-
-                <!-- 右侧部分 -->
-                <el-descriptions-item label="最近接单日期" :min-width="labelMinWidth">
-                  {{ formData.name }}
-                </el-descriptions-item>
-                <el-descriptions-item label="最近引用日期" :min-width="labelMinWidth">
-                  {{ formData.birthdate }}
-                </el-descriptions-item>
-                <el-descriptions-item label="印件数" :min-width="labelMinWidth">
-                  {{ formData.position }}
-                </el-descriptions-item>
-                <el-descriptions-item label="工艺" :min-width="labelMinWidth">
-                  {{ formData.departmentId }}
-                </el-descriptions-item>
-                <el-descriptions-item label="当前状态" :min-width="labelMinWidth">
-                  {{ formData.name }}
-                </el-descriptions-item>
-                <el-descriptions-item label="最后修改" :min-width="labelMinWidth">
-                  {{ formData.birthdate }}
-                </el-descriptions-item>
-                <el-descriptions-item label="建档时间" :min-width="labelMinWidth">
-                  {{ formData.position }}
-                </el-descriptions-item>
-                <el-descriptions-item label="更新时间" :min-width="labelMinWidth">
-                  {{ formData.departmentId }}
-                </el-descriptions-item>
-              </el-descriptions>
-            </el-scrollbar>
-
-          </el-dialog>
         </el-main>
       </el-container>
     </el-container>
@@ -305,7 +255,8 @@
 export default {
   data() {
     return {
-      currentTable: '', // 当前展示的表格
+      currentTable: '',
+      activeName: 'first',
       // 其他表格数据...
     };
   },
@@ -329,7 +280,7 @@ import {createCompany, deleteCompany, deleteCompanyByIds, updateCompany, findCom
 import { getDictFunc, formatDate, formatBoolean, filterDict, ReturnArrImg, onDownloadFile } from '@/utils/format'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { ref, reactive } from 'vue'
-import {getCustom, getDepartment, getProduct, getProductData} from "@/api/yunyin/yunying";
+import {getCustom, getDepartment, getProduct, getProductData, getStaffList} from "@/api/yunyin/yunying";
 defineOptions({   name: 'Company'})
 // =========== 导出Excel表格 ===========
 //导出产品
@@ -350,12 +301,14 @@ const gydialogexportToExcel = ref(false)
 const treeData = ref({})
 const getCustomdata = async () => {
   try {
-    const response = await getCustom(); // 调用接口获取数据
-    const formatCustomData = response.data.map(item => ({
-      children: [],
-      label: `${item.客户编号}【${item.客户名称}】`,
-    }));
-    treeData.value = formatCustomData
+    const data  = await getCustom() //接口调用函数
+    treeData.value = data.data;
+    // const response = await getCustom(); // 调用接口获取数据
+    // const formatCustomData = response.data.map(item => ({
+    //   children: [],
+    //   label: `${item.客户编号}【${item.客户名称}】`,
+    // }));
+    // treeData.value = formatCustomData
   } catch (error) {
     console.error('Error fetching custom data:', error);
   }
@@ -364,11 +317,14 @@ getCustomdata()
 
 //点击左侧树形获取列表
 const tableData = reactive([])
+const _custom_code = ref(null)
 const handleNodeClick = async (node) => {
-  const custom_code = node.客户编号;
-  const WorkListdata = await getProduct({ custom_code:custom_code, limit: pageSize.value, page: page.value });
-  tableData.splice(0, tableData.length, ...WorkListdata.data.data);//表格
-  total.value = tableData.length;//共多少条
+  _custom_code.value = node.客户编号;
+  _getProduct()
+  // const custom_code = node.客户编号;
+  // const WorkListdata = await getProduct({ custom_code:custom_code, limit: pageSize.value, page: page.value });
+  // tableData.splice(0, tableData.length, ...WorkListdata.data.data);//表格
+  // total.value = tableData.length;//共多少条
 };
 //印件资料
 const yjtableData = reactive([])
@@ -389,19 +345,36 @@ const tableRowClick = async (row) => {
   ybtableData.splice(0, ybtableData.length, ...res.data.ybData);//印版资料表格
 };
 
+//封装的方法
+const _getProduct = async ()=>{
+  let params = {}
+  params.custom_code = _custom_code.value;
+  params.limit = pageSize.value;
+  params.page = page.value;
+  try {
+    const WorkListdata = await getProduct(params);
+    tableData.splice(0, tableData.length, ...WorkListdata.data.data);//表格
+    total.value = tableData.length;//共多少条
+  } catch (error) {
+    console.error(error);
+  }
+}
+
 // 分页
 const handleCurrentChange = (val) => {
   page.value = val;
-  // console.log(page)
-  getCustomdata();
+  _getProduct();
 };
 
 // 修改页面容量 点击多少条/页
 const handleSizeChange = (val) => {
   page.value = 10;//默认显示十条
   pageSize.value = val;
-  getCustomdata();
+  _getProduct();
 };
+const page = ref(1)
+const total = ref(0)
+const pageSize = ref(10)
 
 
 // 自动化生成的字典（可能为空）以及字段
@@ -431,9 +404,6 @@ const searchRule = reactive({
 })
 const elFormRef = ref()
 const elSearchFormRef = ref()
-const page = ref(1)
-const total = ref(0)
-const pageSize = ref(10)
 const searchInfo = ref({})
 // 搜索
 const onSubmit = () => {
@@ -464,24 +434,16 @@ setOptions()
 //行为控制标记（弹窗内部需要增还是改）
 const type = ref('')
 
+let formDataTest = reactive({})
 //修改
 const updateCompanyFunc = async (row) => {
   const product_code = row.产品编号;
-  console.log(product_code);
-  try {
-    // const res = await getProductData({ product_code });
-    // console.log(res)
-    // 根据需要进行操作，比如更新表单数据或显示弹窗等
-    // if (res.code === 0) {
-    //   formData.value = res.data.recompany;
-    //   dialogFormVisible.value = true;
-    // }
-  } catch (error) {
-    // 处理错误
-    console.error('Error in updateCompanyFunc:', error);
-  }
+  // console.log(product_code);
+  formDataTest = row;
+  console.log(row);
   dialogFormVisible.value = true;
 };
+
 // 弹窗控制标记
 const dialogFormVisible = ref(false)
 

src/view/yunyin/renliziyuan/renyuanjibenziliao.vue

@@ -1,11 +1,15 @@
 <template>
-	<div>
+	<div style="margin: 0 auto">
 		<el-container>
 			<!-- 左侧树形结构 -->
-			<el-aside width="270px">
-				<div class="JKWTree-tree" style="height: 500px">
+			<el-aside width="210px" >
+				<div class="JKWTree-tree" style="height: 746px">
 					<h3>组织架构</h3>
-					<el-tree :data="treeData" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
+					<el-tree :data="treeData"  :props="defaultProps" @node-click="handleNodeClick" @node-expand="handleNodeExpand">
+            <template #default="{node,data}">
+              {{data['名称']}}<{{data['num']}}人>
+            </template>
+          </el-tree>
 				</div>
 			</el-aside>
 
@@ -24,10 +28,8 @@
 								<el-button type="primary" icon="search" @click="onSubmit">查询</el-button>
 <!--								<el-button icon="refresh" @click="onReset">重置</el-button>-->
                 <el-button type="primary" icon="plus" @click="openDialog">新增</el-button>
-                <el-button type="primary" icon="Download" @click="exportToExcel">导出到Excel</el-button>
+                <el-button type="primary" icon="Download" @click="exportToExcel" style="float: right;">导出到Excel</el-button>
                 <el-dialog v-model="dialogexportToExcel" title="员工基本资料导出" width="50%">
-                  <!-- 在这里放入弹出页面的内容 -->
-                  <p>这是弹出页面的内容</p>
 
                 </el-dialog>
 							</el-form-item>
@@ -53,7 +55,7 @@
 
 						<!-- 表格 -->
 						<el-table ref="multipleTable"
-                      style="width: 100%;height: 500px"
+                      style="width: 100%;height: 580px"
                       tooltip-effect="dark"
                       :data="tableData"
                       border
@@ -85,98 +87,85 @@
 							<el-table-column align="left" label="修改时间" prop="mod_rq" width="160" />
 						</el-table>
 						<!-- 分页 -->
-<!--						<div class="gva-pagination">-->
-<!--							<el-pagination layout="total, sizes, prev, pager, next, jumper" :current-page="page"-->
-<!--								:page-size="pageSize" :page-sizes="[5,10, 30, 50, 100]" :total="total"-->
-<!--								@current-change="handleCurrentChange" @size-change="handleSizeChange" />-->
-<!--						</div>-->
+						<div class="gva-pagination">
+							<el-pagination layout="total, sizes, prev, pager, next, jumper" :current-page="page"
+								:page-size="pageSize" :page-sizes="[10, 30, 50, 100]" :total="total"
+								@current-change="handleCurrentChange" @size-change="handleSizeChange" />
+						</div>
 					</div>
 
 					<!-- 弹窗 -->
-					<el-dialog v-model="dialogFormVisible" :before-close="closeDialog"
-						:title="type==='create'?'添加员工基本资料':'修改员工基本资料'" destroy-on-close>
+					<el-dialog
+              v-model="dialogFormVisible"
+              :before-close="closeDialog"
+						:title="type==='create'?'添加员工基本资料':'修改员工基本资料'"
+              destroy-on-close
+          >
 						<el-row>
 							<!-- 左侧表单 -->
 							<el-col :span="8">
 								<el-scrollbar height="500px">
-									<el-form :model="formData" label-position="right" ref="elFormRef" :rules="rule"
-										label-width="100px">
+									<el-form :model="formDataTest" label-position="right" ref="elFormRef" :rules="rule" label-width="100px">
 										<el-form-item label="员工编号:" prop="address">
-											<el-input v-model="formData.address" :clearable="true" placeholder="请输入员工编号"
-												style="width: 180px;" />
+											<el-input v-model="formDataTest['员工编号']" :clearable="true" placeholder="请输入员工编号" style="width: 180px;" />
 										</el-form-item>
 										<el-form-item label="性别:" prop="gender">
-											<el-input v-model="formData.gender" :clearable="true" placeholder="请输入性别"
-												style="width: 180px;" />
+											<el-input v-model="formDataTest['性别']" :clearable="true" placeholder="请输入性别" style="width: 180px;" />
 										</el-form-item>
-										<el-form-item label="身份证:" prop="idCard">
-											<el-input v-model="formData.idCard" :clearable="true" placeholder="请输入身份证"
-												style="width: 180px;" />
+										<el-form-item label="身份证号:" prop="idCard">
+											<el-input v-model="formDataTest['身份证号']" :clearable="true" placeholder="请输入身份证" style="width: 180px;" />
 										</el-form-item>
 										<el-form-item label="部门名称:" prop="department">
-											<el-input v-model="formData.department" :clearable="true"
-												placeholder="请输入部门名称" style="width: 180px;" />
+											<el-input v-model="formDataTest['所在部门']" :clearable="true" placeholder="请输入部门名称" style="width: 180px;" />
 										</el-form-item>
 										<el-form-item label="入职日期:" prop="joinDate">
-											<el-input v-model="formData.joinDate" :clearable="true"
-												placeholder="请输入入职日期" style="width: 180px;" />
+											<el-input v-model="formDataTest['聘用日期']" :clearable="true" placeholder="请输入入职日期" style="width: 180px;" />
 										</el-form-item>
 										<el-form-item label="人员类别:" prop="joinDate">
-											<el-select v-model="formData.joinDate" placeholder="请选择人员类别"
-												style="width: 180px;">
+											<el-select v-model="formDataTest['人员类别']" placeholder="请选择人员类别" style="width: 180px;">
 												<el-option label="生产" value="生产"></el-option>
 												<el-option label="行政" value="行政"></el-option>
 											</el-select>
 										</el-form-item>
 										<el-form-item label="班次类型:" prop="joinDate">
-											<el-input v-model="formData.joinDate" :clearable="true"
-												placeholder="请输入班次类型" style="width: 180px;" />
+											<el-input v-model="formDataTest['班次类型']" :clearable="true" placeholder="请输入班次类型" style="width: 180px;" />
 										</el-form-item>
 										<el-form-item label="工资表类别:" prop="joinDate">
-											<el-select v-model="formData.joinDate" placeholder="请选择工资表类别"
-												style="width: 180px;">
+											<el-select v-model="formDataTest['工资表类别']" placeholder="请选择工资表类别" style="width: 180px;">
 												<el-option label="职员级计时工资表" value="职员级计时工资表"></el-option>
 												<el-option label="另发工资" value="另发工资"></el-option>
 												<el-option label="操作级计件工资表" value="操作级计件工资表"></el-option>
 												<el-option label="操作级计时工资表" value="操作级计时工资表"></el-option>
 											</el-select>
 										</el-form-item>
+
 									</el-form>
 								</el-scrollbar>
 							</el-col>
 							<!-- 中间表单 -->
 							<el-col :span="8">
 								<el-scrollbar height="500px">
-									<el-form :model="formData" label-position="right" ref="elFormRef" :rules="rule"
-										label-width="100px">
-										<el-form-item label="姓名:" prop="name"
-											:rules="[{ required: true, message: '请输入姓名', trigger: 'blur' }]">
-											<el-input v-model="formData.name" :clearable="true" placeholder="请输入姓名"
-												style="width: 180px;" />
+									<el-form :model="formDataTest" label-position="right" ref="elFormRef" :rules="rule" label-width="100px">
+										<el-form-item label="员工姓名:" prop="name">
+											<el-input v-model="formDataTest['员工姓名']" :clearable="true" placeholder="请输入姓名" style="width: 180px;" />
 										</el-form-item>
 										<el-form-item label="出生日期:" prop="birthDate">
-											<el-input v-model="formData.birthDate" :clearable="true"
-												placeholder="请输入出生日期" style="width: 180px;" />
+											<el-input v-model="formDataTest['出生日期']" :clearable="true" placeholder="" style="width: 180px;" />
 										</el-form-item>
 										<el-form-item label="职务:" prop="position">
-											<el-input v-model="formData.position" :clearable="true" placeholder="请输入职务"
-												style="width: 180px;" />
-										</el-form-item>
-										<el-form-item label="部门编号:" prop="departmentId">
-											<el-input v-model="formData.departmentId" :clearable="true"
-												placeholder="请输入部门编号" style="width: 180px;" />
+											<el-input v-model="formDataTest['职称职务']" :clearable="true" placeholder="请输入职务" style="width: 180px;" />
 										</el-form-item>
+<!--										<el-form-item label="部门编号:" prop="departmentId">-->
+<!--											<el-input v-model="formDataTest['部门编号']" :clearable="true" placeholder="请输入部门编号" style="width: 180px;" />-->
+<!--										</el-form-item>-->
 										<el-form-item label="转正日期:" prop="departmentId">
-											<el-input v-model="formData.departmentId" :clearable="true"
-												placeholder="请输入转正日期" style="width: 180px;" />
+											<el-input v-model="formDataTest['转正日期']" :clearable="true" placeholder="请输入转正日期" style="width: 180px;" />
 										</el-form-item>
 										<el-form-item label="扣减司龄:" prop="departmentId">
-											<el-input v-model="formData.departmentId" :clearable="true"
-												placeholder="请输入扣减司龄" style="width: 180px;" />
+											<el-input v-model="formDataTest['扣减司龄']" :clearable="true" placeholder="" style="width: 180px;" />
 										</el-form-item>
 										<el-form-item label="人员性质:" prop="departmentId">
-											<el-select v-model="formData.joinDate" placeholder="请选择人员性质"
-												style="width: 180px;">
+											<el-select v-model="formDataTest['人员性质']" placeholder="请选择人员性质" style="width: 180px;">
 												<el-option label="退休返聘" value="退休返聘"></el-option>
 												<el-option label="劳动合同工" value="劳动合同工"></el-option>
 												<el-option label="借用" value="借用"></el-option>
@@ -184,18 +173,17 @@
 												<el-option label="实习生" value="实习生"></el-option>
 											</el-select>
 										</el-form-item>
-										<el-form-item label="工资核算分组:" prop="departmentId">
-											<el-input v-model="formData.departmentId" :clearable="true"
-												placeholder="请输入工资核算分组" style="width: 180px;" />
-										</el-form-item>
+                    <el-form-item label="U8状态:" prop="joinDate">
+                      <el-input v-model="formDataTest['U8在职']" :clearable="true"  placeholder="" style="width: 180px;" />
+                    </el-form-item>
+                    <el-form-item label="在职状态:" prop="joinDate">
+                      <el-input v-model="formDataTest['在职状态']" :clearable="true" placeholder="" style="width: 180px;" />
+                    </el-form-item>
 									</el-form>
 								</el-scrollbar>
 							</el-col>
-
 							<!-- 右侧图片 -->
-
 						</el-row>
-
 						<!-- 添加 编辑页面 取消 确定 -->
 						<template #footer>
 							<div class="dialog-footer">
@@ -204,6 +192,7 @@
 							</div>
 						</template>
 					</el-dialog>
+
 				</el-main>
 			</el-container>
 		</el-container>
@@ -231,32 +220,45 @@ const defaultProps = {
   children: 'children',
   label: '名称' // 将label设置为中文名称对应的字段名
 };
+const _department_code = ref(null)
 const getDepartmentdata = async () => {
   try {
     const data  = await getDepartment() //接口调用函数
-    if(data.code === 0){
-      treeData.value = data.data;
-    }else {
-      console.error(data.msg);
-    }
+    treeData.value = data.data;
   } catch (error) {
     console.error(error)
   }
 }
 getDepartmentdata();
+const numTime = 0
 
 //点击左侧树形 获取右侧table列表
 const tableData = reactive([])
 const handleNodeClick = async (node) => {
-  const department_code = node.编号;
+  _department_code.value = node.编号;
+  _getStaffList()
+};
+// 点击管理中心 显示全部数据
+const handleNodeExpand = async (node) => {
+  _department_code.value = node.编号;
+  _getStaffList()
+
+}
+
+//封装的方法
+const _getStaffList = async ()=>{
+  let params = {}
+  params.department_code = _department_code.value;
+  params.limit = pageSize.value;
+  params.page = page.value;
   try {
-    const WorkListdata = await getStaffList({ department_code:department_code,limit: '', page: ''});//接口调用函数
+    const WorkListdata = await getStaffList(params);//接口调用函数
     tableData.splice(0,tableData.length,...WorkListdata.data.list);//表格数据
-    total.value = tableData.length;//共多少条
+    total.value = WorkListdata.data.total;//共多少条total
   } catch (error) {
     console.error(error);
   }
-};
+}
 
 // 分页相关的响应式变量
 const page = ref(1)
@@ -265,23 +267,23 @@ const pageSize = ref(10)
 // 分页
 const handleCurrentChange = (val) => {
   page.value = val;
-  getDepartmentdata();
+  _getStaffList();
 };
 
 // 修改页面容量 点击多少条/页
 const handleSizeChange = (val) => {
   page.value = 10;//默认显示十条
   pageSize.value = val;
-  getDepartmentdata();
+  _getStaffList();
 };
 
-
 // 自动化生成的字典（可能为空）以及字段
 const formData = ref({
   address: '',
   image: '',
   name: '',
 })
+let formDataTest = reactive({})
 
 // 验证规则
 const rule = reactive({})
@@ -316,7 +318,7 @@ const onReset = () => {
 
 // 搜索
 const onSubmit = () => {
-  const searchValue = searchInfo._rawValue; // 获取搜索框输入的值
+  const searchValue = searchInfo._rawValue.ke; // 获取搜索框输入的值
   console.log(searchValue);
   // elSearchFormRef.value?.validate(async (valid) => {
   //   if (valid) {
@@ -344,7 +346,10 @@ const type = ref('')
 //修改
 const updateCompanyFunc = async (row) => {
   const product_code = row.员工编号;
-  console.log(product_code);
+  formDataTest = row;
+  console.log(row);
+  // const response = await ygjbzledit({ product_code: product_code });
+  // console.log(response);
   dialogFormVisible.value = true;
 };
 // 弹窗控制标记

src/view/yunyin/shengchanguanli/gongdanshengchan.vue

@@ -1,8 +1,9 @@
 <template>
-  <div>
+  <div style="margin: 0 auto">
     <el-container>
-      <el-aside width="340px">
-        <div class="JKWTree-tree">
+      <el-aside width="200px">
+<!--        <div class="JKWTree-tree" style="width: 480px;height: 746px;">-->
+        <div class="JKWTree-tree" style="height: 746px;">
 <!--          <h3> 组织列表</h3>-->
           <el-tree :data="sctreeData" :props="defaultProps" @node-click="schandleNodeClick"></el-tree>
           <el-tree
@@ -12,7 +13,6 @@
         </div>
       </el-aside>
       <el-container>
-        <!--        <el-header>dd</el-header>-->
         <el-main>
 
           <!-- 搜索框 -->
@@ -21,40 +21,27 @@
 
               <!-- 左侧查询输入框 -->
               <el-form-item>
-                <el-input v-model="searchInfo.keyword" placeholder="" clearable style="width: 300px;"></el-input>
+                <el-input v-model="searchInfo.keyword" placeholder="搜索" clearable style="width: 200px;"></el-input>
               </el-form-item>
 
               <!-- 查询和重置按钮 -->
               <el-form-item>
                 <el-button type="primary" icon="search" @click="onSubmit">查询</el-button>
-                <el-button icon="refresh" @click="onReset">重置</el-button>
+<!--                <el-button icon="refresh" @click="onReset">重置</el-button>-->
+<!--                <el-button type="primary" icon="plus" @click="openDialog">新增</el-button>-->
               </el-form-item>
             </el-form>
           </div>
 
           <div class="gva-table-box">
-            <div class="gva-btn-list">
-              <el-button type="primary" icon="plus" @click="openDialog">新增</el-button>
-              <!--              <el-button type="primary" style="width: 110px;" >查找工单</el-button>-->
-              <!--              <el-button type="primary" style="width: 110px;" >工单状态设置</el-button>-->
-              <!--              <el-button type="primary" style="width: 110px;" >工单状态更正</el-button>-->
-              <!--              <el-button type="primary" style="width: 110px;" >引用实际参数</el-button>-->
-              <!--              <el-button type="primary" style="width: 110px;" >排程参数维护</el-button>-->
-              <!--              <el-button type="primary" icon="plus" style="width: 110px;" >排程参数复制</el-button>-->
-              <!--              <el-button type="primary" icon="plus" style="width: 110px;" >编辑生产计划</el-button>-->
-              <!--              <el-button type="primary" icon="plus" style="width: 110px;" >工单打印</el-button>-->
-              <!--              <el-button type="primary" icon="plus" style="width: 110px;" >工序产量核查</el-button>-->
-              <!--              <el-button type="primary" icon="plus" style="width: 110px;" >流程单查询</el-button>-->
-              <!--              <el-button type="primary" icon="plus" style="width: 110px;" >工单筛选</el-button>-->
-            </div>
-
             <el-table ref="multipleTable"
-                      style="width: 100%"
+                      style="width: 100%;height: 580px"
                       border
                       tooltip-effect="dark"
                       :data="tableData"
                       row-key="ID"
                       highlight-current-row="true"
+                      @row-click="tableRowClick"
                       @selection-change="handleSelectionChange"
                       :show-overflow-tooltip="true">
               <el-table-column type="selection" width="55"/>
@@ -76,152 +63,93 @@
               <el-table-column align="left" label="UNIQID" prop="UNIQID" width="120" />
               <el-table-column align="left" label="投料率" prop="投料率" width="120" />
               <el-table-column align="left" label="销售订单号" prop="销售订单号" width="120" />
-              <el-table-column align="left" label="操作" min-width="120" fixed='right'>
-                <template #default="scope">
-                  <el-button type="primary" link icon="edit" class="table-button" @click="updateCompanyFunc(scope.row)">变更</el-button>
-                </template>
-              </el-table-column>
             </el-table>
-            <!--            <div class="gva-pagination">-->
-            <!--              <el-pagination layout="total, sizes, prev, pager, next, jumper" :current-page="page" :page-size="pageSize" :page-sizes="[5,10, 30, 50, 100]" :total="total" @current-change="handleCurrentChange" @size-change="handleSizeChange"/>-->
-            <!--            </div>-->
+            <div class="gva-pagination">
+              <el-pagination layout="total, sizes, prev, pager, next, jumper" :current-page="page" :page-size="pageSize" :page-sizes="[10, 30, 50, 100]" :total="total" @current-change="handleCurrentChange" @size-change="handleSizeChange"/>
+            </div>
           </div>
 
-          <!-- 弹窗 -->
-          <el-dialog v-model="dialogFormVisible" :before-close="closeDialog" :title="type==='create'?'添加产品资料':'修改产品资料'" destroy-on-close>
-            <el-row>
-              <!-- 左侧表单 -->
-              <el-col :span="8">
-                <el-scrollbar height="500px">
-                  <el-form :model="formData" label-position="right" ref="elFormRef" :rules="rule" label-width="100px">
-                    <el-form-item label="客户料号:" prop="address">
-                      <el-input v-model="formData.address" :clearable="true" placeholder="" style="width: 180px;" />
-                    </el-form-item>
-                    <el-form-item label="产品编号:" prop="gender">
-                      <el-input v-model="formData.gender" :clearable="true" placeholder="" style="width: 180px;" />
-                    </el-form-item>
-                    <el-form-item label="产品名称:" prop="idCard">
-                      <el-input v-model="formData.idCard" :clearable="true" placeholder="" style="width: 180px;" />
-                    </el-form-item>
-                    <el-form-item label="版本号:" prop="department">
-                      <el-input v-model="formData.department" :clearable="true" placeholder="" style="width: 180px;" />
-                    </el-form-item>
-                    <el-form-item label="成品规格:" prop="joinDate">
-                      <el-input v-model="formData.joinDate" :clearable="true" placeholder="" style="width: 180px;" />
-                    </el-form-item>
-                    <el-form-item label="单位:" prop="joinDate">
-                      <el-input v-model="formData.joinDate" :clearable="true" placeholder="" style="width: 180px;" />
-                    </el-form-item>
-                    <el-form-item label="产品分类:" prop="joinDate">
-                      <el-input v-model="formData.joinDate" :clearable="true" placeholder="" style="width: 180px;" />
-                    </el-form-item>
-                  </el-form>
-                </el-scrollbar>
-              </el-col>
-
-              <!-- 中间表单 -->
-              <el-col :span="8">
-                <el-scrollbar height="500px">
-                  <el-form :model="formData" label-position="right" ref="elFormRef" :rules="rule" label-width="100px">
-                    <el-form-item label="最近接单日期:" prop="name">
-                      <el-input v-model="formData.name" :clearable="true" placeholder=":" style="width: 180px;" />
-                    </el-form-item>
-                    <el-form-item label="最近引用日期:" prop="birthDate">
-                      <el-input v-model="formData.birthDate" :clearable="true" placeholder="" style="width: 180px;" />
-                    </el-form-item>
-                    <el-form-item label="印件数:" prop="position">
-                      <el-input v-model="formData.position" :clearable="true" placeholder="" style="width: 180px;" />
-                    </el-form-item>
-                    <el-form-item label="工艺:" prop="departmentId">
-                      <el-input v-model="formData.departmentId" :clearable="true" placeholder="" style="width: 180px;" />
-                    </el-form-item>
-                    <el-form-item label="当前状态:" prop="departmentId">
-                      <el-input v-model="formData.departmentId" :clearable="true" placeholder="" style="width: 180px;" />
-                    </el-form-item>
-                    <el-form-item label="最后修改:" prop="departmentId">
-                      <el-input v-model="formData.departmentId" :clearable="true" placeholder=":" style="width: 180px;" />
-                    </el-form-item>
-                    <el-form-item label="建档时间:" prop="departmentId">
-                      <el-input v-model="formData.departmentId" :clearable="true" placeholder="" style="width: 180px;" />
-                    </el-form-item>
-                    <el-form-item label="更新时间:" prop="departmentId">
-                      <el-input v-model="formData.departmentId" :clearable="true" placeholder="" style="width: 180px;" />
-                    </el-form-item>
-                  </el-form>
-                </el-scrollbar>
-              </el-col>
-
-            </el-row>
-
-            <template #footer>
-              <div class="dialog-footer">
-                <el-button @click="closeDialog">取 消</el-button>
-                <el-button type="primary" @click="enterDialog">确 定</el-button>
-              </div>
-            </template>
-          </el-dialog>
-
-          <!-- 详情展示弹窗 -->
-          <el-dialog v-model="detailShow" style="width: 800px" lock-scroll :before-close="closeDetailShow" title="员工基本资料管理" destroy-on-close>
-            <el-scrollbar height="550px">
-              <el-descriptions column="2" border>
-                <!-- 左侧部分 -->
-                <el-descriptions-item label="客户料号" :min-width="labelMinWidth">
-                  {{ formData.employeeId }}
-                </el-descriptions-item>
-                <el-descriptions-item label="产品编号" :min-width="labelMinWidth">
-                  {{ formData.gender }}
-                </el-descriptions-item>
-                <el-descriptions-item label="产品名称" :min-width="labelMinWidth">
-                  {{ formData.idCard }}
-                </el-descriptions-item>
-                <el-descriptions-item label="版本号" :min-width="labelMinWidth">
-                  {{ formData.sectionName }}
-                </el-descriptions-item>
-                <el-descriptions-item label="成品规格" :min-width="labelMinWidth">
-                  {{ formData.employeeId }}
-                </el-descriptions-item>
-                <el-descriptions-item label="单位" :min-width="labelMinWidth">
-                  {{ formData.gender }}
-                </el-descriptions-item>
-                <el-descriptions-item label="产品分类" :min-width="labelMinWidth">
-                  {{ formData.idCard }}
-                </el-descriptions-item>
-
-                <!-- 右侧部分 -->
-                <el-descriptions-item label="最近接单日期" :min-width="labelMinWidth">
-                  {{ formData.name }}
-                </el-descriptions-item>
-                <el-descriptions-item label="最近引用日期" :min-width="labelMinWidth">
-                  {{ formData.birthdate }}
-                </el-descriptions-item>
-                <el-descriptions-item label="印件数" :min-width="labelMinWidth">
-                  {{ formData.position }}
-                </el-descriptions-item>
-                <el-descriptions-item label="工艺" :min-width="labelMinWidth">
-                  {{ formData.departmentId }}
-                </el-descriptions-item>
-                <el-descriptions-item label="当前状态" :min-width="labelMinWidth">
-                  {{ formData.name }}
-                </el-descriptions-item>
-                <el-descriptions-item label="最后修改" :min-width="labelMinWidth">
-                  {{ formData.birthdate }}
-                </el-descriptions-item>
-                <el-descriptions-item label="建档时间" :min-width="labelMinWidth">
-                  {{ formData.position }}
-                </el-descriptions-item>
-                <el-descriptions-item label="更新时间" :min-width="labelMinWidth">
-                  {{ formData.departmentId }}
-                </el-descriptions-item>
-              </el-descriptions>
-            </el-scrollbar>
-
-          </el-dialog>
+
+            <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+
+              <el-tab-pane label="工艺资料"  @click="showTable('工艺资料')"  name="first">
+                <el-table ref="multipleTable"
+                          :show-overflow-tooltip="true"
+                          highlight-current-row="true"
+                          style="width: 100%;height: 400px" border tooltip-effect="dark" :data="gytableData" row-key="ID" @selection-change="handleSelectionChange">
+                  <el-table-column type="selection" width="55" />
+                  <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="印刷方式" prop="印刷方式"  width="100"/>
+                  <el-table-column align="left" label="版距" prop="版距"  width="100"/>
+                  <el-table-column align="left" label="创建用户" prop="创建用户"  width="120"/>
+                  <el-table-column align="left" label="创建时间" prop="创建时间"  width="160"/>
+                  <el-table-column align="left" label="修改时间" prop="修改时间"  width="160"/>
+                  <el-table-column align="left" label="UNIQID" prop="UNIQID"  width="100"/>
+                  <el-table-column align="left" label="印件工序及名称" prop="印件工序及名称"  width="340"/>
+                </el-table>
+              </el-tab-pane>
+
+              <el-tab-pane label="印件资料"  @click="showTable('印件资料')"  name="second">
+                <el-table ref="multipleTable"
+                          :show-overflow-tooltip="true"
+                          highlight-current-row="true"
+                          style="width: 100%;height: 400px" border tooltip-effect="dark" :data="yjtableData" row-key="ID" @selection-change="handleSelectionChange">
+                  <el-table-column type="selection" width="55" />
+                  <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="实际投料" 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="120"/>
+                  <el-table-column align="left" label="创建时间" prop="创建时间"  width="160"/>
+                  <el-table-column align="left" label="修改时间" prop="修改时间"  width="160"/>
+                  <el-table-column align="left" label="UNIQID" prop="UNIQID"  width="100"/>
+                </el-table>
+              </el-tab-pane>
+
+            </el-tabs>
+
         </el-main>
       </el-container>
     </el-container>
   </div>
 </template>
+<script>
+//点击按钮显示下方表格
+export default {
+  data() {
+    return {
+      currentTable: '',
+      activeName: 'first',
+      // 其他表格数据...
+    };
+  },
+  methods: {
+    showTable(tableName) {
+      // console.log(tableName)
+      // 根据点击的按钮设置当前展示的表格
+      this.currentTable = tableName;
+    },
+    showTableChange() {
+      // 处理表格选中事件
+    },
+    // 其他方法...
+  }
+};
+</script>
 
 <script setup>
 // 全量引入格式化工具 请按需保留
@@ -229,7 +157,15 @@ import {createCompany, deleteCompany, deleteCompanyByIds, updateCompany, findCom
 import { getDictFunc, formatDate, formatBoolean, filterDict, ReturnArrImg, onDownloadFile } from '@/utils/format'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { ref, reactive } from 'vue'
-import {DataList, getProduct, Project, workbench} from "@/api/yunyin/yunying";
+import {
+  DataList,
+  getProduct,
+  getProductData,
+  Project,
+  projectCraft,
+  projectPrint,
+  workbench
+} from "@/api/yunyin/yunying";
 defineOptions({name: 'Company'})
 
 // =========== 左侧树侧形结构 ===========
@@ -248,6 +184,7 @@ const sctreeData = ref([
 const treeData = ref([]);
 //点击 设备定额及分配参数设置
 const schandleNodeClick = async (node) => {
+  console.log(node);
   switch (node.number) {
     case 1:
       const Projectdata = await Project();
@@ -272,6 +209,8 @@ const workbenchdata = async () => {
   try {
     const data = await workbench();
     const rawData = data.data;
+    console.log(rawData);
+
     const dataArray =Object.keys(rawData).map(key => ({
       label: key,
       children: Object.keys(rawData[key]).map(subKey => ({
@@ -294,28 +233,24 @@ const tableData = ref([])
 const handleNodeClick = async (node) => {
   const custom_code = node.label; // 假设你想使用节点的 label 作为 custom_code
   console.log(custom_code);
-
-  // 通过 custom_code 客户编号获取列表数据
-  try {
-    const WorkListdata = await getProduct({ custom_code, limit: pageSize.value, page: page.value });
-    console.log(WorkListdata)
-    tableData.splice(0, tableData.length, ...WorkListdata.data.data);
-    // total.value = tableData.length;
-  } catch (error) {
-    console.error(error);
-  }
-
-  // 检查并设置子节点的 expanded 属性，以确保它们能够正确展开
-  if (node.children && node.children.length > 0) {
-    node.children.forEach((child) => {
-      this.$set(child, 'expanded', false);
-    });
-  }
-
 };
 
 
-
+//印件资料
+const yjtableData = reactive([])
+//工艺资料
+const gytableData = reactive([])
+
+const tableRowClick = async (row) => {
+  //点击表格获取 产品编号
+  // const Gd_gdbh = row.工单编号;
+  const Gd_gdbh = '2401101';
+  // console.log(Gd_gdbh);
+  const gyres = await projectCraft({Gd_gdbh:Gd_gdbh});//接口
+  gytableData.splice(0, gytableData.length, ...gyres.data);//工艺资料表格
+  const yjres = await projectPrint({Gd_gdbh:Gd_gdbh});//接口
+  yjtableData.splice(0, yjtableData.length, ...yjres.data);//印件资料表格
+};
 
 
 
@@ -414,93 +349,26 @@ const handleSelectionChange = (val) => {
   multipleSelection.value = val
 }
 
-// 删除行
-const deleteRow = (row) => {
-  ElMessageBox.confirm('确定要删除吗?', '提示', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning'
-  }).then(() => {
-    deleteCompanyFunc(row)
-  })
-}
-
-
-// 批量删除控制标记
-const deleteVisible = ref(false)
-
-// 多选删除
-const onDelete = async() => {
-  const ids = []
-  if (multipleSelection.value.length === 0) {
-    ElMessage({
-      type: 'warning',
-      message: '请选择要删除的数据'
-    })
-    return
-  }
-  multipleSelection.value &&
-  multipleSelection.value.map(item => {
-    ids.push(item.ID)
-  })
-  const res = await deleteCompanyByIds({ ids })
-  if (res.code === 0) {
-    ElMessage({
-      type: 'success',
-      message: '删除成功'
-    })
-    if (tableData.value.length === ids.length && page.value > 1) {
-      page.value--
-    }
-    deleteVisible.value = false
-    getTableData()
-  }
-}
-
 // 行为控制标记（弹窗内部需要增还是改）
 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
-  //     dialogFormVisible.value = true
-  // }
-  dialogFormVisible.value = true
-}
-
-
-// 删除行
-const deleteCompanyFunc = async (row) => {
-  const res = await deleteCompany({ ID: row.ID })
-  if (res.code === 0) {
-    ElMessage({
-      type: 'success',
-      message: '删除成功'
-    })
-    if (tableData.value.length === 1 && page.value > 1) {
-      page.value--
-    }
-    getTableData()
-  }
-}
+//修改
+const updateCompanyFunc = async (row) => {
+  console.log(row);
+  dialogFormVisible.value = true;
+};
 
 // 弹窗控制标记
 const dialogFormVisible = ref(false)
 
-
 // 查看详情控制标记
 const detailShow = ref(false)
 
-
 // 打开详情弹窗
 const openDetailShow = () => {
   detailShow.value = true
 }
 
-
 // 打开详情
 const getDetails = async (row) => {
   // 打开弹窗
@@ -511,7 +379,6 @@ const getDetails = async (row) => {
   }
 }
 
-
 // 关闭详情弹窗
 const closeDetailShow = () => {
   detailShow.value = false
@@ -522,7 +389,6 @@ const closeDetailShow = () => {
   }
 }
 
-
 // 打开弹窗
 const openDialog = () => {
   type.value = 'create'
@@ -564,14 +430,11 @@ const enterDialog = async () => {
     }
   })
 }
-
 </script>
-
 <style>
 .JKWTree-container {
   display: flex;
 }
-
 .JKWTree-tree {
   width: 300px;
   background-color: #fff;
@@ -584,7 +447,6 @@ const enterDialog = async () => {
   font-weight: 700;
   margin: 10px 0;
 }
-
 .JKWTree-content {
   flex: 1;
 }

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -3,7 +3,7 @@
     <el-container>
       <!-- 左侧树形结构 -->
       <el-aside width="270px">
-        <div class="JKWTree-tree" style="width: 100%;height: 400px">
+        <div class="JKWTree-tree" style="width: 100%;height: 746px">
           <h3>工单管理</h3>
           <el-tree :data="treeData" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
         </div>
@@ -23,8 +23,11 @@
               <el-form-item>
                 <el-button type="primary" icon="search" @click="onSubmit">查询</el-button>
 <!--                <el-button icon="refresh" @click="onReset">重置</el-button>-->
-                <el-button type="primary" icon="plus" @click="openDialog">新增</el-button>
-                <el-button type="primary" icon="el-icon-download" style="margin-left: 10px;">导出到Excel</el-button>
+<!--                <el-button type="primary" icon="plus" @click="openDialog">新增</el-button>-->
+<!--                <el-button type="primary" icon="Download" @click="exportToExcel" style="float: right;">导出到Excel</el-button>-->
+<!--                <el-dialog v-model="dialogexportToExcel" title="导出到Excel" width="50%">-->
+
+<!--                </el-dialog>-->
               </el-form-item>
             </el-form>
           </div>
@@ -33,7 +36,7 @@
           <div class="gva-table-box">
             <!-- 表格 -->
             <el-table ref="multipleTable"
-                      style="width: 100%;height: 400px"
+                      style="width: 100%;height: 580px"
                       border
                       tooltip-effect="dark"
                       :data="tableData"
@@ -71,82 +74,78 @@
             </div>
           </div>
 
-          <!--      印件资料、工艺资料、BOM资料【按钮】-->
-          <div>
-            <el-button type="primary" icon="" @click="showTable('印件资料')" style="margin-right: 2px;">印件资料</el-button>
-            <el-button type="primary" icon="" @click="showTable('工艺资料')" style="margin-right: 2px;">工艺资料</el-button>
-            <el-button type="primary" icon="" @click="showTable('BOM资料')" style="margin-right: 2px;">BOM资料</el-button>
-          </div>
-
-          <div v-if="currentTable === '印件资料'">
-            <!--      印件资料【表格】-->
-            <el-table ref="multipleTable"
-                      highlight-current-row="true"
-                      style="width: 100%;height: 400px" border tooltip-effect="dark" :data="yjtableData" row-key="ID" @selection-change="handleSelectionChange">
-              <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="400"/>
-              <el-table-column align="left" label="纸张代号" prop="纸张代号"  width="100"/>
-              <el-table-column align="left" label="纸张名称" prop="纸张名称"  width="400"/>
-              <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="120"/>
-              <el-table-column align="left" label="建档时间" prop="建档时间"  width="160"/>
-              <el-table-column align="left" label="更新时间" prop="更新时间"  width="160"/>
-            </el-table>
-          </div>
-
-          <div v-if="currentTable === '工艺资料'">
-            <!--      工艺资料【表格】-->
-            <el-table ref="multipleTable"
-                      highlight-current-row="true"
-                      style="width: 100%;height: 400px" border tooltip-effect="dark" :data="gytableData" row-key="ID" @selection-change="handleSelectionChange">
-              <el-table-column type="selection" width="55" />
-              <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="560"/>
-              <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="160"/>
-              <el-table-column align="left" label="人工检_废检" prop="人工检_废检"  width="160"/>
-              <el-table-column align="left" label="机检_正品板" prop="机检_正品板"  width="160"/>
-              <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="100"/>
-              <el-table-column align="left" label="备注" prop="备注"  width="450"/>
-              <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="160"/>
-              <el-table-column align="left" label="建档日期" prop="建档日期"  width="160"/>
-              <el-table-column align="left" label="更新时间" prop="更新时间"  width="160"/>
-            </el-table>
-          </div>
-
-          <div v-if="currentTable === 'BOM资料'">
-            <!--      BOM资料表格】-->
-            <el-table ref="multipleTable"
-                      highlight-current-row="true"
-                      style="width: 100%;height: 400px" border tooltip-effect="dark" :data="bomtableData" row-key="ID" @selection-change="handleSelectionChange">
-              <el-table-column type="selection" width="55" />
-              <el-table-column align="left" label="方案" prop="方案"  width="120"/>
-              <el-table-column align="left" label="物料编号" prop="物料编号"  width="100"/>
-              <el-table-column align="left" label="物料名称" prop="物料名称"  width="420"/>
-              <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="160"/>
-              <el-table-column align="left" label="更新时间" prop="更新时间"  width="160"/>
-              <el-table-column align="left" label="消耗定量" prop="消耗定量"  width="210"/>
-            </el-table>
-          </div>
 
+          <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+
+            <el-tab-pane label="印件资料"  @click="showTable('印件资料')"  name="first">
+              <el-table ref="multipleTable"
+                        :show-overflow-tooltip="true"
+                        highlight-current-row="true"
+                        style="width: 100%;height: 400px" border tooltip-effect="dark" :data="yjtableData" row-key="ID" @selection-change="handleSelectionChange">
+                <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="340"/>
+                <el-table-column align="left" label="纸张代号" prop="纸张代号"  width="100"/>
+                <el-table-column align="left" label="纸张名称" prop="纸张名称"  width="340"/>
+                <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="120"/>
+                <el-table-column align="left" label="建档时间" prop="建档时间"  width="160"/>
+                <el-table-column align="left" label="更新时间" prop="更新时间"  width="160"/>
+              </el-table>
+            </el-tab-pane>
+
+            <el-tab-pane label="工艺资料" @click="showTable('工艺资料')" name="second">
+              <el-table ref="multipleTable"
+                        highlight-current-row="true"
+                        :show-overflow-tooltip="true"
+                        style="width: 100%;height: 400px" border tooltip-effect="dark" :data="gytableData" row-key="ID" @selection-change="handleSelectionChange">
+                <el-table-column type="selection" width="55" />
+                <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="340"/>
+                <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="160"/>
+                <el-table-column align="left" label="人工检_废检" prop="人工检_废检"  width="160"/>
+                <el-table-column align="left" label="机检_正品板" prop="机检_正品板"  width="160"/>
+                <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="100"/>
+                <el-table-column align="left" label="备注" prop="备注"  width="450"/>
+                <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="160"/>
+                <el-table-column align="left" label="建档日期" prop="建档日期"  width="160"/>
+                <el-table-column align="left" label="更新时间" prop="更新时间"  width="160"/>
+              </el-table>
+            </el-tab-pane>
+
+            <el-tab-pane label="BOM资料" @click="showTable('BOM资料')" name="third">
+              <el-table ref="multipleTable"
+                        highlight-current-row="true"
+                        style="width: 100%;height: 400px" border tooltip-effect="dark" :data="bomtableData" row-key="ID" @selection-change="handleSelectionChange">
+                <el-table-column type="selection" width="55" />
+                <el-table-column align="left" label="方案" prop="方案"  width="120"/>
+                <el-table-column align="left" label="物料编号" prop="物料编号"  width="100"/>
+                <el-table-column align="left" label="物料名称" prop="物料名称"  width="340"/>
+                <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="160"/>
+                <el-table-column align="left" label="更新时间" prop="更新时间"  width="160"/>
+                <el-table-column align="left" label="消耗定量" prop="消耗定量"  width="210"/>
+              </el-table>
+            </el-tab-pane>
+
+          </el-tabs>
 
          <!-- 弹窗 -->
          <el-dialog v-model="dialogFormVisible" :before-close="closeDialog" style="width: 1000px;" :title="type==='create'?'添加工单资料':'修改工单资料'" destroy-on-close>
@@ -349,6 +348,7 @@ export default {
   data() {
     return {
       currentTable: '', // 当前展示的表格
+      activeName: 'first',
       // 其他表格数据...
     };
   },
@@ -373,7 +373,13 @@ import { ElMessage, ElMessageBox } from 'element-plus'
 import { ref, reactive } from 'vue'
 import {DataList, WorkList, Craft, Printed,Bom} from "@/api/yunyin/yunying";
 defineOptions({name: 'Company'})
-
+// =========== 导出Excel表格 ===========
+const exportToExcel = () => {
+  console.log('点击了导出按钮')
+  dialogexportToExcel.value = true;
+}
+// 导出Excel弹窗
+const dialogexportToExcel = ref(false)
 // =========== 左侧树侧形结构 ===========
 const treeData = ref([]);
 const defaultProps = {
@@ -423,11 +429,11 @@ const tableRowClick = async (row) => {
   const Gd_gdbh = row.工单编号;
   // console.log(row);
   const yjres = await Printed({ Gd_gdbh:Gd_gdbh});
-  // const gyres = await Craft({ Gd_gdbh:Gd_gdbh });
-  // const bomres = await Bom({ Gd_gdbh:Gd_gdbh});
+  const gyres = await Craft({ Gd_gdbh:Gd_gdbh });
+  const bomres = await Bom({ Gd_gdbh:Gd_gdbh});
   yjtableData.value = yjres.data;
-  // gytableData.value = gyres.data;
-  // bomtableData.value = bomres.data;
+  gytableData.value = gyres.data;
+  bomtableData.value = bomres.data;
   // yjtableData.splice(0,yjtableData.length,...yjres.data);//表格数据
   // gytableData.splice(0,gytableData.length,...gyres.data);//表格数据
   // bomtableData.splice(0,bomtableData.length,...bomres.data);//表格数据