From 0feaeefb11970fb8474567304dacde924b32a30c Mon Sep 17 00:00:00 2001
From: jinna <jn517618@163.com>
Date: Thu, 15 Jan 2026 18:02:36 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=AE=A1=E7=90=86=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/orderManagement/planYieIdOrder.js     |  14 +-
 src/api/orderManagement/sinTerPlanOrder.js    |   4 +-
 .../components/orderUpdateDailog.vue          | 175 ++++++++++--------
 src/views/orderManagement/planYieIdOrder.vue  |  67 ++++---
 src/views/orderManagement/plannedOrder.vue    |  61 +++---
 src/views/orderManagement/sinTerPlanOrder.vue |  67 ++++---
 .../orderManagement/sinTerYieIdOrder.vue      |  85 +++++----
 .../components/sametankView.vue               |  16 +-
 .../productionTesting/productionQuality.vue   |  54 ++++--
 9 files changed, 331 insertions(+), 212 deletions(-)

diff --git a/src/api/orderManagement/planYieIdOrder.js b/src/api/orderManagement/planYieIdOrder.js
index 535fa21..d9dfd58 100644
--- a/src/api/orderManagement/planYieIdOrder.js
+++ b/src/api/orderManagement/planYieIdOrder.js
@@ -22,7 +22,7 @@ export const getHotOrderList = params => {
 // 获取烧结生产订单
 export const getSinterOrderList = params => {
   return request({
-    url: '/api/blade-desk/order/yieldPlan/pageSintering',
+    url: '/api/blade-desk/order/yieldOrder/pageSintering',
     method: 'get',
     params,
   });
@@ -30,7 +30,7 @@ export const getSinterOrderList = params => {
  // 修改
 export const update = row => {
   return request({
-    url: '/blade-desk/order/yieldOrder/update',
+    url: '/api/blade-desk/order/yieldOrder/update',
     method: 'post',
     data: row,
   });
@@ -40,7 +40,7 @@ export const update = row => {
 // 获取详情
 export const getassayContentDeatils = (params) => {
   return request({
-    url: `/blade-desk/order/yieldOrder/detail`,
+    url: `/api/blade-desk/order/yieldOrder/detail`,
     method: 'get',
     params,
   });
@@ -82,6 +82,14 @@ export const getFirstProcess = id => {
   });
 };
 
+// 获取生产标识下拉
+export const getProdIdentList = () => {
+  return request({
+    url: '/api/blade-desk/BA/ProdMark/listForSelect',
+    method: 'get',
+  });
+};
+
 
 
 
diff --git a/src/api/orderManagement/sinTerPlanOrder.js b/src/api/orderManagement/sinTerPlanOrder.js
index b72dc94..3a2a699 100644
--- a/src/api/orderManagement/sinTerPlanOrder.js
+++ b/src/api/orderManagement/sinTerPlanOrder.js
@@ -49,8 +49,8 @@ export const getassayContentDeatils = (params) => {
 //批量关闭
 export const closeBatchs = ids => {
   return request({
-    url: '/blade-desk/order/plateGoodsRecord/closeBatch',
+    url: '/api/blade-desk/order/yieldPlan/closeBatch',
     method: 'post',
-    data: ids,
+    params: ids,
   });
 };
diff --git a/src/views/orderManagement/components/orderUpdateDailog.vue b/src/views/orderManagement/components/orderUpdateDailog.vue
index 5eb8829..cb82e70 100644
--- a/src/views/orderManagement/components/orderUpdateDailog.vue
+++ b/src/views/orderManagement/components/orderUpdateDailog.vue
@@ -14,10 +14,11 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="零件号" prop="partCode">
-            <el-select v-model="formData.partCode" placeholder="请输入" disabled>
+            <el-input v-model="formData.partCode" disabled></el-input>
+            <!-- <el-select v-model="formData.partCode" placeholder="请输入" disabled>
               <el-option label="零件1" value="1" />
               <el-option label="零件12" value="2" />
-            </el-select>
+            </el-select> -->
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -34,26 +35,30 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="下级B号" prop="roamNo">
-            <el-input v-model="formData.roamNo" />
+          <el-form-item label="下级B号" prop="roamNoNext">
+            <el-input v-model="formData.roamNoNext" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="订单类型" prop="yieldType">
             <el-select v-model="formData.yieldType" placeholder="请选择">
-              <el-option :value="1" label="热表订单" />
-              <el-option :value="2" label="烧结订单" />
+              <el-option v-if="type == 'hotlist'" :value="12001" label="热表订单" />
+              <el-option v-if="type == 'sintering'" :value="12002" label="烧结订单" />
+              <el-option v-if="type == 'sintering'" :value="12003" label="玻璃饼" />
+              <el-option v-if="type == 'sintering'" :value="12004" label="壳体" />
+              <el-option v-if="type == 'sintering'" :value="12005" label="插针" />
+              <el-option v-if="type == 'sintering'" :value="12006" label="石墨模" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="产品型号" prop="productType">
-            <el-input v-model="formData.productType" />
+            <el-input v-model="formData.productType" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="产品名称" prop="productName">
-            <el-input v-model="formData.productName" />
+          <el-form-item label="产品名称" prop="partName">
+            <el-input v-model="formData.partName" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -63,14 +68,14 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="镀种" prop="plate">
-            <el-input v-model="formData.plate" />
+            <el-input v-model="formData.plate" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="生产标识" prop="productIdent">
             <el-select v-model="formData.productIdent" placeholder="请选择">
-              <el-option :value="1" label="JI-JII" />
-              <el-option :value="2" label="JIII" />
+              <el-option v-for="item in prodIdentList" :key="item.id" :value="item.id" :label="item.name" />
+              <!-- <el-option :value="2" label="JIII" /> -->
             </el-select>
           </el-form-item>
         </el-col>
@@ -86,7 +91,7 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="面积(d㎡)" prop="ypArea">
-            <el-input v-model="formData.ypArea" />
+            <el-input v-model="formData.ypArea" disabled />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -140,7 +145,7 @@
   </el-dialog>
 </template>
 <script>
-import { update } from '@/api/orderManagement/planYieIdOrder';
+import { update,getassayContentDeatils,getProdIdentList } from '@/api/orderManagement/planYieIdOrder';
 export default {
   props: {
     showDialog: {
@@ -155,12 +160,17 @@ export default {
       type: String,
       default: false,
     },
+    type:{
+      type: String,
+      default:''
+    }
   },
   data() {
     return {
       openShow: false,
       tableData: [],
       formData: {},
+      prodIdentList:[],
       rules: {
         ypCode: [{ required: true, message: '请输入', trigger: 'blur' }],
         yoCode: [
@@ -177,74 +187,88 @@ export default {
 
         batchNo: [{ required: true, message: '请输入', trigger: 'blur' }],
         cardNo: [{ required: true, message: '请输入', trigger: 'blur' }],
-        roamNo: [{ required: true, message: '请输入', trigger: 'blur' }],
+        // roamNo: [{ required: true, message: '请输入', trigger: 'blur' }],
         yieldType: [{ required: true, message: '请输入', trigger: 'blur' }],
       },
     };
   },
   mounted() {
     this.openShow = this.showDialog;
-    this.formData = {
-      partCode: 1,
-      yoCode: 'WO-98978789988',
-      batchNo: 'Y0232511359',
-      businessType: -1,
-      businessTypeTitle: null,
-      cardNo: '1022413231',
-      craftId: null,
-      curStatus: 0,
-      curStatusTitle: '待接收',
-      custodian: '肖盼盼',
-      demandDate: '2025-11-18',
-      dsCraft: { craftId: 59361, craftNo: 'C000000' },
-      dsPart: { partCode: '21E8-900-363-H1', partCode: 1, partName: 'M2 螺钉' },
-      entrustDept: '采购与物流中心 (成件)',
-      failureMan: {
-        accountId: null,
-        card: null,
-        createTime: null,
-        curStatus: 1,
-        deleted: false,
-        deptName: null,
-      },
-      failureMemo: null,
-      failureTime: null,
-      fatherVoid: null,
-      keyValue: 4490279,
-      kitPreparationMan: {
-        accountId: null,
-        card: null,
-        createTime: null,
-        curStatus: 1,
-        deleted: false,
-        deptName: null,
-      },
-      kitPreparationTime: null,
-      manualIncrease: false,
-      memo: null,
-      newlevFlag: '采购',
-      nextRoom: null,
-      nextRoomName: null,
-      partCode: '21E8-900-363-H1',
-      partName: 'M2 螺钉',
-      pdmUrl: null,
-      pkDate: null,
-      pkUsername: null,
-      planUser: '申强',
-      plate: 'Ct.P',
-      ypArea: 0.0170467129,
-      ypCode: 'WO-N251174111',
-      poMemo: 'DZ',
-      poProdLine: 'J303',
-      ypQty: 22,
-      primaryCraft: '库 1-1 (机加)-4 (表)- 库 2',
-      priority: 1,
-      prodident: 'JII',
-      produceBool: false,
-      productType: null,
-    };
+    this.getDetail()
+    this.getProdIdentList()
+    // this.formData = {
+    //   partCode: 1,
+    //   yoCode: 'WO-98978789988',
+    //   batchNo: 'Y0232511359',
+    //   businessType: -1,
+    //   businessTypeTitle: null,
+    //   cardNo: '1022413231',
+    //   craftId: null,
+    //   curStatus: 0,
+    //   curStatusTitle: '待接收',
+    //   custodian: '肖盼盼',
+    //   demandDate: '2025-11-18',
+    //   dsCraft: { craftId: 59361, craftNo: 'C000000' },
+    //   dsPart: { partCode: '21E8-900-363-H1', partCode: 1, partName: 'M2 螺钉' },
+    //   entrustDept: '采购与物流中心 (成件)',
+    //   failureMan: {
+    //     accountId: null,
+    //     card: null,
+    //     createTime: null,
+    //     curStatus: 1,
+    //     deleted: false,
+    //     deptName: null,
+    //   },
+    //   failureMemo: null,
+    //   failureTime: null,
+    //   fatherVoid: null,
+    //   keyValue: 4490279,
+    //   kitPreparationMan: {
+    //     accountId: null,
+    //     card: null,
+    //     createTime: null,
+    //     curStatus: 1,
+    //     deleted: false,
+    //     deptName: null,
+    //   },
+    //   kitPreparationTime: null,
+    //   manualIncrease: false,
+    //   memo: null,
+    //   newlevFlag: '采购',
+    //   nextRoom: null,
+    //   nextRoomName: null,
+    //   partCode: '21E8-900-363-H1',
+    //   partName: 'M2 螺钉',
+    //   pdmUrl: null,
+    //   pkDate: null,
+    //   pkUsername: null,
+    //   planUser: '申强',
+    //   plate: 'Ct.P',
+    //   ypArea: 0.0170467129,
+    //   ypCode: 'WO-N251174111',
+    //   poMemo: 'DZ',
+    //   poProdLine: 'J303',
+    //   ypQty: 22,
+    //   primaryCraft: '库 1-1 (机加)-4 (表)- 库 2',
+    //   priority: 1,
+    //   prodident: 'JII',
+    //   produceBool: false,
+    //   productType: null,
+    // };
   },
   methods: {
+    getDetail(){
+      getassayContentDeatils({id:this.id}).then(res =>{
+        console.log('res----------',res)
+        this.formData = res.data.data
+      })
+    },
+    // 获取生产标识下拉数据
+    getProdIdentList() {
+      getProdIdentList().then(res => {
+        this.prodIdentList = res.data.data;
+      });
+    },
     closeDialog() {
       this.openShow = false;
       this.$emit('closeDialog');
@@ -252,9 +276,10 @@ export default {
     submit() {
       this.$refs.formRules.validate(valid => {
         if (valid) {
+          console.log('this.formData',this.formData)
           update(this.formData).then(res => {
             console.log(res);
-            if(res.code===200){
+            if(res.data.code===200){
               this.openShow = false;
               this.$emit("closeDialog",true)
  
diff --git a/src/views/orderManagement/planYieIdOrder.vue b/src/views/orderManagement/planYieIdOrder.vue
index 5d87c3d..07bea32 100644
--- a/src/views/orderManagement/planYieIdOrder.vue
+++ b/src/views/orderManagement/planYieIdOrder.vue
@@ -65,6 +65,7 @@
     <!-- 修改 -->
     <orderUpdateDailog
       :showDialog="isUpdateOpen"
+      type="hotlist"
       v-if="isUpdateOpen"
       @closeDialog="closeDialog"
       :id="id"
@@ -246,7 +247,7 @@ export default {
           },
           {
             label: '批次号',
-            prop: 'str2',
+            prop: 'batchNo',
             search: true,
             sortable: true,
             width: 150,
@@ -309,14 +310,14 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入角色名称',
+                message: '请输入流程卡号',
                 trigger: 'blur',
               },
             ],
           },
           {
             label: '流转编号',
-            prop: 'poCode2',
+            prop: 'roamNo',
             search: true,
             sortable: true,
             width: 150,
@@ -326,7 +327,7 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入角色名称',
+                message: '请输入流转编号',
                 trigger: 'blur',
               },
             ],
@@ -376,7 +377,7 @@ export default {
             rules: [
               {
                 required: false,
-                message: '请输入角色名称',
+                message: '请输入镀种',
                 trigger: 'blur',
               },
             ],
@@ -411,14 +412,14 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入角色名称',
+                message: '请输入生产标识',
                 trigger: 'blur',
               },
             ],
           },
           {
             label: '使用部门',
-            prop: 'useDept',
+            prop: 'useDeptName',
             search: false,
             sortable: true,
             disabled: true,
@@ -429,14 +430,14 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入角色名称',
+                message: '请输入使用部门',
                 trigger: 'blur',
               },
             ],
           },
           {
             label: '需求数量',
-            prop: 'poQty',
+            prop: 'ypQty',
             search: false,
             sortable: true,
             width: 120,
@@ -464,7 +465,7 @@ export default {
             rules: [
               {
                 required: false,
-                message: '请输入角色名称',
+                message: '请输入面积(d㎡)',
                 trigger: 'blur',
               },
             ],
@@ -483,14 +484,14 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入角色名称',
+                message: '请输入需求交期',
                 trigger: 'blur',
               },
             ],
           },
           {
             label: '计划员',
-            prop: 'planUser',
+            prop: 'planUserName',
             search: false,
             sortable: true,
             width: 120,
@@ -500,7 +501,7 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入角色名称',
+                message: '请输入计划员',
                 trigger: 'blur',
               },
             ],
@@ -519,14 +520,14 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入角色名称',
+                message: '请输入计划下达时间',
                 trigger: 'blur',
               },
             ],
           },
           {
             label: '返工单号',
-            prop: 'returnWorkOrderNo',
+            prop: 'reworkCode',
             search: true,
             sortable: true,
             width: 120,
@@ -536,7 +537,7 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入原生产单号',
+                message: '请输入返工单号',
                 trigger: 'blur',
               },
             ],
@@ -560,7 +561,7 @@ export default {
           },
           {
             label: '订单状态',
-            prop: 'curStatusText',
+            prop: 'status',
             search: true,
             sortable: true,
             span: 12,
@@ -571,23 +572,39 @@ export default {
             align: 'center',
             dicData: [
               {
-                value: 1,
-                label: '已下发',
+                value: 10000,
+                label: '已同步',
               },
               {
-                value: 2,
-                label: '未下发',
+                value: 10001,
+                label: '订单异常',
               },
               {
-                value: 5,
+                value: 10002,
+                label: '未下达',
+              },
+              {
+                value: 10003,
+                label: '待排产',
+              },
+              {
+                value: 10004,
+                label: '待生产',
+              },
+              {
+                value: 10005,
                 label: '加工中',
               },
               {
-                value: 15,
+                value: 10006,
+                label: '排产异常',
+              },
+              {
+                value: 10015,
                 label: '已完工',
               },
               {
-                value: 21,
+                value: 10021,
                 label: '已关闭',
               },
             ],
@@ -605,7 +622,7 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入角色名称',
+                message: '请输入备注',
                 trigger: 'blur',
               },
             ],
diff --git a/src/views/orderManagement/plannedOrder.vue b/src/views/orderManagement/plannedOrder.vue
index 94ae327..02acdd4 100644
--- a/src/views/orderManagement/plannedOrder.vue
+++ b/src/views/orderManagement/plannedOrder.vue
@@ -172,7 +172,7 @@ export default {
         editBtnText: '修改',
         labelWidth: 120,
         // searchLabelWidth: 120,
-        menuWidth: 150,
+        menuWidth: 120,
         dialogWidth: 900,
         dialogClickModal: false,
         searchEnter: true,
@@ -262,7 +262,7 @@ export default {
             rules: [
               {
                 required: false,
-                message: '请输入角色名称',
+                message: '请输入产品名称',
                 trigger: 'blur',
               },
             ],
@@ -279,7 +279,7 @@ export default {
             rules: [
               {
                 required: false,
-                message: '请输入角色名称',
+                message: '请输入镀种',
                 trigger: 'blur',
               },
             ],
@@ -297,7 +297,7 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入角色名称',
+                message: '请输入镀种小类',
                 trigger: 'blur',
               },
             ],
@@ -314,7 +314,7 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入角色名称',
+                message: '请输入生产标识',
                 trigger: 'blur',
               },
             ],
@@ -332,7 +332,7 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入角色名称',
+                message: '请输入使用部门',
                 trigger: 'blur',
               },
             ],
@@ -349,7 +349,7 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入角色名称',
+                message: '请输入生产数量',
                 trigger: 'blur',
               },
             ],
@@ -367,7 +367,7 @@ export default {
             rules: [
               {
                 required: false,
-                message: '请输入角色名称',
+                message: '请输入面积(d㎡)',
                 trigger: 'blur',
               },
             ],
@@ -386,14 +386,14 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入角色名称',
+                message: '请输入需求交期',
                 trigger: 'blur',
               },
             ],
           },
           {
             label: '计划员',
-            prop: 'planUser',
+            prop: 'planUserName',
             search: false,
             sortable: true,
             width: 120,
@@ -403,7 +403,7 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入角色名称',
+                message: '请输入计划员',
                 trigger: 'blur',
               },
             ],
