eee

src/views/EquipmentArchives/detailsPage.vue

@@ -40,6 +40,10 @@
                 <span v-else>{{ row.code }}</span>
             </template>
 
+              <template slot-scope="{ row, index }" slot="maintenanceSecond">
+                <el-link type="primary" @click="maintenanceSecondC(row)">{{ row.maintenanceSecond }}</el-link>
+              </template>
+
             <template slot="remarks" slot-scope="{ row, index }">
                 <el-input v-if="row.$cellEdit" v-model="row.remarks"
                           placeholder="请输入" size="small" :controls="false" style="width:100%;"></el-input>
@@ -179,6 +183,37 @@
         </span>
     </el-dialog>
 
+    <el-dialog
+      title="维修信息"
+      :visible.sync="maintenanceSecondList"
+      width="80%"
+      append-to-body>
+
+      <el-table :data="maintenanceData" style="width: 100%">
+        <el-table-column prop="repairReportDate" label="报修日期"></el-table-column>
+        <el-table-column prop="completeDate" label="完成日期"> </el-table-column>
+        <el-table-column prop="maintenanceWorkerName" label="维修工"> </el-table-column>
+        <el-table-column prop="maintenanceWorkerTel" label="维修电话"> </el-table-column>
+        <el-table-column prop="maintenanceAmount" label="维修金额"  width="180"> </el-table-column>
+      </el-table>
+
+      <el-pagination
+        @size-change="getMaintenanceList"
+        @current-change="getMaintenanceList"
+        :current-page.sync="mPcurrent"
+        :page-sizes="[10, 20, 30, 40]"
+        :page-size="mPageSize"
+        layout="sizes, prev, pager, next"
+        :total="mDtotal"
+        style="display: flex;
+        justify-content: flex-end;">
+      </el-pagination>
+
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="maintenanceSecondList = false">关 闭</el-button>
+      </span>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -202,10 +237,22 @@ import {
 import { getGoodstype } from "@/api/basicData/product";
 import {getFee, saveFile} from "../../api/landTransportation";
 import {getDictionary} from "../../api/system/dictbiz";
+import {maintenanceList} from "../../api/basicData/maintenanceQ";
 export default {
   name: "index",
   data() {
     return {
+
+      // 维修次数弹窗
+      maintenanceSecondList: false,
+      // 维修信息list
+      maintenanceData: [],
+      // 总共数量
+      mDtotal: 0,
+      // 每页数量
+      mPageSize: 10,
+      // 当前页
+      mPcurrent: 1,
         // 图片的弹窗的开启
         imgfalse:false,
         imgtext:'',
@@ -476,8 +523,9 @@ export default {
 
         loading:false,
 
-        dataId: ''
-
+        dataId: '',
+      // 设备id
+      archivesId: ''
     };
   },
   props: {
@@ -507,6 +555,29 @@ export default {
     // });
   },
   methods: {
+    getMaintenanceList(pageSize) {
+      this.mPageSize = pageSize
+      this.maintenanceSecondC()
+    },
+
+    // 维修次数点击事件
+    maintenanceSecondC(row) {
+
+      this.archivesId = row.id
+
+      var params = {
+        archivesId: this.form.id,
+        deviceId: row.srcId
+      }
+
+      maintenanceList(this.mPcurrent, this.mPageSize, params).then(res => {
+        this.mDtotal = res.data.data.total
+        this.mPcurrent = res.data.data.current;
+        this.maintenanceData = res.data.data.records
+      })
+
+      this.maintenanceSecondList = true
+    },
       // 打印报表按钮事件
     openReport() {
       this.switchDialog = !this.switchDialog;
@@ -709,6 +780,7 @@ export default {
                     specs:item.specs,
                     remarks:item.remarks,
                     goodsTypeId:item.goodsTypeId,
+                    srcId:item.srcId,
                     // goodsTypeName:item.goodsTypeName,
                     maintenanceSecond:item.maintenanceSecond?item.maintenanceSecond:0,
                     exitDate:item.exitDate?item.exitDate + ' 00:00:00':item.exitDate,
@@ -814,11 +886,13 @@ export default {
       importGoods(){
           if (this.goodsListSave.length > 0) {
               for (let item of this.goodsListSave) {
+                const srcId = item.id
                   delete item.id
                   this.data.push({
                       $cellEdit: true,
                       storageId: this.form.storageId,
                       factoryId:item.corpId,
+                      srcId:srcId,
                       factoryName:item.corpName,
                       ...item,
                       equipmentDescribe:item.cname,
@@ -826,10 +900,12 @@ export default {
               }
           }else {
               for (let item of this.tableData) {
+                const srcId = item.id
                   delete item.id
                   this.data.push({
                       $cellEdit: true,
                       storageId: this.form.storageId,
+                      srcId:srcId,
                       factoryId:item.corpId,
                       factoryName:item.corpName,
                       ...item,

src/views/maintenanceQ/detailsPage.vue

@@ -406,7 +406,7 @@ export default {
       for (const item of this.deviceList) {
         if (item.cname == cname) {
 
-          this.form.deviceId = item.id
+          this.form.deviceId = item.srcId
           this.form.deviceDescribe = item.cname
 
           this.form.categoryitem = item.categoryitem
@@ -570,6 +570,7 @@ export default {
                 corpId:this.form.corpId,
                 corpName:this.form.corpName,
                 corpTel:this.form.corpTel,
+                archivesId: this.form.archivesId,
                 deviceAddress:this.form.deviceAddress,
                 faultDescribe:this.form.faultDescribe,
                 maintenanceWorkerId:this.form.maintenanceWorkerId,