From b47b2017de99d407f0f359419889c9c20c8ca41e Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 3 Nov 2021 08:19:51 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hb_client/src/styles/index.scss              |   2 +-
 hb_client/src/views/em/detection.vue         |   4 +-
 hb_client/src/views/em/equipment.vue         |   4 +-
 hb_client/src/views/em/record.vue            |   4 +-
 hb_client/src/views/inm/fifo.vue             |   6 +-
 hb_client/src/views/inm/fifodetail.vue       |   2 +-
 hb_client/src/views/inm/inventory.vue        |   2 +-
 hb_client/src/views/inm/materialbatch.vue    |   2 +-
 hb_client/src/views/inm/warehouse.vue        |   4 +-
 hb_client/src/views/monitor/service.vue      | 391 ++++++-------------
 hb_client/src/views/mtm/material.vue         |   4 +-
 hb_client/src/views/mtm/process.vue          |   4 +-
 hb_client/src/views/mtm/stepdo.vue           |   2 +-
 hb_client/src/views/procurement/vendor.vue   |   4 +-
 hb_client/src/views/qm/standard.vue          |   4 +-
 hb_client/src/views/qm/testitem.vue          |   4 +-
 hb_client/src/views/sam/contract.vue         |   4 +-
 hb_client/src/views/sam/customer.vue         |   4 +-
 hb_client/src/views/sam/order.vue            |   4 +-
 hb_client/src/views/sam/review.vue           |   4 +-
 hb_client/src/views/system/dict.vue          |   4 +-
 hb_client/src/views/system/file.vue          |   2 +-
 hb_client/src/views/system/organization.vue  |   2 +-
 hb_client/src/views/system/perm.vue          |   2 +-
 hb_client/src/views/system/position.vue      |   2 +-
 hb_client/src/views/system/role.vue          |   2 +-
 hb_client/src/views/system/task.vue          |   2 +-
 hb_client/src/views/workflow/customfield.vue |   4 +-
 hb_client/src/views/workflow/index.vue       |   4 +-
 hb_client/src/views/workflow/state.vue       |   6 +-
 hb_client/src/views/workflow/ticket.vue      |   2 +-
 hb_client/src/views/workflow/transitions.vue |   4 +-
 hb_client/src/views/wpm/testitem.vue         |   4 +-
 hb_server/apps/mtm/views.py                  |   1 +
 hb_server/apps/pm/views.py                   |   5 +-
 35 files changed, 188 insertions(+), 317 deletions(-)

