Kaynağa Gözat

查看驳回

1 yıl önce
ebeveyn
işleme
d24f1dceca
1 değiştirilmiş dosya ile 152 ekleme ve 420 silme
  1. 152 420
      src/views/GATHER/index.vue

+ 152 - 420
src/views/GATHER/index.vue

@@ -1,12 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form
-      :model="queryParams"
-      ref="queryForm"
-      size="small"
-      :inline="true"
-      v-show="showSearch"
-    >
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
       <!--      <el-form-item label="数据类型" prop="type">-->
       <!--        <el-select-->
       <!--          v-model="queryParams.type"-->
@@ -24,143 +18,66 @@
       <!--        </el-select>-->
       <!--      </el-form-item>-->
       <el-form-item label="采集状态" prop="collStatus">
-        <el-select
-          v-model="queryParams.collStatus"
-          placeholder="请选择采集状态"
-          clearable
-          filterable
-          class="se"
-        >
-          <el-option
-            v-for="dict in collStatus"
-            :key="dict.value + 'collStatus'"
-            :label="dict.label"
-            :value="dict.value"
-          />
+        <el-select v-model="queryParams.collStatus" placeholder="请选择采集状态" clearable filterable class="se">
+          <el-option v-for="dict in collStatus" :key="dict.value + 'collStatus'" :label="dict.label"
+            :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="上报状态" prop="reportStatus">
-        <el-select
-          v-model="queryParams.reportStatus"
-          placeholder="请选择上报状态"
-          clearable
-          filterable
-          class="se"
-        >
-          <el-option
-            v-for="dict in reportStatus"
-            :key="dict.value + 'reportStatus'"
-            :label="dict.label"
-            :value="dict.value"
-          />
+        <el-select v-model="queryParams.reportStatus" placeholder="请选择上报状态" clearable filterable class="se">
+          <el-option v-for="dict in reportStatus" :key="dict.value + 'reportStatus'" :label="dict.label"
+            :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="审核状态" prop="approveStatus">
-        <el-select
-          v-model="queryParams.approveStatus"
-          placeholder="请选择审核状态"
-          clearable
-          filterable
-          class="se"
-        >
-          <el-option
-            v-for="(dict, index) in approveStatus"
-            :key="dict.value + 'approveStatus'"
-            :label="dict.label"
-            :value="dict.value"
-          />
+        <el-select v-model="queryParams.approveStatus" placeholder="请选择审核状态" clearable filterable class="se">
+          <el-option v-for="(dict, index) in approveStatus" :key="dict.value + 'approveStatus'" :label="dict.label"
+            :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="年度" prop="year">
-        <el-date-picker
-          v-model="queryParams.year"
-          type="year"
-          format="yyyy"
-          value-format="yyyy"
-          placeholder="选择年度"
-          class="se"
-        ></el-date-picker>
+        <el-date-picker v-model="queryParams.year" type="year" format="yyyy" value-format="yyyy" placeholder="选择年度"
+          class="se"></el-date-picker>
       </el-form-item>
       <el-form-item label="月份" prop="month">
-        <el-date-picker
-          v-model="queryParams.month"
-          type="month"
-          format="MM"
-          value-format="MM"
-          placeholder="选择月份"
-          class="se"
-        ></el-date-picker>
+        <el-date-picker v-model="queryParams.month" type="month" format="MM" value-format="MM" placeholder="选择月份"
+          class="se"></el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery"
-          >搜索</el-button
-        >
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="success" @click="onOpenDialog('old')"
-          >历史数据导入</el-button
-        >
+        <el-button type="success" @click="onOpenDialog('old')">历史数据导入</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          v-hasPermi="['gather:GATHER:upload']"
-          @click="onOpenDialog('new')"
-          >导入</el-button
-        >
+        <el-button type="success" v-hasPermi="['gather:GATHER:upload']" @click="onOpenDialog('new')">导入</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          @click="handleDownload()"
-          :title="radio === '' ? '请先选择下面对应的单位模板' : ''"
-          :disabled="radio === '' ? true : false"
-          >下载导入模板</el-button
-        >
+        <el-button @click="handleDownload()" :title="radio === '' ? '请先选择下面对应的单位模板' : ''"
+          :disabled="radio === '' ? true : false">下载导入模板</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          @click="importFile({ type: '0', mark: '1' })"
-          v-hasPermi="['gather:GATHER:upload']"
-          >海关部分贸易导入</el-button
-        >
+        <el-button type="danger" plain @click="importFile({ type: '0', mark: '1' })"
+          v-hasPermi="['gather:GATHER:upload']">海关部分贸易导入</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          @click="importFile({ type: '0', mark: '2' })"
-          v-hasPermi="['gather:GATHER:upload']"
-          >海关进出口总值导入</el-button
-        >
+        <el-button type="danger" plain @click="importFile({ type: '0', mark: '2' })"
+          v-hasPermi="['gather:GATHER:upload']">海关进出口总值导入</el-button>
       </el-col>
 
