Merge branch 'product' of http://git.mes123.com/zhouyx/mes-ui into product

pages/resource/resource/index.vue

@@ -401,7 +401,7 @@ export default {
       if (index > -1) {
         this.cartListCount -= value;
         this.cartList.splice(index, 1);
-        if (value == 0) {
+        if (value == 0 || this.cartList.length == 0) {
           this.cartListCount = 0;
         }
         this.$store.commit("setCart", this.cartList);

pages/resource/resource/record.vue

@@ -37,7 +37,7 @@ export default {
       dataList: [],
       curId: 0,
       modal: false,
-      title: "详情",
+      title: "归还",
       columns: [
         {
           type: "index",
@@ -79,7 +79,7 @@ export default {
                   class: "details",
                   on: { click: () => this.details(params.row.id) },
                 },
-                "查看"
+                params.row.status == 0 ? "归还" : ""
               ),
             ]);
           },
@@ -91,7 +91,7 @@ export default {
       libraryTube: this.$store.state.userInfo.userName, //库管员
     };
   },
-   async fetch({ store, params }) {
+  async fetch({ store, params }) {
     await store.dispatch("loadDictionary"); // 加载数据字典
   },
   props: {},

pages/resource/resource/return.vue

@@ -97,6 +97,14 @@ export default {
           key: "storeTitle",
           width: 100,
         },
+        {
+          title: "借出数量",
+          key: "lentCount",
+        },
+        {
+          title: "已归还数量",
+          key: "lentCount2",
+        },
         {
           title: this.l("count"),
           key: "count",
@@ -114,6 +122,7 @@ export default {
       libraryTube: this.$store.state.userInfo.userName, //库管员
     };
   },
+
   props: {
     eid: Number,
   },
@@ -135,6 +144,7 @@ export default {
             let objList = data;
             objList.count1 = parseFloat(data.count);
             objList.count = parseFloat(data.count);
+            objList.lentCount2 = parseFloat(data.lentCount - data.count);
             objList.state = "3";
             items.push(objList);
           });