测试问题修改

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: [],
@@ -63,7 +63,7 @@ export default {
   },
   computed: {
     dynamicOption() {
-      const showPriceColumn = this.rowData.type === 'NY' && this.transactionType === '1';
+      const showPriceColumn = this.rowData.type === 'NY' && this.transactionType === '2';
 
       const columns = [
         {

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: "待审核",
-        // },
       ],
     };
   },

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;
       });

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="1"></el-tab-pane>
-      <el-tab-pane label="入库" name="2"></el-tab-pane>
+      <el-tab-pane label="出库" name="2"></el-tab-pane>
+
     </el-tabs>
 <div style="height: 400px;">
     <avue-crud