diff --git a/hb_client/src/styles/index.scss b/hb_client/src/styles/index.scss
index 13042e0..73e86dd 100644
--- a/hb_client/src/styles/index.scss
+++ b/hb_client/src/styles/index.scss
@@ -62,7 +62,7 @@ div:focus {
 
 // main-container global css
 .app-container {
-  padding: 10px;
+  padding: 2px;
 }
 
 .el-table--medium td,   .el-table--medium th {
diff --git a/hb_client/src/views/em/detection.vue b/hb_client/src/views/em/detection.vue
index 89d54b0..4238688 100644
--- a/hb_client/src/views/em/detection.vue
+++ b/hb_client/src/views/em/detection.vue
@@ -24,13 +24,13 @@
               >重置</el-button
             >
     </div>
-    <div style="margin-top: 10px">
+    <div style="margin-top: 2px">
       <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
         >新增设备</el-button
       >
     </div>
     </el-card>
-    <el-card style="margin-top: 10px">
+    <el-card style="margin-top: 2px">
       <el-table
         v-loading="listLoading"
         :data="equipmentList.results"
diff --git a/hb_client/src/views/em/equipment.vue b/hb_client/src/views/em/equipment.vue
index 740b0d3..e31e26d 100644
--- a/hb_client/src/views/em/equipment.vue
+++ b/hb_client/src/views/em/equipment.vue
@@ -24,13 +24,13 @@
               >重置</el-button
             >
     </div>
-    <div style="margin-top: 10px">
+    <div style="margin-top: 2px">
       <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
         >新增设备</el-button
       >
     </div>
     </el-card>
-    <el-card style="margin-top: 10px">
+    <el-card style="margin-top: 2px">
       <el-table
         v-loading="listLoading"
         :data="equipmentList.results"
diff --git a/hb_client/src/views/em/record.vue b/hb_client/src/views/em/record.vue
index 0db948c..cdec323 100644
--- a/hb_client/src/views/em/record.vue
+++ b/hb_client/src/views/em/record.vue
@@ -24,13 +24,13 @@
               >重置</el-button
             >
     </div>
-    <div style="margin-top: 10px">
+    <div style="margin-top: 2px">
       <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
         >新增校准或检定</el-button
       >
     </div>
     </el-card>
-    <el-card style="margin-top: 10px">
+    <el-card style="margin-top: 2px">
       <el-table
         v-loading="listLoading"
         :data="equipmentrecordList.results"
diff --git a/hb_client/src/views/inm/fifo.vue b/hb_client/src/views/inm/fifo.vue
index 52175ca..7f26080 100644
--- a/hb_client/src/views/inm/fifo.vue
+++ b/hb_client/src/views/inm/fifo.vue
@@ -25,8 +25,8 @@
             >
     </div>
     </el-card>
-    <el-card style="margin-top: 10px">
-        <div style="margin-top: 10px">
+    <el-card style="margin-top: 2px">
+        <div style="margin-top: 2px">
        <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
         >新增物料</el-button
       >
@@ -153,7 +153,7 @@
                             </div>
                             <div>
                                 <el-tooltip class="item" effect="dark" content="添加条件" placement="top">
-                                    <el-button  @click="addConditions" style='cursor:pointer;width:95%;color:#fe000c;border:1px dashed #fe000c;height:40px;padding:0px;margin-top:10px;margin-left:20px;font-size:26px'>
+                                    <el-button  @click="addConditions" style='cursor:pointer;width:95%;color:#fe000c;border:1px dashed #fe000c;height:40px;padding:0px;margin-top: 2px;margin-left:20px;font-size:26px'>
                                         +
                                     </el-button>
                                 </el-tooltip> 
diff --git a/hb_client/src/views/inm/fifodetail.vue b/hb_client/src/views/inm/fifodetail.vue
index 3f1a7aa..ba70e95 100644
--- a/hb_client/src/views/inm/fifodetail.vue
+++ b/hb_client/src/views/inm/fifodetail.vue
@@ -25,7 +25,7 @@
             >
     </div>
     </el-card>
-    <el-card style="margin-top: 10px">
+    <el-card style="margin-top: 2px">
       
       <el-table
         v-loading="listLoading"
diff --git a/hb_client/src/views/inm/inventory.vue b/hb_client/src/views/inm/inventory.vue
index 77e1f60..a221592 100644
--- a/hb_client/src/views/inm/inventory.vue
+++ b/hb_client/src/views/inm/inventory.vue
@@ -25,7 +25,7 @@
             >
     </div>
     </el-card>
-    <el-card style="margin-top: 10px">
+    <el-card style="margin-top: 2px">
       
       <el-table
         v-loading="listLoading"
diff --git a/hb_client/src/views/inm/materialbatch.vue b/hb_client/src/views/inm/materialbatch.vue
index 4585950..46a2058 100644
--- a/hb_client/src/views/inm/materialbatch.vue
+++ b/hb_client/src/views/inm/materialbatch.vue
@@ -25,7 +25,7 @@
             >
     </div>
     </el-card>
-    <el-card style="margin-top: 10px">
+    <el-card style="margin-top: 2px">
       
       <el-table
         v-loading="listLoading"
diff --git a/hb_client/src/views/inm/warehouse.vue b/hb_client/src/views/inm/warehouse.vue
index 364380c..2a5a649 100644
--- a/hb_client/src/views/inm/warehouse.vue
+++ b/hb_client/src/views/inm/warehouse.vue
@@ -24,13 +24,13 @@
               >重置</el-button
             >
     </div>
-    <div style="margin-top: 10px">
+    <div style="margin-top: 2px">
       <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
         >新增仓库</el-button
       >
     </div>
     </el-card>
-    <el-card style="margin-top: 10px">
+    <el-card style="margin-top: 2px">
       <el-table
         v-loading="listLoading"
         :data="warehouseList.results"
diff --git a/hb_client/src/views/monitor/service.vue b/hb_client/src/views/monitor/service.vue
index e2bfb1c..8c9fcdd 100644
--- a/hb_client/src/views/monitor/service.vue
+++ b/hb_client/src/views/monitor/service.vue
@@ -1,130 +1,72 @@
 <template>
   <div class="app-container">
+    <el-row :gutter="12">
+      <el-col :span="8">
+        <el-card>
+          <div slot="header" class="clearfix">
+            <span>CPU</span>
+          </div>
+          <el-descriptions :column="1" border>
+            <el-descriptions-item>
+              <template slot="label"> 逻辑核心数 </template>
+              {{ cpuData.count }}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label"> 物理核心数 </template>
+              {{ cpuData.lcount }}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label"> 当前使用率 </template>
+              {{ cpuData.percent }}%
+            </el-descriptions-item>
+          </el-descriptions>
+        </el-card>
+      </el-col>
+      <el-col :span="8">
+        <el-card>
+          <div slot="header" class="clearfix">
+            <span>内存</span>
+          </div>
+          <el-descriptions :column="1" border>
+            <el-descriptions-item>
+              <template slot="label"> 总内存 </template>
+              {{ memoryData.total }}GB
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label"> 已用内存 </template>
+              {{ memoryData.used }}GB
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label"> 当前使用率 </template>
+              {{ memoryData.percent }}%
+            </el-descriptions-item>
+          </el-descriptions>
+        </el-card>
+      </el-col>
+      <el-col :span="8">
+        <el-card>
+          <div slot="header" class="clearfix">
+            <span>硬盘</span>
+          </div>
+          <el-descriptions :column="1" border>
+            <el-descriptions-item>
+              <template slot="label"> 总大小 </template>
+              {{ diskData.total }}GB
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label"> 已用内存 </template>
+              {{ diskData.used }}GB
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label"> 当前使用率 </template>
+              {{ diskData.percent }}%
+            </el-descriptions-item>
+          </el-descriptions>
+        </el-card>
+      </el-col>
+    </el-row>
 
-    <div class="box-card">
-      <el-row :gutter="12">
-        <el-col :span="8">
-          <el-card shadow="always">
-
-            <div slot="header" class="clearfix">
-              <span>CPU</span>
-            </div>
-            <el-row class="row">
-              <el-col :span="8">
-                属性
-              </el-col>
-              <el-col :span="8">
-                值
-              </el-col>
-            </el-row>
-            <el-row class="rowlist">
-              <el-col :span="8">
-                逻辑核心数
-              </el-col>
-              <el-col :span="8">
-                {{cpuData.count}}
-              </el-col>
-            </el-row>
-            <el-row class="rowlist">
-              <el-col :span="8">
-                物理核心数
-              </el-col>
-              <el-col :span="8">
-                {{cpuData.lcount}}
-              </el-col>
-            </el-row>
-            <el-row class="rowlist">
-              <el-col :span="8">
-                当前使用率
-              </el-col>
-              <el-col :span="8">
-                {{cpuData.percent}}%
-              </el-col>
-            </el-row>
-          </el-card>
-        </el-col>
-        <el-col :span="8">
-          <el-card shadow="always">
-            <div slot="header" class="clearfix">
-              <span>内存</span>
-            </div>
-            <el-row class="row">
-              <el-col :span="8">
-                属性
-              </el-col>
-              <el-col :span="8">
-                值
-              </el-col>
-            </el-row>
-            <el-row class="rowlist">
-              <el-col :span="8">
-                使用率
-              </el-col>
-              <el-col :span="8">
-                {{memoryData.percent}}%
-              </el-col>
-            </el-row>
-            <el-row class="rowlist">
-              <el-col :span="8">
-                总内存
-              </el-col>
-              <el-col :span="8">
-                {{memoryData.total}}
-              </el-col>
-            </el-row>
-            <el-row class="rowlist">
-              <el-col :span="8">
-                已用内存
-              </el-col>
-              <el-col :span="8">
-                {{memoryData.used}}
-              </el-col>
-            </el-row>
-          </el-card>
-        </el-col>
-        <el-col :span="8">
-          <el-card shadow="always">
-            <div slot="header" class="clearfix">
-              <span>硬盘</span>
-            </div>
-            <el-row class="row">
-              <el-col :span="8">
-                属性
-              </el-col>
-              <el-col :span="8">
-                值
-              </el-col>
-            </el-row>
-            <el-row class="rowlist">
-              <el-col :span="8">
-                已用百分比
-              </el-col>
-              <el-col :span="8">
-                {{diskData.percent}}%
-              </el-col>
-            </el-row>
-            <el-row class="rowlist">
-              <el-col :span="8">
-                总大小
-              </el-col>
-              <el-col :span="8">
-                {{diskData.total}}
-              </el-col>
-            </el-row>
-            <el-row class="rowlist">
-              <el-col :span="8">
-                已用大小
-              </el-col>
-              <el-col :span="8">
-                {{diskData.used}}
-              </el-col>
-            </el-row>
-          </el-card>
-        </el-col>
-      </el-row>
-    </div>
-
-    <el-card class="box-card">
+    <el-card style="margin-top: 6px">
       <div slot="header" class="clearfix">
         <span>日志列表</span>
       </div>
@@ -141,45 +83,33 @@
           type="primary"
           icon="el-icon-search"
           @click="handleFilter"
-        >搜索
+          >搜索
         </el-button>
         <el-button
           class="filter-item"
           type="primary"
           icon="el-icon-refresh-left"
           @click="resetFilter"
-        >重置
+          >重置
         </el-button>
       </div>
       <el-table
         :data="tableData"
-        style="width: 100%;height:400px"
+        style="width: 100%"
+        height="100"
+        v-el-height-adaptive-table="{ bottomOffset: 30 }"
       >
-        <el-table-column
-          prop="name"
-          label="日志名称"
-        >
-        </el-table-column>
-        <el-table-column
-          prop="size"
-          label="日志大小"
-        >
-        </el-table-column>
-        <el-table-column
-          fixed="right"
-          label="操作"
-          width="100"
-        >
+        <el-table-column prop="name" label="日志名称"> </el-table-column>
+        <el-table-column prop="size" label="日志大小"> </el-table-column>
+        <el-table-column fixed="right" label="操作" width="100">
           <template slot-scope="scope">
-            <el-button @click="handleClick(scope.row)" type="text" size="small">查看详情</el-button>
+            <el-button @click="handleClick(scope.row)" type="text" size="small"
+              >查看详情</el-button
+            >
           </template>
         </el-table-column>
       </el-table>
-      <el-dialog
-        :visible.sync="dialogVisible"
-        width="80%"
-        title="日志详情"
-      >
+      <el-dialog :visible.sync="dialogVisible" width="80%" title="日志详情">
         <div v-html="logdec" class="dialogDiv"></div>
       </el-dialog>
     </el-card>
@@ -188,121 +118,60 @@
 
 
 <script>
-  import {getlogList, getLog, getServerList} from "@/api/moritor";
+import { getlogList, getLog, getServerList } from "@/api/moritor";
 
-  const defaultCMA = {}
-  export default {
-    components: {},
-    data() {
-      return {
-        tableData: [],
-        cpuData: [],
-        diskData: [],
-        memoryData: [],
-        dialogVisible: false,
-        logdec: "",
-        text: "",
-        listQuery: {},
-      };
+const defaultCMA = {};
+export default {
+  components: {},
+  data() {
+    return {
+      tableData: [],
+      cpuData: [],
+      diskData: [],
+      memoryData: [],
+      dialogVisible: false,
+      logdec: "",
+      text: "",
+      listQuery: {},
+    };
+  },
+  computed: {},
+  watch: {},
+  created() {
+    this.getlogList();
+    this.getServerList();
+  },
+  methods: {
+    getlogList() {
+      getlogList(this.listQuery).then((response) => {
+        if (response.data) {
+          this.tableData = response.data;
+        }
+      });
     },
-    computed: {},
-    watch: {},
-    created() {
+    handleFilter() {
       this.getlogList();
-      this.getServerList();
     },
-    methods: {
-
-      getlogList() {
-        getlogList(this.listQuery).then((response) => {
-          if (response.data) {
-
-            this.tableData = response.data;
-          }
-
-        });
-      },
-      handleFilter() {
-        this.getlogList();
-      },
-      resetFilter() {
-
-        this.getlogList();
-      },
-      getServerList() {
-        getServerList().then((response) => {
-          if (response.data) {
-            this.cpuData = response.data.cpu;
-            this.diskData = response.data.disk;
-            this.memoryData = response.data.memory;
-          }
-
-        });
-      },
-      handleClick(row) {
-        this.dialogVisible = true;
-        getLog(row.name).then((response) => {
-          if (response.data) {
-            this.logdec = response.data.replace(/\n/gm, "<br/>")
-          }
-        });
-      },
+    resetFilter() {
+      this.getlogList();
     },
-  };
-</script>
-<style>
-  ::-webkit-scrollbar {
-    width: 10px;
-  }
-  ::-webkit-scrollbar-track{
-    -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.2);
-    background-color: #fefefe;
-    border-radius: 7px;
-  }
-  ::-webkit-scrollbar-thumb{
-    border-radius: 7px;
-    -webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.2);
-    background-color: #f5f5f5;
-  }
-  .dialogDiv{
-    height: 70vh;
-    overflow-y: scroll;
-  }
-  .text {
-    font-size: 14px;
-  }
-
-  .item {
-    margin-bottom: 18px;
-  }
-
-  .clearfix:before,
-  .clearfix:after {
-    display: table;
-    content: "";
-  }
-
-  .clearfix:after {
-    clear: both
-  }
-
-  .box-card {
-    width: 90%;
-    margin: 0 auto;
-    margin-top: 30px;
-  }
-
-  .row {
-    border-bottom: 1px solid #dfe6ec;
-    color: #909399;
-    font-weight: 500;
-    padding: 10px;
-  }
-
-  .rowlist {
-    border-bottom: 1px solid #dfe6ec;
-    color: #606266;
-    font-weight: 500;
-    padding: 10px;
-  }
-</style>
+    getServerList() {
+      getServerList().then((response) => {
+        if (response.data) {
+          this.cpuData = response.data.cpu;
+          this.diskData = response.data.disk;
+          this.memoryData = response.data.memory;
+        }
+      });
+    },
+    handleClick(row) {
+      this.dialogVisible = true;
+      getLog(row.name).then((response) => {
+        if (response.data) {
+          this.logdec = response.data.replace(/\n/gm, "<br/>");
+        }
+      });
+    },
+  },
+};
+</script>
\ No newline at end of file
diff --git a/hb_client/src/views/mtm/material.vue b/hb_client/src/views/mtm/material.vue
index 9eb99f4..b781fc5 100644
--- a/hb_client/src/views/mtm/material.vue
+++ b/hb_client/src/views/mtm/material.vue
@@ -24,13 +24,13 @@
               >重置</el-button
             >
     </div>
-    <div style="margin-top: 10px">
+    <div style="margin-top: 2px">
       <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
         >新增物料</el-button
       >
     </div>
     </el-card>
-    <el-card style="margin-top: 10px">
+    <el-card style="margin-top: 2px">
       <el-table
         v-loading="listLoading"
         :data="materialList.results"
diff --git a/hb_client/src/views/mtm/process.vue b/hb_client/src/views/mtm/process.vue
index 99654d2..be91d34 100644
--- a/hb_client/src/views/mtm/process.vue
+++ b/hb_client/src/views/mtm/process.vue
@@ -2,13 +2,13 @@
   <div class="app-container">
     <el-card>
         
-    <div style="margin-top: 10px">
+    <div style="margin-top: 2px">
       <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
         >新增工序</el-button
       >
     </div>
     </el-card>
-    <el-card style="margin-top: 10px">
+    <el-card style="margin-top: 2px">
       <el-table
         v-loading="listLoading"
         :data="processList.results"
diff --git a/hb_client/src/views/mtm/stepdo.vue b/hb_client/src/views/mtm/stepdo.vue
index 624906e..d55246f 100644
--- a/hb_client/src/views/mtm/stepdo.vue
+++ b/hb_client/src/views/mtm/stepdo.vue
@@ -21,7 +21,7 @@
 
           <el-row :gutter="24">
             <el-col :span="6" >
-              <el-card style="margin-top: 10px">
+              <el-card style="margin-top: 2px">
                 <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
                 >新增</el-button>
                 <el-table
diff --git a/hb_client/src/views/procurement/vendor.vue b/hb_client/src/views/procurement/vendor.vue
index 71c5579..9ec3815 100644
--- a/hb_client/src/views/procurement/vendor.vue
+++ b/hb_client/src/views/procurement/vendor.vue
@@ -24,13 +24,13 @@
               >重置</el-button
             >
     </div>
-    <div style="margin-top: 10px">
+    <div style="margin-top: 2px">
       <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
         >新增供应商</el-button
       >
     </div>
     </el-card>
-    <el-card style="margin-top: 10px">
+    <el-card style="margin-top: 2px">
       <el-table
         v-loading="listLoading"
         :data="vendorList.results"
diff --git a/hb_client/src/views/qm/standard.vue b/hb_client/src/views/qm/standard.vue
index ffd426d..4f6b6eb 100644
--- a/hb_client/src/views/qm/standard.vue
+++ b/hb_client/src/views/qm/standard.vue
@@ -24,13 +24,13 @@
               >重置</el-button
             >
     </div>
-    <div style="margin-top: 10px">
+    <div style="margin-top: 2px">
       <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
         >新增标准</el-button
       >
     </div>
     </el-card>
-    <el-card style="margin-top: 10px">
+    <el-card style="margin-top: 2px">
       <el-table
         v-loading="listLoading"
         :data="standardList.results"
diff --git a/hb_client/src/views/qm/testitem.vue b/hb_client/src/views/qm/testitem.vue
index 1c92b00..6f8d7b3 100644
--- a/hb_client/src/views/qm/testitem.vue
+++ b/hb_client/src/views/qm/testitem.vue
@@ -24,13 +24,13 @@
               >重置</el-button
             >
     </div>
-    <div style="margin-top: 10px">
+    <div style="margin-top: 2px">
       <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
         >新增项目</el-button
       >
     </div>
     </el-card>
-    <el-card style="margin-top: 10px">
+    <el-card style="margin-top: 2px">
       <el-table
         v-loading="listLoading"
         :data="testitemList.results"
diff --git a/hb_client/src/views/sam/contract.vue b/hb_client/src/views/sam/contract.vue
index abd14b4..6735fc4 100644
--- a/hb_client/src/views/sam/contract.vue
+++ b/hb_client/src/views/sam/contract.vue
@@ -24,13 +24,13 @@
               >重置</el-button
             >
     </div>
-    <div style="margin-top: 10px">
+    <div style="margin-top: 2px">
       <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
         >新增客户</el-button
       >
     </div>
     </el-card>
-    <el-card style="margin-top: 10px">
+    <el-card style="margin-top: 2px">
       <el-table
         v-loading="listLoading"
         :data="contractList.results"
diff --git a/hb_client/src/views/sam/customer.vue b/hb_client/src/views/sam/customer.vue
index 66fa455..209eba4 100644
--- a/hb_client/src/views/sam/customer.vue
+++ b/hb_client/src/views/sam/customer.vue
@@ -24,13 +24,13 @@
               >重置</el-button
             >
     </div>
-    <div style="margin-top: 10px">
+    <div style="margin-top: 2px">
       <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
         >新增客户</el-button
       >
     </div>
     </el-card>
-    <el-card style="margin-top: 10px">
+    <el-card style="margin-top: 2px">
       <el-table
         v-loading="listLoading"
         :data="customerList.results"
diff --git a/hb_client/src/views/sam/order.vue b/hb_client/src/views/sam/order.vue
index 175621e..2c2c9a4 100644
--- a/hb_client/src/views/sam/order.vue
+++ b/hb_client/src/views/sam/order.vue
@@ -24,13 +24,13 @@
               >重置</el-button
             >
     </div>
-    <div style="margin-top: 10px">
+    <div style="margin-top: 2px">
       <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
         >新增订单</el-button
       >
     </div>
     </el-card>
-    <el-card style="margin-top: 10px">
+    <el-card style="margin-top: 2px">
       <el-table
         v-loading="listLoading"
         :data="orderList.results"
diff --git a/hb_client/src/views/sam/review.vue b/hb_client/src/views/sam/review.vue
index abd14b4..6735fc4 100644
--- a/hb_client/src/views/sam/review.vue
+++ b/hb_client/src/views/sam/review.vue
@@ -24,13 +24,13 @@
               >重置</el-button
             >
     </div>
-    <div style="margin-top: 10px">
+    <div style="margin-top: 2px">
       <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
         >新增客户</el-button
       >
     </div>
     </el-card>
-    <el-card style="margin-top: 10px">
+    <el-card style="margin-top: 2px">
       <el-table
         v-loading="listLoading"
         :data="contractList.results"
diff --git a/hb_client/src/views/system/dict.vue b/hb_client/src/views/system/dict.vue
index 273d8a0..f9aa9b3 100644
--- a/hb_client/src/views/system/dict.vue
+++ b/hb_client/src/views/system/dict.vue
@@ -16,7 +16,7 @@
           highlight-current
           :expand-on-click-node="false"
           :filter-node-method="filterNode"
-          style="margin-top:10px;"
+          style="margin-top: 2px;"
           @node-click="handleDictTypeClick"
         >
         <span class="custom-tree-node" slot-scope="{ node, data }">
@@ -52,7 +52,7 @@
           v-show="listQuery.type"
           v-loading="listLoading"
           :data="dictList"
-          style="width: 100%;margin-top:10px;"
+          style="width: 100%;margin-top: 2px;"
           highlight-current-row
           row-key="id"
           height="100"
diff --git a/hb_client/src/views/system/file.vue b/hb_client/src/views/system/file.vue
index b9c70a8..02307b3 100644
--- a/hb_client/src/views/system/file.vue
+++ b/hb_client/src/views/system/file.vue
@@ -41,7 +41,7 @@
         <el-table
           v-loading="listLoading"
           :data="fileList.results"
-          style="width: 100%;margin-top:10px;"
+          style="width: 100%;margin-top: 2px;"
           highlight-current-row
           row-key="id"
           height="100"
diff --git a/hb_client/src/views/system/organization.vue b/hb_client/src/views/system/organization.vue
index a71f2b6..b438dee 100644
--- a/hb_client/src/views/system/organization.vue
+++ b/hb_client/src/views/system/organization.vue
@@ -25,7 +25,7 @@
             !search || data.name.toLowerCase().includes(search.toLowerCase())
         )
       "
-      style="width: 100%; margin-top: 10px"
+      style="width: 100%; margin-top: 2px"
       highlight-current-row
       row-key="id"
       height="100"
diff --git a/hb_client/src/views/system/perm.vue b/hb_client/src/views/system/perm.vue
index ae8a7cf..8b474e0 100644
--- a/hb_client/src/views/system/perm.vue
+++ b/hb_client/src/views/system/perm.vue
@@ -24,7 +24,7 @@
             !search || data.name.toLowerCase().includes(search.toLowerCase())
         )
       "
-      style="width: 100%; margin-top: 10px"
+      style="width: 100%; margin-top: 2px"
       highlight-current-row
       row-key="id"
       height="100"
diff --git a/hb_client/src/views/system/position.vue b/hb_client/src/views/system/position.vue
index cffc146..a2b19da 100644
--- a/hb_client/src/views/system/position.vue
+++ b/hb_client/src/views/system/position.vue
@@ -25,7 +25,7 @@
             !search || data.name.toLowerCase().includes(search.toLowerCase())
         )
       "
