From 546f33823aeb5c8c1c3489881492ed8906df9f7d Mon Sep 17 00:00:00 2001
From: jinna <jn517618@163.com>
Date: Thu, 30 Apr 2026 14:30:46 +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

---
 src/api/costManagement/costConfiguration.js   |  9 ++++++-
 .../components/batchAddProcess.vue            |  4 +--
 .../components/processMaintenance.vue         |  2 +-
 .../components/coatingAddDialog.vue           | 22 +++++++--------
 .../coatingMater/assayedContent.vue           | 27 +++++++++++++++++--
 .../coatingMater/assayedContentDialog.vue     |  6 ++---
 .../statisticalAnalysis/index.vue             | 14 +++++-----
 7 files changed, 57 insertions(+), 27 deletions(-)

diff --git a/src/api/costManagement/costConfiguration.js b/src/api/costManagement/costConfiguration.js
index 325b3633..3aac7cd2 100644
--- a/src/api/costManagement/costConfiguration.js
+++ b/src/api/costManagement/costConfiguration.js
@@ -47,4 +47,11 @@ export const deleteProcess = params =>
     url: '/api/blade-desk/costCalculationGoods/remove',
     method: 'post',
     params
-  });
\ No newline at end of file
+  });
+
+export const getWorkCenterList = () =>{
+  return request({
+    url: '/api/blade-desk/BA/WorkCenter/listForSelect',
+    method: 'get',
+  });
+}
\ No newline at end of file
diff --git a/src/views/costManagement/components/batchAddProcess.vue b/src/views/costManagement/components/batchAddProcess.vue
index b5640467..22a9972f 100644
--- a/src/views/costManagement/components/batchAddProcess.vue
+++ b/src/views/costManagement/components/batchAddProcess.vue
@@ -88,8 +88,8 @@
 </template>
 
 <script>
