From 9250179f8bb1ea8a0b24ad0f0c9d1182edaac65b Mon Sep 17 00:00:00 2001
From: jinna <jn517618@163.com>
Date: Thu, 16 Apr 2026 11:24:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E9=A2=9D=E8=AE=A1=E7=AE=97=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=81=94=E8=B0=83=E5=8F=8A=E9=A1=B5=E9=9D=A2=E6=8B=86?=
 =?UTF-8?q?=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/orderManagement/exceptionOrder.js     |   9 +
 .../components/settlementDailog.vue           |  19 +-
 .../productionManagement/abnormalOrder.vue    |  18 +
 .../productionManagement/addRequirements.vue  |  16 +
 .../productionManagement/assayedContent.vue   |  16 +
 .../productionManagement/coatingMaterial.vue  |  10 +-
 .../components/coatingMater/abnormalOrder.vue | 509 ++++++++++--------
 7 files changed, 353 insertions(+), 244 deletions(-)
 create mode 100644 src/views/productionManagement/abnormalOrder.vue
 create mode 100644 src/views/productionManagement/addRequirements.vue
 create mode 100644 src/views/productionManagement/assayedContent.vue

diff --git a/src/api/orderManagement/exceptionOrder.js b/src/api/orderManagement/exceptionOrder.js
index aee5005..2362a00 100644
--- a/src/api/orderManagement/exceptionOrder.js
+++ b/src/api/orderManagement/exceptionOrder.js
@@ -69,4 +69,13 @@ export const getProductionIdentificationList = (params) => {
     method: 'get',
     params
   });
+};
+
+// 定额异常订单重新计算
+export const reCalculate = (params) => {
+  return request({
+    url: '/blade-desk/order/yieldOrder/calculateCoatingMaterial',
+    method: 'post',
+    params
+  });
 };
\ No newline at end of file
diff --git a/src/views/oem/oemOrderSettlement/components/settlementDailog.vue b/src/views/oem/oemOrderSettlement/components/settlementDailog.vue
index 2535c0c..abb5d2f 100644
--- a/src/views/oem/oemOrderSettlement/components/settlementDailog.vue
+++ b/src/views/oem/oemOrderSettlement/components/settlementDailog.vue
@@ -12,7 +12,7 @@
                 </el-icon>
                 <h3>计算完成</h3>
             </div>
-            <div>
+            <div v-if="!abnormal">
                 <h4>计算结果</h4>
                 <div class="box-txt">
                     <el-icon style="color:#67c23a;margin-right: 4px;margin-top: 2px;">
@@ -25,6 +25,19 @@
                     </el-icon>结算异常{{ exceptionCount }}条
                 </div>
             </div>
+            <div v-if="abnormal">
+                <h4>计算结果</h4>
+                <div class="box-txt">
+                    <el-icon style="color:#67c23a;margin-right: 4px;margin-top: 2px;">
+                        <SuccessFilled />
+                    </el-icon>计算成功订单数量{{ successCount }}条
+                </div>
+                <div class="box-txt">
+                    <el-icon style="color:#f56c6c;margin-right: 4px;margin-top: 2px;">
+                        <CircleCloseFilled />
+                    </el-icon>计算失败订单数量{{ exceptionCount }}条
+                </div>
+            </div>
         </div>
         <template #footer>
             <span class="dialog-footer">
