damon227 преди 2 години
родител
ревизия
698aaf1ae8
променени са 3 файла, в които са добавени 319 реда и са изтрити 384 реда
  1. 3 0
      src/views/modules/home/admin.vue
  2. 315 383
      src/views/modules/home/customer.vue
  3. 1 1
      src/views/modules/warehouse/stock.vue

+ 3 - 0
src/views/modules/home/admin.vue

@@ -653,6 +653,9 @@ body,
 .el-card__body {
   height: 100%;
 }
+</style>
+<style scoped>
+
 .mod-home {
   /* line-height: 1.5; */
   height: 100%;

+ 315 - 383
src/views/modules/home/customer.vue

@@ -2,60 +2,160 @@
   <div class="mod-home" id="content">
     <el-button @click="fullScreen" class="full-screen-btn">全屏</el-button>
 
-    <el-row :span="24" class="sample-bg">
-      <el-col :span="6" class="bg1-1">
-        <el-row :span="24" class="bg1-1-1">
-          <div class="box-company-title">
-            <div class="company-title">东齐公司大数据看板</div>
-          </div>
-        </el-row>
-        <el-row :span="24" class="bg1-1-2">
-          <div class="box-custom-number">
-            <div class="custom-number">客户数:{{ analytics.clients }}</div>
-          </div>
-        </el-row>
-        <el-row :span="24" class="bg1-1-1">
-          <div class="box-contract-number">
-            <div class="contract-number">合同数:{{ analytics.num }}</div>
-          </div>
-        </el-row>
-        <el-row :span="24" class="bg1-1-2">
-          <div class="box-contract-amount">
-            <div class="contract-amount">
-              合同总金额:{{ analytics.totalAmount }}
-            </div>
-          </div>
-        </el-row>
-      </el-col>
-      <el-col :span="12" class="bg1-2">
-        <el-row :span="24" class="bg1-2-1">
-          <div class="box-notice-title" @dblclick="doubleClick">
-            <div class="notice-title">{{ noticeContent }}</div>
-          </div>
-        </el-row>
-        <el-row :span="24" class="bg1-2-2">
-          <div class="box-stat-number">
-            <div class="stat-number">
-              <div class="item">
-                <div class="title">在制产品总数</div>
-                <div class="number">{{ produceCensus.produceNum }}</div>
+    <el-row style="height: 100%">
+      <el-col :span="18" style="height: 100%">
+        <el-row :span="24" class="sample-bg">
+          <el-col :span="6" class="bg1-1">
+            <el-row :span="24" class="bg1-1-1">
+              <div class="box-company-title">
+                <div class="company-title">生产现场时时看板</div>
               </div>
-              <div class="item">
-                <div class="title">已完成数量</div>
-                <div class="number">{{ produceCensus.completeNum }}</div>
+            </el-row>
+            <el-row :span="24" class="bg1-1-2">
+              <div class="box-custom-number">
+                <div class="custom-number">在制产品数:{{ produceCensus.produceNum }}</div>
               </div>
-              <div class="item">
-                <div class="title">损坏数量</div>
-                <div class="number">{{ produceCensus.damageNum }}</div>
+            </el-row>
+            <el-row :span="24" class="bg1-1-1">
+              <div class="box-contract-number">
+                <!-- <div class="contract-number">合同数:{{ analytics.num }}</div> -->
               </div>
-              <div class="item">
-                <div class="title">生产总值</div>
-                <div class="number">{{ produceCensus.totalOutputValue }}</div>
+            </el-row>
+            <el-row :span="24" class="bg1-1-2">
+              <div class="box-contract-amount">
+                <!-- <div class="contract-amount">
+                  合同总金额:{{ analytics.totalAmount }}
+                </div> -->
               </div>
-            </div>
-          </div>
+            </el-row>
+          </el-col>
+          <el-col :span="18" class="bg1-2">
+            <el-row :span="24" class="bg1-2-1">
+              <div class="box-notice-title" @dblclick="doubleClick">
+                <div class="notice-title">{{ noticeContent }}</div>
+              </div>
+            </el-row>
+            <el-row :span="24" class="bg1-2-2">
+              <div class="box-stat-number">
+                <div class="stat-number">
+                  <div class="item">
+                    <div class="title">在制产品总数</div>
+                    <div class="number">{{ produceCensus.produceNum }}</div>
+                  </div>
+                  <div class="item">
+                    <div class="title">已完成数量</div>
+                    <div class="number">{{ produceCensus.completeNum }}</div>
+                  </div>
+                  <div class="item">
+                    <div class="title">损坏数量</div>
+                    <div class="number">{{ produceCensus.damageNum }}</div>
+                  </div>
+                  <div class="item">
+                    <div class="title">生产总值</div>
+                    <div class="number">
+                      {{ produceCensus.totalOutputValue }}
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </el-row>
+            <el-row :span="24" class="bg1-2-3">
+              <el-col :span="12" class="bg2-1">
+                <el-row :span="24" class="bg2-3-1">
+                  <div class="box-contract-alert">
+                    <div class="contract-alert">合同预警</div>
+                  </div>
+                </el-row>
+                <el-row :span="24" class="bg2-3-2">
+                  <div class="box-contract-alert">
+                    <div class="contract-alert">
+                      <div class="table">
+                        <el-table
+                          ref="contractAlarmTable"
+                          :data="contractAlarmList"
+                          height="100%"
+                          row-class-name="custom-ranking-table-row"
+                          style="width: 100%"
+                        >
+                          <el-table-column
+                            type="index"
+                            label="序号"
+                          ></el-table-column>
+                          <el-table-column
+                            prop="contractNumber"
+                            label="合同号"
+                          ></el-table-column>
+                          <!-- <el-table-column prop="orderCode" label="订单号"></el-table-column> -->
+                          <el-table-column
+                            prop="remainTime"
+                            label="剩余时间"
+                            min-width="70"
+                          ></el-table-column>
+                          <el-table-column
+                            prop="deliveryTime"
+                            label="交付日期"
+                          ></el-table-column>
+                          <el-table-column
+                            prop="customerName"
+                            label="客户名称"
+                          ></el-table-column>
+                          <!-- <el-table-column prop="salesmenName" label="业务员"></el-table-column> -->
+                        </el-table>
+                      </div>
+                    </div>
+                  </div>
+                </el-row>
+              </el-col>
+              <el-col :span="12" class="bg2-2">
+                <el-row :span="24" class="bg2-3-11">
+                  <div class="box-contract-alert">
+                    <div class="contract-alert">报损记录</div>
+                  </div>
+                </el-row>
+                <el-row :span="24" class="bg2-3-3">
+                  <div class="box-contract-alert">
+                    <div class="contract-alert">
+                      <div class="table">
+                        <el-table
+                          ref="damageTable"
+                          :data="damageList"
+                          height="100%"
+                          row-class-name="custom-ranking-table-row"
+                          style="width: 100%"
+                        >
+                          <el-table-column
+                            type="index"
+                            label="序号"
+                          ></el-table-column>
+                          <el-table-column
+                            prop="productName"
+                            label="产品"
+                          ></el-table-column>
+                          <el-table-column
+                            prop="prodCode"
+                            label="编号"
+                          ></el-table-column>
+                          <!-- <el-table-column prop="damageReason" label="原因"></el-table-column> -->
+                          <el-table-column
+                            prop="liableUserName"
+                            label="报损人"
+                            width="80"
+                          ></el-table-column>
+                          <el-table-column
+                            prop="createTime"
+                            label="报损时间"
+                          ></el-table-column>
+                        </el-table>
+                      </div>
+                    </div>
+                  </div>
+                </el-row>
+              </el-col>
+            </el-row>
+          </el-col>
+          <el-col :span="9"></el-col>
         </el-row>
-        <el-row :span="24" class="bg1-2-3">
+        <el-row :span="24" class="sample-bg1">
           <div class="box-contract-table">
             <div class="contract-table table">
               <el-table
@@ -102,10 +202,10 @@
           </div>
         </el-row>
       </el-col>
-      <el-col :span="6" class="bg1-3">
+      <el-col :span="6" class="left-bg">
         <el-row :span="24" class="bg1-3-1">
           <div class="box-custom-ranking">
-            <div class="custom-ranking">客户排名</div>
+            <div class="custom-ranking">报工列表</div>
           </div>
         </el-row>
         <el-row :span="24" class="bg1-3-2">
@@ -114,130 +214,6 @@
               <div class="table">
                 <el-table
                   ref="customerRankTable"
-                  :data="customerRankList"
-                  height="100%"
-                  row-class-name="custom-ranking-table-row"
-                  style="width: 100%"
-                >
-                  <el-table-column
-                    prop="customerName"
-                    label="客户名称"
-                  ></el-table-column>
-                  <el-table-column label="合同金额占比">
-                    <template slot-scope="scope">
-                      <el-progress
-                        :text-inside="true"
-                        :stroke-width="16"
-                        :percentage="scope.row.percentage * 100"
-                        status="success"
-                      ></el-progress>
-                    </template>
-                  </el-table-column>
-                </el-table>
-              </div>
-            </div>
-          </div>
-        </el-row>
-      </el-col>
-    </el-row>
-    <el-row :span="24" class="sample-bg1">
-      <el-col :span="6" class="bg2-1">
-        <el-row :span="24" class="bg2-3-1">
-          <div class="box-contract-alert">
-            <div class="contract-alert">合同预警</div>
-          </div>
-        </el-row>
-        <el-row :span="24" class="bg2-3-2">
-          <div class="box-contract-alert">
-            <div class="contract-alert">
-              <div class="table">
-                <el-table
-                  ref="contractAlarmTable"
-                  :data="contractAlarmList"
-                  height="100%"
-                  row-class-name="custom-ranking-table-row"
-                  style="width: 100%"
-                >
-                  <el-table-column type="index" label="序号"></el-table-column>
-                  <el-table-column
-                    prop="contractNumber"
-                    label="合同号"
-                  ></el-table-column>
-                  <!-- <el-table-column prop="orderCode" label="订单号"></el-table-column> -->
-                  <el-table-column
-                    prop="remainTime"
-                    label="剩余时间"
-                    width="70"
-                  ></el-table-column>
-                  <el-table-column
-                    prop="deliveryTime"
-                    label="交付日期"
-                  ></el-table-column>
-                  <el-table-column
-                    prop="customerName"
-                    label="客户名称"
-                  ></el-table-column>
-                  <!-- <el-table-column prop="salesmenName" label="业务员"></el-table-column> -->
-                </el-table>
-              </div>
-            </div>
-          </div>
-        </el-row>
-      </el-col>
-      <el-col :span="6" class="bg2-2">
-        <el-row :span="24" class="bg2-3-1">
-          <div class="box-contract-alert">
-            <div class="contract-alert">报损记录</div>
-          </div>
-        </el-row>
-        <el-row :span="24" class="bg2-3-2">
-          <div class="box-contract-alert">
-            <div class="contract-alert">
-              <div class="table">
-                <el-table
-                  ref="damageTable"
-                  :data="damageList"
-                  height="100%"
-                  row-class-name="custom-ranking-table-row"
-                  style="width: 100%"
-                >
-                  <el-table-column type="index" label="序号"></el-table-column>
-                  <el-table-column
-                    prop="productName"
-                    label="产品"
-                  ></el-table-column>
-                  <el-table-column
-                    prop="prodCode"
-                    label="编号"
-                  ></el-table-column>
-                  <!-- <el-table-column prop="damageReason" label="原因"></el-table-column> -->
-                  <el-table-column
-                    prop="liableUserName"
-                    label="报损人"
-                    width="80"
-                  ></el-table-column>
-                  <el-table-column
-                    prop="createTime"
-                    label="报损时间"
-                  ></el-table-column>
-                </el-table>
-              </div>
-            </div>
-          </div>
-        </el-row>
-      </el-col>
-      <el-col :span="6" class="bg2-1">
-        <el-row :span="24" class="bg2-3-1">
-          <div class="box-contract-alert">
-            <div class="contract-alert">报工</div>
-          </div>
-        </el-row>
-        <el-row :span="24" class="bg2-3-2">
-          <div class="box-contract-alert">
-            <div class="contract-alert">
-              <div class="table">
-                <el-table
-                  ref="submittedRecordTable"
                   :data="submittedRecordList"
                   height="100%"
                   row-class-name="custom-ranking-table-row"
@@ -259,48 +235,7 @@
                   ></el-table-column>
                   <el-table-column
                     prop="operatorName"
-                    label="操作人名字"
-                  ></el-table-column>
-                </el-table>
-              </div>
-            </div>
-          </div>
-        </el-row>
-      </el-col>
-      <el-col :span="6" class="bg2-2">
-        <el-row :span="24" class="bg2-3-1">
-          <div class="box-contract-alert">
-            <div class="contract-alert">出库记录</div>
-          </div>
-        </el-row>
-        <el-row :span="24" class="bg2-3-2">
-          <div class="box-contract-alert">
-            <div class="contract-alert">
-              <div class="table">
-                <el-table
-                  ref="outboundRecordTable"
-                  :data="outboundRecordList"
-                  height="100%"
-                  row-class-name="custom-ranking-table-row"
-                  style="width: 100%"
-                >
-                  <el-table-column type="index" label="序号"></el-table-column>
-                  <el-table-column
-                    prop="materialName"
-                    label="物品"
-                  ></el-table-column>
-                  <el-table-column
-                    prop="cnt"
-                    label="数量"
-                    width="50"
-                  ></el-table-column>
-                  <el-table-column
-                    prop="createTime"
-                    label="时间"
-                  ></el-table-column>
-                  <el-table-column
-                    prop="applicant"
-                    label="申请人"
+                    label="操作人"
                   ></el-table-column>
                 </el-table>
               </div>
@@ -309,7 +244,6 @@
         </el-row>
       </el-col>
     </el-row>
-
     <el-dialog title="设置通知内容" :visible.sync="dialogFormVisible">
       <el-form :model="noticeForm">
         <el-form-item label="通知内容">
@@ -333,17 +267,17 @@ import {
   getOutboundRecordList,
   getContractProdList,
   getSubmittedRecordList,
-  getProduceCensus
-} from '@/api/home'
+  getProduceCensus,
+} from "@/api/home";
 export default {
-  name: 'customer',
+  name: "customer",
   components: {},
-  data () {
+  data() {
     return {
       analytics: {
-        clients: '', // 客户数
-        num: '', // 合同数
-        totalAmount: '' // 合同总金额
+        clients: "", // 客户数
+        num: "", // 合同数
+        totalAmount: "", // 合同总金额
       },
       analyticsTimer: null,
       // 合同预警列表
@@ -369,287 +303,266 @@ export default {
         produceNum: 0, // 在制产品总数
         completeNum: 0, // 已完成数量
         damageNum: 0, // 损坏数量
-        totalOutputValue: 0 // 生产总值
+        totalOutputValue: 0, // 生产总值
       },
       produceCensusTimer: null,
       dialogFormVisible: false,
       noticeForm: {
-        content: ''
+        content: "",
       },
-      noticeContent: ''
-    }
+      noticeContent: "",
+    };
   },
-  created () {
-    this.getAnalytics()
-    this.analyticsTimer = setInterval(this.getAnalytics, 1000 * 3600) // 1小时刷新
+  created() {
+    this.getAnalytics();
+    this.analyticsTimer = setInterval(this.getAnalytics, 1000 * 3600); // 1小时刷新
 
-    this.getContractAlarmList()
+    this.getContractAlarmList();
     this.contractAlarmListTimer = setInterval(
       this.getContractAlarmList,
       1000 * 60 * 10
-    ) // 10分钟刷新
+    ); // 10分钟刷新
 
-    this.getCustomerRankList()
-    this.damageListTimer = setInterval(
-      this.getCustomerRankList,
-      1000 * 60 * 10
-    ) // 10分钟刷新
-
-    this.getDamageList()
+    this.getDamageList();
     this.customerRankListTimer = setInterval(
       this.getDamageList,
       1000 * 60 * 10
-    ) // 10分钟刷新
+    ); // 10分钟刷新
 
-    this.getOutboundRecordList()
-    this.outboundRecordListTimer = setInterval(
-      this.getOutboundRecordList,
-      1000 * 60 * 5
-    ) // 5分钟刷新
-
-    this.getContractProdList()
+    this.getContractProdList();
     this.contractProdListTimer = setInterval(
       this.getContractProdList,
       1000 * 60 * 10
-    ) // 10分钟刷新
+    ); // 10分钟刷新
 
