From 64e48b604b382aae844beab5db11fb1fd2acb60e Mon Sep 17 00:00:00 2001
From: jinna <jn517618@163.com>
Date: Wed, 27 May 2026 15:03:02 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/settlementAnomaly.vue          | 37 ++++++++++++++++---
 .../components/settlementCompleted.vue        | 34 +++++++++++++++--
 .../components/underReview.vue                | 30 +++++++++++++--
 .../components/unsettled.vue                  | 28 +++++++++++++-
 src/views/oem/oemOrderSettlement/index.vue    |  2 +-
 .../tankSolutionTaskDispose.vue               |  2 +-
 .../wasteGasSet/components/wasteGasRunRec.vue |  5 ++-
 7 files changed, 120 insertions(+), 18 deletions(-)

diff --git a/src/views/oem/oemOrderSettlement/components/settlementAnomaly.vue b/src/views/oem/oemOrderSettlement/components/settlementAnomaly.vue
index f9d961ff..c618ca23 100644
--- a/src/views/oem/oemOrderSettlement/components/settlementAnomaly.vue
+++ b/src/views/oem/oemOrderSettlement/components/settlementAnomaly.vue
@@ -12,6 +12,7 @@
                     </el-form-item>
                     <el-form-item>
                         <el-button type="primary"  @click="settlementFnNum" v-if="permission.settlementAnomaly_settlement">结算</el-button>
+                        <!-- <el-button type="danger" @click="">无需结算</el-button> -->
                     </el-form-item>
                 </el-form>
             </template>
@@ -22,6 +23,25 @@
             <template #menu>
 
             </template>
+            <template #ocIds-search="{ type }">
+                <jhSelect
+                :value="searchParams.ocIds"
+                @input="val => (searchParams.ocIds = val)"
+                placeholder="请搜索选择"
+                api-url="/blade-desk/BA/Oem/list"
+                echo-api="/blade-desk/BA/Oem/list"
+                echoParamsKey="ids"
+                echo-method="get"
+                api-method="get"
+                list-key="records"
+                total-key="total"
+                label-key="ocName"
+                labelPre="code"
+                value-key="id"
+                search-key="code"
+                :debounce-time="500"
+                />
+            </template>
 
         </avue-crud>
        <settlementDailog v-if="isOpen" :showDialog="isOpen" :type="settlementType" :statementList="selectionList" :settleResult="settleResult" @closeDialog="closeDialog" @refresh="refreshTable"></settlementDailog>
@@ -188,16 +208,21 @@ export default {
                             value:"id"
                         },
                     },
