Merge branch 'dev' of http://git.echepei.com/caojunjie/Smart_platform_ui into dev

src/views/financialManagement/payment.vue

@@ -0,0 +1,38 @@
+<template>
+  <div>
+    <basic-container>
+      <el-form :model="form" ref="form" label-width="130px">
+        <el-row>
+          <el-col v-for="(item, index) in basicData.column" :span="item.span?item.span:6" :key="index">
+            <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
+              <el-date-picker v-if="item.type === 'datetime'" style="width: 100%;" v-model="form[item.prop]" size="small" type="datetime" placeholder="选择日期" value-format="yyyy-MM-dd HH:mm:ss"/>
+              <el-select v-else-if="item.type === 'select'" style="width: 100%" size="small" placeholder="请选择" clearable filterable></el-select>
+              <el-input type="age" v-else v-model="form[item.prop]" size="small" autocomplete="off" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col>
+            <el-form-item>
+              <el-button type="info" style="float: right" @click="">生成账单</el-button>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </basic-container>
+  </div>
+</template>
+
+<script>
+    export default {
+      data(){
+        return {
+          form:{},
+          basicData:{},
+
+        }
+      }
+    }
+</script>
+
+<style scoped>
+
+</style>

src/views/financialManagement/receipt.vue

@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+    export default {
+        name: "receipt"
+    }
+</script>
+
+<style scoped>
+
+</style>

src/views/workManagement/main-items/configuration/detailsPage.json

@@ -5,7 +5,6 @@
   "index": true,
   "lazy": true,
   "tip": false,
-  "simplePage": true,
   "searchShow": false,
   "searchMenuSpan": 6,
   "selection": false,

src/views/workManagement/receipt/configuration/settleAccounts.json

@@ -5,7 +5,6 @@
   "index": true,
   "lazy": true,
   "tip": false,
-  "simplePage": true,
   "searchShow": true,
   "searchMenuSpan": 6,
   "tree": true,

src/views/workManagement/receipt/configuration/statisticalList.json

@@ -6,7 +6,6 @@
   "index": true,
   "lazy": true,
   "tip": false,
-  "simplePage": true,
   "searchShow": true,
   "searchMenuSpan": 6,
   "tree": true,

src/views/workManagement/service-items/configuration/mainList.json

@@ -5,7 +5,6 @@
   "index": true,
   "lazy": true,
   "tip": false,
-  "simplePage": true,
   "searchShow": true,
   "searchMenuSpan": 6,
   "tree": true,

src/views/workManagement/service-items/project.vue

@@ -37,7 +37,7 @@
                        size="small"
                        icon="el-icon-upload2"
                        plain
-                       @click="handleDelete">导 出
+                       @click="">导 出
             </el-button>
           </template>
         </avue-crud>

src/views/workManagement/task/configuration/mainList.json

@@ -5,7 +5,6 @@
   "index": true,
   "lazy": true,
   "tip": false,
-  "simplePage": true,
   "searchShow": true,
   "searchMenuSpan": 6,
   "tree": true,

src/views/workManagement/task/index.vue

@@ -80,6 +80,9 @@
     created() {
 
     },
+    mounted() {
+      option.height = window.innerHeight - 350 ;
+    },
     methods: {
       //新增
       beforeOpen(row){