-    this.getSubmittedRecordList()
+    this.getSubmittedRecordList();
     this.submittedRecordListTimer = setInterval(
       this.getSubmittedRecordList,
       1000 * 60 * 5
-    ) // 5分钟刷新
+    ); // 5分钟刷新
 
-    this.getProduceCensus()
-    this.produceCensusTimer = setInterval(this.getProduceCensus, 1000 * 60 * 5) // 5分钟刷新
+    this.getProduceCensus();
+    this.produceCensusTimer = setInterval(this.getProduceCensus, 1000 * 60 * 5); // 5分钟刷新
 
-    this.getNoticeContent()
+    this.getNoticeContent();
   },
-  mounted () {
-    this.contractProdTableScroll()
-    this.customerRankTableScroll()
-    this.contractAlarmTableScroll()
-    this.outboundRecordTableScroll()
-    this.submittedRecordTableScroll()
-    this.damageTableScroll()
+  mounted() {
+    this.contractProdTableScroll();
+    this.customerRankTableScroll();
+    this.contractAlarmTableScroll();
+    // this.outboundRecordTableScroll();
+    // this.submittedRecordTableScroll();
+    this.damageTableScroll();
   },
-  beforeDestroy () {
-    clearInterval(this.analyticsTimer)
-    clearInterval(this.contractAlarmListTimer)
-    clearInterval(this.damageListTimer)
-    clearInterval(this.customerRankListTimer)
-    clearInterval(this.outboundRecordListTimer)
-    clearInterval(this.contractProdListTimer)
-    clearInterval(this.submittedRecordListTimer)
-    clearInterval(this.produceCensusTimer)
+  beforeDestroy() {
+    clearInterval(this.analyticsTimer);
+    clearInterval(this.contractAlarmListTimer);
+    clearInterval(this.damageListTimer);
+    clearInterval(this.customerRankListTimer);
+    clearInterval(this.outboundRecordListTimer);
+    clearInterval(this.contractProdListTimer);
+    clearInterval(this.submittedRecordListTimer);
+    clearInterval(this.produceCensusTimer);
   },
   methods: {
-    getNoticeContent () {
-      let content = sessionStorage.getItem('noticeContent')
-      if (content == null || content === '') {
-        content = '双击此处修改通知内容'
+    getNoticeContent() {
+      let content = sessionStorage.getItem("customer-noticeContent");
+      if (content == null || content === "") {
+        content = "双击此处修改通知内容";
       }
 
-      this.noticeContent = content
+      this.noticeContent = content;
     },
-    doubleClick () {
-      this.dialogFormVisible = true
+    doubleClick() {
+      this.dialogFormVisible = true;
     },
-    dialogSubmit () {
-      this.noticeContent = this.noticeForm.content
-      this.dialogFormVisible = false
-      sessionStorage.setItem('noticeContent', this.noticeContent)
+    dialogSubmit() {
+      this.noticeContent = this.noticeForm.content;
+      this.dialogFormVisible = false;
+      sessionStorage.setItem("customer-noticeContent", this.noticeContent);
     },
     // 合同统计
-    getAnalytics () {
+    getAnalytics() {
       getAnalytics({}).then(({ data }) => {
-        if (data && data.code === '200') {
-          this.analytics = { ...data.data }
+        if (data && data.code === "200") {
+          this.analytics = { ...data.data };
         }
-      })
+      });
     },
     // 合同预警列表
-    getContractAlarmList () {
+    getContractAlarmList() {
       let params = {
         current: 1,
-        size: 20
-      }
+        size: 20,
+      };
       getContractAlarmList(params).then(({ data }) => {
-        if (data && data.code === '200') {
-          this.contractAlarmList = data.data.records
+        if (data && data.code === "200") {
+          this.contractAlarmList = data.data.records;
         }
-      })
+      });
     },
     // 客户排名列表
-    getCustomerRankList () {
+    getCustomerRankList() {
       let params = {
         current: 1,
-        size: 20
-      }
+        size: 20,
+      };
       getCustomerRankList(params).then(({ data }) => {
-        if (data && data.code === '200') {
-          this.customerRankList = data.data
+        if (data && data.code === "200") {
+          this.customerRankList = data.data;
         }
-      })
+      });
     },
     // 报损记录列表
-    getDamageList () {
+    getDamageList() {
       let params = {
         current: 1,
-        size: 20
-      }
+        size: 20,
+      };
       getDamageList(params).then(({ data }) => {
-        if (data && data.code === '200') {
-          this.damageList = data.data.records
+        if (data && data.code === "200") {
+          this.damageList = data.data.records;
         }
-      })
+      });
     },
     // 出库记录列表
-    getOutboundRecordList () {
+    getOutboundRecordList() {
       let params = {
         current: 1,
-        size: 20
-      }
+        size: 20,
+      };
       getOutboundRecordList(params).then(({ data }) => {
-        if (data && data.code === '200') {
-          this.outboundRecordList = data.data.records
+        if (data && data.code === "200") {
+          this.outboundRecordList = data.data.records;
         }
-      })
+      });
     },
     // 合同生产记录列表
-    getContractProdList () {
+    getContractProdList() {
       let params = {
         current: 1,
-        size: 20
-      }
+        size: 20,
+      };
       getContractProdList(params).then(({ data }) => {
-        if (data && data.code === '200') {
-          this.contractProdList = data.data.records
+        if (data && data.code === "200") {
+          this.contractProdList = data.data.records;
         }
-      })
+      });
     },
     // 报工列表
-    getSubmittedRecordList () {
+    getSubmittedRecordList() {
       let params = {
         current: 1,
-        size: 20
-      }
+        size: 20,
+      };
       getSubmittedRecordList(params).then(({ data }) => {
-        if (data && data.code === '200') {
-          this.submittedRecordList = data.data.records
+        if (data && data.code === "200") {
+          this.submittedRecordList = data.data.records;
         }
-      })
+      });
     },
     // 生产统计
-    getProduceCensus () {
+    getProduceCensus() {
       getProduceCensus({}).then(({ data }) => {
-        if (data && data.code === '200') {
-          this.produceCensus = data.data
+        if (data && data.code === "200") {
+          this.produceCensus = data.data;
         }
-      })
+      });
     },
-    contractProdTableScroll () {
+    contractProdTableScroll() {
       this.$nextTick(() => {
-        const divData = this.$refs.contractProdTable.bodyWrapper
+        const divData = this.$refs.contractProdTable.bodyWrapper;
         setInterval(() => {
-          divData.scrollTop += 1
+          divData.scrollTop += 1;
           if (
             divData.clientHeight + divData.scrollTop + 1 >
             divData.scrollHeight
           ) {
-            divData.scrollTop = 0
+            divData.scrollTop = 0;
           }
-        }, 50)
-      })
+        }, 50);
+      });
     },