-      style="width: 100%; margin-top: 10px"
+      style="width: 100%; margin-top: 2px"
       highlight-current-row
       row-key="id"
       height="100"
diff --git a/hb_client/src/views/system/role.vue b/hb_client/src/views/system/role.vue
index a19ebd0..6321b59 100644
--- a/hb_client/src/views/system/role.vue
+++ b/hb_client/src/views/system/role.vue
@@ -20,7 +20,7 @@
     <el-table
       v-loading="listLoading"
       :data="tableData"
-      style="width: 100%; margin-top: 10px"
+      style="width: 100%; margin-top: 2px"
       highlight-current-row
       row-key="id"
       height="100"
diff --git a/hb_client/src/views/system/task.vue b/hb_client/src/views/system/task.vue
index 62797e9..de9810b 100644
--- a/hb_client/src/views/system/task.vue
+++ b/hb_client/src/views/system/task.vue
@@ -53,7 +53,7 @@
     <el-table
       v-loading="listLoading"
       :data="dataList.results"
-      style="width: 100%; margin-top: 10px"
+      style="width: 100%; margin-top: 2px"
       highlight-current-row
       row-key="id"
       height="100"
diff --git a/hb_client/src/views/workflow/customfield.vue b/hb_client/src/views/workflow/customfield.vue
index b9bda45..44fbdac 100644
--- a/hb_client/src/views/workflow/customfield.vue
+++ b/hb_client/src/views/workflow/customfield.vue
@@ -2,13 +2,13 @@
   <div class="app-container">
     <el-card>
 
