merge fix

src/views/home/component/dash.vue

@@ -184,7 +184,7 @@ export default {
           },
           {
             label: '项目情况',
-            prop: 'projectStage',
+            prop: 'project_stage',
             type: 'select',
             width: 180,
             dicUrl: '/api/blade-system/dict-biz/dictionary?code=project-situation',
@@ -195,17 +195,17 @@ export default {
           },
           {
             label: '项目总投资（万元）',
-            prop: 'totalAmount',
+            prop: 'total_amount',
             width: 180,
             type: 'number',
             precision: 2,
             formatter: (val, value, label) => {
-              return val.totalAmount.toLocaleString()
+              return val.total_amount.toLocaleString()
             }
           },
           {
             label: '股（科）室',
-            prop: 'createDeptName',
+            prop: 'create_dept_name',
             width: 180
           },
           {
@@ -215,7 +215,7 @@ export default {
           },
           {
             label: '是否入库',
-            prop: 'isStorage',
+            prop: 'is_storage',
             width: 120,
             dicData: [
               {
@@ -230,7 +230,7 @@ export default {
           },
           {
             label: '是否开工',
-            prop: 'isStart',
+            prop: 'is_start',
             width: 120,
             dicData: [
               {
@@ -245,7 +245,7 @@ export default {
           },
           {
             label: '创建时间',
-            prop: 'createTime',
+            prop: 'create_time',
             width: 180
           }]
       },

src/views/home/component/form_dialog.vue

@@ -96,8 +96,9 @@
         <!--        <div v-if='attaches.length === 0' class='full-width flex flex-center '>-->
         <!--          <el-empty image-size='100'/>-->
         <!--        </div>-->
-        <div class="flex flex-justify-between flex-center">
+        <div class="flex flex-justify-start flex-center">
           <span class="bold font-15 grey ml-5 ">字段选择</span>
+          <el-checkbox class='ml-20' @change='allChange'>全 选</el-checkbox>
         </div>
 
         <div class="flex flex-wrap" v-if='selectIndex !== -1'>
@@ -253,6 +254,14 @@ export default {
         this.resultParams.push(tmp[i])
       }
     },
+    allChange (res) {
+      console.log(res)
+      this.fieldType[this.selectIndex].params = this.fieldType[this.selectIndex].params.map(sub => {
+        sub.checked = res
+        return sub
+      })
+      this.fieldType[this.selectIndex].count = 0
+    },
     resetParams () {
       this.fieldType[this.selectIndex].params = this.fieldType[this.selectIndex].params.map(sub => {
         sub.checked = false