From 60e3a1cafed400ba7b13e73b69320f1da651add2 Mon Sep 17 00:00:00 2001
From: zhangdi <15053473693@163.com>
Date: Mon, 2 Feb 2026 16:29:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../beforeAndAfterPlating.js                  |  67 +++
 .../productionManagement/deductionPreserve.js |  35 ++
 .../shortageApplication.js                    |  39 ++
 .../components/declareAdd.vue                 | 285 ++++++++++
 .../shortageApplication.vue                   | 163 +++---
 .../beforeAndAfterPlating.vue                 | 520 ++++-------------
 .../components/afterPlatingEntryDialog.vue    | 321 ++++++-----
 .../components/beforePlatingBoundDialog.vue   | 223 ++++----
 .../components/beforePlatingEntryDialog.vue   | 224 ++++----
 .../deductionPreserve/editDialog.vue          | 193 ++++---
 .../deductionPreserve/index.vue               | 362 ++----------
 .../js/platingColumnData.js                   | 523 +++---------------
 12 files changed, 1285 insertions(+), 1670 deletions(-)
 create mode 100644 src/api/productionManagement/beforeAndAfterPlating.js
 create mode 100644 src/api/productionManagement/deductionPreserve.js
 create mode 100644 src/api/productionManagement/shortageApplication.js
 create mode 100644 src/views/procurementManagement/components/declareAdd.vue