@@ -43,6 +56,10 @@ export default {
         settleResult: {
             type: Object,
             default: null
+        },
+        abnormal:{
+            type: Boolean,
+            default: false
         }
     },
     data() {
diff --git a/src/views/productionManagement/abnormalOrder.vue b/src/views/productionManagement/abnormalOrder.vue
new file mode 100644
index 0000000..48156e8
--- /dev/null
+++ b/src/views/productionManagement/abnormalOrder.vue
@@ -0,0 +1,18 @@
+<template>
+    <basic-container>
+        <abnormalOrder></abnormalOrder>
+    </basic-container>
+</template>
+
+<script>
+import abnormalOrder from "./components/coatingMater/abnormalOrder.vue"
+export default {
+    components:{
+        abnormalOrder
+    }
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/src/views/productionManagement/addRequirements.vue b/src/views/productionManagement/addRequirements.vue
new file mode 100644
index 0000000..634fa30
--- /dev/null
+++ b/src/views/productionManagement/addRequirements.vue
@@ -0,0 +1,16 @@
+<template>
+    <basic-container>
+        <addRequirements ></addRequirements>
+    </basic-container>
+</template>
+
+<script>
+import addRequirements from './components/coatingMater/addRequirements.vue'
+export default {
+    components: { addRequirements },
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/src/views/productionManagement/assayedContent.vue b/src/views/productionManagement/assayedContent.vue
new file mode 100644
index 0000000..d4f7384
--- /dev/null
+++ b/src/views/productionManagement/assayedContent.vue
@@ -0,0 +1,16 @@
+<template>
+    <basic-container>
+        <assayedContent></assayedContent>
+    </basic-container>
+</template>
+
+<script>
+import assayedContent from './components/coatingMater/assayedContent.vue'
+export default {
+    components:{assayedContent}
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/src/views/productionManagement/coatingMaterial.vue b/src/views/productionManagement/coatingMaterial.vue
index 06a06a3..7bffd2a 100644
--- a/src/views/productionManagement/coatingMaterial.vue
+++ b/src/views/productionManagement/coatingMaterial.vue
@@ -1,15 +1,15 @@
 <template>
   <basic-container>
-    <el-tabs v-model="tabPosition" class="demo-tabs" @tab-change="tabPositionChange">
+    <!-- <el-tabs v-model="tabPosition" class="demo-tabs" @tab-change="tabPositionChange">
       <el-tab-pane label="物料需求申报" name="1"></el-tab-pane>
       <el-tab-pane label="化验含量" name="2"></el-tab-pane>
       <el-tab-pane label="添加量申报" name="3"></el-tab-pane>
       <el-tab-pane label="定额异常订单" name="4"></el-tab-pane>
-    </el-tabs>
-    <materialRequirements v-if="tabPosition=='1'"></materialRequirements>
-    <assayedContent  v-if="tabPosition=='2'"></assayedContent>
+    </el-tabs> -->
+    <materialRequirements ></materialRequirements>
+    <!-- <assayedContent  v-if="tabPosition=='2'"></assayedContent>
     <addRequirements  v-if="tabPosition=='3'"></addRequirements>
-    <abnormalOrder v-if="tabPosition=='4'"></abnormalOrder>
+    <abnormalOrder v-if="tabPosition=='4'"></abnormalOrder> -->
 
   </basic-container>
 </template>
diff --git a/src/views/productionManagement/components/coatingMater/abnormalOrder.vue b/src/views/productionManagement/components/coatingMater/abnormalOrder.vue
index 920a9d5..52dc06e 100644
--- a/src/views/productionManagement/components/coatingMater/abnormalOrder.vue
+++ b/src/views/productionManagement/components/coatingMater/abnormalOrder.vue
@@ -17,13 +17,29 @@
       @refresh-change="refreshChange"
       @on-load="onLoad"
     >
+        <template #menu-left>
+            <el-button type="primary" @click="reCalc">重新计算</el-button>
+        </template>
     </avue-crud>
+    <settlementDailog  
+        v-if="isOpen" 
+        :abnormal="true"
+        :showDialog="isOpen"  
+        :settleResult="settleResult" 
+        @closeDialog="closeDialog" 
+        @refresh="refreshTable"
+    >
+    </settlementDailog>
   </div>
 </template>
 
 <script>
-import {getList} from "@/api/orderManagement/exceptionOrder"
+import {getList,reCalculate} from "@/api/orderManagement/exceptionOrder"
+import settlementDailog from "@/views/oem/oemOrderSettlement/components/settlementDailog.vue"
 export default {
+    components:{
+        settlementDailog
+    },
     data(){
         return{
             loading:false,
@@ -35,6 +51,8 @@ export default {
                 total: 0,
             },
             query:{},
+            isOpen:false,
+            settleResult:{},
             selectionList:[],
             option:{
                 columnSort: true,
@@ -43,7 +61,7 @@ export default {
                 calcHeight: 32,
                 simplePage: false,
                 searchShow: true,
-                searchMenuSpan: 18,
+                searchMenuSpan: 12,
                 searchIcon: true,
                 searchIndex: 3,
                 tree: false,
@@ -79,11 +97,29 @@ export default {
                 searchMenuPosition: 'right',
                 align: 'center',
                 column: [
+                    {
+                        label: '异常原因',
+                        prop: 'validationMomo',
+                        search: false,
+                        sortable: true,
+                        span: 24,
+                        type: 'textarea',
+                        // width: 150,
+                        headerAlign: 'center',
+                        align: 'left',
+                        // rules: [
+                        //   {
+                        //     required: true,
+                        //     message: '请输入备注',
+                        //     trigger: 'blur',
+                        //   },
+                        // ],
+                    },
                     {
                         label: '计划单号',
                         prop: 'ypCode',
                         span: 24,
-                        width: 150,
+                        // width: 150,
                         overflow: true,
                         search: true,
                         headerAlign: 'center',
@@ -97,18 +133,18 @@ export default {
                         ]
                     },
                     {
-                        label: '生产订单',
+                        label: '生产单号',
                         prop: 'yoCode',
                         search: false,
                         sortable: true,
-                        width: 150,
+                        // width: 150,
                         span: 12,
                         headerAlign: 'center',
                         align: 'center',
                         rules: [
                             {
                                 required: true,
-                                message: '请输入生产订单',
+                                message: '请输入生产单号',
                                 trigger: 'blur',
                             },
                         ],
@@ -116,9 +152,9 @@ export default {
                     {
                         label: '零件号',
                         prop: 'partCode',
-                        search: false,
+                        search: true,
                         sortable: true,
-                        width: 150,
+                        // width: 150,
                         span: 12,
                         headerAlign: 'center',
                         align: 'center',
@@ -130,112 +166,112 @@ export default {
                             },
                         ],
                     },
-                    {
-                        label: '产品型号',
-                        prop: 'productType',
-                        search: false,
-                        sortable: true,
-                        disabled: true,
-                        width: 150,
-                        span: 12,
-                        headerAlign: 'center',
-                        align: 'center',
-                        rules: [
-                            {
-                                required: false,
-                                message: '请输入产品型号',
-                                trigger: 'blur',
-                            },
-                        ],
-                    },
-                    {
-                        label: '产品名称',
-                        prop: 'partName',
-                        search: false,
-                        sortable: true,
-                        disabled: true,
-                        span: 12,
-                        width: 150,
-                        headerAlign: 'center',
-                        align: 'left',
-                        rules: [
-                            {
-                                required: false,
-                                message: '请输入产品名称',
-                                trigger: 'blur',
-                            },
-                        ],
-                    },
-                    {
-                        label: '流程卡号',
-                        prop: 'cardNo',
-                        search: false,
-                        sortable: true,
-                        disabled: true,
-                        span: 12,
-                        width: 150,
-                        headerAlign: 'center',
-                        rules: [
-                            {
-                                required: false,
-                                message: '请输入流程卡号',
-                                trigger: 'blur',
-                            },
-                        ],
-                    },
-                    {
-                        label: '批次号',
-                        prop: 'batchNo',
-                        search: false,
-                        sortable: true,
-                        disabled: true,
-                        span: 12,
-                        width: 150,
-                        headerAlign: 'center',
-                        rules: [
-                            {
-                                required: false,
-                                message: '请输入批次号',
-                                trigger: 'blur',
-                            },
-                        ],
-                    },
-                    {
-                        label: '镀种',
-                        prop: 'plate',
-                        search: false,
-                        sortable: true,
-                        disabled: true,
-                        width: 150,
-                        span: 12,
-                        headerAlign: 'center',
-                        align: 'center',
-                        rules: [
-                            {
-                                required: false,
-                                message: '请输入镀种',
-                                trigger: 'blur',
-                            },
-                        ],
-                    },
-                    {
-                        label: '面积(d㎡)',
-                        prop: 'ypArea',
-                        search: false,
-                        sortable: true,
-                        width: 120,
-                        span: 12,
-                        disabled: true,
-                        headerAlign: 'center',
-                        align: 'center',
-                        rules: [
-                            {
-                                required: false,
-                                message: '请输入面积(d㎡)',
-                                trigger: 'blur',
-                            },
-                        ],
-                    },
+                    // {
+                    //     label: '产品型号',
+                    //     prop: 'productType',
+                    //     search: false,
+                    //     sortable: true,
+                    //     disabled: true,
+                    //     width: 150,
+                    //     span: 12,
+                    //     headerAlign: 'center',
+                    //     align: 'center',
+                    //     rules: [
+                    //         {
+                    //             required: false,
+                    //             message: '请输入产品型号',
+                    //             trigger: 'blur',
+                    //         },
+                    //     ],
+                    // },
+                    // {
+                    //     label: '产品名称',
+                    //     prop: 'partName',
+                    //     search: false,
+                    //     sortable: true,
+                    //     disabled: true,
+                    //     span: 12,
+                    //     width: 150,
+                    //     headerAlign: 'center',
+                    //     align: 'left',
+                    //     rules: [
+                    //         {
+                    //             required: false,
+                    //             message: '请输入产品名称',
+                    //             trigger: 'blur',
+                    //         },
+                    //     ],
+                    // },
+                    // {
+                    //     label: '流程卡号',
+                    //     prop: 'cardNo',
+                    //     search: false,
+                    //     sortable: true,
+                    //     disabled: true,
+                    //     span: 12,
+                    //     width: 150,
+                    //     headerAlign: 'center',
+                    //     rules: [
+                    //         {
+                    //             required: false,
+                    //             message: '请输入流程卡号',
+                    //             trigger: 'blur',
+                    //         },
+                    //     ],
+                    // },
+                    // {
+                    //     label: '批次号',
+                    //     prop: 'batchNo',
+                    //     search: false,
+                    //     sortable: true,
+                    //     disabled: true,
+                    //     span: 12,
+                    //     width: 150,
+                    //     headerAlign: 'center',
+                    //     rules: [
+                    //         {
+                    //             required: false,
+                    //             message: '请输入批次号',
+                    //             trigger: 'blur',
+                    //         },
+                    //     ],
+                    // },
+                    // {
+                    //     label: '镀种',
+                    //     prop: 'plate',
+                    //     search: false,
+                    //     sortable: true,
+                    //     disabled: true,
+                    //     width: 150,
+                    //     span: 12,
+                    //     headerAlign: 'center',
+                    //     align: 'center',
+                    //     rules: [
+                    //         {
+                    //             required: false,
+                    //             message: '请输入镀种',
+                    //             trigger: 'blur',
+                    //         },
+                    //     ],
+                    // },
+                    // {
+                    //     label: '面积(d㎡)',
+                    //     prop: 'ypArea',
+                    //     search: false,
+                    //     sortable: true,
+                    //     width: 120,
+                    //     span: 12,
+                    //     disabled: true,
+                    //     headerAlign: 'center',
+                    //     align: 'center',
+                    //     rules: [
+                    //         {
+                    //             required: false,
+                    //             message: '请输入面积(d㎡)',
+                    //             trigger: 'blur',
+                    //         },
+                    //     ],
+                    // },
                     {
                         label: '生产标识',
                         prop: 'productIdent',
@@ -259,30 +295,30 @@ export default {
                             },
                         ],
                     },
-                    {
-                        label: '使用部门',
-                        prop: 'useDept',
-                        search: false,
-                        sortable: true,
-                        disabled: true,
-                        width: 120,
-                        span: 12,
-                        headerAlign: 'center',
-                        align: 'center',
-                        rules: [
-                        {
-                            required: true,
-                            message: '请输入使用部门',
-                            trigger: 'blur',
-                        },
-                        ],
-                    },
+                    // {
+                    //     label: '使用部门',
+                    //     prop: 'useDept',
+                    //     search: false,
+                    //     sortable: true,
+                    //     disabled: true,
+                    //     width: 120,
+                    //     span: 12,
+                    //     headerAlign: 'center',
+                    //     align: 'center',
+                    //     rules: [
+                    //     {
+                    //         required: true,
+                    //         message: '请输入使用部门',
+                    //         trigger: 'blur',
+                    //     },
+                    //     ],
+                    // },
                     {
                         label: '生产数量',
                         prop: 'ypQty',
                         search: false,
                         sortable: true,
-                        width: 120,
+                        // width: 120,
                         span: 12,
                         headerAlign: 'center',
                         align: 'center',
@@ -294,49 +330,49 @@ export default {
                         },
                         ],
                     },
-                    {
-                        label: '需求交期',
-                        prop: 'demandDate',
-                        search: false,
-                        sortable: true,
-                        width: 180,
-                        span: 12,
-                        headerAlign: 'center',
-                        align: 'center',
-                        type: 'datetime', // 改成 datetime
-                        valueFormat: 'YYYY-MM-DD HH:mm:ss', // 输出格式
-                        rules: [
-                        {
-                            required: true,
-                            message: '请输入需求交期',
-                            trigger: 'blur',
-                        },
-                        ],
-                    },
-                    {
-                        label: '计划员',
-                        prop: 'planUser',
-                        search: false,
-                        sortable: true,
-                        width: 120,
-                        span: 12,
-                        headerAlign: 'center',
-                        align: 'center',
-                        rules: [
-                        {
-                            required: true,
-                            message: '请输入计划员',
-                            trigger: 'blur',
-                        },
-                        ],
-                    },
+                    // {
+                    //     label: '需求交期',
+                    //     prop: 'demandDate',
+                    //     search: false,
+                    //     sortable: true,
+                    //     width: 180,
+                    //     span: 12,
+                    //     headerAlign: 'center',
+                    //     align: 'center',
+                    //     type: 'datetime', // 改成 datetime
+                    //     valueFormat: 'YYYY-MM-DD HH:mm:ss', // 输出格式
+                    //     rules: [
+                    //     {
+                    //         required: true,
+                    //         message: '请输入需求交期',
+                    //         trigger: 'blur',
+                    //     },
+                    //     ],
+                    // },
+                    // {
+                    //     label: '计划员',
+                    //     prop: 'planUser',
+                    //     search: false,
+                    //     sortable: true,
+                    //     width: 120,
+                    //     span: 12,
+                    //     headerAlign: 'center',
+                    //     align: 'center',
+                    //     rules: [
+                    //     {
+                    //         required: true,
+                    //         message: '请输入计划员',
+                    //         trigger: 'blur',
+                    //     },
+                    //     ],
+                    // },
                     {
                         label: '计划下达时间',
                         prop: 'releaseDate',
                         search: false,
                         sortable: true,
                         searchLabelWidth: 100,
-                        width: 180,
+                        // width: 180,
                         span: 12,
                         type: 'datetime', // 改成 datetime
                         valueFormat: 'YYYY-MM-DD HH:mm:ss', // 输出格式
@@ -350,79 +386,76 @@ export default {
                         },
                         ],
                     },
-                    {
-                        label: '订单状态',
-                        prop: 'status',
-                        search: false,
-                        sortable: true,
-                        span: 12,
-                        display: false,
-                        type: 'select',
-                        width: '140',
-                        headerAlign: 'center',
-                        align: 'center',
-                        dicData: [
-                        {
-                            value: 10000,
-                            label: '已同步',
-                        },
-                        {
-                            value: 10001,
-                            label: '订单异常',
-                        },
-                        {
-                            value: 10002,
-                            label: '未下达',
-                        },
-                        {
-                            value: 10003,
-                            label: '待排产',
-                        },
-                        {
-                            value: 10004,
-                            label: '待生产',
-                        },
-                        {
-                            value: 10005,
-                            label: '加工中',
-                        },
-                        {
-                            value: 10006,
-                            label: '排产异常',
-                        },
-                        {
-                            value: 10015,
-                            label: '已完工',
-                        },
-                        {
-                            value: 10021,
-                            label: '已关闭',
-                        },
-                        ],
-                    },
-                    {
-                        label: '备注',
-                        prop: 'validationMomo',
-                        search: false,
-                        sortable: true,
-                        span: 24,
-                        type: 'textarea',
-                        width: 150,
-                        headerAlign: 'center',
-                        align: 'left',
-                        // rules: [
-                        //   {
-                        //     required: true,
-                        //     message: '请输入备注',
-                        //     trigger: 'blur',
-                        //   },
-                        // ],
-                    },
+                    // {
+                    //     label: '订单状态',
+                    //     prop: 'status',
+                    //     search: false,
+                    //     sortable: true,
+                    //     span: 12,
+                    //     display: false,
+                    //     type: 'select',
+                    //     width: '140',
+                    //     headerAlign: 'center',
+                    //     align: 'center',
+                    //     dicData: [
+                    //     {
+                    //         value: 10000,
+                    //         label: '已同步',
+                    //     },
+                    //     {
+                    //         value: 10001,
+                    //         label: '订单异常',
+                    //     },
+                    //     {
+                    //         value: 10002,
+                    //         label: '未下达',
+                    //     },
+                    //     {
+                    //         value: 10003,
+                    //         label: '待排产',
+                    //     },
+                    //     {
+                    //         value: 10004,
+                    //         label: '待生产',
+                    //     },
+                    //     {
+                    //         value: 10005,
+                    //         label: '加工中',
+                    //     },
+                    //     {
+                    //         value: 10006,
+                    //         label: '排产异常',
+                    //     },
+                    //     {
+                    //         value: 10015,
+                    //         label: '已完工',
+                    //     },
+                    //     {
+                    //         value: 10021,
+                    //         label: '已关闭',
+                    //     },
+                    //     ],
+                    // },
+                    
                 ]
             }
         }
     },
     methods:{
+        reCalc(){
+            if(this.selectionList.length == 0){
+                this.$message.error('请至少选择一条数据！')
+                return
+            }
+            reCalculate({
+                ids:this.selectionList.map(item => item.id).join(',')
+            }).then(res =>{ 
+                if(res.data.code == 200){
+                    this.settleResult = res.data.data
+                    this.isOpen = true
+                }
+            })
+        },
         searchChange(params, done){
             this.query = params;
             this.page.currentPage = 1;