Browse Source

费用支出问题

@dongkboy 2 năm trước cách đây
mục cha
commit
1a846cdf51

+ 2 - 2
config/dev.env.js

@@ -9,9 +9,9 @@ module.exports = merge(prodEnv, {
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL: '"http://192.168.0.115:8080/"' //凯森
-  // BASE_URL: '"http:///192.168.0.106:8080/"',//屈晨
+  BASE_URL: '"http:///192.168.0.106:8080/"',//屈晨
   // BASE_URL: '"http:///192.168.0.253:8080/"',//田智
-  BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
+  // BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
   // BASE_URL: '"http://192.168.1.101:8080/"',
   // BASE_URL: '"http:///192.168.0.22:8080/"',//郝宇
   // BASE_URL: '"http:///192.168.0.103:8080/"',//

+ 2 - 2
src/views/AgreementManage/CarInsurance/AgreementEntry.vue

@@ -427,8 +427,8 @@
       </el-form>
       <kt-common-table :tableHeights="700" :SerialShow="false" :operationWidth="250" :showOperation="true"
         :showBatchDelete="false" :showBatchSettled="false" :showBatchPrint="false" :data="productPageResult"
-        :columns="productColumns" @findPage="productCostFindPage" 
-        button2Name="编辑"  permsButton2="agreement:input:productCost" @handleButton2="productUpdate" 
+        :columns="productColumns" @findPage="productCostFindPage"
+        button2Name="编辑"  permsButton2="agreement:input:productCost" @handleButton2="productUpdate"
          button3Name="删除"  permsButton3="agreement:input:productCost"  @handleButton3="productDelete"
          button5Name="轨迹"    @handleButton5="trajectory"
         button3Icon="">

+ 2 - 3
src/views/FinancialManagement/ExpenseManagement/ViewExpenseReport.vue

@@ -253,7 +253,7 @@ export default {
     },
     //表格多选事件
     selectionChange(e) {
-      this.expentList = e.selections.map((item) => item.excelAccountOperateId);
+      this.expentList = e.selections.map((item) => item.accountOperateId);
     },
     //获取归属数据
     getAffiliationData() {
@@ -272,8 +272,7 @@ export default {
     },
     //导出公共方法
     expendDataup(e, idList) {
-      idList = idList || this.expentList;
-      this.$api.expense.deriveReport(idList).then((response) => {
+      this.$api.expense.deriveReport(this.expentList).then((response) => {
         if (response.code == 200) {
           if (response.data == null) {
             this.$message.error("暂无导出数据,请重试!");

+ 17 - 6
src/views/HeadBar/HeadBar.vue

@@ -35,13 +35,13 @@
     </div>
 
     <!-- 工具栏 -->
-    <span class="toolbar" v-popover:popover-personal>
+    <span class="toolbar" :class="{'active':toolbarActive}" v-popover:popover-personal>
       <el-popover
         placement="bottom"
-        ref="popover-personal"
-        trigger="click">
+        ref="reference"
+        trigger="click" @show="show" @hide="hide">
         <personal-panel :user="userData"></personal-panel>
-        <img  slot="reference" :src="userData.headSculpture?userData.headSculpture:avatar" />        
+        <img  slot="reference" :src="userData.headSculpture?userData.headSculpture:avatar" />
       </el-popover>
       <div class="personalStyle">
         <span >{{ userData.roleName }} - {{ userData.name }}</span>
@@ -96,6 +96,7 @@ export default {
   },
   data() {
     return {
+      toolbarActive:false,
       sum: null,
       datawidth: 1920,
       screenWidth: document.body.clientWidth,
@@ -217,6 +218,13 @@ export default {
     // }
   },
   methods: {
+    show(e){
+      this.toolbarActive=true;
+    },
+    hide(){
+      this.toolbarActive=false;
+
+    },
     openWindow(url) {
       window.open(url)
     },
@@ -302,9 +310,8 @@ export default {
   float: right;
   display: flex;
   align-items: center;
-  background: rgba(180, 180, 180, 0.12);
+
   border-radius: 24px 24px 24px 24px;
-  border: 1px solid rgba(180, 180, 180, 0.12);
   margin: 7px;
   img {
     width: 40px;
@@ -314,7 +321,11 @@ export default {
     float: right;
   }
 }
+.active {
+  background: rgba(180, 180, 180, 0.12);
+  border: 1px solid rgba(180, 180, 180, 0.12);
 
+}
 .el-menu-item {
   // padding: 0 15px!important;
   padding: 0 14px !important;