-import { getWorkCenterList } from '@/api/processManagement/addQuantity.js';
-import {getProcessList,addCost} from "@/api/costManagement/costConfiguration.js"
+// import { getWorkCenterList } from '@/api/processManagement/addQuantity.js';
+import {getProcessList,addCost,getWorkCenterList} from "@/api/costManagement/costConfiguration.js"
 export default {
     props:{
         title:{
diff --git a/src/views/costManagement/components/processMaintenance.vue b/src/views/costManagement/components/processMaintenance.vue
index 88e65e52..25236513 100644
--- a/src/views/costManagement/components/processMaintenance.vue
+++ b/src/views/costManagement/components/processMaintenance.vue
@@ -143,7 +143,7 @@ export default {
                         search: true,
                         sortable: 'custom',
                         overHidden: true,
-                        dicUrl: '/blade-desk/bsWorkCenter/getList',
+                        dicUrl: '/api/blade-desk/BA/WorkCenter/listForSelect',
                         props: {
                         label: 'wcName',
                         value: 'id',
diff --git a/src/views/productionManagement/components/coatingAddDialog.vue b/src/views/productionManagement/components/coatingAddDialog.vue
index 841c0645..d148c25d 100644
--- a/src/views/productionManagement/components/coatingAddDialog.vue
+++ b/src/views/productionManagement/components/coatingAddDialog.vue
@@ -10,13 +10,13 @@
     class="content-box"
   >
     <el-form :inline="true" v-model="submitForm">
-      <el-form-item label="银钾系数" prop="coefficient" v-if="searchForm.materalType == 2">
+      <el-form-item label="银钾系数" prop="coefficient" v-if="searchForm.plateGoodsCode == '04-05-024'">
         <el-input placeholder="请输入银钾系数" v-model="submitForm.coefficient"></el-input>
       </el-form-item>
-      <el-form-item :label="labelValue + '需求量'" prop="" v-if="searchForm.materalType == 1">
+      <el-form-item :label="labelValue + '需求量'" prop="" v-if="searchForm.plateGoodsCode == '04-05-023'">
         <el-input placeholder="请输入需求量" v-model="submitForm.goodsQuantity"></el-input>
       </el-form-item>
-      <el-form-item label="银钾需求量" prop="saveBoardVal" v-if="searchForm.materalType == 2">
+      <el-form-item label="银钾需求量" prop="saveBoardVal" v-if="searchForm.plateGoodsCode == '04-05-024'">
         <el-input placeholder="请输入银钾需求量" v-model="submitForm.goodsQuantity"></el-input>
       </el-form-item>
       <!-- <el-form-item>
@@ -40,10 +40,10 @@
               <!-- <el-option label="作业中心二" value="2"></el-option> -->
             </el-select>
           </el-form-item>
-          <el-form-item label="物料类型" prop="materalType">
-            <el-radio-group v-model="searchForm.materalType" @input="changeType">
-              <el-radio :label="1">金钾（04-05-023）</el-radio>
-              <el-radio :label="2">银钾（04-05-024）</el-radio>
+          <el-form-item label="物料类型" prop="plateGoodsCode">
+            <el-radio-group v-model="searchForm.plateGoodsCode" @input="changeType">
+              <el-radio label="04-05-023">金钾（04-05-023）</el-radio>
+              <el-radio label="04-05-024">银钾（04-05-024）</el-radio>
             </el-radio-group>
           </el-form-item>
           <el-form-item>
@@ -191,7 +191,7 @@ export default {
       loading: false,
       submitForm: {},
       searchForm: {
-        materalType: 1,
+        plateGoodsCode: '04-05-023',
       },
       labelValue: '金钾',
       tableData: [],
@@ -205,7 +205,7 @@ export default {
     console.log('11111111111');
     this.submitForm = {};
     this.searchForm = {
-      materalType: 1,
+      plateGoodsCode: '04-05-023',
     };
     this.tableData = [];
     this.getWorkCenterList();
@@ -301,14 +301,14 @@ export default {
           wcId: this.searchForm.wcId,
           plateGoodsCode: plateCode,
           goodsDemand: this.totalNum,
-          // coefficient: this.searchForm.materalType == 2 && this.searchForm.coefficient ? this.searchForm.coefficient : 0
+          // coefficient: this.searchForm.plateGoodsCode == '04-05-024' && this.searchForm.coefficient ? this.searchForm.coefficient : 0
         },
         detailList: this.selectionList.map(item => {
           return { yoId: item.id };
         }),
       };
 
-      if (this.searchForm.materalType != 2) {
+      if (this.searchForm.plateGoodsCode != '04-05-024') {
         // const { coefficient, ...validData } = params;
         console.log('params------------', params);
         add(params).then(res => {
diff --git a/src/views/productionManagement/components/coatingMater/assayedContent.vue b/src/views/productionManagement/components/coatingMater/assayedContent.vue
index 4001d56b..3b2c014f 100644
--- a/src/views/productionManagement/components/coatingMater/assayedContent.vue
+++ b/src/views/productionManagement/components/coatingMater/assayedContent.vue
@@ -17,6 +17,7 @@
       @size-change="sizeChange"
       @refresh-change="refreshChange"
       @on-load="onLoad"
+      @sort-change="sortChange"
     >
       <template #menu-left="row">
         <el-button type="primary" @click="handleAdd">新增</el-button>
@@ -58,6 +59,9 @@ export default {
       loading: false,
       data: [],
       form: {},
+      query:{
+        descs: 'ASSAY_TIME'
+      },
       viewType:"",
       addDialog: false,
       showDialog: false,
@@ -115,6 +119,7 @@ export default {
               overflow: true,
               search: true,
               headerAlign: 'center',
+              sortable:"custom",
               align: 'center',
               searchLabelWidth: 80,
               rules: [
@@ -134,6 +139,7 @@ export default {
               label: '化验人',
               prop: 'assayManName',
               span: 24,
+              // sortable:"custom",
               overflow: true,
               search: false,
               headerAlign: 'center',
@@ -152,6 +158,7 @@ export default {
               prop: 'assayTime',
               span: 24,
               overflow: true,
+              sortable:"custom",
               search: false,
               headerAlign: 'center',
               align: 'center',
@@ -169,6 +176,7 @@ export default {
               prop: 'status',
               span: 24,
               overflow: true,
+              sortable:"custom",
               search: true,
               type: 'select',
               headerAlign: 'center',
@@ -210,12 +218,27 @@ export default {
     // this.option.column = coatingColumnData[this.tabPosition];
   },
   methods: {
+    // 表格排序
+    sortChange({ prop, order }) {
+      this.query.ascs = undefined
+      this.query.descs = undefined
+      const orderByField = prop.replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase();
+      const orderByFieldKey =  order === 'ascending' ? 'ascs' : 'descs';
+      this.query[orderByFieldKey] = orderByField;
+      // // 重新加载数据
+      this.onLoad(this.page, this.query);
+    },
     searchReset() {
-      this.query = {};
+      this.query = {
+        descs: 'ASSAY_TIME'
+      };
       this.onLoad(this.page);
     },
     searchChange(params, done) {
-      this.query = params;
+      this.query = {
+        ...params,
+        descs: 'ASSAY_TIME'
+      };
       this.page.currentPage = 1;
       this.onLoad(this.page, params);
       done();
diff --git a/src/views/productionManagement/components/coatingMater/assayedContentDialog.vue b/src/views/productionManagement/components/coatingMater/assayedContentDialog.vue
index cead8896..a23713b8 100644
--- a/src/views/productionManagement/components/coatingMater/assayedContentDialog.vue
+++ b/src/views/productionManagement/components/coatingMater/assayedContentDialog.vue
@@ -26,10 +26,10 @@
             <!-- 修复日期选择器v-model绑定错误 -->
             <el-date-picker
               v-model="ruleForm.assayTime"
-              type="date"
+              type="datetime"
               placeholder="请选择"
-              format="YYYY-MM-DD"
-              value-format="YYYY-MM-DD"
+              format="YYYY-MM-DD HH:mm:ss"
+              value-format="YYYY-MM-DD HH:mm:ss"
             />
           </el-form-item>
         </el-col>
diff --git a/src/views/productionSchedulingPlan/statisticalAnalysis/index.vue b/src/views/productionSchedulingPlan/statisticalAnalysis/index.vue
index b1fe3577..53c651ff 100644
--- a/src/views/productionSchedulingPlan/statisticalAnalysis/index.vue
+++ b/src/views/productionSchedulingPlan/statisticalAnalysis/index.vue
@@ -158,49 +158,49 @@ export default {
             label: '作业中心',
             prop: 'workCenterName',
             search: false,
-            sortable: true,
+            sortable: "custom",
             span: 12,
           },
           {
             label: '总订单量',
             prop: 'totalCount',
             search: false,
-            sortable: true,
+            sortable: "custom",
             span: 12,
           },
           {
             label: '已排产订单量',
             prop: 'schedulingCount',
             search: false,
-            sortable: true,
+            sortable: "custom",
             span: 12,
           },
           {
             label: '未排产订单量',
             prop: 'unschedulingCount',
             search: false,
-            sortable: true,
+            sortable: "custom",
             span: 12,
           },
           {
             label: '排产异常量',
             prop: 'errorCount',
             search: false,
-            sortable: true,
+            sortable: "custom",
             span: 12,
           },
           {
             label: '排产率',
             prop: 'schedulingRate',
             search: false,
-            sortable: true,
+            sortable: "custom",
             span: 12,
           },
           {
             label: '订单接收时间',
             prop: 'cycledate',
             search: true,
-            sortable: true,
+            sortable: "custom",
             span: 12,
             hide: true,
             type: 'date',