-    <div style="margin-top: 10px">
+    <div style="margin-top: 2px">
       <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
         >新增</el-button
       >
     </div>
     </el-card>
-    <el-card style="margin-top: 10px">
+    <el-card style="margin-top: 2px">
       <el-table
 
         :data="customfieldList"
diff --git a/hb_client/src/views/workflow/index.vue b/hb_client/src/views/workflow/index.vue
index 3c3e38f..0fe684c 100644
--- a/hb_client/src/views/workflow/index.vue
+++ b/hb_client/src/views/workflow/index.vue
@@ -24,11 +24,11 @@
           >重置</el-button
         >
       </div>
-      <div style="margin-top: 10px">
+      <div style="margin-top: 2px">
         <el-button type="primary" icon="el-icon-plus" @click="handleCreate">新增</el-button>
       </div>
     </el-card>
-    <el-card style="margin-top: 10px">
+    <el-card style="margin-top: 2px">
       <el-table
         v-loading="listLoading"
         :data="workflowList.results"
diff --git a/hb_client/src/views/workflow/state.vue b/hb_client/src/views/workflow/state.vue
index af442a1..9c104df 100644
--- a/hb_client/src/views/workflow/state.vue
+++ b/hb_client/src/views/workflow/state.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="app-container">
     <el-card>