@@ -422,7 +422,7 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入角色名称',
+                message: '请输入计划下达时间',
                 trigger: 'blur',
               },
             ],
@@ -447,7 +447,7 @@ export default {
           },
           {
             label: '产品系列',
-            prop: 'createName',
+            prop: 'productLine',
             search: false,
             sortable: true,
             hide: true,
@@ -489,23 +489,31 @@ export default {
             align: 'center',
             dicData: [
               {
-                value: 2,
+                value: 10001,
+                label: '正常',
+              },
+              {
+                value: 10002,
                 label: '已退回',
               },
               {
-                value: 4,
+                value: 10003,
+                label: '无工艺',
+              },
+              {
+                value: 10004,
                 label: '已派工',
               },
               {
-                value: 5,
+                value: 10005,
                 label: '加工中',
               },
               {
-                value: 15,
+                value: 10015,
                 label: '已完工',
               },
               {
-                value: 21,
+                value: 10021,
                 label: '已关闭',
               },
             ],
@@ -627,9 +635,14 @@ export default {
     batchClose() {
       // 检查是否选择了数据
       if (this.selectionList.length === 0) {
-        this.$message.warning('请选择至少一条数据');
+        this.$message.error('请选择至少一条数据');
         return;
       }
+      let tmp = this.selectionList.filter(item => item.status === 10015 || item.status === 10021)
+      if(tmp.length > 0){
+        this.$message.error('请勿选择状态为【已完工】或【已关闭】的数据');
+        return
+      }
       this.$confirm('确定将选择数据批量关闭?', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -638,12 +651,13 @@ export default {
         .then(() => {
           const ids = this.selectionList.map(item => item.id).join(',');
           closeBatchs({ ...{ ids }, ...this.approveForm }).then(res => {
-            if (res.code === 200) {
-              this.$message.success('审核成功');
+            if (res.data.code === 200) {
+              this.$message.success('关闭成功');
+              this.$refs.crud.toggleSelection();
+              this.onLoad(this.page); // return remove(row.id);
             }
           });
-          this.$refs.crud.toggleSelection();
-          this.onLoad(this.page); // return remove(row.id);
+          
         })
         .catch(() => {
           // this.onLoad(this.page);
@@ -869,6 +883,7 @@ export default {
         const res = await getHotList({
           current:this.page.currentPage,
           size:this.page.pageSize,
+          ...this.query
         })
         this.data = res.data.data.records;
         this.page.total = res.data.data.total;
diff --git a/src/views/orderManagement/sinTerPlanOrder.vue b/src/views/orderManagement/sinTerPlanOrder.vue
index d59d060..4fb2a47 100644
--- a/src/views/orderManagement/sinTerPlanOrder.vue
+++ b/src/views/orderManagement/sinTerPlanOrder.vue
@@ -157,7 +157,7 @@ export default {
         editBtnText: '修改',
         labelWidth: 120,
         // searchLabelWidth: 120,
-        menuWidth: 150,
+        menuWidth: 120,
         dialogWidth: 900,
         dialogClickModal: false,
         searchEnter: true,
@@ -210,7 +210,7 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入角色名称',
+                message: '请输入计划单号',
                 trigger: 'blur',
               },
             ],
@@ -228,7 +228,7 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入角色名称',
+                message: '请输入零件号',
                 trigger: 'blur',
               },
             ],
@@ -246,7 +246,7 @@ export default {
             rules: [
               {
                 required: false,
-                message: '请输入角色名称',
+                message: '请输入产品型号',
                 trigger: 'blur',
               },
             ],
@@ -264,7 +264,7 @@ export default {
             rules: [
               {
                 required: false,
-                message: '请输入角色名称',
+                message: '请输入产品名称',
                 trigger: 'blur',
               },
             ],
@@ -281,7 +281,7 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入角色名称',
+                message: '请输入生产标识',
                 trigger: 'blur',
               },
             ],
@@ -299,7 +299,7 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入角色名称',
+                message: '请输入使用部门',
                 trigger: 'blur',
               },
             ],
@@ -316,7 +316,7 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入角色名称',
+                message: '请输入生产数量',
                 trigger: 'blur',
               },
             ],
@@ -370,7 +370,7 @@ export default {
             rules: [
               {
                 required: false,
-                message: '请输入角色名称',
+                message: '请输入面积(d㎡)',
                 trigger: 'blur',
               },
             ],
@@ -389,7 +389,7 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入角色名称',
+                message: '请输入需求交期',
                 trigger: 'blur',
               },
             ],
@@ -407,7 +407,7 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入角色名称',
+                message: '请输入备注',
                 trigger: 'blur',
               },
             ],
