Merge remote-tracking branch 'origin/master'

sample-form-client-ui/admin/src/api/index.js

@@ -35,13 +35,11 @@ export const getdeptList = (data) => {
 export const getSampleformMatterList = (data) => {
   let baseUrl = local.getLocal("serverUrl");
   let siteId = local.getLocal("siteId");
-  let devicenum = local.getLocal("devicenum");
   return request({
     url: `${baseUrl}sampleform/matter/list`,
     method: "post",
     data: {
       siteId,
-      devicenum,
       ...data,
     },
   });

sample-form-manager-ui/admin/src/pages/hardware/NumberWriteDevice.vue

@@ -199,7 +199,7 @@ export default {
         : "",
       tableData: [],
       pageSizes: [10, 20, 30, 40, 50, 100, 200],
-      total: 10,
+      total: 0,
       current: 1,
       size: 10,
       dialogVisible: false,
@@ -223,7 +223,8 @@ export default {
         productName: "样表机",
       });
       this.loading = false;
-      let { data } = res.data.data;
+      let { data, total } = res.data.data;
+      this.total = total;
       this.tableData = data;
       this.$refs.multipleTable.bodyWrapper.scrollTop = 0;
     },

sample-form-manager-ui/admin/src/pages/hardware/modal/AddMatter.vue

@@ -317,7 +317,7 @@ export default {
       let { code, msg } = res.data;
       if (code == 1) {
         this.$message.success(msg);
-        this.getDeviceMatterList();
+        this.getDeviceMatterList(this.devInfo.id);
       }
     },
     // 删除设备事项
@@ -333,7 +333,7 @@ export default {
           let { code, msg } = res.data;
           if (code == 1) {
             this.$message.success(msg);
-            this.getDeviceMatterList();
+            this.getDeviceMatterList(this.devInfo.id);
           }
         })
         .catch(() => {