-      <div style="margin-top: 10px">
+      <div style="margin-top: 2px">
         <el-button type="primary" icon="el-icon-plus" @click="handleCreate">新增
         </el-button>
       </div>
     </el-card>
-    <el-card style="margin-top: 10px">
+    <el-card style="margin-top: 2px">
       <el-table
         :data="wfstateList"
         style="width: 100%"
@@ -166,7 +166,7 @@
         </el-form-item>
         <el-form-item label="字段状态">
           <el-button @click="addWordStatusChange">添加修改</el-button>
-          <el-row v-for="(item,$index) in statusChange" :key="item+$index" style="margin-top: 10px">
+          <el-row v-for="(item,$index) in statusChange" :key="item+$index" style="margin-top: 2px">
             <el-col :span="11">
               <el-select style="width: 100%" v-model="item.name" placeholder="请选择字段">
                 <el-option v-for="item in customfieldList" :key="item.id" :label="item.field_name"
diff --git a/hb_client/src/views/workflow/ticket.vue b/hb_client/src/views/workflow/ticket.vue
index 2b4a2ae..bb93ffd 100644
--- a/hb_client/src/views/workflow/ticket.vue
+++ b/hb_client/src/views/workflow/ticket.vue
@@ -23,7 +23,7 @@
           @click="handleFilter"
         >搜索</el-button>
       </div>
