Merge remote-tracking branch 'origin/dev' into dev

src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -1770,7 +1770,6 @@ export default {
     //返回列表
     backToList() {
       let orderFeesList = this.$refs.feeInfo.submitData();
-      console.log(orderFeesList, this.oldorderFeesList);
       if (
         contrastObj(this.form, this.oldform) ||
         contrastList(this.data, this.olddata) ||

src/views/exportTrade/customerInquiry/index.vue

@@ -241,7 +241,6 @@ export default {
     gainUser().then(res => {
       this.findObject(this.option.column, "createUser").dicData = res.data.data;
     });
-    console.log(this.$router.data);
   },
   filters: {
     IntegerFormat(num) {

src/views/exportTrade/invoice/index.vue

@@ -171,9 +171,11 @@ export default {
   },
   activated() {
     //当页面已打开并无法重新渲染时，用activated重新激活keepalive组件
-    this.show = true;
+    if (!this.$store.getters.outStatus && !this.show) {
+      this.show = true;
+    }
     setTimeout(() => {
-      if (this.$route.query.pageType == "Generate") {
+      if (this.$route.query.pageType == "Generate" && this.show) {
         this.newAdd();
       }
     }, 100);

src/views/exportTrade/receipt/index.vue

@@ -160,9 +160,11 @@ export default {
   },
   activated() {
     //当页面已打开并无法重新渲染时，用activated重新激活keepalive组件
-    this.show = true;
+    if (!this.$store.getters.outtaskStatus && !this.show) {
+      this.show = true;
+    }
     setTimeout(() => {
-      if (this.$route.query.pageType == "Generate") {
+      if (this.$route.query.pageType == "Generate" && this.show) {
         this.newAdd();
       }
     }, 100);

src/views/wel/components/audit-data.vue

@@ -14,33 +14,12 @@
         </span>
       </div>
       <div class="content" v-loading="loading">
-        <div class="content-item">
+        <div class="content-item" v-for="(item, index) in list" :key="index">
           <div class="card">
-            <i class="el-icon-s-order" style="font-size:30px;color:#409EFF"></i>
+            <i :class="item.icon" style="font-size:30px;color:#409EFF"></i>
             <div class="card-content">
-              <span class="card-content-num">1</span>
-              <span class="card-content-text">销售订单/待审核</span>
-            </div>
-          </div>
-        </div>
-        <div class="content-item">
-          <div class="card">
-            <i class="el-icon-s-goods" style="font-size:30px;color:#409EFF"></i>
-            <div class="card-content">
-              <span class="card-content-num">0</span>
-              <span class="card-content-text">采购订单/待审核</span>
-            </div>
-          </div>
-        </div>
-        <div class="content-item">
-          <div class="card">
-            <i
-              class="el-icon-s-finance"
-              style="font-size:30px;color:#409EFF"
-            ></i>
-            <div class="card-content">
-              <span class="card-content-num">0</span>
-              <span class="card-content-text">申请付款/待审核</span>
+              <span class="card-content-num">{{ item.qty }}</span>
+              <span class="card-content-text">{{ item.text }}</span>
             </div>
           </div>
         </div>
@@ -54,7 +33,14 @@ export default {
   name: "basicContainer",
   data() {
     return {
-      loading: false
+      loading: false,
+      list: [
+        { icon: "el-icon-s-order", qty: "1", text: "销售订单/待审核" },
+        { icon: "el-icon-s-goods", qty: "1", text: "采购订单/待审核" },
+        { icon: "el-icon-s-home", qty: "1", text: "发货/待审核" },
+        { icon: "el-icon-s-home", qty: "1", text: "收货/待审核" },
+        { icon: "el-icon-s-finance", qty: "1", text: "申请付款/待审核" }
+      ]
     };
   },
   methods: {
@@ -74,7 +60,7 @@ export default {
   box-sizing: border-box;
   height: 100%;
   ::v-deep .el-card__body {
-    padding: 5px 10px;
+    padding: 10px 15px;
     font-size: 14px;
   }
   &__card {
@@ -90,10 +76,10 @@ export default {
   display: flex;
   &-item {
     background-color: #f4f8ff;
-    margin-top: 1vh;
+    margin-top: 0.5vh;
+    margin-right: 0.5vw;
     height: 13vh;
     width: 15vw;
-    margin-right: 1vw;
     display: flex;
     align-items: center;
     padding-left: 1.5vw;

src/views/wel/components/charge-today.vue

@@ -13,8 +13,28 @@
           ></i>
         </span>
       </div>
-      <div class="content" v-loading="loading">
-
+      <div v-loading="loading">
+        <div class="content">
+          <div class="content_item divider">
+            <div>
+              <div class="content_item_num">10</div>
+              <div class="content_item_text">已收金额</div>
+            </div>
+          </div>
+          <div class="content_item divider">
+            <div>
+              <div class="content_item_num">100,000</div>
+              <div class="content_item_text">待收金额</div>
+            </div>
+          </div>
+          <div class="content_item">
+            <div>
+              <div class="content_item_num">1</div>
+              <div class="content_item_text">未结单据</div>
+            </div>
+          </div>
+        </div>
+        <div id="chargeData" ref="chargeData" style="width:45vw;height:30vh" />
       </div>
     </el-card>
   </div>
@@ -28,12 +48,36 @@ export default {
       loading: false
     };
   },
+  mounted() {
+    this.chargeData();
+  },
   methods: {
     refresh() {
       this.loading = true;
       setTimeout(() => {
         this.loading = false;
       }, 1000);
+    },
+    chargeData() {
+      let chargeData = this.$echarts.init(
+        document.getElementById("chargeData")
+      );
+      chargeData.setOption({
+        xAxis: {
+          type: "category",
+          data: []
+        },
+        yAxis: {
+          type: "value"
+        },
+        series: [
+          {
+            data: [0.1, 0.4, 0.6, 0.7, 0.8, 0.9, 1],
+            type: "line",
+            smooth: true
+          }
+        ]
+      });
     }
   }
 };
@@ -41,11 +85,11 @@ export default {
 
 <style lang="scss" scoped>
 .home-container {
-  padding:0px 5px 5px 5px;
+  padding: 0px 5px 5px 5px;
   box-sizing: border-box;
   height: 100%;
   ::v-deep .el-card__body {
-    padding: 5px 10px;
+    padding: 10px 15px;
     font-size: 14px;
   }
   &__card {
@@ -55,9 +99,29 @@ export default {
   .title {
     display: flex;
     justify-content: space-between;
+        margin-bottom: 5px;
   }
 }
 .content {
   display: flex;
+  background-color: #fafafa;
+  justify-content: space-around;
+  .divider {
+    border-right: 1px dashed #dcdfe6;
+  }
+  &_item {
+    margin: 20px 0px 20px 20px;
+    height: 5vh;
+    width: 33.3%;
+    display: flex;
+    align-items: center;
+    &_num {
+      font-size: 18px;
+      font-weight: 600;
+    }
+    &_text {
+      color: #909399;
+    }
+  }
 }
 </style>

src/views/wel/components/pay-today.vue

@@ -13,7 +13,29 @@
           ></i>
         </span>
       </div>
-      <div class="content" v-loading="loading"></div>
+      <div v-loading="loading">
+        <div class="content">
+          <div class="content_item divider">
+            <div>
+              <div class="content_item_num">10</div>
+              <div class="content_item_text">已付金额</div>
+            </div>
+          </div>
+          <div class="content_item divider">
+            <div>
+              <div class="content_item_num">100,000</div>
+              <div class="content_item_text">待付金额</div>
+            </div>
+          </div>
+          <div class="content_item">
+            <div>
+              <div class="content_item_num">1</div>
+              <div class="content_item_text">未结单据</div>
+            </div>
+          </div>
+        </div>
+        <div id="payData" ref="payData" style="width:45vw;height:30vh" />
+      </div>
     </el-card>
   </div>
 </template>
@@ -26,12 +48,34 @@ export default {
       loading: false
     };
   },
+  mounted() {
+    this.payData();
+  },
   methods: {
     refresh() {
       this.loading = true;
       setTimeout(() => {
         this.loading = false;
       }, 1000);
+    },
+    payData() {
+      let payData = this.$echarts.init(document.getElementById("payData"));
+      payData.setOption({
+        xAxis: {
+          type: "category",
+          data: []
+        },
+        yAxis: {
+          type: "value"
+        },
+        series: [
+          {
+            data: [0.1, 0.3, 0.4, 0.5, 0.6, 0.7, 1],
+            type: "line",
+            smooth: true
+          }
+        ]
+      });
     }
   }
 };
@@ -43,7 +87,7 @@ export default {
   box-sizing: border-box;
   height: 100%;
   ::v-deep .el-card__body {
-    padding: 5px 10px;
+    padding: 10px 15px;
     font-size: 14px;
   }
   &__card {
@@ -53,9 +97,29 @@ export default {
   .title {
     display: flex;
     justify-content: space-between;
+    margin-bottom: 5px;
   }
 }
 .content {
   display: flex;
+  background-color: #fafafa;
+  justify-content: space-around;
+  .divider {
+    border-right: 1px dashed #dcdfe6;
+  }
+  &_item {
+    margin: 20px 0px 20px 20px;
+    height: 5vh;
+    width: 33.3%;
+    display: flex;
+    align-items: center;
+    &_num {
+      font-size: 18px;
+      font-weight: 600;
+    }
+    &_text {
+      color: #909399;
+    }
+  }
 }
 </style>

src/views/wel/components/quick-launch.vue

@@ -7,31 +7,31 @@
         </span>
       </div>
       <div class="content">
-        <div class="content-icon">
+        <div class="content-icon" @click="inPage('xs')">
           <i class="tradingIcon icon-sales" style="color:#409EFF"></i>
           <span>销售</span>
         </div>
-        <div class="content-icon">
+        <div class="content-icon" @click="inPage('cg')">
           <i class="tradingIcon icon-purchase" style="color:#75CD28"></i>
           <span>采购</span>
         </div>
-        <div class="content-icon">
+        <div class="content-icon" @click="inPage('fh')">
           <i class="tradingIcon icon-ship" style="color:#143056"></i>
           <span>发货</span>
         </div>
-        <div class="content-icon">
+        <div class="content-icon" @click="inPage('sh')">
           <i class="tradingIcon icon-receipt" style="color:#921939"></i>
           <span>收货</span>
         </div>
-        <div class="content-icon">
+        <div class="content-icon" @click="inPage('sqfk')">
           <i class="tradingIcon icon-apply" style="color:#BE3216"></i>
           <span>申请付款</span>
         </div>
-        <div class="content-icon">
+        <div class="content-icon" @click="inPage('sf')">
           <i class="tradingIcon icon-charge" style="color:#4D6016"></i>
           <span>收费</span>
         </div>
-        <div class="content-icon">
+        <div class="content-icon" @click="inPage('ff')">
           <i class="tradingIcon icon-pay" style="color:#7E8270"></i>
           <span>付费</span>
         </div>
@@ -42,7 +42,47 @@
 
 <script>
 export default {
-  name: "basicContainer"
+  name: "basicContainer",
+  data() {
+    return {};
+  },
+  props: {
+    sysType: Number
+  },
+  methods: {
+    inPage(type) {
+      //出口
+      if (this.sysType == 4) {
+        switch (type) {
+          case "xs":
+            this.$router.push("/exportTrade/salesContract/index");
+            break;
+          case "cg":
+            this.$router.push("/exportTrade/purchaseContract/index");
+            break;
+          case "fh":
+            this.$router.push("/exportTrade/invoice/index");
+            break;
+          case "sh":
+            this.$router.push("/exportTrade/receipt/index");
+            break;
+          case "sqfk":
+            this.$router.push("/financialManagement/paymentRequest/index");
+            break;
+          case "sf":
+            this.$router.push(
+              "/financialManagement/receiptSettle/receiptSettle"
+            );
+            break;
+          case "ff":
+            this.$router.push(
+              "/financialManagement/paymentSettle/paymentSettle"
+            );
+            break;
+        }
+      }
+    }
+  }
 };
 </script>
 
@@ -52,7 +92,7 @@ export default {
   box-sizing: border-box;
   height: 100%;
   ::v-deep .el-card__body {
-    padding: 5px 10px;
+    padding: 10px 15px;
     font-size: 14px;
   }
   &__card {
@@ -73,9 +113,9 @@ export default {
     display: flex;
     flex-direction: column;
     align-items: center;
-    margin:1.5vh 1vw 0vh 1vw;
-    span{
-      margin-top:1vh;
+    margin: 1.5vh 1vw 0vh 1vw;
+    span {
+      margin-top: 1vh;
     }
   }
 }

src/views/wel/components/realtime-data.vue

@@ -3,7 +3,7 @@
     <el-card class="home-container__card">
       <div class="title">
         <span>
-          审核数据
+          实时数据
         </span>
         <span class="right">
           <div class="right_but">
@@ -128,11 +128,11 @@ export default {
 
 <style lang="scss" scoped>
 .home-container {
-  padding: 5px;
+  padding: 0px 5px 5px 5px;
   box-sizing: border-box;
   height: 100%;
   ::v-deep .el-card__body {
-    padding: 5px 10px;
+    padding: 10px 15px;
     font-size: 14px;
   }
   &__card {

src/views/wel/components/sales-reached.vue

@@ -15,7 +15,7 @@
       </div>
       <div class="content" v-loading="loading">
         <div style="display:flex">
-          <div id="myChart" ref="myChart" style="width:20vw;height:33vh"></div>
+          <div id="ringData" ref="ringData" style="width:20vw;height:33vh" />
           <div>
             <div class="content_item">
               <div class="content_item_num">100,000</div>
@@ -58,8 +58,8 @@ export default {
       }, 1000);
     },
     ringData() {
-      let myChart = this.$echarts.init(document.getElementById("myChart"));
-      myChart.setOption({
+      let ringData = this.$echarts.init(document.getElementById("ringData"));
+      ringData.setOption({
         tooltip: {
           trigger: "item"
         },
@@ -123,7 +123,7 @@ export default {
   box-sizing: border-box;
   height: 100%;
   ::v-deep .el-card__body {
-    padding: 5px 10px;
+    padding: 10px 15px;
     font-size: 14px;
   }
   &__card {

src/views/wel/components/sales-trend.vue

@@ -14,7 +14,11 @@
         </span>
       </div>
       <div class="content" v-loading="loading">
-
+        <div
+          id="polylineData"
+          ref="polylineData"
+          style="width:60vw;height:33vh"
+        />
       </div>
     </el-card>
   </div>
@@ -28,12 +32,44 @@ export default {
       loading: false
     };
   },
+  mounted() {
+    this.polylineData();
+  },
   methods: {
     refresh() {
       this.loading = true;
       setTimeout(() => {
         this.loading = false;
       }, 1000);
+    },
+    polylineData() {
+      let polylineData = this.$echarts.init(
+        document.getElementById("polylineData")
+      );
+      polylineData.setOption({
+        xAxis: {
+          type: "category",
+          data: [
+            "2022-01-01",
+            "2022-01-01",
+            "2022-01-05",
+            "2022-01-09",
+            "2022-01-13",
+            "2022-01-17",
+            "2022-01-21"
+          ]
+        },
+        yAxis: {
+          type: "value"
+        },
+        series: [
+          {
+            data: [1, 4, 6, 7, 8, 10, 20],
+            type: "line",
+            smooth: true
+          }
+        ]
+      });
     }
   }
 };
@@ -41,11 +77,11 @@ export default {
 
 <style lang="scss" scoped>
 .home-container {
-  padding:0px 5px 5px 0px;
+  padding: 0px 5px 5px 0px;
   box-sizing: border-box;
   height: 100%;
   ::v-deep .el-card__body {
-    padding: 5px 10px;
+    padding: 10px 15px;
     font-size: 14px;
   }
   &__card {

src/views/wel/home/defaultPage.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="container">
-    <quick-launch class="item1" />
+    <quick-launch class="item1" :sysType="sysType" />
     <audit-data class="item2" />
     <realtime-data class="item3" />
     <sales-reached class="item4" />
@@ -23,6 +23,9 @@ export default {
   data() {
     return {};
   },
+  props:{
+    sysType:Number
+  },
   created() {},
   components: {
     quickLaunch,

src/views/wel/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <tongjiSchool v-if="billType == 1"></tongjiSchool>
-    <defaultPage v-else></defaultPage>
+    <defaultPage v-else :sysType='billType'></defaultPage>
   </div>
 </template>