diff --git a/src/api/secondOrder/list.js b/src/api/secondOrder/list.js
index d426d09..5d3b8de 100644
--- a/src/api/secondOrder/list.js
+++ b/src/api/secondOrder/list.js
@@ -14,3 +14,17 @@ export const getList = (current, size, params) => {
   })
 }
 
+
+export const recordList = (current, size, params) => {
+  return request({
+    url: '/smartpark/inventoryRecord/list',
+    method: 'get',
+    params: {
+      ...params,
+      pageSize:size,
+      pageNum:current,
+    },
+    cryptoToken: false,
+    cryptoData: false
+  })
+}
diff --git a/src/views/firstOrder/list.vue b/src/views/firstOrder/list.vue
index 5960fa0..9ac21fd 100644
--- a/src/views/firstOrder/list.vue
+++ b/src/views/firstOrder/list.vue
@@ -28,28 +28,24 @@
     <el-dialog
       title="记录"
       :visible.sync="dialogLogVisible"
-      width="60%"
+      width="50%"
       :close-on-click-modal="false"
       :append-to-body="true"
     >
       <el-tabs v-model="transactionType" @tab-click="handleTabClick">
+         <el-tab-pane label="出库" name="1"></el-tab-pane>
         <el-tab-pane label="入库" name="2"></el-tab-pane>
-        <el-tab-pane label="出库" name="1"></el-tab-pane>
-        <!-- <el-tab-pane label="报废" name="third"></el-tab-pane> -->
       </el-tabs>
       <el-table :data="tableData" style="width: 100%">
         <el-table-column type="index" width="50"> </el-table-column>
-        <el-table-column prop="quantity" label="数量" width="180">
+        <el-table-column prop="quantity" label="数量" >
         </el-table-column>
-        <el-table-column prop="operatorName" label="操作人" width="180">
+        <el-table-column prop="operatorName" label="操作人" >
         </el-table-column>
-        <el-table-column prop="operationTime" label="时间" width="180">
+        <el-table-column prop="operationTime" label="时间" >
         </el-table-column>
         <el-table-column prop="departmentName" label="部门"> </el-table-column>
       </el-table>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogLogVisible = false">取 消</el-button>
-      </span>
     </el-dialog>
   </div>
 </template>
diff --git a/src/views/materials/components/returnDialog.vue b/src/views/materials/components/returnDialog.vue
new file mode 100644
index 0000000..3d9ed9d
--- /dev/null
+++ b/src/views/materials/components/returnDialog.vue
@@ -0,0 +1,85 @@
+<template>
+  <el-dialog
+    :title="purchaseTitle"
+    append-to-body
+    :visible.sync="openShow"
+    width="30%"
+    @close="closeDialog"
+  >
+    <avue-form ref="form" :option="option"></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>
+<script>
+export default {
+  props: {
+    showDialog: {
+      type: Boolean,
+      default: false,
+    },
+
+  },
+  data() {
+    return {
+      purchaseTitle:'归还',
+      openShow: false,
+      option: {
+        submitBtn: false,
+        emptyBtn: false,
+        column: [
+          {
+            label: "归还数量",
+            prop: "name",
+            span: 24,
+            type: "number",
+            rules: [
+              {
+                required: true,
+                message: "请输入",
+                trigger: "blur",
+              },
+            ],
+          },
+          {
+            label: "归还理由",
+            prop: "sex",
+            span: 24,
+            type:'textarea',
+            rows:5,
+            rules: [
+              {
+                required: true,
+                message: "请输入",
+                trigger: "blur",
+              },
+            ],
+          },
+        ],
+      },
+    };
+  },
+  mounted() {
+    this.openShow = this.showDialog;
+  },
+  methods: {
+    closeDialog() {
+      this.openShow = false;
+      this.$emit("closeDialog");
+    },
+    submit() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.$emit("submit", this.formData);
+        }
+      });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped></style>
diff --git a/src/views/materials/components/scrapDialog.vue b/src/views/materials/components/scrapDialog.vue
new file mode 100644
index 0000000..5722abb
--- /dev/null
+++ b/src/views/materials/components/scrapDialog.vue
@@ -0,0 +1,86 @@
+<template>
+  <el-dialog
+    :title="purchaseTitle"
+    append-to-body
+    :visible.sync="openShow"
+    width="30%"
+    @close="closeDialog"
+  >
+    <avue-form ref="form" :option="option"></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>
+<script>
+
+export default {
+  props: {
+    showDialog: {
+      type: Boolean,
+      default: false,
+    },
+
+  },
+  data() {
+    return {
+      purchaseTitle:'报废',
+      openShow: false,
+      option: {
+        submitBtn: false,
+        emptyBtn: false,
+        column: [
+          {
+            label: "报废数量",
+            prop: "name",
+            span: 24,
+            type: "number",
+            rules: [
+              {
+                required: true,
+                message: "请输入",
+                trigger: "blur",
+              },
+            ],
+          },
+          {
+            label: "报废理由",
+            prop: "sex",
+            span: 24,
+            type:'textarea',
+            rows:5,
+            rules: [
+              {
+                required: true,
+                message: "请输入",
+                trigger: "blur",
+              },
+            ],
+          },
+        ],
+      },
+    };
+  },
+  mounted() {
+    this.openShow = this.showDialog;
+  },
+  methods: {
+    closeDialog() {
+      this.openShow = false;
+      this.$emit("closeDialog");
+    },
+    submit() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.$emit("submit", this.formData);
+        }
+      });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped></style>
diff --git a/src/views/materials/expend.vue b/src/views/materials/expend.vue
index f9f92ec..85a591c 100644
--- a/src/views/materials/expend.vue
+++ b/src/views/materials/expend.vue
@@ -36,71 +36,41 @@
         </template>
       </avue-crud>
     </basic-container>