-      <div style="margin-top: 10px">
+      <div style="margin-top: 2px">
         <el-button type="primary" icon="el-icon-plus" @click="handleCreate">新增</el-button>
       </div>
     </el-card>
diff --git a/hb_client/src/views/workflow/transitions.vue b/hb_client/src/views/workflow/transitions.vue
index 341fa2b..d0827f6 100644
--- a/hb_client/src/views/workflow/transitions.vue
+++ b/hb_client/src/views/workflow/transitions.vue
@@ -2,13 +2,13 @@
   <div class="app-container">
     <el-card>
       
-    <div style="margin-top: 10px">
+    <div style="margin-top: 2px">
       <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
         >新增</el-button
       >
     </div>
     </el-card>
-    <el-card style="margin-top: 10px">
+    <el-card style="margin-top: 2px">
       <el-table
         :data="wftransitionList"
         style="width: 100%"
diff --git a/hb_client/src/views/wpm/testitem.vue b/hb_client/src/views/wpm/testitem.vue
index 1c92b00..6f8d7b3 100644
--- a/hb_client/src/views/wpm/testitem.vue
+++ b/hb_client/src/views/wpm/testitem.vue
@@ -24,13 +24,13 @@
               >重置</el-button
             >
     </div>
-    <div style="margin-top: 10px">
+    <div style="margin-top: 2px">
       <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
         >新增项目</el-button
       >
     </div>
     </el-card>
