diff --git a/god-ui/src/views/familyOcean/visualStatistics/gatheringList/index.vue b/god-ui/src/views/familyOcean/visualStatistics/gatheringList/index.vue
index 646dfdff..1ca2fcae 100644
--- a/god-ui/src/views/familyOcean/visualStatistics/gatheringList/index.vue
+++ b/god-ui/src/views/familyOcean/visualStatistics/gatheringList/index.vue
@@ -1,154 +1,179 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="时间" prop="nowTimeOne">
-        <el-date-picker clearable
-          v-model="queryParams.nowTimeOne"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="时间2" prop="nowTimeTwo">
-        <el-date-picker clearable
-          v-model="queryParams.nowTimeTwo"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择时间2">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="${comment}" prop="fieldLikeOne">
+    <el-row>
+      <el-col :offset="2" span="4">
+        <div class="colCountCl">
+          应收款总金额<br>
+          52590000
+        </div>
+      </el-col>
+      <el-col span="4" :offset="2">
+        <div class="colCountCl">
+          已收款总金额<br>
+          16590000
+        </div>
+      </el-col>
+      <el-col span="4" :offset="2">
+        <div class="colCountCl">
+          未收款总金额<br>
+          36000000
+        </div>
+      </el-col>
+    </el-row>
+
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"
+             style="margin-top: 30px"
+    >
+      <!--      <el-form-item label="时间" prop="nowTimeOne">-->
+      <!--        <el-date-picker clearable-->
+      <!--                        v-model="queryParams.nowTimeOne"-->
+      <!--                        type="date"-->
+      <!--                        value-format="yyyy-MM-dd"-->
+      <!--                        placeholder="请选择时间"-->
+      <!--        >-->
+      <!--        </el-date-picker>-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="时间2" prop="nowTimeTwo">-->
+      <!--        <el-date-picker clearable-->
+      <!--                        v-model="queryParams.nowTimeTwo"-->
+      <!--                        type="date"-->
+      <!--                        value-format="yyyy-MM-dd"-->
+      <!--                        placeholder="请选择时间2"-->
+      <!--        >-->
+      <!--        </el-date-picker>-->
+      <!--      </el-form-item>-->
+      <el-form-item label="项目名称" prop="fieldLikeOne">
         <el-input
           v-model="queryParams.fieldLikeOne"
-          placeholder="请输入${comment}"
+          placeholder="请输入项目名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="${comment}" prop="fieldLikeTwo">
+      <el-form-item label="合同名称" prop="fieldLikeTwo">
         <el-input
           v-model="queryParams.fieldLikeTwo"
-          placeholder="请输入${comment}"
+          placeholder="请输入合同名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="${comment}" prop="fieldLikeThree">
+      <el-form-item label="甲方单位" prop="fieldLikeThree">
         <el-input
           v-model="queryParams.fieldLikeThree"
-          placeholder="请输入${comment}"
+          placeholder="请输入甲方单位"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="${comment}" prop="fieldFour">
-        <el-input
-          v-model="queryParams.fieldFour"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="fieldFive">
-        <el-input
-          v-model="queryParams.fieldFive"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="fieldSix">
-        <el-input
-          v-model="queryParams.fieldSix"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="fieldSeven">
-        <el-input
-          v-model="queryParams.fieldSeven"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="fieldEleven">
-        <el-input
-          v-model="queryParams.fieldEleven"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="fieldNine">
-        <el-input
-          v-model="queryParams.fieldNine"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="fieldTen">
-        <el-input
-          v-model="queryParams.fieldTen"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="fieldEight">
-        <el-input
-          v-model="queryParams.fieldEight"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="fieldTwelve">
-        <el-input
-          v-model="queryParams.fieldTwelve"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="fieldThirteen">
-        <el-input
-          v-model="queryParams.fieldThirteen"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="fieldFourteen">
-        <el-input
-          v-model="queryParams.fieldFourteen"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="fieldFifteen">
-        <el-input
-          v-model="queryParams.fieldFifteen"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="fieldSixteen">
-        <el-input
-          v-model="queryParams.fieldSixteen"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="fieldNineteen">
-        <el-select v-model="queryParams.fieldNineteen" placeholder="请选择${comment}" clearable>
+      <!--      <el-form-item label="${comment}" prop="fieldFour">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.fieldFour"-->
+      <!--          placeholder="请输入${comment}"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="${comment}" prop="fieldFive">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.fieldFive"-->
+      <!--          placeholder="请输入${comment}"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="${comment}" prop="fieldSix">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.fieldSix"-->
+      <!--          placeholder="请输入${comment}"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="${comment}" prop="fieldSeven">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.fieldSeven"-->
+      <!--          placeholder="请输入${comment}"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="${comment}" prop="fieldEleven">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.fieldEleven"-->
+      <!--          placeholder="请输入${comment}"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="${comment}" prop="fieldNine">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.fieldNine"-->
+      <!--          placeholder="请输入${comment}"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="${comment}" prop="fieldTen">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.fieldTen"-->
+      <!--          placeholder="请输入${comment}"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="${comment}" prop="fieldEight">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.fieldEight"-->
+      <!--          placeholder="请输入${comment}"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="${comment}" prop="fieldTwelve">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.fieldTwelve"-->
+      <!--          placeholder="请输入${comment}"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="${comment}" prop="fieldThirteen">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.fieldThirteen"-->
+      <!--          placeholder="请输入${comment}"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="${comment}" prop="fieldFourteen">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.fieldFourteen"-->
+      <!--          placeholder="请输入${comment}"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="${comment}" prop="fieldFifteen">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.fieldFifteen"-->
+      <!--          placeholder="请输入${comment}"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="${comment}" prop="fieldSixteen">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.fieldSixteen"-->
+      <!--          placeholder="请输入${comment}"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <el-form-item label="是否通过" prop="fieldNineteen">
+        <el-select v-model="queryParams.fieldNineteen" placeholder="请选择是否通过" clearable>
           <el-option
