巡检计划和开发票接口联调

src/api/labManagement/repair.js

@@ -69,4 +69,39 @@ export const servicemanSubmit = (data) =>{
         method:'post',
         data
     })
-}
+}
+
+// 客户确认完成
+export const customerConfirmFinish = (data) =>{
+  return request({
+      url:'/api/lab-ops/maintenance/repair-customer-confirm-finish',
+      method:'post',
+      data
+  })
+}
+// 客户确认未完成
+export const customerRefuseFinish = (data) =>{
+  return request({
+      url:'/api/lab-ops/maintenance/repair-customer-refuse-finish',
+      method:'post',
+      data
+  })
+}
+
+//确认付款完成
+export const repairServiceConfirm = (data) =>{
+  return request({
+      url:'/api/lab-ops/maintenance/repair-service-confirm',
+      method:'post',
+      data
+  })
+}
+
+// 客服确认开发票
+export const repairConfirmConfirm = (data) =>{
+  return request({
+      url:'/api/lab-ops/maintenance/repair-service-confirm-invoice',
+      method:'post',
+      data
+  })
+}

src/api/labManagement/task.js

@@ -86,3 +86,4 @@ export const customerRefuse = (data) =>{
         data
     })
 }
+

src/views/businessManagement/inspection/task.vue

@@ -25,8 +25,8 @@
           <!-- role_id  运维主管 1839537055389515777  维修人员 1839552581620793346 实验室管理员 1846419477876510721-->
           <el-tag
             size="small"
-            :type="role_id == '1839537055389515777' && row.taskStatus == 0 ? 'success' 
-            : role_id == '1839537055389515777' && row.taskStatus == 1 ? '' 
+            :type="role_id == '1839537055389515777' && row.taskStatus == 0 ? 'success'
+            : role_id == '1839537055389515777' && row.taskStatus == 1 ? ''
             : role_id == '1839537055389515777' && (row.taskStatus == 2 || row.taskStatus == 3) ? 'warning'
             : row.taskStatus == 4 ? 'info'
             : role_id == '1839552581620793346' && row.taskStatus == 1 ? 'success'
@@ -35,15 +35,15 @@
             : role_id == '1846419477876510721' && (row.taskStatus == 0 || row.taskStatus == 1) ? ''
             : role_id == '1846419477876510721' && (row.taskStatus == 2) ? 'warning'
             : role_id == '1846419477876510721' && (row.taskStatus == 3) ? 'success'
-            : (row.taskStatus == 3) ? 'success' 
-            : (row.taskStatus == 2) ? 'warning' 
-            : (row.taskStatus == 0) ? 'success' 
-            : (row.taskStatus == 1) ? '' 
+            : (row.taskStatus == 3) ? 'success'
+            : (row.taskStatus == 2) ? 'warning'
+            : (row.taskStatus == 0) ? 'success'
+            : (row.taskStatus == 1) ? ''
             : ''"
           >
             {{
-              role_id == '1839537055389515777' && row.taskStatus == 0 ? '待指派' 
-              : role_id == '1839537055389515777' && row.taskStatus == 1 ? '待巡检' 
+              role_id == '1839537055389515777' && row.taskStatus == 0 ? '待指派'
+              : role_id == '1839537055389515777' && row.taskStatus == 1 ? '待巡检'
               : role_id == '1839537055389515777' && (row.taskStatus == 2 || row.taskStatus == 3) ? '巡检中'
               : row.taskStatus == 4 ? '已完成'
               : role_id == '1839552581620793346' && row.taskStatus == 1 ? '待接单'
@@ -440,7 +440,7 @@
       </el-dialog>
     </basic-container>
   </template>
-  
+
   <script>
   import website from '@/config/website';
   import {getToken} from '@/util/auth';
@@ -559,7 +559,7 @@
         activeRoom:'001',
         activeRoomName:'',
         addForm:{
-          
+
         },
         addRules:{
           deviceNo:{required:true,message:'请输入设备编号',trigger:'blur'},
@@ -606,7 +606,7 @@
       console.log('persimmon-------------->',this.permission)
       this.role_id = this.userInfo.role_id
       console.log('role_id=======>',this.role_id)
-      
+
     },
     methods:{
       createTask(){
@@ -655,7 +655,7 @@
             }
 					  return v
           }
-					
+
 				})
 			})
 			return data
