zck 4 mesi fa
parent
commit
dc45ac6a5d
2 ha cambiato i file con 109 aggiunte e 26 eliminazioni
  1. 7 0
      src/api/mes/job.js
  2. 102 26
      src/view/yunyin/shengchanguanli/ShippingManagement.vue

+ 7 - 0
src/api/mes/job.js

@@ -1115,6 +1115,13 @@ export const Read_List = (params) => {
   })
 }
 
+export const Read_ListsData = (params) => {
+  return service({
+    url: '/mes_server/work_order/Read_ListsData',
+    method: 'get',
+    params
+  })
+}
 
 
 

+ 102 - 26
src/view/yunyin/shengchanguanli/ShippingManagement.vue

@@ -20,15 +20,13 @@
         </layout-header>
   
         <layout>
-          <!--    左侧树侧形结构-->
-          <!-- <layout-sider :resize-directions="['right']" :width="190" style="margin-right: 10px;">
-            <div class="JKWTree-tree" style="height: 200px">
-              <h3>生产进程查询</h3>
-              <el-tree :data="treeData"  :props="defaultProps" @node-click="handleNodeClick" @node-expand="handleNodeExpand">
-              </el-tree>
-            </div>
-          </layout-sider>
-   -->
+		  <!-- 左侧树形结构 -->
+		  <layout-sider :resize-directions="['right']" :width="190" style="margin: 0px;">
+			<div class="JKWTree-tree" style="height: 200px">
+			  <h3>客户编号</h3>
+			  <el-tree :data="treeData" class="treecolor" @node-click="handleNodeClick"></el-tree>
+			</div>
+		  </layout-sider>
           <!-- 右侧区域 -->
           <layout-content >
           <el-main>
@@ -46,19 +44,19 @@
 						  :cell-class-name="tableDataCellClass"
 						  @row-click="tableRowClick" @row-dblclick="updateCompanyFunc"
 						  @selection-change="handleSelectionChange" :show-overflow-tooltip="true">
-			   <el-table-column type="selection" width="40" />
-			   <el-table-column   align="center" label="客户编号" prop="客户编号"  width="110" />
-               <el-table-column   align="center" label="订单编号" prop="订单编号"  width="110" />
-               <el-table-column   align="center" label="子订单编号" prop="子订单编号"  width="200" />
-			   <el-table-column   align="center" label="生产款号" prop="生产款号"  width="200" />
-			   <el-table-column   align="center" label="款式" prop="款式"  width="200" />
-			   <el-table-column   align="center" label="尺码" prop="尺码"  width="110" />
-               <el-table-column   align="center" label="制单数量" prop="制单数量"  width="200" />
-			   <el-table-column   align="center" label="发货箱数" prop="发货箱数"  width="200" />
-			   <el-table-column   align="center" label="每箱件数" prop="每箱件数"  width="200" />
-               <el-table-column   align="center" label="发货数量" prop="发货数量"  width="200" />
-               <el-table-column   align="center" label="箱数" prop="箱数"  width="110" />
-              </el-table>
+                  <el-table-column type="selection" width="40" />
+                  <el-table-column   align="center" label="客户编号" prop="客户编号"  width="110" />
+                  <el-table-column   align="center" label="订单编号" prop="订单编号"  width="110" />
+                  <!-- <el-table-column   align="center" label="子订单编号" prop="子订单编号"  width="200" /> -->
+                  <el-table-column   align="center" label="生产款号" prop="生产款号"  width="200" />
+                  <el-table-column   align="center" label="款式" prop="款式"  width="200" />
+                  <!-- <el-table-column   align="center" label="尺码" prop="尺码"  width="110" /> -->
+                  <el-table-column   align="center" label="制单数量" prop="制单数量"  width="200" />
+                  <el-table-column   align="center" label="总发货箱数" prop="总发货箱数"  width="200" />
+                  <!-- <el-table-column   align="center" label="每箱件数" prop="每箱件数"  width="200" /> -->
+                  <el-table-column   align="center" label="发货数量" prop="发货数量"  width="200" />
+                  <!-- <el-table-column   align="center" label="箱数" prop="箱数"  width="110" /> -->
+                  </el-table>
   
               <div class="gva-pagination">
                 <el-pagination layout="total" :current-page="page" :page-size="pageSize"
@@ -66,6 +64,33 @@
               </div>
             </div>
 