-                     {
+                    {
                         label: '结算大类',
-                        prop: 'statementCategory',
+                        prop: 'statementCategoryId',
                         sortable: 'custom',
+                        type:"select",
                         filter: true,
                         span: 24,
                         search: true,
                         width: 120,
                         searchOrder:19,
-
+                        dicUrl:"/api/blade-desk/mesOemStatementCategory/listForSelect",
+                        props:{
+                            label:'statementCategory',
+                            value:"id"
+                        },
                     },
                     {
                         label: '流程卡号',
@@ -349,6 +374,7 @@ export default {
                         prop: 'memo',
                         sortable: true,
                         filterable: true,
+                        clearable:true,
                         span: 24,
                         search: true,
                         width: 120,
@@ -433,7 +459,7 @@ export default {
                     },
                     {
                         label: '外协厂商',
-                        prop: 'ocId',
+                        prop: 'ocIds',
                         sortable: true,
                         filterable: true,
                         span: 24,
@@ -620,7 +646,8 @@ export default {
                 ...this.query,
                 postPlatingStorageTimeStart:this.query && this.query.putStoreTime && this.query.putStoreTime.length != 0 && this.query.putStoreTime[0],
                 postPlatingStorageTimeEnd:this.query && this.query.putStoreTime && this.query.putStoreTime.length != 0 && this.query.putStoreTime[1],
-                memo:this.query && this.query.memo && typeof(this.query.memo) == 'object' && this.query.memo.length != 0 ? this.query.memo.join(';') : this.query.memo,
+                memo:this.query && this.query.memo && typeof(this.query.memo) == 'object' && this.query.memo.length != 0 ? 
+                this.query.memo.join(';') : this.query.memo && this.query.memo.indexOf(',') != -1 ? this.query.memo.split(',').join(';') : this.query.memo,
                 // memo:this.query && this.query.memo && this.query.memo.length != 0 && this.query.memo.join(';'),
             }
             if(params.putStoreTime) delete params.putStoreTime;
diff --git a/src/views/oem/oemOrderSettlement/components/settlementCompleted.vue b/src/views/oem/oemOrderSettlement/components/settlementCompleted.vue
index cdd07f9c..50a4c594 100644
--- a/src/views/oem/oemOrderSettlement/components/settlementCompleted.vue
+++ b/src/views/oem/oemOrderSettlement/components/settlementCompleted.vue
@@ -8,6 +8,25 @@
             <template #menu-left>
                 <el-button type="primary" @click="pushERP" v-if="permission.settlementCompleted_pushERP">推送ERP</el-button>
             </template>
+            <template #ocIds-search="{ type }">
+                <jhSelect
+                :value="searchParams.ocIds"
+                @input="val => (searchParams.ocIds = val)"
+                placeholder="请搜索选择"
+                api-url="/blade-desk/BA/Oem/list"
+                echo-api="/blade-desk/BA/Oem/list"
+                echoParamsKey="ids"
+                echo-method="get"
+                api-method="get"
+                list-key="records"
+                total-key="total"
+                label-key="ocName"
+                labelPre="code"
+                value-key="id"
+                search-key="code"
+                :debounce-time="500"
+                />
+            </template>
             <template #menu-right>
 
             </template>
@@ -181,16 +200,21 @@ export default {
                         },
                         searchOrder:9,
                     },
-                     {
+                    {
                         label: '结算大类',
-                        prop: 'statementCategory',
+                        prop: 'statementCategoryId',
                         sortable: 'custom',
+                        type:"select",
                         filter: true,
                         span: 24,
                         search: true,
                         width: 120,
                         searchOrder:19,
-
+                        dicUrl:"/api/blade-desk/mesOemStatementCategory/listForSelect",
+                        props:{
+                            label:'statementCategory',
+                            value:"id"
+                        },
                     },
                     {
                         label: '厂家代码',
@@ -636,7 +660,9 @@ export default {
                 ...this.query,
                 postPlatingStorageTimeStart:this.query && this.query.putStoreTime && this.query.putStoreTime.length != 0 && this.query.putStoreTime[0],
                 postPlatingStorageTimeEnd:this.query && this.query.putStoreTime && this.query.putStoreTime.length != 0 && this.query.putStoreTime[1],
-                memo:this.query && this.query.memo && typeof(this.query.memo) == 'object' && this.query.memo.length != 0 ? this.query.memo.join(';') : this.query.memo,
+                // memo:this.query && this.query.memo && typeof(this.query.memo) == 'object' && this.query.memo.length != 0 ? this.query.memo.join(';') : this.query.memo,
+                memo:this.query && this.query.memo && typeof(this.query.memo) == 'object' && this.query.memo.length != 0 ? 
+                this.query.memo.join(';') : this.query.memo && this.query.memo.indexOf(',') != -1 ? this.query.memo.split(',').join(';') : this.query.memo,
             }
             if(params.putStoreTime) delete params.putStoreTime;
             getStatement(params).then(res =>{
diff --git a/src/views/oem/oemOrderSettlement/components/underReview.vue b/src/views/oem/oemOrderSettlement/components/underReview.vue
index e73f91d6..774d065f 100644
--- a/src/views/oem/oemOrderSettlement/components/underReview.vue
+++ b/src/views/oem/oemOrderSettlement/components/underReview.vue
@@ -10,6 +10,25 @@
                 <el-button type="primary"  @click="settleConfirm" v-if="permission.underReview_settlementConfirm">结算确认</el-button>
                 <el-button type="primary"  @click="initiateReview" v-if="permission.underReview_initiateCheck">发起审核</el-button>
             </template>
+            <template #ocIds-search="{ type }">
+                <jhSelect
+                :value="searchParams.ocIds"
+                @input="val => (searchParams.ocIds = val)"
+                placeholder="请搜索选择"
+                api-url="/blade-desk/BA/Oem/list"
+                echo-api="/blade-desk/BA/Oem/list"
+                echoParamsKey="ids"
+                echo-method="get"
+                api-method="get"
+                list-key="records"
+                total-key="total"
+                label-key="ocName"
+                labelPre="code"
+                value-key="id"
+                search-key="code"
+                :debounce-time="500"
+                />
+            </template>
         </avue-crud>
         <!-- 结算确认 -->
         <el-dialog title="结算确认" :modelValue="isConfirm" append-to-body width="30%">
@@ -226,16 +245,21 @@ export default {
                             value:"id"
                         },
                     },
-                     {
+                    {
                         label: '结算大类',
-                        prop: 'statementCategory',
+                        prop: 'statementCategoryId',
                         sortable: 'custom',
+                        type:"select",
                         filter: true,
                         span: 24,
                         search: true,
                         width: 120,
                         searchOrder:19,
-
+                        dicUrl:"/api/blade-desk/mesOemStatementCategory/listForSelect",
+                        props:{
+                            label:'statementCategory',
+                            value:"id"
+                        },
                     },
                     {
                         label: '厂家代码',
diff --git a/src/views/oem/oemOrderSettlement/components/unsettled.vue b/src/views/oem/oemOrderSettlement/components/unsettled.vue
index 1623b053..f0e81e6d 100644
--- a/src/views/oem/oemOrderSettlement/components/unsettled.vue
+++ b/src/views/oem/oemOrderSettlement/components/unsettled.vue
@@ -22,6 +22,25 @@
                 <el-button type="primary" @click="handleSupplement" v-if="permission.unsettled_suppleSettlement">补充结算</el-button>
             </template>
             <template #menu></template>
+            <template #ocIds-search="{ type }">
+                <jhSelect
+                :value="searchParams.ocIds"
+                @input="val => (searchParams.ocIds = val)"
+                placeholder="请搜索选择"
+                api-url="/blade-desk/BA/Oem/list"
+                echo-api="/blade-desk/BA/Oem/list"
+                echoParamsKey="ids"
+                echo-method="get"
+                api-method="get"
+                list-key="records"
+                total-key="total"
+                label-key="ocName"
+                labelPre="code"
+                value-key="id"
+                search-key="code"
+                :debounce-time="500"
+                />
+            </template>
         </avue-crud>
         <!-- 预结算弹窗 -->
         <el-dialog title="预结算" append-to-body :modelValue="openSettle" width="30%">
@@ -269,14 +288,19 @@ export default {
                     // },
                     {
                         label: '结算大类',
-                        prop: 'statementCategory',
+                        prop: 'statementCategoryId',
                         sortable: 'custom',
+                        type:"select",
                         filter: true,
                         span: 24,
                         search: true,
                         width: 120,
                         searchOrder:19,
-
+                        dicUrl:"/api/blade-desk/mesOemStatementCategory/listForSelect",
+                        props:{
+                            label:'statementCategory',
+                            value:"id"
+                        },
                     },
                     {
                         label: '厂家代码',
diff --git a/src/views/oem/oemOrderSettlement/index.vue b/src/views/oem/oemOrderSettlement/index.vue
index 40227623..c41672e7 100644
--- a/src/views/oem/oemOrderSettlement/index.vue
+++ b/src/views/oem/oemOrderSettlement/index.vue
@@ -2,9 +2,9 @@
     <basic-container>
         <el-tabs v-model="activeName" class="demo-tabs" @tab-change="tabPositionChange">
             <el-tab-pane label="未结算" name="1" v-if="permission.unsettled_list"></el-tab-pane>
+            <el-tab-pane label="结算异常" name="3" v-if="permission.settlementAnomaly_list"></el-tab-pane>
             <el-tab-pane label="待确认" name="2" v-if="permission.underReview_list"></el-tab-pane>
             <!-- <el-tab-pane label="结算中" name="2"></el-tab-pane> -->
-            <el-tab-pane label="结算异常" name="3" v-if="permission.settlementAnomaly_list"></el-tab-pane>
             <el-tab-pane label="审核中" name="6" v-if="permission.inReview_list"></el-tab-pane>
              <el-tab-pane label="结算完成" name="4" v-if="permission.settlementCompleted_list"></el-tab-pane>
         </el-tabs>
diff --git a/src/views/qualityManagement/tankSolutionSystem/tankSolutionTaskDispose.vue b/src/views/qualityManagement/tankSolutionSystem/tankSolutionTaskDispose.vue
index 216b425a..976bce48 100644
--- a/src/views/qualityManagement/tankSolutionSystem/tankSolutionTaskDispose.vue
+++ b/src/views/qualityManagement/tankSolutionSystem/tankSolutionTaskDispose.vue
@@ -9,7 +9,7 @@
             <template #menu-left>
                 <el-button type="primary" @click="batchSet()" v-if="permission.tankSolutionTaskDispose_batchFill">批量填报</el-button>
                 <el-button type="primary" @click="checkFn()" v-if="permission.tankSolutionTaskDispose_check">审核</el-button>
-                <el-button type="primary" @click="getMedicineFn()" v-if="permission.tankSolutionTaskDispose_medicine">领药</el-button>
+                <el-button type="primary" @click="getMedicineFn()" v-if="permission.tankSolutionTaskDispose_medicine">加药</el-button>
             </template>
             <template #menu="scope">
                 <el-button type="text" @click="handleView(scope.row, 'view')" v-if="permission.tankSolutionTaskDispose_detail">详情</el-button>
diff --git a/src/views/safetyManagement/wasteGasSet/components/wasteGasRunRec.vue b/src/views/safetyManagement/wasteGasSet/components/wasteGasRunRec.vue
index f3c93595..1f0bcdce 100644
--- a/src/views/safetyManagement/wasteGasSet/components/wasteGasRunRec.vue
+++ b/src/views/safetyManagement/wasteGasSet/components/wasteGasRunRec.vue
@@ -313,7 +313,7 @@ export default {
                 value: 1,
               },
               {
-                label: '电器控制',
+                label: '电气控制',
                 prop: 'dqkz',
                 width: 120,
                 type: 'switch',
@@ -346,7 +346,8 @@ export default {
                 value: 1,
               },
               {
-                label: '循环水箱',
+                label: '循环系统',
+                // label: '循环水箱',
                 prop: 'xhsx',
                 width: 120,
                 type: 'switch',