diff --git a/src/views/productionManagement/blbWorkOrder/components/glass.vue b/src/views/productionManagement/blbWorkOrder/components/glass.vue
index 7427fc6..e74e800 100644
--- a/src/views/productionManagement/blbWorkOrder/components/glass.vue
+++ b/src/views/productionManagement/blbWorkOrder/components/glass.vue
@@ -1,5 +1,5 @@
 <template>
-  <basic-container>
+  <div>
     <!--玻璃饼-->
     <avue-crud
       :option="option"
@@ -22,10 +22,11 @@
         <el-button type="primary" @click="priorityFn">优先级调整</el-button>
       </template>
       <template #menu-right>
-        <el-button type="success" plain @click="processingHandle">在制品</el-button>
-        <el-button type="warning" plain>加工中</el-button>
-        <el-button type="danger" plain>检验中</el-button>
-        <el-button type="success" plain>已完工</el-button>
+         <el-button type="success" plain @click="queryOrdersHandle('3,4,5,6')">在制品</el-button>
+        <el-button type="warning" plain @click="queryOrdersHandle('3')">加工中</el-button>
+        <el-button type="danger" plain @click="queryOrdersHandle('4')">检验中</el-button>
+        <el-button type="success" plain @click="queryOrdersHandle('15')">已完工</el-button>
+        <el-button type="primary" @click="queryOrdersHandle('')">全部</el-button>
       </template>
       <template #menu="scope">
         <el-button type="text" @click="clickProduction(scope.row)">生产监控</el-button>
@@ -46,36 +47,6 @@
           >异常申报</el-button
         >
       </template>
-      <template #tsName="{ row }">{{ row.makeTeam && row.makeTeam.tsName }}</template>
-      <template #ppsName="{ row }">{{ row.procedureSet && row.procedureSet.ppsName }}</template>
-      <template #planTime1="{ row }">
-        {{ Array.isArray(row.planTime1) ? row.planTime1.join(' ~ ') : row.planTime1 || '-' }}
-      </template>
-      <template #planTime="{ row }">
-        {{ Array.isArray(row.planTime) ? row.planTime.join(' ~ ') : row.planTime || '-' }}
-      </template>
-      <template #putStoreTime="{ row }">
-        {{
-          Array.isArray(row.putStoreTime) ? row.putStoreTime.join(' ~ ') : row.putStoreTime || '-'
-        }}
-      </template>
-      <template #partCode="{ row }">{{ row.pjYieldOrder && row.pjYieldOrder.partCode }}</template>
-      <template #prodIdent="{ row }">{{ row.pjYieldOrder && row.pjYieldOrder.prodIdent }}</template>
-      <template #partName="{ row }">{{ row.pjYieldOrder && row.pjYieldOrder.partName }}</template>
-      <template #plate="{ row }">{{ row.pjYieldOrder && row.pjYieldOrder.plate }}</template>
-      <template #productType="{ row }">{{
-        row.pjYieldOrder && row.pjYieldOrder.productType
-      }}</template>
-      <template #useDept="{ row }">{{ row.pjYieldOrder && row.pjYieldOrder.useDept }}</template>
-      <template #poArea="{ row }">{{ row.pjYieldOrder && row.pjYieldOrder.poArea }}</template>
-      <template #userName="{ row }">{{ row.dispatcher && row.dispatcher.userName }}</template>
-      <template #nextPpsName="{ row }">{{
-        row.nextProcedureSet && row.nextProcedureSet.ppsName
-      }}</template>
-      <template #nextTeamName="{ row }">{{ row.nextMakeTeam && row.nextMakeTeam.tsName }}</template>
-      <template #failureMan="{ row }">{{
-        row.pjYieldOrder && row.pjYieldOrder.failureMan && row.pjYieldOrder.failureMan.userName
-      }}</template>
     </avue-crud>
     <el-dialog append-to-body v-model="printDialog" title="打印标签">
       <el-form ref="printForm" :model="printForm" :rules="printRules">
@@ -112,7 +83,7 @@
       @closeDialog="closeDialog"
       @submitPriority="handlePrioritySubmit"
     ></productionMonitoringDialog>
-  </basic-container>
+  </div>
 </template>
 
 <script>