-      <right-toolbar
-        :showSearch.sync="showSearch"
-        @queryTable="getList"
-      ></right-toolbar>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table
-      :data="GATHERList"
-      @selection-change="handleSelectionChange"
-      @row-click="showRow"
-    >
+    <el-table :data="GATHERList" @selection-change="handleSelectionChange" @row-click="showRow">
       <!-- @current-change="handleCurrentChange" -->
       <el-table-column label="选择" fixed="left" width="70" center>
         <template scope="scope">
-          <el-radio
-            class="radio"
-            v-model="radio"
-            :label="scope.$index"
-            @change.native="getCurrentRow(scope.row)"
-            >{{ "" }}</el-radio
-          >
+          <el-radio class="radio" v-model="radio" :label="scope.$index" @change.native="getCurrentRow(scope.row)">{{ ""
+          }}</el-radio>
         </template>
       </el-table-column>
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
@@ -191,22 +108,12 @@
           <span v-if="scope.row.collStatus == 1">已采集</span>
         </template>
       </el-table-column>
-      <el-table-column
-        label="采集人"
-        align="center"
-        prop="collName"
-        width="110"
-      >
+      <el-table-column label="采集人" align="center" prop="collName" width="110">
         <template slot-scope="scope">
           <span>{{ scope.row.collName }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        label="采集时间"
-        align="center"
-        prop="collTime"
-        width="100"
-      >
+      <el-table-column label="采集时间" align="center" prop="collTime" width="100">
       </el-table-column>
       <el-table-column label="上报状态" align="center" prop="reportStatus">
         <template slot-scope="scope">
@@ -214,55 +121,24 @@
           <span v-if="scope.row.reportStatus == 1">已上报</span>
         </template>
       </el-table-column>
-      <el-table-column
-        label="上报人"
-        align="center"
-        prop="reportName"
-        width="110"
-      />
-      <el-table-column
-        label="上报时间"
-        align="center"
-        prop="reportTime"
-        width="100"
-      />
-      <el-table-column
-        label="审核人"
-        align="center"
-        prop="approveName"
-        width="110"
-      />
-      <el-table-column
-        label="审核时间"
-        align="center"
-        prop="approveTime"
-        width="100"
-      />
+      <el-table-column label="上报人" align="center" prop="reportName" width="110" />
+      <el-table-column label="上报时间" align="center" prop="reportTime" width="100" />
+      <el-table-column label="审核人" align="center" prop="approveName" width="110" />
+      <el-table-column label="审核时间" align="center" prop="approveTime" width="100" />
       <el-table-column label="审核状态" align="center" prop="approveStatus">
         <template slot-scope="scope">
-          <span v-if="scope.row.audit == 0 && scope.row.auditTime == null"
-            >未提交审核</span
-          >
-          <span
-            v-if="
-              scope.row.audit == 1 &&
-              (scope.row.approveStatus == 0 ||
-                scope.row.approveStatus == null) &&
-              scope.row.approveTime == null
-            "
-            >未审核</span
-          >
+          <span v-if="scope.row.audit == 0 && scope.row.auditTime == null">未提交审核</span>
+          <span v-if="scope.row.audit == 1 &&
+            (scope.row.approveStatus == 0 ||
+              scope.row.approveStatus == null) &&
+            scope.row.approveTime == null
+            ">未审核</span>
 
           <span v-if="scope.row.approveStatus == 1">审核通过</span>
           <span v-if="scope.row.approveStatus == 2">审核拒绝</span>
         </template>
       </el-table-column>
-      <el-table-column
-        label="操作"
-        align="center"
-        fixed="right"
-        class-name="small-padding fixed-width"
-      >
+      <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <!-- <el-button
             style="margin: 0 2px"
@@ -273,37 +149,16 @@
           > -->
           <!--          todo不加 template 会造成浏览器渲染问题 导致无法弹出 el-popconfirm 组件-->
 
-          <template
-            v-if="
-              scope.row.collStatus == 0 && checkPermi(['gather:GATHER:add'])
-            "
-          >
-            <el-button
-              style="margin: 0 2px"
-              size="mini"
-              type="text"
-              @click="handleUpdate(scope.row)"
-              >录入</el-button
-            >
+          <template v-if="scope.row.collStatus == 0 && checkPermi(['gather:GATHER:add'])
+            ">
+            <el-button style="margin: 0 2px" size="mini" type="text" @click="handleUpdate(scope.row)">录入</el-button>
           </template>
-          <template
-            v-if="
-              scope.row.collStatus == 1 &&
-              (scope.row.audit == 0 || scope.row.audit == null) &&
-              checkPermi(['gather:GATHER:approve'])
-            "
-          >
-            <el-popconfirm
-              title="确定提交审核吗?"
-              @confirm="handleAudit(scope.row)"
-            >
-              <el-button
-                style="margin: 0 2px"
-                size="mini"
-                type="text"
-                slot="reference"
-                >提交审核</el-button
-              >
+          <template v-if="scope.row.collStatus == 1 &&
+            (scope.row.audit == 0 || scope.row.audit == null) &&
+            checkPermi(['gather:GATHER:approve'])
+            ">
+            <el-popconfirm title="确定提交审核吗?" @confirm="handleAudit(scope.row)">
+              <el-button style="margin: 0 2px" size="mini" type="text" slot="reference">提交审核</el-button>
             </el-popconfirm>
           </template>
           <!--              已采集,未上报,未提交审核 或 审核拒绝-->
@@ -315,103 +170,51 @@
             {{ checkPermi(["gather:GATHER:check"]) }}普通 ---
             {{ checkPermi(["gather:GATHER:approve"]) }}管理
           </template> -->
-          <template
-            v-if="
-              scope.row.collStatus == 1 &&
-              scope.row.audit == 1 &&
-              (scope.row.approveStatus == 0 ||
-                scope.row.approveStatus == null ||
-                scope.row.approveStatus == 2) &&
-              checkPermi(['gather:GATHER:check'])
-            "
-          >
+          <template v-if="scope.row.collStatus == 1 &&
+            scope.row.audit == 1 &&
+            (scope.row.approveStatus == 0 ||
+              scope.row.approveStatus == null ||
+              scope.row.approveStatus == 2) &&
+            checkPermi(['gather:GATHER:check'])
+            ">
             <!-- <el-popconfirm
               title="确定提交吗?"
               @confirm="handleApprove(scope.row)"
             > -->
-            <el-button
-              @click="handleApprove(scope.row)"
-              style="margin: 0 2px"
-              size="mini"
-              type="text"
-              slot="reference"
-              >审核绩效</el-button
-            >
+            <el-button @click="handleApprove(scope.row)" style="margin: 0 2px" size="mini" type="text"
+              slot="reference">审核绩效</el-button>
             <!-- </el-popconfirm> -->
           </template>
 
           <!--              已采集,未上报,审核通过 -->
-          <template
-            v-if="
-              scope.row.collStatus == 1 &&
-              scope.row.reportStatus == 0 &&
-              scope.row.approveStatus == 1 &&
-              checkPermi(['gather:GATHER:report'])
-            "
-          >
-            <el-popconfirm
-              title="确定上报吗?"
-              @confirm="handleReport(scope.row)"
-            >
-              <el-button
-                style="margin: 0 2px"
-                size="mini"
-                slot="reference"
-                type="text"
-                >上报</el-button
-              >
+          <template v-if="scope.row.collStatus == 1 &&
+            scope.row.reportStatus == 0 &&
+            scope.row.approveStatus == 1 &&
+            checkPermi(['gather:GATHER:report'])
+            ">
+            <el-popconfirm title="确定上报吗?" @confirm="handleReport(scope.row)">
+              <el-button style="margin: 0 2px" size="mini" slot="reference" type="text">上报</el-button>
             </el-popconfirm>
           </template>
 
-          <el-button
-            style="margin: 0 2px"
-            v-if="scope.row.collStatus == 1"
-            size="mini"
-            type="text"
-            @click="handleDetail(scope.row, 0)"
-            >查看</el-button
-          >
+          <el-button style="margin: 0 2px" v-if="scope.row.collStatus == 1" size="mini" type="text"
+            @click="handleDetail(scope.row, 0)">查看</el-button>
           <!-- {{scope.row.collStatus}}--{{scope.row.approveStatus}} -->
 
-          <el-button
-            style="margin: 0 2px"
-            v-if="
-              scope.row.collStatus == 1 && // 已采集
-              scope.row.audit == 0 && // 未审核
-              checkPermi(['gather:GATHER:edit']) // 编辑权限
-            "
-            size="mini"
-            type="text"
-            @click="handleDetail(scope.row, 1)"
-            >修改</el-button
-          >
+          <el-button style="margin: 0 2px" v-if="scope.row.collStatus == 1 && // 已采集
+            scope.row.audit == 0 && // 未审核
+            checkPermi(['gather:GATHER:edit']) // 编辑权限
+            " size="mini" type="text" @click="handleDetail(scope.row, 1)">修改</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
-      v-show="total > 0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 上传文件对话框  历史数据导入 -->
-    <el-dialog
-      center
-      title="导入"
-      :visible.sync="openUpload"
-      width="50%"
-      append-to-body
-      :close-on-click-modal="false"
-    >
-      <el-form
-        ref="uploadForm"
-        :model="uploadForm"
-        :rules="rules"
-        label-width="120px"
-      >
+    <el-dialog center title="导入" :visible.sync="openUpload" width="50%" append-to-body :close-on-click-modal="false">
+      <el-form ref="uploadForm" :model="uploadForm" :rules="rules" label-width="120px">
         <!--        <el-form-item label="数据类型" prop="type">-->
         <!--          <el-select-->
         <!--            v-model="uploadForm.type"-->
@@ -428,19 +231,9 @@
         <!--          </el-select>-->
         <!--        </el-form-item>-->
         <el-form-item label="文件" prop="linkUrl">
-          <el-upload
-            class="upload-demo"
-            ref="upload"
-            action="#"
-            :http-request="httprequest"
-            :before-upload="uploadFile"
-            :file-list="fileList"
-            :auto-upload="false"
-            :limit="1"
-          >
-            <el-button slot="trigger" size="small" type="primary"
-              >选取文件</el-button
-            >
+          <el-upload class="upload-demo" ref="upload" action="#" :http-request="httprequest" :before-upload="uploadFile"
+            :file-list="fileList" :auto-upload="false" :limit="1">
+            <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
           </el-upload>
         </el-form-item>
         <div class="tips-text">
@@ -456,62 +249,31 @@
     </el-dialog>
 
     <!-- 录入数据采集对话框 -->
-    <el-dialog
-      center
-      :title="title"
-      :visible.sync="open"
-      width="55%"
-      append-to-body
-      :close-on-click-modal="false"
-    >
-      <el-tabs
-        v-if="this.form.type == 0"
-        v-model="activeName"
-        type="border-card"
-        @tab-click="handleClick"
-      >
-        <el-tab-pane
-          v-for="(item, index) in tabList"
-          :key="index + 'tabs'"
-          :label="item.normName"
-          :name="item.normName"
-        >
+    <el-dialog center :title="title" :visible.sync="open" width="55%" append-to-body :close-on-click-modal="false">
+      <el-tabs v-if="this.form.type == 0" v-model="activeName" type="border-card" @tab-click="handleClick">
+        <el-tab-pane v-for="(item, index) in tabList" :key="index + 'tabs'" :label="item.normName" :name="item.normName">
           <el-row :gutter="10">
             <template v-for="listItem in form.feeLists">
-              <el-form
-                v-if="listItem.normId == item.normId"
-                :rules="
-                  validatorList(
-                    listItem.normfeeCode,
-                    listItem.normfeeName,
-                    listItem.sendValue
-                  )
-                "
-                :model="listItem"
-                :ref="'form' + listItem.normfeeId"
-                :key="listItem.normfeeId"
-                :disabled="listItem.sendValue == 1"
-              >
+              <el-form v-if="listItem.normId == item.normId" :rules="validatorList(
+                listItem.normfeeCode,
+                listItem.normfeeName,
+                listItem.sendValue
+              )
+                " :model="listItem" :ref="'form' + listItem.normfeeId" :key="listItem.normfeeId"
+                :disabled="listItem.sendValue == 1">
                 <!-- :key="index + listIndex + listItem.normId" -->
                 <!-- :rules="rules" ref="form" -->
 
                 <el-col :span="12">