@@ -415,7 +415,7 @@ export default {
 
           {
             label: '计划员',
-            prop: 'planUser',
+            prop: 'planUserName',
             search: false,
             sortable: true,
             width: 120,
@@ -425,7 +425,7 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入角色名称',
+                message: '请输入计划员',
                 trigger: 'blur',
               },
             ],
@@ -445,14 +445,14 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入角色名称',
+                message: '请输入计划下达时间',
                 trigger: 'blur',
               },
             ],
           },
           {
             label: '订单状态',
-            prop: 'curStatusText',
+            prop: 'status',
             search: true,
             sortable: true,
             span: 12,
@@ -463,23 +463,31 @@ export default {
             align: 'center',
             dicData: [
               {
-                value: 2,
+                value: 10001,
+                label: '正常',
+              },
+              {
+                value: 10002,
                 label: '已退回',
               },
               {
-                value: 4,
+                value: 10003,
+                label: '无工艺',
+              },
+              {
+                value: 10004,
                 label: '已派工',
               },
               {
-                value: 5,
+                value: 10005,
                 label: '加工中',
               },
               {
-                value: 15,
+                value: 10015,
                 label: '已完工',
               },
               {
-                value: 21,
+                value: 10021,
                 label: '已关闭',
               },
             ],
@@ -581,9 +589,14 @@ export default {
     batchClose() {
       // 检查是否选择了数据
       if (this.selectionList.length === 0) {
-        this.$message.warning('请选择至少一条数据');
+        this.$message.error('请选择至少一条数据');
         return;
       }
+      let tmp = this.selectionList.filter(item => item.status === 10015 || item.status === 10021)
+      if(tmp.length > 0){
+        this.$message.error('请勿选择状态为【已完工】或【已关闭】的数据');
+        return
+      }
       this.$confirm('确定将选择数据批量关闭?', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
@@ -592,12 +605,13 @@ export default {
         .then(() => {
           const ids = this.selectionList.map(item => item.id).join(',');
           closeBatchs({ ...{ ids }, ...this.approveForm }).then(res => {
-            if (res.code === 200) {
-              this.$message.success('审核成功');
+            if (res.data.code === 200) {
+              this.$message.success('关闭成功');
+              this.$refs.crud.toggleSelection();
+              this.onLoad(this.page); // return remove(row.id);
             }
           });
-          this.$refs.crud.toggleSelection();
-          this.onLoad(this.page); // return remove(row.id);
+          
         })
         .catch(() => {
           // this.onLoad(this.page);
@@ -822,7 +836,8 @@ export default {
       try {
         const res = await getShootList({
           current:this.page.currentPage,
-          size:this.page.pageSize
+          size:this.page.pageSize,
+          ...this.query
         })
         this.data = res.data.data.records;
         this.page.total = res.data.data.total;
diff --git a/src/views/orderManagement/sinTerYieIdOrder.vue b/src/views/orderManagement/sinTerYieIdOrder.vue
index a237363..57b2717 100644
--- a/src/views/orderManagement/sinTerYieIdOrder.vue
+++ b/src/views/orderManagement/sinTerYieIdOrder.vue
@@ -85,6 +85,7 @@
     <orderUpdateDailog
       :showDialog="isUpdateOpen"
       v-if="isUpdateOpen"
+      type="sintering"
       @closeDialog="closeDialog"
       :id="id"
     >
@@ -248,14 +249,14 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入角色名称',
+                message: '请输入计划单号',
                 trigger: 'blur',
               },
             ],
           },
           {
             label: '生产单号',
-            prop: 'ypCode',
+            prop: 'yoCode',
             search: true,
             sortable: true,
             width: 150,
@@ -265,7 +266,7 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入角色名称',
+                message: '请输入生产单号',
                 trigger: 'blur',
               },
             ],
@@ -283,14 +284,14 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入角色名称',
+                message: '请输入零件号',
                 trigger: 'blur',
               },
             ],
           },
           {
             label: '批次号',
-            prop: 'str2',
+            prop: 'batchNo',
             search: true,
             sortable: true,
             width: 150,
@@ -300,7 +301,7 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入角色名称',
+                message: '请输入批次号',
                 trigger: 'blur',
               },
             ],
@@ -319,7 +320,7 @@ export default {
             rules: [
               {
                 required: false,
-                message: '请输入角色名称',
+                message: '请输入产品型号',
                 trigger: 'blur',
               },
             ],
@@ -337,7 +338,7 @@ export default {
             rules: [
               {
                 required: false,
-                message: '请输入角色名称',
+                message: '请输入产品名称',
                 trigger: 'blur',
               },
             ],
@@ -354,14 +355,14 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入角色名称',
+                message: '请输入流程卡号',
                 trigger: 'blur',
               },
             ],
           },
           {
             label: '流转编号',
-            prop: 'poCode4',
+            prop: 'roamNo',
             search: true,
             sortable: true,
             width: 150,
@@ -371,14 +372,14 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入角色名称',
+                message: '请输入流转编号',
                 trigger: 'blur',
               },
             ],
           },
           {
             label: '订单优先级',
-            prop: 'priorityAps',
+            prop: 'priorityErp',
             search: false,
             sortable: true,
             width: 150,
@@ -395,7 +396,7 @@ export default {
           },
           {
             label: '订单类型',
-            prop: 'orderType',
+            prop: 'yieldType',
             search: true,
             sortable: true,
             disabled: true,
@@ -429,7 +430,7 @@ export default {
             rules: [
               {
                 required: false,
-                message: '请输入订单类型',
+                message: '请选择订单类型',
                 trigger: 'blur',
               },
             ],
@@ -446,7 +447,7 @@ export default {
             rules: [
               {
                 required: false,
-                message: '请输入角色名称',
+                message: '请输入镀种',
                 trigger: 'blur',
               },
             ],
@@ -463,14 +464,14 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入角色名称',
+                message: '请输入生产标识',
                 trigger: 'blur',
               },
             ],
           },
           {
             label: '使用部门',
-            prop: 'useDept',
+            prop: 'useDeptName',
             search: false,
             sortable: true,
             disabled: true,
@@ -481,7 +482,7 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入角色名称',
+                message: '请输入使用部门',
                 trigger: 'blur',
               },
             ],