@@ -697,7 +697,7 @@
         console.log('this.inspectionForm.tableData',this.inspectionForm.tableData)
         console.log('this.addForm.inspectionData',this.addForm.inspectionData)
         // this.inspectionForm.tableData  = this.mergeTableRow(this.inspectionForm.tableData,this.activeFloor,['deptName'])
-        
+
       },
       clickRoom(val){
         this.activeRoom = val.value
@@ -811,7 +811,7 @@
             servicemanId:res.data.data.servicemanId != -1 ? res.data.data.servicemanId : ''
           }
         })
-      
+
       },
       handleAccept(row){
         this.dialogTitle = '巡检任务'
@@ -858,7 +858,7 @@
             inspectionData:res.data.data.details,
           }
         })
-      
+
       },
 
       //用于回调的函数
@@ -983,7 +983,7 @@
             // this.$message({
             //   type: 'info',
             //   message: '已取消删除'
-            // });          
+            // });
           });
       },
       // 点击新增弹窗关闭按钮
@@ -1033,7 +1033,7 @@
         }else if(this.dialogType == '接单'){
           let query = {
             id:this.addForm.id,
-            reservationTime:this.addForm.appointTime					
+            reservationTime:this.addForm.appointTime
           }
           taskServicemanReceive({id:this.addForm.id}).then(res =>{
             if(res.data.code == 200){
@@ -1114,7 +1114,7 @@
                 })
               }
             }
-            
+
           }
         })
       },
@@ -1269,9 +1269,9 @@
     }
   }
   </script>
-  
+
   <style lang="scss" scoped>
-  
+
   </style>
   <style lang="scss">
     .inspectionDialog{
@@ -1285,4 +1285,4 @@
         }
       }
     }
-  </style>
+  </style>

src/views/businessManagement/ordinary.vue

@@ -19,42 +19,42 @@
           维修负责人1839537055389515777：1-待接单 2,3-待维修 4-维修完成 5-待评价 6-已完成   维修人：2-待确认 3-待维修 4-维修完成 5-待评价 6-已完成  领导：4-待审批 5-待评价 6-已完成
         -->
           <!-- 客服角色 -->
-        <el-tag size="small" v-if="role_id == '1839536982874193922'" :type="(row.status == 0 ? 'success' 
-          : (row.status == 1 || row.status == 2 || row.status ==3 || row.status == 4 || row.status == 5 || row.status == 7) ? 'warning' 
-          : row.status == 6 ? '' 
-          : (row.status == 8 && row.totalPrice < 0) ? 'info' 
-          : (row.status == 8 && row.totalPrice > 0) ? 'warning' 
+        <el-tag size="small" v-if="role_id == '1839536982874193922'" :type="(row.status == 0 ? 'success'
+          : (row.status == 1 || row.status == 2 || row.status ==3 || row.status == 4 || row.status == 5 || row.status == 7) ? 'warning'
+          : row.status == 6 ? ''
+          : (row.status == 8 && row.totalPrice < 0) ? 'info'
+          : (row.status == 8 && row.totalPrice > 0) ? 'warning'
           : row.status == 9 ? 'success' :
           ''
         )">
