货代bug修改，鑫动力首页静态绘制 11.22

src/api/check/check.js

@@ -34,6 +34,18 @@ export const auditProcessListXD = (id,batchNo,times) => {
     }
   })
 }
+// 货代审批
+export const auditProcessListHD = (id,batchNo,times) => {
+  return request({
+    url: 'api/blade-los/auditproecess/findAuditProcessList',
+    method: 'get',
+    params: {
+      id:id,
+      batchNo:batchNo,
+      times:times
+    }
+  })
+}
 
 export const cancelCheckXD = (id) => {
   return request({

src/api/iosBasicData/bcorps.js

@@ -2,6 +2,17 @@ import request from '@/router/axios';
 
 export const getBcorpsList = (current, size, params) => {
   return request({
+    url: '/api/blade-los/bcorps/selectList',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+export const BcorpsList = (current, size, params) => {
+  return request({
     url: '/api/blade-los/bcorps/list',
     method: 'get',
     params: {

src/components/checkH/check.vue

@@ -0,0 +1,192 @@
+<template>
+  <div>
+    <avue-form class="trading-form" :option="option" ref="form" v-model="form">
+    </avue-form>
+    <div class="dialogButton">
+      <el-button size="small" :loading="buttonLoading" @click="$emit('choceCheckFun')">关闭</el-button>
+      <el-button type="warning" :loading="buttonLoading" size="small" @click="submit(2)">审批驳回</el-button>
+      <el-button type="primary" :loading="buttonLoading" size="small" @click="submit(1)">审批通过</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { approvePass,batchOperation } from "@/api/approveData/main";
+  import {offset} from "@/api/basicData/salesOrder";
+
+  export default {
+    name: "check",
+    props: {
+      checkData: {
+        type: Object
+      },
+      choceCheckFun:{
+        type: Function
+      },
+      checkDetail:{
+        type: Boolean
+      },
+      idList:{
+        type: Array
+      }
+    },
+    data() {
+      return {
+        form: {},
+        list: [],
+        currencyDic: [],
+        buttonLoading:false,
+        corpId: "",
+        option: {
+          emptyBtn: false,
+          submitBtn: false,
+          labelWidth: 120,
+          menuSpan: 8,
+          column: [
+            {
+              label: '审批人',
+              prop: 'auditName',
+              span: 12,
+              disabled:true,
+              rules: [
+                {
+                  required: false,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
+            },
+            {
+              label: '审批日期',
+              prop: 'auditOpTime',
+              type: "datetime",
+              span: 12,
+              disabled:true,
+              rules: [
+                {
+                  required: false,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
+            },
+            {
+              label: '审批意见',
+              prop: 'auditMsg',
+              span: 24,
+              rules: [
+                {
+                  required: false,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
+            }
+          ]
+        },
+      }
+    },
+    created() {
+      let date = new Date();
+      let strDate = date.getFullYear() + "-" + (date.getMonth() + 1) + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
+      this.$set(this.form,"auditOpTime",strDate)
+      this.$set(this.form,"auditName",this.$store.getters.userInfo.user_name)
+    },
+    methods: {
+      submit(operate){
+        this.$confirm("是否确认此操作!", "提示", {
+          confirmButtonText: "确认",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then(() => {
+            console.log(operate)
+          this.checkData.operate = operate
+          if(this.idList.length !== 0){
+            //批量
+            this.buttonLoading = true
+            batchOperation(this.idList.join(","),operate,this.form.auditMsg).then(res=>{
+              if(res.data.success){
+                this.$message.success("操作成功!")
+                this.$emit("operationType")
+              }
+            }).finally(()=>{
+              this.buttonLoading = false
+            })
+          }else{
+            //单个
+            this.buttonLoading = true
+            this.checkData.auditName = this.form.auditName
+            this.checkData.auditMsg = this.form.auditMsg
+            this.checkData.auditOpTime = this.form.auditOpTime
+            if (this.checkData.checkType === "YPJ-XSJH" && operate === 1){
+              offset({id: this.checkData.billId}).then(res => {
+                if (res.data.data == '操作成功') {
+                  this.checkData = this.detailData.check;
+                  this.checkDialog = true;
+                } else {
+                  this.$confirm(res.data.data, {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning"
+                  }).then(() => {
+                    approvePass(this.checkData).then(res=>{
+                      if(res.data.success){
+                        this.$message.success("操作成功!")
+                        this.$emit("choceCheckFun")
+                      }
+                      if(!this.checkDetail){
+                        //关闭付费申请页面
+                        let tag = this.$store.getters.tagList.filter(ele => ele.label === "付费申请")[0]
+                        this.$store.commit('DEL_TAG', tag)
+                        this.$store.commit("PQ_OUT_DETAIL");
+                        let tag1 = this.$store.getters.tagList.filter(ele => ele.label === "审批数据")[0]
+                        this.$store.commit('DEL_TAG', tag1)
+                        this.$router.push({
+                          path: "/approveData/index",
+                          query: {check:'refresh'},
+                        });
+                      }
+                    }).finally(()=>{
+                      this.buttonLoading = false
+                    })
+                  }).catch(()=>{
+                    this.buttonLoading = false
+                  })
+                }
+              }).catch(()=>{
+                this.buttonLoading = false
+              })
+            }else{
+              approvePass(this.checkData).then(res=>{
+                if(res.data.success){
+                  this.$message.success("操作成功!")
+                  this.$emit("choceCheckFun")
+                }
+                if(!this.checkDetail){
+                  //关闭付费申请页面
+                  let tag = this.$store.getters.tagList.filter(ele => ele.label === "付费申请")[0]
+                  this.$store.commit('DEL_TAG', tag)
+                  this.$store.commit("PQ_OUT_DETAIL");
+                  let tag1 = this.$store.getters.tagList.filter(ele => ele.label === "审批数据")[0]
+                  this.$store.commit('DEL_TAG', tag1)
+                  this.$router.push({
+                    path: "/approveData/index",
+                    query: {check:'refresh'},
+                  });
+                }
+              }).finally(()=>{
+                this.buttonLoading = false
+              })
+            }
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style  lang="scss" scoped>
+  .trading-form ::v-deep .el-form-item {
+    margin-bottom: 8px !important;
+  }
+</style>

src/components/checkH/checkSchedule.vue

@@ -0,0 +1,141 @@
+<template>
+  <div>
+    <div style="height: 90%;margin-top:30px;margin-left: 20%" v-if="data.length>0">
+      <el-steps direction="vertical"
+                :active="active"
+                space="150px"
+                align-center
+                style="font-size: 12px">
+        <el-step :key="index"
+                 v-for="(item,index) in data"
+                 :title="item.title"
+                 :status="item.status"
+                 style="font-size: 14px !important;">
+          <template slot="description" scope="scope">
+            <table width="100%" border="0" cellspacing="0" cellpadding="0" style="font-size: 14px">
+              <tr>
+                <td>
+                  <span >{{index === 0?'提交人:':'审批人:'}}&nbsp;&nbsp;&nbsp;</span><span>{{item.auditName}}</span>
+                </td>
+              </tr>
+              <tr>
+                <td>
+                  <span >{{index === 0?'提交日期:':'审批日期:'}}&nbsp;&nbsp;&nbsp;</span><span>{{item.auditOpTime}}</span>
+                </td>
+              </tr>
+              <tr>
+                <td>
+                  <span >{{index === 0?'备注':'审批意见'}}:&nbsp;&nbsp;&nbsp;</span><span>{{item.auditMsg}}</span>
+                </td>
+              </tr>
+            </table>
+          </template>
+        </el-step>
+      </el-steps>
+      <div class="dialogButton">
+        <el-button size="small" @click="$emit('choceScheduleFun')">关闭</el-button>
+      </div>
+    </div>
+    <div style="height: 90%;margin-top:30px;" v-else>
+      <div style="text-align: center">
+        <i class="el-icon-document" style="font-size: 60px;"></i>
+        <div style="margin: 10px auto">暂无记录</div>
+      </div>
+      <div class="dialogButton">
+        <el-button size="small" @click="$emit('choceScheduleFun')">关闭</el-button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import option from './config/mainList.json'
+  import { auditProcessListHD } from "@/api/check/check";
+
+  export default {
+    name: "checkSchedule",
+    props: {
+      checkId: {
+        type: String
+      },
+      batchNo:{
+        type: String
+      },
+      times:{
+        type: String
+      },
+      choceScheduleFun:{
+        type: Function
+      }
+    },
+    data(){
+      return {
+        loading:false,
+        option:option,
+        active:1,
+        data:[],
+        page: {
+          pageSize: 10,
+          pagerCount: 5,
+          total: 0,
+        },
+      }
+    },
+    watch:{
+      checkId(val, oldVal) {
+        if(val != oldVal){
+          this.init()
+        }
+      },
+      batchNo(val, oldVal) {
+        if(val != oldVal){
+          this.init()
+        }
+      }
+    },
+    created() {
+
+    },
+    mounted() {
+      this.init()
+    },
+    methods:{
+      init(){
+        this.times = this.times?this.times:''
+        auditProcessListHD(this.checkId,this.batchNo,this.times).then(res =>{
+          res.data.data.map((item,index) =>{
+            if(item.auditStatus == "A"){
+              this.active = index + 2
+              item.title = "审批通过"
+              item.status = "success"
+            }
+            if(item.auditStatus == "B"){
+              item.title = "审批驳回"
+              item.status = "error"
+            }
+            if(item.auditStatus == "S" || item.auditStatus == "N"){
+              item.title = "待审批"
+            }
+          })
+
+          let sendObject = {
+            ... res.data.data[0],
+            auditName:res.data.data[0].sendName,
+            auditOpTime:res.data.data[0].sendTime,
+            auditMsg:res.data.data[0].sendMsg,
+            auditStatus:"O",
+            title:"提交",
+          }
+          res.data.data.unshift(sendObject)
+          this.data = res.data.data
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  /*::v-deep .el-step__title{*/
+  /*  font-size: 14px;*/
+  /*}*/
+</style>

src/components/checkH/config/mainList.json

@@ -0,0 +1,62 @@
+{
+  "lazy": true,
+  "tip": false,
+  "simplePage": true,
+  "searchShow": false,
+  "addBtn":false,
+  "editBtn":false,
+  "addRowBtn":false,
+  "cellBtn":false,
+  "cancelBtn":false,
+  "refreshBtn": false,
+  "searchMenuPosition": "right",
+  "searchMenuSpan": 24,
+  "searchSpan": 8,
+  "align": "center",
+  "delBtn":true,
+  "dialogWidth": "60%",
+  "tree": true,
+  "columnBtn": false,
+  "border": true,
+  "index": false,
+  "selection": false,
+  "menu": false,
+  "menuWidth": 0,
+  "dialogClickModal": false,
+  "column": [
+    {
+      "label": "操作人",
+      "prop": "auditName",
+      "overHidden": true,
+      "width": 180,
+      "index": 2
+    },
+    {
+      "label": "操作状态",
+      "prop": "auditStatus",
+      "type": "select",
+      "dicUrl": "/api/blade-system/dict-biz/dictionary?code=auditStatus",
+      "props": {
+        "label": "dictValue",
+        "value": "dictKey"
+      },
+      "overHidden": true,
+      "hide": true,
+      "index": 2
+    },
+    {
+      "label": "操作日期",
+      "prop": "auditOpTime",
+      "overHidden": true,
+      "width": 180,
+      "index": 2
+    },
+    {
+      "label": "备注",
+      "prop": "auditMsg",
+      "overHidden": true,
+      "width": 426,
+      "index": 4
+    }
+  ]
+}

src/views/approveDataH/index.vue

@@ -95,7 +95,7 @@ import option2 from "./configuration/mainList2.json";
 import option3 from "./configuration/mainList3.json";
 import option4 from "./configuration/mainList4.json";
 import { getList, approvePass, financingExcess } from "@/api/approveDataH/main";
-import checkSchedule from "@/components/checkL/checkSchedule";
+import checkSchedule from "@/components/checkH/checkSchedule";
 import check from "./check";
 import { getUserInfo } from "@/api/system/user";
 import { gainUser } from "@/api/basicData/customerInquiry";

src/views/iosBasicData/SeafreightExportF/bills/assembly/feecenter.vue

@@ -152,7 +152,7 @@
                     <el-table-column
                         prop="corpCnName"
                         header-align="center"
-                        label="单位" width="160px">
+                        label="往来单位" width="160px">
                         <template slot-scope="{ row }">
                             <search-query v-if="row.edit"
                                           :datalist="corpCnNameData"
@@ -259,6 +259,9 @@
                         prop="isTax"
                         label="单价是否含税" width="100px"
                         header-align="center">
+                        <template slot-scope="{row}">
+                            <span>{{row.isTax?'是':'否'}}</span>
+                        </template>
                     </el-table-column>
                     <el-table-column
                         prop="price"
@@ -394,7 +397,7 @@
                     </el-table-column>
                     <el-table-column
                         prop="corpCnName"
-                        label="单位" width="160px"
+                        label="往来单位" width="160px"
                         header-align="center">
                         <template slot-scope="{ row }">
                             <search-query v-if="row.edit"
@@ -489,6 +492,24 @@
                         </template>
                     </el-table-column>
                     <el-table-column
+                        prop="taxRate"
+                        label="税率" width="100px"
+                        header-align="center">
+                    </el-table-column>
+                    <el-table-column
+                        prop="surchargeRate"
+                        label="附件税率" width="100px"
+                        header-align="center">
+                    </el-table-column>
+                    <el-table-column
+                        prop="isTax"
+                        label="单价是否含税" width="100px"
+                        header-align="center">
+                        <template slot-scope="{row}">
+                            <span>{{row.isTax?'是':'否'}}</span>
+                        </template>
+                    </el-table-column>
+                    <el-table-column
                         prop="price"
                         label="单价" width="120px"
                         header-align="center">

src/views/iosBasicData/SeafreightExportF/bills/assembly/filescenter.vue

@@ -380,7 +380,7 @@
                     message: "操作成功!"
                 });
                 // 编辑
-                this.$set(row,'edit',row.edit)
+                this.$set(row,'edit',!row.edit)
             })
         },
 

src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -17,7 +17,7 @@
                 <el-button size="small" type="success" :disabled="!form.id" v-if="form.status == 0"
                            @click.stop="DocumentApproval">单据请核
                 </el-button>
-                <el-button size="small" type="success" :disabled="!form.id" v-if="form.status == 1"
+                <el-button size="small" type="warning" :disabled="!form.id" v-if="form.status == 1"
                            @click.stop="revokeDocumentApproval">撤销单据请核
                 </el-button>
                 <el-button  size="small" type="primary" style="margin-right: 8px" v-if="detailData.seeDisabled"
@@ -26,6 +26,17 @@
                 <el-button  size="small" type="primary" style="margin-right: 8px" v-else
                             :loading="saveLoading" @click="editCustomer">保 存
                 </el-button>
+                <el-dropdown style="line-height: 0">
+                    <el-button type="warning" :loading="saveLoading" :disabled="!form.id" size="small">
+                        审 批<i class="el-icon-arrow-down el-icon--right"></i>
+                    </el-button>
+                    <el-dropdown-menu slot="dropdown">
+                        <!--<el-dropdown-item @click.native="examineBtn('审批')" :disabled="isExamineBtn && !detailData.check">审批-->
+                        <!--</el-dropdown-item>-->
+                        <el-dropdown-item @click.native="checkScheduleDialog = true, checkId = form.id">审核进度
+                        </el-dropdown-item>
+                    </el-dropdown-menu>
+                </el-dropdown>
             </div>
         </div>
 
@@ -219,7 +230,11 @@
             </el-tabs>
         </div>
 
-
+        <!--审核弹窗-->
+        <el-dialog append-to-body title="审批进度" class="el-dialogDeep" :visible.sync="checkScheduleDialog" width="40%"
+                   :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
+            <check-schedule :checkId="checkId" :batchNo="batchNo" @choceScheduleFun="choceScheduleFun"></check-schedule>
+        </el-dialog>
     </div>
 </template>
 
@@ -253,8 +268,10 @@ import {
     deptGetDetailPol
 } from '@/api/iosBasicData/bills'
 import {dateFormat} from "@/util/date";
+import checkSchedule from "@/components/checkH/checkSchedule.vue";
     export default {
         components:{
+            checkSchedule,
             SearchQuery,
             EntrustmentLnformation,
             formbottom,
@@ -276,6 +293,9 @@ import {dateFormat} from "@/util/date";
         },
         data() {
             return {
+                checkScheduleDialog:false, // 审核弹窗
+                checkId:'', // 审核需要的id
+                batchNo:'',
                 // 分单列表数据
                 billsListAllData:[],
                 pageLoading:false,
@@ -317,7 +337,7 @@ import {dateFormat} from "@/util/date";
                             },
                             rules: [{
                                 required: true,
-                                message: "请输入客户名称",
+                                message: " ",
                                 trigger: "blur"
                             }]
                         },
@@ -355,7 +375,7 @@ import {dateFormat} from "@/util/date";
                                 span:7,
                                 rules: [{
                                     required: true,
-                                    message: "请输入客户联系人邮箱",
+                                    message: " ",
                                     trigger: "blur"
                                 }]
                             },
@@ -479,7 +499,7 @@ import {dateFormat} from "@/util/date";
                                 disabled:false,
                                 rules: [{
                                     required: true,
-                                    message: "请输入单据日期",
+                                    message: " ",
                                     trigger: "blur"
                                 }]
                             },
@@ -498,7 +518,7 @@ import {dateFormat} from "@/util/date";
                                 },
                                 rules: [{
                                     required: true,
-                                    message: "请选择OP",
+                                    message: " ",
                                     trigger: "blur"
                                 }]
                             },
@@ -514,7 +534,7 @@ import {dateFormat} from "@/util/date";
                                 },
                                 rules: [{
                                     required: true,
-                                    message: "请选择核算部门",
+                                    message: " ",
                                     trigger: "blur"
                                 }]
                             },
@@ -714,6 +734,10 @@ import {dateFormat} from "@/util/date";
             this.getLazylistfun() // 获取审核数据
         },
         methods:{
+            //请核关闭
+            choceScheduleFun() {
+                this.checkScheduleDialog = false
+            },
             // 收货地 装货港 当前登录人的默认
             deptGetDetailPolfun(){
                 deptGetDetailPol(this.saberUserInfo.dept_id).then(res=>{
@@ -1160,9 +1184,13 @@ import {dateFormat} from "@/util/date";
                     if (item.curCode == 'CNY') {
                         this.$set(item,'rmbAmount',item.amount)
                         this.$set(item,'usdAmount','')
+                        this.$set(item,'rmbAmountNet',item.amountNet)
+                        this.$set(item,'usdAmountNet','')
                     }else {
                         this.$set(item,'usdAmount',item.amount)
                         this.$set(item,'rmbAmount','')
+                        this.$set(item,'usdAmountNet',item.amountNet)
+                        this.$set(item,'rmbAmountNet','')
                     }
                     item.edit = false
                 }

src/views/iosBasicData/bcorps/index.vue

@@ -187,7 +187,7 @@
 <script>
 import { getToken } from "@/util/auth";
 import detailPage from "./detailsPage";
-import { getBcorpsList, getBcorpsDetail, addBcorps, updateBcorps, removeBcorps, downLoadBcorpsTemplate } from "@/api/iosBasicData/bcorps";
+import { BcorpsList, getBcorpsDetail, addBcorps, updateBcorps, removeBcorps, downLoadBcorpsTemplate } from "@/api/iosBasicData/bcorps";
 import { mapGetters } from "vuex";
 import { bcorpstypedefineList } from "@/api/iosBasicData/bcorpstypedefine"
 import bcorpstypedefine from "@/views/iosBasicData/bcorps/bcorpstypedefine.vue"
@@ -1288,7 +1288,7 @@ export default {
     },
     onLoad(page, params = {}) {
       this.loading = true;
-      getBcorpsList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+      BcorpsList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         const data = res.data.data;
         this.page.total = data.total;
         this.data = data.records;

src/views/iosBasicData/finstlbills/assembly/finstlbillsitems.vue

@@ -58,7 +58,7 @@
                     </avue-text-ellipsis>
                 </template>
             </el-table-column>
-            <el-table-column label="本地结算金额">
+            <el-table-column label="本币结算金额">
                 <!--amount-->
                 <el-table-column
                     prop="amountRMB"
@@ -70,6 +70,51 @@
                 </el-table-column>
             </el-table-column>
             <el-table-column
+                label="本次结算币种"
+                prop="currentStlCurCode" width="100">
+                <template slot-scope="{row}">
+                    <search-query :datalist="curCodeData"
+                                  :selectValue="row.currentStlCurCode"
+                                  :filterable="true"
+                                  :clearable="true"
+                                  :remote="true"
+                                  :buttonIf="false"
+                                  :forParameter="{key:'id',label:'code',value:'code'}"
+                                  @remoteMethod="getRateListfun"
+                                  @corpChange="corpChange($event,row)"
+                                  @corpFocus="getRateListfun">
+                    </search-query>
+                </template>
+            </el-table-column>
+            <el-table-column label="本次结算金额">
+                <!--默认应结算 可以修改-->
+                <!--currentStlAmount-->
+                <el-table-column
+                    prop="currentStlAmountRMB"
+                    label="RMB" width="60">
+                    <template slot-scope="scope">
+                        <!--<el-input style="width: 100%;" v-model="scope.row.currentStlAmountRMB" v-if="brfalse"-->
+                        <!--          size="mini" autocomplete="off"-->
+                        <!--          clearable placeholder="请输入USD" >-->
+                        <!--</el-input>-->
+                        <!--<span v-else>{{scope.row.currentStlAmountRMB}}</span>-->
+                        <span>{{scope.row.currentStlAmountRMB}}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column
+                    prop="currentStlAmountUSD"
+                    label="USD" width="60">
+                    <template slot-scope="scope">
+                        <!--<el-input style="width: 100%;" v-model="scope.row.currentStlAmountUSD" v-if="brfalse"-->
+                        <!--          size="mini" autocomplete="off"-->
+                        <!--          clearable placeholder="请输入USD" >-->
+                        <!--</el-input>-->
+                        <!--<span v-else>{{scope.row.currentStlAmountUSD}}</span>-->
+                        <span>{{scope.row.currentStlAmountUSD}}</span>
+                    </template>
+                </el-table-column>
+            </el-table-column>
+            <el-table-column
                 prop="currentStlExrate"
                 label="汇率">
             </el-table-column>
@@ -245,51 +290,6 @@
                 </template>
             </el-table-column>
             <el-table-column
-                label="本次结算币种"
-                prop="currentStlCurCode" width="100">
-                <template slot-scope="{row}">
-                    <search-query :datalist="curCodeData"
-                                  :selectValue="row.currentStlCurCode"
-                                  :filterable="true"
-                                  :clearable="true"
-                                  :remote="true"
-                                  :buttonIf="false"
-                                  :forParameter="{key:'id',label:'code',value:'code'}"
-                                  @remoteMethod="getRateListfun"
-                                  @corpChange="corpChange($event,row)"
-                                  @corpFocus="getRateListfun">
-                    </search-query>
-                </template>
-            </el-table-column>
-            <el-table-column label="本次结算金额">
-                <!--默认应结算 可以修改-->
-                <!--currentStlAmount-->
-                <el-table-column
-                    prop="currentStlAmountRMB"
-                    label="RMB" width="60">
-                    <template slot-scope="scope">
-                        <!--<el-input style="width: 100%;" v-model="scope.row.currentStlAmountRMB" v-if="brfalse"-->
-                        <!--          size="mini" autocomplete="off"-->
-                        <!--          clearable placeholder="请输入USD" >-->
-                        <!--</el-input>-->
-                        <!--<span v-else>{{scope.row.currentStlAmountRMB}}</span>-->
-                        <span>{{scope.row.currentStlAmountRMB}}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column
-                    prop="currentStlAmountUSD"
-                    label="USD" width="60">
-                    <template slot-scope="scope">
-                        <!--<el-input style="width: 100%;" v-model="scope.row.currentStlAmountUSD" v-if="brfalse"-->
-                        <!--          size="mini" autocomplete="off"-->
-                        <!--          clearable placeholder="请输入USD" >-->
-                        <!--</el-input>-->
-                        <!--<span v-else>{{scope.row.currentStlAmountUSD}}</span>-->
-                        <span>{{scope.row.currentStlAmountUSD}}</span>
-                    </template>
-                </el-table-column>
-            </el-table-column>
-            <el-table-column
                 prop="remarkss"
                 label="备注" width="100px">
                 <template slot-scope="scope">

src/views/iosBasicData/finstlbills/finstlbillsDetails.vue

@@ -124,12 +124,15 @@
                                 </el-form-item>
                             </el-col>
                             <el-col :span="5">
-                                <el-form-item label="账期备注" prop="corpAccRemarks">
-                                    <el-input style="width: 100%;" v-model="form.corpAccRemarks"
-                                              size="small" autocomplete="off"
-                                              :disabled="editSave"
-                                              clearable placeholder="请输入账期备注" >
-                                    </el-input>
+                                <el-form-item label="业务类型" prop="businessTypes" >
+                                    <search-query :datalist="businessTypesData"
+                                                  :selectValue="form.businessTypes"
+                                                  :clearable="true"
+                                                  :disabled="editSave"
+                                                  :buttonIf="false"
+                                                  :multiple="true"
+                                                  @corpChange="corpChange($event,'businessTypes')">
+                                    </search-query>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="4">
@@ -307,14 +310,12 @@
                                     </el-form-item>
                                 </el-col>
                                 <el-col :span="5">
-                                    <el-form-item label="业务类型" prop="businessTypes" >
-                                        <search-query :datalist="businessTypesData"
-                                                      :selectValue="form.businessTypes"
-                                                      :clearable="true"
-                                                      :disabled="editSave"
-                                                      :buttonIf="false"
-                                                      @corpChange="corpChange($event,'businessTypes')">
-                                        </search-query>
+                                    <el-form-item label="账期备注" prop="corpAccRemarks">
+                                        <el-input style="width: 100%;" v-model="form.corpAccRemarks"
+                                                  size="small" autocomplete="off"
+                                                  :disabled="editSave"
+                                                  clearable placeholder="请输入账期备注" >
+                                        </el-input>
                                     </el-form-item>
                                 </el-col>
                                 <el-col :span="4">
@@ -761,6 +762,7 @@
                 this.form.billNoFormat = 'HYDZ'
                 this.form.businessTypeCode = 'HYDZ'
                 this.form.businessType = 'CHK' // 对账单
+                this.form.businessTypes = this.form.businessTypes.join(',') // 业务类型
 
                 this.form.finStlBillsItemsList = this.handleSelectionData.map((item,index)=>{
                     item.lineNo = index
@@ -797,6 +799,7 @@
                 this.pageLoading = true
                 finstlbillsDetail(id).then(res=>{
                     this.form = res.data.data
+                    this.form.businessTypes = this.form.businessTypes.split(',') // 业务类型转换成数组显示
                     this.tableData = this.form.finStlBillsItemsList.map(item=>{
                         if(item.curCode == 'CNY') {
                             this.$set(item,'amountRMB',item.amount)
@@ -855,7 +858,7 @@
                 obj.hblno = this.form.hblno // HB/L NO
                 obj.isChecked = this.form.isChecked // 是否对账（0 未对账 1 已对账）
                 obj.queryAmount = this.form.queryAmount // 查询金额
-                obj.businessType = this.form.businessTypes // 业务类型
+                obj.businessType = this.form.businessTypes.join(',') // 业务类型
                 obj.invoiceStatus = this.form.isInvoice // 发票状态 0 = 未开 9=已开 2 待开 3 不开
                 obj.vesselCnName = this.form.vesselCnName // 中文船名
                 obj.invoiceNo = this.form.invoiceNo // 发票号

src/views/iosBasicData/losbfeestemplate/feesTemplateItems.vue

@@ -43,7 +43,7 @@
         </div>
 
         <div class="customer-main margintop">
-            <containerTitle title="费用详细"></containerTitle>
+            <containerTitle title="费用详情"></containerTitle>
             <basic-container>
                 <div style="margin-bottom: 10px">
                     <el-button type="primary"
@@ -123,7 +123,7 @@
 
         <!--费用详细添加弹窗-->
         <el-dialog
-            title="费用详细"
+            title="费用详情"
             :visible.sync="feestemplateVisible"
             width="60%"
             append-to-body
@@ -570,6 +570,7 @@ export default {
 
         // 费用详细添加
         feestemplatepingCompanyAdd(){
+            this.feestemplateForm = {}
             this.feestemplateVisible = true
         },
         // 费用详细编辑
@@ -584,6 +585,7 @@ export default {
         },
         // 费用详细确认
         feestemplatecompanyConfirm(){
+            console.log(this.feestemplateIndex,588)
             if (this.feestemplateIndex != null) {
                 this.form.feesTemplateItemsList.splice(this.feestemplateIndex,1,this.feestemplateForm)
             }else {

src/views/tirePartsMall/salesManagement/outboundWorkOrderL/index.vue

@@ -362,6 +362,11 @@ export default {
 
   },
   activated() {
+      console.log(this.$route.query,400);
+      // 主页快捷跳转来的 直接打开新建订单
+      if (this.$route.query.showTrue) {
+          this.detailsOpen = true;
+      }
     if (this.$route.query.id) {
       this.detailData = {
         id: this.$route.query.id

src/views/tirePartsMall/salesManagement/purchaseOrder/index.vue

@@ -419,9 +419,13 @@ export default {
     }
   },
   activated() {
-    console.log(213213213213);
     setTimeout(() => {
-      console.log(this.$route.query.check);
+      console.log(this.$route.query,400);
+        // 主页快捷跳转来的 直接打开新建订单
+        if (this.$route.query.showTrue) {
+            this.$store.commit("IN_LTCG_STATUS");
+            this.detailsOpen = true;
+        }
       if (this.$route.query.check) {
         this.editOpen({ id: this.$route.query.check.srcBillId }, 1)
         this.$store.commit("IN_LTCG_STATUS");

src/views/tirePartsMall/salesManagement/saleOrder/index.vue

@@ -7,8 +7,14 @@
         @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 269)"
         @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 269)" :page.sync="page">
         <template slot-scope="{ row }" slot="status">
-          <span  v-for=" item in orderStatusList" :style="{ color: item.colour }" v-if="item.dictKey == row.status">{{ item.dictValue }}</span>
+          <span  v-for="item in orderStatusList"
+                 :style="{background: item.colour}"
+                 class="bottomBox"
+                 v-if="item.dictKey == row.status">
+              {{ item.dictValue }}
+          </span>
         </template>
+          <!--actualPaymentStatus-->
         <template slot-scope="{ row }" slot="expand">
           <avue-crud :data="row.itemData" :option="itemOption" :table-loading="row.itemLoading" :cell-style="cellStyle"
             class="itemTable"></avue-crud>
@@ -391,7 +397,12 @@ export default {
   },
   activated() {
     setTimeout(() => {
-      console.log(this.$route.query.check);
+        console.log(this.$route.query,400)
+        // 主页快捷跳转来的 直接打开新建订单
+        if (this.$route.query.showTrue) {
+            this.$store.commit("IN_LTXS_STATUS");
+            this.detailsOpen = true;
+        }
       if (this.$route.query.check) {
         this.editOpen({ id: this.$route.query.check.srcBillId }, 1)
         this.$store.commit("IN_LTXS_STATUS");
@@ -578,4 +589,10 @@ export default {
   margin-left: 50px;
   width: 100%;
 }
+.bottomBox {
+    padding: 3px 6px;
+    border-radius: 12px;
+    color: #fff;
+    font-size: 10px;
+}
 </style>

src/views/wel/components/card.vue

@@ -1,13 +1,13 @@
 <template>
   <div style="width: 100%;">
     <div class="card">
-      <div class="card-head">
+      <div :class="classType?'card-head-border':'card-head'">
         <span> <i :class="iconName" class="index-icon"></i>{{ title }}</span>
       </div>
-      <div class="card-select">
+      <div :class="classType?'card-select-border':'card-select'">
         <slot name="select"></slot>
       </div>
-      <div class="card-content">
+      <div :class="classType?'card-content-border':'card-content'">
         <slot name="content"></slot>
       </div>
     </div>
@@ -25,6 +25,11 @@ export default {
     },
     iconName: {
       type: String
+    },
+      // 是否带边框
+    classType: {
+      type: Boolean,
+      default:false
     }
   },
   methods: {}
@@ -42,6 +47,12 @@ export default {
     display: flex;
     align-items: center;
   }
+    .card-head-border {
+        height: 28px;
+        font-size: 12px;
+        display: flex;
+        align-items: center;
+    }
   .card-select {
     padding: 10px;
     display: flex;
@@ -56,6 +67,16 @@ export default {
     padding: 10px;
     height: 100%;
   }
+
+    .card-select-border {
+        padding: 10px;
+        display: flex;
+        justify-content: right;
+    }
+    .card-content-border {
+        padding: 10px;
+        height: 100%;
+    }
 }
 .index-icon {
   margin: 0 10px;

src/views/wel/home/xindongPower/xindongPower.vue

@@ -0,0 +1,553 @@
+<template>
+    <!--青岛鑫动力-->
+    <div class="xindongpowerBox">
+        <div class="statisticsFlex">
+            <div class="statisticsBox">
+                <div class="statisticsTop">
+                    <div class="statisticsTop_ioc">
+                        <img class="imgbox" src="@/assets/img/home/homeStatistics4.png">
+                    </div>
+                    <div class="statisticsTop_text">
+                        <div>本日成交额</div>
+                        <div class="statisticsTop_amount">¥{{typeFalse?'****':6780}}元</div>
+                    </div>
+                </div>
+                <div style="color: #53b2da" class="statisticsBottom">
+                    <span>当月销售额：¥{{typeFalse?'****':455,567.00}}元</span>
+                </div>
+                <div class="position" @click="typeFalse = !typeFalse">
+                    <i style="font-size: 16px" :class="typeFalse?'el-icon-partly-cloudy':'el-icon-cloudy-and-sunny'"></i>
+                </div>
+            </div>
+            <div class="statisticsBox">
+                <div class="statisticsTop">
+                    <div class="statisticsTop_ioc">
+                        <img class="imgbox" src="@/assets/img/home/homeStatistics3.png">
+                    </div>
+                    <div class="statisticsTop_text">
+                        <div>本日轮胎销售量</div>
+                        <div class="statisticsTop_amount">{{typeFalse?'****':6780}}条</div>
+                    </div>
+                </div>
+                <div style="color: #69d1a0" class="statisticsBottom">
+                    <span>当月轮胎销售：{{typeFalse?'****':6780}}条</span>
+                </div>
+                <div class="position" @click="typeFalse = !typeFalse">
+                    <i style="font-size: 16px" :class="typeFalse?'el-icon-partly-cloudy':'el-icon-cloudy-and-sunny'"></i>
+                </div>
+            </div>
+            <div class="statisticsBox">
+                <div class="statisticsTop">
+                    <div class="statisticsTop_ioc">
+                        <img class="imgbox" src="@/assets/img/home/homeStatistics1.png">
+                    </div>
+                    <div class="statisticsTop_text">
+                        <div>当日线上收款金额</div>
+                        <div class="statisticsTop_amount">¥{{typeFalse?'****':6780}}元</div>
+                    </div>
+                </div>
+                <div style="color: #c865d7" class="statisticsBottom">
+                    <span>当月销售额：¥{{typeFalse?'****':6780}}元</span>
+                </div>
+                <div class="position" @click="typeFalse = !typeFalse">
+                    <i style="font-size: 16px" :class="typeFalse?'el-icon-partly-cloudy':'el-icon-cloudy-and-sunny'"></i>
+                </div>
+            </div>
+            <div class="statisticsBox">
+                <div class="statisticsTop">
+                    <div class="statisticsTop_ioc">
+                        <img class="imgbox" src="@/assets/img/home/homeStatistics5.png">
+                    </div>
+                    <div class="statisticsTop_text">
+                        <div>当日利润</div>
+                        <div class="statisticsTop_amount">¥{{typeFalse?'****':6780}}元</div>
+                    </div>
+                </div>
+                <div style="color: #f09d68" class="statisticsBottom">
+                    <span>当月销售额：¥{{typeFalse?'****':6780}}元</span>
+                </div>
+                <div class="position" @click="typeFalse = !typeFalse">
+                    <i style="font-size: 16px" :class="typeFalse?'el-icon-partly-cloudy':'el-icon-cloudy-and-sunny'"></i>
+                </div>
+            </div>
+
+        </div>
+
+        <div class="quickJumpBox">
+            <div class="content">
+                <div class="content-icon" @click="inPage('xs')" v-if="menuAll.includes('1649222564150513666')">
+                    <i class="tradingIcon icon-sales" style="color:#57927a"></i>
+                    <span style="font-size: 12px">销售订单</span>
+                </div>
+                <div class="content-icon" @click="inPage('ck')" v-if="menuAll.includes('1649222726755291138')">
+                    <i class="tradingIcon icon-sales" style="color:#57927a"></i>
+                    <span style="font-size: 12px">出库任务</span>
+                </div>
+                <div class="content-icon" @click="inPage('ckgd')" v-if="menuAll.includes('1649222873652400129')">
+                    <i class="tradingIcon icon-receipt" style="color:#57927a"></i>
+                    <span style="font-size: 12px">出库工单</span>
+                </div>
+                <div class="content-icon" @click="inPage('kccx')" v-if="menuAll.includes('1726789203724873729')">
+                    <i class="tradingIcon icon-ship" style="color:#f09d68"></i>
+                    <span style="font-size: 12px">库存查询</span>
+                </div>
+                <div class="content-icon" @click="inPage('cgdd')" v-if="menuAll.includes('1649221237009813506')">
+                    <i class="tradingIcon icon-sales" style="color:#5266bc"></i>
+                    <span style="font-size: 12px">采购订单</span>
+                </div>
+                <div class="content-icon" @click="inPage('rkrw')" v-if="menuAll.includes('1649221831804063745')">
+                    <i class="tradingIcon icon-ship" style="color:#5266bc"></i>
+                    <span style="font-size: 12px">入库任务</span>
+                </div>
+                <div class="content-icon" @click="inPage('rk')" v-if="menuAll.includes('1649221486306660353')">
+                    <i class="tradingIcon icon-ship" style="color:#5266bc"></i>
+                    <span style="font-size: 12px">采购入库</span>
+                </div>
+                <div class="content-icon" @click="inPage('db')" v-if="menuAll.includes('1726789203724873729')">
+                    <i class="tradingIcon icon-ship" style="color:#5266bc"></i>
+                    <span style="font-size: 12px">调拨</span>
+                </div>
+            </div>
+        </div>
+
+        <div class="tableEchatsBox">
+            <div class="tableBox">
+                <div class="card-head">
+                    <span> <i class="el-icon-s-fold index-icon"></i>代办订单</span>
+                </div>
+                <div style="padding: 10px">
+                    <div style="display:flex;">
+                        <el-date-picker
+                            v-model="search.businesDateList"
+                            type="daterange"
+                            range-separator="-"
+                            size="mini"
+                            style="margin-right: 5px"
+                            :default-time="['00:00:00', '23:59:59']"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            @change="query(0)"
+                            start-placeholder="开始日期"
+                            end-placeholder="结束日期">
+                        </el-date-picker>
+                        <el-button size="mini" @click="query(1)">当日</el-button>
+                        <el-button size="mini" @click="query(2)">当月</el-button>
+                    </div >
+                    <el-table
+                        :data="tableData"
+                        size="mini"
+                        height="300"
+                        style="width: 100%">
+                        <el-table-column
+                            prop="ordNo"
+                            align="center"
+                            show-overflow-tooltip
+                            label="订单号">
+                            <template slot-scope="{row}">
+                                <span style="color: #1e9fff">{{row.ordNo}}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column
+                            prop="customerName"
+                            align="center"
+                            show-overflow-tooltip
+                            label="客户名称">
+                        </el-table-column>
+                        <el-table-column
+                            prop="businesDate"
+                            align="center"
+                            show-overflow-tooltip
+                            label="订单日期">
+                        </el-table-column>
+                        <el-table-column
+                            prop="status"
+                            align="center"
+                            show-overflow-tooltip
+                            label="订单状态">
+                            <template slot-scope="{row}">
+                                <span v-for="item in dingdanzhuangtai"
+                                      :style="{background: item.colour}"
+                                      class="bottomBox"
+                                      v-if="item.dictKey == row.status">
+                                    {{item.dictValue}}
+                                </span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column
+                            prop="actualPaymentStatus"
+                            align="center"
+                            show-overflow-tooltip
+                            label="支付状态">
+                            <template slot-scope="{row}">
+                                <span v-for="item in orderStatusList"
+                                      :style="{background: item.colour}"
+                                      class="bottomBox"
+                                      v-if="item.dictKey == row.actualPaymentStatus">
+                                    {{item.dictValue}}
+                                </span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column
+                            prop="salerName"
+                            align="center"
+                            show-overflow-tooltip
+                            label="业务员">
+                        </el-table-column>
+                    </el-table>
+                </div>
+            </div>
+            <div class="echattsBox">
+                <index-card
+                    :classType="true"
+                    title="经营趋势"
+                    iconName="el-icon-s-fold"
+                    style="height:400px;margin-bottom: 30px"
+                >
+                    <div slot="select">
+                        <el-date-picker
+                            v-model="annual3"
+                            type="year"
+                            size="mini"
+                            placeholder="选择年"
+                            value-format="yyyy"
+                            style="margin-right:10px;margin-bottom: -20px"
+                            @change="commoDity2Datafun"
+                        >
+                        </el-date-picker>
+                    </div>
+                    <div slot="content" style="height:350px" id="commoDity2"></div>
+                </index-card>
+            </div>
+
+        </div>
+    </div>
+</template>
+
+<script>
+    import indexCard from "@/views/wel/components/card.vue";
+    import xinsalesTrend from "@/views/wel/components/xinsales-trend.vue";
+    import { xinsalaryDataChain, xinsalesList} from "@/api/wel";
+    import {dateFormat, getYearDate} from "@/util/date";
+
+    export default {
+        components: {indexCard,xinsalesTrend},
+        props:{
+            sysType:Number
+        },
+        data() {
+            return {
+                menuAll:[], //所有路由菜单id
+                annual3:'', // echatts 时间筛选
+                amountList2:[], // 金额
+                numberList2:[], // 数量
+                search:{}, // 表格 筛选
+                tableData:[], // 表格数据
+                dingdanzhuangtai:[], // 订单状态
+                orderStatusList:[], // 支付状态
+                // 展开是否查看
+                typeFalse:false,
+            }
+        },
+        created() {
+            this.annual3 = getYearDate().toString(); // 获取当前时间
+            // 支付状态
+            this.getWorkDicts("settlement_Status").then(res => {
+                this.orderStatusList = res.data.data
+            });
+            // 订单状态
+            this.getWorkDicts("sales_Status").then(res => {
+                this.dingdanzhuangtai = res.data.data
+            });
+            this.query(1)
+            //从缓存中获取所有路由信息
+            setTimeout(data=>{
+                let menu = JSON.parse(localStorage.getItem("saber-menuAll")).content
+                for (let item of menu){
+                    this.menuAll.push(item.id)
+                    if (item.children.length > 0){
+                        this.getMenuId(item.children)
+                    }
+                }
+            },600)
+        },
+        mounted() {
+            this.commoDity2Datafun()
+        },
+        methods:{
+            // 表格数据获取
+            query(type){
+                const date = new Date();
+                if (type == 1){
+                    this.$set(this.search,"businesDateList",[`${dateFormat(new Date(),"yyyy-MM-dd")} 00:00:00`,`${dateFormat(new Date(),"yyyy-MM-dd")} 23:59:59`])
+                }
+                if (type == 2){
+                    this.$set(this.search,"businesDateList",[
+                        `${dateFormat(new Date(date.getFullYear(), date.getMonth(), 1),"yyyy-MM-dd")} 00:00:00`,
+                        `${dateFormat(new Date(date.getFullYear(), date.getMonth() + 1, 0),"yyyy-MM-dd")} 23:59:59`
+                    ])
+                }
+                xinsalesList({...this.search}).then(res=>{
+                    this.tableData = res.data.data.records
+                })
+            },
+            // 获取echarts 表的数据
+            commoDity2Datafun() {
+                xinsalaryDataChain({
+                    year:Number(this.annual3)
+                }).then(res=>{
+                    this.amountList2 = res.data.data.amount
+                    this.numberList2 = res.data.data.number
+                    this.commoDity2()
+                })
+            },
+            //获取所有路由信息id
+            getMenuId(array){
+                for (let item of array){
+                    this.menuAll.push(item.id)
+                }
+            },
+            // 快捷跳转
+            inPage(type){
+                switch(type){
+                    case 'xs':
+                        this.$router.push('/tirePartsMall/salesManagement/saleOrder/index?showTrue=' + true);
+                        break;
+                    case 'ck':
+                        this.$router.push('/tirePartsMall/salesManagement/outboundTask/index');
+                        break;
+                    case 'ckgd':
+                        this.$router.push('/tirePartsMall/salesManagement/outboundWorkOrder/index');
+                        break;
+                    case 'cgdd':
+                        this.$router.push('/tirePartsMall/salesManagement/purchaseOrder/index?showTrue=' + true);
+                        break;
+                    case 'rkrw':
+                        this.$router.push('/tirePartsMall/salesManagement/inboundTask/index');
+                        break;
+                    case 'rk':
+                        this.$router.push('/tirePartsMall/purchasingManagement/warehouseEntryOrder/index');
+                        break;
+                    case 'kccx':
+                        this.$router.push('/tirePartsMall/inventory/index');
+                        break;
+                    case 'db':
+                        this.$router.push('/tirePartsMall/salesManagement/outboundWorkOrderL/index?showTrue=' + true);
+                        break;
+                }
+            },
+            // echatts 配置
+            commoDity2() {
+                // 基于准备好的dom，初始化echarts实例，所以只能在mounted中调用
+                let myChart = this.$echarts.init(document.getElementById("commoDity2"));
+                // 绘制图表
+                myChart.setOption({
+                    tooltip: {
+                        trigger: 'axis',
+                        axisPointer: {
+                            type: 'cross',
+                            label:{
+                                precision:'0', // 设备y轴指示线保留整数 文本标签中数值的小数点精度。默认根据当前轴的值自动判断。也可以指定如 2 表示保留两位小数。
+                            },
+                            crossStyle: {
+                                color: '#999'
+                            }
+                        }
+                    },
+                    toolbox: {
+                    },
+                    legend: {
+                        data: ['数量', '金额']
+                    },
+                    xAxis: [
+                        {
+                            type: 'category',
+                            data: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月','十二月'],
+                            axisPointer: {
+                                type: 'shadow'
+                            }
+                        }
+                    ],
+                    grid: {
+                        left: "10%",
+                        right: "10%",
+                        bottom: "3%",
+                        containLabel: true
+                    },
+                    yAxis: [
+                        {
+                            type: 'value',
+                            name: '数量(条)',
+                            min: 0,
+                            axisLine:{
+                                show:true,
+                                lineStyle: {
+                                    color: "#5266bc",//y轴线的颜色（若只设置了y轴线的颜色，未设置y轴文字的颜色，则y轴文字会默认跟设置的y轴线颜色一致）
+                                },
+                            },
+                            axisLabel: {
+                                formatter: '{value}'
+                            }
+                        },
+                        {
+                            type: 'value',
+                            name: '金额(元)',
+                            min: 0,
+                            axisLine:{
+                                show:true,
+                                lineStyle: {
+                                    color: "#98c46d",//y轴线的颜色（若只设置了y轴线的颜色，未设置y轴文字的颜色，则y轴文字会默认跟设置的y轴线颜色一致）
+                                },
+                            },
+                            axisLabel: {
+                                formatter: '{value}',
+                                // textStyle: {
+                                //     color: "#000",//Y轴内容文字颜色
+                                // },
+                            }
+                        }
+                    ],
+                    series: [
+                        {
+                            name: '数量',
+                            type: 'bar',
+                            yAxisIndex: 0,
+                            tooltip: {
+                                valueFormatter: function (value) {
+                                    return value + ' 条';
+                                }
+                            },
+                            data: this.numberList2
+                        },
+                        {
+                            name: '金额',
+                            type: 'bar',
+                            yAxisIndex: 1,
+                            tooltip: {
+                                valueFormatter: function (value) {
+                                    return value + ' 元';
+                                }
+                            },
+                            data: this.amountList2
+                        },
+                    ]
+                });
+            },
+        }
+    }
+</script>
+
+<style lang="scss" scoped>
+    .xindongpowerBox {
+        padding: 15px;
+        box-sizing: border-box;
+    }
+    .statisticsFlex {
+        display: flex;
+        align-items: center;
+        .statisticsBox {
+            flex: 1;
+            background: #fff;
+            border-radius: 10px;
+            padding: 10px 30px;
+            box-sizing: border-box;
+            margin-right: 20px;
+            position: relative;
+            &:last-child {
+                margin-right: 0;
+            }
+            .position {
+                width: 20px;
+                height: 20px;
+                position: absolute;
+                top: 10px;
+                right: 20px;
+            }
+            .statisticsTop {
+                display: flex;
+                align-items: center;
+                .statisticsTop_ioc {
+                    //background: red;
+                    width: 60px;
+                    height: 60px;
+                    margin-right: 20px;
+                }
+                .statisticsTop_text {
+                    font-size: 12px;
+                    font-weight: 300;
+                    .statisticsTop_amount {
+                        font-weight: 500;
+                        font-size: 24px;
+                    }
+                }
+            }
+            .statisticsBottom {
+                color: #1e9fff;
+                margin-top: 20px;
+                font-size: 12px;
+                text-align: center;
+            }
+        }
+    }
+    .quickJumpBox {
+        margin-top: 10px;
+        background: #fff;
+        border-radius: 10px;
+        padding: 20px;
+        box-sizing: border-box;
+        .content {
+            display: flex;
+            &-icon {
+                display: flex;
+                flex-direction: column;
+                align-items: center;
+                margin: 1.5vh 1vw 0vh 1vw;
+                span {
+                    margin-top: 0.2vh;
+                }
+            }
+        }
+    }
+    .tableEchatsBox {
+        margin-top: 10px;
+        display: flex;
+        .tableBox {
+            flex: 2;
+            background: #fff;
+            border-radius: 10px;
+            box-sizing: border-box;
+            margin-right: 20px;
+            padding-bottom: 20px;
+        }
+        .echattsBox {
+            flex: 3;
+            background: #fff;
+            border-radius: 10px;
+            padding-bottom: 20px;
+            box-sizing: border-box;
+        }
+    }
+
+
+    .tradingIcon {
+        font-size: 36px;
+    }
+    .imgbox {
+        width: 100%;
+        height: 100%;
+    }
+    .card-head {
+        margin-top: 5px;
+        height: 28px;
+        font-size: 12px;
+        display: flex;
+        align-items: center;
+    }
+    .index-icon {
+        margin: 0 10px;
+    }
+    .bottomBox {
+        padding: 3px 6px;
+        border-radius: 12px;
+        color: #fff;
+        font-size: 10px;
+    }
+</style>

src/views/wel/index.vue

@@ -1,6 +1,6 @@
 <template>
   <dev v-if="saberTenantId != 409341">
-    <div v-if="billType && saberTenantId != 212186 && saberTenantId != 504978">
+    <div v-if="billType && saberTenantId != 212186 && saberTenantId != 504978 && saberTenantId != 883868">
       <tongjiSchool v-if="billType == 1"></tongjiSchool>
       <landTransportation v-else-if="billType == 7"></landTransportation>
       <jiatongPage v-else-if="billType == 8"></jiatongPage>
@@ -43,6 +43,11 @@
               </div>
           </el-card>
       </div>
+
+      <!--青岛鑫动力新的首页-->
+      <div v-else-if="saberTenantId == 883868">
+          <xindongPower :sysType="billType"></xindongPower>
+      </div>
   </dev>
 </template>
 
@@ -57,6 +62,7 @@ import equipmentControl from "@/views/wel/home/equipmentControl/landTransportati
 import { getUserInfo } from "@/api/system/user";
 import { setStore } from "@/util/store";
 import { areaTypeTree } from "@/api/basicData/customerInformation";
+import xindongPower from "@/views/wel/home/xindongPower/xindongPower.vue";
 export default {
   name: "wel",
   data() {
@@ -87,7 +93,8 @@ export default {
     jiatongPage,
     noctite,
     equipmentControl,
-    landTransportation
+    landTransportation,
+      xindongPower
   },
   methods: {
       inPage(url){