Merge branch 'master' of http://132.232.92.186:3000/XinXiBu/oa-system

src/components/expenseMobile.vue

@@ -1,14 +1,35 @@
 <template>
     <div class="expenseMobile-all">
+        <el-dialog width="95%" title="详情" :visible.sync="expenseMobileVisible">
+            <div class="dialog-title">详情</div>
+            <div class="dialog-info">
+                <div class="dialog-info-ms">费用描述：{{dailydata.instructions}}</div>
+                <div class="dialog-info-zj">费用总计：{{dailydata.sumPrice}}</div>
+                <div class="dialog-info-sh">
+                    <div>财务审核：{{dailydata.fAuditDesc}}</div>
+                    <div>总经理审核：{{dailydata.mAuditDesc}}</div>
+                    <div>是否付款：{{ dailydata.isPay==1?'已付款':'未付款' }}</div>
+                </div>
+            </div>
+            <div class="dialog-title">具体费用</div>
+            <div class="dialog-list">
+                <div v-for="(items,index) in dailydata.feeContents" :key="index" class="dialog-list-li">
+                    <div>费用项目:{{items.priceName}}</div>
+                    <div class="info-sl">
+                        <div>数量:{{items.quantity}}</div>
+                        <div>单价(CNY):{{townum(items.price)}}</div>
+                        <div>小计(CNY):{{townum(items.itemTotal)}}</div>
+                    </div>
+                    <div>备注:{{items.remark}}</div>
+                </div>
+            </div>
+        </el-dialog>
         <div class="expenseMobile-top">
             <div class="expenseMobile-title">日常付款申请</div>
             <div class="expenseMobile-search">
-                <el-input style="width:85%;" placeholder="请输入内容" v-model="input3" class="input-with-select">
-                    <el-button slot="append" icon="el-icon-search"></el-button>
+                <el-input clearable placeholder="请输入费用描述" v-model="input" class="input-with-select">
+                    <el-button @click="searchbtn" slot="append" icon="el-icon-search"></el-button>
                 </el-input>
-                <div style="width:15%;text-align: right;">
-                    <i style="font-size:35px;" class="el-icon-s-operation"></i>
-                </div>
             </div>
         </div>
         <div class="daily-box">
@@ -20,7 +41,7 @@
                     <span>申请人：{{item.createUser}}</span>
                 </div>
                 <div class="card-btn">
-                    <el-button size="mini">详情</el-button>
+                    <el-button @click="infobtn(item)" size="mini">详情</el-button>
                     <el-button size="mini" type="primary">通过</el-button>
                     <el-button size="mini" type="danger">拒绝</el-button>
                 </div>
@@ -45,18 +66,24 @@ export default {
     data () {
         return {
             tableData:[],
-            input3:'',
+            input:'',
+            expenseMobileVisible:false,
+            dailydata:{},
         }
     },
     methods:{
         //保留两位小数
         townum(val){
-            return val.toFixed(2)
+            if(val.toFixed(2)){
+                return val.toFixed(2)
+            }else{
+                return val
+            }
         },
         rpxTopx(){ 
             document.getElement.style.fontSize=document.getElement.clientWidth/7.5+'px'
         },
-        //获取两位小数
+        //获取列表
         postPageDailyPaymentList() {
             var url = "/api/Financial/PostPageSearchDailyPaymentList"
             var that = this
@@ -75,7 +102,7 @@ export default {
                     managerAuditStatus: -1,  //总经理审核
                     feeTypeId: -1,           //费用类型
                     feeSubTypeId: -1,       //费用子类型
-                    feeDesc: '',    //描述
+                    feeDesc: that.input,    //描述
                     createUserId: -1, //申请人
                     isPaySign:-1 //是否支付
                 }
@@ -85,6 +112,36 @@ export default {
                 }
             })
         },
+        //详情按钮
+        infobtn(val){
+            this.expenseMobileVisible=true;
+            this.dailydata={};
+            this.getPostSearchDailyPaymentInfo(val.id);
+        },
+        //获取详情
+        getPostSearchDailyPaymentInfo(val){
+            var url = "/api/Financial/PostSearchDailyPaymentInfo"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + that.token
+                },
+                data: {
+                    PortType: 1,
+                    id:val
+                }
+            }).then(function (res) {
+                if (res.data.code == 200) {
+                    that.dailydata=res.data.data;
+                }
+            })
+        },
+        //搜索
+        searchbtn(){
+            this.postPageDailyPaymentList()
+        }
     },
     mounted(){
         // this.rpxTopx()
@@ -101,6 +158,12 @@ export default {
     background-color: #fff;
     color: #555;
 }
+.expenseMobile-all .el-dialog__header{
+    display: none;
+}
+.expenseMobile-all .el-dialog__body{
+    padding: 10px;
+}
 .daily-box{
     padding: 8px;
     padding-top: 93px;
@@ -141,9 +204,6 @@ export default {
     margin-bottom:0px;
 }
 .expenseMobile-search{
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
     padding: 8px;
 }
 .expenseMobile-tabtn{
@@ -164,4 +224,39 @@ export default {
 .tabtn-box div div{
     width: 100%;
 }
+.expenseMobile-all .dialog-title{
+    font-weight: 600;
+    margin-bottom: 10px;
+}
+.expenseMobile-all .dialog-info{
+    margin-bottom: 10px;
+}
+.dialog-info-zj{
+    margin: 5px 0;
+}
+.dialog-info-sh{
+    display: flex;
+    flex-wrap: wrap;
+    justify-content:space-between;
+}
+.dialog-info-sh div{
+    margin-bottom: 5px;
+}
+.info-sl{
+    margin: 5px 0;
+    display: flex;
+    justify-content: space-between;
+    flex-wrap:wrap ;
+}
+.dialog-list-li{
+    padding: 5px 0;
+    border-top: 1px dotted #afadad;
+}
+.dialog-list-li:last-child{
+    border-bottom: 1px dotted #afadad;
+}
+.expenseMobile-all .dialog-list{
+    max-height: 160px;
+    overflow: auto;
+}
 </style>