From fcce433b025e321c245d0b4a2878180929d3413f Mon Sep 17 00:00:00 2001
From: zhangdi <1104545947@qq.com>
Date: Thu, 16 Apr 2026 09:51:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=8E=A5=E6=94=B6=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/factionalwork.js         |  2 +-
 pages/plan/factionalwork.vue | 59 ++++++++++++++++++++++++------------
 2 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/api/factionalwork.js b/api/factionalwork.js
index 2fb8da1..ff08532 100644
--- a/api/factionalwork.js
+++ b/api/factionalwork.js
@@ -4,7 +4,7 @@ import http from '@/http/api.js'
 // 订单接收
  const yieldOrderConfirm = (params) => {
     return http.request({
-        url: '/blade-desk/order/yieldOrder/confirmBatch',
+        url: '/blade-desk/order/yieldOrder/confirm',
         method: 'POST',
         params: params
     })
diff --git a/pages/plan/factionalwork.vue b/pages/plan/factionalwork.vue
index 4e9c098..d88a41c 100644
--- a/pages/plan/factionalwork.vue
+++ b/pages/plan/factionalwork.vue
@@ -11,22 +11,34 @@
           placeholder="请扫描流程卡"
       /></uni-forms-item>
     </uni-forms>
-    <!-- <t-table style="margin-top:20rpx">
-            <t-tr>
-                <t-td>厂内生产</t-td>
-                <t-td>
-                    <switch :checked="unFsBool" @change="switchChange" />
-                </t-td>
-            </t-tr>
-            <t-tr>
-                <t-td>流程卡</t-td>
-                <t-td>{{ cradNoText }}</t-td>
-            </t-tr>
-            <t-tr>
-                <t-td>处理班组/供应商</t-td>
-                <t-td>{{ makeTeam }}</t-td>
-            </t-tr>
-        </t-table> -->
+    <t-table style="margin-top: 20rpx">
+      <t-tr>
+        <t-td>厂内生产</t-td>
+        <t-td>
+          <switch :checked="unFsBool" @change="switchChange" />
+        </t-td>
+      </t-tr>
+      <!-- <t-tr>
+        <t-td>流程卡</t-td>
+        <t-td>{{ cradNoText }}</t-td>
+      </t-tr> -->
+      <!-- <t-tr>
+        <t-td>处理班组/供应商</t-td>
+        <t-td>{{ makeTeam }}</t-td>
+      </t-tr> -->
+    </t-table>
+    <t-table style="margin-top: 20rpx">
+      <t-tr>
+        <t-td>工序号</t-td>
+        <t-td> 工序名称 </t-td>
+        <t-td> 作业中心/供应商 </t-td>
+      </t-tr>
+      <t-tr v-for="(item,index) in makeTeam" :key="index">
+        <t-td>{{ item.processNo }}</t-td>
+        <t-td> {{ item.processName }} </t-td>
+        <t-td> {{ item.workCenterName }} </t-td>
+      </t-tr>
+    </t-table>
   </ifrm>
 </template>
 
@@ -49,10 +61,11 @@ export default {
   data() {
     return {
       cradNo: "",
-      makeTeam: "",
+      makeTeam: [],
       cradNoText: "",
       unFsBool: false,
       getDataFun: true,
+      tableData:[]
     };
   },
   methods: {
@@ -72,11 +85,19 @@ export default {
       this.cradNoText = code;
       if (!this.cradNo) return;
       this.getDataFun = false;
+       uni.showLoading({
+        title: "提交中...",
+      });
+      let query = {
+        cardNo: this.cradNo,
+        mark: this.unFsBool ? 1 : 0,
+      };
       this.$u.api
-        .yieldOrderConfirm()
+        .yieldOrderConfirm(query)
         .then((res) => {
-          let data = res.data
+          let data = res.data;
           this.makeTeam = data;
+          uni.hideLoading()
           uni.showToast({
             title: "操作成功",
           });