@@ -498,14 +499,14 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入角色名称',
+                message: '请输入需求数量',
                 trigger: 'blur',
               },
             ],
           },
           {
             label: '面积(d㎡)',
-            prop: 'poArea',
+            prop: 'ypArea',
             search: false,
             sortable: true,
             width: 120,
@@ -516,7 +517,7 @@ export default {
             rules: [
               {
                 required: false,
-                message: '请输入角色名称',
+                message: '请输入面积(d㎡)',
                 trigger: 'blur',
               },
             ],
@@ -535,14 +536,14 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入角色名称',
+                message: '请输入需求交期',
                 trigger: 'blur',
               },
             ],
           },
           {
             label: '计划员',
-            prop: 'planUser',
+            prop: 'planUserName',
             search: false,
             sortable: true,
             width: 120,
@@ -552,7 +553,7 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入角色名称',
+                message: '请输入计划员',
                 trigger: 'blur',
               },
             ],
@@ -571,14 +572,14 @@ export default {
             rules: [
               {
                 required: true,
-                message: '请输入角色名称',
+                message: '请输入计划下达时间',
                 trigger: 'blur',
               },
             ],
           },
           {
             label: '返工单号',
-            prop: 'returnWorkOrderNo',
+            prop: 'reworkCode',
             search: true,
             sortable: true,
             width: 120,
@@ -642,7 +643,7 @@ export default {
           },
           {
             label: '订单状态',
-            prop: 'curStatusText',
+            prop: 'status',
             search: true,
             sortable: true,
             span: 12,
@@ -653,23 +654,39 @@ export default {
             align: 'center',
             dicData: [
               {
-                value: 2,
-                label: '已退回',
+                value: 10000,
+                label: '已同步',
               },
               {
-                value: 4,
-                label: '已派工',
+                value: 10001,
+                label: '订单异常',
+              },
+              {
+                value: 10002,
+                label: '未下达',
               },
               {
-                value: 5,
+                value: 10003,
+                label: '待排产',
+              },
+              {
+                value: 10004,
+                label: '待生产',
+              },
+              {
+                value: 10005,
                 label: '加工中',
               },
               {
-                value: 15,
+                value: 10006,
+                label: '排产异常',
+              },
+              {
+                value: 10015,
                 label: '已完工',
               },
               {
-                value: 21,
+                value: 10021,
                 label: '已关闭',
               },
             ],
diff --git a/src/views/productionTesting/components/sametankView.vue b/src/views/productionTesting/components/sametankView.vue
index 08ef5c1..937f48a 100644
--- a/src/views/productionTesting/components/sametankView.vue
+++ b/src/views/productionTesting/components/sametankView.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog title="查看" append-to-body :modelValue="openShow" width="70%" @close="closeDialog">
+  <el-dialog title="查看" append-to-body :modelValue="openShow" width="80%" @close="closeDialog">
     <div style="display: flex; align-items: center; justify-content: space-between">
       <el-descriptions title="订单信息" :column="5" border style="width: 100%" :label-width="110">
         <el-descriptions-item label="车间订单号" class="fixed-width-item">{{
@@ -51,15 +51,15 @@
         </el-col>
       </el-row>
     </el-form>
+    <!-- :row-class-name="getRowClass"
+      row-key="id"
+      :expand-row-keys="expandedRowKeys"
+      @expand-change="handleExpandChange" -->
     <el-table
       :data="vxeTableData"
       show-overflow-tooltip
-      :row-class-name="getRowClass"
-      row-key="id"
-      :expand-row-keys="expandedRowKeys"
-      @expand-change="handleExpandChange"
     >
-      <el-table-column type="expand">
+      <!-- <el-table-column type="expand">
         <template #default="scope">
           <el-table
             :data="scope.row.wpItemDetailList"
@@ -167,7 +167,7 @@
             </el-table-column>
           </el-table>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column
         label="项目编号"
         prop="code"
@@ -176,7 +176,7 @@
       >
         <template #default="scope"> {{scope.row.item.code}} </template>
       </el-table-column>
-      <el-table-column label="项目" prop="name" align="center">
+      <el-table-column label="项目" prop="name" align="center" width="120">
           <template #default="scope"> {{scope.row.item.name}} </template>
       </el-table-column>
       <el-table-column label="检验类型" prop="itemType" align="center">
diff --git a/src/views/productionTesting/productionQuality.vue b/src/views/productionTesting/productionQuality.vue
index b7fbaed..c175eff 100644
--- a/src/views/productionTesting/productionQuality.vue
+++ b/src/views/productionTesting/productionQuality.vue
@@ -1132,23 +1132,45 @@ export default {
         cancelButtonText: '取消',
         type: 'warning',
       }).then(() => {
-        applySameLot({
-          sourceId:row.id,
-          targetId:this.detailInfo.id
-        }).then(res =>{
-          if(res.data.code == 200){
-            getInspectionDetail({id:this.checkedId}).then(res =>{
-              this.detailInfo = res.data.data
-              this.dialogData = {
-                ...res.data.data.orderInfo,
-                ppsName:res.data.data.processName
-              };
-              console.log('pps------------------',this.dialogData)
-              this.remindMsgList = res.data.data.remindMsgList;
-              this.vxeTableData = res.data.data.wpItemList;
-            })
-          }
+        getInspectionDetail({
+        id:row.id,
+      }).then(res => {
+        console.log('res----------------', res);
+        res.data.data.wpItemList.map(item =>{
+          this.vxeTableData.map(item1 =>{
+            if(item.item.name == item1.item.name){
+              if(item.item.specialType != '1' && item.item.specialType != '2' && item.item.specialType != '3'){
+                item1.checkValue = item.checkValue
+              }
+              item1.testQty = item.testQty
+              item1.lossQty = item.lossQty
+              item1.checkQty = item.checkQty
+              item1.checkResult = item.checkResult
+            }
+          })
         })
+        // this.dialogData = res.data.data.orderInfo;
+        // this.remindMsgList = res.data.data.remindMsgList;
+        // this.vxeTableData = res.data.data.wpItemList;
+        // console.log('this.vxeTableData', this.vxeTableData);
+      });
+        // applySameLot({
+        //   sourceId:row.id,
+        //   targetId:this.detailInfo.id
+        // }).then(res =>{
+        //   if(res.data.code == 200){
+        //     getInspectionDetail({id:this.checkedId}).then(res =>{
+        //       this.detailInfo = res.data.data
+        //       this.dialogData = {
+        //         ...res.data.data.orderInfo,
+        //         ppsName:res.data.data.processName
+        //       };
+        //       console.log('pps------------------',this.dialogData)
+        //       this.remindMsgList = res.data.data.remindMsgList;
+        //       this.vxeTableData = res.data.data.wpItemList;
+        //     })
+        //   }
+        // })
       });
     },
     // 点击查看按钮