zck 8 сар өмнө
parent
commit
f1630cb1c6

+ 18 - 5
src/view/inventory/ruku.vue

@@ -3,7 +3,7 @@
     <layout>
 		<el-row :gutter="24" style="margin-bottom: 6px;">
 			  <!-- <el-input v-model="records_searchInfo" placeholder="请搜索入库单号、订单编号或生产款号进行查询相关入库记录"  @input="records_handleInput"
-				@keyup.enter="records_onSubmit" id="searchInput"  style="width: 460px;height: 50px;margin-left: 10px;">
+				@keyup.enter="search_onSubmit" id="searchInput"  style="width: 460px;height: 50px;margin-left: 10px;">
 			  </el-input> -->
 			  <el-button type="primary" @click="Reporting_onSubmit" style="height: 50px;font-size: 20px;margin-left: 20px;">面料入库</el-button>
 			  <!-- <el-button type="danger"  @click="deldetail_delclick" style="width: 80px;height: 50px;"	v-if="del_details=== true" :disabled="details_Selection === '' "  class="bt"   >删除</el-button> -->
@@ -201,8 +201,12 @@
 			        <!-- <el-table-column type="selection" width="80" /> -->
 				<el-table-column  align="left" label="批次号" prop="批次号" width="90"/>
 				<el-table-column  align="left" label="关联号" prop="关联号" width="90"/>
+				<el-table-column  align="left" label="订单编号" prop="订单编号" width="110"/>
+				<el-table-column  align="left" label="生产款号" prop="生产款号" width="110"/>
 				<el-table-column  align="left" label="物料编号" prop="物料编号" width="160" />	 
 				<el-table-column  align="left" label="物料名称" prop="物料名称" width="130" />
+				<el-table-column  align="left" label="客户" prop="客户编号" width="90"/>
+				<el-table-column  align="left" label="款式" prop="款式" width="120"/>
 				<el-table-column  align="left" label="颜色" prop="颜色" width="90"/>
 				<!-- <el-table-column  align="left" label="计划用料" prop="计划用料" width="90"/> -->
 				<!-- <el-table-column  align="left" label="计划门幅" prop="计划门幅" width="90" />	 -->
@@ -401,6 +405,14 @@ const handleNodeClick = async (node, check) => {
 
 
 
+//查询按钮
+const search_onSubmit = async ()  => {
+		// const UnapprovalListtable = await UnapprovalList({search:records_searchInfo.value,page:page.value,limit:pageSize.value});
+		// tableData1.splice(0,tableData1.length,...UnapprovalListtable.data.table);
+		// total.value = UnapprovalListtable.data.total
+		console.log('调用搜索接口')
+};
+
 //input实时调用
 const handleInput = async ()=>{
 	restableData.splice(0, restableData.length);//清空表格
@@ -716,20 +728,21 @@ const res_bomenterDialog = async () => {
 	}
  // 构造一个包含所有数据的数组
  const formattedDataArray = danjutableData.value.map(item => ({
-    order_id: ddhformData.ddh,
-    款号: ddhformData.sckh,
+    order_id: item['订单编号'],
+    款号: item['生产款号'],
     物料编码: item['物料编号'],
     物料名称: item['物料名称'],
     number: item['入库数量'],
     name: "入库",
     sys_id: userStore.userInfo.nickName,
     receipt_number: danhao.value,
-    客户编号: ddhformData.kh,
-    款式: ddhformData.ks,
+    客户编号: item['客户编号'],
+    款式: item['款式'],
     rq: currentDate,
     批次号: item['批次号'],
     关联编号: item['关联号'],
     实际门幅: item['实际门幅'],
+	单位: item['单位'],
   }));
   console.log(formattedDataArray);
   try {

+ 13 - 8
src/view/inventory/tuihuan.vue

@@ -208,14 +208,18 @@
                       <!-- <el-table-column type="selection" width="80" /> -->
                   <el-table-column  align="left" label="批次号" prop="批次号" width="90"/>
                   <el-table-column  align="left" label="关联号" prop="关联号" width="90"/>
+                  <el-table-column  align="left" label="订单编号" prop="订单编号" width="110"/>
+                  <el-table-column  align="left" label="生产款号" prop="生产款号" width="110"/>
                   <el-table-column  align="left" label="物料编号" prop="物料编号" width="160" />	 
                   <el-table-column  align="left" label="物料名称" prop="物料名称" width="130" />
+                  <el-table-column  align="left" label="客户" prop="客户编号" width="90"/>
+                  <el-table-column  align="left" label="款式" prop="款式" width="120"/>
                   <el-table-column  align="left" label="颜色" prop="颜色" width="90"/>
                   <!-- <el-table-column  align="left" label="计划用料" prop="计划用料" width="90"/> -->
                   <!-- <el-table-column  align="left" label="计划门幅" prop="计划门幅" width="90" />	 -->
                   <el-table-column  align="left" label="定额用料" prop="定额用料" width="90" />	 
                   <el-table-column  align="left" label="定额门幅" prop="定额门幅" width="90" />
-                  <!-- <el-table-column  align="left" label="实际门幅" prop="实际门幅" width="90"/> -->
+                  <el-table-column  align="left" label="实际门幅" prop="实际门幅" width="90"/>
                   <el-table-column  align="left" label="退还数量" prop="退还数量" width="90"/>
 				  <el-table-column  align="left" label="退还类型" prop="退还类型" width="90"/>
                   <!-- <el-table-column  align="left" label="累计退还数量" prop="入仓总数量" width="110"/>
@@ -527,7 +531,7 @@ const handleNodeClick = async (node, check) => {
       领用数量: Detailres.data.领用数量,
       关联订单: Detailres.data.关联订单,
       颜色: Detailres.data.BOM_颜色,
-      单位: '米',
+      单位: Detailres.data.单位,
       实际门幅: Detailres.data.实际门幅,
     };
 
@@ -748,21 +752,22 @@ const dj_Dialog = () => {
       }
    // 构造一个包含所有数据的数组
    const formattedDataArray = danjutableData.value.map(item => ({
-      order_id: ddhformData.ddh,
-      款号: ddhformData.sckh,
+      order_id: item['订单编号'],
+      款号: item['生产款号'],
       物料编码: item['物料编号'],
       物料名称: item['物料名称'],
       number: item['退还数量'],
       name: "退还",
       sys_id: userStore.userInfo.nickName,
       receipt_number: danhao.value,
-      客户编号: ddhformData.kh,
-      款式: ddhformData.ks,
+      客户编号: item['客户编号'],
+      款式: item['款式'],
       rq: currentDate,
       批次号: item['批次号'],
       关联编号: item['关联号'],
-      // 实际门幅: item['实际门幅'],
-      type: radio1.value,
+      单位: item['单位'],
+      实际门幅: item['实际门幅'],
+      type: item['退还类型'],
     }));
     console.log(formattedDataArray);
     try {

+ 43 - 18
src/view/material/bomproduct.vue

@@ -1,13 +1,14 @@
 <template>
     <div style="padding: 0px;margin-left: -30px;">
       <layout>
-        <!-- <layout-header>
+        <layout-header>
           <div class="gva-table-box" style="margin-left: 20px;width: 97%;">
             <el-form-item>
-              <el-button type="primary" icon="plus"  @click="addonclick" >新增问题分类</el-button>
+              <el-input v-model="searchinfo" @keydown="keydown_onSearch($event)" placeholder="输入工单编号或产品名称" style="width: 180px;" />
+              <el-button type="primary" class="search" icon="search" @click="onSearch"></el-button>
             </el-form-item>
           </div>
-        </layout-header> -->
+        </layout-header>
   
   
           <!-- 右侧区域 -->
@@ -23,22 +24,25 @@
                         highlight-current-row="true" @row-dblclick="updateCompanyFunc"
                         @row-click="tableRowClick" :show-overflow-tooltip="true"
                         @selection-change="handleSelectionChange">
-               <el-table-column   align="center" label="工单编号" prop="BOM_工单编号"  width="100" />
-               <el-table-column   align="center" label="物料编码" prop="BOM_物料编码"  width="100" />
+               <el-table-column   align="center" label="订单编号" prop="订单编号"  width="100" />
+               <el-table-column   align="center" label="款号" prop="生产款号"  width="100" />
+               <el-table-column   align="center" label="客户" prop="客户编号"  width="73" />
+               <el-table-column   align="center" label="款式" prop="款式"  width="100" />
+               <!-- <el-table-column   align="center" label="物料编码" prop="物料编码"  width="100" /> -->
                <el-table-column   align="center" label="物料分类" prop="物料分类"  width="73" />
-               <el-table-column   align="center" label="物料名称" prop="BOM_物料名称"  width="160" />
-               <el-table-column   align="center" label="计划用料" prop="BOM_计划用量"  width="73" />
-               <el-table-column   align="center" label="计划门幅" prop="BOM_计划门幅"  width="73" />
-               <el-table-column   align="center" label="定额用料" prop="BOM_标准用量"  width="73" />
-               <el-table-column   align="center" label="定额门幅" prop="BOM_定额门幅"  width="73" />
+               <el-table-column   align="center" label="物料名称" prop="物料名称"  width="160" />
+               <el-table-column   align="center" label="计划用料" prop="计划用料"  width="80" />
+               <el-table-column   align="center" label="计划门幅" prop="计划门幅"  width="73" />
+               <el-table-column   align="center" label="定额用料" prop="定额用料"  width="73" />
+               <el-table-column   align="center" label="定额门幅" prop="定额门幅"  width="73" />
                <!-- <el-table-column   align="center" label="实际门幅" prop="BOM_实际门幅"  width="110" /> -->
-               <el-table-column   align="center" label="实际用料" prop="BOM_实际用量"  width="73" />
-               <el-table-column   align="center" label="库存总量" prop="BOM_库存总量"  width="100" />
-               <el-table-column   align="center" label="面料结余" prop="BOM_面料结余"  width="100" />
-               <el-table-column   align="center" label="退还数量" prop="BOM_退还数量"  width="100" />
-               <el-table-column   align="center" label="投料单位" prop="BOM_投料单位"  width="73" />
-               <el-table-column   align="center" label="备注" prop="BOM_desc"  width="160" />
-               <el-table-column   align="center" label="建档人员" prop="Sys_ID"  width="160" />
+               <el-table-column   align="center" label="实际用料" prop="实际用料"  width="73" />
+               <el-table-column   align="center" label="库存总量" prop="库存总量"  width="80" />
+               <el-table-column   align="center" label="面料结余" prop="面料结余"  width="73" />
+               <el-table-column   align="center" label="退还数量" prop="退还数量"  width="73" />
+               <el-table-column   align="center" label="投料单位" prop="投料单位"  width="73" />
+               <el-table-column   align="center" label="备注" prop="备注"  width="160" />
+               <el-table-column   align="center" label="建档人员" prop="Sys_ID"  width="120" />
                <el-table-column   align="center" label="建档日期" prop="Sys_rq"  width="160" />
 
 
@@ -138,11 +142,32 @@
 	_gettabledata();
   };
 
+//搜索
+const searchinfo = ref('');
+const onSearch = async () => { // 搜索按钮触发的事件处理函数,根据需要修改逻辑和接口调用
+  const response = await Apibomlistarr({
+        search: searchinfo.value, 
+        page: 1,
+        limit: 50,
+      });
+      if (response.code === 0) {
+      tableData.value = response.data.list;
+      total.value = response.data.total;
+    }
+}
+//回车搜索
+const keydown_onSearch = async (event) => {
+	if(event.keyCode === 13){
+    onSearch();
+	}
+}
+
+
   // =========== 获取表格数据 ===========
   const tableData = ref([])
   const _gettabledata = async () => {
     // 调用接口获取数据
-    const res = await Apibomlistarr({page:page.value,limit:pageSize.value})
+    const res = await Apibomlistarr({search:'',page:page.value,limit:pageSize.value})
     console.log(res)
     if (res.code === 0) {
       tableData.value = res.data.list;

+ 41 - 33
src/view/performance/QualityAssessment/SemiFinishedRework.vue

@@ -30,12 +30,13 @@
               :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
               :show-overflow-tooltip="true" @row-click="Click" @row-dblclick="doubleClick">
               <el-table-column align="left"  label="单据编号" prop="单据编号" width="140" />
-              <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="190" />
               <el-table-column align="left"  label="生产款号" prop="生产款号" width="140" />
-              <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="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="120" />
               <el-table-column align="left"  label="创建时间" prop="Sys_rq" width="120" />
               <el-table-column fixed="right" label="操作" width="130">
@@ -237,12 +238,13 @@ width="100%" style="height: 100%;margin: 0%;padding: 0px 10px 0px 10px;"  destro
               <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="100" />
-              <el-table-column align="left"  label="数量" prop="数量" width="80" />
-              <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="100" />
+              <el-table-column align="left"  label="返工数量" prop="数量" width="90" />
+              <!-- <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="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="Sys_id" width="120" />
               <el-table-column align="left"  label="创建时间" prop="Sys_rq" width="120" />
       </el-table>
@@ -374,23 +376,28 @@ const handleNodeClick = async (node) => {
 };
 
 const searchinfo = ref('');
-//回车搜索
-const keydown_onSearch = async (event) => {
-if(event.keyCode === 13){
+
+const onSearch = async () => { // 搜索按钮触发的事件处理函数,根据需要修改逻辑和接口调用
   const response = await ApiSubPieceAnd({
-      search: searchinfo.value, 
-      page: 1,
-      limit: 50,
-      code: '返工'
-    });
-    if (response.code === 0 && response.data?.data) {
-      // 清空并更新表格数据
-      tableData.splice(0, tableData.length, ...response.data.data);
-    } else {
-      ElMessage.warning(response.msg || '暂无数据');
-      tableData.splice(0, tableData.length);
-    }
+        search: searchinfo.value, 
+        Sys_rq:'',
+        page: 1,
+        limit: 50,
+        code: '次片'
+      });
+      if (response.code === 0 && response.data?.data) {
+        // 清空并更新表格数据
+        tableData.splice(0, tableData.length, ...response.data.data);
+      } else {
+        ElMessage.warning(response.msg || '暂无数据');
+        tableData.splice(0, tableData.length);
+      }
 }
+//回车搜索
+const keydown_onSearch = async (event) => {
+	if(event.keyCode === 13){
+    onSearch();
+	}
 }
 
 /**
@@ -685,7 +692,7 @@ try {
 }
 
 const exportExcel2 = () => {
-const filename = '导出返工明细EXCEL.xlsx';
+const filename = '服装半成品返工报工页面表.xlsx';
 console.log('导出数据', exceltableData);
 
 // 获取 el-table 的列配置
@@ -694,17 +701,18 @@ const columns = [
   { label: "订单编号", prop: "订单编号" },
   { label: "生产款号", prop: "生产款号" },
   { label: "款式", prop: "款式" },
-  { label: "面料分类", prop: "面料分类" },
-  { label: "面料名称", prop: "面料名称" },
+  // { label: "面料分类", prop: "面料分类" },
+  // { label: "面料名称", prop: "面料名称" },
   { label: "颜色", prop: "颜色" },
-  { label: "数量", prop: "数量" },
-  { label: "计划用料", prop: "计划用料" },
-  { label: "实际用料", prop: "实际用料" },
-  { label: "问题分类", prop: "问题分类" },
+  { label: "尺码", prop: "尺码" },
+  { label: "返工数量", prop: "数量" },
+  { label: "返工小组", prop: "组别" },
+  // { label: "计划用料", prop: "计划用料" },
+  // { label: "实际用料", prop: "实际用料" },
+  { label: "返工问题", prop: "问题分类" },
   { label: "备注", prop: "备注" },
-  { label: "组别", prop: "组别" },
-  { label: "操作人员", prop: "Sys_id" },
-  { label: "创建时间", prop: "Sys_rq" }
+  // { label: "操作人员", prop: "Sys_id" },
+  // { label: "创建时间", prop: "Sys_rq" }
 ];
 
 // 创建表头映射对象

+ 24 - 19
src/view/performance/QualityAssessment/cropdefective.vue

@@ -222,16 +222,16 @@ width="100%" style="height: 100%;margin: 0%;padding: 0px 10px 0px 10px;"  destro
                 <el-table-column align="left"  label="单据编号" prop="单据编号" width="140" />
                 <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="100" />
-                <el-table-column align="left"  label="数量" prop="数量" width="80" />
-                <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="120" />
+                <el-table-column align="left"  label="次片数量" prop="数量" width="80" />
+                <!-- <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="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="Sys_id" width="120" />
                 <el-table-column align="left"  label="创建时间" prop="Sys_rq" width="120" />
 				</el-table>
@@ -363,11 +363,11 @@ const handleNodeClick = async (node) => {
 };
 
 const searchinfo = ref('');
-//回车搜索
-const keydown_onSearch = async (event) => {
-	if(event.keyCode === 13){
-    const response = await ApiSubPieceAnd({
+
+const onSearch = async () => { // 搜索按钮触发的事件处理函数,根据需要修改逻辑和接口调用
+  const response = await ApiSubPieceAnd({
         search: searchinfo.value, 
+        Sys_rq:'',
         page: 1,
         limit: 50,
         code: '次片'
@@ -379,6 +379,11 @@ const keydown_onSearch = async (event) => {
         ElMessage.warning(response.msg || '暂无数据');
         tableData.splice(0, tableData.length);
       }
+}
+//回车搜索
+const keydown_onSearch = async (event) => {
+	if(event.keyCode === 13){
+    onSearch();
 	}
 }
 
@@ -657,7 +662,7 @@ const exportExcel = () => {
 }
 
 const exportExcel2 = () => {
-  const filename = '导出次片明细EXCEL.xlsx';
+  const filename = '裁剪次片汇总报工页面表.xlsx';
   console.log('导出数据', exceltableData);
   
   // 获取 el-table 的列配置
@@ -665,18 +670,18 @@ const exportExcel2 = () => {
     { label: "单据编号", prop: "单据编号" },
     { label: "订单编号", prop: "订单编号" },
     { label: "生产款号", prop: "生产款号" },
-    { label: "款式", prop: "款式" },
     { label: "面料分类", prop: "面料分类" },
     { label: "面料名称", prop: "面料名称" },
     { label: "颜色", prop: "颜色" },
-    { label: "数量", prop: "数量" },
-    { label: "计划用料", prop: "计划用料" },
-    { label: "实际用料", prop: "实际用料" },
-    { label: "问题分类", prop: "问题分类" },
+    { label: "款式", prop: "款式" },
+    { label: "次片数量", prop: "数量" },
+    // { label: "计划用料", prop: "计划用料" },
+    // { label: "实际用料", prop: "实际用料" },
+    { label: "次片分类", prop: "问题分类" },
     { label: "备注", prop: "备注" },
-    { label: "组", prop: "组别" },
-    { label: "操作人员", prop: "Sys_id" },
-    { label: "创建时间", prop: "Sys_rq" }
+    { label: "报工小组", prop: "组别" },
+    // { label: "操作人员", prop: "Sys_id" },
+    // { label: "创建时间", prop: "Sys_rq" }
   ];
 
   // 创建表头映射对象

+ 3 - 3
src/view/performance/Suborderdetailspage.vue

@@ -134,8 +134,8 @@ const searchOrder = async (query) => {
     const res = await Apiorder({ search: query });
     if (res.code === 0 && res.data?.list) {
       orderOptions.value = res.data.list.map(item => ({
-        value: item.订单编号,
-        label: item.订单编号
+        value: `${item.订单编号}---${item.生产款号}`, 
+        label: `${item.订单编号}---${item.生产款号}`,
       }));
     
     }
@@ -154,7 +154,7 @@ const handleOrderSelect = async (orderNo) => {
 
   try {
     // 调用子订单接口
-    const res = await Apiorderids({ order:orderNo}); // 假设接口需要传订单编号
+    const res = await Apiorderids({ order:orderNo.split('---')[0]}); // 假设接口需要传订单编号
     if (res.code === 0 && res.data?.list) {
       subOrderOptions.value = res.data.list.map(item => ({
         value: item.子订单编号,

+ 12 - 6
src/view/performance/chukubaogong.vue

@@ -201,14 +201,18 @@
 					  <!-- <el-table-column type="selection" width="80" /> -->
 				  <el-table-column  align="left" label="批次号" prop="批次号" width="90"/>
 				  <el-table-column  align="left" label="关联号" prop="关联号" width="90"/>
+				  <el-table-column  align="left" label="订单编号" prop="订单编号" width="110"/>
+				  <el-table-column  align="left" label="生产款号" prop="生产款号" width="110"/>
 				  <el-table-column  align="left" label="物料编号" prop="物料编号" width="160" />	 
 				  <el-table-column  align="left" label="物料名称" prop="物料名称" width="130" />
+				  <el-table-column  align="left" label="客户" prop="客户编号" width="90"/>
+				  <el-table-column  align="left" label="款式" prop="款式" width="120"/>
 				  <el-table-column  align="left" label="颜色" prop="颜色" width="90"/>
 				  <!-- <el-table-column  align="left" label="计划用料" prop="计划用料" width="90"/> -->
 				  <!-- <el-table-column  align="left" label="计划门幅" prop="计划门幅" width="90" />	 -->
 				  <el-table-column  align="left" label="定额用料" prop="定额用料" width="90" />	 
 				  <el-table-column  align="left" label="定额门幅" prop="定额门幅" width="90" />
-				  <!-- <el-table-column  align="left" label="实际门幅" prop="实际门幅" width="90"/> -->
+				  <el-table-column  align="left" label="实际门幅" prop="实际门幅" width="90"/>
 				  <el-table-column  align="left" label="出库数量" prop="出库数量" width="90"/>
 				  <!-- <el-table-column  align="left" label="累计出库数量" prop="入仓总数量" width="110"/>
 				  <el-table-column  align="left" label="库存数量" prop="库存数量" width="90"/> -->
@@ -523,7 +527,7 @@ const handleNodeClick = async (node, check) => {
       库存数量: Detailres.data.库存数量 ? Detailres.data.库存数量 : 0,
       关联订单: Detailres.data.关联订单,
       颜色: Detailres.data.BOM_颜色,
-      单位: '米',
+      单位: Detailres.data.单位,
       实际门幅: Detailres.data.实际门幅,
     };
 
@@ -720,19 +724,21 @@ const handleNodeClick = async (node, check) => {
 	  }
    // 构造一个包含所有数据的数组
    const formattedDataArray = danjutableData.value.map(item => ({
-	  order_id: ddhformData.ddh,
-	  款号: ddhformData.sckh,
+	  order_id: item['订单编号'],
+	  款号: item['生产款号'],
 	  物料编码: item['物料编号'],
 	  物料名称: item['物料名称'],
 	  number: item['出库数量'],
 	  name: "出库",
 	  sys_id: userStore.userInfo.nickName,
 	  receipt_number: danhao.value,
-	  客户编号: ddhformData.kh,
-	  款式: ddhformData.ks,
+	  客户编号: item['客户编号'],
+      款式: item['款式'],
 	  rq: currentDate,
 	  批次号: item['批次号'],
+	  实际门幅: item['实际门幅'],
 	  关联编号: item['关联号'],
+	  单位: item['单位'],
 	  // 实际门幅: item['实际门幅'],
 	}));
 	console.log(formattedDataArray);

+ 3 - 3
src/view/yunyin/shengchanguanli/yangyipihe.vue

@@ -43,9 +43,9 @@
 						<el-table-column   align="center" label="订单附件状态" prop="orderstatus"  width="110" />
 						<el-table-column   align="left" label="客户" prop="客户编号"  width="70" />
 						<el-table-column   align="left" label="订单编号" prop="订单编号"  width="115" />
-						<el-table-column   align="left" label="生产款号" prop="生产款号"  width="150" />
+						<el-table-column   align="left" label="款号" prop="生产款号"  width="150" />
 						<el-table-column   align="left" label="款式" prop="款式"  width="110" />
-						<el-table-column align="left" label="单状态" prop="gd_statu" width="100" >
+						<el-table-column align="left" label="单状态" prop="gd_statu" width="100" >
 							<template #default="{ row }">
 							<el-tag :type="row.gd_statu === '1-计划中' ? 'warning' : (row.gd_statu === '2-生产中' ? 'success' : 'info')">
 							{{ row.gd_statu === '1-计划中' ? '计划中' : (row.gd_statu === '2-生产中' ? '生产中' : '已完工') }}
@@ -61,7 +61,7 @@
 						<el-table-column   align="left" label="船样合计" prop="船样合计"  width="90" />
 						<el-table-column   align="left" label="船样描述" prop="船样描述"  width="200" />
 						<el-table-column   align="left" label="箱唛要求" prop="箱唛要求"  width="360" />
-						<el-table-column   align="left" label="工单完工日期" prop="工单完工日期"  width="140" />
+						<el-table-column   align="left" label="完工日期" prop="工单完工日期"  width="140" />
 						<el-table-column   align="left" label="制单人" prop="Sys_id"  width="160" />
 						<el-table-column   align="left" label="制单日期" prop="Sys_rq"  width="160" />
 						<!-- <el-table-column   align="left" label="接单日期" prop="接单日期"  width="120" /> -->