-                  <el-form-item
-                    :label="
-                      listItem.normfeeName +
-                      '(' +
-                      listItem.funit_dictText +
-                      ')'
-                    "
-                    prop="collCalue"
-                  >
+                  <el-form-item :label="listItem.normfeeName +
+                    '(' +
+                    listItem.funit_dictText +
+                    ')'
+                    " prop="collCalue">
                     <!-- 这里科研失败!想动态绑定校验规则的 -->
                     <!-- :prop="listItem.normfeeId" -->
                     <!-- :rules="rules.listItem.normfeeId" -->
-                    <el-input
-                      v-model="listItem.collCalue"
-                      :placeholder="'请输入' + listItem.normfeeName"
-                    ></el-input>
+                    <el-input v-model="listItem.collCalue" :placeholder="'请输入' + listItem.normfeeName"></el-input>
                   </el-form-item>
                 </el-col>
               </el-form>
@@ -533,27 +295,15 @@
         </el-tab-pane>
       </el-tabs>
       <template v-else-if="this.form.type == 1">
-        <el-form
-          v-for="listItem in form.feeLists"
-          :model="listItem"
-          :ref="'form' + listItem.normfeeId"
-          :rules="rules"
-          :key="listItem.normfeeId"
-        >
+        <el-form v-for="listItem in form.feeLists" :model="listItem" :ref="'form' + listItem.normfeeId" :rules="rules"
+          :key="listItem.normfeeId">
           <!-- :rules="rules" ref="form" -->
