Browse Source

绩效管理界面优化

Lexie 1 year ago
parent
commit
6d306d30c9

+ 5 - 0
src/api/jixiaoguanli/jitairibaobiao.js

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

+ 12 - 12
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">

+ 53 - 42
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));
 }
 // ============== 表格控制部分结束 ===============
 

File diff suppressed because it is too large
+ 555 - 533
src/view/performance/MachineDocuments.vue


File diff suppressed because it is too large
+ 588 - 364
src/view/performance/Manualdocuments.vue


+ 467 - 331
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>

Some files were not shown because too many files changed in this diff