-            v-for="dict in dict.type.sys_user_sex"
+            v-for="dict in dict.type.sys_yes_no"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -162,105 +187,80 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-        >导出</el-button>
-      </el-col>
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="primary"-->
+      <!--          plain-->
+      <!--          icon="el-icon-plus"-->
+      <!--          size="mini"-->
+      <!--          @click="handleAdd"-->
+      <!--        >收款登记-->
+      <!--        </el-button>-->
+      <!--      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="energyGeneralInfoList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键id" align="center" prop="id" />
-      <el-table-column label="模块区分" align="center" prop="moduleType" />
-      <el-table-column label="时间" align="center" prop="nowTimeOne" width="180">
+      <!--      <el-table-column type="selection" width="55" align="center" />-->
+      <!--      <el-table-column label="主键id" align="center" prop="id" />-->
+      <!--      <el-table-column label="模块区分" align="center" prop="moduleType" />-->
+
+      <!--      <el-table-column label="时间2" align="center" prop="nowTimeTwo" width="180">-->
+      <!--        <template slot-scope="scope">-->
+      <!--          <span>{{ parseTime(scope.row.nowTimeTwo, '{y}-{m}-{d}') }}</span>-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
+      <!--      <el-table-column label="${comment}" align="center" prop="remark"/>-->
+      <el-table-column label="项目名称" align="center" prop="fieldLikeOne" :show-overflow-tooltip="true"/>
+      <el-table-column label="合同名称" align="center" prop="fieldLikeTwo" :show-overflow-tooltip="true"/>
+      <el-table-column label="甲方单位" align="center" prop="fieldLikeThree" :show-overflow-tooltip="true"/>
+      <el-table-column label="合同金额" align="center" prop="fieldFour"/>
+      <el-table-column label="收款类型" align="center" prop="fieldFive"/>
+      <el-table-column label="收款金额" align="center" prop="fieldSix"/>
+      <el-table-column label="开户行" align="center" prop="fieldSeven" :show-overflow-tooltip="true"/>
+      <el-table-column label="银行账号" align="center" prop="fieldEleven" :show-overflow-tooltip="true"/>
+      <el-table-column label="收款登记编号" align="center" prop="fieldNine" :show-overflow-tooltip="true"/>
+      <el-table-column label="收款登记人" align="center" prop="fieldTen"/>
+      <el-table-column label="审核人" align="center" prop="fieldEight"/>
+      <el-table-column label="审核时间" align="center" prop="nowTimeOne" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.nowTimeOne, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="时间2" align="center" prop="nowTimeTwo" width="180">
+      <el-table-column label="审核意见" align="center" prop="fieldTwelve"/>
+      <!--      <el-table-column label="${comment}" align="center" prop="fieldThirteen"/>-->
+      <!--      <el-table-column label="${comment}" align="center" prop="fieldFourteen"/>-->
+      <!--      <el-table-column label="${comment}" align="center" prop="fieldFifteen"/>-->
+      <!--      <el-table-column label="${comment}" align="center" prop="fieldSixteen"/>-->
+      <!--      <el-table-column label="${comment}" align="center" prop="fieldSeventeen"/>-->
+      <!--      <el-table-column label="${comment}" align="center" prop="fieldEighteen" width="100">-->
+      <!--        <template slot-scope="scope">-->
+      <!--          <image-preview :src="scope.row.fieldEighteen" :width="50" :height="50"/>-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
+      <el-table-column label="是否通过" align="center" prop="fieldNineteen">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.nowTimeTwo, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="${comment}" align="center" prop="remark" />
-      <el-table-column label="${comment}" align="center" prop="fieldLikeOne" />
-      <el-table-column label="${comment}" align="center" prop="fieldLikeTwo" />
-      <el-table-column label="${comment}" align="center" prop="fieldLikeThree" />
-      <el-table-column label="${comment}" align="center" prop="fieldFour" />
-      <el-table-column label="${comment}" align="center" prop="fieldFive" />
-      <el-table-column label="${comment}" align="center" prop="fieldSix" />
-      <el-table-column label="${comment}" align="center" prop="fieldSeven" />
-      <el-table-column label="${comment}" align="center" prop="fieldEleven" />
-      <el-table-column label="${comment}" align="center" prop="fieldNine" />
-      <el-table-column label="${comment}" align="center" prop="fieldTen" />
-      <el-table-column label="${comment}" align="center" prop="fieldEight" />
-      <el-table-column label="${comment}" align="center" prop="fieldTwelve" />
-      <el-table-column label="${comment}" align="center" prop="fieldThirteen" />
-      <el-table-column label="${comment}" align="center" prop="fieldFourteen" />
-      <el-table-column label="${comment}" align="center" prop="fieldFifteen" />
-      <el-table-column label="${comment}" align="center" prop="fieldSixteen" />
-      <el-table-column label="${comment}" align="center" prop="fieldSeventeen" />
-      <el-table-column label="${comment}" align="center" prop="fieldEighteen" width="100">
-        <template slot-scope="scope">
-          <image-preview :src="scope.row.fieldEighteen" :width="50" :height="50"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="${comment}" align="center" prop="fieldNineteen">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.fieldNineteen"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
+          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.fieldNineteen"/>
         </template>
       </el-table-column>
+      <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+      <!--        <template slot-scope="scope">-->
+      <!--          <el-button-->
+      <!--            size="mini"-->
+      <!--            type="text"-->
+      <!--            icon="el-icon-edit"-->
+      <!--            @click="handleUpdate(scope.row)"-->
+      <!--          >修改-->
+      <!--          </el-button>-->
+      <!--          <el-button-->
+      <!--            size="mini"-->
+      <!--            type="text"-->
+      <!--            icon="el-icon-delete"-->
+      <!--            @click="handleDelete(scope.row)"-->
+      <!--          >删除-->
+      <!--          </el-button>-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
     </el-table>
 
     <pagination
@@ -272,85 +272,87 @@
     />
 
     <!-- 添加或修改新能源通用对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="时间" prop="nowTimeOne">
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <!--        <el-form-item label="时间2" prop="nowTimeTwo">-->
+        <!--          <el-date-picker clearable-->
+        <!--                          v-model="form.nowTimeTwo"-->
+        <!--                          type="date"-->
+        <!--                          value-format="yyyy-MM-dd"-->
+        <!--                          placeholder="请选择时间2"-->
+        <!--          >-->
+        <!--          </el-date-picker>-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="${comment}" prop="remark">-->
+        <!--          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>-->
+        <!--        </el-form-item>-->
+        <el-form-item label="项目名称" prop="fieldLikeOne">
+          <el-input v-model="form.fieldLikeOne" placeholder="请输入项目名称"/>
+        </el-form-item>
+        <el-form-item label="合同名称" prop="fieldLikeTwo">
+          <el-input v-model="form.fieldLikeTwo" placeholder="请输入合同名称"/>
+        </el-form-item>
+        <el-form-item label="甲方单位" prop="fieldLikeThree">
+          <el-input v-model="form.fieldLikeThree" placeholder="请输入甲方单位"/>
+        </el-form-item>
+        <el-form-item label="合同金额" prop="fieldFour">
+          <el-input v-model="form.fieldFour" placeholder="请输入合同金额"/>
+        </el-form-item>
+        <el-form-item label="收款类型" prop="fieldFive">
+          <el-input v-model="form.fieldFive" placeholder="请输入收款类型"/>
+        </el-form-item>
+        <el-form-item label="收款金额" prop="fieldSix">
+          <el-input v-model="form.fieldSix" placeholder="请输入收款金额"/>
+        </el-form-item>
+        <el-form-item label="开户行" prop="fieldSeven">
+          <el-input v-model="form.fieldSeven" placeholder="请输入开户行"/>
+        </el-form-item>
+        <el-form-item label="银行账号" prop="fieldEleven">
+          <el-input v-model="form.fieldEleven" placeholder="请输入银行账号"/>
+        </el-form-item>
+        <el-form-item label="收款登记编号" prop="fieldNine">
+          <el-input v-model="form.fieldNine" placeholder="请输入收款登记编号"/>
+        </el-form-item>
+        <el-form-item label="收款登记人" prop="fieldTen">
+          <el-input v-model="form.fieldTen" placeholder="请输入收款登记人"/>
+        </el-form-item>
+        <el-form-item label="审核人" prop="fieldEight">
+          <el-input v-model="form.fieldEight" placeholder="请输入审核人"/>
+        </el-form-item>
+        <el-form-item label="审核时间" prop="nowTimeOne">
           <el-date-picker clearable
-            v-model="form.nowTimeOne"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择时间">
+                          v-model="form.nowTimeOne"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择时间"
+          >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="时间2" prop="nowTimeTwo">
-          <el-date-picker clearable
-            v-model="form.nowTimeTwo"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择时间2">
-          </el-date-picker>
+        <el-form-item label="审核意见" prop="fieldTwelve">
+          <el-input v-model="form.fieldTwelve" placeholder="请输入审核意见"/>
         </el-form-item>
-        <el-form-item label="${comment}" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldLikeOne">
-          <el-input v-model="form.fieldLikeOne" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldLikeTwo">
-          <el-input v-model="form.fieldLikeTwo" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldLikeThree">
-          <el-input v-model="form.fieldLikeThree" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldFour">
-          <el-input v-model="form.fieldFour" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldFive">
-          <el-input v-model="form.fieldFive" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldSix">
-          <el-input v-model="form.fieldSix" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldSeven">
-          <el-input v-model="form.fieldSeven" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldEleven">
-          <el-input v-model="form.fieldEleven" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldNine">
-          <el-input v-model="form.fieldNine" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldTen">
-          <el-input v-model="form.fieldTen" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldEight">
-          <el-input v-model="form.fieldEight" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldTwelve">
-          <el-input v-model="form.fieldTwelve" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldThirteen">
-          <el-input v-model="form.fieldThirteen" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldFourteen">
-          <el-input v-model="form.fieldFourteen" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldFifteen">
-          <el-input v-model="form.fieldFifteen" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldSixteen">
-          <el-input v-model="form.fieldSixteen" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldSeventeen">
-          <file-upload v-model="form.fieldSeventeen"/>
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldEighteen">
-          <image-upload v-model="form.fieldEighteen"/>
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldNineteen">
-          <el-select v-model="form.fieldNineteen" placeholder="请选择${comment}">
+        <!--        <el-form-item label="${comment}" prop="fieldThirteen">-->
+        <!--          <el-input v-model="form.fieldThirteen" placeholder="请输入${comment}"/>-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="${comment}" prop="fieldFourteen">-->
+        <!--          <el-input v-model="form.fieldFourteen" placeholder="请输入${comment}"/>-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="${comment}" prop="fieldFifteen">-->
+        <!--          <el-input v-model="form.fieldFifteen" placeholder="请输入${comment}"/>-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="${comment}" prop="fieldSixteen">-->
+        <!--          <el-input v-model="form.fieldSixteen" placeholder="请输入${comment}"/>-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="${comment}" prop="fieldSeventeen">-->
+        <!--          <file-upload v-model="form.fieldSeventeen"/>-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="${comment}" prop="fieldEighteen">-->
+        <!--          <image-upload v-model="form.fieldEighteen"/>-->
+        <!--        </el-form-item>-->
+        <el-form-item label="是否通过" prop="fieldNineteen">
+          <el-select v-model="form.fieldNineteen" placeholder="请选择是否通过">
             <el-option