-          <el-form-item
-            :label="
-              listItem.normfeeName + '(' + listItem.funit_dictText + ')'
-            "
-            prop="collCalue"
-          >
+          <el-form-item :label="listItem.normfeeName + '(' + listItem.funit_dictText + ')'
+            " prop="collCalue">
             <!-- 这里科研失败!想动态绑定校验规则的 -->
             <!-- :prop="listItem.normfeeId" -->
             <!-- :rules="rules.listItem.normfeeId" -->
-            <el-input
-              v-model="listItem.collCalue"
-              :placeholder="'请输入' + listItem.normfeeName"
-            ></el-input>
+            <el-input v-model="listItem.collCalue" :placeholder="'请输入' + listItem.normfeeName"></el-input>
           </el-form-item>
         </el-form>
       </template>
@@ -565,55 +315,26 @@
     </el-dialog>
 
     <!-- 查看或修改 -->
-    <el-dialog
-      center
-      @close="handleClose"
-      :title="title"
-      :visible.sync="openDetail"
-      width="50%"
-      append-to-body
-      :close-on-click-modal="false"
-    >
-      <el-tabs
-        v-if="this.form.type == 0"
-        v-model="activeName"
-        type="border-card"
-        @tab-click="handleClick"
-      >
-        <el-tab-pane
-          v-for="(item, index) in tabList"
-          :key="index + 'tabs'"
-          :label="item.normName"
-          :name="item.normName"
-        >
+    <el-dialog center @close="handleClose" :title="title" :visible.sync="openDetail" width="50%" append-to-body
+      :close-on-click-modal="false">
+      <el-tabs v-if="this.form.type == 0" v-model="activeName" type="border-card" @tab-click="handleClick">
+        <el-tab-pane v-for="(item, index) in tabList" :key="index + 'tabs'" :label="item.normName" :name="item.normName">
           <el-row :gutter="10">
             <template v-for="listItem in form.feeLists">