diff --git a/src/api/productionManagement/beforeAndAfterPlating.js b/src/api/productionManagement/beforeAndAfterPlating.js
new file mode 100644
index 0000000..de86d41
--- /dev/null
+++ b/src/api/productionManagement/beforeAndAfterPlating.js
@@ -0,0 +1,67 @@
+import request from '@/axios';
+//列表接口
+export const getList = (current, size, params) => {
+  return request({
+    url: '/blade-desk/plateAround/queryPlateAround',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    },
+  });
+};
+
+// 删除 镀后入库 
+export const deleteById = (params) => {
+  return request({
+    url: '/blade-desk/plateAround/deleteById',
+    method: 'delete',
+    params: params,
+  });
+};
+
+// 扫描流程卡获取镀前入库数据
+export const getBeforePlatInCardNo = (params) => {
+  return request({
+    url: '/blade-desk/plateAround/getBeforePlatInCardNo',
+    method: 'get',
+    params: params,
+  });
+};
+
+// 扫描流程卡获取镀前出库数据
+export const getBeforePlatOutCardNo = (params) => {
+  return request({
+    url: '/blade-desk/plateAround/getBeforePlatOutCardNo',
+    method: 'get',
+    params: params,
+  });
+};
+
+// 扫描流程卡获取镀后数据 /plateAround/getAfterPlatInCardNo
+export const getAfterPlatCardNo = (params) => {
+  return request({
+    url: '/blade-desk/plateAround/getAfterPlatCardNo',
+    method: 'get',
+    params: params,
+  });
+};
+// 镀前镀后保存
+export const savePlateAround = (params) => {
+  return request({
+    url: '/blade-desk/plateAround/savePlateAround',
+    method: 'post',
+    data: params,
+  });
+};
+
+
+// 加载镀后入库记录
+export const loadPlateAround = (params) => {
+  return request({
+    url: '/blade-desk/plateAround/loadPlateAround',
+    method: 'get',
+    params: params,
+  });
+};
diff --git a/src/api/productionManagement/deductionPreserve.js b/src/api/productionManagement/deductionPreserve.js
new file mode 100644
index 0000000..0a551be
--- /dev/null
+++ b/src/api/productionManagement/deductionPreserve.js
@@ -0,0 +1,35 @@
+import request from '@/axios';
+//列表接口
+export const getList = (current, size, params) => {
+  return request({
+    url: '/blade-desk/deductionPreserve/queryData',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    },
+  });
+};
+
+
+// 扣数维护查询  
+export const getWorkOrderByCardNo = (params) => {
+  return request({
+    url: '/blade-desk/deductionPreserve/workOrderByCardNo',
+    method: 'get',
+    params: {
+      ...params,
+    },
+  });
+};
+ 
+// 保存和修改扣数查询
+export const saveOrUpdate = (params) => {
+  return request({
+    url: '/blade-desk/deductionPreserve/saveOrUpdate',
+    method: 'post',
+    data: params,
+  });
+};
+
diff --git a/src/api/productionManagement/shortageApplication.js b/src/api/productionManagement/shortageApplication.js
new file mode 100644
index 0000000..7043b5c
--- /dev/null
+++ b/src/api/productionManagement/shortageApplication.js
@@ -0,0 +1,39 @@
+import request from '@/axios';
+//列表接口
+export const getList = (current, size, params) => {
+  return request({
+    url: '/blade-desk/deductionPreserve/orderDeclarePage',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    },
+  });
+};
+// 删除
+export const del = data => {
+  return request({
+    url: '/blade-desk/deductionPreserve/signDelete',
+    method: 'post',
+    data: data,
+  });
+};
+
+// 通过零件获取批次号
+export const queryBatch = data => {
+  return request({
+    url: '/blade-desk/deductionPreserve/queryBatch',
+    method: 'post',
+    data: data,
+  });
+};
+
+// 缺件申报  保存  /deductionPreserve/saveDeclare
+export const saveDeclare = data => {
+  return request({
+    url: '/blade-desk/deductionPreserve/saveDeclare',
+    method: 'post',
+    data: data,
+  });
+};
\ No newline at end of file
diff --git a/src/views/procurementManagement/components/declareAdd.vue b/src/views/procurementManagement/components/declareAdd.vue
new file mode 100644
index 0000000..7f04737
--- /dev/null
+++ b/src/views/procurementManagement/components/declareAdd.vue
@@ -0,0 +1,285 @@
+<template>
+  <el-dialog title="申报" append-to-body :modelValue="openShow" width="90%" @close="closeDialog">
+    <!-- 单个 Form 包裹整个表格 -->
+    <el-form ref="tableForm" :model="form" :rules="formRules" label-width="0px">
+      <el-row gutter="10">
+        <el-col :span="6">
+          <el-form-item label="零件号" label-width="70px" required>
+            <el-input v-model="form.partCode" placeholder="请输入零件号"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-button type="primary" @click="queryBatchNo" :loading="batchLoading">查询批次号</el-button>
+        </el-col>
+      </el-row>
+
+      <div style="margin-bottom: 12px" v-if="moldAddMore">
+        <el-button type="danger" @click="delTable">删除选中行</el-button>
+      </div>
+      <!-- 全局错误提示 -->
+      <div v-if="formError" class="error-message" style="color: #f56c6c; margin-bottom: 10px">
+        {{ formError }}
+      </div>
+
+      <el-table :data="form.tableData" @select="selectChange" border>
+        <el-table-column type="selection" width="55"></el-table-column>
+
+        <!-- 车间订单号 -->
+        <el-table-column align="center" prop="woCode" label="车间订单号">
+          <template #default="scope">
+            <el-input
+              v-model="scope.row.woCode"
+              placeholder="请输入"
+              style="width: 100%"
+            ></el-input>
+          </template>
+        </el-table-column>
+        <!-- 返工单号 -->
+        <el-table-column align="center" prop="reworkCode" label="返工单号">
+          <template #header>
+            <span><i style="color: red">*</i>返工单号</span>
+          </template>
+          <template #default="scope">
+            <el-form-item
+              :prop="`tableData[${scope.$index}].reworkCode`"
+              :rules="formRules.reworkCode"
+            >
+              <el-input
+                v-model="scope.row.reworkCode"
+                placeholder="请输入"
+                style="width: 100%"
+              ></el-input>
+            </el-form-item>
+          </template>
+        </el-table-column>
+        <!-- 零件号 -->
+        <el-table-column align="center" prop="partCode" label="零件号"> </el-table-column>
+        <!-- 批次号 -->
+        <el-table-column align="center" prop="batchNo" label="批次号"> </el-table-column>
+        <!--生产标识 -->
+        <el-table-column align="center" prop="quaLevel" label="生产标识"> </el-table-column>
+        <!--数量 -->
+        <el-table-column align="center" prop="quantity" label="数量">
+          <template #header>
+            <span><i style="color: red">*</i>数量</span>
+          </template>
+          <template #default="scope">
+            <el-form-item :prop="`tableData[${scope.$index}].quantity`" :rules="formRules.quantity">
+              <el-input
+                v-model="scope.row.quantity"
+                placeholder="请输入"
+                style="width: 100%"
+              ></el-input>
+            </el-form-item>
+          </template>
+        </el-table-column>
+        <!--保管员 -->
+        <el-table-column align="center" prop="keeper" label="保管员"> </el-table-column>
+        <!--计划员 -->
+        <el-table-column align="center" prop="planMan" label="计划员"> </el-table-column>
+        <!--备注 -->
+        <el-table-column align="center" prop="remark" label="备注">
+          <template #default="scope">
+            <el-input
+              v-model="scope.row.remark"
+              placeholder="请输入"
+              style="width: 100%"
+            ></el-input>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-form>
+
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="closeDialog">取 消</el-button>
+        <el-button type="primary" @click="submitForm">申 报</el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import { getWorkCenterList } from '@/api/processManagement/addQuantity.js';
+// import { submitBatchData } from '@/api/processManagement/periodical.js'; // 实际提交接口
+import { queryBatch, saveDeclare } from '@/api/productionManagement/shortageApplication';
+
+export default {
+  props: {
+    showDialog: { type: Boolean, default: false },
+    moldAddMore: { type: Boolean, default: true },
+    tabPosition: { type: String, default: '' },
+  },
+  data() {
+    return {
+      batchLoading:false,
+      openShow: false,
+      wcData: [],
+      formError: '', // 全局错误提示
+
+      // 单个表单模型：包含表格所有行数据
+      form: {
+        tableData: [], // 表格数据数组（直接绑定到 Form 模型）
+      },
+
+      // 统一校验规则：支持数组项校验
+      formRules: {
+        // 表格数据数组的整体校验（可选：如最少1行数据）
+        tableData: [
+          {
+            required: true,
+            message: '请至少添加一行数据',
+            trigger: 'submit',
+            type: 'array', // 明确类型为数组
+          },
+          {
+            validator: (rule, value, callback) => {
+              if (value.length === 0) {
+                callback(new Error('请至少添加一行数据'));
+              } else {
+                callback();
+              }
+            },
+            trigger: 'submit',
+          },
+        ],
+
+        // 数组中每一项的
+        reworkCode: [{ required: true, message: '请输入', trigger: ['blur', 'submit'] }],
+        quantity: [{ required: true, message: '请输入', trigger: ['blur', 'submit'] }],
+      },
+    };
+  },
+  mounted() {
+    this.openShow = this.showDialog;
+    this.getWorkCenterList();
+    // 初始添加一行（可选）
+    if (this.moldAddMore && this.form.tableData.length === 0) {
+      this.addTable();
+    }
+  },
+  methods: {
+    // 根据零件查询批次号
+    queryBatchNo(){
+      this.batchLoading = true;
+      queryBatch({partCode: this.form.partCode}).then(res=>{
+        this.form.tableData = res.data.data || [];
+        this.batchLoading = false;
+      })
+    },
+    getWorkCenterList() {
+      getWorkCenterList().then(res => {
+        this.wcData = res.data.data || [];
+      });
+    },
+
+    selectChange(list, row) {
+      row._select = !row._select;
+    },
+
+    // 新增一行（直接push到表单模型的 tableData 中）
+    addTable() {
+      this.form.tableData.push({
+        _select: false, // 选择状态
+        wcId: '', // 作业中心ID
+        batchNo: '', // 槽号/检查项
+        preserveContent: '', // 维护内容
+      });
+    },
+
+    // 删除选中行
+    delTable() {
+      this.form.tableData = this.form.tableData.filter(row => !row._select);
+    },
+
+    closeDialog() {
+      this.openShow = false;
+      this.$emit('closeDialog', true);
+      // 重置表单
+      this.form.tableData = [];
+      this.formError = '';
+      this.$refs.tableForm?.resetFields();
+    },
+
+    // 提交表单（单次校验所有行）
+    submitForm() {
+      this.formError = '';
+
+      // 调用单个 Form 的校验方法
+      this.$refs.tableForm.validate((isValid, invalidFields) => {
+        if (!isValid) {
+          // 校验失败：显示提示并滚动到第一个错误字段
+          this.formError = '存在未完善的字段，请检查表格中的红色提示';
+
+          this.$nextTick(() => {
+            // 找到第一个错误字段并滚动到视图
+            const firstError = document.querySelector('.el-form-item.is-error');
+            if (firstError) {
+              firstError.scrollIntoView({ behavior: 'smooth', block: 'center' });
+            }
+          });
+          return;
+        }
+
+        // 调用接口提交（实际项目替换）
+         saveDeclare(this.form.tableData).then(res=>{
+           this.$message.success('操作成功');
+            this.closeDialog();
+         })
+      //   try {
+      //     const res = saveDeclare(this.form.tableData);
+      //     if (res.code === 200) {
+      //       this.$message.success('操作成功');
+      //       this.closeDialog();
+      //       this.$emit('submitSuccess', submitData);
+      //     } else {
+      //       this.$message.error(res.msg || '操作失败');
+      //     }
+
+
+      //   } catch (err) {
+      //     this.$message.error(err);
+      //     console.error('提交失败：', err);
+      //   }
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+// 优化表单字段样式
+:deep(.el-table .el-form-item) {
+  margin-bottom: 0; // 去掉默认边距
+}
+
+// 错误提示样式优化
+:deep(.el-form-item__error) {
+  font-size: 12px;
+  white-space: nowrap;
+  z-index: 10;
+  background: #fff;
+  padding: 2px 4px;
+  border: 1px solid #f56c6c;
+  border-radius: 4px;
+}
+
+// 表格行高适配 textarea
+.el-table__row {
+  height: 80px !important;
+}
+
+.el-table__cell {
+  vertical-align: middle !important;
+}
+
+.error-message {
+  font-size: 14px;
+  line-height: 1.5;
+}
+:deep(.el-table .el-table__cell) {
+  height: 50px !important;
+  padding: 0 !important;
+  line-height: 50px !important;
+}
+</style>
diff --git a/src/views/procurementManagement/shortageApplication.vue b/src/views/procurementManagement/shortageApplication.vue
index 3def285..4bc99c7 100644
--- a/src/views/procurementManagement/shortageApplication.vue
+++ b/src/views/procurementManagement/shortageApplication.vue
@@ -7,7 +7,7 @@
       v-model="form"
       v-model:page="page"
       ref="crud"
-      @row-del="rowDel"
+      @row-del="handleDelete"
       @search-change="searchChange"
       @search-reset="searchReset"
       @selection-change="selectionChange"
@@ -17,32 +17,37 @@
       @on-load="onLoad"
     >
       <template #menu-left>
-        <!-- <el-button type="primary" icon="el-icon-plus" @click="handleDelete">申报
-            </el-button> -->
+        <el-button type="primary" @click="handleAdd">申报 </el-button>
       </template>
       <template #menu-right>
-        <el-button type="primary" @click="handleImport">已申报 </el-button>
-        <el-button type="primary" @click="handleImport">已完成 </el-button>
-        <el-button type="success" icon="el-icon-upload" @click="handleImport"
-          >导入
-        </el-button>
+        <el-button type="primary" plain @click="handleImport">已申报 </el-button>
+        <el-button type="primary" plain @click="handleImport">已完成 </el-button>
       </template>
       <template #menu="scope">
         <el-button type="primary" @click="handleImport">打印 </el-button>
       </template>
     </avue-crud>
+
+    <!-- 申报 -->
+    <declareAdd v-if="declareAddShow" :showDialog="declareAddShow" ></declareAdd>
+
   </basic-container>
 </template>
 <script>
+import declareAdd from './components/declareAdd.vue';
+import { getList, del } from '@/api/productionManagement/shortageApplication';
 export default {
+  components: {
+    declareAdd,
+  },
   data() {
     return {
+      declareAddShow: false,
       selectionList: [],
       option: {
-        height: "auto",
+        height: 'auto',
         calcHeight: 32,
         tip: false,
-        size: "medium",
         simplePage: true,
         searchShow: true,
         searchMenuSpan: 6,
@@ -51,15 +56,16 @@ export default {
         tree: false,
         border: true,
         index: true,
-        selection: true,
+        selection: false,
         viewBtn: false,
+        addBtn: false,
         delBtn: true,
-        addBtnText: "申报",
-        editBtnText: "修改",
-        viewBtnIcon: " ",
-        delBtnIcon: " ",
-        editBtnIcon: " ",
-        viewBtnText: "详情",
+        addBtnText: '申报',
+        editBtnText: '修改',
+        viewBtnIcon: ' ',
+        delBtnIcon: ' ',
+        editBtnIcon: ' ',
+        viewBtnText: '详情',
         labelWidth: 120,
         menuWidth: 180,
         dialogWidth: 1040,
@@ -73,22 +79,17 @@ export default {
         columnSort: true,
         index: false,
         showOverflowTooltip: true,
-        searchLabelPosition: "left",
-        searchLabelPosition: "left",
+        searchLabelPosition: 'left',
         searchGutter: 24,
         searchSpan: 6,
-        menuAlign: "left",
+        menuAlign: 'left',
         gridBtn: false,
-        searchMenuPosition: "right",
-        addBtnIcon: " ",
-        viewBtnIcon: " ",
-        delBtnIcon: " ",
-        editBtnIcon: " ",
-        align: "center",
+        searchMenuPosition: 'right',
+        align: 'center',
         column: [
           {
-            label: "领用单号",
-            prop: "useCode",
+            label: '领用单号',
+            prop: 'useCode',
             sortable: true,
             filter: true,
             span: 12,
@@ -98,26 +99,27 @@ export default {
             display: false,
           },
           {
-            label: "车间订单号",
-            prop: "woCode",
-            search: false,
+            label: '车间订单号',
+            prop: 'woCode',
+            search: true,
             sortable: true,
             filter: true,
             span: 12,
             width: 140,
+            searchLabelWidth: 90,
           },
           {
-            label: "零件号",
-            prop: "partCode",
-            search: false,
+            label: '零件号',
+            prop: 'partCode',
+            search: true,
             sortable: true,
             filter: true,
             span: 12,
             width: 120,
           },
           {
-            label: "返工单号",
-            prop: "reworkCode",
+            label: '返工单号',
+            prop: 'reworkCode',
             search: false,
             sortable: true,
             filter: true,
@@ -125,35 +127,34 @@ export default {
             width: 120,
           },
           {
-            label: "批次号",
-            prop: "batchNo",
-            search: false,
+            label: '批次号',
+            prop: 'batchNo',
+            search: true,
             sortable: true,
             filter: true,
             span: 12,
             width: 120,
           },
           {
-            label: "生产标识",
-            prop: "quaLevel",
-            search: false,
+            label: '生产标识',
+            prop: 'quaLevel',
+            search: true,
             sortable: true,
             filter: true,
             span: 12,
             width: 120,
           },
           {
-            label: "数量",
-            prop: "quantity",
+            label: '数量',
+            prop: 'quantity',
             search: false,
             sortable: true,
             filter: true,
             span: 12,
           },
           {
-            label: "申报人",
-            prop: "createMan.userName",
-            bind: "createMan.userName",
+            label: '申报人',
+            prop: 'userName',
             search: false,
             sortable: true,
             filter: true,
@@ -162,8 +163,8 @@ export default {
             display: false,
           },
           {
-            label: "保管员",
-            prop: "keeper",
+            label: '保管员',
+            prop: 'keeper',
             search: false,
             sortable: true,
             filter: true,
@@ -171,8 +172,8 @@ export default {
             width: 120,
           },
           {
-            label: "计划员",
-            prop: "planMan",
+            label: '计划员',
+            prop: 'planMan',
             search: false,
             sortable: true,
             filter: true,
@@ -180,8 +181,8 @@ export default {
             width: 120,
           },
           {
-            label: "建立时间",
-            prop: "createTime",
+            label: '建立时间',
+            prop: 'createTime',
             search: false,
             sortable: true,
             filter: true,
@@ -190,8 +191,8 @@ export default {
             display: false,
           },
           {
-            label: "备注",
-            prop: "remark",
+            label: '备注',
+            prop: 'remark',
             search: false,
             sortable: true,
             filter: true,
@@ -199,13 +200,13 @@ export default {
             width: 120,
           },
           {
-            label: "当前状态",
-            prop: "podStatusTitle",
+            label: '当前状态',
+            prop: 'podStatus',
             search: false,
             sortable: true,
             filter: true,
             span: 12,
-            fixed: "right",
+            fixed: 'right',
             width: 120,
           },
         ],
@@ -219,29 +220,47 @@ export default {
     };
   },
   methods: {
-    handleDelete() {
+    // 导入
+    handleImport() {
+      this.isShowImport = true;
+    },
+    // 关闭弹框
+    closeDialog(isRefresh) {
+      this.isShowImport = false;
+      // if (isRefresh) {
+      this.onLoad(this.page, this.query);
+      // }
+    },
+    handleAdd() {
+      this.declareAddShow = true;
+    },
+    handleDelete(row) {
       if (this.selectionList.length === 0) {
-        this.$message.warning("请选择至少一条数据");
+        this.$message.warning('请选择至少一条数据');
         return;
       }
-      this.$confirm("确定将选择数据删除?", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      }).then(() => {});
+      this.$confirm('确定将选择数据删除?', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        del({id:row.id}).then(res => {
+          this.$message.success(res.data.message);
+          this.onLoad(this.page, this.query);
+        });
+      });
     },
     // 多选
     selectionChange(list) {
       this.selectionList = list;
     },
-    onLoad() {
+    onLoad(page, params = {}) {
       this.loading = true;
-      this.data = [];
-      this.page.total = this.data.length;
-      this.loading = false;
-      setTimeout(() => {
-        this.selectionClear();
-      }, 500);
+      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;
+      });
     },
   },
 };
diff --git a/src/views/productionManagement/beforeAndAfterPlating.vue b/src/views/productionManagement/beforeAndAfterPlating.vue
index d0e3778..20f4ddc 100644
--- a/src/views/productionManagement/beforeAndAfterPlating.vue
+++ b/src/views/productionManagement/beforeAndAfterPlating.vue
@@ -7,46 +7,62 @@
     </el-tabs>
 
     <!-- 表格数据 -->
-    <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">
+    <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>
-        <el-button type="primary" icon="el-icon-plus" @click="handleAdd(tabPosition)">新 增</el-button>
+        <el-button type="primary" @click="handleAdd(tabPosition)">新 增</el-button>
       </template>
-      <template #cardNo="{ row }">{{ row.prWorkOrder.cardNo }}</template>
-      <template #woCode="{ row }">{{ row.prWorkOrder.woCode }}</template>
-      <template #batchNo="{ row }">{{ row.prWorkOrder.batchNo }}</template>
-      <template #orders="{ row }">{{ row.prWorkOrder.orders }}</template>
-      <template #ppsName="{ row }">{{ row.prWorkOrder.orders }}</template>
-      <template #partCode="{ row }">{{ row.prWorkOrder.pjYieldOrder.partCode }}</template>
-      <template #partName="{ row }">{{ row.prWorkOrder.pjYieldOrder.partName }}</template>
-      <template #tsName="{ row }"> {{ row.makeTeam != null ? row.makeTeam.tsName : row.oemCustomer.ocName }}</template>
-      <template #userName="{ row }"> {{ row.makeMan.userName }}</template>
     </avue-crud>
-    <before-plating-entry-dialog :show-dialog="showDialog"  @closeDialog="closeDialog"></before-plating-entry-dialog>
-    <before-plating-bound-dialog :bound-dialog="boundDialog"  @closeDialog="closeDialog"></before-plating-bound-dialog>
-    <after-plating-entry-dialog :after-bound-dialog="afterBoundDialog" @closeDialog="closeDialog"></after-plating-entry-dialog>
+    <!-- 镀前入库新增 -->
+    <before-plating-entry-dialog
+      :show-dialog="showDialog"
+      @closeDialog="closeDialog"
+    ></before-plating-entry-dialog>
+    <!-- 镀前出库 -->
+    <before-plating-bound-dialog
+      :bound-dialog="boundDialog"
+      @closeDialog="closeDialog"
+    ></before-plating-bound-dialog>
+    <!-- 镀后入库 -->
+    <after-plating-entry-dialog
+      :after-bound-dialog="afterBoundDialog"
+      @closeDialog="closeDialog"
+    ></after-plating-entry-dialog>
   </basic-container>
 </template>
 
 <script>
-import columnData from './js/platingColumnData'
-import addPlatingColumnData from './js/addPlatingColumnData';
+import columnData from './js/platingColumnData';
 import beforePlatingEntryDialog from './components/beforePlatingEntryDialog.vue';
 import beforePlatingBoundDialog from './components/beforePlatingBoundDialog.vue';
 import afterPlatingEntryDialog from './components/afterPlatingEntryDialog.vue';
+import { getList, deleteById } from '@/api/productionManagement/beforeAndAfterPlating';
 export default {
   components: {
     beforePlatingEntryDialog,
     beforePlatingBoundDialog,
-    afterPlatingEntryDialog
+    afterPlatingEntryDialog,
   },
   data() {
     return {
       tabPosition: 'beforePlatingEntry',
       showDialog: false,
-      boundDialog:false,
-      afterBoundDialog:false,
+      boundDialog: false,
+      afterBoundDialog: false,
       option: {
         columnSort: true,
         tip: false,
@@ -65,10 +81,8 @@ export default {
         viewBtn: false,
         delBtn: true,
         editBtn: false,
-        delBtnIcon: ' ',
         addBtn: false,
         labelWidth: 120,
-        searchLabelWidth: 120,
         menu: false,
         menuWidth: 140,
         dialogWidth: 600,
@@ -78,416 +92,112 @@ export default {
         gridBtn: false,
         searchShowBtn: false,
         showOverflowTooltip: true,
-        searchLabelPosition:'left',
-searchLabelPosition:'left',
- searchGutter:24,
-  searchSpan:6,
-menuAlign: 'left',
-gridBtn:false,
-searchMenuPosition:'right',
-addBtnIcon: ' ',
+        searchLabelPosition: 'left',
+        searchGutter: 24,
+        searchSpan: 6,
+        menuAlign: 'left',
+        gridBtn: false,
+        searchMenuPosition: 'right',
+        addBtnIcon: ' ',
         viewBtnIcon: ' ',
         delBtnIcon: ' ',
         editBtnIcon: ' ',
-        column: []
-      },
-      addForm: {},
-      addOption: {
-        columnSort: true,
-        tip: false,
-        // height: 'auto',
-        align: 'center',
-        calcHeight: 32,
-        simplePage: false,
-        searchShow: true,
-        searchMenuSpan: 6,
-        searchIcon: true,
-        searchIndex: 3,
-        tree: false,
-        border: true,
-        index: true,
-        selection: true,
-        viewBtn: false,
-        delBtn: true,
-        editBtn: false,
-        delBtnIcon: ' ',
-        addBtn: false,
-        labelWidth: 120,
-        searchLabelWidth: 120,
-        menu: false,
-        menuWidth: 140,
-        dialogWidth: 600,
-        dialogClickModal: false,
-        searchEnter: true,
-        excelBtn: true,
-        gridBtn: false,
-        searchShowBtn: false,
-        showOverflowTooltip: true,
-        column: [
-
-        ]
+        column: [],
       },
       data: [],
       tableData: [],
-      selectDialogData: [],
       cardNo: '',
-      page:{
+      page: {
         pageSize: 10,
         currentPage: 1,
         total: 0,
-      }
-    }
-  },
-  mounted() {
-    this.option.column = columnData[this.tabPosition]
-    this.data = [
-      {
-        id: 1, paCode: 'FE-20231223003', quantity: 160, createTime: '2023-12-23 18:01:26',
-        prWorkOrder: {
-          orders: "0005",
-          cardNo: '1016663941',
-          woCode: 'WO-S22122668-R01',
-          batchNo: 'WB135230311004',
-          procedureSet: {
-            ppsName: '上挂',
-          },
-          pjYieldOrder: {
-            partName: '方盘壳体',
-            partCode: '21E8-003-1149-E9-N',
-          }
-        },
-        makeMan: {
-          userName: '崔殿龙',
-        },
-        makeTeam: {
-          tsName: '化学镀镍一班崔胜伟'
-        },
-        oemCustomer: null
-      },
-      {
-        id: 2, paCode: 'FE-20231223003', quantity: 160, createTime: '2023-12-23 18:01:26',
-        prWorkOrder: {
-          orders: "0005",
-          cardNo: '1016663941',
-          woCode: 'WO-S22122668-R01',
-          batchNo: 'WB135230311004',
-          procedureSet: {
-            ppsName: '上挂',
-          },
-          pjYieldOrder: {
-            partName: '方盘壳体',
-            partCode: '21E8-003-1149-E9-N',
-          }
-        },
-        makeMan: {
-          userName: '崔殿龙',
-        },
-        makeTeam: {
-          tsName: '化学镀镍一班崔胜伟'
-        },
-        oemCustomer: null
       },
-      {
-        id: 3, paCode: 'FE-20231223003', quantity: 160, createTime: '2023-12-23 18:01:26',
-        prWorkOrder: {
-          orders: "0005",
-          cardNo: '1016663941',
-          woCode: 'WO-S22122668-R01',
-          batchNo: 'WB135230311004',
-          procedureSet: {
-            ppsName: '上挂',
-          },
-          pjYieldOrder: {
-            partName: '方盘壳体',
-            partCode: '21E8-003-1149-E9-N',
-          }
-        },
-        makeMan: {
-          userName: '崔殿龙',
-        },
-        makeTeam: null,
-        oemCustomer: {
-          ocName: 'L235'
-        },
+      query: {
+        paType: 1, //1-镀前入库 2-镀前出库 3-镀后入库
       },
-    ]
-    this.page.total = this.data.length
+    };
+  },
+  mounted() {
+    this.option.column = columnData[this.tabPosition];
   },
   methods: {
-    // 流程卡号输入框点击回车按钮
-    handleEnter() {
-      console.log('this.cars-------------', this.cardNo)
-      console.log('tab---------', this.tabPosition)
-      if (this.tabPosition == 'beforePlatingEntry') {
-        this.beforePlatingEntryData = [
-          {
-            paCode: 'FE-20231223003', woCode: 'WO-S22122668-R01', batchNo: '	WB135230311004', cardNo: "1016663941",
-            tsName: '', orders: ''
-          }
-        ]
-      }
-    },
     // 点击新增按钮
     handleAdd(val) {
-      console.log('val---------',val)
       if (val == 'beforePlatingEntry') {
-        this.showDialog = true
-      }else if(val == 'beforePlatingBound'){
-        this.boundDialog = true
-      }else{
-        this.afterBoundDialog = true
+        this.showDialog = true;
+      } else if (val == 'beforePlatingBound') {
+        this.boundDialog = true;
+      } else {
+        this.afterBoundDialog = true;
       }
-      
     },
     rowDel() {
-      this.$confirm(
-        '此操作将永久删除该数据, 是否继续?',
-        '提示',
-        {
-          confirmButtonText: '确认',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-
-      })
+      this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => {
+        deleteById().then(res => {
+          this.$message({
+            type: 'success',
+            message: '删除成功!',
+          });
+          this.onLoad(this.page, this.query);
+        });
+      });
+    },
+    searchReset() {
+      this.query = {};
+      this.onLoad(this.page, this.query);
+    },
+    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);
     },
     // 关闭弹窗
     closeDialog() {
-      this.showDialog = false
-      this.boundDialog = false
-      this.afterBoundDialog = false
+      this.showDialog = false;
+      this.boundDialog = false;
+      this.afterBoundDialog = false;
     },
     tabPositionChange(value, event) {
-      this.option.column = columnData[this.tabPosition]
-      this.option.menu = false
+      this.option.column = columnData[this.tabPosition];
+      this.option.menu = false;
       if (this.tabPosition == 'beforePlatingEntry') {
-        this.data = [
-          {
-            id: 1, paCode: 'FE-20231223003', quantity: 160, createTime: '2023-12-23 18:01:26',
-            prWorkOrder: {
-              orders: "0005",
-              cardNo: '1016663941',
-              woCode: 'WO-S22122668-R01',
-              batchNo: 'WB135230311004',
-              procedureSet: {
-                ppsName: '上挂',
-              },
-              pjYieldOrder: {
-                partName: '方盘壳体',
-                partCode: '21E8-003-1149-E9-N',
-              }
-            },
-            makeMan: {
-              userName: '崔殿龙',
-            },
-            makeTeam: {
-              tsName: '化学镀镍一班崔胜伟'
-            },
-            oemCustomer: null
-          },
-          {
-            id: 2, paCode: 'FE-20231223003', quantity: 160, createTime: '2023-12-23 18:01:26',
-            prWorkOrder: {
-              orders: "0005",
-              cardNo: '1016663941',
-              woCode: 'WO-S22122668-R01',
-              batchNo: 'WB135230311004',
-              procedureSet: {
-                ppsName: '上挂',
-              },
-              pjYieldOrder: {
-                partName: '方盘壳体',
-                partCode: '21E8-003-1149-E9-N',
-              }
-            },
-            makeMan: {
-              userName: '崔殿龙',
-            },
-            makeTeam: {
-              tsName: '化学镀镍一班崔胜伟'
-            },
-            oemCustomer: null
-          },
-          {
-            id: 3, paCode: 'FE-20231223003', quantity: 160, createTime: '2023-12-23 18:01:26',
-            prWorkOrder: {
-              orders: "0005",
-              cardNo: '1016663941',
-              woCode: 'WO-S22122668-R01',
-              batchNo: 'WB135230311004',
-              procedureSet: {
-                ppsName: '上挂',
-              },
-              pjYieldOrder: {
-                partName: '方盘壳体',
-                partCode: '21E8-003-1149-E9-N',
-              }
-            },
-            makeMan: {
-              userName: '崔殿龙',
-            },
-            makeTeam: null,
-            oemCustomer: {
-              ocName: 'L235'
-            },
-          },
-        ]
-        this.page.total = this.data.length
+        this.query.paType = 1;
+        this.onLoad(this.page, this.query);
       } else if (this.tabPosition == 'beforePlatingBound') {
-        this.data = [
-          {
-            id: 1, paCode: 'FE-20231223003', quantity: 160, createTime: '2023-12-23 18:01:26',
-            prWorkOrder: {
-              orders: "0021",
-              cardNo: '1016663941',
-              woCode: 'WO-S22122668-R01',
-              batchNo: 'WB135230311004',
-              procedureSet: {
-                ppsName: '包装防护',
-              },
-              pjYieldOrder: {
-                partName: '24-插头密封盖壳体',
-                partCode: '21E8-003-1149-E9-N',
-              }
-            },
-            makeMan: {
-              userName: '崔殿龙',
-            },
-            makeTeam: {
-              tsName: '化学镀镍一班崔胜伟'
-            },
-            oemCustomer: null
-          },
-          {
-            id: 2, paCode: 'FE-20231223003', quantity: 160, createTime: '2023-12-23 18:01:26',
-            prWorkOrder: {
-              orders: "0021",
-              cardNo: '1016663941',
-              woCode: 'WO-S22122668-R01',
-              batchNo: 'WB135230311004',
-              procedureSet: {
-                ppsName: '包装防护',
-              },
-              pjYieldOrder: {
-                partName: '24-插头密封盖壳体',
-                partCode: '21E8-003-1149-E9-N',
-              }
-            },
-            makeMan: {
-              userName: '崔殿龙',
-            },
-            makeTeam: {
-              tsName: '化学镀镍一班崔胜伟'
-            },
-            oemCustomer: null
-          },
-          {
-            id: 3, paCode: 'FE-20231223003', quantity: 160, createTime: '2023-12-23 18:01:26',
-            prWorkOrder: {
-              orders: "0021",
-              cardNo: '1016663941',
-              woCode: 'WO-S22122668-R01',
-              batchNo: 'WB135230311004',
-              procedureSet: {
-                ppsName: '包装防护',
-              },
-              pjYieldOrder: {
-                partName: '24-插头密封盖壳体',
-                partCode: '21E8-003-1149-E9-N',
-              }
-            },
-            makeMan: {
-              userName: '崔殿龙',
-            },
-            makeTeam: null,
-            oemCustomer: {
-              ocName: 'L235'
-            },
-          },
-        ]
-        this.page.total = this.data.length
+        this.query.paType = 2;
+        this.onLoad(this.page, this.query);
       } else {
-        this.option.menu = true
-        this.data = [
-          {
-            id: 1, paCode: 'FE-20231223003', quantity: 160, createTime: '2023-12-23 18:01:26',
-            weight: 111,
-            prWorkOrder: {
-              orders: "0021",
-              cardNo: '1016663941',
-              woCode: 'WO-S22122668-R01',
-              batchNo: 'WB135230311004',
-              procedureSet: {
-                ppsName: '包装防护',
-              },
-              pjYieldOrder: {
-                partName: '24-插头密封盖壳体',
-                partCode: '21E8-003-1149-E9-N',
-              }
-            },
-            makeMan: {
-              userName: '崔殿龙',
-            },
-            makeTeam: {
-              tsName: '化学镀镍一班崔胜伟'
-            },
-            oemCustomer: null
-          },
-          {
-            id: 2, paCode: 'FE-20231223003', quantity: 160, createTime: '2023-12-23 18:01:26',
-            weight: 111,
-            prWorkOrder: {
-              orders: "0021",
-              cardNo: '1016663941',
-              woCode: 'WO-S22122668-R01',
-              batchNo: 'WB135230311004',
-              procedureSet: {
-                ppsName: '包装防护',
-              },
-              pjYieldOrder: {
-                partName: '24-插头密封盖壳体',
-                partCode: '21E8-003-1149-E9-N',
-              }
-            },
-            makeMan: {
-              userName: '崔殿龙',
-            },
-            makeTeam: {
-              tsName: '化学镀镍一班崔胜伟'
-            },
-            oemCustomer: null
-          },
-          {
-            id: 3, paCode: 'FE-20231223003', quantity: 160, createTime: '2023-12-23 18:01:26',
-            weight: 111,
-            prWorkOrder: {
-              orders: "0021",
-              cardNo: '1016663941',
-              woCode: 'WO-S22122668-R01',
-              batchNo: 'WB135230311004',
-              procedureSet: {
-                ppsName: '包装防护',
-              },
-              pjYieldOrder: {
-                partName: '24-插头密封盖壳体',
-                partCode: '21E8-003-1149-E9-N',
-              }
-            },
-            makeMan: {
-              userName: '崔殿龙',
-            },
-            makeTeam: null,
-            oemCustomer: {
-              ocName: 'L235'
-            },
-          },
-        ]
-        this.page.total = this.data.length
+        this.option.menu = true;
+        this.query.paType = 3;
+        this.onLoad(this.page, this.query);
       }
-    }
-  }
-}
+    },
+    onLoad(page, params = {}) {
+      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;
+      });
+    },
+  },
+};
 </script>
 
-<style></style>
\ No newline at end of file
+<style></style>
diff --git a/src/views/productionManagement/components/afterPlatingEntryDialog.vue b/src/views/productionManagement/components/afterPlatingEntryDialog.vue
index 5b12671..99ae6bc 100644
--- a/src/views/productionManagement/components/afterPlatingEntryDialog.vue
+++ b/src/views/productionManagement/components/afterPlatingEntryDialog.vue
@@ -1,161 +1,182 @@
 <template>
-    <el-dialog title="新增" append-to-body :modelValue="afterBoundDialog" width="90%" @close="closeDialog" @open="open">
-        <div style="margin-bottom: 20px;">
-            <el-input placeholder="流程卡号" style="width: 220px;margin-right: 10px;" v-model="cardNo"
-                @keyup.enter="handleEnter"></el-input>
-            <el-button plain type="danger" @click="handleDelete">删除选择行</el-button>
-            <el-button type="primary" @click="handleSave">保存</el-button>
-        </div>
+  <el-dialog
+    title="新增"
+    append-to-body
+    :modelValue="afterBoundDialog"
+    width="90%"
+    @close="closeDialog"
+    @open="open"
+  >
+    <div style="margin-bottom: 20px">
+      <el-input
+        placeholder="流程卡号"
+        style="width: 220px; margin-right: 10px"
+        v-model="cardNo"
+        @keyup.enter="handleEnter"
+      ></el-input>
+      <el-button plain type="danger" @click="handleDelete">删除选择行</el-button>
+      <!-- <el-button type="primary" @click="handleSave">保存</el-button> -->
+    </div>
 
-        <el-table :data="beforePlatingEntryData" @selection-change="selectionChangeProject" @select="selectChange">
-            <el-table-column type="selection"></el-table-column>
-            <el-table-column label="移交类型" prop="hrTypeBool" width="150" align="center">
-                <template #default="scope">
-                    <el-select v-model="scope.row.tsName">
-                        <el-option label="转工" value="true"></el-option>
-                        <el-option label="入库" value="false"></el-option>
-                    </el-select>
-                </template>
-            </el-table-column>
-            <el-table-column label="转交部门" prop="useDept" width="200" align="center">
-                <template #default="scope">
-                    <el-input v-model="scope.row.useDept"></el-input>
-                </template>
-            </el-table-column>
-            <el-table-column label="下级B号" prop="nextRoam" width="150" align="center">
-                <template #default="scope">
-                    <el-input v-model="scope.row.nextRoam"></el-input>
-                </template>
-            </el-table-column>
-            <el-table-column label="下级B号名称" prop="nextRoamName" width="150" align="center">
-                <template #default="scope">
-                    <el-input v-model="scope.row.nextRoamName"></el-input>
-                </template>
-            </el-table-column>
-            <el-table-column label="单号" prop="paCode" width="150" align="center"></el-table-column>
-            <el-table-column label="车间订单" prop="woId" width="150" align="center">
-                <template #default="scope">
-                    <el-input v-model="scope.row.woId"></el-input>
-                </template>
-            </el-table-column>
-            <el-table-column label="批单号" prop="batchNo" width="150" align="center"></el-table-column>
-            <el-table-column label="入库数量" prop="quantity" width="150" align="center">
-                <template #default="scope">
-                    <el-input v-model="scope.row.quantity"></el-input>
-                </template>
-            </el-table-column>
-            <el-table-column label="重量" prop="weight" width="150" align="center">
-                <template #default="scope">
-                    <el-input v-model="scope.row.weight"></el-input>
-                </template>
-            </el-table-column>
-            <el-table-column label="流转编号" prop="prWorkOrder.pjYieldOrder.roamNo" width="150" align="center"></el-table-column>
-            <el-table-column label="编号名称" prop="prWorkOrder.pjYieldOrder.roamName" width="150" align="center"></el-table-column>
-            <el-table-column label="流程卡号" prop="prWorkOrder.cardNo" width="150" align="center"></el-table-column>
-            <el-table-column label="入库班组/供应商" prop="tsName" width="200" align="center">
-                <template #default="scope">
-                    <el-select v-model="scope.row.tsName">
-                        <el-option label="化学镀镍一班崔胜伟" value="化学镀镍一班崔胜伟"></el-option>
-                        <el-option label="L235" value="L235"></el-option>
-                    </el-select>
-                </template>
-            </el-table-column>
-            <el-table-column label="入库工序号" prop="orders" width="200" align="center">
-                <template #default="scope">
-                    <el-input v-model="scope.row.orders"></el-input>
-                </template>
-            </el-table-column>
-            <el-table-column label="入库工序名称" prop="ppsName" width="200" align="center">
-                <template #default="scope">
-                    <el-input v-model="scope.row.ppsName"></el-input>
-                </template>
-            </el-table-column>
-            <el-table-column label="上序号" prop="nextOrders" width="200" align="center">
-                <template #default="scope">
-                    <el-input v-model="scope.row.nextOrders"></el-input>
-                </template>
-            </el-table-column>
-            <el-table-column label="上序名称" prop="nextPpsName" width="200" align="center">
-                <template #default="scope">
-                    <el-input v-model="scope.row.nextPpsName"></el-input>
-                </template>
-            </el-table-column>
-            <el-table-column label="上序班组/供应商" prop="nextTsName" width="200" align="center">
-                <template #default="scope">
-                    <el-select v-model="scope.row.nextTsName">
-                        <el-option label="化学镀镍一班崔胜伟" value="化学镀镍一班崔胜伟"></el-option>
-                        <el-option label="L235" value="L235"></el-option> 
-                    </el-select>
-                    
-                </template>
-            </el-table-column>
-            <el-table-column label="入库人员" prop="userName" width="200" align="center">
-                <template #default="scope">
-                    <el-input v-model="scope.row.userName"></el-input>
-                </template>
-            </el-table-column>
-            <el-table-column label="入库时间" prop="createTime" width="200" align="center">
-                <template #default="scope">
-                    <el-input v-model="scope.row.createTime"></el-input>
-                </template>
-            </el-table-column>
-        </el-table>
-    </el-dialog>
+    <el-table
+      :data="beforePlatingEntryData"
+      @selection-change="selectionChangeProject"
+      @select="selectChange"
+    >
+      <el-table-column type="selection"></el-table-column>
+      <el-table-column label="移交类型" prop="hrTypeBool" width="150" align="center">
+        <template #default="scope">
+          <el-select v-model="scope.row.tsName">
+            <el-option label="转工" value="true"></el-option>
+            <el-option label="入库" value="false"></el-option>
+          </el-select>
+        </template>
+      </el-table-column>
+      <el-table-column label="转交部门" prop="useDept" width="200" align="center">
+        <template #default="scope">
+          <el-input v-model="scope.row.useDept"></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column label="下级B号" prop="nextRoam" width="150" align="center">
+        <template #default="scope">
+          <el-input v-model="scope.row.nextRoam"></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column label="下级B号名称" prop="nextRoamName" width="150" align="center">
+        <template #default="scope">
+          <el-input v-model="scope.row.nextRoamName"></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column label="单号" prop="paCode" width="150" align="center"></el-table-column>
+      <el-table-column label="车间订单" prop="woId" width="150" align="center">
+        <template #default="scope">
+          <el-input v-model="scope.row.woId"></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column label="批单号" prop="batchNo" width="150" align="center"></el-table-column>
+      <el-table-column label="入库数量" prop="quantity" width="150" align="center">
+        <template #default="scope">
+          <el-input v-model="scope.row.quantity"></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column label="重量" prop="weight" width="150" align="center">
+        <template #default="scope">
+          <el-input v-model="scope.row.weight"></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="流转编号"
+        prop="prWorkOrder.pjYieldOrder.roamNo"
+        width="150"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        label="编号名称"
+        prop="prWorkOrder.pjYieldOrder.roamName"
+        width="150"
+        align="center"
+      ></el-table-column>
+      <el-table-column
+        label="流程卡号"
+        prop="prWorkOrder.cardNo"
+        width="150"
+        align="center"
+      ></el-table-column>
+      <el-table-column label="入库班组/供应商" prop="tsName" width="200" align="center">
+        <template #default="scope">
+          <el-select v-model="scope.row.tsName">
+            <el-option label="化学镀镍一班崔胜伟" value="化学镀镍一班崔胜伟"></el-option>
+            <el-option label="L235" value="L235"></el-option>
+          </el-select>
+        </template>
+      </el-table-column>
+      <el-table-column label="入库工序号" prop="orders" width="200" align="center">
+        <template #default="scope">
+          <el-input v-model="scope.row.orders"></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column label="入库工序名称" prop="ppsName" width="200" align="center">
+        <template #default="scope">
+          <el-input v-model="scope.row.ppsName"></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column label="上序号" prop="nextOrders" width="200" align="center">
+        <template #default="scope">
+          <el-input v-model="scope.row.nextOrders"></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column label="上序名称" prop="nextPpsName" width="200" align="center">
+        <template #default="scope">
+          <el-input v-model="scope.row.nextPpsName"></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column label="上序班组/供应商" prop="nextTsName" width="200" align="center">
+        <template #default="scope">
+          <el-select v-model="scope.row.nextTsName">
+            <el-option label="化学镀镍一班崔胜伟" value="化学镀镍一班崔胜伟"></el-option>
+            <el-option label="L235" value="L235"></el-option>
+          </el-select>
+        </template>
+      </el-table-column>
+      <el-table-column label="入库人员" prop="userName" width="200" align="center">
+        <template #default="scope">
+          <el-input v-model="scope.row.userName"></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column label="入库时间" prop="createTime" width="200" align="center">
+        <template #default="scope">
+          <el-input v-model="scope.row.createTime"></el-input>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="closeDialog">取 消</el-button>
+        <el-button type="primary" @click="handleSave">保 存</el-button>
+      </span>
+    </template>
+  </el-dialog>
 </template>
 
 <script>
-export default {
-    props: {
-        afterBoundDialog: {
-            type: Boolean,
-            default: false
-        },
+import { getAfterPlatCardNo } from '@/api/productionManagement/beforeAndAfterPlating';
 
+export default {
+  props: {
+    afterBoundDialog: {
+      type: Boolean,
+      default: false,
     },
-    data() {
-        return {
-            cardNo: "",
-            beforePlatingEntryData: []
-        }
+  },
+  data() {
+    return {
+      cardNo: '',
+      beforePlatingEntryData: [],
+    };
+  },
+  mounted() {},
+  methods: {
+    open() {
+      this.cardNo = '';
+      this.beforePlatingEntryData = [];
     },
-    mounted() {
-
+    handleEnter() {
+      getAfterPlatCardNo({ cardNo: this.cardNo }).then(res => {
+        this.beforePlatingEntryData = res.data.data;
+      });
+    },
+    handleDelete() {},
+    handleSave() {
+      this.closeDialog();
+    },
+    selectionChangeProject() {},
+    selectChange() {},
+    closeDialog() {
+      this.$emit('closeDialog');
     },
-    methods: {
-        open(){
-            this.cardNo = ''
-            this.beforePlatingEntryData = []
-        },
-        handleEnter() {
-            this.beforePlatingEntryData.push({
-                paCode: 'FE-20231223003', woCode: 'WO-S22122668-R01', batchNo: 'WB135230311004', cardNo: '1016663941',woId:'',
-                tsName: '', orders: '', ppsName: '', nextOrders: '', nextPpsName: '', nextTsName: '', quantity: '', userName: '',
-                createTime: '',
-                prWorkOrder:{
-                    pjYieldOrder:{roamNo:'编号XXXX',roamName:'编号XXXX'},
-                    cardNo: '1016663941'
-                }
-            }, {
-                paCode: 'FE-20231223003', woCode: 'WO-S22122668-R01', batchNo: 'WB135230311004', cardNo: '1016663941',woId:'',
-                tsName: '', orders: '', ppsName: '', nextOrders: '', nextPpsName: '', nextTsName: '', quantity: '', userName: '',
-                createTime: '',
-                prWorkOrder:{
-                    pjYieldOrder:{roamNo:'编号XXXX',roamName:'编号XXXX'},
-                    cardNo: '1016663941'
-                }
-            })
-        },
-        handleDelete() {        },
-        handleSave(){
-            this.closeDialog()
-        },
-        selectionChangeProject() { },
-        selectChange() { },
-        closeDialog(){
-            this.$emit('closeDialog');
-        },
-    }
-}
+  },
+};
 </script>
 
-<style></style>
\ No newline at end of file
+<style></style>
diff --git a/src/views/productionManagement/components/beforePlatingBoundDialog.vue b/src/views/productionManagement/components/beforePlatingBoundDialog.vue
index 0b7cd00..c8139eb 100644
--- a/src/views/productionManagement/components/beforePlatingBoundDialog.vue
+++ b/src/views/productionManagement/components/beforePlatingBoundDialog.vue
@@ -1,115 +1,130 @@
 <template>
-    <el-dialog title="新增" append-to-body :modelValue="boundDialog" width="90%" @close="closeDialog" @open="open">
-        <div style="margin-bottom: 20px;">
-            <el-input placeholder="流程卡号" style="width: 220px;margin-right: 10px;" v-model="cardNo"
-                @keyup.enter="handleEnter"></el-input>
-            <el-button plain type="danger" @click="handleDelete">删除选择行</el-button>
-            <el-button type="primary" @click="handleSave">保存</el-button>
-        </div>
+  <el-dialog
+    title="新增"
+    append-to-body
+    :modelValue="boundDialog"
+    width="90%"
+    @close="closeDialog"
+    @open="open"
+  >
+    <div style="margin-bottom: 20px">
+      <el-input
+        placeholder="流程卡号"
+        style="width: 220px; margin-right: 10px"
+        v-model="cardNo"
+        @keyup.enter="handleEnter"
+      ></el-input>
+      <el-button plain type="danger" @click="handleDelete">删除选择行</el-button>
+      <!-- <el-button type="primary" @click="handleSave">保存</el-button> -->
+    </div>
 
-        <el-table :data="beforePlatingEntryData" @selection-change="selectionChangeProject" @select="selectChange">
-            <el-table-column type="selection"></el-table-column>
-            <el-table-column label="单号" prop="paCode" width="150" align="center"></el-table-column>
-            <el-table-column label="车间订单" prop="woCode" width="200" align="center"></el-table-column>
-            <el-table-column label="批单号" prop="batchNo" width="150" align="center"></el-table-column>
-            <el-table-column label="流程卡号" prop="cardNo" width="150" align="center"></el-table-column>
-            <el-table-column label="出库班组/供应商" prop="tsName" width="200" align="center">
-                <template #default="scope">
-                    <el-select v-model="scope.row.tsName">
-                        <el-option label="化学镀镍一班崔胜伟" value="化学镀镍一班崔胜伟"></el-option>
-                        <el-option label="L235" value="L235"></el-option>
-                    </el-select>
-                </template>
-            </el-table-column>
-            <el-table-column label="出库工序号" prop="orders" width="200" align="center">
-                <template #default="scope">
-                    <el-input v-model="scope.row.orders"></el-input>
-                </template>
-            </el-table-column>
-            <el-table-column label="出库工序名称" prop="ppsName" width="200" align="center">
-                <template #default="scope">
-                    <el-input v-model="scope.row.ppsName"></el-input>
-                </template>
-            </el-table-column>
-            <el-table-column label="上序号" prop="nextOrders" width="200" align="center">
-                <template #default="scope">
-                    <el-input v-model="scope.row.nextOrders"></el-input>
-                </template>
-            </el-table-column>
-            <el-table-column label="上序名称" prop="nextPpsName" width="200" align="center">
-                <template #default="scope">
-                    <el-input v-model="scope.row.nextPpsName"></el-input>
-                </template>
-            </el-table-column>
-            <el-table-column label="上序班组/供应商" prop="nextTsName" width="200" align="center">
-                <template #default="scope">
-                    <el-option label="化学镀镍一班崔胜伟" value="化学镀镍一班崔胜伟"></el-option>
-                    <el-option label="L235" value="L235"></el-option>
-                </template>
-            </el-table-column>
-            <el-table-column label="出库数量" prop="quantity" width="200" align="center">
-                <template #default="scope">
-                    <el-input v-model="scope.row.quantity"></el-input>
-                </template>
-            </el-table-column>
-            <el-table-column label="出库人员" prop="userName" width="200" align="center">
-                <template #default="scope">
-                    <el-input v-model="scope.row.userName"></el-input>
-                </template>
-            </el-table-column>
-            <el-table-column label="出库时间" prop="createTime" width="200" align="center">
-                <template #default="scope">
-                    <el-input v-model="scope.row.createTime"></el-input>
-                </template>
-            </el-table-column>
-        </el-table>
-    </el-dialog>
+    <el-table
+      :data="beforePlatingEntryData"
+      @selection-change="selectionChangeProject"
+      @select="selectChange"
+    >
+      <el-table-column type="selection"></el-table-column>
+      <el-table-column label="单号" prop="paCode" width="150" align="center"></el-table-column>
+      <el-table-column label="车间订单" prop="woCode" width="200" align="center"></el-table-column>
+      <el-table-column label="批单号" prop="batchNo" width="150" align="center"></el-table-column>
+      <el-table-column label="流程卡号" prop="cardNo" width="150" align="center"></el-table-column>
+      <el-table-column label="出库班组/供应商" prop="tsName" width="200" align="center">
+        <template #default="scope">
+          <el-select v-model="scope.row.tsName">
+            <el-option label="化学镀镍一班崔胜伟" value="化学镀镍一班崔胜伟"></el-option>
+            <el-option label="L235" value="L235"></el-option>
+          </el-select>
+        </template>
+      </el-table-column>
+      <el-table-column label="出库工序号" prop="orders" width="200" align="center">
+        <template #default="scope">
+          <el-input v-model="scope.row.orders"></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column label="出库工序名称" prop="ppsName" width="200" align="center">
+        <template #default="scope">
+          <el-input v-model="scope.row.ppsName"></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column label="上序号" prop="nextOrders" width="200" align="center">
+        <template #default="scope">
+          <el-input v-model="scope.row.nextOrders"></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column label="上序名称" prop="nextPpsName" width="200" align="center">
+        <template #default="scope">
+          <el-input v-model="scope.row.nextPpsName"></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column label="上序班组/供应商" prop="nextTsName" width="200" align="center">
+        <template #default="scope">
+          <el-option label="化学镀镍一班崔胜伟" value="化学镀镍一班崔胜伟"></el-option>
+          <el-option label="L235" value="L235"></el-option>
+        </template>
+      </el-table-column>
+      <el-table-column label="出库数量" prop="quantity" width="200" align="center">
+        <template #default="scope">
+          <el-input v-model="scope.row.quantity"></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column label="出库人员" prop="userName" width="200" align="center">
+        <template #default="scope">
+          <el-input v-model="scope.row.userName"></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column label="出库时间" prop="createTime" width="200" align="center">
+        <template #default="scope">
+          <el-input v-model="scope.row.createTime"></el-input>
+        </template>
+      </el-table-column>
+    </el-table>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="closeDialog">取 消</el-button>
+        <el-button type="primary" @click="handleSave">保 存</el-button>
+      </span>
+    </template>
+  </el-dialog>
 </template>
 
 <script>
+import { getBeforePlatOutCardNo } from '@/api/productionManagement/beforeAndAfterPlating';
+
 export default {
-    props: {
-        boundDialog: {
-            type: Boolean,
-            default: false
-        },
+  props: {
+    boundDialog: {
+      type: Boolean,
+      default: false,
     },
-    data() {
-        return {
-            cardNo: "",
-            beforePlatingEntryData: []
-        }
+  },
+  data() {
+    return {
+      cardNo: '',
+      beforePlatingEntryData: [],
+    };
+  },
+  mounted() {},
+  methods: {
+    open() {
+      this.cardNo = '';
+      this.beforePlatingEntryData = [];
     },
-    mounted() {
-
+    handleEnter() {
+      getBeforePlatOutCardNo({ cardNo: this.cardNo }).then(res => {
+        this.beforePlatingEntryData = res.data;
+      });
+    },
+    handleDelete() {},
+    handleSave() {
+      this.closeDialog();
+    },
+    selectionChangeProject() {},
+    selectChange() {},
+    closeDialog() {
+      this.$emit('closeDialog');
     },
-    methods: {
-        open(){
-            this.cardNo = ''
-            this.beforePlatingEntryData = []
-        },
-        handleEnter() {
-            this.beforePlatingEntryData.push({
-                paCode: 'FE-20231223003', woCode: 'WO-S22122668-R01', batchNo: 'WB135230311004', cardNo: '1016663941',
-                tsName: '', orders: '', ppsName: '', nextOrders: '', nextPpsName: '', nextTsName: '', quantity: '', userName: '',
-                createTime: ''
-            }, {
-                paCode: 'FE-20231223003', woCode: 'WO-S22122668-R01', batchNo: 'WB135230311004', cardNo: '1016663941',
-                tsName: '', orders: '', ppsName: '', nextOrders: '', nextPpsName: '', nextTsName: '', quantity: '', userName: '',
-                createTime: ''
-            })
-        },
-        handleDelete() {        },
-        handleSave(){
-            this.closeDialog()
-        },
-        selectionChangeProject() { },
-        selectChange() { },
-        closeDialog(){
-            this.$emit('closeDialog');
-        },
-    }
-}
+  },
+};
 </script>
 
-<style></style>
\ No newline at end of file
+<style></style>
diff --git a/src/views/productionManagement/components/beforePlatingEntryDialog.vue b/src/views/productionManagement/components/beforePlatingEntryDialog.vue
index 1fd0d26..614c907 100644
--- a/src/views/productionManagement/components/beforePlatingEntryDialog.vue
+++ b/src/views/productionManagement/components/beforePlatingEntryDialog.vue
@@ -1,116 +1,130 @@
 <template>
-    <el-dialog title="新增" append-to-body :modelValue="showDialog" width="90%" @close="closeDialog" @open="open">
-        <div style="margin-bottom: 20px;">
-            <el-input placeholder="流程卡号" style="width: 220px;margin-right: 10px;" v-model="cardNo"
-                @keyup.enter="handleEnter"></el-input>
-            <el-button plain type="danger" @click="handleDelete">删除选择行</el-button>
-            <el-button type="primary" @click="handleSave">保存</el-button>
-        </div>
+  <el-dialog
+    title="新增"
+    append-to-body
+    :modelValue="showDialog"
+    width="90%"
+    @close="closeDialog"
+    @open="open"
+  >
+    <div style="margin-bottom: 20px">
+      <el-input
+        placeholder="流程卡号"
+        style="width: 220px; margin-right: 10px"
+        v-model="cardNo"
+        @keyup.enter="handleEnter"
+      ></el-input>
+      <el-button plain type="danger" @click="handleDelete">删除选择行</el-button>
+      <!-- <el-button type="primary" @click="handleSave">保存</el-button> -->
+    </div>
 
-        <el-table :data="beforePlatingEntryData" @selection-change="selectionChangeProject" @select="selectChange">
-            <el-table-column type="selection"></el-table-column>
-            <el-table-column label="单号" prop="paCode" width="150" align="center"></el-table-column>
-            <el-table-column label="车间订单" prop="woCode" width="200" align="center"></el-table-column>
-            <el-table-column label="批单号" prop="batchNo" width="150" align="center"></el-table-column>
-            <el-table-column label="流程卡号" prop="cardNo" width="150" align="center"></el-table-column>
-            <el-table-column label="入库班组/供应商" prop="tsName" width="200" align="center">
-                <template #default="scope">
-                    <el-select v-model="scope.row.tsName">
-                        <el-option label="化学镀镍一班崔胜伟" value="化学镀镍一班崔胜伟"></el-option>
-                        <el-option label="L235" value="L235"></el-option>
-                    </el-select>
-                </template>
-            </el-table-column>
-            <el-table-column label="入库工序号" prop="orders" width="200" align="center">
-                <template #default="scope">
-                    <el-input v-model="scope.row.orders"></el-input>
-                </template>
-            </el-table-column>
-            <el-table-column label="入库工序名称" prop="ppsName" width="200" align="center">
-                <template #default="scope">
-                    <el-input v-model="scope.row.ppsName"></el-input>
-                </template>
-            </el-table-column>
-            <el-table-column label="下序号" prop="nextOrders" width="200" align="center">
-                <template #default="scope">
-                    <el-input v-model="scope.row.nextOrders"></el-input>
-                </template>
-            </el-table-column>
-            <el-table-column label="下序名称" prop="nextPpsName" width="200" align="center">
-                <template #default="scope">
-                    <el-input v-model="scope.row.nextPpsName"></el-input>
-                </template>
-            </el-table-column>
-            <el-table-column label="下序班组/供应商" prop="nextTsName" width="200" align="center">
-                <template #default="scope">
-                    <el-option label="化学镀镍一班崔胜伟" value="化学镀镍一班崔胜伟"></el-option>
-                    <el-option label="L235" value="L235"></el-option>
-                </template>
-            </el-table-column>
-            <el-table-column label="入库数量" prop="quantity" width="200" align="center">
-                <template #default="scope">
-                    <el-input v-model="scope.row.quantity"></el-input>
-                </template>
-            </el-table-column>
-            <el-table-column label="入库人员" prop="userName" width="200" align="center">
-                <template #default="scope">
-                    <el-input v-model="scope.row.userName"></el-input>
-                </template>
-            </el-table-column>
-            <el-table-column label="入库时间" prop="createTime" width="200" align="center">
-                <template #default="scope">
-                    <el-input v-model="scope.row.createTime"></el-input>
-                </template>
-            </el-table-column>
-        </el-table>
-    </el-dialog>
+    <el-table
+      :data="beforePlatingEntryData"
+      @selection-change="selectionChangeProject"
+      @select="selectChange"
+    >
+      <el-table-column type="selection"></el-table-column>
+      <el-table-column label="单号" prop="paCode" width="150" align="center"></el-table-column>
+      <el-table-column label="车间订单" prop="woCode" width="200" align="center"></el-table-column>
+      <el-table-column label="批单号" prop="batchNo" width="150" align="center"></el-table-column>
+      <el-table-column label="流程卡号" prop="cardNo" width="150" align="center"></el-table-column>
+      <el-table-column label="入库班组/供应商" prop="tsName" width="200" align="center">
+        <template #default="scope">
+          <el-select v-model="scope.row.tsName">
+            <el-option label="化学镀镍一班崔胜伟" value="化学镀镍一班崔胜伟"></el-option>
+            <el-option label="L235" value="L235"></el-option>
+          </el-select>
+        </template>
+      </el-table-column>
+      <el-table-column label="入库工序号" prop="orders" width="200" align="center">
+        <template #default="scope">
+          <el-input v-model="scope.row.orders"></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column label="入库工序名称" prop="ppsName" width="200" align="center">
+        <template #default="scope">
+          <el-input v-model="scope.row.ppsName"></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column label="下序号" prop="nextOrders" width="200" align="center">
+        <template #default="scope">
+          <el-input v-model="scope.row.nextOrders"></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column label="下序名称" prop="nextPpsName" width="200" align="center">
+        <template #default="scope">
+          <el-input v-model="scope.row.nextPpsName"></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column label="下序班组/供应商" prop="nextTsName" width="200" align="center">
+        <template #default="scope">
+          <el-option label="化学镀镍一班崔胜伟" value="化学镀镍一班崔胜伟"></el-option>
+          <el-option label="L235" value="L235"></el-option>
+        </template>
+      </el-table-column>
+      <el-table-column label="入库数量" prop="quantity" width="200" align="center">
+        <template #default="scope">
+          <el-input v-model="scope.row.quantity"></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column label="入库人员" prop="userName" width="200" align="center">
+        <template #default="scope">
+          <el-input v-model="scope.row.userName"></el-input>
+        </template>
+      </el-table-column>
+      <el-table-column label="入库时间" prop="createTime" width="200" align="center">
+        <template #default="scope">
+          <el-input v-model="scope.row.createTime"></el-input>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="closeDialog">取 消</el-button>
+        <el-button type="primary" @click="handleSave">保 存</el-button>
+      </span>
+    </template>
+  </el-dialog>
 </template>
 
 <script>
+import { getList, getBeforePlatInCardNo } from '@/api/productionManagement/beforeAndAfterPlating';
 export default {
-    props: {
-        showDialog: {
-            type: Boolean,
-            default: false
-        },
-
+  props: {
+    showDialog: {
+      type: Boolean,
+      default: false,
     },
-    data() {
-        return {
-            cardNo: "",
-            beforePlatingEntryData: []
-        }
+  },
+  data() {
+    return {
+      cardNo: '',
+      beforePlatingEntryData: [],
+    };
+  },
+  mounted() {},
+  methods: {
+    open() {
+      this.cardNo = '';
+      this.beforePlatingEntryData = [];
     },
-    mounted() {
-
+    handleEnter() {
+      getBeforePlatInCardNo({ cardNo: this.cardNo }).then(res => {
+        this.beforePlatingEntryData = res.data;
+      });
+    },
+    handleDelete() {},
+    handleSave() {
+      this.closeDialog();
+    },
+    selectionChangeProject() {},
+    selectChange() {},
+    closeDialog() {
+      this.$emit('closeDialog');
     },
-    methods: {
-        open(){
-            this.cardNo = ''
-            this.beforePlatingEntryData = []
-        },
-        handleEnter() {
-            this.beforePlatingEntryData.push({
-                paCode: 'FE-20231223003', woCode: 'WO-S22122668-R01', batchNo: 'WB135230311004', cardNo: '1016663941',
-                tsName: '', orders: '', ppsName: '', nextOrders: '', nextPpsName: '', nextTsName: '', quantity: '', userName: '',
-                createTime: ''
-            }, {
-                paCode: 'FE-20231223003', woCode: 'WO-S22122668-R01', batchNo: 'WB135230311004', cardNo: '1016663941',
-                tsName: '', orders: '', ppsName: '', nextOrders: '', nextPpsName: '', nextTsName: '', quantity: '', userName: '',
-                createTime: ''
-            })
-        },
-        handleDelete() {        },
-        handleSave(){
-            this.closeDialog()
-        },
-        selectionChangeProject() { },
-        selectChange() { },
-        closeDialog(){
-            this.$emit('closeDialog');
-        },
-    }
-}
+  },
+};
 </script>
 
-<style></style>
\ No newline at end of file
+<style></style>
diff --git a/src/views/productionManagement/deductionPreserve/editDialog.vue b/src/views/productionManagement/deductionPreserve/editDialog.vue
index fe3f8cf..1f8b592 100644
--- a/src/views/productionManagement/deductionPreserve/editDialog.vue
+++ b/src/views/productionManagement/deductionPreserve/editDialog.vue
@@ -1,102 +1,111 @@
 <template>
-    <el-dialog title="扣数维护" append-to-body :modelValue="openShow" width="40%" @close="closeDialog">
-        <avue-form :option="option"></avue-form>
+  <el-dialog title="扣数维护" append-to-body v-model="openShow" width="40%" @close="closeDialog">
+    <avue-form ref="form" :option="option" v-model="form"></avue-form>
 
-        <template #footer>
-           <span class="dialog-footer">
-                <el-button @click="closeDialog">取 消</el-button>
-                <el-button type="primary" @click="submit">确 定</el-button>
-            </span>
-        </template>
-    </el-dialog>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="closeDialog">取 消</el-button>
+        <el-button type="primary" @click="submit">确 定</el-button>
+      </span>
+    </template>
+  </el-dialog>
 </template>
 <script>
+import { getWorkOrderByCardNo,saveOrUpdate } from '@/api/productionManagement/deductionPreserve';
 export default {
-    props: {
-        showDialog: {
-            type: Boolean,
-            default: false
-        },
+  props: {
+    showDialog: {
+      type: Boolean,
+      default: false,
     },
-    data() {
-        return {
-            openShow: false,
-            option: {
-                submitBtn: false,
-                emptyBtn: false,
-                column: [
-                     {
-                        label: '订单号',
-                        prop: 'input',
-                        span: 12, 
-                        disabled:true,                       
-                        
-                    },
-                    {
-                        label: '零件号',
-                        prop: 'input',
-                        span: 12, 
-                        disabled:true,                       
-                        
-                    },
-                    {
-                        label: '批次号',
-                        prop: 'input',
-                        span: 12, 
-                        disabled:true,                       
-                        
-                    },
-                    {
-                        label: '试验数量',
-                        prop: 'input',
-                        span: 12,                        
-                        
-                    },
-                    {
-                        label: '报废数量',
-                        prop: 'input',
-                        span: 12,                        
-                        
-                    },
-                     {
-                        label: '消耗数量',
-                        prop: 'input',
-                        span: 12,                        
-                        
-                    },
-                    {
-                        label: '备注',
-                        prop: 'input2',
-                        // type: 'select',
-                        type:'textarea',
-                        span: 24,
-                        rules: [
-                            { required: true, message: '请输入', trigger: 'blur' }
-                        ]
-                        // dicData: [
-                        //     {
-                        //         label: '不需要结算',
-                        //         value: '1',
-                        //     },
-                        //     {
-                        //         label: '基础数据有误',
-                        //         value: '2',
-                        //     }
-                        // ]
-                    }
-                ]
-            }
-        }
+    cardNo: {
+      type: String,
+      default: '',
+    },
+  },
+  data() {
+    return {
+      openShow: false,
+      option: {
+        submitBtn: false,
+        emptyBtn: false,
+        column: [
+          {
+            label: '订单号',
+            prop: 'woId',
+            span: 12,
+            disabled: true,
+          },
+        //   {
+        //     label: '零件号',
+        //     prop: 'input',
+        //     span: 12,
+        //     disabled: true,
+        //   },
+        //   {
+        //     label: '批次号',
+        //     prop: 'input',
+        //     span: 12,
+        //     disabled: true,
+        //   },
+          {
+            label: '试验数量',
+            prop: 'testQty',
+            span: 12,
+          },
+          {
+            label: '报废数量',
+            prop: 'scrapQty',
+            span: 12,
+          },
+          {
+            label: '消耗数量',
+            prop: 'lossQty',
+            span: 12,
+          },
+          {
+            label: '备注',
+            prop: 'memo',
+            type: 'textarea',
+            span: 24,
+            rules: [{ required: true, message: '请输入', trigger: 'blur' }],
+          },
+        ],
+      },
+      form:{}
+    };
+  },
+  mounted() {
+    this.openShow = this.showDialog;
+    this.getWorkOrderByCardNo()
+  },
+  methods: {
+    getWorkOrderByCardNo() {
+      getWorkOrderByCardNo({
+        cardNo: this.cardNo,
+      }).then(res => {
+        console.log(res, 'res');
+      });
     },
-    mounted() {
-        this.openShow = this.showDialog
+    closeDialog(type) {
+      this.openShow = false;
+      this.$emit('closeDialog',type);
     },
-    methods: {
-        closeDialog() {
-            this.openShow = false
-            this.$emit('closeDialog');
+    submit() {
+      this.$refs.form.validate((valid, done, msg) => {
+        if (valid) {
+          done();
+          saveOrUpdate(this.form).then(res => {
+            this.$message.success('操作成功');
+            this.closeDialog(true)
+          });
+        } else {
+          console.log('error submit!!');
+          return false;
         }
-    }
-}
+      });
+    },
+  },
+};
 </script>
-<style lang="scss" scoped></style>
\ No newline at end of file
+<style lang="scss" scoped></style>
diff --git a/src/views/productionManagement/deductionPreserve/index.vue b/src/views/productionManagement/deductionPreserve/index.vue
index 512c9cf..82530c3 100644
--- a/src/views/productionManagement/deductionPreserve/index.vue
+++ b/src/views/productionManagement/deductionPreserve/index.vue
@@ -7,7 +7,6 @@
       v-model="form"
       v-model:page="page"
       ref="crud"
-      @row-del="rowDel"
       @search-change="searchChange"
       @search-reset="searchReset"
       @selection-change="selectionChange"
@@ -18,7 +17,7 @@
     >
       <template #menu-left>
         <el-input
-          v-model="input"
+          v-model="cardNo"
           placeholder="请扫描流程卡号"
           @keyup.enter.native="queryOrder"
         ></el-input>
@@ -36,25 +35,15 @@
     <editDialog
       v-if="editOpen"
       :showDialog="editOpen"
+      :cardNo="cardNo"
       @closeDialog="closeDialog"
     ></editDialog>
   </basic-container>
 </template>
 
 <script>
-import editDialog from "./editDialog.vue";
-import {
-  add,
-  getRole,
-  getRoleAlias,
-  getRoleTreeById,
-  grant,
-  grantTree,
-  remove,
-  update,
-} from "@/api/system/role";
-import { mapGetters } from "vuex";
-import { validatenull } from "@/utils/validate";
+import editDialog from './editDialog.vue';
+import { getList } from '@/api/productionManagement/deductionPreserve';
 
 export default {
   components: {
@@ -62,27 +51,9 @@ export default {
   },
   data() {
     return {
+      cardNo: '', //流程卡号
       editOpen: false,
-      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: {
@@ -93,7 +64,7 @@ export default {
       option: {
         columnSort: true,
         tip: false,
-        height: "auto",
+        height: 'auto',
         calcHeight: 32,
         simplePage: false,
         searchShow: true,
@@ -108,7 +79,7 @@ export default {
         editBtn: false,
         viewBtn: false,
         delBtn: false,
-        editBtnText: "修改",
+        editBtnText: '修改',
         labelWidth: 120,
         menuWidth: 80,
         dialogWidth: 900,
@@ -119,33 +90,31 @@ export default {
         searchShowBtn: false,
         excelBtn: true,
         showOverflowTooltip: true,
-        addBtnIcon: " ",
-        viewBtnIcon: " ",
-        delBtnIcon: " ",
-        editBtnIcon: " ",
+        addBtnIcon: ' ',
+        viewBtnIcon: ' ',
+        delBtnIcon: ' ',
+        editBtnIcon: ' ',
         gridBtn: false,
-        searchLabelPosition: "left",
+        searchLabelPosition: 'left',
         searchGutter: 24,
         searchSpan: 6,
-        menuAlign: "left",
+        menuAlign: 'left',
         gridBtn: false,
-        searchMenuPosition: "right",
-        align: "center",
+        searchMenuPosition: 'right',
+        align: 'center',
         menu: false,
         column: [
           {
-            label: "订单号",
-            prop: "partCode",
-            bind: "dsPart.partCode",
+            label: '订单号',
+            prop: 'woCode',
             search: true,
             sortable: true,
             span: 12,
             width: 150,
           },
           {
-            label: "零件号",
-            prop: "partCode",
-            bind: "dsPart.partCode",
+            label: '零件号',
+            prop: 'partCode',
             search: true,
             sortable: true,
             span: 12,
@@ -153,9 +122,8 @@ export default {
           },
 
           {
-            label: "批次号",
-            prop: "plate",
-            bind: "dsPart.plate",
+            label: '批次号',
+            prop: 'batchNo',
             search: true,
             sortable: true,
             span: 12,
@@ -163,9 +131,8 @@ export default {
             width: 150,
           },
           {
-            label: "当前工序",
-            prop: "plate",
-            bind: "dsPart.plate",
+            label: '当前工序',
+            prop: 'ppsName',
             search: false,
             sortable: true,
             span: 12,
@@ -173,9 +140,8 @@ export default {
             width: 150,
           },
           {
-            label: "数量",
-            prop: "plate",
-            bind: "dsPart.plate",
+            label: '数量',
+            prop: 'qty',
             search: false,
             sortable: true,
             span: 12,
@@ -183,9 +149,8 @@ export default {
             width: 150,
           },
           {
-            label: "实验数量",
-            prop: "plate",
-            bind: "dsPart.plate",
+            label: '实验数量',
+            prop: 'testQty',
             search: false,
             sortable: true,
             span: 12,
@@ -193,9 +158,8 @@ export default {
             width: 150,
           },
           {
-            label: "报废数量",
-            prop: "plate",
-            bind: "dsPart.plate",
+            label: '报废数量',
+            prop: 'scrapQty',
             search: false,
             sortable: true,
             span: 12,
@@ -203,9 +167,8 @@ export default {
             width: 150,
           },
           {
-            label: "消耗数量",
-            prop: "plate",
-            bind: "dsPart.plate",
+            label: '消耗数量',
+            prop: 'lossQty',
             search: false,
             sortable: true,
             span: 12,
@@ -213,9 +176,8 @@ export default {
             width: 150,
           },
           {
-            label: "维护人",
-            prop: "plate",
-            bind: "dsPart.plate",
+            label: '维护人',
+            prop: 'maintenanceName',
             search: false,
             sortable: true,
             span: 12,
@@ -223,9 +185,8 @@ export default {
             width: 150,
           },
           {
-            label: "维护时间",
-            prop: "plate",
-            bind: "dsPart.plate",
+            label: '维护时间',
+            prop: 'maintenanceTime',
             search: false,
             sortable: true,
             span: 12,
@@ -233,9 +194,8 @@ export default {
             width: 150,
           },
           {
-            label: "备注",
-            prop: "plate",
-            bind: "dsPart.plate",
+            label: '备注',
+            prop: 'memo',
             search: false,
             sortable: true,
             span: 12,
@@ -246,154 +206,26 @@ export default {
       },
 
       data: [],
-      isRushOpen: false, //加急弹框
-      isBatchOpen: false, //分批处理
     };
   },
   methods: {
+    // 扫描流程卡号
     queryOrder() {
       this.editOpen = true;
     },
-    closeDialog() {
-      this.editOpen = false;
-    },
-    // 批量接收
-    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() {
+
+    closeDialog(type) {
       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.editOpen = false;
+      if(type){
+        this.onLoad(this.page, this.query); 
       }
-      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();
-        },
-        (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: "操作成功!",
-          });
-        });
     },
 
     searchReset() {
       this.query = {};
-      this.onLoad(this.page);
+      this.onLoad(this.page, this.query);
     },
     searchChange(params, done) {
       this.query = params;
@@ -401,118 +233,26 @@ export default {
       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;
+      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);
     },
-    handleChange(file, fileList) {
-      // proxy.$Export.xlsx(file.raw).then((data) => {
-      //     data.value = data.results;
-      // });
-      this.$message({
-        type: "success",
-        message: "操作成功!",
-      });
-    },
 
     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();
-      //   });
+      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;
+      });
     },
   },
-  mounted() {},
 };
 </script>
diff --git a/src/views/productionManagement/js/platingColumnData.js b/src/views/productionManagement/js/platingColumnData.js
index b3f1eeb..5362e22 100644
--- a/src/views/productionManagement/js/platingColumnData.js
+++ b/src/views/productionManagement/js/platingColumnData.js
@@ -4,222 +4,111 @@ export default {
       label: '单号',
       prop: 'paCode',
       span: 24,
-      width:150,
+      width: 150,
       overflow: true,
       search: true,
-      rules: [
-        {
-          required: true,
-          message: '请输入单号',
-          trigger: 'blur',
-        },
-      ],
+
     },
     {
       label: '流程卡号',
       prop: 'cardNo',
-      width:150,
+      width: 150,
       span: 24,
       search: true,
-      rules: [
-        {
-          required: true,
-          message: '请输入流程卡号',
-          trigger: 'blur',
-        },
-      ],
+
     },
     {
       label: '车间订单号',
       prop: 'woCode',
       span: 24,
-      width:200,
+      width: 200,
       search: true,
-      rules: [
-        {
-          required: true,
-          message: '请输入车间订单号',
-          trigger: 'blur',
-        },
-      ],
+
     },
     {
-      label: '批单号',
+      label: '批次号',
       prop: 'batchNo',
       span: 24,
-      width:200,
+      width: 200,
       search: true,
-      rules: [
-        {
-          required: true,
-          message: '请输入批单号',
-          trigger: 'blur',
-        },
-      ],
+
     },
     {
       label: '零件号',
       prop: 'partCode',
       span: 24,
-      width:200,
+      width: 200,
       search: false,
-      rules: [
-        {
-          required: true,
-          message: '请输入零件号',
-          trigger: 'blur',
-        },
-      ],
+
     },
     {
-      label: '名称',
+      label: '零件名称',
       prop: 'partName',
-      width:120,
+      width: 120,
       span: 24,
       search: true,
-      rules: [
-        {
-          required: true,
-          message: '请输入名称',
-          trigger: 'blur',
-        },
-      ],
+
     },
     {
       label: '入库数量',
       prop: 'quantity',
       span: 24,
-      width:100,
+      width: 100,
       search: false,
-      rules: [
-        {
-          required: true,
-          message: '请输入入库数量',
-          trigger: 'blur',
-        },
-      ],
+
     },
     {
       label: '入库班组/供应商',
       prop: 'tsName',
       span: 24,
-      width:200,
+      width: 200,
       search: false,
-      rules: [
-        {
-          required: true,
-          message: '请输入入库班组/供应商',
-          trigger: 'blur',
-        },
-      ],
+
     },
     {
       label: '班组',
       prop: 'tsId',
-      type: 'select',
-      span: 24,
-      search: true,
-      hide: true,
-      rules: [
-        {
-          required: true,
-          message: '请选择班组',
-          trigger: 'blur',
-        },
-      ],
-      props: {
-        label: 'tsName',
-        value: 'tsId'
-      },
-      dicData: [
-        { tsId: 61, tsName: "化学镀镍一班崔胜伟" },
-        { tsId: 64, tsName: "零件管理班" },
-        { tsId: 65, tsName: "检验班" },
-      ]
-    },
-    {
-      label: '供应商',
-      prop: 'ocId',
-      type: 'select',
       span: 24,
       search: true,
       hide: true,
-      rules: [
-        {
-          required: true,
-          message: '请选择供应商',
-          trigger: 'blur',
-        },
-      ],
-      props: {
-        label: 'ocCode',
-        value: 'ocId'
-      },
-      dicData: [
-        { ocCode: "L050", ocId: 3 },
-        { ocCode: "L065", ocId: 4 },
-        { ocCode: "L070", ocId: 5 },
-      ]
+
     },
+
     {
       label: '入库工序号',
       prop: 'orders',
       span: 24,
-      width:120,
+      width: 120,
       search: true,
-      rules: [
-        {
-          required: true,
-          message: '请输入入库工序号',
-          trigger: 'blur',
-        },
-      ],
+
     },
     {
       label: '入库工序名称',
-      prop: 'ppsName',
+      prop: 'ppsId',
       span: 24,
       search: true,
-      width:150,
-      rules: [
-        {
-          required: true,
-          message: '请输入入库工序名称',
-          trigger: 'blur',
-        },
-      ],
+      width: 150,
+
     },
     {
       label: '入库人员',
-      prop: 'userName',
-      width:150,
+      prop: 'createUser',
+      width: 150,
       span: 24,
       search: false,
-      rules: [
-        {
-          required: true,
-          message: '请输入入库人员',
-          trigger: 'blur',
-        },
-      ],
+
     },
     {
       label: '入库时间',
       prop: 'createTime',
       type: 'date',
       searchRange: true,
-      startPlaceholder:'开始时间',
-                        endPlaceholder:"结束时间",
-      width:150,
+      startPlaceholder: '开始时间',
+      endPlaceholder: "结束时间",
+      width: 150,
       span: 24,
       search: true,
-      rules: [
-        {
-          required: true,
-          message: '请输入入库时间',
-          trigger: 'blur',
-        },
-      ],
+
     },
   ],
   'beforePlatingBound': [
@@ -228,221 +117,101 @@ export default {
       prop: 'paCode',
       span: 24,
       overflow: true,
-      width:150,
+      width: 150,
       search: true,
-      rules: [
-        {
-          required: true,
-          message: '请输入单号',
-          trigger: 'blur',
-        },
-      ],
+
     },
     {
       label: '流程卡号',
       prop: 'cardNo',
-      width:150,
+      width: 150,
       span: 24,
       search: true,
-      rules: [
-        {
-          required: true,
-          message: '请输入流程卡号',
-          trigger: 'blur',
-        },
-      ],
+
     },
     {
       label: '车间订单号',
       prop: 'woCode',
-      width:200,
+      width: 200,
       span: 24,
       search: true,
-      rules: [
-        {
-          required: true,
-          message: '请输入车间订单号',
-          trigger: 'blur',
-        },
-      ],
+
     },
     {
       label: '批单号',
       prop: 'batchNo',
-      width:200,
+      width: 200,
       span: 24,
       search: true,
-      rules: [
-        {
-          required: true,
-          message: '请输入批单号',
-          trigger: 'blur',
-        },
-      ],
+
     },
     {
       label: '零件号',
       prop: 'partCode',
-      width:200,
+      width: 200,
       span: 24,
       search: false,
-      rules: [
-        {
-          required: true,
-          message: '请输入零件号',
-          trigger: 'blur',
-        },
-      ],
+
     },
     {
-      label: '名称',
+      label: '零件名称',
       prop: 'partName',
-      width:120,
+      width: 120,
       span: 24,
       search: true,
-      rules: [
-        {
-          required: true,
-          message: '请输入名称',
-          trigger: 'blur',
-        },
-      ],
+
     },
     {
       label: '出库数量',
       prop: 'quantity',
       span: 24,
-      width:100,
+      width: 100,
       search: false,
-      rules: [
-        {
-          required: true,
-          message: '请输入出库数量',
-          trigger: 'blur',
-        },
-      ],
+
     },
     {
       label: '出库班组/供应商',
       prop: 'tsName',
-      width:200,
+      width: 200,
       span: 24,
       search: false,
-      rules: [
-        {
-          required: true,
-          message: '请输入出库班组/供应商',
-          trigger: 'blur',
-        },
-      ],
-    },
-    {
-      label: '班组',
-      prop: 'tsId',
-      type: 'select',
-      span: 24,
-      search: true,
-      hide: true,
-      rules: [
-        {
-          required: true,
-          message: '请选择班组',
-          trigger: 'blur',
-        },
-      ],
-      props: {
-        label: 'tsName',
-        value: 'tsId'
-      },
-      dicData: [
-        { tsId: 61, tsName: "化学镀镍一班崔胜伟" },
-        { tsId: 64, tsName: "零件管理班" },
-        { tsId: 65, tsName: "检验班" },
-      ]
-    },
-    {
-      label: '供应商',
-      prop: 'ocId',
-      type: 'select',
-      span: 24,
-      search: true,
-      hide: true,
-      rules: [
-        {
-          required: true,
-          message: '请选择供应商',
-          trigger: 'blur',
-        },
-      ],
-      props: {
-        label: 'ocCode',
-        value: 'ocId'
-      },
-      dicData: [
-        { ocCode: "L050", ocId: 3 },
-        { ocCode: "L065", ocId: 4 },
-        { ocCode: "L070", ocId: 5 },
-      ]
+
     },
     {
       label: '出库工序号',
       prop: 'orders',
-      width:120,
+      width: 120,
       span: 24,
       search: true,
-      rules: [
-        {
-          required: true,
-          message: '请输入出库工序号',
-          trigger: 'blur',
-        },
-      ],
+
     },
     {
       label: '出库工序名称',
       prop: 'ppsName',
-      width:150,
+      width: 150,
       span: 24,
       search: true,
-      rules: [
-        {
-          required: true,
-          message: '请输入出库工序名称',
-          trigger: 'blur',
-        },
-      ],
+
     },
     {
       label: '出库人员',
       prop: 'userName',
-      width:150,
+      width: 150,
       span: 24,
       search: false,
-      rules: [
-        {
-          required: true,
-          message: '请输入出库人员',
-          trigger: 'blur',
-        },
-      ],
+
     },
     {
       label: '出库时间',
       prop: 'createTime',
       type: 'date',
       searchRange: true,
-      startPlaceholder:'开始时间',
-                        endPlaceholder:"结束时间",
-      width:150,
+      startPlaceholder: '开始时间',
+      endPlaceholder: "结束时间",
+      width: 150,
       span: 24,
       search: true,
-      rules: [
-        {
-          required: true,
-          message: '请输入出库时间',
-          trigger: 'blur',
-        },
-      ],
+
     },
   ],
   'afterPlatingEntry': [
@@ -451,127 +220,73 @@ export default {
       prop: 'paCode',
       span: 24,
       overflow: true,
-      width:150,
+      width: 150,
       search: true,
-      rules: [
-        {
-          required: true,
-          message: '请输入单号',
-          trigger: 'blur',
-        },
-      ],
+
     },
     {
       label: '流程卡号',
       prop: 'cardNo',
       span: 24,
-      width:150,
+      width: 150,
       search: true,
-      rules: [
-        {
-          required: true,
-          message: '请输入流程卡号',
-          trigger: 'blur',
-        },
-      ],
+
     },
     {
       label: '车间订单号',
       prop: 'woCode',
-      width:200,
+      width: 200,
       span: 24,
       search: true,
-      rules: [
-        {
-          required: true,
-          message: '请输入车间订单号',
-          trigger: 'blur',
-        },
-      ],
+
     },
     {
       label: '批单号',
       prop: 'batchNo',
-      width:200,
+      width: 200,
       span: 24,
       search: true,
-      rules: [
-        {
-          required: true,
-          message: '请输入批单号',
-          trigger: 'blur',
-        },
-      ],
+
     },
     {
       label: '零件号',
       prop: 'partCode',
       span: 24,
-      width:200,
+      width: 200,
       search: false,
-      rules: [
-        {
-          required: true,
-          message: '请输入零件号',
-          trigger: 'blur',
-        },
-      ],
+
     },
     {
-      label: '名称',
+      label: '零件名称',
       prop: 'partName',
       span: 24,
-      width:120,
+      width: 120,
       search: true,
-      rules: [
-        {
-          required: true,
-          message: '请输入名称',
-          trigger: 'blur',
-        },
-      ],
+
     },
     {
       label: '重量',
       prop: 'weight',
       span: 24,
-      width:100,
+      width: 100,
       search: true,
-      rules: [
-        {
-          required: true,
-          message: '请输入重量',
-          trigger: 'blur',
-        },
-      ],
+
     },
     {
       label: '入库数量',
       prop: 'quantity',
       span: 24,
-      width:100,
+      width: 100,
       search: false,
-      rules: [
-        {
-          required: true,
-          message: '请输入入库数量',
-          trigger: 'blur',
-        },
-      ],
+
     },
     {
       label: '入库班组/供应商',
       prop: 'tsName',
       span: 24,
-      width:200,
+      width: 200,
       search: false,
-      rules: [
-        {
-          required: true,
-          message: '请输入入库班组/供应商',
-          trigger: 'blur',
-        },
-      ],
+
     },
     {
       label: '班组',
@@ -580,22 +295,7 @@ export default {
       span: 24,
       search: true,
       hide: true,
-      rules: [
-        {
-          required: true,
-          message: '请选择班组',
-          trigger: 'blur',
-        },
-      ],
-      props: {
-        label: 'tsName',
-        value: 'tsId'
-      },
-      dicData: [
-        { tsId: 61, tsName: "化学镀镍一班崔胜伟" },
-        { tsId: 64, tsName: "零件管理班" },
-        { tsId: 65, tsName: "检验班" },
-      ]
+
     },
     {
       label: '供应商',
@@ -604,82 +304,43 @@ export default {
       span: 24,
       search: true,
       hide: true,
-      rules: [
-        {
-          required: true,
-          message: '请选择供应商',
-          trigger: 'blur',
-        },
-      ],
-      props: {
-        label: 'ocCode',
-        value: 'ocId'
-      },
-      dicData: [
-        { ocCode: "L050", ocId: 3 },
-        { ocCode: "L065", ocId: 4 },
-        { ocCode: "L070", ocId: 5 },
-      ]
+
     },
     {
       label: '入库工序号',
       prop: 'orders',
       span: 24,
-      width:120,
+      width: 120,
       search: true,
-      rules: [
-        {
-          required: true,
-          message: '请输入入库工序号',
-          trigger: 'blur',
-        },
-      ],
+
     },
     {
       label: '入库工序名称',
       prop: 'ppsName',
-      width:150,
+      width: 150,
       span: 24,
       search: true,
-      rules: [
-        {
-          required: true,
-          message: '请输入入库工序名称',
-          trigger: 'blur',
-        },
-      ],
+
     },
     {
-      label: '出库人员',
+      label: '入库人员',
       prop: 'userName',
-      width:150,
+      width: 150,
       span: 24,
       search: false,
-      rules: [
-        {
-          required: true,
-          message: '请输入出库人员',
-          trigger: 'blur',
-        },
-      ],
+
     },
     {
-      label: '出库时间',
+      label: '入库时间',
       prop: 'createTime',
       type: 'date',
       searchRange: true,
-      startPlaceholder:'开始时间',
-                        endPlaceholder:"结束时间",
-      width:150,
+      startPlaceholder: '开始时间',
+      endPlaceholder: "结束时间",
+      width: 150,
       span: 24,
       search: true,
-      rules: [
-        {
-          required: true,
-          message: '请输入出库时间',
-          trigger: 'blur',
-        },
-      ],
+
     },
   ],
 }
\ No newline at end of file