-              v-for="dict in dict.type.sys_user_sex"
+              v-for="dict in dict.type.sys_yes_no"
               :key="dict.value"
               :label="dict.label"
               :value="dict.value"
@@ -367,11 +369,17 @@
 </template>
 
 <script>
-import { listEnergyGeneralInfo, getEnergyGeneralInfo, delEnergyGeneralInfo, addEnergyGeneralInfo, updateEnergyGeneralInfo } from "@/api/energy/energyGeneralInfo";
+import {
+  listEnergyGeneralInfo,
+  getEnergyGeneralInfo,
+  delEnergyGeneralInfo,
+  addEnergyGeneralInfo,
+  updateEnergyGeneralInfo
+} from '@/api/energy/energyGeneralInfo'
 
 export default {
-  name: "EnergyGeneralInfo",
-  dicts: ['sys_user_sex'],
+  name: 'EnergyGeneralInfo',
+  dicts: ['sys_yes_no'],
   data() {
     return {
       // 遮罩层
@@ -389,14 +397,14 @@ export default {
       // 新能源通用表格数据
       energyGeneralInfoList: [],
       // 弹出层标题
-      title: "",
+      title: '',
       // 是否显示弹出层
       open: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        moduleType: null,
+        moduleType: 'gatheringRegister',
         nowTimeOne: null,
         nowTimeTwo: null,
         fieldLikeOne: null,
@@ -422,33 +430,32 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
-      }
-    };
+      rules: {}
+    }
   },
   created() {
-    this.getList();
+    this.getList()
   },
   methods: {
     /** 查询新能源通用列表 */
     getList() {
-      this.loading = true;
+      this.loading = true
       listEnergyGeneralInfo(this.queryParams).then(response => {
-        this.energyGeneralInfoList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
+        this.energyGeneralInfoList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
     },
     // 取消按钮
     cancel() {
-      this.open = false;
-      this.reset();
+      this.open = false
+      this.reset()
     },
     // 表单重置
     reset() {
       this.form = {
         id: null,
-        moduleType: null,
+        moduleType: 'gatheringRegister',
         nowTimeOne: null,
         nowTimeTwo: null,
         remark: null,
@@ -471,70 +478,71 @@ export default {
         fieldSeventeen: null,
         fieldEighteen: null,
         fieldNineteen: null
-      };
-      this.resetForm("form");
+      }
+      this.resetForm('form')
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
+      this.queryParams.pageNum = 1
+      this.getList()
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
+      this.resetForm('queryForm')
+      this.handleQuery()
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加新能源通用";
+      this.reset()
+      this.open = true
+      this.title = '收款登记'
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset();
+      this.reset()
       const id = row.id || this.ids
       getEnergyGeneralInfo(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改新能源通用";
-      });
+        this.form = response.data
+        this.open = true
+        this.title = '收款登记修改'
+      })
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs['form'].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
             updateEnergyGeneralInfo(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
+              this.$modal.msgSuccess('修改成功')
+              this.open = false
+              this.getList()
+            })
           } else {
             addEnergyGeneralInfo(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
+              this.$modal.msgSuccess('新增成功')
+              this.open = false
+              this.getList()
+            })
           }
         }
-      });
+      })
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除新能源通用编号为"' + ids + '"的数据项？').then(function() {
-        return delEnergyGeneralInfo(ids);
+      const ids = row.id || this.ids
+      this.$modal.confirm('是否确认删除收款登记编号为"' + ids + '"的数据项？').then(function() {
+        return delEnergyGeneralInfo(ids)
       }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+        this.getList()
+        this.$modal.msgSuccess('删除成功')
+      }).catch(() => {
+      })
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -543,5 +551,16 @@ export default {
       }, `energyGeneralInfo_${new Date().getTime()}.xlsx`)
     }
   }
-};
+}
 </script>
+<style lang="scss" scoped>
+.colCountCl {
+  display: flex;
+  height: 100px;
+  border-radius: 15px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);
+  text-align: center;
+  justify-content: center;
+  align-items: center;
+}
+</style>
diff --git a/god-ui/src/views/familyOcean/visualStatistics/pactList/index.vue b/god-ui/src/views/familyOcean/visualStatistics/pactList/index.vue
index 646dfdff..49e8bc8c 100644
--- a/god-ui/src/views/familyOcean/visualStatistics/pactList/index.vue
+++ b/god-ui/src/views/familyOcean/visualStatistics/pactList/index.vue
@@ -1,154 +1,26 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="时间" prop="nowTimeOne">
-        <el-date-picker clearable
-          v-model="queryParams.nowTimeOne"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="时间2" prop="nowTimeTwo">
-        <el-date-picker clearable
-          v-model="queryParams.nowTimeTwo"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择时间2">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="${comment}" prop="fieldLikeOne">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="85px">
+      <el-form-item label="合同编号" prop="contractNo">
         <el-input
-          v-model="queryParams.fieldLikeOne"
-          placeholder="请输入${comment}"
+          v-model="queryParams.contractNo"
+          placeholder="请输入合同编号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="${comment}" prop="fieldLikeTwo">
+      <el-form-item label="合同名称" prop="contractName">
         <el-input
-          v-model="queryParams.fieldLikeTwo"
-          placeholder="请输入${comment}"
+          v-model="queryParams.contractName"
+          placeholder="请输入合同名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="${comment}" prop="fieldLikeThree">
-        <el-input
-          v-model="queryParams.fieldLikeThree"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="fieldFour">
-        <el-input
-          v-model="queryParams.fieldFour"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="fieldFive">
-        <el-input
-          v-model="queryParams.fieldFive"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="fieldSix">
-        <el-input
-          v-model="queryParams.fieldSix"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="fieldSeven">
-        <el-input
-          v-model="queryParams.fieldSeven"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="fieldEleven">
-        <el-input
-          v-model="queryParams.fieldEleven"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="fieldNine">
-        <el-input
-          v-model="queryParams.fieldNine"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="fieldTen">
-        <el-input
-          v-model="queryParams.fieldTen"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="fieldEight">
-        <el-input
-          v-model="queryParams.fieldEight"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="fieldTwelve">
-        <el-input
-          v-model="queryParams.fieldTwelve"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="fieldThirteen">
-        <el-input
-          v-model="queryParams.fieldThirteen"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="fieldFourteen">
-        <el-input
-          v-model="queryParams.fieldFourteen"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="fieldFifteen">
-        <el-input
-          v-model="queryParams.fieldFifteen"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="fieldSixteen">
-        <el-input
-          v-model="queryParams.fieldSixteen"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="fieldNineteen">
-        <el-select v-model="queryParams.fieldNineteen" placeholder="请选择${comment}" clearable>
+      <el-form-item label="合同类型" prop="contractType">
+        <el-select v-model="queryParams.contractType" placeholder="请选择合同类型" clearable>
           <el-option