-          {{ row.status == 0 ? '待接单' 
-            : (row.status == 1 || row.status == 2 || row.status == 3 || row.status == 4) ? '待维修' 
-            : row.status == 5 ? '维修中' : row.status == 6 ? '维修完成' : row.status == '7' ? '待付款' 
-            : (row.status == 8 && row.totalPrice < 0) ? '已完成' 
-            : (row.status == 8 && row.totalPrice > 0) ? '待开发票' 
+          {{ row.status == 0 ? '待接单'
+            : (row.status == 1 || row.status == 2 || row.status == 3 || row.status == 4) ? '待维修'
+            : row.status == 5 ? '维修中' : row.status == 6 ? '维修完成' : row.status == '7' ? '待付款'
+            : (row.status == 8 && row.totalPrice < 0) ? '已完成'
+            : (row.status == 8 && row.totalPrice > 0) ? '待开发票'
             : row.status == 9 ? '已开发票' : '' }}
         </el-tag>
         <!-- 维修人员角色 -->
-        <el-tag size="small" v-if="role_id == '1839552581620793346'" :type="row.status == 0 ? 'danger' : (row.status == 1 || row.status == 5) ? 'success' 
-          : (row.status == 2 || row.status == 6 || row.status == 7 || row.status == 8 || row.status == 9) ? '' 
+        <el-tag size="small" v-if="role_id == '1839552581620793346'" :type="row.status == 0 ? 'danger' : (row.status == 1 || row.status == 5) ? 'success'
+          : (row.status == 2 || row.status == 6 || row.status == 7 || row.status == 8 || row.status == 9) ? ''
           : (row.status == 3 || row.status == 4) ? 'warning' : ''">
-          {{row.status == 0 ? '已驳回' :  row.status == 1 ? '待确认' : row.status == 2 ? '待提交' 
-            : (row.status == 3 || row.status == 4) ? '待审批' 
-            : row.status == 5 ? '维修中' 
+          {{row.status == 0 ? '已驳回' :  row.status == 1 ? '待确认' : row.status == 2 ? '待提交'
+            : (row.status == 3 || row.status == 4) ? '待审批'
+            : row.status == 5 ? '维修中'
             : (row.status == 6 || row.status == 7 || row.status == 8 || row.status == 9) ? '维修完成' : '' }}
         </el-tag>
-        <el-tag size="small" v-if="role_id == 1839537055389515777" :type="row.status == 2 ? 'danger' 
-          : (row.status == 3 || row.status == 6)? '' 
-          : (row.status == 4 ) ? 'success' 
-          : (row.status == 5  || row.status == 7) ? 'warning' 
-          : (row.status == 8 && row.totalPrice < 0) ? 'info' 
-          : (row.status == 8 && row.totalPrice > 0) ? 'warning' 
-          : row.status == 9 ? 'success' 
+        <el-tag size="small" v-if="role_id == 1839537055389515777" :type="row.status == 2 ? 'danger'
+          : (row.status == 3 || row.status == 6)? ''
+          : (row.status == 4 ) ? 'success'
+          : (row.status == 5  || row.status == 7) ? 'warning'
+          : (row.status == 8 && row.totalPrice < 0) ? 'info'
+          : (row.status == 8 && row.totalPrice > 0) ? 'warning'
+          : row.status == 9 ? 'success'
           : ''">
-          {{ row.status == 2 ? '已驳回' : row.status == 3 ? '待审批' : row.status == 4 ? '已通过' : row.status == 5 ? '维修中' : row.status == 6 ? '维修完成' : row.status == 7 ? '待付款' 
-           : (row.status == 8 && row.totalPrice < 0) ? '已完成' 
-           : (row.status == 8 && row.totalPrice > 0) ? '待开发票' 
-           : row.status == 9 ? '已开发票' : '' }}  
+          {{ row.status == 2 ? '已驳回' : row.status == 3 ? '待审批' : row.status == 4 ? '已通过' : row.status == 5 ? '维修中' : row.status == 6 ? '维修完成' : row.status == 7 ? '待付款'
+           : (row.status == 8 && row.totalPrice < 0) ? '已完成'
+           : (row.status == 8 && row.totalPrice > 0) ? '待开发票'
+           : row.status == 9 ? '已开发票' : '' }}
       </el-tag>
       </template>
       <template slot-scope="scope" slot="menuLeft">
@@ -193,7 +193,7 @@
                   <template slot-scope="scope">
                     <el-input placeholder="请输入库存ID" v-model="scope.row.inventoryId" @change="changeInventoryId"></el-input>
                   </template>
-                  
+
                 </el-table-column>
                 <el-table-column prop="productName" label="物品" align="center">
                   <template slot-scope="scope">
@@ -826,13 +826,13 @@ export default {
         }else if(value.indexOf('.') != -1 && value.match(/(\.\d+)/)[0].length > 3){
           this.discount = this.discount.substring(0, value.length - 1);
         }
-        
+
       }
   },
   changeDiscount(val){
     this.discountPrice = this.totalPrice * val * 0.1;
   },
-  
+
   getProductLists(type, val,inventoryId) {
     console.log('type------------->', type)
     console.log('goodsCurrent------------->', this.productCurrent)
@@ -953,13 +953,14 @@ export default {
       cancelButtonText: '取消',
       type: 'warning'
     }).then(() => {
-      serviceInvoice({id:row.id}).then(res =>{
+      let query=[{id:row.id}]
+      serviceInvoice(query).then(res =>{
         if(res.data.code == 200){
           this.$message.success('发票开具成功')
           this.onLoad()
         }
       })
-    })  
+    })
   },
   handleRepair(row) {
     // this.repairForm = row
@@ -1203,7 +1204,7 @@ export default {
       // if (query.status == 7) {
       //   let data = {
       //     ...query,
-      //     repaiRejectReason: this.rejectForm.reason,		//维修人员驳回原因	
+      //     repaiRejectReason: this.rejectForm.reason,		//维修人员驳回原因
 
       //   }
       //   repairReject(data).then(res => {
@@ -1217,7 +1218,7 @@ export default {
       // } else if (query.status == 8) {
       //   let data = {
       //     ...query,
-      //     repaiTeamRejectReason: this.rejectForm.reason,		//维修人员驳回原因	
+      //     repaiTeamRejectReason: this.rejectForm.reason,		//维修人员驳回原因
       //   }
       //   submitReject(data).then(res => {
       //     if (res.data.code == 200) {
@@ -1418,7 +1419,7 @@ export default {
               }
             })
           }
-            
+
         }
         //  else if (this.repairForm.status == 4) {
         //   let query = {