-              <el-form
-                v-if="listItem.normId == item.normId"
-                :model="listItem"
-                :ref="'form' + listItem.normfeeId"
-                :rules="rules"
-                :key="listItem.normfeeId"
-              >
+              <el-form v-if="listItem.normId == item.normId" :model="listItem" :ref="'form' + listItem.normfeeId"
+                :rules="rules" :key="listItem.normfeeId">
                 <!-- :rules="rules" ref="form" -->
                 <el-col :span="12">
-                  <el-form-item
-                    prop="collCalue"
-                    :label="
-                      listItem.normfeeName +
-                      '(' +
-                      listItem.funit_dictText +
-                      ')'
-                    "
-                  >
+                  <el-form-item prop="collCalue" :label="listItem.normfeeName +
+                    '(' +
+                    listItem.funit_dictText +
+                    ')'
+                    ">
                     <!-- 这里科研失败!想动态绑定校验规则的 -->
                     <!-- :prop="listItem.normfeeId" -->
                     <!-- :rules="rules.listItem.normfeeId" -->
-                    <el-input
-                      :disabled="!edit"
-                      v-model="listItem.collCalue"
-                      :placeholder="'请输入' + listItem.normfeeName"
-                    ></el-input>
+                    <el-input :disabled="!edit" v-model="listItem.collCalue"
+                      :placeholder="'请输入' + listItem.normfeeName"></el-input>
                   </el-form-item>
                 </el-col>
               </el-form>
