设备变更审批

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

@@ -673,20 +673,17 @@
       <el-table-column label="泄空方式" align="center" prop="leakageMode" :show-overflow-tooltip="true"/>、
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+           <el-button
+              type="text"
+              size="mini"
+              @click="addAprrove(scope.row,devType)"
+            >{{ $t('提交变更申请') }}</el-button>
           <el-button
-            size="mini"
+            v-if="scope.row.approveTime != null"
             type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['intact:gj:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['intact:gj:remove']"
-          >删除</el-button>
+            size="small"
+            @click="hisApprove(scope.row,devType)">
+            {{ $t('申请记录') }}</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -1000,6 +997,10 @@
               <el-button @click="upload.open = false">取 消</el-button>
           </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>
+
   </div>
 </template>
 
@@ -1008,17 +1009,23 @@ import { listGj, getGj, delGj, addGj, updateGj, exportGj, importTemplate} from "
 import { treeselect } from "@/api/system/dept";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
+import AddApprove from "../approve/tapprove-add"
+import HisApprove from "../approve/tapprove-his"
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "Gj",
-  components: { Treeselect },
+  components: { Treeselect,AddApprove,HisApprove },
   data() {
     return {
+      devType: 2,
       // 遮罩层
       loading: true,
+       addAprroveVisible: false,
+      hisAprroveVisible: false,
       // 选中数组
       ids: [],
+      dataListSelections: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -1459,6 +1466,34 @@ export default {
       a.setAttribute('href', process.env.VUE_APP_BASE_API + url)
       a.click()
     },
+
+    //提交申请方法
+     addAprrove (row, type) {
+      var rows = row ? [row] : this.dataListSelections.map(item => {
+        return item
+      })
+      for (let i = 0; i <rows.length ; i++) {
+        if (rows[i].approveStatus != 0) {
+          this.$alert(this.$t('当前设备正在申请中，无法重复申请'), this.$t('提示'), {
+            type: 'warning'
+          })
+          return
+        }
+      }
+      this.addAprroveVisible = true
+      console.log(rows)
+      console.log(type)
+      this.$nextTick(() => {
+        this.$refs.addApprove.init(rows, type)
+      })
+    },
+    hisApprove (row, type) {
+      this.hisAprroveVisible = true
+      
+      this.$nextTick(() => {
+        this.$refs.hisApprove.init(row, type)
+      })
+    },
   }
 };
 </script>

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

@@ -611,6 +611,17 @@
             @click="addAprrove(scope.row,devType)"
           >{{ $t('提交维修申请') }}
           </el-button>
+           <el-button
+              type="text"
+              size="mini"
+              @click="addAprroveDev(scope.row,devType2)"
+            >{{ $t('设备变更申请') }}</el-button>
+          <el-button
+            v-if="scope.row.approveTime != null"
+            type="text"
+            size="small"
+            @click="hisApproveDev(scope.row,devType2)">
+            {{ $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>
@@ -961,6 +972,9 @@
         <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>
   </div>
 </template>
 
@@ -974,10 +988,12 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import HisApprove from "@/views/sems/approve/tapprove-his";
 import AddApprove from "../approve/tapprove-maintenance-add"
+import AddApproveDev from "../approve/tapprove-add"
+import HisApproveDev from "../approve/tapprove-his"
 
 export default {
   name: "Gyl",
-  components: {Treeselect, AddApprove, HisApprove},
+  components: {Treeselect, AddApprove, HisApprove,AddApproveDev,HisApproveDev},
   data() {
     return {
       // 遮罩层
@@ -985,6 +1001,7 @@ export default {
       // 选中数组
       ids: [],
       devType: 1,
+      devType2: 4,
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -1121,6 +1138,8 @@ export default {
       recordList: [],
       addAprroveVisible: false,
       hisAprroveVisible: false,
+      addAprroveDevVisible: false,
+      hisAprroveDevVisible: false,
       openRecord : false
     };
   },
@@ -1429,6 +1448,34 @@ export default {
       a.setAttribute('href', process.env.VUE_APP_BASE_API + url)
       a.click()
     },
+
+    //提交申请方法
+     addAprroveDev (row, type) {
+      var rows = row ? [row] : this.dataListSelections.map(item => {
+        return item
+      })
+      for (let i = 0; i <rows.length ; i++) {
+        if (rows[i].approveStatus != 0) {
+          this.$alert(this.$t('当前设备正在申请中，无法重复申请'), this.$t('提示'), {
+            type: 'warning'
+          })
+          return
+        }
+      }
+      this.addAprroveDevVisible = true
+      console.log(rows)
+      console.log(type)
+      this.$nextTick(() => {
+        this.$refs.addApproveDev.init(rows, type)
+      })
+    },
+    hisApproveDev (row, type) {
+      this.hisAprroveDevVisible = true
+      
+      this.$nextTick(() => {
+        this.$refs.hisApproveDev.init(row, type)
+      })
+    },
   }
 };
 </script>

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

@@ -1099,6 +1099,7 @@ export default {
   data() {
     return {
       // 遮罩层
+      devType: 1,
       devType2: 4,
       loading: true,
        addAprroveVisible: false,

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

@@ -326,6 +326,17 @@
             @click="addAprrove(scope.row,devType)"
           >{{ $t('提交维修申请') }}
           </el-button>
+           <el-button
+              type="text"
+              size="mini"
+              @click="addAprroveDev(scope.row,devType2)"
+            >{{ $t('设备变更申请') }}</el-button>
+          <el-button
+            v-if="scope.row.approveTime != null"
+            type="text"
+            size="small"
+            @click="hisApproveDev(scope.row,devType2)">
+            {{ $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>
@@ -554,7 +565,9 @@
         <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>
   </div>
 </template>
 
@@ -568,13 +581,15 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {listRecord} from "@/api/inspection/record";
 import AddApprove from "../approve/tapprove-maintenance-add"
 import HisApprove from "../approve/tapprove-maintenance-his";
+import AddApproveDev from "../approve/tapprove-add"
+import HisApproveDev from "../approve/tapprove-his"
 
 export default {
   name: "Ysj",
-  components: {Treeselect, AddApprove, HisApprove},
+  components: {Treeselect, AddApprove, HisApprove,AddApproveDev,HisApproveDev},
   data() {
     return {
-      devType: 3,
+      devType2: 3,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -690,6 +705,9 @@ export default {
       devType: 2,
       addAprroveVisible: false,
       hisAprroveVisible: false,
+      addAprroveDevVisible: false,
+      hisAprroveDevVisible: false,
+      
       openRecord:false
       };
   },
@@ -972,6 +990,34 @@ export default {
       a.setAttribute('href', process.env.VUE_APP_BASE_API + url)
       a.click()
     },
+
+    //提交申请方法
+     addAprroveDev (row, type) {
+      var rows = row ? [row] : this.dataListSelections.map(item => {
+        return item
+      })
+      for (let i = 0; i <rows.length ; i++) {
+        if (rows[i].approveStatus != 0) {
+          this.$alert(this.$t('当前设备正在申请中，无法重复申请'), this.$t('提示'), {
+            type: 'warning'
+          })
+          return
+        }
+      }
+      this.addAprroveDevVisible = true
+      console.log(rows)
+      console.log(type)
+      this.$nextTick(() => {
+        this.$refs.addApproveDev.init(rows, type)
+      })
+    },
+    hisApproveDev (row, type) {
+      this.hisAprroveDevVisible = true
+      
+      this.$nextTick(() => {
+        this.$refs.hisApproveDev.init(row, type)
+      })
+    },
   }
 };
 </script>