-            v-for="dict in dict.type.sys_user_sex"
+            v-for="dict in dict.type.hydraulic_pact_type"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -162,105 +34,107 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-        >导出</el-button>
-      </el-col>
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="primary"-->
+      <!--          plain-->
+      <!--          icon="el-icon-plus"-->
+      <!--          size="mini"-->
+      <!--          @click="handleAdd"-->
+      <!--        >新增-->
+      <!--        </el-button>-->
+      <!--      </el-col>-->
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="success"-->
+      <!--          plain-->
+      <!--          icon="el-icon-edit"-->
+      <!--          size="mini"-->
+      <!--          :disabled="single"-->
+      <!--          @click="handleUpdate"-->
+      <!--        >修改-->
+      <!--        </el-button>-->
+      <!--      </el-col>-->
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="danger"-->
+      <!--          plain-->
+      <!--          icon="el-icon-delete"-->
+      <!--          size="mini"-->
+      <!--          :disabled="multiple"-->
+      <!--          @click="handleDelete"-->
+      <!--        >删除-->
+      <!--        </el-button>-->
+      <!--      </el-col>-->
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="warning"-->
+      <!--          plain-->
+      <!--          icon="el-icon-download"-->
+      <!--          size="mini"-->
+      <!--          @click="handleExport"-->
+      <!--          v-hasPermi="['digitization:contract:export']"-->
+      <!--        >导出-->
+      <!--        </el-button>-->
+      <!--      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="energyGeneralInfoList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键id" align="center" prop="id" />
-      <el-table-column label="模块区分" align="center" prop="moduleType" />
-      <el-table-column label="时间" align="center" prop="nowTimeOne" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.nowTimeOne, '{y}-{m}-{d}') }}</span>
+    <el-table v-loading="loading" :data="contractList" @selection-change="handleSelectionChange"
+              height="calc(100vh - 270px)"
+    >
+      <!--      <el-table-column type="selection" width="55" align="center"/>-->
+      <el-table-column label="序号" width="80" align="center">
+        <template v-slot="scope">
+          <span>{{ scope.$index + (queryParams.pageNum - 1) * (queryParams.pageSize) + 1 }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="时间2" align="center" prop="nowTimeTwo" width="180">
+      <el-table-column label="合同编号" align="center" prop="contractNo" width="180"/>
+      <el-table-column label="合同名称" align="center" prop="contractName" width="180"/>
+      <el-table-column label="合同类型" align="center" prop="contractType" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.nowTimeTwo, '{y}-{m}-{d}') }}</span>
+          <dict-tag :options="dict.type.hydraulic_pact_type" :value="scope.row.contractType"/>
         </template>
       </el-table-column>
-      <el-table-column label="${comment}" align="center" prop="remark" />
-      <el-table-column label="${comment}" align="center" prop="fieldLikeOne" />
-      <el-table-column label="${comment}" align="center" prop="fieldLikeTwo" />
-      <el-table-column label="${comment}" align="center" prop="fieldLikeThree" />
-      <el-table-column label="${comment}" align="center" prop="fieldFour" />
-      <el-table-column label="${comment}" align="center" prop="fieldFive" />
-      <el-table-column label="${comment}" align="center" prop="fieldSix" />
-      <el-table-column label="${comment}" align="center" prop="fieldSeven" />
-      <el-table-column label="${comment}" align="center" prop="fieldEleven" />
-      <el-table-column label="${comment}" align="center" prop="fieldNine" />
-      <el-table-column label="${comment}" align="center" prop="fieldTen" />
-      <el-table-column label="${comment}" align="center" prop="fieldEight" />
-      <el-table-column label="${comment}" align="center" prop="fieldTwelve" />
-      <el-table-column label="${comment}" align="center" prop="fieldThirteen" />
-      <el-table-column label="${comment}" align="center" prop="fieldFourteen" />
-      <el-table-column label="${comment}" align="center" prop="fieldFifteen" />
-      <el-table-column label="${comment}" align="center" prop="fieldSixteen" />
-      <el-table-column label="${comment}" align="center" prop="fieldSeventeen" />
-      <el-table-column label="${comment}" align="center" prop="fieldEighteen" width="100">
+      <el-table-column label="合同金额" align="center" prop="contractMoney" width="180">
         <template slot-scope="scope">
-          <image-preview :src="scope.row.fieldEighteen" :width="50" :height="50"/>
+          <span>{{ scope.row.contractMoney }}万元</span>
         </template>
       </el-table-column>
-      <el-table-column label="${comment}" align="center" prop="fieldNineteen">
+      <el-table-column label="年度" align="center" width="140">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.fieldNineteen"/>
+          <span>{{ scope.row.contractTime.substr(0, 4) }}年</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
+      <el-table-column label="签订日期" align="center" prop="contractTime" width="180"/>
+      <el-table-column label="文件" align="center" prop="contractFile" width="200">
+        <template v-slot="scope">
+          <span style="color: #1890ff;cursor: pointer" @click="handleDownload(scope.row)">{{
+              scope.row.contractFile
+            }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="部门" align="center" prop="contractUnit" width="180"/>
+      <el-table-column label="负责人" align="center" prop="principal" width="180"/>
+      <el-table-column label="负责人联系电话" align="center" prop="principalTell" width="180"/>
+      <!--      <el-table-column label="操作" align="center" fixed="right" width="160">-->
+      <!--        <template slot-scope="scope">-->
+      <!--          <el-button-->
+      <!--            size="mini"-->
+      <!--            type="text"-->
+      <!--            icon="el-icon-edit"-->
+      <!--            @click="handleUpdate(scope.row)"-->
+      <!--          >修改-->
+      <!--          </el-button>-->
+      <!--          <el-button-->
+      <!--            size="mini"-->
+      <!--            type="text"-->
+      <!--            icon="el-icon-delete"-->
+      <!--            @click="handleDelete(scope.row)"-->
+      <!--          >删除-->
+      <!--          </el-button>-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
     </el-table>
 
     <pagination
@@ -271,92 +145,77 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改新能源通用对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="时间" prop="nowTimeOne">
-          <el-date-picker clearable
-            v-model="form.nowTimeOne"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择时间">
-          </el-date-picker>
+    <!-- 添加或修改合同基本信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="550px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="合同编号" prop="contractNo">
+          <el-input v-model="form.contractNo" placeholder="请输入合同编号"/>
         </el-form-item>
-        <el-form-item label="时间2" prop="nowTimeTwo">
-          <el-date-picker clearable
-            v-model="form.nowTimeTwo"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择时间2">
-          </el-date-picker>
+        <el-form-item label="合同名称" prop="contractName">
+          <el-input v-model="form.contractName" placeholder="请输入合同名称"/>
         </el-form-item>
-        <el-form-item label="${comment}" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldLikeOne">
-          <el-input v-model="form.fieldLikeOne" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldLikeTwo">
-          <el-input v-model="form.fieldLikeTwo" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldLikeThree">
-          <el-input v-model="form.fieldLikeThree" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldFour">
-          <el-input v-model="form.fieldFour" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldFive">
-          <el-input v-model="form.fieldFive" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldSix">
-          <el-input v-model="form.fieldSix" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldSeven">
-          <el-input v-model="form.fieldSeven" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldEleven">
-          <el-input v-model="form.fieldEleven" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldNine">
-          <el-input v-model="form.fieldNine" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldTen">
-          <el-input v-model="form.fieldTen" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldEight">
-          <el-input v-model="form.fieldEight" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldTwelve">
-          <el-input v-model="form.fieldTwelve" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldThirteen">
-          <el-input v-model="form.fieldThirteen" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldFourteen">
-          <el-input v-model="form.fieldFourteen" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldFifteen">
-          <el-input v-model="form.fieldFifteen" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldSixteen">
-          <el-input v-model="form.fieldSixteen" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldSeventeen">
-          <file-upload v-model="form.fieldSeventeen"/>
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldEighteen">
-          <image-upload v-model="form.fieldEighteen"/>
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldNineteen">
-          <el-select v-model="form.fieldNineteen" placeholder="请选择${comment}">
+        <el-form-item label="合同类型" prop="contractType">
+          <el-select v-model="form.contractType" placeholder="请选择合同类型" style="width: 100%">
             <el-option
-              v-for="dict in dict.type.sys_user_sex"
+              v-for="dict in dict.type.hydraulic_pact_type"
               :key="dict.value"
               :label="dict.label"
               :value="dict.value"
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="合同金额" prop="contractMoney">
+          <el-input v-model="form.contractMoney" placeholder="请输入合同金额/万元"/>
+        </el-form-item>
+        <el-form-item label="部门" prop="contractUnit">
+          <el-input v-model="form.contractUnit" placeholder="请输入部门"/>
+        </el-form-item>
+        <el-form-item label="签订日期" prop="contractTime">
+          <el-date-picker clearable
+                          v-model="form.contractTime"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          style="width: 100%"
+                          placeholder="请选择签订日期"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="负责人" prop="principal">
+          <el-input v-model="form.principal" placeholder="请输入负责人"/>
+        </el-form-item>
+        <el-form-item label="负责人联系电话" prop="principalTell">
+          <el-input v-model="form.principalTell" placeholder="请输入负责人联系电话"/>
+        </el-form-item>
+        <el-form-item label="相对方" prop="oppositeId">
+          <el-select v-model="form.oppositeId" placeholder="请选择相对方" @change="changeOpposite" style="width: 100%">
+            <el-option
+              v-for="item in oppositeList"
+              :key="item.oppositeId"
+              :label="item.oppositeName"
+              :value="item.oppositeId"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="文件" prop="contractFile">
+          <file-upload-minio
+            v-model="form.contractFile"
+            ref="docFileUploadMinio"
+            :fileType="[
+              'doc',
+              'docx',
+              'pdf',
+            ]"
+            :limit="1"
+            :isShowTip="false"
+            @input="handleAttachmentList"
+          >
+            <a
+              slot="append"
+              style="display: inline-block; margin-left: 16px"
+            >{{ fileInfo.fileName }}</a
+            >
+          </file-upload-minio>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -367,11 +226,15 @@
 </template>
 
 <script>
