Merge branch 'master' of gitee.com:longyears/contract-business-web

# Conflicts:
#	src/views/statisticalReport/govProcure.vue

src/views/budget/fundApply.vue

@@ -56,6 +56,7 @@ export default {
         page: 1,
         page_size: 10,
         keyword: "",
+        is_auth: 1
       },
       total: 0,
       list: [],

src/views/contract/components/govPlane.vue

@@ -118,7 +118,8 @@ export default {
       select: {
         page: 1,
         page_size: 10,
-        keyword: ''
+        keyword: '',
+        is_auth: 1
       },
 
 

src/views/contract/paymentRegistrationList.vue

@@ -435,9 +435,9 @@ export default {
       })
     },
     tableSelect (selections) {
-      console.log(selections)
       this.selections = selections;
       this.list = [...this.list]
+      this.$nextTick(() => this.$refs['xyTable'].doLayout())
     },
 
     toExport() {

src/views/finance/components/addPropertyPlan.vue

@@ -19,7 +19,7 @@
           </div>
           <div class="xy-table-item-content">
             <el-cascader
-              :options="[{children:lists,project_name:'根项目',id:0}]"
+              :options="[{children:lists,project_name:'总包项目',id:0}]"
               :props="{ checkStrictly: true, label: 'project_name', value: 'id' }"
               :value="form.pid"
               clearable

src/views/statisticalReport/govProcure.vue

@@ -131,6 +131,7 @@ export default {
         page_size: 10,
         keyword: "",
         year:""
+        is_auth: 1
       },
       total: 0,
       list: [],