From 6455f45a9ddba4da7052897a2d3600b9924272ba Mon Sep 17 00:00:00 2001
From: zhangdi <15053473693@163.com>
Date: Wed, 4 Feb 2026 13:53:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../firstOrder/components/recordDialog.vue    | 36 +++++++++----------
 .../components/approvalProcessDialog.vue      | 17 +--------
 .../secondOrder/components/outDialog.vue      | 14 ++++++--
 .../secondOrder/components/recordDialog.vue   |  9 ++---
 4 files changed, 36 insertions(+), 40 deletions(-)

diff --git a/src/views/firstOrder/components/recordDialog.vue b/src/views/firstOrder/components/recordDialog.vue
index d52e3d2..66f6f49 100644
--- a/src/views/firstOrder/components/recordDialog.vue
+++ b/src/views/firstOrder/components/recordDialog.vue
@@ -7,8 +7,8 @@
     @close="closeDialog"
   >
     <el-tabs v-model="transactionType" @tab-click="handleTabClick">
-      <el-tab-pane label="入库" name="2"></el-tab-pane>
-      <el-tab-pane label="出库" name="1"></el-tab-pane>
+      <el-tab-pane label="入库" name="1"></el-tab-pane>
+      <el-tab-pane label="出库" name="2"></el-tab-pane>
     </el-tabs>
     <div style="display:flex; flex-direction:column; height:400px;">
       <avue-crud
@@ -48,7 +48,7 @@ export default {
   data() {
     return {
       openShow: false,
-      transactionType: "2",
+      transactionType: "1",
       tableData: [],
       purchaseTitle: "记录",
       data: [],
@@ -57,25 +57,25 @@ export default {
         currentPage: 1,
         total: 0,
       },
-      loading: false, 
-      query: {}, 
+      loading: false,
+      query: {},
     };
   },
   computed: {
     dynamicOption() {
-      const showPriceColumn = this.rowData.type === 'NY' && this.transactionType === '1';
-      
+      const showPriceColumn = this.rowData.type === 'NY' && this.transactionType === '2';
+
       const columns = [
         {
           label: "数量",
           prop: "quantity",
-          hide: false, 
+          hide: false,
         },
-        
+
         {
           label: "操作人",
           prop: "operatorName",
-          hide: false, 
+          hide: false,
         },
         {
           label: "时间",
@@ -83,7 +83,7 @@ export default {
           type: "date",
           format: "yyyy-MM-dd HH:mm:ss",
           valueFormat: "yyyy-MM-dd HH:mm:ss",
-          hide: false, 
+          hide: false,
         },
         {
           label: "部门",
@@ -93,7 +93,7 @@ export default {
         {
           label: "单价",
           prop: "money",
-          hide: !showPriceColumn, 
+          hide: !showPriceColumn,
         },
       ];
 
@@ -105,7 +105,7 @@ export default {
         searchMenuSpan: 6,
         border: true,
         index: true,
-        selection: false, 
+        selection: false,
         viewBtn: false,
         addBtn: false,
         editBtn: false,
@@ -121,7 +121,7 @@ export default {
         columnBtn: false,
         menuAlign: "left",
         searchMenuPosition: "right",
-        column: columns, 
+        column: columns,
       };
     }
   },
@@ -135,7 +135,7 @@ export default {
       this.page.currentPage = 1;
       this.onLoad(this.page, params);
       done();
-    },  
+    },
     searchReset() {
       this.query = {};
       this.onLoad(this.page);
@@ -165,17 +165,17 @@ export default {
         transactionType: this.transactionType,
         currentPage: page.currentPage,
         pageSize: page.pageSize,
-        ...params, 
+        ...params,
       };
       console.log("query_", query_);
-      
+
       recordList(query_)
         .then((res) => {
           this.data = res.data.result.list;
           this.page.total = res.data.result.total;
         })
         .finally(() => {
-          this.loading = false; 
+          this.loading = false;
         });
     },
   },
diff --git a/src/views/secondOrder/components/approvalProcessDialog.vue b/src/views/secondOrder/components/approvalProcessDialog.vue
index b524069..a00a832 100644
--- a/src/views/secondOrder/components/approvalProcessDialog.vue
+++ b/src/views/secondOrder/components/approvalProcessDialog.vue
@@ -36,21 +36,6 @@ export default {
       inDialogVisible: false,
       inDialogTiltle: "审批流程",
       approvalList: [
-        // {
-        //   name: "张三",
-        //   time: "2021-01-01 10:10:10",
-        //   status: "通过",
-        // },
-        // {
-        //   name: "张三1",
-        //   time: "",
-        //   status: "待审核",
-        // },
-        // {
-        //   name: "张三3",
-        //   time: "",
-        //   status: "待审核",
-        // },
       ],
     };
   },
@@ -82,7 +67,7 @@ export default {
 .teps-con {
   margin: 0 auto 0;
   :deep(.el-step) {
-    margin-bottom: 10px; 
+    margin-bottom: 10px;
     &:last-child {
       margin-bottom: 0;
     }
diff --git a/src/views/secondOrder/components/outDialog.vue b/src/views/secondOrder/components/outDialog.vue
index 07a8bd1..0689e79 100644
--- a/src/views/secondOrder/components/outDialog.vue
+++ b/src/views/secondOrder/components/outDialog.vue
@@ -134,7 +134,7 @@
             </el-col>
           </el-row>
           <div class="form-title">{{ outDateInfo }} 出库信息：</div>
-          <div v-if="sizeForm.ldTwoOutStorage.groupName != null">
+          <div v-if="sizeForm.ldTwoOutStorage.groupName !== '自由出库'">
             <el-table
               :data="groupTableData"
               style="width: 100%"
@@ -192,7 +192,7 @@
             </el-table>
           </div>
 
-          <div v-if="sizeForm.ldTwoOutStorage.groupName == null">
+          <div v-if="sizeForm.ldTwoOutStorage.groupName == '自由出库'">
             <el-button
               type="primary"
               size="mini"
@@ -550,6 +550,16 @@ export default {
       }
     },
     getOutGroupName() {
+      // this.groupNameOptions = [
+      //   {
+      //     groupIds: "83,85",
+      //     groupName: "测试",
+      //   },
+      //   {
+      //     groupIds: null,
+      //     groupName: "自由出库",
+      //   },
+      // ];
       getOutGroupName().then((res) => {
         this.groupNameOptions = res.data.result;
       });
diff --git a/src/views/secondOrder/components/recordDialog.vue b/src/views/secondOrder/components/recordDialog.vue
index 74f4a9e..68b628b 100644
--- a/src/views/secondOrder/components/recordDialog.vue
+++ b/src/views/secondOrder/components/recordDialog.vue
@@ -8,8 +8,9 @@
   >
 
     <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="2"></el-tab-pane>
+
     </el-tabs>
 <div style="height: 400px;">
     <avue-crud
@@ -21,7 +22,7 @@
       @size-change="sizeChange"
       @search-change="searchChange"
       @search-reset="searchReset"
-      
+
       :page.sync="page"
     ></avue-crud>
     </div>
@@ -115,7 +116,7 @@ export default {
       this.page.currentPage = 1;
       this.onLoad(this.page, params);
       done();
-    },  
+    },
       searchReset() {
       this.query = {};
       this.onLoad(this.page);