-    <!-- 归还 -->
-    <el-dialog
-      title="归还"
-      :visible.sync="dialogReturnVisible"
-      width="30%"
-      :close-on-click-modal="false"
-      :append-to-body="true"
-    >
-      <el-form ref="form" :model="returnForm" label-width="100px">
-        <el-form-item label="归还数量">
-          <el-input-number
-            v-model="returnForm.count"
-            :min="1"
-          ></el-input-number>
-        </el-form-item>
-        <el-form-item label="归还理由">
-          <el-input
-            v-model="returnForm.rmark"
-            type="textarea"
-            :rows="3"
-            placeholder="请输入内容"
-          ></el-input>
-        </el-form-item>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogReturnVisible = false">取 消</el-button>
-        <el-button type="primary" @click="returnSave()">确 定</el-button>
-      </span>
-    </el-dialog>
 
+    <!-- 归还 -->
+    <returnDialog
+      v-if="returnShow"
+      :showDialog="returnShow"
+      :rowDta="returnInfo"
+      @closeDialog="closeDialog"
+    ></returnDialog>
     <!-- 报废 -->
-    <el-dialog
-      title="报废"
-      :visible.sync="dialogScrapVisible"
-      width="30%"
-      :close-on-click-modal="false"
-      :append-to-body="true"
-    >
-      <el-form ref="form" :model="scrapForm" label-width="100px">
-        <el-form-item label="报废数量">
-          <el-input-number v-model="scrapForm.count" :min="1"></el-input-number>
-        </el-form-item>
-        <el-form-item label="报废理由">
-          <el-input
-            v-model="scrapForm.rmark"
-            type="textarea"
-            :rows="3"
-            placeholder="请输入内容"
-          ></el-input>
-        </el-form-item>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogScrapVisible = false">取 消</el-button>
-        <el-button type="primary" @click="scrapSave()">确 定</el-button>
-      </span>
-    </el-dialog>
+    <scrapDialog
+      v-if="scrapShow"
+      :showDialog="scrapShow"
+      :rowDta="scrapInfo"
+      @closeDialog="closeDialog"
+    ></scrapDialog>
+
   </div>
 </template>
 
 <script>
 import { mapGetters } from "vuex";
 import { getList } from "@/api/materials/expend";
