设备完整性界面和一机一档页面调整

ui/src/views/intact/gj/index.vue

@@ -572,12 +572,7 @@
       <el-table-column label="单元" align="center" prop="unit" :show-overflow-tooltip="true"/>
       <el-table-column label="设备名称" align="center" prop="devname" :show-overflow-tooltip="true"/>
       <el-table-column label="设备位号" align="center" prop="devno" :show-overflow-tooltip="true"/>
-          <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="submitdate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.submitdate, '{y}-{m}-{d}') }}</span>

ui/src/views/intact/gyl/intactRecord.vue

@@ -306,6 +306,7 @@
 
 <script>
 import { listGyl, getGyl, delGyl, addGyl, updateGyl, exportGyl, importTemplate} from "@/api/intact/gyl";
+import {  getApproveInfo,listHisApprove } from "@/api/intact/approve_dev";
 import Treeselect from "@riophae/vue-treeselect";
 import {allFileList, delCommonfile} from "@/api/common/commonfile";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -497,16 +498,20 @@ export default {
         this.loading = false;
 
       });
-       var data3={
+     
+      //设备变更信息
+        var data3={
         devId : row.id,
         devType : this.devType
       }
-      getApproveInfo(data3).then(response => {
+      //变更的申请记录
+      listHisApprove(data3).then(response => {
         this.changelist = response.data;
         this.total = response.total;
         this.loading = false;
-
       });
+      
+
     },
     staffPlanQuery1(row,year){
       var data2={

ui/src/views/intact/pump/index.vue

@@ -571,12 +571,7 @@
       <el-table-column label="单元" align="center" prop="unit" :show-overflow-tooltip="true"/>
       <el-table-column label="设备名称" align="center" prop="devname" :show-overflow-tooltip="true"/>
       <el-table-column label="设备位号" align="center" prop="devno" :show-overflow-tooltip="true"/>
-         <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="submitdate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.submitdate, '{y}-{m}-{d}') }}</span>
@@ -1007,71 +1002,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>
+   
 
       <add-approve v-if="addAprroveVisible" ref="addApprove" @refreshDataList="getList"></add-approve>
     <his-approve v-if="hisAprroveVisible" ref="hisApprove" @refreshDataList="getList"></his-approve>

ui/src/views/intact/ysj/index.vue

@@ -257,12 +257,7 @@
       <el-table-column label="单元" align="center" prop="unit" :show-overflow-tooltip="true"/>
       <el-table-column label="设备名称" align="center" prop="devname" :show-overflow-tooltip="true"/>
       <el-table-column label="设备位号" align="center" prop="devno" :show-overflow-tooltip="true"/>
-            <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="position" :show-overflow-tooltip="true"/>
       <el-table-column label="尺寸" align="center" prop="deviceSize" :show-overflow-tooltip="true"/>
       <el-table-column label="设计压力" align="center" prop="desPressure" :show-overflow-tooltip="true"/>
@@ -500,71 +495,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>
+   
     
     <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>