浏览代码

设备一机一档档案附件

zhangding 3 年之前
父节点
当前提交
e21f5baf66

+ 10 - 0
ui/src/api/intact/gj.js

@@ -17,6 +17,16 @@ export function getGj(id) {
   })
 }
 
+/**
+ * 查询设备完整性管件台账的历史改造记录
+ */
+ export function getTIntactHiGJByReform(devId) {
+  return request({
+    url: '/his/gj/reform/' + devId,
+    method: 'get'
+  })
+}
+
 // 新增设备完整性管件台账
 export function addGj(data) {
   return request({

+ 10 - 0
ui/src/api/intact/pump.js

@@ -17,6 +17,16 @@ export function getPump(id) {
   })
 }
 
+/**
+ * 查询设备完整性泵台账的历史改造记录
+ */
+ export function getTIntactHiPumpByReform(devId) {
+  return request({
+    url: '/his/pump/reform/' + devId,
+    method: 'get'
+  })
+}
+
 // 新增设备完整性泵台账
 export function addPump(data) {
   return request({

+ 18 - 2
ui/src/views/intact/gj/index.vue

@@ -568,7 +568,6 @@
 
     <el-table v-loading="loading" :data="gjList" @selection-change="handleSelectionChange" :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="唯一标识ID" align="center" prop="id" :show-overflow-tooltip="true"/>
       <el-table-column label="装置名称" align="center" prop="plantCode" :show-overflow-tooltip="true"/>
       <el-table-column label="单元" align="center" prop="unit" :show-overflow-tooltip="true"/>
       <el-table-column label="设备名称" align="center" prop="devname" :show-overflow-tooltip="true"/>
@@ -697,8 +696,14 @@
             size="small"
             @click="hisApproveDev(scope.row,devType2)">
             {{ $t('申请记录') }}</el-button>
+              <el-button
+            type="text"
+            size="mini"
+            @click="hisReform(scope.row)"
+          >{{ $t('台账历史') }}</el-button>
           <add-approve v-if="addAprroveVisible" ref="addApprove" @refreshDataList="getList"></add-approve>
           <his-approve v-if="hisAprroveVisible" ref="hisApprove" @refreshDataList="getList"></his-approve>
+          
         </template>
       </el-table-column>
     </el-table>
@@ -1015,12 +1020,14 @@
 
       <add-approve-dev v-if="addAprroveDevVisible" ref="addApproveDev" @refreshDataList="getList"></add-approve-dev>
       <his-approve-dev v-if="hisAprroveDevVisible" ref="hisApproveDev" @refreshDataList="getList"></his-approve-dev>
+      <HisReform v-if="hisReformVisible" ref="hisReformList" ></HisReform>
   </div>
 </template>
 
 <script>
 import { listGj, getGj, delGj, addGj, updateGj, exportGj, importTemplate} from "@/api/intact/gj";
 import { treeselect } from "@/api/system/dept";
+import {allFileList, delCommonfile} from "@/api/common/commonfile";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -1028,10 +1035,11 @@ import HisApprove from "../approve/tapprove-maintenance-his";
 import AddApprove from "../approve/tapprove-maintenance-add"
 import AddApproveDev from "../approve/tapprove-add"
 import HisApproveDev from "../approve/tapprove-his"
+import HisReform from "./specGl-hisReform";
 
 export default {
   name: "Gj",
-  components: { Treeselect , AddApprove, HisApprove,AddApproveDev,HisApproveDev},
+  components: { Treeselect , AddApprove, HisApprove,HisReform,AddApproveDev,HisApproveDev},
   data() {
     return {
       devType: 3,
@@ -1184,6 +1192,7 @@ export default {
       hisAprroveVisible: false,
       addAprroveDevVisible: false,
       hisAprroveDevVisible: false,
+      hisReformVisible: false,//管件变更历史记录
       // 表单校验
       rules: {
       }
@@ -1535,6 +1544,13 @@ export default {
         this.$refs.hisApproveDev.init(row, type)
       })
     },
+    //历史
+     hisReform (row) {
+      this.hisReformVisible = true
+      this.$nextTick(() => {
+        this.$refs.hisReformList.init(row)
+      })
+    },
   }
 };
 </script>

+ 4 - 105
ui/src/views/intact/gyl/index.vue

@@ -493,12 +493,7 @@
           <span>{{ parseTime(scope.row.submitdate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-            <el-table-column label="档案" align="center" prop="archives" :show-overflow-tooltip="true" >
-       <template slot-scope="scope">
-
-         <el-button icon="el-icon-folder" style="color:#6e96fa;"  @click="handleDoc(scope.row)"  ></el-button>
-       </template>
-      </el-table-column>
+ 
       <el-table-column label="状态" align="center" prop="status" :show-overflow-tooltip="true"/>
 <!--      <el-table-column label="创建人" align="center" prop="createrCode" :show-overflow-tooltip="true"/>-->
 <!--      <el-table-column label="创建时间" align="center" prop="createdate" width="100">-->
@@ -913,71 +908,7 @@
               <el-button @click="upload.open = false">取 消</el-button>
           </div>
       </el-dialog>
-         <!-- 档案附件对话框 -->
-    <el-dialog v-dialogDrag :title="doc.title" :visible.sync="doc.open" width="700px" append-to-body>
-      <el-upload
-        ref="doc"
-        :limit="50"
-        :headers="doc.headers"
-        :action="doc.url + '?pType=' + doc.pType + '&pId=' + doc.pId"
-        :disabled="doc.isUploading"
-        :on-progress="handleFileDocProgress"
-        :on-success="handleFileDocSuccess"
-        :auto-upload="true"
-        drag
-      >
-        <i class="el-icon-upload"></i>
-        <div class="el-upload__text">
-          {{ $t('将文件拖到此处,或') }}
-          <em>{{ $t('点击上传') }}</em>
-        </div>
-      </el-upload>
-        <el-table :data="doc.commonfileList" border>
-          <el-table-column :label="$t('文件名')" align="center" prop="fileName" :show-overflow-tooltip="true">
-          <template slot-scope="scope">
-            <a  class="link-type"  @click="handleDownload(scope.row)">
-              <span>{{ scope.row.fileName }}</span>
-            </a>
-          </template>
-          </el-table-column>
-          <el-table-column :label="$t('大小(Kb)')" align="center" prop="fileSize" :show-overflow-tooltip="true" width="80" />
-          <el-table-column :label="$t('上传人')" align="center" prop="creator" :show-overflow-tooltip="true" width="120"/>
-          <el-table-column :label="$t('操作')" align="center" width="150" class-name="small-padding fixed-width">
-            <template slot-scope="scope">
-              <el-button
-                v-if="scope.row.fileName.endsWith('pdf')"
-                size="mini"
-                type="text"
-                icon="el-icon-view"
-                @click="handleSee(scope.row)"
-              >{{ $t('预览') }}</el-button>
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-download"
-                @click="handleDownload(scope.row)"
-              >{{ $t('下载') }}</el-button>
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-delete"
-                @click="handleDeleteDoc(scope.row)"
-              >{{ $t('删除') }}</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-      <div slot="footer" class="dialog-footer">
-<!--        <el-button type="primary" @click="submitFileForm">{{ $t('确 定') }}</el-button>-->
-        <el-button @click="doc.open = false">{{ $t('返 回') }}</el-button>
-      </div>
-    </el-dialog>
-    <el-dialog v-dialogDrag :title="pdf.title" :visible.sync="pdf.open" width="1300px" append-to-body>
-        <div style="margin-top: -60px;float: right;margin-right: 40px;">
-          <el-button size="mini" type="text" @click="openPdf">{{$t('新页面打开PDF')}}</el-button></div>
-      <div style="margin-top: -30px">
-        <iframe :src="pdf.pdfUrl" frameborder="0" width="100%" height="700px"></iframe>
-      </div>
-    </el-dialog>
+      
     <intact-record  v-if="intactRecordVisible" ref="intactRecord"></intact-record>
 
     <add-approve-dev v-if="addAprroveDevVisible" ref="addApproveDev" @refreshDataList="getList"></add-approve-dev>
@@ -1043,40 +974,7 @@ export default {
             // 上传的地址
             url: process.env.VUE_APP_BASE_API + "/intact/gyl/importData"
         },
-           // 报告附件参数
-      doc: {
-        file: "123",
-        // 是否显示弹出层(报告附件)
-        open: false,
-        // 弹出层标题(报告附件)
-        title: "",
-        // 是否禁用上传
-        isUploading: false,
-        // 是否更新已经存在的用户数据
-        updateSupport: 0,
-        // 报告附件上传位置编号
-        ids: 0,
-        // 设置上传的请求头部
-        headers: { Authorization: "Bearer " + getToken() },
-        // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/common/commonfile/uploadFile",
-        commonfileList: null,
-        queryParams: {
-          pId: null,
-          pType: 'gyl'
-        },
-        pType: 'gyl',
-        pId: null
-      },
-      pdf : {
-        title: '',
-        pdfUrl: '',
-        numPages: null,
-        open: false,
-        pageNum: 1,
-        pageTotalNum: 1,
-        loadedRatio: 0,
-      },
+     
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -1461,6 +1359,7 @@ export default {
       this.intactRecordVisible = true
       this.$nextTick(() => {
         this.$refs.intactRecord.init(row)
+       
       })
     },
 

+ 309 - 10
ui/src/views/intact/gyl/intactRecord.vue

@@ -1,4 +1,5 @@
 <template>
+
   <el-dialog :title="$t('一机一档')" :visible.sync="visible" width="1200px" append-to-body>
     <el-card>
       <div slot="header" class="clearfix">
@@ -31,17 +32,150 @@
     <el-card>
       <div slot="header" class="clearfix">
         <span>原始资料(厂家,产品编号等)</span>
+
       </div>
-      <el-table v-loading="loading" :data="list" border>
+      <el-table v-loading="loading" :data="yuanshilist" border>
+        <el-table-column label="设备id" align="center" prop="id"  v-if="false" :show-overflow-tooltip="true"/>
+        <el-table-column label="设备位号" align="center" prop="devno" :show-overflow-tooltip="true"/>
+        <el-table-column label="设备名称" align="center" prop="devname" :show-overflow-tooltip="true"/>
+        <el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" />
+        <el-table-column label="原始资料档案查看" align="center" prop="archives" :show-overflow-tooltip="true" >
+          <template slot-scope="scope">
 
+            <el-button icon="el-icon-folder" style="color:#6e96fa;"  @click="handleDoc(scope.row)"  ></el-button>
+            <el-dialog v-dialogDrag :title="doc.title" :visible.sync="doc.open" width="700px" append-to-body>
+              <el-upload
+                ref="doc"
+                :limit="50"
+                :headers="doc.headers"
+                :action="doc.url + '?pType=' + doc.pType + '&pId=' + doc.pId"
+                :disabled="doc.isUploading"
+                :on-progress="handleFileDocProgress"
+                :on-success="handleFileDocSuccess"
+                :auto-upload="true"
+                drag
+              >
+                <i class="el-icon-upload"></i>
+                <div class="el-upload__text">
+                  {{ $t('将文件拖到此处,或') }}
+                  <em>{{ $t('点击上传') }}</em>
+                </div>
+              </el-upload>
+              <el-table :data="doc.commonfileList" border>
+                <el-table-column :label="$t('文件名')" align="center" prop="fileName" :show-overflow-tooltip="true">
+                  <template slot-scope="scope">
+                    <a  class="link-type"  @click="handleDownload(scope.row)">
+                      <span>{{ scope.row.fileName }}</span>
+                    </a>
+                  </template>
+                </el-table-column>
+                <el-table-column :label="$t('大小(Kb)')" align="center" prop="fileSize" :show-overflow-tooltip="true" width="80" />
+                <el-table-column :label="$t('上传人')" align="center" prop="creator" :show-overflow-tooltip="true" width="120"/>
+                <el-table-column :label="$t('操作')" align="center" width="150" class-name="small-padding fixed-width">
+                  <template slot-scope="scope">
+                    <el-button
+                      v-if="scope.row.fileName.endsWith('pdf')"
+                      size="mini"
+                      type="text"
+                      icon="el-icon-view"
+                      @click="handleSee(scope.row)"
+                    >{{ $t('预览') }}</el-button>
+                    <el-button
+                      size="mini"
+                      type="text"
+                      icon="el-icon-download"
+                      @click="handleDownload(scope.row)"
+                    >{{ $t('下载') }}</el-button>
+                    <el-button
+                      size="mini"
+                      type="text"
+                      icon="el-icon-delete"
+                      @click="handleDeleteDoc(scope.row)"
+                    >{{ $t('删除') }}</el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+              <div slot="footer" class="dialog-footer">
+                <!--        <el-button type="primary" @click="submitFileForm">{{ $t('确 定') }}</el-button>-->
+                <el-button @click="doc.open = false">{{ $t('返 回') }}</el-button>
+              </div>
+            </el-dialog>
+          </template>
+        </el-table-column>
       </el-table>
     </el-card>
     <el-card>
       <div slot="header" class="clearfix">
         <span>安装资料、使用说明</span>
       </div>
-      <el-table v-loading="loading" :data="list" border>
+      <el-table v-loading="loading" :data="anzhuanglist" border>
+       <el-table-column label="设备id" align="center" prop="id"  v-if="false" :show-overflow-tooltip="true"/>
+        <el-table-column label="设备位号" align="center" prop="devno" :show-overflow-tooltip="true"/>
+        <el-table-column label="设备名称" align="center" prop="devname" :show-overflow-tooltip="true"/>
+        <el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" />
+  <el-table-column label="安装资料档案查看" align="center" prop="archives" :show-overflow-tooltip="true" >
+          <template slot-scope="scope">
 
+            <el-button icon="el-icon-folder" style="color:#6e96fa;"  @click="handleDoc11(scope.row)"  ></el-button>
+                <el-dialog v-dialogDrag :title="doc11.title" :visible.sync="doc11.open" width="700px" append-to-body>
+              <el-upload
+                ref="doc11"
+                :limit="50"
+                :headers="doc11.headers"
+                :action="doc11.url + '?pType=' + doc11.pType + '&pId=' + doc11.pId"
+                :disabled="doc11.isUploading"
+                :on-progress="handleFileDocProgress11"
+                :on-success="handleFileDocSuccess11"
+                :auto-upload="true"
+                drag
+              >
+                <i class="el-icon-upload"></i>
+                <div class="el-upload__text">
+                  {{ $t('将文件拖到此处,或') }}
+                  <em>{{ $t('点击上传') }}</em>
+                </div>
+              </el-upload>
+              <el-table :data="doc11.commonfileList" border>
+                <el-table-column :label="$t('文件名')" align="center" prop="fileName" :show-overflow-tooltip="true">
+                  <template slot-scope="scope">
+                    <a  class="link-type"  @click="handleDownload(scope.row)">
+                      <span>{{ scope.row.fileName }}</span>
+                    </a>
+                  </template>
+                </el-table-column>
+                <el-table-column :label="$t('大小(Kb)')" align="center" prop="fileSize" :show-overflow-tooltip="true" width="80" />
+                <el-table-column :label="$t('上传人')" align="center" prop="creator" :show-overflow-tooltip="true" width="120"/>
+                <el-table-column :label="$t('操作')" align="center" width="150" class-name="small-padding fixed-width">
+                  <template slot-scope="scope">
+                    <el-button
+                      v-if="scope.row.fileName.endsWith('pdf')"
+                      size="mini"
+                      type="text"
+                      icon="el-icon-view"
+                      @click="handleSee(scope.row)"
+                    >{{ $t('预览') }}</el-button>
+                    <el-button
+                      size="mini"
+                      type="text"
+                      icon="el-icon-download"
+                      @click="handleDownload(scope.row)"
+                    >{{ $t('下载') }}</el-button>
+                    <el-button
+                      size="mini"
+                      type="text"
+                      icon="el-icon-delete"
+                      @click="handleDeleteDoc(scope.row)"
+                    >{{ $t('删除') }}</el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+              <div slot="footer" class="dialog-footer">
+                <!--        <el-button type="primary" @click="submitFileForm">{{ $t('确 定') }}</el-button>-->
+                <el-button @click="doc11.open = false">{{ $t('返 回') }}</el-button>
+              </div>
+            </el-dialog>
+                 </template>
+        </el-table-column>
       </el-table>
     </el-card>
     <el-card>
@@ -80,9 +214,9 @@
         <el-table-column label="处理情况" align="center" prop="treatment" :show-overflow-tooltip="true"/>
         <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
       </el-table>
-<!--      <el-table :data="list" v-loading="planLoading"  border>-->
+      <!--      <el-table :data="list" v-loading="planLoading"  border>-->
 
-<!--      </el-table>-->
+      <!--      </el-table>-->
     </el-card>
     <el-card>
       <div slot="header" class="clearfix">
@@ -128,9 +262,9 @@
         </el-table-column>
       </el-table>
       <spec-maintenance v-if="specMaintenanceVisible" ref="specMaintenance"></spec-maintenance>
-<!--      <el-table :data="list" v-loading="planLoading"  border>-->
+      <!--      <el-table :data="list" v-loading="planLoading"  border>-->
 
-<!--      </el-table>-->
+      <!--      </el-table>-->
     </el-card>
     <el-card>
       <div slot="header" class="clearfix">
@@ -157,11 +291,14 @@
 </template>
 
 <script>
+import { listGyl, getGyl, delGyl, addGyl, updateGyl, exportGyl, importTemplate} from "@/api/intact/gyl";
 import Treeselect from "@riophae/vue-treeselect";
+import {allFileList, delCommonfile} from "@/api/common/commonfile";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {listPlan} from "@/api/training/spec/plan";
 import {listParticipants} from "@/api/training/participants";
 import {listDevice} from "@/api/training/device";
+import {getToken} from "@/utils/auth";
 import {listRecord} from "@/api/inspection/record";
 import {hisApprovelist} from "@/api/intact/maintenance";
 import SpecMaintenance from "@/views/approve/approveDetail/specMaintenance-detail";
@@ -181,6 +318,8 @@ export default {
       approveTypeOptions: [{dictValue:1,dictLabel:'维修'}],
       statusOptions: [],
       list: [],
+      yuanshilist:[],
+      anzhuanglist:[],
       // 遮罩层
       loading: false,
       planLoading: false,
@@ -237,18 +376,67 @@ export default {
         year: this.getNowTime(),
         trainingType: null
       },
+      doc: {
+        file: "123",
+        // 是否显示弹出层(报告附件)
+        open: false,
+        // 弹出层标题(报告附件)
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 报告附件上传位置编号
+        ids: 0,
+        // 设置上传的请求头部
+        headers: { Authorization: "Bearer " + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/common/commonfile/uploadFile",
+        commonfileList: null,
+        queryParams: {
+          pId: null,
+          pType: 'intactRecord'
+        },
+        pType: 'intactRecord',
+        pId: null
+      },
+        doc11: {
+        file: "123",
+        // 是否显示弹出层(报告附件)
+        open: false,
+        // 弹出层标题(报告附件)
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 报告附件上传位置编号
+        ids: 0,
+        // 设置上传的请求头部
+        headers: { Authorization: "Bearer " + getToken() },
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/common/commonfile/uploadFile",
+        commonfileList: null,
+        queryParams: {
+          pId: null,
+          pType: 'intactRecord'
+        },
+        pType: 'intactRecord',
+        pId: null
+      },
       // 表单参数
       form: {},
       // 表单校验
       rules: {}
     };
+
   },
   watch: {},
   created() {
     this.getDicts("PLANT_DIVIDE").then(response => {
       this.plantCodeOptions = response.data;
     });
-    this.getDicts("spec_approve_res").then(response => {
+    this.getDicts("INTACT_STATUS").then(response => {
       this.statusOptions = response.data;
     });
   },
@@ -256,6 +444,19 @@ export default {
     init(row) {
       this.row=row
       this.visible = true
+    
+      //给原始、安装资料的list数据赋值
+      
+      getGyl(row.id).then(response => {
+        const didi=[]
+        didi.push(response.data)
+       this.yuanshilist=didi
+       this.anzhuanglist=didi
+        this.total = response.total;
+        this.loading = false;
+       
+      });
+    
       var data = {
         devno:row.devno,
         region:row.position
@@ -264,16 +465,18 @@ export default {
         this.recordList = response.rows;
         this.total = response.total;
         this.loading = false;
+        
       });
 
       var data2={
-      devId : row.id,
-      devType : this.devType
+        devId : row.id,
+        devType : this.devType
       }
       hisApprovelist(data2).then(response => {
         this.approveList = response.data;
         this.total = response.total;
         this.loading = false;
+      
       });
     },
     staffPlanQuery1(row,year){
@@ -287,6 +490,9 @@ export default {
         this.total = response.total;
         this.loading = false;
       });
+    },
+    handleSee(row){
+
     },
     staffPlanQuery(){
       alert("123123qqss")
@@ -335,7 +541,100 @@ export default {
         this.total = response.total;
         this.loading = false;
       });
-    }
+    },
+
+    /** 原始资料档案附件按钮操作 */
+    handleDoc(row) {
+      console.log(row)
+
+      this.doc.id = row.id;
+      this.doc.title = row.filename;
+      this.doc.open = true;
+      this.doc.queryParams.pId = row.id
+      this.doc.pId = row.id
+      this.getFileList()
+      this.$nextTick(() => {
+        this.$refs.doc.clearFiles()
+      })
+
+    },
+    //安装资料档案操作
+    handleDoc11(row) {
+
+ 
+      this.doc11.id = row.id;
+      this.doc11.title = row.filename;
+      this.doc11.open = true;
+      this.doc11.queryParams.pId = row.id+row.id
+      this.doc11.pId = row.id+row.id
+      this.getFileList11()
+      this.$nextTick(() => {
+        this.$refs.doc11.clearFiles()
+      })
+
+    },
+    //原始资料得到文件列表
+    getFileList (){
+      allFileList(this.doc.queryParams).then(response => {
+        this.doc.commonfileList = response;
+      });
+    },
+    //安装资料得到文件列表
+    getFileList11 (){
+      allFileList(this.doc11.queryParams).then(response => {
+        this.doc11.commonfileList = response;
+      });
+    },
+    //原始附件上传中处理
+    handleFileDocProgress(event, file, fileList) {
+      this.doc.file = file;
+      this.doc.isUploading = true;
+    },
+    //原始附件上传成功处理
+    handleFileDocSuccess(response, file, fileList) {
+      this.doc.isUploading = false;
+      this.$alert(response.msg, this.$t('导入结果'), { dangerouslyUseHTMLString: true });
+      this.getFileList()
+    },
+     //安装附件上传中处理
+    handleFileDocProgress11(event, file, fileList) {
+      this.doc11.file = file;
+      this.doc11.isUploading = true;
+    },
+    //安装附件上传成功处理11
+    handleFileDocSuccess11(response, file, fileList) {
+      this.doc11.isUploading = false;
+      this.$alert(response.msg, this.$t('导入结果'), { dangerouslyUseHTMLString: true });
+      this.getFileList11()
+    },
+    /** 删除按钮操作 */
+    handleDeleteDoc(row) {
+      const ids = row.id || this.ids;
+      this.$confirm(this.$t('是否确认删除?'), this.$t('警告'), {
+        confirmButtonText: this.$t('确定'),
+        cancelButtonText: this.$t('取消'),
+        type: "warning"
+      }).then(function() {
+        return delCommonfile(ids);
+      }).then(() => {
+        this.getFileList()
+        this.getFileList11()
+        this.msgSuccess(this.$t('删除成功'));
+      })
+    },
+    // 文件下载处理
+    handleDownload(row) {
+      var name = row.fileName;
+      var url = row.fileUrl;
+      var suffix = url.substring(url.lastIndexOf("."), url.length);
+      console.log(url)
+      const a = document.createElement('a')
+      a.setAttribute('download', name)
+      a.setAttribute('target', '_blank')
+      a.setAttribute('href', process.env.VUE_APP_BASE_API + url)
+      a.click()
+    },
+
   }
 };
 </script>

+ 8 - 2
ui/src/views/intact/pump/index.vue

@@ -670,7 +670,7 @@
       <el-table-column label="尺寸" align="center" prop="deviceSize" :show-overflow-tooltip="true"/>
       <el-table-column label="泄空方式" align="center" prop="leakageMode" :show-overflow-tooltip="true"/>
 
-      <el-table-column :label="$t('操作')" align="center" fixed="right" width="140" class-name="small-padding fixed-width">
+      <el-table-column :label="$t('操作')" align="center" fixed="right" width="240" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
               type="text"
@@ -682,7 +682,7 @@
             type="text"
             size="small"
             @click="hisApprove(scope.row,devType)">
-            {{ $t('申请记录') }}</el-button>
+            {{ $t('变更记录') }}</el-button>
           <el-button
             v-if="scope.row.approveTime != null"
             type="text"
@@ -696,6 +696,11 @@
             @click="addAprrove2(scope.row,devType2)"
           >{{ $t('提交维修申请') }}
           </el-button>
+          <el-button
+            type="text"
+            size="mini"
+            @click="hisReform(scope.row)"
+          >{{ $t('台账历史') }}</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -1107,6 +1112,7 @@ export default {
       addAprroveVisible2: false,
       hisAprroveVisible2: false,
       hisCheckVisible: false,
+      hisReformVisible: false,//泵变更历史记录
       // 选中数组
       ids: [],
       dataListSelections: [],

+ 1 - 1
ui/src/views/intact/pump/specGl-hisReform.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :title="$t('改造记录')" :visible.sync="visible" width="1200px" append-to-body>
+  <el-dialog :title="$t('台账历史')" :visible.sync="visible" width="1200px" append-to-body>
     <el-table v-loading="loading" ref="reTable" :data="specHiGlList"  :height="clientHeight" border>
       <el-table-column :label="$t('装置')" align="center" fixed="left"  prop="plantCode" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('单元')" align="center"  fixed="left" prop="unit" :show-overflow-tooltip="true"/>