@@ -201,8 +172,9 @@ export default {
         align: 'center',
         column: [
           {
+
             label: '当前工序',
-            prop: 'ppsName',
+            prop: 'wpId',
             fixed: 'left',
             search: false,
             sortable: true,
@@ -211,7 +183,7 @@ export default {
           },
           {
             label: '下一工序',
-            prop: 'nextPpsName',
+            prop: 'ppsNameNext',
             search: false,
             sortable: true,
             overHidden: true,
@@ -225,50 +197,11 @@ export default {
             sortable: true,
             overHidden: true,
             width: 200,
-
-            dicData: [
-              {
-                value: 2,
-                label: '待生产',
-              },
-              {
-                value: 3,
-                label: '生产中',
-              },
-              {
-                value: 4,
-                label: '检验中',
-              },
-              {
-                value: 6,
-                label: '审理中',
-              },
-              {
-                value: 5,
-                label: '工艺变更',
-              },
-              {
-                value: 19,
-                label: '已返工',
-              },
-              {
-                value: 15,
-                label: '已完成',
-              },
-              {
-                value: 21,
-                label: '已作废',
-              },
-            ],
-          },
-          {
-            label: '领料状态',
-            prop: 'llStatus',
-            search: true,
-            sortable: true,
-            overHidden: true,
-            width: 200,
-            hide: true,
+            dicUrl: '/blade-system/dict/dictionary?code=order_status',
+            props: {
+              label: 'dictValue',
+              value: 'dictKey',
+            },
           },
           {
             label: '车间订单号',
@@ -278,7 +211,6 @@ export default {
             overHidden: true,
             width: 200,
           },
-
           {
             label: '加工班组',
             prop: 'tsId',
@@ -306,25 +238,25 @@ export default {
             width: 200,
           },
           {
-            label: '烧结生产订单号',
-            prop: 'sjCode',
-            search: false,
+            label: '计划单号',
+            prop: 'poCode',
+            search: true,
             sortable: true,
             overHidden: true,
             width: 200,
           },
           {
-            label: '零件号',
-            prop: 'partCode',
-            search: true,
+            label: '返工单号',
+            prop: 'qcReworkCode',
+            search: false,
             sortable: true,
             overHidden: true,
             width: 200,
           },
           {
-            label: '烧结零件号',
-            prop: 'sjPartCode',
-            search: false,
+            label: '零件号',
+            prop: 'partCode',
+            search: true,
             sortable: true,
             overHidden: true,
             width: 200,
@@ -347,7 +279,7 @@ export default {
           },
           {
             label: '产品名称',
-            prop: 'str3',
+            prop: 'false',
             search: false,
             sortable: true,
             overHidden: true,
@@ -365,7 +297,7 @@ export default {
 
           {
             label: 'MES流程卡号',
-            prop: 'str4',
+            prop: 'mesCardNo',
             search: false,
             sortable: true,
             overHidden: true,
@@ -373,7 +305,7 @@ export default {
           },
           {
             label: '生产标识',
-            prop: 'prodIdent',
+            prop: 'productIdent',
             search: false,
             sortable: true,
             overHidden: true,
@@ -388,95 +320,42 @@ export default {
             width: 200,
           },
           {
-            label: '面积(dm²)',
-            prop: 'poArea',
-            search: false,
-            sortable: true,
-            overHidden: true,
-            width: 200,
-          },
-          {
-            label: '单批次面积',
-            prop: 'batchArea',
-            search: false,
-            sortable: true,
-            overHidden: true,
-            width: 200,
-          },
-          {
-            label: '是否印字',
-            prop: 'str1',
-            search: false,
-            sortable: true,
-            overHidden: true,
-            width: 200,
+            label: '订单优先级',
+            prop: 'priority',
             type: 'select',
-            dicData: [
-              {
-                label: '是',
-                value: '1',
-              },
-              {
-                label: '否',
-                value: '0',
-              },
-            ],
-          },
-          {
-            label: '粉重',
-            prop: 'fenzhong',
-            search: false,
+            search: true,
             sortable: true,
             overHidden: true,
             width: 200,
+            dicUrl: '/blade-system/dict/dictionary?code=orderPriority',
+            props: {
+              label: 'dictValue',
+              value: 'dictKey',
+            },
           },
           {
-            label: '材料号',
-            prop: 'materialNo',
-            search: false,
+            label: '需求部门',
+            prop: 'useDept',
+            search: true,
             sortable: true,
             overHidden: true,
             width: 200,
           },
           {
-            label: '成型厚度',
-            prop: 'formingThickness',
+            label: '需求交期',
+            prop: 'demandDate',
             search: false,
             sortable: true,
             overHidden: true,
             width: 200,
           },
           {
-            label: '订单优先级',
-            prop: 'priorityTitle',
-            type: 'select',
-            search: true,
+            label: '会议要求周期',
+            prop: 'meetCycle',
+            search: false,
             sortable: true,
             overHidden: true,
             width: 200,
-
-            dicData: [
-              {
-                value: 1,
-                label: '正常-白色',
-              },
-              {
-                value: 2,
-                label: '项目要求日期急件-橙色',
-              },
-              {
-                value: 3,
-                label: '合同急件-黄色',
-              },
-              {
-                value: 4,
-                label: '绩效零件-青色',
-              },
-              {
-                value: 5,
-                label: '调度标注急件-蓝色',
-              },
-            ],
           },
           {
             label: '调度员',
@@ -486,15 +365,7 @@ export default {
             overHidden: true,
             width: 200,
           },
-          {
-            label: '需求部门',
-            prop: 'str2',
-            search: true,
-            sortable: true,
-            overHidden: true,
-            hide: true,
-            width: 200,
-          },
+
           {
             label: '计划下达时间',
             prop: 'planTime',
@@ -561,7 +432,7 @@ export default {
           },
           {
             label: '试验数量',
-            prop: 'testQuantity',
+            prop: 'testQty',
             search: false,
             sortable: true,
             overHidden: true,
@@ -569,7 +440,7 @@ export default {
           },
           {
             label: '报废数量',
-            prop: 'scrapQuantity',
+            prop: 'scrapQty',
             search: false,
             sortable: true,
             overHidden: true,
@@ -589,6 +460,14 @@ export default {
   },
   mounted() {},
   methods: {
+    
+    //查询【生产中3、工艺变更5、检验中4、审理中6】状态的订单
+    queryOrdersHandle(status) {
+      this.query = {
+        runStatus: status,
+      };
+      this.onLoad(this.page, this.query);
+    },
     // 优先级调整
     priorityFn(row) {
       this.rowItem = row;
@@ -685,10 +564,14 @@ export default {
       this.$refs.crud.toggleSelection();
     },
     onLoad(page, params = {}) {
-      // this.loading = true;
-      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+      this.loading = true;
+      getList(
+        page.currentPage,
+        page.pageSize,
+        Object.assign(params, this.query, { yieldType: '3' })
+      ).then(res => {
         this.data = res.data.data.records;
-        // this.loading = false;
+        this.loading = false;
         this.page.total = res.data.data.total;
         this.selectionClear();
       });
diff --git a/src/views/productionManagement/blbWorkOrder/components/others.vue b/src/views/productionManagement/blbWorkOrder/components/others.vue
index d55d6f1..c678e42 100644
--- a/src/views/productionManagement/blbWorkOrder/components/others.vue
+++ b/src/views/productionManagement/blbWorkOrder/components/others.vue
@@ -1,5 +1,5 @@
 <template>
-  <basic-container>
+  <div>
     <!--玻璃饼-->
     <avue-crud
       :option="option"
@@ -22,10 +22,11 @@
         <el-button type="primary" @click="priorityFn">优先级调整</el-button>
       </template>
       <template #menu-right>
-        <el-button type="success" plain @click="queryOrdersHandle">在制品</el-button>
-        <el-button type="warning" plain>加工中</el-button>
-        <el-button type="danger" plain>检验中</el-button>
-        <el-button type="success" plain>已完工</el-button>
+        <el-button type="success" plain @click="queryOrdersHandle('3,4,5,6')">在制品</el-button>
+        <el-button type="warning" plain @click="queryOrdersHandle('3')">加工中</el-button>
+        <el-button type="danger" plain @click="queryOrdersHandle('4')">检验中</el-button>
+        <el-button type="success" plain @click="queryOrdersHandle('15')">已完工</el-button>
+        <el-button type="primary" @click="queryOrdersHandle('')">全部</el-button>
       </template>
       <template #menu="scope">
         <el-button type="text" @click="clickProduction(scope.row)">生产监控</el-button>
@@ -114,7 +115,7 @@
       @closeDialog="closeDialog"
       @submitPriority="handlePrioritySubmit"
     ></productionMonitoringDialog>
-  </basic-container>
+  </div>
 </template>
 
 <script>
@@ -203,7 +204,7 @@ export default {
         column: [
           {
             label: '当前工序',
-            prop: 'ppsName',
+            prop: 'wpId',
             fixed: 'left',
             search: false,
             sortable: true,
@@ -212,7 +213,7 @@ export default {
           },
           {
             label: '下一工序',
-            prop: 'nextPpsName',
+            prop: 'ppsNameNext',
             search: false,
             sortable: true,
             overHidden: true,
@@ -226,50 +227,11 @@ export default {
             sortable: true,
             overHidden: true,
             width: 200,
-
-            dicData: [
-              {
-                value: 2,
-                label: '待生产',
-              },
-              {
-                value: 3,
-                label: '生产中',
-              },
-              {
-                value: 4,
-                label: '检验中',
-              },
-              {
-                value: 6,
-                label: '审理中',
-              },
-              {
-                value: 5,
-                label: '工艺变更',
-              },
-              {
-                value: 19,
-                label: '已返工',
-              },
-              {
-                value: 15,
-                label: '已完成',
-              },
-              {
-                value: 21,
-                label: '已作废',
-              },
-            ],
-          },
-          {
-            label: '领料状态',
-            prop: 'llStatus',
-            search: true,
-            sortable: true,
-            overHidden: true,
-            width: 200,
-            hide: true,
+            dicUrl: '/blade-system/dict/dictionary?code=order_status',
+            props: {
+              label: 'dictValue',
+              value: 'dictKey',
+            },
           },
           {
             label: '车间订单号',
@@ -307,15 +269,15 @@ export default {
           },
           {
             label: '计划单号',
-            prop: 'str1',
-            search: false,
+            prop: 'poCode',
+            search: true,
             sortable: true,
             overHidden: true,
             width: 200,
           },
           {
             label: '返工单号',
-            prop: 'str2',
+            prop: 'qcReworkCode',
             search: false,
             sortable: true,
             overHidden: true,
@@ -347,7 +309,7 @@ export default {
           },
           {
             label: '产品名称',
-            prop: 'str3',
+            prop: 'false',
             search: false,
             sortable: true,
             overHidden: true,
@@ -365,7 +327,7 @@ export default {
 
           {
             label: 'MES流程卡号',
-            prop: 'str4',
+            prop: 'mesCardNo',
             search: false,
             sortable: true,
             overHidden: true,
@@ -373,15 +335,7 @@ export default {
           },
           {
             label: '生产标识',
-            prop: 'prodIdent',
-            search: false,
-            sortable: true,
-            overHidden: true,
-            width: 200,
-          },
-          {
-            label: '镀种信息',
-            prop: 'str',
+            prop: 'productIdent',
             search: false,
             sortable: true,
             overHidden: true,
@@ -395,59 +349,31 @@ export default {
             overHidden: true,
             width: 200,
           },
-          {
-            label: '面积(dm²)',
-            prop: 'poArea',
-            search: false,
-            sortable: true,
-            overHidden: true,
-            width: 200,
-          },
-          {
-            label: '单批次面积',
-            prop: 'batchArea',
-            search: false,
-            sortable: true,
-            overHidden: true,
-            width: 200,
-          },
           {
             label: '订单优先级',
-            prop: 'priorityTitle',
+            prop: 'priority',
             type: 'select',
             search: true,
             sortable: true,
             overHidden: true,
             width: 200,
-
-            dicData: [
-              {
-                value: 1,
-                label: '一级(ERP优先级)',
-              },
-              {
-                value: 2,
-                label: '二级',
-              },
-              {
-                value: 3,
-                label: '三级',
-              },
-            ],
+            dicUrl: '/blade-system/dict/dictionary?code=orderPriority',
+            props: {
+              label: 'dictValue',
+              value: 'dictKey',
+            },
           },
-
           {
             label: '需求部门',
-            prop: 'str0',
+            prop: 'useDept',
             search: true,
             sortable: true,
             overHidden: true,
-            hide: true,
             width: 200,
           },
           {
             label: '需求交期',
-            prop: 'str5',
+            prop: 'demandDate',
             search: false,
             sortable: true,
             overHidden: true,
@@ -455,7 +381,7 @@ export default {
           },
           {
             label: '会议要求周期',
-            prop: 'str6',
+            prop: 'meetCycle',
             search: false,
             sortable: true,
             overHidden: true,
@@ -469,6 +395,7 @@ export default {
             overHidden: true,
             width: 200,
           },
+
           {
             label: '计划下达时间',
             prop: 'planTime',
@@ -480,8 +407,8 @@ export default {
             width: 200,
             searchSpan: 8,
             type: 'datetimerange',
-            format: 'YYYY-MM-DD  HH:mm:ss',
-            valueFormat: 'YYYY-MM-DD  HH:mm:ss',
+            format: 'YYYY-MM-DD HH:mm:ss',
+            valueFormat: 'YYYY-MM-DD HH:mm:ss',
             startPlaceholder: '开始日期',
             endPlaceholder: '结束日期',
             rangeSeparator: '-',
@@ -510,8 +437,8 @@ export default {
             searchSpan: 8,
             width: 200,
             type: 'datetimerange',
-            format: 'YYYY-MM-DD  HH:mm:ss',
-            valueFormat: 'YYYY-MM-DD  HH:mm:ss',
+            format: 'YYYY-MM-DD HH:mm:ss',
+            valueFormat: 'YYYY-MM-DD HH:mm:ss',
             startPlaceholder: '开始日期',
             endPlaceholder: '结束日期',
             rangeSeparator: '-',
@@ -535,7 +462,7 @@ export default {
           },
           {
             label: '试验数量',
-            prop: 'testQuantity',
+            prop: 'testQty',
             search: false,
             sortable: true,
             overHidden: true,
@@ -543,7 +470,7 @@ export default {
           },
           {
             label: '报废数量',
-            prop: 'scrapQuantity',
+            prop: 'scrapQty',
             search: false,
             sortable: true,
             overHidden: true,
@@ -563,6 +490,13 @@ export default {
   },
   mounted() {},
   methods: {
+    //查询【生产中3、工艺变更5、检验中4、审理中6】状态的订单
+    queryOrdersHandle(status) {
+      this.query = {
+        runStatus: status,
+      };
+      this.onLoad(this.page, this.query);
+    },
     // 优先级调整
     priorityFn(row) {
       this.rowItem = row;
@@ -659,10 +593,14 @@ export default {
       this.$refs.crud.toggleSelection();
     },
     onLoad(page, params = {}) {
-      // this.loading = true;
-      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+      this.loading = true;
+      getList(
+        page.currentPage,
+        page.pageSize,
+        Object.assign(params, this.query, { yieldType: '4,5,6' })
+      ).then(res => {
         this.data = res.data.data.records;
-        // this.loading = false;
+        this.loading = false;
         this.page.total = res.data.data.total;
         this.selectionClear();
       });
diff --git a/src/views/productionManagement/frontTooling.vue b/src/views/productionManagement/frontTooling.vue
index 29b1f1e..2d3394c 100644
--- a/src/views/productionManagement/frontTooling.vue
+++ b/src/views/productionManagement/frontTooling.vue
@@ -282,27 +282,11 @@ searchMenuPosition:'right',
                                 trigger: 'blur',
                             },
                         ],
-                        dicData: [
-                            {
-                                value: 1,
-                                label: '正常-白色'
-                            }, {
-                                value: 2,
-                                label: '项目要求日期急件-橙色'
-                            },
-                            {
-                                value: 3,
-                                label: '合同急件-黄色'
-                            },
-                            {
-                                value: 4,
-                                label: '绩效零件-青色'
-                            },
-                            {
-                                value: 5,
-                                label: '调度标注急件-蓝色'
-                            }
-                        ]
+                        dicUrl: '/blade-system/dict/dictionary?code=orderPriority',
+            props: {
+              label: 'dictValue',
+              value: 'dictKey',
+            },
                     },
                     {
                         label: '计划下达时间',
diff --git a/src/views/productionManagement/productionMonitoring.vue b/src/views/productionManagement/productionMonitoring.vue
index 6d8ad27..d480754 100644
--- a/src/views/productionManagement/productionMonitoring.vue
+++ b/src/views/productionManagement/productionMonitoring.vue
@@ -27,12 +27,11 @@
       </template>
 
       <template #menu-right>
-        <el-button type="success" plain @click="queryOrdersHandle">在制品</el-button>
-        <el-button type="warning" plain>加工中</el-button>
-        <el-button type="danger" plain>检验中</el-button>
-        <!-- <el-button type="success">已下达</el-button> -->
-        <el-button type="success" plain>已完工</el-button>
-        <!-- <el-button type="primary">全部</el-button> -->
+        <el-button type="success" plain @click="queryOrdersHandle('3,4,5,6')">在制品</el-button>
+        <el-button type="warning" plain @click="queryOrdersHandle('3')">加工中</el-button>
+        <el-button type="danger" plain @click="queryOrdersHandle('4')">检验中</el-button>
+        <el-button type="success" plain @click="queryOrdersHandle('15')">已完工</el-button>
+        <el-button type="primary" @click="queryOrdersHandle('')">全部</el-button>
       </template>
 
       <template #menu="scope">
@@ -126,6 +125,7 @@
     <!-- 分批弹窗  -->
     <batches-dialog :show-batches="showBatches" @closeDialog="closeDialog"></batches-dialog>
     <!-- 关闭弹窗  -->
+
     <closed-dialog
       v-if="showClose"
       :show-close="showClose"
@@ -722,14 +722,13 @@ export default {
       }
     },
     //查询【生产中3、工艺变更5、检验中4、审理中6】状态的订单
-    queryOrdersHandle() {
-      const targetStatuses = [3, 5, 4, 6];
-      const filteredData = this.data.filter(item => targetStatuses.includes(item.runStatus));
-      const originalData = [...this.data];
-      this.data = filteredData;
-      
-      this.$message.success(`已筛选出${filteredData.length}条符合条件的订单`);
+    queryOrdersHandle(status) {
+      this.query = {
+        runStatus: status,
+      };
+      this.onLoad(this.page, this.query);
     },
+
     // 异常申报
     handleAbnormal() {
       this.showAbnormal = true;
@@ -776,14 +775,14 @@ export default {
       this.$refs.crud.toggleSelection();
     },
     onLoad(page, params = {}) {
-      // this.loading = true;
+      this.loading = true;
       getList(
         page.currentPage,
         page.pageSize,
-        Object.assign(params, this.query, { yieldType: 1 })
+        Object.assign(params, this.query, { yieldType: '1' })
       ).then(res => {
         this.data = res.data.data.records;
-        // this.loading = false;
+        this.loading = false;
         this.page.total = res.data.data.total;
         this.selectionClear();
       });
diff --git a/src/views/productionManagement/sinTerWorkOrder/index.vue b/src/views/productionManagement/sinTerWorkOrder/index.vue
index ccbe818..e54c7b1 100644
--- a/src/views/productionManagement/sinTerWorkOrder/index.vue
+++ b/src/views/productionManagement/sinTerWorkOrder/index.vue
@@ -21,13 +21,14 @@
         <el-button type="primary" @click="handlePrintTags">过程记录打印</el-button>
         <el-button type="primary" @click="handlePrintTags">打印标签</el-button>
         <el-button type="primary" @click="handlePrint">配套单打印</el-button>
-        <el-button type="primary" @click="priorityFn">优先级调整</el-button>
+        <el-button type="primary" @click="priorityFnBatch">优先级调整</el-button>
       </template>
       <template #menu-right>
-        <el-button type="success" plain @click="processingHandle">在制品</el-button>
-        <el-button type="warning" plain>加工中</el-button>
-        <el-button type="danger" plain>检验中</el-button>
-        <el-button type="success" plain>已完工</el-button>
+        <el-button type="success" plain @click="queryOrdersHandle('3,4,5,6')">在制品</el-button>
+        <el-button type="warning" plain @click="queryOrdersHandle('3')">加工中</el-button>
+        <el-button type="danger" plain @click="queryOrdersHandle('4')">检验中</el-button>
+        <el-button type="success" plain @click="queryOrdersHandle('15')">已完工</el-button>
+        <el-button type="primary" @click="queryOrdersHandle('')">全部</el-button>
       </template>
       <template #menu="scope">
         <el-button type="text" @click="clickProduction(scope.row)">生产监控</el-button>
@@ -50,36 +51,6 @@
           >异常申报</el-button
         >
       </template>
-      <template #tsName="{ row }">{{ row.makeTeam && row.makeTeam.tsName }}</template>
-      <template #ppsName="{ row }">{{ row.procedureSet && row.procedureSet.ppsName }}</template>
-      <template #planTime1="{ row }">
-        {{ Array.isArray(row.planTime1) ? row.planTime1.join(' ~ ') : row.planTime1 || '-' }}
-      </template>
-      <template #planTime="{ row }">
-        {{ Array.isArray(row.planTime) ? row.planTime.join(' ~ ') : row.planTime || '-' }}
-      </template>
-      <template #putStoreTime="{ row }">
-        {{
-          Array.isArray(row.putStoreTime) ? row.putStoreTime.join(' ~ ') : row.putStoreTime || '-'
-        }}
-      </template>
-      <template #partCode="{ row }">{{ row.pjYieldOrder && row.pjYieldOrder.partCode }}</template>
-      <template #prodIdent="{ row }">{{ row.pjYieldOrder && row.pjYieldOrder.prodIdent }}</template>
-      <template #partName="{ row }">{{ row.pjYieldOrder && row.pjYieldOrder.partName }}</template>
-      <template #plate="{ row }">{{ row.pjYieldOrder && row.pjYieldOrder.plate }}</template>
-      <template #productType="{ row }">{{
-        row.pjYieldOrder && row.pjYieldOrder.productType
-      }}</template>
-      <template #useDept="{ row }">{{ row.pjYieldOrder && row.pjYieldOrder.useDept }}</template>
-      <template #poArea="{ row }">{{ row.pjYieldOrder && row.pjYieldOrder.poArea }}</template>
-      <template #userName="{ row }">{{ row.dispatcher && row.dispatcher.userName }}</template>
-      <template #nextPpsName="{ row }">{{
-        row.nextProcedureSet && row.nextProcedureSet.ppsName
-      }}</template>
-      <template #nextTeamName="{ row }">{{ row.nextMakeTeam && row.nextMakeTeam.tsName }}</template>
-      <template #failureMan="{ row }">{{
-        row.pjYieldOrder && row.pjYieldOrder.failureMan && row.pjYieldOrder.failureMan.userName
-      }}</template>
     </avue-crud>
     <el-dialog append-to-body v-model="printDialog" title="打印标签">
       <el-form ref="printForm" :model="printForm" :rules="printRules">
@@ -107,9 +78,15 @@
     <!-- 分批弹窗  -->
     <batches-dialog :show-batches="showBatches" @closeDialog="closeDialog"></batches-dialog>
     <!-- 关闭弹窗  -->
-    <closed-dialog :show-close="showClose" @closeDialog="closeDialog"></closed-dialog>
+    <closed-dialog
+      v-if="showClose"
+      :show-close="showClose"
+      @closeDialog="closeDialog"
+      :itemData="itemData"
+    ></closed-dialog>
     <!-- 异常处理 -->
     <abnormalDialog :show-abnormal="showAbnormal" @closeDialog="closeDialog"></abnormalDialog>
+    <!-- 优先级调整 -->
     <productionMonitoringDialog
       :showDialog="isPriorityOpen"
       v-if="isPriorityOpen"
@@ -137,6 +114,8 @@ export default {
   },
   data() {
     return {
+      itemData: [],
+
       isPriorityOpen: false,
       showAbnormal: false,
       showRadio: true,
@@ -206,7 +185,7 @@ export default {
         column: [
           {
             label: '当前工序',
-            prop: 'ppsName',
+            prop: 'wpId',
             fixed: 'left',
             search: false,
             sortable: true,
@@ -215,7 +194,7 @@ export default {
           },
           {
             label: '下一工序',
-            prop: 'nextPpsName',
+            prop: 'ppsNameNext',
             search: false,
             sortable: true,
             overHidden: true,
@@ -229,41 +208,11 @@ export default {
             sortable: true,
             overHidden: true,
             width: 200,
-
-            dicData: [
-              {
-                value: 2,
-                label: '待生产',
-              },
-              {
-                value: 3,
-                label: '生产中',
-              },
-              {
-                value: 4,
-                label: '检验中',
-              },
-              {
-                value: 6,
-                label: '审理中',
-              },
-              {
-                value: 5,
-                label: '工艺变更',
-              },
-              {
-                value: 19,
-                label: '已返工',
-              },
-              {
-                value: 15,
-                label: '已完成',
-              },
-              {
-                value: 21,
-                label: '已作废',
-              },
-            ],
+            dicUrl: '/blade-system/dict/dictionary?code=order_status',
+            props: {
+              label: 'dictValue',
+              value: 'dictKey',
+            },
           },
           {
             label: '车间订单号',
@@ -359,7 +308,7 @@ export default {
 
           {
             label: 'MES流程卡号',
-            prop: 'false',
+            prop: 'mesCardNo',
             search: false,
             sortable: true,
             overHidden: true,
@@ -367,7 +316,7 @@ export default {
           },
           {
             label: '生产标识',
-            prop: 'prodIdent',
+            prop: 'productIdent',
             search: false,
             sortable: true,
             overHidden: true,
@@ -383,35 +332,17 @@ export default {
           },
           {
             label: '订单优先级',
-            prop: 'priorityTitle',
+            prop: 'priority',
             type: 'select',
             search: true,
             sortable: true,
             overHidden: true,
             width: 200,
-
-            dicData: [
-              {
-                value: 1,
-                label: '正常-白色',
-              },
-              {
-                value: 2,
-                label: '项目要求日期急件-橙色',
-              },
-              {
-                value: 3,
-                label: '合同急件-黄色',
-              },
-              {
-                value: 4,
-                label: '绩效零件-青色',
-              },
-              {
-                value: 5,
-                label: '调度标注急件-蓝色',
-              },
-            ],
+            dicUrl: '/blade-system/dict/dictionary?code=orderPriority',
+            props: {
+              label: 'dictValue',
+              value: 'dictKey',
+            },
           },
           {
             label: '需求部门',
@@ -512,7 +443,7 @@ export default {
           },
           {
             label: '试验数量',
-            prop: 'testQuantity',
+            prop: 'testQty',
             search: false,
             sortable: true,
             overHidden: true,
@@ -520,7 +451,7 @@ export default {
           },
           {
             label: '报废数量',
-            prop: 'scrapQuantity',
+            prop: 'scrapQty',
             search: false,
             sortable: true,
             overHidden: true,
@@ -540,12 +471,24 @@ export default {
   },
   mounted() {},
   methods: {
+    //查询【生产中3、工艺变更5、检验中4、审理中6】状态的订单
+    queryOrdersHandle(status) {
+      this.query = {
+        runStatus: status,
+      };
+      this.onLoad(this.page, this.query);
+    },
     // 优先级调整
     priorityFn(row) {
-      this.rowItem = row;
-      console.log(row.runStatus, 123);
+      this.itemData = [row];
+      this.isPriorityOpen = true;
+    },
+    priorityFnBatch() {
+      if (this.selectionList.length == 0) {
+        return this.$message.error('请先选择数据');
+      }
+      this.itemData = this.selectionList;
       this.isPriorityOpen = true;
-      // console.log(runStatus,123)
     },
     handlePrioritySubmit(data) {
       this.$message.success(
@@ -610,12 +553,15 @@ export default {
       this.showAbnormal = true;
     },
     // 关闭弹窗
-    closeDialog() {
+    closeDialog(type) {
       this.monitorDialog = false;
       this.showBatches = false;
       this.showClose = false;
       this.showAbnormal = false;
       this.isPriorityOpen = false;
+      if (type) {
+        this.onLoad(this.page, this.query);
+      }
     },
     currentChange(currentPage) {
       this.page.currentPage = currentPage;
@@ -645,10 +591,14 @@ export default {
       this.$refs.crud.toggleSelection();
     },
     onLoad(page, params = {}) {
-      // this.loading = true;
-      getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+      this.loading = true;
+      getList(
+        page.currentPage,
+        page.pageSize,
+        Object.assign(params, this.query, { yieldType: '2' })
+      ).then(res => {
         this.data = res.data.data.records;
-        // this.loading = false;
+        this.loading = false;
         this.page.total = res.data.data.total;
         this.selectionClear();
       });
diff --git a/src/views/productionManagement/sinteringProductionMonitoring.vue b/src/views/productionManagement/sinteringProductionMonitoring.vue
index 6d04e46..e847679 100644
--- a/src/views/productionManagement/sinteringProductionMonitoring.vue
+++ b/src/views/productionManagement/sinteringProductionMonitoring.vue
@@ -424,32 +424,11 @@ align: 'center',
                 trigger: 'blur',
               },
             ],
-            dicData: [
-              {
-                value: 1,
-                label: '正常'
-              },
-              {
-                value: 3,
-                label: '加工中'
-              },
-              {
-                value: 4,
-                label: '检验中'
-              },
-              {
-                value: 19,
-                label: '已返工'
-              },
-              {
-                value: 15,
-                label: '已完工'
-              },
-              {
-                value: 21,
-                label: '已作废'
-              }
-            ]
+           dicUrl: '/blade-system/dict/dictionary?code=order_status',
+            props: {
+              label: 'dictValue',
+              value: 'dictKey',
+            },
           },
           {
             label: '子件状态',
@@ -732,27 +711,11 @@ align: 'center',
                 trigger: 'blur',
               },
             ],
-            dicData: [
-              {
-                value: 1,
-                label: '正常-白色'
-              }, {
-                value: 2,
-                label: '项目要求日期急件-橙色'
-              },
-              {
-                value: 3,
-                label: '合同急件-黄色'
-              },
-              {
-                value: 4,
-                label: '绩效零件-青色'
-              },
-              {
-                value: 5,
-                label: '调度标注急件-蓝色'
-              }
-            ]
+             dicUrl: '/blade-system/dict/dictionary?code=orderPriority',
+            props: {
+              label: 'dictValue',
+              value: 'dictKey',
+            },
           },
 
           {
diff --git a/src/views/productionManagement/sjKitPreparation/index.vue b/src/views/productionManagement/sjKitPreparation/index.vue
index 823d358..b854107 100644
--- a/src/views/productionManagement/sjKitPreparation/index.vue
+++ b/src/views/productionManagement/sjKitPreparation/index.vue
@@ -1,572 +1,606 @@
-
 <template>
-    <basic-container>
-        <div class="search_box">
-
-        </div>
-        <avue-crud :option="option" :table-loading="loading" :data="data" v-model="form" v-model:page="page" ref="crud"
-            @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset"
-            @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
-            @refresh-change="refreshChange" @on-load="onLoad">
-            <template #menu-left>
-            </template>
-            <template #menu-right>
-            </template>
-            <template #menu="{ row }">
-                <el-button type="text">发送</el-button>
-            </template>
-
-            <template #heatTreat="scope">
-                <el-tag v-if="scope.row.afterPlating" type="success">是</el-tag>
-                <el-tag v-else type="warning">否</el-tag>
-            </template>
-
-        </avue-crud>
-
+  <basic-container>
+    <div class="search_box"></div>
+    <avue-crud
+      :option="option"
+      :table-loading="loading"
+      :data="data"
+      v-model="form"
+      v-model:page="page"
+      ref="crud"
+      @row-del="rowDel"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @selection-change="selectionChange"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+    >
+      <template #menu-left> </template>
+      <template #menu-right> </template>
+      <template #menu="{ row }">
+         <el-button type="text">完成</el-button>
+        <el-button type="text">发送</el-button>
+        <el-button type="text">车间订单生成</el-button>
+      </template>
 
-    </basic-container>
+      <template #heatTreat="scope">
+        <el-tag v-if="scope.row.afterPlating" type="success">是</el-tag>
+        <el-tag v-else type="warning">否</el-tag>
+      </template>
+    </avue-crud>
+  </basic-container>
 </template>
 
 <script>
-
 import {
-    add,
-    getRole,
-    getRoleAlias,
-    getRoleTreeById,
-    grant,
-    grantTree,
-    remove,
-    update,
+  add,
+  getRole,
+  getRoleAlias,
+  getRoleTreeById,
+  grant,
+  grantTree,
+  remove,
+  update,
 } from '@/api/system/role';
 import { mapGetters } from 'vuex';
 import { validatenull } from '@/utils/validate';
 
-
 export default {
-    components: {
-    },
-    data() {
-        return {
-            inBatchesOpen: false,
-            platingSmallOpen: false,
-            planOrderArr: [],
-            isOpen: false,
-            rowItem: {},
-            poId: null,
-            form: {},
-            box: false,
-            props: {
-                label: 'title',
-                value: 'key',
-            },
-            menuGrantList: [],
-            dataScopeGrantList: [],
-            apiScopeGrantList: [],
-            apiGrantList: [],
-            menuTreeObj: [],
-            dataScopeTreeObj: [],
-            apiScopeTreeObj: [],
-            selectionList: [],
-            query: {},
-            loading: true,
-            page: {
-                pageSize: 10,
-                currentPage: 1,
-                total: 0,
-            },
-             option: {
-                columnSort: true,
-                tip: false,
-                height: 'auto',
-                calcHeight: 32,
-                simplePage: false,
-                searchShow: true,
-                searchMenuSpan: 6,
-                searchIcon: true,
-                searchIndex: 3,
-                tree: false,
-                border: true,
-                index: true,
-                selection: false,
-                addBtn: false,
-                editBtn: false,
-                viewBtn: false,
-                delBtn: false,
-                editBtnText: '修改',
-                labelWidth: 120,
-                menuWidth: 80,
-                dialogWidth: 900,
-                dialogClickModal: false,
-                searchEnter: true,
-                excelBtn: false,
-                filterBtn: true,
-                searchShowBtn: false,
-                excelBtn: true,
-                showOverflowTooltip: true,
-                addBtnIcon: ' ',
-                viewBtnIcon: ' ',
-                delBtnIcon: ' ',
-                editBtnIcon: ' ',
-                gridBtn: false,
-                searchLabelPosition: 'left',
-                searchGutter: 24,
-                searchSpan: 6,
-                menuAlign: 'left',
-                gridBtn: false,
-                searchMenuPosition: 'right',
-                align: 'center',
-                column: [
-                    {
-                        label: '配套人',
-                        prop: 'partCode',
-                        bind: 'dsPart.partCode',
-                        search: true,
-                        sortable: true,
-                        width: 150,
-                        span: 12,
-                       
-                    },
-                    {
-                        label: '配套时间',
-                        prop: 'partName',
-                        bind: 'dsPart.partName',
-                        search: true,
-                        sortable: true,
-                        width: 150,
-                        span: 12,
-                    },
-                    {
-                        label: '计划单号',
-                        prop: 'cycle',
-                        search: true,
-                        sortable: true,
-                        width: 150,
-                        span: 12,
-                    },
-                    {
-                        label: '生产单号',
-                        prop: 'material',
-                        bind: 'dsPart.material',
-                        search: false,
-                        sortable: true,
-                        width: 150,
-                        span: 12,
-                        display: false,
-                    },
-                    {
-                        label: '零件号',
-                        prop: 'plate',
-                        bind: 'dsPart.plate',
-                        search: false,
-                        sortable: true,
-                        width: 150,
-                        span: 12,
-                        display: false,
-                    },
-                    {
-                        label: '批次号',
-                        prop: 'craftWay',
-                        bind: 'dsPart.craftWay',
-                        search: false,
-                        sortable: true,
-                        width: 150,
-                        span: 12,
-                        display: false,
-                    },
-                    {
-                        label: '流程卡号',
-                        prop: 'chlidPart',
-                        search: false,
-                        sortable: true,
-                        width: 150,
-                        span: 12,
-                    },
-                    {
-                        label: '产品型号',
-                        prop: 'remindContent',
-                        search: false,
-                        sortable: true,
-                        width: 150,
-                        span: 12,
-                    },
-                    {
-                        label: '名称',
-                        prop: 'parameter',
-                        search: false,
-                        sortable: true,
-                        width: 150,
-                        span: 12,
-                        display: false,
-                    },
-                    {
-                        label: '镀种',
-                        prop: 'metalsTest',
-                        search: false,
-                        sortable: true,
-                        width: 150,
-                        span: 12,
-                        display: false,
-                    },
-                    {
-                        label: '生产标识',
-                        prop: 'silverTest',
-                        search: false,
-                        sortable: true,
-                        width: 150,
-                        span: 12,
-                        display: false,
-                    },
-                    {
-                        label: '使用部门',
-                        prop: 'heatTreat',
-                        search: false,
-                        sortable: true,
-                        width: 150,
-                        span: 12,
-                        type: 'switch',
-                       
-                    },
-                    {
-                        label: '数量',
-                        prop: 'afterPlating',
-                        search: false,
-                        sortable: true,
-                        width: 150,
-                        span: 12,
-                        
-                    },
-                     {
-                        label: '面积(d㎡)',
-                        prop: 'afterPlating',
-                        search: false,
-                        sortable: true,
-                        width: 150,
-                        span: 12,
-                        
-                    },
-                    {
-                        label: '需求交期',
-                        prop: 'afterPlating',
-                        search: false,
-                        sortable: true,
-                        width: 150,
-                        span: 12,
-                        
-                    },
-                    {
-                        label: '计划员',
-                        prop: 'afterPlating',
-                        search: false,
-                        sortable: true,
-                        width: 150,
-                        span: 12,
-                        
-                    },
-                    {
-                        label: '计划下达时间',
-                        prop: 'afterPlating',
-                        search: false,
-                        sortable: true,
-                        width: 150,
-                        span: 12,
-                        
-                    },
-                    {
-                        label: '流转编号',
-                        prop: 'afterPlating',
-                        search: false,
-                        sortable: true,
-                        width: 150,
-                        span: 12,
-                        
-                    },
-                    {
-                        label: '备注',
-                        prop: 'afterPlating',
-                        search: false,
-                        sortable: true,
-                        width: 150,
-                        span: 12,
-                        
-                    },
-                    {
-                        label: '状态',
-                        prop: 'afterPlating',
-                        search: false,
-                        sortable: true,
-                        width: 150,
-                        span: 12,
-                        
-                    },
-                ],
-            },
+  components: {},
+  data() {
+    return {
+      inBatchesOpen: false,
+      platingSmallOpen: false,
+      planOrderArr: [],
+      isOpen: false,
+      rowItem: {},
+      poId: null,
+      form: {},
+      box: false,
+      props: {
+        label: 'title',
+        value: 'key',
+      },
+      menuGrantList: [],
+      dataScopeGrantList: [],
+      apiScopeGrantList: [],
+      apiGrantList: [],
+      menuTreeObj: [],
+      dataScopeTreeObj: [],
+      apiScopeTreeObj: [],
+      selectionList: [],
+      query: {},
+      loading: true,
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0,
+      },
+      option: {
+        columnSort: true,
+        tip: false,
+        height: 'auto',
+        calcHeight: 32,
+        simplePage: false,
+        searchShow: true,
+        searchMenuSpan: 6,
+        searchIcon: true,
+        searchIndex: 3,
+        tree: false,
+        border: true,
+        index: true,
+        selection: false,
+        addBtn: false,
+        editBtn: false,
+        viewBtn: false,
+        delBtn: false,
+        editBtnText: '修改',
+        labelWidth: 120,
+        menuWidth: 80,
+        dialogWidth: 900,
+        dialogClickModal: false,
+        searchEnter: true,
+        excelBtn: false,
+        filterBtn: true,
+        searchShowBtn: false,
+        excelBtn: true,
+        showOverflowTooltip: true,
+        addBtnIcon: ' ',
+        viewBtnIcon: ' ',
+        delBtnIcon: ' ',
+        editBtnIcon: ' ',
+        gridBtn: false,
+        searchLabelPosition: 'left',
+        searchGutter: 24,
+        searchSpan: 6,
+        menuAlign: 'left',
+        gridBtn: false,
+        searchMenuPosition: 'right',
+        align: 'center',
+        column: [
+          {
+            label: '配套人',
+            prop: 'partCode',
+            bind: 'dsPart.partCode',
+            search: true,
+            sortable: true,
+            width: 150,
+            span: 12,
+          },
+          {
+            label: '配套时间',
+            prop: 'partName',
+            bind: 'dsPart.partName',
+            search: true,
+            sortable: true,
+            width: 150,
+            span: 12,
+          },
+          {
+            label: '计划单号',
+            prop: 'cycle',
+            search: true,
+            sortable: true,
+            width: 150,
+            span: 12,
+          },
+          {
+            label: '生产单号',
+            prop: 'material',
+            bind: 'dsPart.material',
+            search: false,
+            sortable: true,
+            width: 150,
+            span: 12,
+            display: false,
+          },
+          {
+            label: '零件号',
+            prop: 'plate',
+            bind: 'dsPart.plate',
+            search: false,
+            sortable: true,
+            width: 150,
+            span: 12,
+            display: false,
+          },
+          {
+            label: '批次号',
+            prop: 'craftWay',
+            bind: 'dsPart.craftWay',
+            search: false,
+            sortable: true,
+            width: 150,
+            span: 12,
+            display: false,
+          },
+          {
+            label: '流程卡号',
+            prop: 'chlidPart',
+            search: false,
+            sortable: true,
+            width: 150,
+            span: 12,
+          },
+          {
+            label: '产品型号',
+            prop: 'remindContent',
+            search: false,
+            sortable: true,
+            width: 150,
+            span: 12,
+          },
+          {
+            label: '名称',
+            prop: 'parameter',
+            search: false,
+            sortable: true,
+            width: 150,
+            span: 12,
+            display: false,
+          },
+          {
+            label: '镀种',
+            prop: 'metalsTest',
+            search: false,
+            sortable: true,
+            width: 150,
+            span: 12,
+            display: false,
+          },
+          {
+            label: '生产标识',
+            prop: 'silverTest',
+            search: false,
+            sortable: true,
+            width: 150,
+            span: 12,
+            display: false,
+          },
+          {
+            label: '使用部门',
+            prop: 'heatTreat',
+            search: false,
+            sortable: true,
+            width: 150,
+            span: 12,
+            type: 'switch',
+          },
+          {
+            label: '数量',
+            prop: 'afterPlating',
+            search: false,
+            sortable: true,
+            width: 150,
+            span: 12,
+          },
+          {
+            label: '面积(d㎡)',
+            prop: 'afterPlating',
+            search: false,
+            sortable: true,
+            width: 150,
+            span: 12,
+          },
+          {
+            label: '需求交期',
+            prop: 'afterPlating',
+            search: false,
+            sortable: true,
+            width: 150,
+            span: 12,
+          },
+          {
+            label: '计划员',
+            prop: 'afterPlating',
+            search: false,
+            sortable: true,
+            width: 150,
+            span: 12,
+          },
+          {
+            label: '计划下达时间',
+            prop: 'afterPlating',
+            search: false,
+            sortable: true,
+            width: 150,
+            span: 12,
+          },
+          {
+            label: '流转编号',
+            prop: 'afterPlating',
+            search: false,
+            sortable: true,
+            width: 150,
+            span: 12,
+          },
+          {
+            label: '备注',
+            prop: 'afterPlating',
+            search: false,
+            sortable: true,
+            width: 150,
+            span: 12,
+          },
+          {
+            label: '状态',
+            prop: 'afterPlating',
+            search: false,
+            sortable: true,
+            width: 150,
+            span: 12,
+          },
+        ],
+      },
 
-            data: [],
-            isRushOpen: false,//加急弹框
-            isBatchOpen: false,//分批处理
-        };
-    },
-    methods: {
-        // 批量接收
-        batchReceiving() {
-            this.$confirm('确定将选择数据批量接收?', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning',
-            })
-                .then(() => {
-                    // return remove(row.id);
-                })
-                .then(() => {
-                    // this.onLoad(this.page);
-                    // this.$message({
-                    //     type: 'success',
-                    //     message: '操作成功!',
-                    // });
-                });
-        },
-        // 批量关闭
-        batchDel() {
-            this.$confirm('确定将选择数据批量删除?', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning',
-            })
-                .then(() => {
-                    // return remove(row.id);
-                })
-                .then(() => {
-                    // this.onLoad(this.page);
-                    // this.$message({
-                    //     type: 'success',
-                    //     message: '操作成功!',
-                    // });
-                });
-        },
-        // 加急
-        rushFn() {
-            this.isRushOpen = true
-        },
-        closeDialog() {
-            this.isRushOpen = false
-            this.isBatchOpen = false
-        },
-        inBatchesFn(row) {
-            this.rowItem = row;
-            this.isBatchOpen = true;
-        },
-        subclass() {
-            this.platingSmallOpen = true;
-        },
-        lookProcessRoute(row) {
-            this.isOpen = true;
-            this.rowItem = row;
-        },
-        cancel(refresh) {
-            if (refresh) {
-                this.$refs.myTable.load();
-            }
-            this.inBatchesOpen = false;
-            this.isOpen = false;
-            this.planFormOpen = false;
-            this.platingSmallOpen = false;
-        },
-        initData(roleId) {
-            getRoleTreeById(roleId).then(res => {
-                const column = this.findObject(this.option.column, 'parentId');
-                column.dicData = res.data.data;
+      data: [],
+      isRushOpen: false, //加急弹框
+      isBatchOpen: false, //分批处理
+    };
+  },
+  methods: {
+    // 车间订单生成
+    orderGen(cardNo) {
+      this.$confirm('生成车间订单？', this.$t('global.tips'), {
+        confirmButtonText: this.$t('global.confirm'),
+        cancelButtonText: this.$t('global.cancle'),
+        type: 'warning',
+      })
+        .then(() => {
+          this.$ajax
+            .get('pdaLoad/loadBigWmsSend/' + cardNo + '/' + this.mark)
+            .then((res) => {
+              if (res.code === 0) {
+                this.$message.success(this.$t('global.saveOk'));
+                this.cancel(true);
+              }
             });
-        },
-        submit() {
-            const menuList = this.$refs.treeMenu.getCheckedKeys();
-            const dataScopeList = this.$refs.treeDataScope.getCheckedKeys();
-            const apiScopeList = this.$refs.treeApiScope.getCheckedKeys();
-            grant(this.idsArray, menuList, dataScopeList, apiScopeList).then(() => {
-                this.box = false;
-                this.$message({
-                    type: 'success',
-                    message: '操作成功!',
-                });
-                this.selectionList = [];
-                this.onLoad(this.page);
-            });
-        },
-        rowSave(row, done, loading) {
-            add(row).then(
-                () => {
-                    this.onLoad(this.page);
-                    this.$message({
-                        type: 'success',
-                        message: '操作成功!',
-                    });
-                    done();
-                },
-                error => {
-                    window.console.log(error);
-                    loading();
-                }
-            );
-        },
-        rowUpdate(row, index, done, loading) {
-            update(row).then(
-                () => {
-                    this.onLoad(this.page);
-                    this.$message({
-                        type: 'success',
-                        message: '操作成功!',
-                    });
-                    done();
-                },
-                error => {
-                    window.console.log(error);
-                    loading();
-                }
-            );
-        },
-        rowDel(row) {
-            this.$confirm('确定将选择数据删除?', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning',
+        })
+        .catch(() => {
+          this.$message.info('已取消');
+        });
+    },
+    // 完成
+    moldComplete(yoId) {
+      this.$confirm('模具准备完成？', this.$t('global.tips'), {
+        confirmButtonText: this.$t('global.confirm'),
+        cancelButtonText: this.$t('global.cancle'),
+        type: 'warning',
+      })
+        .then(() => {
+          this.$ajax
+            .post('pjYieldOrder/moldComplete', {
+              yoId: yoId,
             })
-                .then(() => {
-                    return remove(row.id);
-                })
-                .then(() => {
-                    this.onLoad(this.page);
-                    this.$message({
-                        type: 'success',
-                        message: '操作成功!',
-                    });
-                });
-        },
-
-        searchReset() {
-            this.query = {};
-            this.onLoad(this.page);
-        },
-        searchChange(params, done) {
-            this.query = params;
-            this.page.currentPage = 1;
-            this.onLoad(this.page, params);
-            done();
-        },
-        selectionChange(list) {
-            this.selectionList = list;
-        },
-        selectionClear() {
-            this.selectionList = [];
-            this.$refs.crud.toggleSelection();
-        },
-        beforeOpen(done, type) {
-            if (['add', 'edit'].includes(type)) {
-                this.initData(this.form.id);
-            }
-            if (['edit', 'view'].includes(type)) {
-                if (this.form.parentId === '0') {
-                    this.form.parentId = '';
-                }
-            }
-            getRoleAlias().then(res => {
-                const column = this.findObject(this.option.column, 'currentAlias');
-                column.dicData = res.data.data;
-            });
-            done();
-        },
-        handleRole() {
-            if (this.selectionList.length !== 1) {
-                this.$message.warning('只能选择一条数据');
-                return;
-            }
-            this.menuTreeObj = [];
-            this.dataScopeTreeObj = [];
-            this.apiScopeTreeObj = [];
-            grantTree().then(res => {
-                this.menuGrantList = res.data.data.menu;
-                this.dataScopeGrantList = res.data.data.dataScope;
-                this.apiScopeGrantList = res.data.data.apiScope;
-                getRole(this.ids).then(res => {
-                    this.menuTreeObj = res.data.data.menu;
-                    this.dataScopeTreeObj = res.data.data.dataScope;
-                    this.apiScopeTreeObj = res.data.data.apiScope;
-                    this.box = true;
-                });
-            });
-        },
-        handleRowRole(row) {
-            this.menuTreeObj = [];
-            this.dataScopeTreeObj = [];
-            this.apiScopeTreeObj = [];
-            grantTree().then(res => {
-                this.menuGrantList = res.data.data.menu;
-                this.dataScopeGrantList = res.data.data.dataScope;
-                this.apiScopeGrantList = res.data.data.apiScope;
-                getRole(row.id).then(res => {
-                    this.menuTreeObj = res.data.data.menu;
-                    this.dataScopeTreeObj = res.data.data.dataScope;
-                    this.apiScopeTreeObj = res.data.data.apiScope;
-                    this.selectionList.push(row);
-                    this.box = true;
-                });
+            .then((res) => {
+              if (res.code === 0) {
+                this.$message.success(this.$t('global.saveOk'));
+                this.cancel(true);
+              }
             });
+        })
+        .catch(() => {
+          this.$message.info('已取消');
+        });
+    },
+    // 批量接收
+    batchReceiving() {
+      this.$confirm('确定将选择数据批量接收?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          // return remove(row.id);
+        })
+        .then(() => {
+          // this.onLoad(this.page);
+          // this.$message({
+          //     type: 'success',
+          //     message: '操作成功!',
+          // });
+        });
+    },
+    // 批量关闭
+    batchDel() {
+      this.$confirm('确定将选择数据批量删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          // return remove(row.id);
+        })
+        .then(() => {
+          // this.onLoad(this.page);
+          // this.$message({
+          //     type: 'success',
+          //     message: '操作成功!',
+          // });
+        });
+    },
+    // 加急
+    rushFn() {
+      this.isRushOpen = true;
+    },
+    closeDialog() {
+      this.isRushOpen = false;
+      this.isBatchOpen = false;
+    },
+    inBatchesFn(row) {
+      this.rowItem = row;
+      this.isBatchOpen = true;
+    },
+    subclass() {
+      this.platingSmallOpen = true;
+    },
+    lookProcessRoute(row) {
+      this.isOpen = true;
+      this.rowItem = row;
+    },
+    cancel(refresh) {
+      if (refresh) {
+        this.$refs.myTable.load();
+      }
+      this.inBatchesOpen = false;
+      this.isOpen = false;
+      this.planFormOpen = false;
+      this.platingSmallOpen = false;
+    },
+    initData(roleId) {
+      getRoleTreeById(roleId).then(res => {
+        const column = this.findObject(this.option.column, 'parentId');
+        column.dicData = res.data.data;
+      });
+    },
+    submit() {
+      const menuList = this.$refs.treeMenu.getCheckedKeys();
+      const dataScopeList = this.$refs.treeDataScope.getCheckedKeys();
+      const apiScopeList = this.$refs.treeApiScope.getCheckedKeys();
+      grant(this.idsArray, menuList, dataScopeList, apiScopeList).then(() => {
+        this.box = false;
+        this.$message({
+          type: 'success',
+          message: '操作成功!',
+        });
+        this.selectionList = [];
+        this.onLoad(this.page);
+      });
+    },
+    rowSave(row, done, loading) {
+      add(row).then(
+        () => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+          done();
         },
-        handleDelete() {
-            if (this.selectionList.length === 0) {
-                this.$message.warning('请选择至少一条数据');
-                return;
-            }
-            this.$confirm('确定将选择数据删除?', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning',
-            })
-                .then(() => {
-                    return remove(this.ids);
-                })
-                .then(() => {
-                    this.onLoad(this.page);
-                    this.$message({
-                        type: 'success',
-                        message: '操作成功!',
-                    });
-                    this.$refs.crud.toggleSelection();
-                });
-        },
-        currentChange(currentPage) {
-            this.page.currentPage = currentPage;
-        },
-        sizeChange(pageSize) {
-            this.page.pageSize = pageSize;
-        },
-        refreshChange() {
-            this.onLoad(this.page, this.query);
-        },
-        handleChange(file, fileList) {
-            // proxy.$Export.xlsx(file.raw).then((data) => {
-            //     data.value = data.results;
-            // });
-            this.$message({
-                type: 'success',
-                message: '操作成功!',
-            });
+        error => {
+          window.console.log(error);
+          loading();
+        }
+      );
+    },
+    rowUpdate(row, index, done, loading) {
+      update(row).then(
+        () => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+          done();
         },
+        error => {
+          window.console.log(error);
+          loading();
+        }
+      );
+    },
+    rowDel(row) {
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          return remove(row.id);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+        });
+    },
 
-        onLoad(page, params = {}) {
-            this.loading = true;
-            this.data = [
+    searchReset() {
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.$refs.crud.toggleSelection();
+    },
+    beforeOpen(done, type) {
+      if (['add', 'edit'].includes(type)) {
+        this.initData(this.form.id);
+      }
+      if (['edit', 'view'].includes(type)) {
+        if (this.form.parentId === '0') {
+          this.form.parentId = '';
+        }
+      }
+      getRoleAlias().then(res => {
+        const column = this.findObject(this.option.column, 'currentAlias');
+        column.dicData = res.data.data;
+      });
+      done();
+    },
+    handleRole() {
+      if (this.selectionList.length !== 1) {
+        this.$message.warning('只能选择一条数据');
+        return;
+      }
+      this.menuTreeObj = [];
+      this.dataScopeTreeObj = [];
+      this.apiScopeTreeObj = [];
+      grantTree().then(res => {
+        this.menuGrantList = res.data.data.menu;
+        this.dataScopeGrantList = res.data.data.dataScope;
+        this.apiScopeGrantList = res.data.data.apiScope;
+        getRole(this.ids).then(res => {
+          this.menuTreeObj = res.data.data.menu;
+          this.dataScopeTreeObj = res.data.data.dataScope;
+          this.apiScopeTreeObj = res.data.data.apiScope;
+          this.box = true;
+        });
+      });
+    },
+    handleRowRole(row) {
+      this.menuTreeObj = [];
+      this.dataScopeTreeObj = [];
+      this.apiScopeTreeObj = [];
+      grantTree().then(res => {
+        this.menuGrantList = res.data.data.menu;
+        this.dataScopeGrantList = res.data.data.dataScope;
+        this.apiScopeGrantList = res.data.data.apiScope;
+        getRole(row.id).then(res => {
+          this.menuTreeObj = res.data.data.menu;
+          this.dataScopeTreeObj = res.data.data.dataScope;
+          this.apiScopeTreeObj = res.data.data.apiScope;
+          this.selectionList.push(row);
+          this.box = true;
+        });
+      });
+    },
+    handleDelete() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning('请选择至少一条数据');
+        return;
+      }
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          return remove(this.ids);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: 'success',
+            message: '操作成功!',
+          });
+          this.$refs.crud.toggleSelection();
+        });
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    handleChange(file, fileList) {
+      // proxy.$Export.xlsx(file.raw).then((data) => {
+      //     data.value = data.results;
+      // });
+      this.$message({
+        type: 'success',
+        message: '操作成功!',
+      });
+    },
 
-            ]
-            this.page.total = this.data.length
-            //   getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-            //     this.data = res.data.data.records;
-            this.loading = false;
-            //     this.page.total = res.data.data.total
-            //     this.selectionClear();
-            //   });
-        },
+    onLoad(page, params = {}) {
+      this.loading = true;
+      this.data = [];
+      this.page.total = this.data.length;
+      //   getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+      //     this.data = res.data.data.records;
+      this.loading = false;
+      //     this.page.total = res.data.data.total
+      //     this.selectionClear();
+      //   });
     },
-    mounted() {
-    }
+  },
+  mounted() {},
 };
 </script>