Explorar o código

修改了工艺路线中物料bom显示错误的问题 增加生产履历

ooo hai 1 ano
pai
achega
955c4313b2

+ 7 - 0
src/api/material/index.ts

@@ -13,3 +13,10 @@ export function getMaterialDetails(materialCode: String): AxiosPromise<any> {
     method: "get",
   });
 }
+
+export function getMaterialDetailsByseqNo(seqNo: String): AxiosPromise<any> {
+  return request({
+    url: "/api/v1/process/web/traceability/get/" + seqNo,
+    method: "get",
+  });
+}

+ 4 - 1
src/views/base/craftManagement/route/bindProcess.vue

@@ -237,7 +237,10 @@ const editProComponent = async () => {
   // saveFlow();
   let res = await updateProcess(currentProcess.value);
   ElMessage.success("保存成功");
-  router.push(`/base/craftManagement/processCom/${currentProcess.value.id}`);
+  router.push({
+		path: `/base/craftManagement/processCom/${currentProcess.value.id}`,
+		query: {prodtCode:route.query.prodtCode}
+	});
 };
 
 // 全局=======

+ 1 - 1
src/views/base/craftManagement/route/components/bottomTable.vue

@@ -73,7 +73,7 @@ const crudRef = ref(null); //crudRef.value 获取avue-crud对象
 const startCreat = () => {
   if (props.tableType === "wuliaocaiji") {
 	  //根据物料编码获取对应的物料BOM
-    commonTableRef.value && commonTableRef.value.startSelect({ materialCode: "1202010000005" });
+    commonTableRef.value && commonTableRef.value.startSelect({ materialCode: route.query.prodtCode });
   } else {
     crudRef.value && crudRef.value.rowAdd();
   }

+ 6 - 3
src/views/base/craftManagement/route/index.vue

@@ -145,7 +145,10 @@ const copyRow = (row) => {
 const router = useRouter();
 // 绑定工序
 const bindProcess = (row) => {
-  router.push(`/base/craftManagement/bindProcess/${row.id}`);
+  router.push({
+		path: `/base/craftManagement/bindProcess/${row.id}`,
+		query: {prodtCode:row.prodtCode}
+	});
 };
 
 // 设置表格列或者其他自定义的option
@@ -305,8 +308,8 @@ option.value = Object.assign(option.value, {
     {
       label: "版本",
       prop: "processRouteVersion",
-      addDisplay: false,
-      editDisplay: false,
+      addDisplay: true,
+      editDisplay: true,
     },
     {
       label: "创建人",

+ 58 - 10
src/views/pro/traceability/index.vue

@@ -1,8 +1,8 @@
 <template>
-    <div class="mainContentBox">
+    <div class="mainContentBox common-layout">
         
 		<el-container>
-	    <el-aside width="600px">
+	    <el-aside width="600px" style="height: 800px">
 	      <avue-crud
 	              ref="crudRef"
 	              v-model:search="search"
@@ -10,16 +10,43 @@
 	              :data="data"
 	              :option="option"
 	              v-model:page="page"
-	      		@row-click="handleRowClick">
+	      		@cell-click="handleCellClick">
 	      	<template #seqNo="{ row }">
 	      	  <el-tag :type="chooseTagType(row.seqNo,'css')">{{chooseTagType(row.seqNo,'text')}}</el-tag>
 	      	  {{row.seqNo}}
 	      	</template>
 	      </avue-crud>
 	    </el-aside>
-	    <el-main>
-	      <!-- <avue-crud></avue-crud> -->
-	    </el-main>
+			<el-container>
+	            <el-header style="height: 20%;">
+					<el-descriptions title="产品信息回顾" border>
+					    <el-descriptions-item label="产品名称">{{productReviewInfo.materialName}}</el-descriptions-item>
+					    <el-descriptions-item label="序列号">{{productReviewInfo.seqNo}}</el-descriptions-item>
+					    <el-descriptions-item label="物料编号">{{productReviewInfo.materialCode}}</el-descriptions-item>
+						<el-descriptions-item label="产品规格">{{productReviewInfo.materialModel}}</el-descriptions-item>
+						<el-descriptions-item label="铭牌号">-</el-descriptions-item>
+					    <el-descriptions-item label="Remarks">
+					      <el-tag size="small">否</el-tag>
+					    </el-descriptions-item>
+					    <el-descriptions-item label="工单出站">5</el-descriptions-item>
+					    <el-descriptions-item label="交付日期">{{productReviewInfo.planStartEnd}}</el-descriptions-item>
+					</el-descriptions>
+				</el-header>
+	            <el-main>
+					<!-- <el-container>
+					      <el-header style="background-color: black;height: 30%;padding: 0%;">
+							
+						  </el-header>
+					      <el-main style="background-color: red;">Main</el-main>
+					</el-container> -->
+					<el-tabs type="border-card">
+					  <el-tab-pane label="生产履历">生产履历</el-tab-pane>
+					  <el-tab-pane label="已采物料">已采物料</el-tab-pane>
+					  <el-tab-pane label="图片采集">图片采集</el-tab-pane>
+					  <el-tab-pane label="缺陷项">缺陷项</el-tab-pane>
+					</el-tabs>
+				</el-main>
+	        </el-container>
 	  </el-container>	
     </div>
 </template>
@@ -29,6 +56,9 @@
     import ButtonPermKeys from "@/common/configs/buttonPermission";
 
     import { useCommonStoreHook } from "@/store";
+	import {
+	  getMaterialDetailsByseqNo,
+	} from "@/api/material";
     const { isShowTable, tableType } = toRefs(useCommonStoreHook());
     const test = () => {
         isShowTable.value = true;
@@ -54,11 +84,29 @@
 		}
 	  return daynamicType
 	};
-	const handleRowClick = (row, column, event) => {
+	
+	let productReviewInfo = {
+		materialName:'',
+		seqNo:'',
+		materialCode:'',
+		materialModel:'',
+		planStartEnd:'',
+		workOrderCode:''
+	}
+	const handleCellClick = (row, column, event) => {
 	      // 点击行时触发的逻辑
-	      console.log('行数据:', row.workOrderCode);
-	      // console.log('点击列信息:', option.value);
-	      // 这里可以编写你的逻辑代码,比如弹窗显示行详情等
+		  if(!row.children && row.seqNo && row.seqNo.length > 16){
+			if(row.workOrderCode == productReviewInfo.workOrderCode){
+				return
+			}
+			getMaterialDetailsByseqNo(row.seqNo).then(({ data }) => {
+				productReviewInfo = {...data}
+				productReviewInfo.workOrderCode = row.workOrderCode
+				// productReviewInfo.materialName = data.materialName
+				console.log('productReviewInfo',productReviewInfo)
+			  }
+			);
+		  }
 	};
     // 设置表格列或者其他自定义的option
     option.value = Object.assign(option.value, {