-    customerRankTableScroll () {
+    customerRankTableScroll() {
       this.$nextTick(() => {
-        const divData = this.$refs.customerRankTable.bodyWrapper
+        const divData = this.$refs.customerRankTable.bodyWrapper;
         setInterval(() => {
-          divData.scrollTop += 1
+          divData.scrollTop += 1;
           if (
             divData.clientHeight + divData.scrollTop + 1 >
             divData.scrollHeight
           ) {
-            divData.scrollTop = 0
+            divData.scrollTop = 0;
           }
-        }, 50)
-      })
+        }, 50);
+      });
     },
-    contractAlarmTableScroll () {
+    contractAlarmTableScroll() {
       this.$nextTick(() => {
-        const divData = this.$refs.contractAlarmTable.bodyWrapper
+        const divData = this.$refs.contractAlarmTable.bodyWrapper;
         setInterval(() => {
-          divData.scrollTop += 1
+          divData.scrollTop += 1;
           if (
             divData.clientHeight + divData.scrollTop + 1 >
             divData.scrollHeight
           ) {
-            divData.scrollTop = 0
+            divData.scrollTop = 0;
           }
-        }, 50)
-      })
+        }, 50);
+      });
     },
-    outboundRecordTableScroll () {
+    outboundRecordTableScroll() {
       this.$nextTick(() => {
-        const divData = this.$refs.outboundRecordTable.bodyWrapper
+        const divData = this.$refs.outboundRecordTable.bodyWrapper;
         setInterval(() => {
-          divData.scrollTop += 1
+          divData.scrollTop += 1;
           if (
             divData.clientHeight + divData.scrollTop + 1 >
             divData.scrollHeight
           ) {
-            divData.scrollTop = 0
+            divData.scrollTop = 0;
           }
-        }, 50)
-      })
+        }, 50);
+      });
     },