+
+import returnDialog from "./components/returnDialog.vue";
+import scrapDialog from "./components/scrapDialog.vue";
 export default {
+  components: {
+    returnDialog,
+    scrapDialog,
+  },
   data() {
     return {
+      returnShow: false, //归还
+      scrapShow: false, //报废
+
       form: {},
       selectionList: [],
       query: {},
@@ -119,7 +89,10 @@ export default {
         border: true,
         index: true,
         selection: true,
-        viewBtn: true,
+        viewBtn: false,
+        addBtn: false,
+        editBtn: false,
+        delBtn: false,
         dialogClickModal: false,
         menu: true,
         selection: false,
@@ -246,55 +219,16 @@ export default {
       ],
     };
   },
-  computed: {
-    ...mapGetters(["userInfo", "permission"]),
-    permissionList() {
-      return {
-        addBtn: false,
-        viewBtn: false,
-        delBtn: false,
-        editBtn: false,
-      };
-    },
-    ids() {
-      let ids = [];
-      this.selectionList.forEach((ele) => {
-        ids.push(ele.id);
-      });
-      return ids.join(",");
-    },
-  },
+
   mounted() {
     this.tableData = this.ckTable;
   },
   methods: {
-    handleLog() {
-      this.dialogLogVisible = true;
-    },
-    handleTabClick(tab, event) {
-      console.log(tab, event);
-      if (this.activeName == "first") {
-        this.tableData = this.ckTable;
-      }
-      if (this.activeName == "second") {
-        this.tableData = this.rkTable;
-      }
-      if (this.activeName == "third") {
-        this.tableData = this.bfTable;
-      }
-    },
-
-    handlePreview(name) {
-      this.$router.push({
-        path: `/myiframe/urlPath?name=preview-${name}&src=${this.website.design.reportUrl}/preview?_u=blade-${name}`,
-      });
-    },
-    handleDesign(name) {
-      this.$router.push({
-        path: `/myiframe/urlPath?name=designer-${name}&src=${this.website.design.reportUrl}/designer?_u=blade-${name}`,
-      });
+    // 关闭弹窗
+    closeDialog() {
+      this.returnShow = false;
+      this.scrapShow = false;
     },
-
     searchReset() {
       this.query = {};
       this.onLoad(this.page);
@@ -305,14 +239,6 @@ export default {
       this.onLoad(this.page, params);
       done();
     },
-    selectionChange(list) {
-      this.selectionList = list;
-    },
-    selectionClear() {
-      this.selectionList = [];
-      this.$refs.crud.toggleSelection();
-    },
-
     currentChange(currentPage) {
       this.page.currentPage = currentPage;
     },
@@ -324,59 +250,19 @@ export default {
     },
     onLoad(page, params = {}) {
       this.loading = true;
-      this.data.push(
-        {
-          no: "00100001",
-          name: "物品1",
-          xh: "1",
-          lb: "耐用品",
-          unit: "11",
-          number: "1",
-          dj: "11",
-          pice: "11",
-          status: "未归还",
-          str8: "部门一",
-        },
-        {
-          no: "00100002",
-          name: "物品2",
-          xh: "2",
-          lb: "耐用品",
-          unit: "22",
-          number: "1",
-          dj: "11",
-          pice: "22",
-          status: "已归还",
-          time: "2024-01-04",
-          str8: "部门二",
-        }
-      );
       this.loading = false;
     },
     // 归还
     handleReturn(row) {
-      this.dialogReturnVisible = true;
+      this.returnShow = true;
       this.returnInfo = JSON.parse(JSON.stringify(row));
     },
-    returnSave() {
-      this.dialogReturnVisible = false;
-      this.$message({
-        type: "success",
-        message: "归还成功",
-      });
-    },
+
     // 报废
     handleScrap(row) {
-      this.dialogScrapVisible = true;
+      this.scrapShow = true;
       this.scrapInfo = JSON.parse(JSON.stringify(row));
     },
-    scrapSave() {
-      this.dialogScrapVisible = false;
-      this.$message({
-        type: "success",
-        message: "报废成功",
-      });
-    },
   },
 };
 </script>
diff --git a/src/views/secondOrder/components/inDialog.vue b/src/views/secondOrder/components/inDialog.vue
index 48fd940..387c9cf 100644
--- a/src/views/secondOrder/components/inDialog.vue
+++ b/src/views/secondOrder/components/inDialog.vue
@@ -73,7 +73,7 @@
           </el-table-column>
 
           <el-table-column prop="unitPrice" label="单价"> </el-table-column>
-          <el-table-column prop="demandDepartmentName" label="需求部门">
+          <el-table-column prop="demandDepartment" label="需求部门">
           </el-table-column>
         </el-table>
       </el-form>
diff --git a/src/views/secondOrder/components/recordDialog.vue b/src/views/secondOrder/components/recordDialog.vue
new file mode 100644
index 0000000..5d3f51a
--- /dev/null
+++ b/src/views/secondOrder/components/recordDialog.vue
@@ -0,0 +1,73 @@
+<template>
+  <el-dialog
+    :title="purchaseTitle"
+    append-to-body
+    :visible.sync="openShow"
+    width="50%"
+    @close="closeDialog"
+  >
+    <el-tabs v-model="transactionType" @tab-click="handleTabClick">
+      <el-tab-pane label="出库" name="1"></el-tab-pane>
+      <el-tab-pane label="入库" name="2"></el-tab-pane>
+      <el-tab-pane label="报废" name="3"></el-tab-pane>
+    </el-tabs>
+    <el-table :data="tableData" style="width: 100%">
+      <el-table-column type="index" width="50"> </el-table-column>
+      <el-table-column prop="quantity" label="数量"> </el-table-column>
+      <el-table-column prop="operatorName" label="操作人"> </el-table-column>
+      <el-table-column prop="operationTime" label="时间"> </el-table-column>
+      <el-table-column prop="departmentName" label="部门"> </el-table-column>
+    </el-table>
+  </el-dialog>
+</template>
+<script>
+import { recordList } from "@/api/secondOrder/list";
+
+export default {
+  props: {
+    showDialog: {
+      type: Boolean,
+      default: false,
+    },
+
+    rowData:{
+      type: Object,
+      default: () => ({})
+    }
+  },
+  data() {
+    return {
+      openShow: false,
+      transactionType: "1",
+      tableData: [],
+      purchaseTitle:'记录',
+    };
+  },
+  mounted() {
+    this.openShow = this.showDialog;
+    console.log('二级出入库记录 rowData',this.rowData);
+  },
+  methods: {
+    handleTabClick() {
+      this.tableData = [];
+      // 出库
+      if (this.transactionType == "1") {
+        // recordList().then((res) => {});
+      }
+      // 入库
+      if (this.transactionType == "2") {
+        // recordList().then((res) => {});
+      }
+      // 报废
+      if (this.transactionType == "3") {
+        // recordList().then((res) => {});
+      }
+    },
+    closeDialog() {
+      this.openShow = false;
+      this.$emit("closeDialog");
+    },
+  },
+};
+</script>
+<style lang="scss" scoped></style>
diff --git a/src/views/secondOrder/inbound.vue b/src/views/secondOrder/inbound.vue
index d2137c1..7df0c9a 100644
--- a/src/views/secondOrder/inbound.vue
+++ b/src/views/secondOrder/inbound.vue
@@ -189,7 +189,7 @@ export default {
     handleCloseDetail(table) {
       this.inDialogVisible = false;
     },
-    // 行点击事件
+    // 入库 行点击事件
     rowSelect(row) {
       this.inDialogVisible = true;
       this.inDialogType = "inbound";
diff --git a/src/views/secondOrder/list.vue b/src/views/secondOrder/list.vue
index 223d5f4..fa09bae 100644
--- a/src/views/secondOrder/list.vue
+++ b/src/views/secondOrder/list.vue
@@ -8,117 +8,42 @@
         ref="crud"
         v-model="form"
         :page.sync="page"
-        :permission="permissionList"
-        @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 slot-scope="scope" slot="menu">
-          <!-- <el-button type="text" size="small" @click.stop="handleReturn(scope.row)">归还
-          </el-button> -->
-
           <el-button type="text" size="small" @click.stop="handleLog(scope.row)"
             >记录
           </el-button>
         </template>
       </avue-crud>
     </basic-container>
-    <!-- 归还 -->
-    <el-dialog
-      title="归还"
-      :visible.sync="dialogReturnVisible"
-      width="30%"
-      :close-on-click-modal="false"
-      :append-to-body="true"
-    >
-      <el-form ref="form" :model="returnForm" label-width="100px">
-        <el-form-item label="归还数量">
-          <el-input-number
-            v-model="returnForm.count"
-            :min="1"
-          ></el-input-number>
-        </el-form-item>
-        <el-form-item label="归还理由">
-          <el-input
-            v-model="returnForm.rmark"
-            type="textarea"
-            :rows="3"
-            placeholder="请输入内容"
-          ></el-input>
-        </el-form-item>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogReturnVisible = false">取 消</el-button>
-        <el-button type="primary" @click="returnSave()">确 定</el-button>
-      </span>
-    </el-dialog>
-    <!-- 报废 -->
-    <el-dialog
-      title="报废"
-      :visible.sync="dialogScrapVisible"
-      width="30%"
-      :close-on-click-modal="false"
-      :append-to-body="true"
-    >
-      <el-form ref="form" :model="scrapForm" label-width="100px">
-        <el-form-item label="报废数量">
-          <el-input-number v-model="scrapForm.count" :min="1"></el-input-number>
-        </el-form-item>
-        <el-form-item label="报废理由">
-          <el-input
-            v-model="scrapForm.rmark"
-            type="textarea"
-            :rows="3"
-            placeholder="请输入内容"
-          ></el-input>
-        </el-form-item>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogScrapVisible = false">取 消</el-button>
-        <el-button type="primary" @click="scrapSave()">确 定</el-button>
-      </span>
-    </el-dialog>
     <!-- 记录 -->
-    <el-dialog
-      title="记录"
-      :visible.sync="dialogLogVisible"
-      width="60%"
-      :close-on-click-modal="false"
-      :append-to-body="true"
-    >
-      <el-tabs v-model="activeName" @tab-click="handleTabClick">
-        <el-tab-pane label="入库" name="first"></el-tab-pane>
-        <el-tab-pane label="出库" name="second"></el-tab-pane>
-        <el-tab-pane label="报废" name="third"></el-tab-pane>
-      </el-tabs>
-      <el-table :data="tableData" style="width: 100%">
-        <el-table-column type="index" width="50"> </el-table-column>
-        <el-table-column prop="str1" label="数量" width="180">
-        </el-table-column>
-        <el-table-column prop="str2" label="时间" width="180">
-        </el-table-column>
-        <el-table-column prop="str3" label="部门"> </el-table-column>
-        <el-table-column prop="str4" label="操作人"> </el-table-column>
-      </el-table>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="dialogLogVisible = false">取 消</el-button>
-      </span>
-    </el-dialog>
+    <recordDialog
+      v-if="recordShow"
+      :showDialog="recordShow"
+      @closeDialog="closeDialog"
+      :rowData="rowData"
+    ></recordDialog>
   </div>
 </template>
 
 <script>
 import { getList } from "@/api/secondOrder/list.js";
-import { mapGetters } from "vuex";
+import recordDialog from "./components/recordDialog.vue";
 
 export default {
+  components: {
+    recordDialog,
+  },
   data() {
     return {
+      recordShow: false, //记录弹窗
+      rowData: {}, //行数据
       form: {},
       selectionList: [],
       query: {},
@@ -160,26 +85,15 @@ export default {
             search: true,
             headerAlign: "center",
             align: "center",
-            // type: "select",
-            // dicData: [
-            //   {
-            //     label: "部门一",
-            //     value: 0,
-            //   },
-            //   {
-            //     label: "部门二",
-            //     value: 1,
-            //   },
-            // ],
           },
           {
-            label: "物资编号",
+            label: "存货编号",
             prop: "materialCode",
             headerAlign: "center",
             align: "center",
           },
           {
-            label: "物资名称",
+            label: "存货名称",
             prop: "materialName",
             headerAlign: "center",
             align: "center",
@@ -235,66 +149,18 @@ export default {
         ],
       },
       data: [],
-      dialogReturnVisible: false,
-      returnInfo: {},
-      returnForm: {
-        count: 0,
-        rmark: "",
-      },
-      dialogScrapVisible: false,
-      scrapInfo: {},
-      scrapForm: {
-        count: 0,
-        rmark: "",
-      },
-      dialogLogVisible: false,
-      activeName: "first",
-      tableData: [],
-
-      ckTable: [
-        { str1: "3", str2: "2025-04-09", str3: "部门一", str4: "操作人1" },
-        { str1: "37", str2: "2025-04-03", str3: "部门一", str4: "操作人1" },
-      ],
-      rkTable: [
-        { str1: "5", str2: "2025-03-19", str3: "部门二", str4: "操作人1" },
-        { str1: "12", str2: "2025-03-19", str3: "部门二", str4: "操作人1" },
-      ],
-      bfTable: [
-        { str1: "9", str2: "2025-03-19", str3: "部门三", str4: "操作人1" },
-        { str1: "19", str2: "2025-03-19", str3: "部门三", str4: "操作人1" },
-      ],
     };
   },
 
-  mounted() {
-    this.tableData = this.ckTable;
-  },
+  mounted() {},
   methods: {
-    handleLog() {
-      this.dialogLogVisible = true;
+    // 记录弹框关闭
+    closeDialog() {
+      this.recordShow = false;
     },
-    handleTabClick(tab, event) {
-      console.log(tab, event);
-      if (this.activeName == "first") {
-        this.tableData = this.ckTable;
-      }
-      if (this.activeName == "second") {
-        this.tableData = this.rkTable;
-      }
-      if (this.activeName == "third") {
-        this.tableData = this.bfTable;
-      }
-    },
-
-    handlePreview(name) {
-      this.$router.push({
-        path: `/myiframe/urlPath?name=preview-${name}&src=${this.website.design.reportUrl}/preview?_u=blade-${name}`,
-      });
-    },
-    handleDesign(name) {
-      this.$router.push({
-        path: `/myiframe/urlPath?name=designer-${name}&src=${this.website.design.reportUrl}/designer?_u=blade-${name}`,
-      });
+    handleLog(row) {
+      this.recordShow = true;
+      this.rowData = row;
     },
 
     searchReset() {
@@ -307,13 +173,6 @@ export default {
       this.onLoad(this.page, params);
       done();
     },
-    selectionChange(list) {
-      this.selectionList = list;
-    },
-    selectionClear() {
-      this.selectionList = [];
-      this.$refs.crud.toggleSelection();
-    },
 
     currentChange(currentPage) {
       this.page.currentPage = currentPage;
@@ -337,30 +196,6 @@ export default {
       });
       this.loading = false;
     },
-    // 归还
-    handleReturn(row) {
-      this.dialogReturnVisible = true;
-      this.returnInfo = JSON.parse(JSON.stringify(row));
-    },
-    returnSave() {
-      this.dialogReturnVisible = false;
-      this.$message({
-        type: "success",
-        message: "归还成功",
-      });
-    },
-    // 报废
-    handleScrap(row) {
-      this.dialogScrapVisible = true;
-      this.scrapInfo = JSON.parse(JSON.stringify(row));
-    },
-    scrapSave() {
-      this.dialogScrapVisible = false;
-      this.$message({
-        type: "success",
-        message: "报废成功",
-      });
-    },
   },
 };
 </script>
diff --git a/src/views/secondOrder/outbound.vue b/src/views/secondOrder/outbound.vue
index 01ca07b..87d1e3d 100644
--- a/src/views/secondOrder/outbound.vue
+++ b/src/views/secondOrder/outbound.vue
@@ -1,56 +1,76 @@
 <template>
   <basic-container>
-    <el-row :gutter="24">
-      <el-col :span="24">
-        <avue-crud :option="option" :table-loading="loading" :data="data" ref="crud" v-model="form" :page.sync="page"
-          :permission="permissionList" @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset"
-          @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
-          @refresh-change="refreshChange" @on-load="onLoad" @row-click="rowSelect">
-          <template slot-scope="scope" slot="menuLeft">
-            <el-button size="small"  @click.stop="handleDesign()"  type="primary" >新增出库单
-            </el-button>
-            <!-- <el-button size="small" plain @click.stop="handleExport()">出库单导出
+    <avue-crud
+      :option="option"
+      :table-loading="loading"
+      :data="data"
+      ref="crud"
+      v-model="form"
+      :page.sync="page"
+      :permission="permissionList"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @on-load="onLoad"
+    >
+      <template slot-scope="scope" slot="menuLeft">
+        <el-button size="small" @click.stop="handleDesign()" type="primary"
+          >新增出库单
+        </el-button>
+        <!-- <el-button size="small" plain @click.stop="handleExport()">出库单导出
             </el-button> -->
-          </template>
-          <template slot-scope="scope" slot="xuqiudanmingcheng">
-            <el-button type="text" @click.stop="purchaseFn(scope.row)" v-if="scope.row.xuqiudanmingcheng!=''">{{scope.row.xuqiudanmingcheng}}</el-button>
-              <span v-else>无</span>
-          </template>
-        </avue-crud>
-      </el-col>
-    </el-row>
+      </template>
+      <template slot-scope="scope" slot="xuqiudanmingcheng">
+        <el-button
+          type="text"
+          @click.stop="purchaseFn(scope.row)"
+          v-if="scope.row.xuqiudanmingcheng != ''"
+          >{{ scope.row.xuqiudanmingcheng }}</el-button
+        >
+        <span v-else>无</span>
+      </template>
+    </avue-crud>
 
-    <outDialog v-if="outDialogVisible" :repairVisible='outDialogVisible' :outDialogTiltle="outDialogTiltle"
-      :outDialogType="outDialogType" @handleCloseDetail="handleCloseDetail" type="二级库">
+    <outDialog
+      v-if="outDialogVisible"
+      :repairVisible="outDialogVisible"
+      :outDialogTiltle="outDialogTiltle"
+      :outDialogType="outDialogType"
+      @handleCloseDetail="handleCloseDetail"
+      type="二级库"
+    >
     </outDialog>
 
-<!-- 需求单明细 -->
-<needDialog :showDialog="purchaseOpen" v-if="purchaseOpen" @closeDialog="closeDialog" :purchaseTitle="purchaseTitle"></needDialog>
-  </basic-container>
+    <!-- 需求单明细 -->
+    <needDialog
+      :showDialog="purchaseOpen"
+      v-if="purchaseOpen"
+      @closeDialog="closeDialog"
+      :purchaseTitle="purchaseTitle"
+    ></needDialog>
   </basic-container>
 </template>
 
 <script>
-import { getList, remove } from "@/api/report/report";
-import { mapGetters } from "vuex";
-import outDialog from './components/outDialog.vue';
-import needDialog from './components/needDialog.vue';
-import { getQuarterList, getDepartmentList, getDetailedList, getDetailedItems, submitData, getMaterialList, editList } from "@/api/firstOrder/outbound";
-
+import outDialog from "./components/outDialog.vue";
+import needDialog from "./components/needDialog.vue";
+import { getList } from "@/api/secondOrder/outbound";
 
 export default {
   components: {
     outDialog,
-    needDialog
+    needDialog,
   },
   data() {
     return {
-      purchaseOpen:false,
-      purchaseTitle:'',
-      treeData: [],//组织树
+      purchaseOpen: false,
+      purchaseTitle: "",
+      treeData: [], //组织树
       defaultProps: {
-        children: 'children',
-        label: 'label'
+        children: "children",
+        label: "label",
       },
 
       form: {},
@@ -60,10 +80,10 @@ export default {
       page: {
         pageSize: 10,
         currentPage: 1,
-        total: 0
+        total: 0,
       },
       option: {
-        height: 'auto',
+        height: "auto",
         calcHeight: 30,
         tip: false,
         searchShow: true,
@@ -122,132 +142,69 @@ export default {
             headerAlign: "center",
             align: "center",
           },
-          {
-            label: "部门",
-            prop: "str8",
-            search: true,
-            type: 'select',
-            headerAlign: "center",
-            align: "center",
-            dicData: [{
-              label: '部门一',
-              value: 0
-            }, {
-              label: '部门二',
-              value: 1
-            }]
-          },
+
           {
             label: "审批人",
-            prop: "str5",
-            headerAlign: "center",
-            align: "center",
-          },
-          {
-            label: "来源",
-            prop: "str6",
-            search: false,
+            prop: "approvers",
             headerAlign: "center",
             align: "center",
           },
+
           {
             label: "状态",
-            prop: "str7",
+            prop: "status",
             headerAlign: "center",
             align: "center",
+            type: "select",
+            align: "center",
+            dicData: [
+              {
+                label: "暂存",
+                value: 1,
+              },
+              {
+                label: "待审批",
+                value: 2,
+              },
+              {
+                label: "已审批",
+                value: 3,
+              },
+            ],
           },
-
-        ]
+        ],
       },
       data: [],
       outDialogVisible: false,
-      outDialogTiltle: '出库',
-      outDialogType: '',
-      options: [{
-        value: '选项1',
-        label: '黄金糕'
-      }, {
-        value: '选项2',
-        label: '双皮奶'
-      }, {
-        value: '选项3',
-        label: '蚵仔煎'
-      }, {
-        value: '选项4',
-        label: '龙须面'
-      }, {
-        value: '选项5',
-        label: '北京烤鸭'
-      }],
-      value: ''
+      outDialogTiltle: "出库",
+      outDialogType: "",
     };
   },
-  computed: {
-    ...mapGetters(["userInfo", "permission"]),
-    permissionList() {
-      return {
-        addBtn: false,
-        viewBtn: false,
-        delBtn: false,
-        editBtn: false
-      };
-    },
-    ids() {
-      let ids = [];
-      this.selectionList.forEach(ele => {
-        ids.push(ele.id);
-      });
-      return ids.join(",");
-    }
-  },
+
   methods: {
-  purchaseFn(row){
-      this.purchaseOpen = true
-      this.purchaseTitle = row.xuqiudanmingcheng+'详情'
+    purchaseFn(row) {
+      this.purchaseOpen = true;
+      this.purchaseTitle = row.xuqiudanmingcheng + "详情";
     },
-    closeDialog(){
-      this.purchaseOpen = false
-    },
-    handlePreview() {
-      // this.$router.push({ path: `/myiframe/urlPath?name=preview-${name}&src=${this.website.design.reportUrl}/preview?_u=blade-${name}` });
+    closeDialog() {
+      this.purchaseOpen = false;
     },
     handleDesign() {
-      this.outDialogVisible = true
-      this.outDialogType = 'add'
-      this.outDialogTiltle = '新增出库'
+      this.outDialogVisible = true;
+      this.outDialogType = "add";
+      this.outDialogTiltle = "新增出库";
     },
     // 行点击事件
-    rowSelect(row) {
-      this.outDialogVisible = true
-      this.outDialogType = 'outbound'
-      this.outDialogTiltle = '出库'
-    },
     handleCloseDetail() {
-      this.outDialogVisible = false
+      this.outDialogVisible = false;
     },
     handleExport(name) {
       this.$message({
         type: "success",
-        message: "出库单导出成功！"
+        message: "出库单导出成功！",
       });
     },
-    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);
@@ -255,42 +212,13 @@ export default {
     searchChange(params, done) {
       this.query = params;
       this.page.currentPage = 1;
-      // this.onLoad(this.page, params);
+      this.onLoad(this.page, params);
       this.$message({
         type: "success",
-        message: "操作成功!"
+        message: "操作成功!",
       });
       done();
     },
-    selectionChange(list) {
-      this.selectionList = list;
-    },
-    selectionClear() {
-      this.selectionList = [];
-      this.$refs.crud.toggleSelection();
-    },
-    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;
     },
@@ -302,35 +230,24 @@ export default {
     },
     onLoad(page, params = {}) {
       this.loading = true;
-      this.data.push({
-        xuqiudanmingcheng:'2025年一季度需求单',
-        bumen :"部门一",
-        str1: '类型一',
-        str2: '00000001',
-        str3: '2025-03-01',
-        str4: '员工一',
-        str5: '员工二',
-        str6: '需求',
-        str7: '部分出库',
-        str8: '部门一'
-      }, {
-         xuqiudanmingcheng:'',
-        bumen :"",
-        str1: '类型二',
-        str2: '00000002',
-        str3: '2025-03-02',
-        str4: '员工一',
-        str5: '员工二',
-        str6: '单项',
-        str7: '全部出库',
-        str8: '部门二'
-      })
-      this.loading = false
+      const queryParams = {
+        ...params,
+        ...this.query,
+        pageSize: page.pageSize,
+        pageNum: page.currentPage,
+      };
+      if (queryParams.outDate && Array.isArray(queryParams.outDate)) {
+        queryParams.startTime = queryParams.outDate[0];
+        queryParams.endTime = queryParams.outDate[1];
+        delete queryParams.outDate;
+      }
+      getList(page.currentPage, page.pageSize, queryParams).then((res) => {
+        this.data = res.data.result.list;
+        this.loading = false;
+        this.page.total = res.data.result.total;
+      });
     },
-    handleNodeClick(data) {
-      console.log(data);
-    }
-  }
+  },
 };
 </script>