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

src/components/Finance/LncomingBills.vue

@@ -65,9 +65,9 @@
                     width="150">
                         <template slot-scope="scope">
                             <el-select filterable v-model="scope.row.addingWay">
+                                <el-option label="实际报价" :value=2></el-option>
                                 <el-option label="账单模块" :value=0></el-option>
                                 <el-option label="成本预算模块" :value=1></el-option>
-                                <el-option label="实际报价" :value=2></el-option>
                             </el-select>
                         </template>
                     </el-table-column>
@@ -86,7 +86,7 @@
                         </template>
                     </el-table-column>
                     <el-table-column
-                    label="单位名称"
+                    label="单位或其他名称"
                     width="240">
                         <template slot-scope="scope">
                             <el-input v-model="scope.row.priceName"></el-input>
@@ -349,7 +349,7 @@ export default {
                 itemSumPrice:0,// 单项总和
                 rate:1,// 汇率
                 currency:836,//币种
-                addingWay:0,//添加方式
+                addingWay:2,//添加方式
                 remark:""//备注
             }
             this.tableData.push(newinif)

src/components/Finance/PaymentFiled.vue

@@ -394,7 +394,8 @@ export default {
         //获取付款申请list
         PostPayRequest_Center(beginDt,endDt,status){
             this.fullscreenLoading=true;
-
+            this.defaultarr=[]
+            this.hotelSubIdarr=[]
             var url = "/api/Financial/PostPayRequest_Center"
             var that = this
             this.$axios({
@@ -469,6 +470,7 @@ export default {
             }
             this.arrid=Array.from(new Set(this.arrid))
             this.defaultarr=this.filt(this.arrid);
+            console.log(this.defaultarr);
             var url = "/api/Financial/PostPayRequestCheckedChange"
             var that = this
             this.$axios({
@@ -495,6 +497,9 @@ export default {
                         that.$refs.abc.setCheckedKeys([]);
                         that.defaultarr=[];
                         that.everydayarr=[];
+                        that.hotelSubIdarr=[];
+                        that.arrid=[];
+                        that.hotelSubIdarrs=[];
                     }
                 }else{
                     that.$message({

src/components/statistics/paymentstatement.vue

@@ -19,12 +19,18 @@
             </div>
         </el-dialog>
         <div class="paymentstatement-haed">
-            <el-date-picker style="width:350px" v-model="value2" type="daterange" align="left"
+            <el-date-picker @change="Dailychange" style="width:350px" v-model="value2" type="daterange" align="left"
                 unlink-panels range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
                 :picker-options="pickerOptions">
             </el-date-picker>
             <el-button @click="dialogFormVisible = true" type="primary">更改筛选器</el-button>
         </div>
+        <div class="paymentstatement-tree">
+            <div class="paymentstatement-tree-title">
+                <span>日付统计列表</span>
+            </div>
+            <el-tree :data="treedata" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
+        </div>
     </div>
 </template>
 <script>
@@ -32,7 +38,7 @@ export default {
     data () {
         return {
             token:'',
-            dialogFormVisible:true,
+            dialogFormVisible:false,
             pickerOptions: {
                 shortcuts: [{
                     text: '最近一周',
@@ -62,10 +68,18 @@ export default {
             },
             value2:'',
             DailypaymentTypelist:[],
-            typeIds:[]
+            typeIds:[],
+            treedata:[],
+            defaultProps: {
+                children: 'contents',
+                label: 'priceName'
+            }
         }
     },
     methods:{
+        handleNodeClick(data) {
+            console.log(data);
+        },
         //日付类型
         DailypaymentTypeInit(){
             var url = "/api/Statistics/DailypaymentTypeInit"
@@ -145,6 +159,47 @@ export default {
                 that.$message.error("接口错误，请联系信息部！");
             });
         },
+        //处理时间
+        getdate(val){
+            var date=new Date(val);
+            var y=date.getFullYear();
+            var m=date.getMonth()+1<10?'0'+(date.getMonth()+1):date.getMonth()+1;
+            var d=date.getDate()<10?'0'+date.getDate():date.getDate();
+            return y+'-'+m+'-'+d
+        },
+        //日期切换
+        Dailychange(){
+            // console.log(this.getdate(val[0]));
+            this.DailypaymentRange(this.getdate(this.value2[0]),this.getdate(this.value2[1]),1)
+        },
+        //获取列表
+        DailypaymentRange(beginDt,endDt,type){
+            var url = "/api/Statistics/DailypaymentRange"
+            var that = this
+            this.$axios({
+                method: 'post',
+                url: url,
+                headers: {
+                    Authorization: 'Bearer ' + that.token
+                },
+                data: { 
+                    portType: 1 ,
+                    pageIndex:1,
+                    pageSize:99999,
+                    beginDt:beginDt,
+                    endDt:endDt,
+                    type:type,
+                }
+            }).then(function (res) {
+                if (res.data.code == 200) {
+                    that.treedata=res.data.data;
+                } else {
+                    that.$message.error(res.data.msg);
+                }
+            }).catch(function (error) {
+                that.$message.error("接口错误，请联系信息部！");
+            });
+        },
     },
     mounted(){
         this.DailypaymentTypeInit();
@@ -157,7 +212,6 @@ export default {
     padding: 10px;
     box-shadow: 0 0 5px #0005;
     border-radius: 10px;
-    height: 100%;
     min-height: 830px;
 }
 .paymentstatement-haed{
@@ -184,4 +238,9 @@ export default {
     margin-top: 4px;
     margin-bottom: 4px;
 }
+.paymentstatement-tree-title{
+    color: #555;
+    border-bottom: 1px solid #DCDFE6;
+    padding-bottom: 10px;
+}
 </style>