@@ -1529,7 +1530,7 @@ export default {
       // this.$message({
       //   type: 'info',
       //   message: '已取消删除'
-      // });          
+      // });
     });
   },
   // 点击新增弹窗关闭按钮
@@ -1558,7 +1559,7 @@ export default {
     this.$refs['form'].validate(valid => {
       if (valid) {
         // this.addForm()
-        
+
         let query = {}
         if (this.role_id == '1839536982874193922') {
           query = {
@@ -1587,9 +1588,9 @@ export default {
                 }
               })
             }
-            
+
           })
-          
+
         } else {
           query = {
             id: this.addForm.id,
@@ -1732,4 +1733,4 @@ export default {
 }
 </script>
 
-<style></style>
+<style></style>

src/views/operation/hand.vue

@@ -11,7 +11,7 @@
       </template>
       <template slot-scope="{ row }" slot="status">
         <!-- -1-待提报 0-待接单 1,2，3-待维修 4-确认方案 5-维修中 6-待评价 7-待付款 8-已完成/待开发票 9-已开发票 -->
-        <el-tag size="small" :type="row.status == -1 ? 'info' 
+        <el-tag size="small" :type="row.status == -1 ? 'info'
           : (row.status == 0 || row.status == 4 || row.status == 9) ? 'success'
           : (row.status == 1 || row.status == 2 || row.status == 3 || row.status == 5 || row.status == 7) ? 'warning'
           : row.status == 4 ? 'success'
@@ -20,7 +20,7 @@
           : (row.status == 8 && row.totalPrice > 0) ? 'warning'
           : ''">
           {{
-            row.status == -1 ? '待提报' 
+            row.status == -1 ? '待提报'
             : row.status == 0 ? "待接单"
             : (row.status == 1 || row.status == 2 || row.status == 3) ? "待维修"
             : row.status == 4 ? "确认方案"
@@ -439,7 +439,7 @@ import { mapGetters } from "vuex";
 import moment from "moment";
 import { dateFormat } from "../../util/date";
 import requestSub from '../components/requestSub.vue'
-import { getList, getDetail, evaluateSign, addFile, saveData,customerConfirm,customerReject,customerRepairConfirm,customerRepairReject } from '@/api/operation/hand'
+import { getList, getDetail, evaluateSign, addFile, saveData,customerConfirm,customerReject,customerRepairConfirm,customerRepairReject,serviceInvoice } from '@/api/operation/hand'
 import { getDeviceList } from '@/api/device/device'
 import { getChildList } from '@/api/system/dictbiz'
 let action = "https://api.avuejs.com/imgupload";
@@ -752,7 +752,16 @@ export default {
             cancelButtonText: '取消',
             type: 'warning'
           }).then(() => {
-
+            let queryData = []
+            this.selectionList.forEach(item => {
+              queryData.push({
+                id: item.id
+              })
+            })
+            serviceInvoice(queryData).then(res=>{
+              this.$message.success('发票开具成功')
+              this.onLoad()
+            })
           }).catch(() =>{
 
           })
@@ -1004,7 +1013,7 @@ export default {
           this.$message.warning("请进行手写签名并点击确定按钮")
         }
       }
-      
+
 
     },
     // 客户方案确认