-    <el-card style="margin-top: 10px">
+    <el-card style="margin-top: 2px">
       <el-table
         v-loading="listLoading"
         :data="testitemList.results"
diff --git a/hb_server/apps/mtm/views.py b/hb_server/apps/mtm/views.py
index f657bde..0d7f90b 100644
--- a/hb_server/apps/mtm/views.py
+++ b/hb_server/apps/mtm/views.py
@@ -153,6 +153,7 @@ class RecordFormViewSet(OptimizationMixin, CreateUpdateModelAMixin, ModelViewSet
     queryset = RecordForm.objects.all()
     filterset_fields = ['step', 'type', 'material']
     search_fields = ['name']
+    ordering='id'
 
     def get_serializer_class(self):
         if self.action =='create':
diff --git a/hb_server/apps/pm/views.py b/hb_server/apps/pm/views.py
index 9fc474d..ac35f84 100644
--- a/hb_server/apps/pm/views.py
+++ b/hb_server/apps/pm/views.py
@@ -187,8 +187,9 @@ class ResourceViewSet(GenericViewSet):
         res_d_list = []
         res = []
         for i in rdata:
-            materials = InputMaterial.objects.filter(subproduction__product__id=i['id'], 
-            subproduction__is_deleted=False, is_deleted=False, material__type__in=[3,4]).order_by('material__number')\
+            # 计算输入物料
+            materials = SubprodctionMaterial.objects.filter(subproduction__product__id=i['id'], 
+            subproduction__is_deleted=False, is_deleted=False, material__type__in=[3,4], type=1).order_by('material__number')\
                 .values('material__id', 'material__name', 'material__number', 'material__type', 'count', 'material__count')
             l_m = list(materials)
             for m in l_m: