liuhairui 1 vuosi sitten
vanhempi
commit
c4c3c3434c

+ 23 - 2
src/view/performance/chukubaogong.vue

@@ -118,7 +118,7 @@ const add_onSubmit = async ()=>{
 		  if(searcs.value == 1){
 			if(add_tableData[0]['子订单编号'] === add_searchInfo.value){
 				console.log("出库")
-				add_Dialog();
+				add_Dialogs();
 				searcs.value = '';
 			}else{
 				ElMessage({type: 'warning',message: '两次扫码不一致,请重新扫描子订单出库' })
@@ -139,9 +139,30 @@ const add_onSubmit = async ()=>{
     
   }
 };
-
 //确认出库按钮
 const add_Dialog = async () => {
+	let params = {
+	  order_id: _orderid.value,
+	  code_ck_rq: currentDates,
+	  code: '出库',
+	  sys_id: _username.value,
+	};
+	console.log(params)
+				const ck_gettab = await getSpotTab(params);// 发起出库请求
+				if (ck_gettab.code === 0) {// 出库成功后的处理
+					 searcs.value = '';
+					 ElMessage({ type: 'success', message: '出库成功' });
+					 const getSpotLists = await getSpotList({ order: _orderid.value, code: '出库' });// 获取并更新表格数据
+					 add_tableData.splice(0, add_tableData.length, ...getSpotLists.data.data);
+					 add_searchInfo.value = ''
+				}else {
+				 searcs.value = '';
+	    const getSpotLists = await getSpotList({ order: _orderid.value, code: '出库' }); // 出库失败,重新获取数据
+	    add_tableData.splice(0, add_tableData.length, ...getSpotLists.data.data);
+	  }
+}
+//扫码确认出库按钮
+const add_Dialogs = async () => {
 	if(add_tableData[0]['子订单编号'] === add_searchInfo.value){
 		 let params = {
 		   order_id: add_searchInfo.value,

+ 32 - 25
src/view/yunyin/shengchanguanli/yuedudahuoshengchanjindu.vue

@@ -19,7 +19,7 @@
 		  <!--    左侧树侧形结构-->
 		  <layout-sider :resize-directions="['right']" :width="190" style="margin-right: 10px;">
 			<div class="JKWTree-tree" style="height: 200px">
-			  <h3>选择月份</h3>
+			  <h3>选择客户</h3>
 			  <!-- <el-tree :data="treeData"  :props="defaultProps" @node-click="handleNodeClick" @node-expand="handleNodeExpand"> -->
 			  <el-tree :data="treeData" @node-click="handleNodeClick" class="treecolor">
 			  </el-tree>
@@ -40,18 +40,18 @@
 						highlight-current-row="true" @row-dblclick="updateCompanyFunc"
 						@row-click="tableRowClick" :show-overflow-tooltip="true"
 						@selection-change="handleSelectionChange">
-						<el-table-column  sortable align="center" label="订单编号" prop="订单编号"  width="120" />
-						<el-table-column  sortable align="center" label="订单编号" prop="子订单编号"  width="120" />
-						<el-table-column  sortable align="center" label="款号" prop="款号"  width="100" />
-             			<el-table-column  sortable align="center" label="颜色" prop="颜色"  width="120" />
-			 			<el-table-column  sortable align="center" label="车缝" prop="车缝"  width="100" />
-			 			<el-table-column  sortable align="center" label="后道收样" prop="后道收样"  width="100" />
-			 			<el-table-column  sortable align="center" label="大烫" prop="大烫"  width="130" />
-			 			<el-table-column  sortable align="center" label="总检" prop="总检"  width="80" />
-			 			<el-table-column  sortable align="center" label="包装" prop="包装"  width="100" />
-			 			<el-table-column  sortable align="center" label="制单总数" prop="制单总数"  width="100" />
-			 			<el-table-column  sortable align="center" label="裁切总数" prop="裁切数量"  width="100" />	
-			 			<el-table-column  sortable align="center" label="出库日期" prop="出库日期"  width="110" />
+						<el-table-column  sortable align="left" label="订单编号" prop="订单编号"  width="120" />
+						<el-table-column  sortable align="left" label="订单编号" prop="子订单编号"  width="120" />
+						<el-table-column  sortable align="left" label="款号" prop="款号"  width="100" />
+             			<el-table-column  sortable align="left" label="颜色" prop="颜色"  width="120" />
+			 			<el-table-column  sortable align="left" label="车缝" prop="车缝"  width="100" />
+			 			<el-table-column  sortable align="left" label="后道收样" prop="后道收样"  width="100" />
+			 			<el-table-column  sortable align="left" label="大烫" prop="大烫"  width="130" />
+			 			<el-table-column  sortable align="left" label="总检" prop="总检"  width="80" />
+			 			<el-table-column  sortable align="left" label="包装" prop="包装"  width="100" />
+			 			<el-table-column  sortable align="left" label="制单总数" prop="制单总数"  width="100" />
+			 			<el-table-column  sortable align="left" label="裁切总数" prop="裁切数量"  width="100" />	
+			 			<el-table-column  sortable align="left" label="出库日期" prop="出库日期"  width="110" />
 			  </el-table>
   
 			  <!-- 分页 -->
@@ -73,7 +73,7 @@
   // 全量引入格式化工具 请按需保留
   import { Layout, LayoutSider, LayoutContent } from '@arco-design/web-vue';
   import {ref, reactive} from 'vue'
-  import {dateList,OrderYieldList} from '@/api/mes/job'
+  import {dateList,OrderYieldList,Datalist} from '@/api/mes/job'
 
   import PrintPage from './components/print.vue'
   import {ElMessage} from "element-plus";
@@ -83,10 +83,16 @@
   const _department_code = ref(null)
 const getDepartmentdata = async () => {  
   try {  
-    const dateList_list = await dateList();  
-    const { data } = dateList_list;  
-    treeData.value = data.map(month => ({label: month })); // 假设每个节点有一个id和label  
-    console.log(553, treeData.value);  
+	const Datalists = await Datalist();
+	Datalists.data.forEach(id => {
+	  treeData.value.push({  
+	    label: id,
+	  });  
+	}); 
+	// const dateList_list = await dateList();
+    // const { data } = dateList_list;  
+    // treeData.value = data.map(month => ({label: month })); // 假设每个节点有一个id和label  
+    // console.log(553, treeData.value);  
   } catch (error) {  
     console.error(error);  
   }  
@@ -95,11 +101,15 @@ const getDepartmentdata = async () => {
 getDepartmentdata();
   
   //点击左侧树形 获取右侧table列表
+  //日期
   let _ddrq = ref('');
+  //客户编号
+  const _khbh = ref(null);  
   const tableData = reactive([]);
-  const _code = ref(null);  //左侧菜单编号
   const handleNodeClick = async (node) => {
-		_ddrq.value = node.label.replace('-', '');
+	  // console.log(node)
+		// _ddrq.value = node.label.replace('-', '');
+		_khbh.value = node.label;
   // 取消所有节点的颜色
   const allNodes = document.querySelectorAll('.treecolor .el-tree-node');
   allNodes.forEach(node => {
@@ -127,8 +137,6 @@ getDepartmentdata();
   };
   
   
-  
-  
   // 搜索默认为空
   const searchInfo = ref('')
   //点击【查询】按钮
@@ -143,10 +151,9 @@ getDepartmentdata();
 	}
   };
   
-  //获取员工信息列表
   const _workOrderDetailList = async ()=>{
-	const OrderYieldListtable = await OrderYieldList({mouth:_ddrq.value});
-	console.log(456,OrderYieldListtable)
+	const OrderYieldListtable = await OrderYieldList({client:_khbh.value,search:'',mouth:''});
+	console.log(OrderYieldListtable)
 	try {
 		const workOrderDetaildata = OrderYieldListtable
 		tableData.splice(0,tableData.length,...workOrderDetaildata.data);