-    submittedRecordTableScroll () {
+    submittedRecordTableScroll() {
       this.$nextTick(() => {
-        const divData = this.$refs.submittedRecordTable.bodyWrapper
+        const divData = this.$refs.submittedRecordTable.bodyWrapper;
         setInterval(() => {
-          divData.scrollTop += 1
+          divData.scrollTop += 1;
           if (
             divData.clientHeight + divData.scrollTop + 1 >
             divData.scrollHeight
           ) {
-            divData.scrollTop = 0
+            divData.scrollTop = 0;
           }
-        }, 50)
-      })
+        }, 50);
+      });
     },
-    damageTableScroll () {
+    damageTableScroll() {
       this.$nextTick(() => {
-        const divData = this.$refs.damageTable.bodyWrapper
+        const divData = this.$refs.damageTable.bodyWrapper;
         setInterval(() => {
-          divData.scrollTop += 1
+          divData.scrollTop += 1;
           if (
             divData.clientHeight + divData.scrollTop + 1 >
             divData.scrollHeight
           ) {
-            divData.scrollTop = 0
+            divData.scrollTop = 0;
           }
-        }, 50)
-      })
+        }, 50);
+      });
     },
     // 全屏显示
-    fullScreen () {
-      const element = document.getElementById('content')
-      element.requestFullscreen()
-    }
-  }
-}
+    fullScreen() {
+      const element = document.getElementById("content");
+      element.requestFullscreen();
+    },
+  },
+};
 </script>
 
