From 47d096ad029b67093cd17fd41b905833f9413c61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E9=9B=AA?= <1617763071@qq.com>
Date: Thu, 19 Mar 2026 16:13:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E8=BF=87=E7=A8=8B=E8=A1=A8?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/exemption/exemption.js                |  22 +-
 src/api/oem/oem.js                            |  42 ++++
 src/components/basic-import/main.vue          |  77 +++++-
 src/views/exemption/components/addDialog.vue  |  98 +++++---
 .../exemption/components/checkDialog.vue      |   3 -
 src/views/exemption/index.vue                 |  89 +------
 .../oem/proTask/components/oemMaintenance.vue | 236 +++++++++++++++---
 src/views/oem/proTask/inPlantProcessOem.vue   |  26 +-
 src/views/oem/proTask/index.vue               |   2 +-
 9 files changed, 420 insertions(+), 175 deletions(-)
 create mode 100644 src/api/oem/oem.js

diff --git a/src/api/exemption/exemption.js b/src/api/exemption/exemption.js
index d3c1c35..60ae69e 100644
--- a/src/api/exemption/exemption.js
+++ b/src/api/exemption/exemption.js
@@ -63,5 +63,23 @@ export const userList = (current, size, params) => {
     },
   });
 };
-
-
+export const getUserPage = (current, size, params) => {
+  return request({
+    url: '/blade-system/user/page',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    },
+  });
+};
+  export const getPostItem = userId => {
+  return request({
+    url: '/blade-system/user/getPost',
+    method: 'get',
+    params: {
+      userId,
+    },
+  });
+};
diff --git a/src/api/oem/oem.js b/src/api/oem/oem.js
new file mode 100644
index 0000000..ec53586
--- /dev/null
+++ b/src/api/oem/oem.js
@@ -0,0 +1,42 @@
+
+import request from '@/axios';
+
+export const pageList = (current, size, params) => {
+  return request({
+    url: '/blade-desk/mesOemSpecialPro/page',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    },
+  });
+};
+
+export const saveItem = params => {
+  return request({
+    url: '/blade-desk/mesOemSpecialPro/save',
+    method: 'post',
+    data: params,
+  });
+};
+export const updateItem = params => {
+  return request({
+    url: '/blade-desk/mesOemSpecialPro/update',
+    method: 'post',
+    data: params,
+  });
+};
+
+
+  export const removeItem = ids => {
+  return request({
+    url: '/blade-desk/mesOemSpecialPro/remove',
+    method: 'post',
+    params: {
+      ids,
+    },
+  });
+};
+
+
diff --git a/src/components/basic-import/main.vue b/src/components/basic-import/main.vue
index 26513f3..565f773 100644
--- a/src/components/basic-import/main.vue
+++ b/src/components/basic-import/main.vue
@@ -74,6 +74,11 @@ export default {
             }
         }
     },
