Browse Source

0521cb1137lhjyrf

liuhj 1 year ago
parent
commit
83d4c2cee8

+ 6 - 1
src/components/Finance/Cost.vue

@@ -27,7 +27,8 @@
                         <el-button size="small" type="primary" @click="GetClientWord">导出客户报表</el-button>
                         <el-button size="small" type="primary" @click="GetGroupCostExcel">导出成本</el-button>
                         <!-- <el-button type="primary">一键复制</el-button> -->
-                        <el-button size="small" type="primary" @click="GroupIsShare">成本通知</el-button>
+                        <el-button v-if="isShare==1" size="small" type="info" @click="GroupIsShare">取消成本通知</el-button>
+                        <el-button v-if="isShare==0" size="small" type="primary" @click="GroupIsShare">成本通知</el-button>
                         <el-button size="small" type="primary" @click="save">保存设置</el-button>
                     </div>
                 </div>
@@ -2644,6 +2645,7 @@ export default {
             autoSave: null,
             acconarr:[],
             acconarrs:[],
+            isShare:0,
         };
     },
     watch: {
@@ -3156,6 +3158,8 @@ export default {
                         var acostvalue = resp.data.data.groupCostParameter.filter(x => x.costType == 'A')[0];
                         if (acostvalue != undefined) {
                             that.AGroupCostParameter = acostvalue;
+                            that.isShare=that.AGroupCostParameter.isShare;//是否通知
+                            console.log(that.AGroupCostParameter)
                             var result = Number(that.AGroupCostParameter.currency);
                             if (isNaN(result)) {
 
@@ -4537,6 +4541,7 @@ export default {
             }).then(resp => {
                 ////console.log(resp.data.data, '------------------------------------');
                 if (resp.data.code == 200) {
+                    this.isShare=resp.data.data.isShare;
                     this.$message({
                         message: '操作成功!' + resp.data.msg,
                         type: 'success'

+ 1 - 1
src/components/Finance/PaymentFiled.vue

@@ -657,7 +657,7 @@ export default {
         padding-right: 8px;
     }
     .paymentfiled-form .el-tree-node__content{
-        height:40px;
+        height:70px;
     }
     .paymentfiled-form .el-input__inner{
         height:30px;

+ 31 - 1
src/components/OP/AirTicketRes.vue

@@ -47,6 +47,18 @@
                 <div v-if="budgeting.length<=1">
                     <div class="costbudgeting-li" v-for="(item,index) in budgeting" :key="index">
                         <span v-for="(items,index) in item.data" :key="index">{{items.airType}}:{{townum(items.airDRCB)}}元/人&nbsp;&nbsp;&nbsp;{{items.airNum}}人&nbsp;&nbsp;&nbsp;共:{{townum(items.airZCB)}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+                        <el-popover
+                        placement="right"
+                        width="452"
+                        trigger="hover">
+                        <el-table border :data="gridData">
+                            <el-table-column width="150" property="date" label="DATE"></el-table-column>
+                            <!-- <el-table-column width="100" property="name" label="姓名"></el-table-column> -->
+                            <el-table-column width="300" property="address" label="ITIN"></el-table-column>
+                        </el-table>
+                        <!-- <el-button slot="reference">click 激活</el-button> -->
+                        <span slot="reference" style="cursor: pointer;">"移上查看详细"</span>
+                        </el-popover>
                     </div>
                 </div>
                 <div v-if="budgeting.length==0">
@@ -124,7 +136,24 @@ export default {
             AirTicketResSelectData: [],
             delegationInfo: {},
             fynone:true,
-            budgeting:[]
+            budgeting:[],
+            gridData: [{
+            date: '2016-05-02',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1518 弄'
+            }, {
+            date: '2016-05-04',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1518 弄'
+            }, {
+            date: '2016-05-01',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1518 弄'
+            }, {
+            date: '2016-05-03',
+            name: '王小虎',
+            address: '上海市普陀区金沙江路 1518 弄'
+            }]
         }
     },
     methods: {
@@ -428,5 +457,6 @@ export default {
 }
 .costbudgeting-li{
     margin: 5px 0;
+    
 }
 </style>