修改了报告管理

pages/soil-report-manage/report-audit/tabs/historyTask.vue

@@ -284,12 +284,7 @@ export default {
     },
 
     _uploadByIds(id) {
-      const tempData = {
-        id: id,
-        uploadFileUrl: '/v1/entrust_attachment/upload/',
-        downloadFileUrl: '/v1/entrust_attachment/download/'
-      }
-      this.$refs.FileManage._open(tempData, 'entrustId')
+      this.$refs.FileManage._open(id, 'entrustId')
     },
     // 文件返回的数据
     _fileResult(msg, data) {

pages/soil-report-manage/report-audit/tabs/reportAudit.vue

@@ -318,12 +318,7 @@ export default {
     },
 
     _uploadByIds(id) {
-      const tempData = {
-        id: id,
-        uploadFileUrl: '/v1/entrust_attachment/upload/',
-        downloadFileUrl: '/v1/entrust_attachment/download/'
-      }
-      this.$refs.FileManage._open(tempData, 'entrustId')
+      this.$refs.FileManage._open(id, 'entrustId')
     },
     // 文件返回的数据
     _fileResult(msg, data) {

pages/soil-report-manage/report-issue/tabs/historyTask.vue

@@ -36,62 +36,48 @@
         </Form-item>
       </Form>
       <Col span="24">
-      <btn-list :msg="btn" :open="searchOpen" @on-result-change="_btnClick" show-search-btn="true" />
+      <btn-list :msg="btn" :open="searchOpen" @on-result-change="_btnClick" style="height: 30px;" show-search-btn="true" />
       </Col>
 <!--      <Button type="primary" @click="_submitReportCheck">-->
 <!--        提交-->
 <!--      </Button>-->
       <Col span="24">
-      <element-table
-        ref="pageTable"
-        :page-columns="pageColumns"
-        :table-height="tableHeight"
-        :get-page="getPage"
-        @on-result-change="_tableResultChange"
-        show-check-box
-        select-data
-      >
-        <el-table-column
-          v-for="item in pageColumns"
-          :key="item.key"
-          :prop="item.key"
-          :label="item.title"
-          :align="item.align"
-          :width="item.width"
-          :min-width="200"
-          :fixed="item.fixed?item.fixed:undefined"
-          show-overflow-tooltip
-          sortable
-        >
-          <template slot-scope="scope" @click.stop="_handleIndex(scope)">
-            <span v-if="item.datetime">
-              {{ scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd HH:MM:ss'):'' }}
-            </span>
-            <div v-else-if="item.status">
-              {{ scope.row[item.key] === undefined ? '': scope.row[item.key].display }}
-            </div>
-            <span v-else>
-              {{ scope.row[item.key] }}
-            </span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          slot="col"
-          :width="120"
-          label="操作"
-          align="center"
-          fixed="right"
-        >
-          <template slot-scope="scope">
-            <icon-list
-              :msg="iconMsg"
-              :row-data="scope.row"
-              :row-index="scope.$index"
-              @on-result-change="_iconClick"
-            />
-          </template>
-        </el-table-column>
-      </element-table>
+        <PTVXETable
+          ref="pageTable"
+          :tableHeight="tableHeight"
+          :getPage="getPage"
+          :iconMsg="iconMsg"
+          @on-result-change="_tableResultChange"  select-data>
+          <vxe-table-column
+            v-for="item in pageColumns"
+            :key="item.key"
+            :field="item.key"
+            :title="item.title"
+            :min-width="100"
+            :width="item.width"
+            :fixed="item.fixed?item.fixed:undefined"
+            sortable
+          >
+            <template slot-scope="scope">
+              <a @click.stop="_detailModal(scope.row.id,scope.row.type)"
+                 v-if="item.detail">{{scope.row[item.key]}}</a>
+              <div v-else-if="item.type">{{scope.row[item.key]?'政府':'企业'}}</div>
+              <div v-else-if="item.date">{{scope.row[item.key]?$dateformat(scope.row[item.key],'yyyy-mm-dd'): ''}}
+              </div>
+              <div v-else-if="item.key==='havePhoto'">{{scope.row[item.key]===1?'是':
+                scope.row[item.key]===0?'否':''}}
+              </div>
+              <div v-else-if="item.status">
+                <span v-if="scope.row[item.key].display === '报告审核退回'||'报告签发退回' ===scope.row[item.key].display " style="color: red;">{{ scope.row[item.key] === undefined ? '': scope.row[item.key].display }}</span>
+                <span v-else>{{ scope.row[item.key] === undefined ? '': scope.row[item.key].display }}</span>
+              </div>
+              <div v-else-if="item.judge">
+                {{Number(scope.row[item.key]) === 0? '否':'是'}}
+              </div>
+              <div v-else>{{scope.row[item.key]}}</div>
+            </template>
+          </vxe-table-column>
+        </PTVXETable>
       </Col>
     </Row>
     <fileManage ref="FileManage" @on-result-change="_fileResult" />
@@ -131,7 +117,6 @@ export default {
       btn: [
         // { id: 'env-report-make-submit', type: 'primary', name: '提交' },
         // { id: '', type: 'primary', name: '生成' },
-        { id: 'ZBC', type: 'primary', name: '下载' }
       ],
       getPage: {},
       searchOpen: false,
@@ -162,7 +147,7 @@ export default {
       const result = await soilReport.pageReportIssueHis(data)
       if (result) {
         this.getPage = result
-        this.$refs.pageTable._initTable()
+        this.$refs.pageTable._hideLoading()
       }
     },
     _clearPage() {
@@ -337,12 +322,7 @@ export default {
     },
 
     _uploadByIds(id) {
-      const tempData = {
-        id: id,
-        uploadFileUrl: '/v1/entrust_attachment/upload/',
-        downloadFileUrl: '/v1/entrust_attachment/download/'
-      }
-      this.$refs.FileManage._open(tempData, 'entrustId')
+      this.$refs.FileManage._open(id, 'entrustId')
     },
     // 文件返回的数据
     _fileResult(msg, data) {

pages/soil-report-manage/report-issue/tabs/reportIssue.vue

@@ -352,12 +352,7 @@ export default {
     },
 
     _uploadByIds(id) {
-      const tempData = {
-        id: id,
-        uploadFileUrl: '/v1/entrust_attachment/upload/',
-        downloadFileUrl: '/v1/entrust_attachment/download/'
-      }
-      this.$refs.FileManage._open(tempData, 'entrustId')
+      this.$refs.FileManage._open(id, 'entrustId')
     },
     // 文件返回的数据
     _fileResult(msg, data) {