+            <div class="gva-table-box">
+              <!-- 表格数据 -->
+              <el-table ref="multipleTable" style="width: 100%;height: 45vh" tooltip-effect="dark"
+                        :row-style="{ height: '25px' }"  :header-cell-style="{ padding: '0px' }"
+                        :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
+                        :data="mxtableData"  border row-key="ID"
+                        size="small"
+                        :cell-class-name="gxbgCellClass"
+                        highlight-current-row="true" @row-dblclick="updateCompanyFunc"
+                        @row-click="tableRowClick2" :show-overflow-tooltip="true"
+                        @selection-change="handleSelectionChange">
+                        <el-table-column   align="center" label="客户编号" prop="客户编号"  width="110" />
+                  <el-table-column   align="center" label="订单编号" prop="订单编号"  width="110" />
+                  <el-table-column   align="center" label="子订单编号" prop="子订单编号"  width="200" />
+                  <el-table-column   align="center" label="生产款号" prop="生产款号"  width="200" />
+                  <el-table-column   align="center" label="款式" prop="款式"  width="200" />
+                  <el-table-column   align="center" label="尺码" prop="尺码"  width="110" />
+                  <el-table-column   align="center" label="制单数量" prop="制单数量"  width="110" />
+                  <el-table-column   align="center" label="发货箱数" prop="发货箱数"  width="110" />
+                  <el-table-column   align="center" label="每箱件数" prop="每箱件数"  width="110" />
+                  <el-table-column   align="center" label="发货数量" prop="发货数量"  width="110" />
+                  <el-table-column   align="center" label="建立人" prop="sys_id"  width="110" />
+                  <el-table-column   align="center" label="建立时间" prop="sys_rq"  width="110" />
+              </el-table>
+            </div>
+
+
           </el-main>
         </layout-content>
         </layout>
@@ -136,7 +161,7 @@
   </template>
   <script setup>
   import { Layout, LayoutSider, LayoutContent } from '@arco-design/web-vue';
-  import {Read_List} from '@/api/mes/job'
+  import {Datalist,Read_List,Read_ListsData} from '@/api/mes/job'
   import {ref, reactive} from 'vue'
   import { exportExcelFile } from '@/utils/excel'
   import {ElMessage} from "element-plus";
@@ -170,13 +195,64 @@
   };
 
 
+
+    // =========== 左侧树侧形结构 =========== 
+  const treeData = ref([])
   const tableData = ref([])
-  const fahuodan = async(row)=>{
-   const Read_Listdata = await Read_List()
+  const _Gd_khdh = ref(null)
+  const defaultProps = {  
+		children: 'children',  
+		label: 'label'  
+	  };  
+  const Datalistdata = async () => {
+	try {
+	  const Datalists = await Datalist();
+	  console.log(Datalists)
+	Datalists.data.forEach(id => {  
+	  treeData.value.push({  
+		label: id,
+	  });  
+	}); 
+	} catch (error) {
+	  console.error(error);
+	}
+  };
+  Datalistdata();
+
+//点击左侧树形获取编号
+const handleNodeClick = async (node) => {
+  // 取消所有节点的颜色
+  const allNodes = document.querySelectorAll('.treecolor .el-tree-node');
+		  allNodes.forEach(node => {
+		  node.querySelector('.el-tree-node__label').style.color = '';
+	  });
+	  // 获取点击的节点 给当前点击的节点改变颜色【红色】
+	  const clickedNodeId = node['$treeNodeId'];
+	  const clickedNode = document.querySelector(`.treecolor .el-tree-node[data-key="${clickedNodeId}"]`);
+	  if (clickedNode) {
+		  clickedNode.querySelector('.el-tree-node__label').style.color = 'red';
+	  }
+    const Read_Listdata = await Read_List({khbh:node.label.split('【')[0]})
    console.log(Read_Listdata)
    tableData.value = Read_Listdata.data
   }
-  fahuodan()
+
+  const mxtableData = ref([])
+  const tableRowClick = async (row) => {
+    console.log(row)
+    const Read_ListsDatas = await Read_ListsData({order:row.订单编号})
+   console.log(Read_ListsDatas)
+   mxtableData.value = Read_ListsDatas.data
+  }
+
+  // const fahuodan = async(row)=>{
+  //  const Read_Listdata = await Read_List({khbh:node.label.split('【')[0]})
+  //  console.log(Read_Listdata)
+  //  tableData.value = Read_Listdata.data
+  // }
+  // fahuodan()
+
+  
   
  const selection = ref([]) 
  const selectionIds = ref('')