zxr 2 жил өмнө
parent
commit
3134acc0da

+ 6 - 4
src/views/barracksManagement/barracks/index.vue

@@ -289,12 +289,13 @@ export default {
   },
   created() {
     this.getList();
-    getnumber().then(res => {
-      this.tongJiList = res.data;
-      console.log(res, 11);
-    });
   },
   methods: {
+    getnumberfun() {
+      getnumber().then(res => {
+        this.tongJiList = res.data;
+      });
+    },
     /** 查询营房档案列表 */
     getList() {
       this.loading = true;
@@ -302,6 +303,7 @@ export default {
         this.barracksList = response.rows;
         this.total = response.total;
         this.loading = false;
+        this.getnumberfun();
       });
     },
     // 取消按钮

+ 9 - 16
src/views/materialManagement/WarehouseStatistics/index.vue

@@ -27,7 +27,7 @@
         <li v-for="(item, i) in lieList" :key="i + ' '">
           <div class="names">{{ item.dictLabel }}</div>
           <div class="btn">
-            <el-button size="btJS" style="padding-right:10px;" @click="chuku(item.dictValue)">出库记录</el-button>
+            <el-button size="btJS" @click="chuku(item.dictValue)">出库记录</el-button>
             <el-button size="btJS" @click="ruku(item.dictLabel)">入库记录</el-button>
           </div>
         </li>
@@ -244,13 +244,7 @@ export default {
   dicts: ["category", "camp_equipment", "storage_room", "distribution_object"],
   data() {
     return {
-      lieList: [
-        { deptName: "fdb" },
-        { deptName: "fdb" },
-        { deptName: "fdb" },
-        { deptName: "fdb" },
-        { deptName: "fdb" }
-      ],
+      lieList: [],
       tongJiList: [],
       open: false,
       title: "",
@@ -291,12 +285,11 @@ export default {
   methods: {
     ruku(e) {
       this.queryParams.warehouse = e;
-      this.getrulist();
-      this.open = true;
       this.title = "入库记录";
       this.jilunum = 1;
       this.queryParams.pageNum = 1;
       this.queryParams.pageSize = 10;
+      this.getrulist();
     },
     getrulist() {
       this.distributionList = [];
@@ -304,16 +297,16 @@ export default {
         this.materialRegistrationList = response.rows;
         this.total = response.total;
         this.loading = false;
+        this.open = true;
       });
     },
     chuku(e) {
       this.queryParams.warehouse = e;
-      this.getchulist();
-      this.jilunum = 2;
-      this.title = "出库记录";
-      this.open = true;
       this.queryParams.pageNum = 1;
       this.queryParams.pageSize = 10;
+      this.jilunum = 2;
+      this.title = "出库记录";
+      this.getchulist();
     },
     getchulist() {
       this.materialRegistrationList = [];
@@ -415,8 +408,8 @@ li {
   margin-top: 20px;
   height: 50px;
 }
-.el-button--btJS {
-  width: 70px;
+::v-deep .el-button--btJS {
+  width: 80px !important;
   text-align: center;
 }
 </style>