@@ -637,27 +358,15 @@
       </el-tabs>
 
       <template v-else-if="this.form.type == 1">
-        <el-form
-          v-for="listItem in form.feeLists"
-          :model="listItem"
-          :ref="'form' + listItem.normfeeId"
-          :rules="rules"
-          :key="listItem.normfeeId"
-        >
+        <el-form v-for="listItem in form.feeLists" :model="listItem" :ref="'form' + listItem.normfeeId" :rules="rules"
+          :key="listItem.normfeeId">
           <!-- :rules="rules" ref="form" -->z
-          <el-form-item
-            :label="
-              listItem.normfeeName + '(' + listItem.funit_dictText + ')'
-            "
-            prop="collCalue"
-          >
+          <el-form-item :label="listItem.normfeeName + '(' + listItem.funit_dictText + ')'
+            " prop="collCalue">
             <!-- 这里科研失败!想动态绑定校验规则的 -->
             <!-- :prop="listItem.normfeeId" -->
             <!-- :rules="rules.listItem.normfeeId" -->
-            <el-input
-              v-model="listItem.collCalue"
-              :placeholder="'请输入' + listItem.normfeeName"
-            ></el-input>
+            <el-input v-model="listItem.collCalue" :placeholder="'请输入' + listItem.normfeeName"></el-input>
           </el-form-item>
         </el-form>
       </template>
@@ -678,17 +387,16 @@
       </el-form>
       -->
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm('edit')" v-if="edit"
-          >确 定</el-button
-        >
-        <el-button type="primary" v-if="check" @click="handleCheck(1)"
-          >通 过</el-button
-        >
-        <el-button type="warning" v-if="check" @click="handleReject"
-          >驳 回</el-button
-        >
+        <el-button type="primary" @click="submitForm('edit')" v-if="edit">确 定</el-button>
+        <el-button type="primary" v-if="check" @click="handleCheck(1)">通 过</el-button>
+        <el-button type="warning" v-if="check" @click="handleReject">驳 回</el-button>
         <el-button type="primary" @click="cancel">返 回</el-button>
       </div>
+
+      <div class="remark" v-if="form.remark != null && form.approveStatus == 2">
+        <div class="remark_title">驳回理由:</div>
+        <div class="remark_text">{{ form.remark }}</div>
+      </div>
     </el-dialog>
   </div>
 </template>
@@ -958,7 +666,7 @@ export default {
     submitUpload() {
       this.$refs.upload.submit();
     },
-    httprequest() {},
+    httprequest() { },
     getCurrentRow(val) {
       console.log(val);
     },
@@ -1121,7 +829,7 @@ export default {
         });
     },
 
-    handleClick(tab, event) {},
+    handleClick(tab, event) { },
     /** 查询数据采集列表 */
     getList() {
       this.loading = true;
@@ -1369,7 +1077,7 @@ export default {
           this.getList();
           this.$modal.msgSuccess("删除成功");
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -1384,3 +1092,27 @@ export default {
   },
 };
 </script>
+
+
+<style scoped lang="scss">
+.remark {
+  margin-top: 20px;
+
+
+  .remark_title {
+    margin-bottom: 10px;
+    font-size: 18px;
+    font-weight: bold;
+  }
+
+  .remark_text {
+    padding: 2px;
+    min-height: 150px;
+    border: 1px solid #cccccc82;
+    border-radius: 4px;
+    color: #958383;
+    font-size: 16px;
+    background: #3333331a;
+  }
+}
+</style>