+    watch: {
+        isShow(newVal) {
+            this.importBox = newVal;
+        }
+    },
     mounted(){
         console.log('isShowImport=================',this.isShow)
         this.importBox = this.isShow
@@ -84,10 +89,74 @@ export default {
             this.$emit('closeDialog',val);
         },
         handleTemplate() {
-            exportBlob(
-                `${this.templateUrl}?${this.website.tokenHeader}=${getToken()}`
-            ).then(res => {
-                downloadXls(res.data, this.templateName);
+            const url = `${this.templateUrl}?${this.website.tokenHeader}=${getToken()}`;
+            console.log('下载模板URL:', url);
+            console.log('模板文件名:', this.templateName);
+
+            exportBlob(url).then(res => {
+                console.log('API返回状态:', res.status);
+                console.log('res.data类型:', typeof res.data);
+                console.log('res.data instanceof Blob:', res.data instanceof Blob);
+                console.log('res.data size:', res.data?.size);
+                console.log('res.data type:', res.data?.type);
+
+                if (!res.data || res.data.size === 0) {
+                    this.$message.error('下载失败，文件内容为空');
+                    return;
+                }
+
+                // 验证文件内容是否是有效的Excel文件
+                this.validateExcelBlob(res.data).then(isValid => {
+                    if (!isValid) {
+                        console.error('下载的文件不是有效的Excel文件');
+                        this.$message.error('下载的文件格式不正确');
+                        return;
+                    }
+
+                    // 确保文件名有正确的扩展名
+                    let fileName = this.templateName;
+                    if (!fileName.endsWith('.xlsx') && !fileName.endsWith('.xls')) {
+                        fileName += '.xlsx';
+                    }
+
+                    console.log('开始下载文件:', fileName);
+                    downloadXls(res.data, fileName);
+                    this.$message.success('模板下载成功');
+                }).catch(error => {
+                    console.error('验证文件失败:', error);
+                    // 即使验证失败也尝试下载
+                    let fileName = this.templateName;
+                    if (!fileName.endsWith('.xlsx') && !fileName.endsWith('.xls')) {
+                        fileName += '.xlsx';
+                    }
+                    downloadXls(res.data, fileName);
+                    this.$message.success('模板下载成功');
+                });
+            }).catch(error => {
+                console.error('下载模板失败:', error);
+                this.$message.error('下载失败，请检查网络或稍后重试');
+            });
+        },
+        validateExcelBlob(blob) {
+            return new Promise((resolve) => {
+                const reader = new FileReader();
+                reader.onloadend = (e) => {
+                    const arr = new Uint8Array(e.target.result);
+                    const header = Array.from(arr.slice(0, 8)).map(b => b.toString(16).padStart(2, '0')).join(' ');
+                    console.log('文件头 (前8字节):', header);
+
+                    // 检查XLSX (ZIP格式): 50 4B 03 04
+                    const isXlsx = header.startsWith('50 4b 03 04');
+                    // 检查XLS: D0 CF 11 E0 A1 B1 1A E1
+                    const isXls = header.toLowerCase().startsWith('d0 cf 11 e0 a1 b1 1a e1');
+
+                    console.log('是XLSX格式:', isXlsx);
+                    console.log('是XLS格式:', isXls);
+
+                    resolve(isXlsx || isXls);
+                };
+                reader.onerror = () => resolve(true); // 如果读取失败，假设文件是有效的
+                reader.readAsArrayBuffer(blob.slice(0, 8));
             });
         },
         uploadAfter(res, done, loading, column) {
diff --git a/src/views/exemption/components/addDialog.vue b/src/views/exemption/components/addDialog.vue
index 00d3c05..8c6fced 100644
--- a/src/views/exemption/components/addDialog.vue
+++ b/src/views/exemption/components/addDialog.vue
@@ -24,7 +24,7 @@
   </el-dialog>
 </template>
 <script>
-import { saveItem, updateItem ,userList} from '@/api/exemption/exemption';
+import { saveItem, updateItem, getPostItem } from '@/api/exemption/exemption';
 // import {
 //   updateProcess,
 // } from '../../api/flowManagement/index';
@@ -48,29 +48,45 @@ export default {
       attachLink:'',
       openShow: false,
       formData: {},
-      userListData: [],
       option: {
         submitBtn: false,
         emptyBtn: false,
         labelWidth: 100,
         column: [
-              {
+           {
             label: '提出人',
             prop: 'reportUserId',
-            type: 'select',
+            search: false,
+            sortable: true,
+            filter: true,
             span: 24,
-            rules: [{ required: true, message: '请选择提出人', trigger: 'change' }],
-            dicData: [],
+            headerAlign: 'center',
+            align: 'center',
+            type: 'select',
+            dicUrl: '/blade-system/user/page?size=999999&current=1',
+            filterable: true,
+            searchLabelWidth: 50,
             props: {
-              label: 'label',
-              value: 'value',
+              label: 'realName',
+              value: 'id',
+              res: 'data.records',
+            },
+            rules: [
+              {
+                required: true,
+                message: '请输入提出人',
+                trigger: 'change',
+              },
+            ],
+            change: (value) => {
+              this.handleReportUserChange(value);
             },
-            filterable: true,
           },
           {
             label: '岗位',
             prop: 'postName',
             span: 24,
+            disabled: true,
             rules: [{ required: true, message: '请输入岗位', trigger: 'blur' }],
           },
           {
@@ -139,7 +155,7 @@ export default {
   },
   mounted() {
     this.openShow = this.showDialog;
-    this.loadUserList({ currentPage: 1, pageSize: 10 });
+
   },
   watch: {
     rowItem: {
@@ -164,33 +180,6 @@ export default {
     },
   },
   methods: {
-     loadUserList(page, params = {}) {
-
-      userList(page.currentPage, page.pageSize).then(res => {
-        console.log('用户列表接口返回', res);
-        if (res.data.code == 200) {
-          const users = res.data.data;
-            console.log('用户列表数据', users);
-
-          this.userListData = users.map(user => ({
-            label: user.realName || user.name,
-            value: String(user.id)
-          }));
-          console.log('转换后的 userListData', this.userListData);
-
-          // 同步到 option 的 dicData
-          this.option.column[0].dicData = this.userListData;
-        }
-      }).catch(error => {
-        console.error('获取用户列表失败', error);
-      });
-    },
-      uploadAfter(res, done, loading, column) {
-      console.log('uploadAfter1', res, done, loading, column);
-      this.attachLink  = res.link;
-      // this.fileForm.excelFile = [res.link];
-      // done();
-    },
     uploadDelete(file, column) {
       console.log('uploadDelete', file, column);
       this.attachLink = '';
@@ -198,6 +187,32 @@ export default {
     uploadExceed(limit, files, fileList, column) {
       this.$message.error('最多只能上传一个文件');
     },
+    // 处理提出人变化，获取岗位信息
+    handleReportUserChange(value) {
+      console.log('【提出人变化】reportUserId:', value);
+      // 增强验证：过滤掉 undefined、null、空字符串等情况
+      if (!value || value.value === undefined || value.value === null || value.value === '') {
+        this.formData.postName = '';
+        console.log('提出人值为空，跳过获取岗位信息');
+        return;
+      }
+      getPostItem(value.value).then(res => {
+        console.log('【获取岗位信息】响应:', res.data.code);
+        if (res.data.code == 200) {
+          const postInfo = res.data.data;
+          console.log('【岗位信息】:', postInfo[0].postName);
+          // 根据后端返回的数据结构设置岗位名称
+          if (postInfo) {
+            // 尝试不同的字段名
+            this.formData.postName = postInfo[0].postName       }
+        }  else {
+          console.warn('获取岗位信息失败:', res.data.msg || '未知错误');
+        }
+      }).catch(error => {
+        console.error('获取岗位信息失败:', error);
+        // 不影响用户继续操作，只是岗位名称为空
+      });
+    },
    
     closeDialog() {
       this.openShow = false;
@@ -209,6 +224,9 @@ export default {
     submit() {
       this.$refs.form.validate(async valid => {
         if (valid) {
+          console.log('【表单验证通过】formData:', this.formData);
+          console.log('【表单验证通过】reportUserId:', this.formData.reportUserId);
+
           let params = {
             ...this.formData,
           };
@@ -222,12 +240,16 @@ export default {
             params.happenDate = `${year}-${month}-${day}`;
           }
 
-          // 添加文件URL
+          // 添加文件URL，如果是数组则转换为逗号分隔的字符串
           if (this.attachLink) {
             params.fileUrl = this.attachLink;
+          } else if (Array.isArray(params.fileUrl)) {
+            // 将fileUrl数组转换为逗号分隔的字符串
+            params.fileUrl = params.fileUrl.map(item => item.link).join(',');
           }
 
           console.log('【表单提交】', this.infoTitle, params);
+          console.log('【表单提交】reportUserId值:', params.reportUserId);
 
           try {
             let res;
diff --git a/src/views/exemption/components/checkDialog.vue b/src/views/exemption/components/checkDialog.vue
index 211ec9a..21bfce6 100644
--- a/src/views/exemption/components/checkDialog.vue
+++ b/src/views/exemption/components/checkDialog.vue
@@ -11,9 +11,6 @@
   </el-dialog>
 </template>
 <script>
-// import {
-//   updateProcess,
-// } from '../../api/flowManagement/index';
 
 import { reviewDataItem} from '@/api/exemption/exemption';
 export default {
diff --git a/src/views/exemption/index.vue b/src/views/exemption/index.vue
index 5022f7b..45495a8 100644
--- a/src/views/exemption/index.vue
+++ b/src/views/exemption/index.vue
@@ -267,7 +267,7 @@ export default {
   },
   methods: {
     loadUserList(page, params = {}) {
-      
+      console.log(1213999999999999999999999999999999999999999);
       userList(page.currentPage, page.pageSize).then(res => {
         
         if (res.data.code == 200) {
@@ -278,7 +278,6 @@ export default {
             label: user.realName || user.name,
             value: String(user.id)
           }));
-         
         }
       }).catch(error => {
         console.error('获取用户列表失败', error);
@@ -391,16 +390,12 @@ export default {
       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: '操作成功!',
       });
     },
- onLoad(page, params = {}) {
-    
+ onLoad(page, params = {}) { 
       exemptionList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         console.log(res,'00000001');
         
@@ -411,87 +406,9 @@ export default {
        
       });
     },
-    // onLoad(page, params = {}) {
-    //   this.data = [
-    //     {
-    //       arr1: '张三',
-    //       arr2: '热表分厂',
-    //       arr3: '2026-01-09',
-    //       arr4: '问题描述1',
-    //       arr5: '正常操作',
-    //       arr6: '下次注意',
-    //       arr7: '正常损耗',
-    //       arr8: '55',
-    //       arr10: 0,
-    //     },
-    //     {
-    //       arr1: '张三',
-    //       arr2: '热表分厂',
-    //       arr3: '2026-01-09',
-    //       arr4: '问题描述1',
-    //       arr5: '正常操作',
-    //       arr6: '下次注意',
-    //       arr7: '正常损耗',
-    //       arr8: '55',
-    //       arr10: '1',
-    //     },
-    //     {
-    //       arr1: '张三',
-    //       arr2: '热表分厂',
-    //       arr3: '2026-01-09',
-    //       arr4: '问题描述1',
-    //       arr5: '正常操作',
-    //       arr6: '下次注意',
-    //       arr7: '正常损耗',
-    //       arr8: '55',
-    //       arr10: '2',
-    //     },
-    //     {
-    //       arr1: '张三',
-    //       arr2: '热表分厂',
-    //       arr3: '2026-01-09',
-    //       arr4: '问题描述1',
-    //       arr5: '正常操作',
-    //       arr6: '下次注意',
-    //       arr7: '正常损耗',
-    //       arr8: '55',
-    //       arr10: '3',
-    //     },
-    //     {
-    //       arr1: '张三',
-    //       arr2: '热表分厂',
-    //       arr3: '2026-01-09',
-    //       arr4: '问题描述1',
-    //       arr5: '正常操作',
-    //       arr6: '下次注意',
-    //       arr7: '正常损耗',
-    //       arr8: '55',
-    //       arr10: '4',
-    //     },
-    //     {
-    //       arr1: '张三',
-    //       arr2: '热表分厂',
-    //       arr3: '2026-01-09',
-    //       arr4: '问题描述1',
-    //       arr5: '正常操作',
-    //       arr6: '下次注意',
-    //       arr7: '正常损耗',
-    //       arr8: '55',
-    //       arr10: '5',
-    //     },
-    //   ];
-      // this.loading = true;
-      // 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() {
-    this.loadUserList(this.page);
-    console.log('组件已挂载，加载用户列表');
+    this.loadUserList({ currentPage: 1, pageSize: 999999 });
   },
 };
 </script>
diff --git a/src/views/oem/proTask/components/oemMaintenance.vue b/src/views/oem/proTask/components/oemMaintenance.vue
index 5c6079a..20e5c10 100644
--- a/src/views/oem/proTask/components/oemMaintenance.vue
+++ b/src/views/oem/proTask/components/oemMaintenance.vue
@@ -8,6 +8,8 @@
       v-model:page="page"
       ref="crud"
       @row-del="rowDel"
+      @row-save="rowSave"
+      @row-update="rowUpdate"
       @search-change="searchChange"
       @search-reset="searchReset"
       @selection-change="selectionChange"
@@ -24,22 +26,24 @@
       <template #menu-right>
         <el-button type="primary" @click="handleImport">导入 </el-button>
       </template>
-      <template #menu="scope"> </template>
+      <template #menu> </template>
     </avue-crud>
     <!-- 导入 -->
     <basic-import
       v-if="isShowImport"
       title="导入"
       :isShow="isShowImport"
-      templateUrl="/blade-desk/QA/CycleTestItem/download-excel-template"
-      templateName="试验项目模板.xlsx"
-      importUrl="/blade-desk/QA/CycleTestItem/import-excel"
+      templateUrl="/blade-desk/mesOemSpecialPro/downloadExcelTemplate"
+      templateName="试验项目模板.xls"
+      importUrl="/blade-desk/mesOemSpecialPro/importExcel"
       @closeDialog="closeDialog"
     ></basic-import>
   </div>
 </template>
 <script>
 import basicImport from '@/components/basic-import/main.vue';
+
+import { pageList, saveItem, updateItem, removeItem } from '@/api/oem/oem';
 export default {
   components: { basicImport },
   data() {
@@ -71,15 +75,15 @@ export default {
         editBtnIcon: ' ',
         viewBtnText: '详情',
         labelWidth: 120,
-        menuWidth: 180,
+        menuWidth: 110,
         dialogWidth: 1040,
         dialogClickModal: false,
         searchEnter: true,
-        excelBtn: false,
+        excelBtn: true,
+        excelUrl: '/blade-desk/mesOemSpecialPro/export-mesOemSpecialPro',
         filterBtn: true,
         searchShowBtn: false,
         columnSort: true,
-        excelBtn: true,
         columnSort: true,
         index: false,
         showOverflowTooltip: true,
@@ -116,9 +120,11 @@ export default {
           //     align: 'left',
 
           // },
+          
           {
             label: '外协厂商',
-            prop: 'bsWorkCenter.wcName',
+            prop: 'ocId',
+             search: true,
             search: true,
             sortable: true,
             filter: true,
@@ -126,18 +132,19 @@ export default {
             headerAlign: 'center',
             align: 'left',
             type: 'select',
-            dicData: [
-              {
-                label: '厂商一',
-              },
-              {
-                label: '厂商2',
-              },
-            ],
+            dicUrl:"/api/blade-desk/BA/Oem/listForSelect",
+            props:{
+              label:"ocName",
+              value:"id",
+              res:"data"
+            },
+            formatter: (row, value, label, column) => {
+              return row.oemName || value || '-';
+            }
           },
           {
             label: '确认名称',
-            prop: 'condition',
+            prop: 'proItem',
             search: false,
             sortable: true,
             filter: true,
@@ -155,15 +162,17 @@ export default {
             headerAlign: 'center',
             align: 'left',
           },
+       
           {
             label: '确认到期日期',
-            prop: 'lastTime',
+            prop: 'lastDueTime',
             search: false,
             sortable: true,
             filter: true,
             span: 12,
-            headerAlign: 'center',
-            align: 'center',
+              type: 'date',
+       
+            rules: [{ required: true, message: '请选择发生时间', trigger: 'change' }],
           },
           {
             label: '提醒天数',
@@ -172,29 +181,43 @@ export default {
             sortable: true,
             filter: true,
             span: 12,
+            type: 'number',
             headerAlign: 'center',
             align: 'center',
           },
           {
             label: '工艺员',
-            prop: 'proMan.userName',
-            bind: 'proMan.userName',
+            prop: 'proMan',
             search: false,
             sortable: true,
             filter: true,
             span: 12,
             headerAlign: 'center',
             align: 'center',
-            dicUrl: '/blade-system/user/page?current=1&&size=99999',
+            type: 'select',
+            dicUrl: '/blade-system/user/page?size=999999&current=1',
+            filterable: true,
+            searchLabelWidth: 50,
             props: {
-              label: 'name',
+              label: 'realName',
               value: 'id',
               res: 'data.records',
             },
+            formatter: (row, value, label, column) => {
+              return row.proManName || value || '-';
+            },
+            rules: [
+              {
+                required: true,
+                message: '请选择工艺员',
+                trigger: 'change',
+              },
+            ],
           },
+         
           {
             label: '备注',
-            prop: 'memo',
+            prop: 'remarks',
             search: false,
             sortable: true,
             filter: true,
@@ -205,6 +228,8 @@ export default {
         ],
       },
       form: {},
+      data: [],
+      query: {},
       page: {
         pageSize: 10,
         currentPage: 1,
@@ -213,34 +238,185 @@ export default {
     };
   },
   methods: {
+    // 删除单行
+    rowDel(row, index, done) {
+      console.log('【删除行】row:', row);
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        return removeItem(String(row.id)).then(() => {
+          this.$message.success('删除成功');
+          this.onLoad(this.page);
+          done();
+        });
+      }).catch(error => {
+        console.error('删除失败:', error);
+        this.$message.error('删除失败，请稍后重试');
+      });
+    },
     // 点击导入按钮
     handleImport() {
       this.isShowImport = true
     },
+    // 关闭导入对话框
+    closeDialog() {
+      this.isShowImport = false;
+      this.onLoad(this.page);
+    },
     handleDelete() {
       if (this.selectionList.length === 0) {
         this.$message.warning('请选择至少一条数据');
         return;
       }
+      const ids = this.selectionList.map(item => item.id).join(',');
       this.$confirm('确定将选择数据删除?', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning',
-      }).then(() => {});
+      }).then(() => {
+        return removeItem(ids).then(() => {
+          this.$message.success('删除成功');
+          this.selectionClear();
+          this.onLoad(this.page);
+        });
+      }).catch(error => {
+        console.error('批量删除失败:', error);
+        this.$message.error('删除失败，请稍后重试');
+      });
     },
     // 多选
     selectionChange(list) {
       this.selectionList = list;
     },
-    onLoad() {
+    searchReset() {
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+      this.onLoad(this.page, this.query);
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+      this.onLoad(this.page, this.query);
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.$refs.crud.toggleSelection();
+    },
+    onLoad(page, params = {}) {
       this.loading = true;
-      this.data = [];
-      this.page.total = this.data.length;
-      this.loading = false;
+      pageList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        console.log('API返回数据:', res);
+
+        // 检查返回的数据结构
+        if (res.data && res.data.code === 200) {
+          const data = res.data.data;
+          this.page.total = data.total || 0;
+          this.data = data.records || [];
+          console.log('设置的数据:', { total: this.page.total, data: this.data });
+        } else {
+          this.$message.error(res.data.msg || '获取数据失败');
+          this.data = [];
+        }
+        this.loading = false;
+
+      }).catch(error => {
+        console.error('获取数据失败:', error);
+        this.$message.error('获取数据失败');
+        this.data = [];
+        this.loading = false;
+      });
+
       setTimeout(() => {
         this.selectionClear();
       }, 500);
     },
+    // 格式化日期为 yyyy-MM-dd HH:mm:ss
+    formatDate(date) {
+      if (!date) return '';
+      const d = new Date(date);
+      const year = d.getFullYear();
+      const month = String(d.getMonth() + 1).padStart(2, '0');
+      const day = String(d.getDate()).padStart(2, '0');
+      const hours = String(d.getHours()).padStart(2, '0');
+      const minutes = String(d.getMinutes()).padStart(2, '0');
+      const seconds = String(d.getSeconds()).padStart(2, '0');
+      return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+    },
+    // 新增保存
+    rowSave(row, done, loading) {
+      console.log('【新增保存】原始row:', row);
+
+      // 复制一份 row 对象，避免修改原对象
+      const params = { ...row };
+
+      // 格式化日期字段
+      if (params.lastDueTime) {
+        params.lastDueTime = this.formatDate(params.lastDueTime);
+      }
+
+      // 确保工艺员字段不为空
+      console.log('【新增保存】proMan值:', params.proMan);
+      if (!params.proMan) {
+        this.$message.error('请选择工艺员');
+        loading();
+        return;
+      }
+
+      console.log('【新增保存】处理后params:', params);
+
+      saveItem(params).then(() => {
+        this.$message.success('新增成功');
+        this.onLoad(this.page);
+        done();
+      }).catch(error => {
+        console.error('新增失败:', error);
+        loading();
+      });
+    },
+    // 修改更新
+    rowUpdate(row, index, done, loading) {
+      console.log('【修改更新】原始row:', row);
+
+      // 复制一份 row 对象，避免修改原对象
+      const params = { ...row };
+
+      // 格式化日期字段
+      if (params.lastDueTime) {
+        params.lastDueTime = this.formatDate(params.lastDueTime);
+      }
+
+      // 确保工艺员字段不为空
+      console.log('【修改更新】proMan值:', params.proMan);
+      if (!params.proMan) {
+        this.$message.error('请选择工艺员');
+        loading();
+        return;
+      }
+
+      console.log('【修改更新】处理后params:', params);
+
+      updateItem(params).then(() => {
+        this.$message.success('修改成功');
+        this.onLoad(this.page);
+        done();
+      }).catch(error => {
+        console.error('修改失败:', error);
+        loading();
+      });
+    },
   },
 };
 </script>
diff --git a/src/views/oem/proTask/inPlantProcessOem.vue b/src/views/oem/proTask/inPlantProcessOem.vue
index e7c53fc..7aecc5a 100644
--- a/src/views/oem/proTask/inPlantProcessOem.vue
+++ b/src/views/oem/proTask/inPlantProcessOem.vue
@@ -75,22 +75,26 @@ export default {
         searchMenuPosition: 'right',
         align: 'center',
         column: [
-          {
+         {
             label: '外协厂商',
-            prop: 'tbCode',
+            prop: 'ocId',
+             search: true,
+            search: true,
             sortable: true,
             filter: true,
             span: 12,
-            search: true,
+            headerAlign: 'center',
+            align: 'left',
             type: 'select',
-            dicData: [
-              {
-                label: '厂商一',
-              },
-              {
-                label: '厂商2',
-              },
-            ],
+            dicUrl:"/api/blade-desk/BA/Oem/listForSelect",
+            props:{
+              label:"ocName",
+              value:"id",
+              res:"data"
+            },
+            formatter: (row, value, label, column) => {
+              return row.oemName || value || '-';
+            }
           },
           {
             label: '任务号',
diff --git a/src/views/oem/proTask/index.vue b/src/views/oem/proTask/index.vue
index 60a4651..3a99e50 100644
--- a/src/views/oem/proTask/index.vue
+++ b/src/views/oem/proTask/index.vue
@@ -6,7 +6,7 @@
 
         </el-tabs> -->
         <!-- <inPlantMaintenance v-if="activeName == '1'"></inPlantMaintenance> -->
-        <oemMaintenance v-if="activeName == '2'"></oemMaintenance>
+        <oemMaintenance ></oemMaintenance>
     </basic-container>
 </template>
 <script>