-import { listEnergyGeneralInfo, getEnergyGeneralInfo, delEnergyGeneralInfo, addEnergyGeneralInfo, updateEnergyGeneralInfo } from "@/api/energy/energyGeneralInfo";
+import { listContract, getContract, delContract, addContract, updateContract } from '@/api/digitization/contract'
+import { listOpposite } from '@/api/digitization/opposite'
+import FileUploadMinio from '@/components/FileUpload/minio.vue'
+import { download } from '@/utils/request'
 
 export default {
-  name: "EnergyGeneralInfo",
-  dicts: ['sys_user_sex'],
+  name: 'ContractList',
+  dicts: ['hydraulic_pact_type'],
+  components: { FileUploadMinio },
   data() {
     return {
       // 遮罩层
@@ -386,162 +249,209 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 新能源通用表格数据
-      energyGeneralInfoList: [],
+      // 合同基本信息表格数据
+      contractList: [],
+      oppositeList: [],
       // 弹出层标题
-      title: "",
+      title: '',
       // 是否显示弹出层
       open: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        moduleType: null,
-        nowTimeOne: null,
-        nowTimeTwo: null,
-        fieldLikeOne: null,
-        fieldLikeTwo: null,
-        fieldLikeThree: null,
-        fieldFour: null,
-        fieldFive: null,
-        fieldSix: null,
-        fieldSeven: null,
-        fieldEleven: null,
-        fieldNine: null,
-        fieldTen: null,
-        fieldEight: null,
-        fieldTwelve: null,
-        fieldThirteen: null,
-        fieldFourteen: null,
-        fieldFifteen: null,
-        fieldSixteen: null,
-        fieldSeventeen: null,
-        fieldEighteen: null,
-        fieldNineteen: null
+        contractNo: null,
+        contractName: null,
+        contractType: null,
+        contractUnit: null
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
+        contractNo: [
+          { required: true, message: '合同编号不能为空', trigger: 'blur' }
+        ],
+        contractName: [
+          { required: true, message: '合同名称不能为空', trigger: 'blur' }
+        ],
+        contractType: [
+          { required: true, message: '合同类型不能为空', trigger: 'change' }
+        ],
+        contractMoney: [
+          { required: true, message: '合同金额不能为空', trigger: 'blur' }
+        ],
+        contractTime: [
+          { required: true, message: '签订日期不能为空', trigger: 'blur' }
+        ],
+        contractFile: [
+          { required: true, message: '文件不能为空', trigger: 'blur' }
+        ]
+      },
+      fileInfo: {
+        id: '',
+        url: '',
+        fileName: '',
+        newFileName: '',
+        originalFilename: ''
       }
-    };
+    }
   },
   created() {
-    this.getList();
+    this.getList()
+    this.getOppositeList()
   },
   methods: {
-    /** 查询新能源通用列表 */
+    /** 查询合同基本信息列表 */
     getList() {
-      this.loading = true;
-      listEnergyGeneralInfo(this.queryParams).then(response => {
-        this.energyGeneralInfoList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
+      this.loading = true
+      listContract(this.queryParams).then(response => {
+        this.contractList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    getOppositeList() {
+      listOpposite({
+        pageNum: 1,
+        pageSize: 100,
+        isBlacklist: '0',
+        dataType: 'digitization_opposite'
+      }).then(response => {
+        this.oppositeList = response.rows
+      })
     },
     // 取消按钮
     cancel() {
-      this.open = false;
-      this.reset();
+      this.open = false
+      this.reset()
     },
     // 表单重置
     reset() {
       this.form = {
-        id: null,
-        moduleType: null,
-        nowTimeOne: null,
-        nowTimeTwo: null,
-        remark: null,
-        fieldLikeOne: null,
-        fieldLikeTwo: null,
-        fieldLikeThree: null,
-        fieldFour: null,
-        fieldFive: null,
-        fieldSix: null,
-        fieldSeven: null,
-        fieldEleven: null,
-        fieldNine: null,
-        fieldTen: null,
-        fieldEight: null,
-        fieldTwelve: null,
-        fieldThirteen: null,
-        fieldFourteen: null,
-        fieldFifteen: null,
-        fieldSixteen: null,
-        fieldSeventeen: null,
-        fieldEighteen: null,
-        fieldNineteen: null
-      };
-      this.resetForm("form");
+        contractId: null,
+        contractNo: null,
+        contractName: null,
+        contractType: null,
+        contractMoney: null,
+        contractUnit: null,
+        contractYear: null,
+        contractTime: null,
+        principal: null,
+        principalTell: null,
+        contractFile: null,
+        createBy: null,
+        createTime: null,
+        isUse: null,
+        fileId: null
+      }
+      this.fileInfo = {
+        id: '',
+        url: '',
+        fileName: '',
+        newFileName: '',
+        originalFilename: ''
+      }
+      this.resetForm('form')
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
+      this.queryParams.pageNum = 1
+      this.getList()
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
+      this.resetForm('queryForm')
+      this.handleQuery()
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.ids = selection.map(item => item.contractId)
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加新能源通用";
+      this.reset()
+      this.open = true
+      this.title = '添加合同基本信息'
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset();
-      const id = row.id || this.ids
-      getEnergyGeneralInfo(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改新能源通用";
-      });
+      this.reset()
+      const contractId = row.contractId || this.ids
+      getContract(contractId).then(response => {
+        this.form = response.data
+        this.open = true
+        this.title = '修改合同基本信息'
+      })
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs['form'].validate(valid => {
         if (valid) {
-          if (this.form.id != null) {
-            updateEnergyGeneralInfo(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
+          if (this.form.contractId != null) {
+            updateContract(this.form).then(response => {
+              this.$modal.msgSuccess('修改成功')
+              this.open = false
+              this.getList()
+            })
           } else {
-            addEnergyGeneralInfo(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
+            addContract(this.form).then(response => {
+              this.$modal.msgSuccess('新增成功')
+              this.open = false
+              this.getList()
+            })
           }
         }
-      });
+      })
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除新能源通用编号为"' + ids + '"的数据项？').then(function() {
-        return delEnergyGeneralInfo(ids);
+      const contractIds = row.contractId || this.ids
+      this.$modal.confirm('是否确认删除合同基本信息编号为"' + contractIds + '"的数据项？').then(function() {
+        return delContract(contractIds)
       }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+        this.getList()
+        this.$modal.msgSuccess('删除成功')
+      }).catch(() => {
+      })
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('energy/energyGeneralInfo/export', {
+      this.download('digitization/contract/export', {
         ...this.queryParams
-      }, `energyGeneralInfo_${new Date().getTime()}.xlsx`)
+      }, `contract_${new Date().getTime()}.xlsx`)
+    },
+    handleAttachmentList(attachmentList) {
+      if (attachmentList.length > 0) {
+        // this.uploadForm.contractContent = attachmentList[0].fileName;
+        this.form.fileId = attachmentList[0].id
+        this.form.contractFile = attachmentList[0].fileName
+        this.fileInfo.url = attachmentList[0].url
+        this.fileInfo.fileName = attachmentList[0].fileName
+      }
+      console.log('handleAttachmentList', attachmentList)
+    },
+    handleDownload(row) {
+      const fileId = row.fileId
+      const fileName = row.contractFile
+      this.$modal.confirm('是否下载此文件?').then(() => {
+        download('/common/minio/download', { id: fileId }, fileName).catch(
+          () => {
+            this.$modal.msgError('文件下载失败')
+          }
+        )
+      })
+    },
+    changeOpposite(value) {
+      let item = this.oppositeList.filter(item => {
+        return item.oppositeId == value
+      })
+      if (item.length > 0) {
+        this.form.oppositeId = item[0].oppositeId
+      }
     }
   }
-};
+}
 </script>
diff --git a/god-ui/src/views/familyOcean/visualStatistics/paymentList/index.vue b/god-ui/src/views/familyOcean/visualStatistics/paymentList/index.vue
index 646dfdff..80391aae 100644
--- a/god-ui/src/views/familyOcean/visualStatistics/paymentList/index.vue
+++ b/god-ui/src/views/familyOcean/visualStatistics/paymentList/index.vue
@@ -1,154 +1,178 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="时间" prop="nowTimeOne">
-        <el-date-picker clearable
-          v-model="queryParams.nowTimeOne"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择时间">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="时间2" prop="nowTimeTwo">
-        <el-date-picker clearable
-          v-model="queryParams.nowTimeTwo"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择时间2">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="${comment}" prop="fieldLikeOne">
+    <el-row>
+      <el-col :offset="2" span="4">
+        <div class="colCountCl">
+          应付款总金额<br>
+          3440000
+        </div>
+      </el-col>
+      <el-col span="4" :offset="2">
+        <div class="colCountCl">
+          已付款总金额<br>
+          3000000
+        </div>
+      </el-col>
+      <el-col span="4" :offset="2">
+        <div class="colCountCl">
+          未付款总金额<br>
+          440000
+        </div>
+      </el-col>
+    </el-row>
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"
+             style="margin-top: 30px"
+    >
+      <!--      <el-form-item label="时间" prop="nowTimeOne">-->
+      <!--        <el-date-picker clearable-->
+      <!--                        v-model="queryParams.nowTimeOne"-->
+      <!--                        type="date"-->
+      <!--                        value-format="yyyy-MM-dd"-->
+      <!--                        placeholder="请选择时间"-->
+      <!--        >-->
+      <!--        </el-date-picker>-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="时间2" prop="nowTimeTwo">-->
+      <!--        <el-date-picker clearable-->
+      <!--                        v-model="queryParams.nowTimeTwo"-->
+      <!--                        type="date"-->
+      <!--                        value-format="yyyy-MM-dd"-->
+      <!--                        placeholder="请选择时间2"-->
+      <!--        >-->
+      <!--        </el-date-picker>-->
+      <!--      </el-form-item>-->
+      <el-form-item label="项目名称" prop="fieldLikeOne">
         <el-input
           v-model="queryParams.fieldLikeOne"
-          placeholder="请输入${comment}"
+          placeholder="请输入项目名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="${comment}" prop="fieldLikeTwo">
+      <el-form-item label="合同名称" prop="fieldLikeTwo">
         <el-input
           v-model="queryParams.fieldLikeTwo"
-          placeholder="请输入${comment}"
+          placeholder="请输入合同名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="${comment}" prop="fieldLikeThree">
-        <el-input
-          v-model="queryParams.fieldLikeThree"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="fieldFour">
+      <!--      <el-form-item label="${comment}" prop="fieldLikeThree">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.fieldLikeThree"-->
+      <!--          placeholder="请输入${comment}"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <el-form-item label="收款单位" prop="fieldFour">
         <el-input
           v-model="queryParams.fieldFour"
-          placeholder="请输入${comment}"
+          placeholder="请输入收款单位"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="${comment}" prop="fieldFive">
-        <el-input
-          v-model="queryParams.fieldFive"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="fieldSix">
-        <el-input
-          v-model="queryParams.fieldSix"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="fieldSeven">
-        <el-input
-          v-model="queryParams.fieldSeven"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="fieldEleven">
-        <el-input
-          v-model="queryParams.fieldEleven"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="fieldNine">
-        <el-input
-          v-model="queryParams.fieldNine"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="fieldTen">
-        <el-input
-          v-model="queryParams.fieldTen"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="fieldEight">
-        <el-input
-          v-model="queryParams.fieldEight"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="fieldTwelve">
-        <el-input
-          v-model="queryParams.fieldTwelve"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="fieldThirteen">
-        <el-input
-          v-model="queryParams.fieldThirteen"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="fieldFourteen">
-        <el-input
-          v-model="queryParams.fieldFourteen"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="fieldFifteen">
-        <el-input
-          v-model="queryParams.fieldFifteen"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="fieldSixteen">
-        <el-input
-          v-model="queryParams.fieldSixteen"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="${comment}" prop="fieldNineteen">
-        <el-select v-model="queryParams.fieldNineteen" placeholder="请选择${comment}" clearable>
+      <!--      <el-form-item label="${comment}" prop="fieldFive">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.fieldFive"-->
+      <!--          placeholder="请输入${comment}"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="${comment}" prop="fieldSix">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.fieldSix"-->
+      <!--          placeholder="请输入${comment}"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="${comment}" prop="fieldSeven">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.fieldSeven"-->
+      <!--          placeholder="请输入${comment}"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="${comment}" prop="fieldEleven">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.fieldEleven"-->
+      <!--          placeholder="请输入${comment}"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="${comment}" prop="fieldNine">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.fieldNine"-->
+      <!--          placeholder="请输入${comment}"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="${comment}" prop="fieldTen">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.fieldTen"-->
+      <!--          placeholder="请输入${comment}"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="${comment}" prop="fieldEight">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.fieldEight"-->
+      <!--          placeholder="请输入${comment}"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="${comment}" prop="fieldTwelve">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.fieldTwelve"-->
+      <!--          placeholder="请输入${comment}"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="${comment}" prop="fieldThirteen">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.fieldThirteen"-->
+      <!--          placeholder="请输入${comment}"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="${comment}" prop="fieldFourteen">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.fieldFourteen"-->
+      <!--          placeholder="请输入${comment}"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="${comment}" prop="fieldFifteen">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.fieldFifteen"-->
+      <!--          placeholder="请输入${comment}"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <!--      <el-form-item label="${comment}" prop="fieldSixteen">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.fieldSixteen"-->
+      <!--          placeholder="请输入${comment}"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <el-form-item label="是否通过" prop="fieldNineteen">
+        <el-select v-model="queryParams.fieldNineteen" placeholder="请选择是否通过" clearable>
           <el-option
-            v-for="dict in dict.type.sys_user_sex"
+            v-for="dict in dict.type.sys_yes_no"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -162,105 +186,109 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-        >导出</el-button>
-      </el-col>
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="primary"-->
+      <!--          plain-->
+      <!--          icon="el-icon-plus"-->
+      <!--          size="mini"-->
+      <!--          @click="handleAdd"-->
+      <!--        >付款申请-->
+      <!--        </el-button>-->
+      <!--      </el-col>-->
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="success"-->
+      <!--          plain-->
+      <!--          icon="el-icon-edit"-->
+      <!--          size="mini"-->
+      <!--          :disabled="single"-->
+      <!--          @click="handleUpdate"-->
+      <!--        >修改</el-button>-->
+      <!--      </el-col>-->
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="danger"-->
+      <!--          plain-->
+      <!--          icon="el-icon-delete"-->
+      <!--          size="mini"-->
+      <!--          :disabled="multiple"-->
+      <!--          @click="handleDelete"-->
+      <!--        >删除</el-button>-->
+      <!--      </el-col>-->
+      <!--      <el-col :span="1.5">-->
+      <!--        <el-button-->
+      <!--          type="warning"-->
+      <!--          plain-->
+      <!--          icon="el-icon-download"-->
+      <!--          size="mini"-->
+      <!--          @click="handleExport"-->
+      <!--        >导出</el-button>-->
+      <!--      </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="energyGeneralInfoList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键id" align="center" prop="id" />
-      <el-table-column label="模块区分" align="center" prop="moduleType" />
-      <el-table-column label="时间" align="center" prop="nowTimeOne" width="180">
+      <!--      <el-table-column type="selection" width="55" align="center"/>-->
+      <!--      <el-table-column label="主键id" align="center" prop="id"/>-->
+      <!--      <el-table-column label="模块区分" align="center" prop="moduleType"/>-->
+
+      <!--      <el-table-column label="时间2" align="center" prop="nowTimeTwo" width="180">-->
+      <!--        <template slot-scope="scope">-->
+      <!--          <span>{{ parseTime(scope.row.nowTimeTwo, '{y}-{m}-{d}') }}</span>-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
+      <!--      <el-table-column label="${comment}" align="center" prop="remark"/>-->
+      <el-table-column label="项目名称" align="center" prop="fieldLikeOne" :show-overflow-tooltip="true"/>
+      <el-table-column label="合同名称" align="center" prop="fieldLikeTwo" :show-overflow-tooltip="true"/>
+      <el-table-column label="合同金额" align="center" prop="fieldLikeThree"/>
+      <el-table-column label="收款单位" align="center" prop="fieldFour" :show-overflow-tooltip="true"/>
+      <el-table-column label="开户行" align="center" prop="fieldFive" :show-overflow-tooltip="true"/>
+      <el-table-column label="银行账号" align="center" prop="fieldSix" :show-overflow-tooltip="true"/>
+      <el-table-column label="付款方式" align="center" prop="fieldSeven" :show-overflow-tooltip="true"/>
+      <el-table-column label="付款金额" align="center" prop="fieldEleven"/>
+      <el-table-column label="付款类型" align="center" prop="fieldNine" :show-overflow-tooltip="true"/>
+      <el-table-column label="付款申请编号" align="center" prop="fieldTen" :show-overflow-tooltip="true"/>
+      <el-table-column label="审核人" align="center" prop="fieldEight"/>
+      <el-table-column label="审核时间" align="center" prop="nowTimeOne" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.nowTimeOne, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="时间2" align="center" prop="nowTimeTwo" width="180">
+      <el-table-column label="审核意见" align="center" prop="fieldTwelve" :show-overflow-tooltip="true"/>
+      <!--      <el-table-column label="${comment}" align="center" prop="fieldThirteen"/>-->
+      <!--      <el-table-column label="${comment}" align="center" prop="fieldFourteen"/>-->
+      <!--      <el-table-column label="${comment}" align="center" prop="fieldFifteen"/>-->
+      <!--      <el-table-column label="${comment}" align="center" prop="fieldSixteen"/>-->
+      <!--      <el-table-column label="${comment}" align="center" prop="fieldSeventeen"/>-->
+      <!--      <el-table-column label="${comment}" align="center" prop="fieldEighteen" width="100">-->
+      <!--        <template slot-scope="scope">-->
+      <!--          <image-preview :src="scope.row.fieldEighteen" :width="50" :height="50"/>-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
+      <el-table-column label="是否通过" align="center" prop="fieldNineteen">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.nowTimeTwo, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="${comment}" align="center" prop="remark" />
-      <el-table-column label="${comment}" align="center" prop="fieldLikeOne" />
-      <el-table-column label="${comment}" align="center" prop="fieldLikeTwo" />
-      <el-table-column label="${comment}" align="center" prop="fieldLikeThree" />
-      <el-table-column label="${comment}" align="center" prop="fieldFour" />
-      <el-table-column label="${comment}" align="center" prop="fieldFive" />
-      <el-table-column label="${comment}" align="center" prop="fieldSix" />
-      <el-table-column label="${comment}" align="center" prop="fieldSeven" />
-      <el-table-column label="${comment}" align="center" prop="fieldEleven" />
-      <el-table-column label="${comment}" align="center" prop="fieldNine" />
-      <el-table-column label="${comment}" align="center" prop="fieldTen" />
-      <el-table-column label="${comment}" align="center" prop="fieldEight" />
-      <el-table-column label="${comment}" align="center" prop="fieldTwelve" />
-      <el-table-column label="${comment}" align="center" prop="fieldThirteen" />
-      <el-table-column label="${comment}" align="center" prop="fieldFourteen" />
-      <el-table-column label="${comment}" align="center" prop="fieldFifteen" />
-      <el-table-column label="${comment}" align="center" prop="fieldSixteen" />
-      <el-table-column label="${comment}" align="center" prop="fieldSeventeen" />
-      <el-table-column label="${comment}" align="center" prop="fieldEighteen" width="100">
-        <template slot-scope="scope">
-          <image-preview :src="scope.row.fieldEighteen" :width="50" :height="50"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="${comment}" align="center" prop="fieldNineteen">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.fieldNineteen"/>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
+          <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.fieldNineteen"/>
         </template>
       </el-table-column>
+      <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+      <!--        <template slot-scope="scope">-->
+      <!--          <el-button-->
+      <!--            size="mini"-->
+      <!--            type="text"-->
+      <!--            icon="el-icon-edit"-->
+      <!--            @click="handleUpdate(scope.row)"-->
+      <!--          >修改-->
+      <!--          </el-button>-->
+      <!--          <el-button-->
+      <!--            size="mini"-->
+      <!--            type="text"-->
+      <!--            icon="el-icon-delete"-->
+      <!--            @click="handleDelete(scope.row)"-->
+      <!--          >删除-->
+      <!--          </el-button>-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
     </el-table>
 
     <pagination
@@ -272,85 +300,88 @@
     />
 
     <!-- 添加或修改新能源通用对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="时间" prop="nowTimeOne">
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+
+        <!--        <el-form-item label="时间2" prop="nowTimeTwo">-->
+        <!--          <el-date-picker clearable-->
+        <!--                          v-model="form.nowTimeTwo"-->
+        <!--                          type="date"-->
+        <!--                          value-format="yyyy-MM-dd"-->
+        <!--                          placeholder="请选择时间2"-->
+        <!--          >-->
+        <!--          </el-date-picker>-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="${comment}" prop="remark">-->
+        <!--          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>-->
+        <!--        </el-form-item>-->
+        <el-form-item label="项目名称" prop="fieldLikeOne">
+          <el-input v-model="form.fieldLikeOne" placeholder="请输入项目名称"/>
+        </el-form-item>
+        <el-form-item label="合同名称" prop="fieldLikeTwo">
+          <el-input v-model="form.fieldLikeTwo" placeholder="请输入合同名称"/>
+        </el-form-item>
+        <el-form-item label="合同金额" prop="fieldLikeThree">
+          <el-input v-model="form.fieldLikeThree" placeholder="请输入合同金额"/>
+        </el-form-item>
+        <el-form-item label="收款单位" prop="fieldFour">
+          <el-input v-model="form.fieldFour" placeholder="请输入收款单位"/>
+        </el-form-item>
+        <el-form-item label="开户行" prop="fieldFive">
+          <el-input v-model="form.fieldFive" placeholder="请输入开户行"/>
+        </el-form-item>
+        <el-form-item label="银行账号" prop="fieldSix">
+          <el-input v-model="form.fieldSix" placeholder="请输入银行账号"/>
+        </el-form-item>
+        <el-form-item label="付款方式" prop="fieldSeven">
+          <el-input v-model="form.fieldSeven" placeholder="请输入付款方式"/>
+        </el-form-item>
+        <el-form-item label="付款金额" prop="fieldEleven">
+          <el-input v-model="form.fieldEleven" placeholder="请输入付款金额"/>
+        </el-form-item>
+        <el-form-item label="付款类型" prop="fieldNine">
+          <el-input v-model="form.fieldNine" placeholder="请输入付款类型"/>
+        </el-form-item>
+        <el-form-item label="付款申请编号" prop="fieldTen">
+          <el-input v-model="form.fieldTen" placeholder="请输入付款申请编号"/>
+        </el-form-item>
+        <el-form-item label="审核人" prop="fieldEight">
+          <el-input v-model="form.fieldEight" placeholder="请输入审核人"/>
+        </el-form-item>
+        <el-form-item label="审核时间" prop="nowTimeOne">
           <el-date-picker clearable
-            v-model="form.nowTimeOne"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择时间">
+                          v-model="form.nowTimeOne"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择时间"
+          >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="时间2" prop="nowTimeTwo">
-          <el-date-picker clearable
-            v-model="form.nowTimeTwo"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择时间2">
-          </el-date-picker>
+        <el-form-item label="审核意见" prop="fieldTwelve">
+          <el-input v-model="form.fieldTwelve" placeholder="请输入审核意见"/>
         </el-form-item>
-        <el-form-item label="${comment}" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldLikeOne">
-          <el-input v-model="form.fieldLikeOne" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldLikeTwo">
-          <el-input v-model="form.fieldLikeTwo" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldLikeThree">
-          <el-input v-model="form.fieldLikeThree" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldFour">
-          <el-input v-model="form.fieldFour" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldFive">
-          <el-input v-model="form.fieldFive" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldSix">
-          <el-input v-model="form.fieldSix" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldSeven">
-          <el-input v-model="form.fieldSeven" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldEleven">
-          <el-input v-model="form.fieldEleven" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldNine">
-          <el-input v-model="form.fieldNine" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldTen">
-          <el-input v-model="form.fieldTen" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldEight">
-          <el-input v-model="form.fieldEight" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldTwelve">
-          <el-input v-model="form.fieldTwelve" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldThirteen">
-          <el-input v-model="form.fieldThirteen" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldFourteen">
-          <el-input v-model="form.fieldFourteen" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldFifteen">
-          <el-input v-model="form.fieldFifteen" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldSixteen">
-          <el-input v-model="form.fieldSixteen" placeholder="请输入${comment}" />
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldSeventeen">
-          <file-upload v-model="form.fieldSeventeen"/>
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldEighteen">
-          <image-upload v-model="form.fieldEighteen"/>
-        </el-form-item>
-        <el-form-item label="${comment}" prop="fieldNineteen">
-          <el-select v-model="form.fieldNineteen" placeholder="请选择${comment}">
+        <!--        <el-form-item label="${comment}" prop="fieldThirteen">-->
+        <!--          <el-input v-model="form.fieldThirteen" placeholder="请输入${comment}"/>-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="${comment}" prop="fieldFourteen">-->
+        <!--          <el-input v-model="form.fieldFourteen" placeholder="请输入${comment}"/>-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="${comment}" prop="fieldFifteen">-->
+        <!--          <el-input v-model="form.fieldFifteen" placeholder="请输入${comment}"/>-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="${comment}" prop="fieldSixteen">-->
+        <!--          <el-input v-model="form.fieldSixteen" placeholder="请输入${comment}"/>-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="${comment}" prop="fieldSeventeen">-->
+        <!--          <file-upload v-model="form.fieldSeventeen"/>-->
+        <!--        </el-form-item>-->
+        <!--        <el-form-item label="${comment}" prop="fieldEighteen">-->
+        <!--          <image-upload v-model="form.fieldEighteen"/>-->
+        <!--        </el-form-item>-->
+        <el-form-item label="是否通过" prop="fieldNineteen">
+          <el-select v-model="form.fieldNineteen" placeholder="请选择是否通过">
             <el-option
-              v-for="dict in dict.type.sys_user_sex"
+              v-for="dict in dict.type.sys_yes_no"
               :key="dict.value"
               :label="dict.label"
               :value="dict.value"
@@ -367,11 +398,17 @@
 </template>
 
 <script>
-import { listEnergyGeneralInfo, getEnergyGeneralInfo, delEnergyGeneralInfo, addEnergyGeneralInfo, updateEnergyGeneralInfo } from "@/api/energy/energyGeneralInfo";
+import {
+  listEnergyGeneralInfo,
+  getEnergyGeneralInfo,
+  delEnergyGeneralInfo,
+  addEnergyGeneralInfo,
+  updateEnergyGeneralInfo
+} from '@/api/energy/energyGeneralInfo'
 
 export default {
-  name: "EnergyGeneralInfo",
-  dicts: ['sys_user_sex'],
+  name: 'EnergyGeneralInfo',
+  dicts: ['sys_yes_no'],
   data() {
     return {
       // 遮罩层
@@ -389,14 +426,14 @@ export default {
       // 新能源通用表格数据
       energyGeneralInfoList: [],
       // 弹出层标题
-      title: "",
+      title: '',
       // 是否显示弹出层
       open: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        moduleType: null,
+        moduleType: 'paymentApply',
         nowTimeOne: null,
         nowTimeTwo: null,
         fieldLikeOne: null,
@@ -422,33 +459,32 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
-      }
-    };
+      rules: {}
+    }
   },
   created() {
-    this.getList();
+    this.getList()
   },
   methods: {
     /** 查询新能源通用列表 */
     getList() {
-      this.loading = true;
+      this.loading = true
       listEnergyGeneralInfo(this.queryParams).then(response => {
-        this.energyGeneralInfoList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
+        this.energyGeneralInfoList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
     },
     // 取消按钮
     cancel() {
-      this.open = false;
-      this.reset();
+      this.open = false
+      this.reset()
     },
     // 表单重置
     reset() {
       this.form = {
         id: null,
-        moduleType: null,
+        moduleType: 'paymentApply',
         nowTimeOne: null,
         nowTimeTwo: null,
         remark: null,
@@ -471,70 +507,71 @@ export default {
         fieldSeventeen: null,
         fieldEighteen: null,
         fieldNineteen: null
-      };
-      this.resetForm("form");
+      }
+      this.resetForm('form')
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
+      this.queryParams.pageNum = 1
+      this.getList()
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
+      this.resetForm('queryForm')
+      this.handleQuery()
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset();
-      this.open = true;
-      this.title = "添加新能源通用";
+      this.reset()
+      this.open = true
+      this.title = '付款申请'
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset();
+      this.reset()
       const id = row.id || this.ids
       getEnergyGeneralInfo(id).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改新能源通用";
-      });
+        this.form = response.data
+        this.open = true
+        this.title = '付款申请修改'
+      })
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs['form'].validate(valid => {
         if (valid) {
           if (this.form.id != null) {
             updateEnergyGeneralInfo(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
+              this.$modal.msgSuccess('修改成功')
+              this.open = false
+              this.getList()
+            })
           } else {
             addEnergyGeneralInfo(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
+              this.$modal.msgSuccess('新增成功')
+              this.open = false
+              this.getList()
+            })
           }
         }
-      });
+      })
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除新能源通用编号为"' + ids + '"的数据项？').then(function() {
-        return delEnergyGeneralInfo(ids);
+      const ids = row.id || this.ids
+      this.$modal.confirm('是否确认删除付款申请编号为"' + ids + '"的数据项？').then(function() {
+        return delEnergyGeneralInfo(ids)
       }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+        this.getList()
+        this.$modal.msgSuccess('删除成功')
+      }).catch(() => {
+      })
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -543,5 +580,16 @@ export default {
       }, `energyGeneralInfo_${new Date().getTime()}.xlsx`)
     }
   }
-};
+}
 </script>
+<style lang="scss" scoped>
+.colCountCl {
+  display: flex;
+  height: 100px;
+  border-radius: 15px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, .12), 0 0 6px rgba(0, 0, 0, .04);
+  text-align: center;
+  justify-content: center;
+  align-items: center;
+}
+</style>