-<style>
-html,
-body,
-.site-wrapper,
-.site-content__wrapper,
-.site-content,
-.el-card,
-.el-card__body {
-  height: 100%;
-}
+<style scoped>
 .mod-home {
   /* line-height: 1.5; */
   height: 100%;
@@ -712,6 +625,11 @@ body,
   /* border: 1px solid black; */
 }
 
+.left-bg{
+  height: 100%;
+  background-color: #021327;
+}
+
 .box-company-title {
   background-color: #094198;
   display: flex;
@@ -835,9 +753,10 @@ body,
 
 /*合同列表*/
 .box-contract-table {
-  background-color: #415065;
+  background-color: #021327;
   display: flex;
   height: 100%;
+  padding: 10px;
 }
 
 .contract-table {
@@ -892,14 +811,27 @@ body,
 }
 
 .bg2-3-1 {
-  height: 10%;
-  padding: 5px 10px;
+  height: 15%;
+  padding: 5px 5px 5px 0px;
+  /* border: 1px solid black; */
+}
+
+.bg2-3-11 {
+  height: 15%;
+  padding: 5px 0px 5px 5px;
   /* border: 1px solid black; */
 }
 
 .bg2-3-2 {
-  height: 90%;
-  padding: 2px 10px 10px;
+  height: 85%;
+  padding: 2px 5px 0px 0px;
+  /* border: 1px solid black; */
+}
+
+
+.bg2-3-3 {
+  height: 85%;
+  padding: 2px 0px 0px 5px;
   /* border: 1px solid black; */
 }
 

+ 1 - 1
src/views/modules/warehouse/stock.vue

@@ -10,7 +10,7 @@
             <el-cascader
               v-model="dataForm.materialTypeId"
               :options="optionsCate"
-              :props="{ expandTrigger: 'hover', label:'name', value:'id', children:'whCategoryList' }"
+              :props="{ expandTrigger: 'hover' }"
               :show-all-levels="false"
               popper-class="my-cascader"
               >