保养图片

.env.development

@@ -10,7 +10,7 @@ ENV = 'development'
 # VUE_APP_BASE_API = 'http://192.168.1.56:8082/'
 # 线上测试
 VUE_APP_BASE_API = 'http://tmrwatch.cn:8082/'
-# VUE_APP_BASE_API = 'http://10.0.11.208:8082/'
+# VUE_APP_BASE_API = 'http://10.0.11.126:8082/'
 
 # VUE_APP_BASE_API = 'http://36.155.144.182:18090/'
 

src/api/common.js

@@ -374,3 +374,11 @@ export function getSpotRate(data) {
     params: data
   })
 }
+
+export function saveImgIds(data) {
+  return request({
+    url: '/authdata/PostDataByName',
+    method: 'post',
+    data
+  })
+}

src/router/index.js

@@ -67,17 +67,17 @@ export const constantRoutes = [
     }]
   },
 
-  {
-    path: '/spotCheck',
-    component: Layout,
-    redirect: '/spotCheck',
-    children: [{
-      path: 'spotCheck',
-      name: 'spotCheck',
-      component: () => import('@/views/report/spotCheck/index.vue'),
-      meta: { title: '点检率', icon: '', affix: true }
-    }]
-  }
+  // {
+  //   path: '/spotCheck',
+  //   component: Layout,
+  //   redirect: '/spotCheck',
+  //   children: [{
+  //     path: 'spotCheck',
+  //     name: 'spotCheck',
+  //     component: () => import('@/views/report/spotCheck/index.vue'),
+  //     meta: { title: '点检率', icon: '', affix: true }
+  //   }]
+  // }
 
   // {
   //   path: '/vehiclRateTotal',

src/views/maintenance/maintain/index.vue

@@ -131,8 +131,18 @@
     </el-table>
     <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />
     <!-- 查看 -->
-    <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible_See" :close-on-click-modal="false"  v-if ="dialogFormVisible_See" width="90%">
+    <el-dialog :title="textMap[dialogStatus]"  :visible.sync="dialogFormVisible_See" :close-on-click-modal="false"   width="90%"  :append-to-body="true" >
       <div class="app-see">
+            <!-- 图片放大 -->
+           <el-dialog
+            :visible.sync="dialogVisibleImg"
+            width="60%"
+            ref="childDialog"
+            :modal="false"
+            custom-class="child-dialog"
+          >
+             <img :src="dialogImageUrl" alt="" @load="onLoad" width="80%">
+          </el-dialog>
         <div v-if="statue1" class="see">
           <el-form
             ref="seeTemp"
@@ -412,6 +422,7 @@
                   </template>
                 </el-table-column>
               </el-table>
+             
               <el-form
                 ref="seeTemp"
                 :rules="rules"
@@ -420,6 +431,49 @@
                 label-width="120px"
                 style="width: 90%;margin:0 auto;"
               >
+               <!-- 图片上传todo: v-if="(seeTemp.SHStatue == 3) && isLeaderCharge"  -->
+               <div  style="margin-top:20px;" >
+                <el-row>
+                  <el-col :span="24">
+                    <el-form-item label="保养图片:" required>
+                      <el-upload
+                        id="uploadPic"
+                        ref="upload"
+                        :limit="3"
+                        list-type="picture-card"
+                        :file-list="fileList"
+                        :headers="headers"
+                        :action="uploadImageUrl"
+                        :auto-upload="true"
+                        :on-preview="handlePicPreview"
+                        :class="{ hide: showUpload }"
+                        :disabled="seeTemp.SHStatue != 3"
+                        :on-change="
+                          (file, fileList) => {
+                            return handlePicChange(file, fileList)
+                          }
+                        "
+                        :on-success="
+                          (response, file, fileList) => {
+                            return handlePicSuccess(response, file, fileList)
+                          }
+                        "
+                        :on-remove="
+                          (file, fileList) => {
+                            return handlePicRemove(file, fileList)
+                          }
+                        "
+                      >
+                        <i class="el-icon-plus" />
+                      </el-upload>
+                    </el-form-item>
+                     </el-col>
+                  <!-- <el-col :span="24" style="margin-left:120px;"> 
+                    <el-button type="primary" plain @click="handleSaveImg">确认上传图片</el-button>
+                  </el-col> -->
+                </el-row>
+             
+               </div>
                 <el-row>
                   <el-col>
                     <el-form-item label="流程进度" />
@@ -453,7 +507,7 @@
                       <el-button v-if="seeTemp.SHStatue == 2 && isCharge && seeTemp.useEmpId == getdataListParm.parammaps.loginId" type="success" style="display:inline-block" @click="handleExamine()">保养审核</el-button>
                       <el-button v-else type="success" style="width:70px;display:none" @click="handleExamine()">保养审核</el-button>
                       <!-- 保养审核3 -->
-                      <el-button v-if="(seeTemp.SHStatue == 3) && isLeaderCharge" type="success" style="display:inline-block" @click="handleExamine2()">保养审核3</el-button>
+                      <el-button v-if="(seeTemp.SHStatue == 3) && isLeaderCharge" type="success" style="display:inline-block" @click="handleExamine2()">保养审核33</el-button>
                       <el-button v-else type="success" style="width:70px;display:none" @click="handleExamine2()">保养审核3</el-button>
                       <!-- 保养审核2 -->
                       <!-- <el-button v-if="(seeTemp.SHStatue == 3) && isDepartmentCharge && (seeTemp.departmentId ==getdataListParm.parammaps.logindeptId)" type="success" style="display:inline-block" @click="handleExamine3()">保养审核2</el-button>
@@ -467,23 +521,23 @@
               <el-form ref="collarUseTemp" :rules="rules" :model="collarUseTemp" label-position="right" label-width="120px" style="width: 90%;margin:0 auto;">
                 <el-row>
                   <el-col :span="6">
-                    <el-form-item label="领用单号：" prop="applyCode">
-                      <span>{{ collarUseTemp.applyCode }}</span>
+                    <el-form-item label="领用单号：" prop="applyCode" >
+                      <span>{{ (collarUseTemp && collarUseTemp.applyCode)  || ''}}</span>
                     </el-form-item>
                   </el-col>
                   <el-col :span="6">
                     <el-form-item label="领用部门：" prop="departmentName">
-                      <span>{{ collarUseTemp.departmentName }}</span>
+                      <span>{{ (collarUseTemp && collarUseTemp.departmentName) || '' }}</span>
                     </el-form-item>
                   </el-col>
                   <el-col :span="6">
                     <el-form-item label="领用日期：" prop="createDate">
-                      <span>{{ collarUseTemp.createDate }}</span>
+                      <span>{{  (collarUseTemp && collarUseTemp.createDate) || ''   }}</span>
                     </el-form-item>
                   </el-col>
                   <el-col :span="6">
                     <el-form-item label="领用状态：" prop="statueName">
-                      <span>{{ collarUseTemp.statueName }}</span>
+                      <span>{{  (collarUseTemp && collarUseTemp.statueName) || ''  }}</span>
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -584,6 +638,8 @@
             </el-tab-pane>
           </el-tabs>
         </div>
+
+      
       </div>
       <div slot="footer" class="dialog-footer" style="bottom:5px;">
         <el-button @click="close_diago()">关闭</el-button>
@@ -672,13 +728,13 @@
             >
               <el-row>
                 <el-col :span="8">
-                  <el-form-item label="领用单号：" prop="applyCode">
-                    <span>{{ receivingTemp.applyCode }}</span>
+                  <el-form-item label="领用单号：" prop="applyCode" >
+                    <span>{{(receivingTemp &&  receivingTemp.applyCode) ||  '' }}</span>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
                   <el-form-item label="领用部门：" prop="departmentName">
-                    <span>{{ receivingTemp.departmentName }}</span>
+                    <span>{{ (receivingTemp && receivingTemp.departmentName) || '' }}</span>
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
@@ -929,7 +985,7 @@
 
 <script>
 // 引入
-import { GetDataByName, GetDataByNames, PostDataByName, failproccess, ExecDataByConfig, checkButtons } from '@/api/common'
+import { GetDataByName, GetDataByNames, PostDataByName, failproccess, ExecDataByConfig, checkButtons ,saveImgIds} from '@/api/common'
 // import { mapGetters } from 'vuex'
 import waves from '@/directive/waves' // waves directive
 import { parseTime, sortChange } from '@/utils/index.js'
@@ -937,13 +993,24 @@ import { parseTime, sortChange } from '@/utils/index.js'
 import Pagination from '@/components/Pagination' // secondary package based on el-pagination
 import Cookies from 'js-cookie'
 import { MessageBox } from 'element-ui'
+import { getToken } from '@/utils/auth'
+
 export default {
   name: 'Maintain',
   components: { Pagination },
   directives: { waves },
   data() {
     return {
-      myHeight:document.documentElement.clientHeight - 85- 250,
+      showUpload: false,
+      fileList: [],
+      headers: { optname: 'insertcustompic', id: 1, token: getToken(), host: "192.168.1.250:8082" },
+      uploadImageUrl: process.env.VUE_APP_BASE_API + 'authdata/uploaderimage',
+      dialogImageUrl: '',
+      dialogVisibleImg: false,
+      // width:'40%',
+
+     
+      myHeight: document.documentElement.clientHeight - 85- 250,
       active: 0,
       activeList: [],
       rowStyle: { maxHeight: 50 + 'px', height: 45 + 'px' },
@@ -1007,7 +1074,12 @@ export default {
       list: [],
       // 查看
       dialogFormVisible_See: false,
-      seeTemp: {},
+      seeTemp: {
+        id:'',
+        scenePhoto1: -1,
+        scenePhoto2: -1,
+        scenePhoto3: -1
+      },
       statue1: false,
       statue2: false,
       activeName: 'first',
@@ -1025,7 +1097,9 @@ export default {
         returntype: 'Map',
         parammaps: {}
       },
-      collarUseTemp: {},
+      collarUseTemp: {
+   
+      },
       // 查看-领用记录table
       getCollarUseListParm: {
         name: 'getpartapplyListBybig',
@@ -1149,6 +1223,7 @@ export default {
     }
   },
   created() {
+    console.log(process.env.VUE_APP_BASE_API,'00000-hss')
     const that = this
     GetDataByName({ 'name': 'getUserPCButtons', 'parammaps': { 'jwt_username': Cookies.get('name') }}).then(response => {
       that.buttons = response.data.list
@@ -1165,6 +1240,89 @@ export default {
     this.getPendingList()
   },
   methods: {
+    onLoad(e) {
+      const img = e.target
+      let width = 0
+      if (img.fileSize > 0 || (img.width > 1 && img.height > 1)) {
+        width = img.width + 40
+      }
+      this.width = width + 'px'
+    },
+    // 图片保存
+    async handleSaveImg() {
+      if(this.seeTemp.scenePhoto1 == -1 && this.seeTemp.scenePhoto2 == -1 && this.seeTemp.scenePhoto3 == -1){
+        this.$notify({ title: '提示', message: '请上传保养图片', type: 'warning', duration: 3000 })
+        return false
+      }
+      const obj = { name: "upkeepImage", parammaps: { id: this.seeTemp.id, "picId1": this.seeTemp.scenePhoto1, "picId2": this.seeTemp.scenePhoto2, "picId3": this.seeTemp.scenePhoto3 }}
+      const { data } = await saveImgIds(obj)
+      console.log(data, '图片确认发布到保养中')
+    },
+  
+    handlePicChange(file, fileList) {
+     
+      // console.log(this.seeTemp)
+    },
+    handlePicSuccess(response, file, fileList) {
+      console.log('文件上传成功时的钩子response', response, )
+      console.log('文件上传成功时的钩子file', file)
+      console.log('fileList', fileList)
+
+      //3张图片时，关闭新增的按钮
+      if (fileList.length == 3) {
+        document.getElementById('uploadPic').lastChild.style.display = "none"
+      } else {
+        document.getElementById('uploadPic').lastChild.style.display = "inline-block"
+      }
+
+      if (this.seeTemp.scenePhoto1 === undefined || this.seeTemp.scenePhoto1 == -1) {
+        console.log("111")
+        this.seeTemp.scenePhoto1 = response.execresult.LastInsertId
+      } else if (this.seeTemp.scenePhoto2 === undefined || this.seeTemp.scenePhoto2 == -1) {
+        console.log("222")
+        this.seeTemp.scenePhoto2 = response.execresult.LastInsertId
+      } else if (this.seeTemp.scenePhoto3 === undefined || this.seeTemp.scenePhoto3 == -1) {
+        console.log("333")
+        this.seeTemp.scenePhoto3 = response.execresult.LastInsertId
+      }
+      console.log('this.picArr1', this.picArr1)
+      console.log('this.seeTemp', this.seeTemp)
+      // 上传成功后 在调用图片保定合同的接口
+      this.handleSaveImg()
+    },
+    handlePicRemove(file, fileList) {
+      console.log(file, '文件列表移除文件时的钩子file---')
+      console.log(fileList, '文件列表移除文件时的钩子fileList--')
+      //3张图片时，关闭新增的按钮
+      if (fileList.length == 3) {
+        document.getElementById('uploadPic').lastChild.style.display = "none"
+      } else {
+        document.getElementById('uploadPic').lastChild.style.display = "inline-block"
+      }
+      this.seeTemp.scenePhoto1 = -1;
+      this.seeTemp.scenePhoto2 = -1;
+      this.seeTemp.scenePhoto3 = -1;
+     
+      if (fileList.length == 3) {
+        this.seeTemp.scenePhoto1 = fileList[0].response.execresult.LastInsertId || fileList[0].picId1
+        this.seeTemp.scenePhoto2 = fileList[1].response.execresult.LastInsertId || fileList[1].picId2
+        this.seeTemp.scenePhoto3 = fileList[2].response.execresult.LastInsertId || fileList[2].picId3
+
+      } else if (fileList.length == 2) {
+        this.seeTemp.scenePhoto1 = fileList[0].response.execresult.LastInsertId || fileList[0].picId1
+        this.seeTemp.scenePhoto2 = fileList[1].response.execresult.LastInsertId || fileList[1].picId2
+
+      } else if (fileList.length == 1) {
+        this.seeTemp.scenePhoto1 = fileList[0].response.execresult.LastInsertId || fileList[0].picId1
+      }
+      console.log(this.seeTemp)
+    },
+    handlePicPreview(file) {
+      console.log(file,'放大查看')
+      this.dialogImageUrl = file.url
+      this.dialogVisibleImg = true
+    },
+  
     // handleCheck(row) {
     //   this.playvideo = row.hotVideoPath // 存储用户点击的视频播放链接
     //   this.playvideoName = row.hotVideoPath // 存储用户点击的视频播放链接
@@ -1228,6 +1386,7 @@ export default {
     close_diago(){
       console.log(11111111111111)
       this.dialogFormVisible_See = false
+      this.dialogVisibleImg = false
     },
     getPendingList() {
       this.pending.getdataListParm.parammaps = {
@@ -1395,31 +1554,43 @@ export default {
     },
     form_see(row) {
       this.seeTemp = Object.assign({}, row)
-      console.log('查看', this.seeTemp)
+      console.log('查看--图片', this.seeTemp)
       // 流程图
       var reason = '未通过原因:' + this.seeTemp.workflowNote
       var scores = '评分:' + this.seeTemp.scores + '分'
       if (this.seeTemp.SHStatue === 1) {
-        this.activeList = [{ title: '保养人审核' }, { title: '机修审核' },   { title: '设备主管审核' }]
+        this.activeList = [{ title: '保养人提交' }, { title: '机修审核' },   { title: '设备主管审核' }]
         this.active = 0
-
       } else if (this.seeTemp.SHStatue === 2) {
-        this.activeList = [{ title: '保养人审核', name: this.seeTemp.upkeepPerson, date: this.seeTemp.finishedTime, status: '', reason: '' }, { title: '机修审核' },  { title: '设备主管审核' }]
+        this.activeList = [{ title: '保养人提交', name: this.seeTemp.upkeepPerson, date: this.seeTemp.finishedTime, status: '', reason: '' }, { title: '机修审核' },  { title: '设备主管审核' }]
         this.active = 1
 
       } else if (this.seeTemp.SHStatue === 3) {
         this.active = 2
-        this.activeList = [{ title: '保养人审核', name: this.seeTemp.upkeepPerson, date: this.seeTemp.finishedTime, status: '', reason: '' }, { title: '机修审核', date: this.seeTemp.useChargeDate, name: this.seeTemp.useChargePerson, status: '', reason: '', scores: scores },   { title: '设备主管审核' }]
+        if( row.picId1 !== '-1' && row.picId1 !== '') {
+          this.seeTemp.scenePhoto1 = row.picId1
+          // "uploads/thumbnail/insertcustompic/8e22df6c34c89686212997255c1ae5fe.jpeg"
+          this.fileList[0] = { name: "picImg1", url: process.env.VUE_APP_BASE_API + row.picpath1 , picId1 : row.picId1 }
+        } 
+        if( row.picId2 !== '-1' && row.picId2 !== '') {
+          this.seeTemp.scenePhoto2 = row.picId2
+          this.fileList[1] = { name: "picImg2", url: process.env.VUE_APP_BASE_API + row.picpath2, picId2 : row.picId2 }
+        } 
+        if( row.picId3 !== '-1' && row.picId3 !== '') {
+          this.seeTemp.scenePhoto3 = row.picId3
+          this.fileList[2] = { name: "picImg3", url: process.env.VUE_APP_BASE_API + row.picpath3, picId3 : row.picId3 }
+        } 
+        this.activeList = [{ title: '保养人提交', name: this.seeTemp.upkeepPerson, date: this.seeTemp.finishedTime, status: '', reason: '' }, { title: '机修审核', date: this.seeTemp.useChargeDate, name: this.seeTemp.useChargePerson, status: '', reason: '', scores: scores },   { title: '设备主管审核' }]
+
       } else if (this.seeTemp.SHStatue === 4) {
         this.active = 2
-        this.activeList = [{ title: '保养人审核', name: this.seeTemp.upkeepPerson, date: this.seeTemp.finishedTime, status: '', reason: '' }, { title: '机修审核', date: this.seeTemp.useChargeDate, name: this.seeTemp.useChargePerson, status: 'error', reason: reason }, { title: '设备主管审核' }]
-
+        this.activeList = [{ title: '保养人提交', name: this.seeTemp.upkeepPerson, date: this.seeTemp.finishedTime, status: '', reason: '' }, { title: '机修审核', date: this.seeTemp.useChargeDate, name: this.seeTemp.useChargePerson, status: 'error', reason: reason }, { title: '设备主管审核' }]
 
       } else if (this.seeTemp.SHStatue === 7) {
-        this.activeList = [{ title: '保养人审核', name: this.seeTemp.upkeepPerson, date: this.seeTemp.finishedTime, status: '', reason: '' }, { title: '机修审核', date: this.seeTemp.useChargeDate, name: this.seeTemp.useChargePerson, status: '', reason: '', scores: scores },  { title: '设备主管审核', date: this.seeTemp.chargeDate, name: this.seeTemp.chargePerson }]
+        this.activeList = [{ title: '保养人提交', name: this.seeTemp.upkeepPerson, date: this.seeTemp.finishedTime, status: '', reason: '' }, { title: '机修审核', date: this.seeTemp.useChargeDate, name: this.seeTemp.useChargePerson, status: '', reason: '', scores: scores },  { title: '设备主管审核', date: this.seeTemp.chargeDate, name: this.seeTemp.chargePerson }]
         this.active = 3
       } else if (this.seeTemp.SHStatue === 8) {
-        this.activeList = [{ title: '保养人审核', name: this.seeTemp.upkeepPerson, date: this.seeTemp.finishedTime, status: '', reason: '' }, { title: '机修审核', date: this.seeTemp.useChargeDate, name: this.seeTemp.useChargePerson, status: '', reason: '', scores: scores },   { title: '设备主管审核', date: this.seeTemp.chargeDate, name: this.seeTemp.chargePerson, status: 'error', reason: reason }]
+        this.activeList = [{ title: '保养人提交', name: this.seeTemp.upkeepPerson, date: this.seeTemp.finishedTime, status: '', reason: '' }, { title: '机修审核', date: this.seeTemp.useChargeDate, name: this.seeTemp.useChargePerson, status: '', reason: '', scores: scores },   { title: '设备主管审核', date: this.seeTemp.chargeDate, name: this.seeTemp.chargePerson, status: 'error', reason: reason }]
         this.active = 3
       }
       this.dialogStatus = 'see'
@@ -1446,6 +1617,13 @@ export default {
       this.listCollarUse = []
       this.getCollarUse()
       this.getOldProductsList()
+      this.$nextTick(()=>{
+        if(this.seeTemp.SHStatue !== 3){
+            document.getElementById('uploadPic').lastChild.style.display = "none"
+        }else{
+            document.getElementById('uploadPic').lastChild.style.display = "inline-block"
+        }
+      })
     },
     getMaintenanceContentList() {
       this.getMaintenanceContentParm.parammaps.id = this.seeTemp.id
@@ -1461,7 +1639,7 @@ export default {
     },
     openDetails(row, column, cell, event) {
       if (column.label !== '操作') {
-        this.$router.push({ path: '/customs/Receive', query: { applyCode: this.collarUseTemp.applyCode }})
+        this.$router.push({ path: '/customs/Receive', query: { applyCode:  this.collarUseTemp && this.collarUseTemp.applyCode || ''  }})
       }
     },
     getCollarUse() {
@@ -1480,15 +1658,19 @@ export default {
       })
     },
     getCollarUseList() {
-      this.getCollarUseListParm.parammaps.id = this.collarUseTemp.id
+      this.getCollarUseListParm.parammaps.id = this.collarUseTemp ? this.collarUseTemp.id : ''
       this.listLoadingCollarUse = true
-      GetDataByName(this.getCollarUseListParm).then(response => {
-        console.log('领用table数据', response.data.list)
-        this.listCollarUse = response.data.list
-        setTimeout(() => {
-          this.listLoadingCollarUse = false
-        }, 100)
-      })
+      if( this.getCollarUseListParm.parammaps.id == ''){
+          return
+        } else {
+          GetDataByName(this.getCollarUseListParm).then(response => {
+            console.log('领用table数据', response.data.list)
+            this.listCollarUse = response.data.list
+            setTimeout(() => {
+              this.listLoadingCollarUse = false
+            }, 100)
+          })
+      }
     },
     getOldProductsList() {
       this.getOldProductsParm.parammaps.repairCode = this.seeTemp.upkeepCode
@@ -1535,7 +1717,7 @@ export default {
     getAutoCreatCode() {
       GetDataByName(this.getAutoCreatCodeParm).then(response => {
         console.log('领用领用单号', response.data.list[0])
-        this.receivingTemp.applyCode = response.data.list[0].orderCode
+        this.receivingTemp.applyCode =   response.data.list[0].orderCode
         this.$forceUpdate()
       })
     },
@@ -1961,7 +2143,7 @@ export default {
     },
     // 保养审核1
     createExamineData() {
-      console.log('点击了保养审核确认')
+      console.log('点击了保养审核确认-hss')
       this.isokDisable = true
       setTimeout(() => {
         this.isokDisable = false
@@ -1979,6 +2161,10 @@ export default {
           } else {
             this.requestParam.parammaps.scores = this.examineTemp.scores
           }
+          if (this.requestParam.parammaps.scores == '' || !this.requestParam.parammaps.scores ) {
+            this.$notify({ title: '提示', message: '请给保养结果评分', type: 'warning', duration: 2000 })
+            return
+          }
           PostDataByName(this.requestParam).then(response => {
             console.log('保养审核确认发送参数', this.requestParam)
             if (response.msg !== 'fail') {
@@ -2000,15 +2186,26 @@ export default {
     },
     // 保养审核2
     handleExamine2(row) {
-      console.log('点击了保养审核------', row)
+      console.log('点击了保养审核------99', row,this.seeTemp)
+      
+    
       if (row == undefined) {
+       if((this.seeTemp.picId1 == '' || this.seeTemp.picId1 == '-1' ) && (this.seeTemp.picId2 == '' || this.seeTemp.picId2 == '-1' ) &&  (this.seeTemp.picId3 == '' || this.seeTemp.picId3 == '-1'  )){
+        this.$notify({ title: '提示', message: '请确认上传保养图片', type: 'warning', duration: 3000 })
+        return
+      }
         this.examineTemp = this.seeTemp
         this.$set(this.seeTemp, 'isStatue', 3)
         this.$set(this.seeTemp, 'workflowNote', '')
       } else {
+        if((row.picId1 == '' || row.picId1 == '-1' ) && (row.picId2 == '' || row.picId2 == '-1' ) &&  (row.picId3 == '' || row.picId3 == '-1'  )){
+        this.$notify({ title: '提示', message: '当前无法审核,请确认上传保养图片', type: 'warning', duration: 3000 })
+        return
+       }
         this.examineTemp = Object.assign({}, row)
         this.$set(this.examineTemp, 'isStatue', 3)
         this.$set(this.examineTemp, 'workflowNote', '')
+       
       }
       this.dialogStatus = 'examine2'
       this.dialogFormVisible_examine = true
@@ -2180,7 +2377,10 @@ export default {
     z-index: 1;
   }
 </style>
-<style lang="scss">
+<style lang="scss" scoped>  
+::v-deep .child-dialog{
+ z-index: 3000 !important; /* 手动提升 z-index 层级 */
+}
 .el-step__head.is-success {
     color: #409EFF;
     border-color: #409EFF;

src/views/report/spotCheck/index.vue

@@ -24,13 +24,35 @@
             :value="item.id"
           />
         </el-select>
-        <!-- <el-input
+        <el-select
+          v-model="getdataListParm.departmentId"
+          placeholder="部门"
+          clearable
+          class="filter-item"
+          style="width: 120px"
+          @change="choseDepartmente"
+        >
+          <el-option
+            v-for="item in departMent"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+        <el-input
           v-model="getdataListParm.eqCode"
-          placeholder="车辆编号"
+          placeholder="设备编号"
           clearable
           style="width: 140px"
           class="filter-item"
-        ></el-input> -->
+        ></el-input>
+        <el-input
+          v-model="getdataListParm.eqName"
+          placeholder="设备名称"
+          clearable
+          style="width: 140px"
+          class="filter-item"
+        ></el-input>
   
         <el-button
           type="primary"
@@ -110,8 +132,10 @@ export default {
         offset: 1,
         pastureId: parseInt(Cookies.get('pastureid')),
         // pastureName: Cookies.get('pasturename'),
-        date: parseTime(new Date(), '{y}-{m}') // 日期
-        // eqCode: ''
+        date: parseTime(new Date(), '{y}-{m}'), // 日期
+        departmentName: '',
+        eqCode: '',
+        eqName: ''
     },
     requestParams: [
         {
@@ -122,7 +146,15 @@ export default {
         parammaps: { id: Cookies.get('pastureid') } // id:18 默认查询所有
         }
     ],
+    requestParams1: [
+        {
+        name: 'findAllDepart1',
+        offset: 0,
+        pagecount: 0,
+        parammaps: { 'pastureId': Cookies.get('pastureid'), 'eId': Cookies.get('employeid') }}
+    ],
     findAllPasture: [], // 牧场数据
+    departMent: [], // 部门数据
     tableData: [
         {
         pastureName: '圣牧'
@@ -158,13 +190,14 @@ export default {
         {
         label: '点检率',
         prop: 'spotDetectionRate',
-        width: '100'
+        width: '120'
         }
     ]
     }
 },
 created() {
     this.getPasture()
+    this.getDeparment()
     this.getTableList()
 },
 methods: {
@@ -185,6 +218,17 @@ methods: {
     this.findAllPasture = data.findAllPasture.list
     },
 
+    // 获取部门的信息
+    async getDeparment() {
+    const { data } = await GetDataByNames(this.requestParams1)
+      this.departMent = data.findAllDepart1.list
+    },
+
+    // 部门切换
+    choseDepartmente(){
+      this.getdataListParm.departmentId = this.departMent.find(item => item.id == val).id
+    },
+
     // 获取列表数据
     async getTableList() {
     this.loading = true

vue.config.js

@@ -43,7 +43,12 @@ module.exports = {
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''
         }
-      }
+      },
+      '/authdata': {
+        target: 'http://tmrwatch.cn:8082',
+        changeOrigin: true, // 改变请求头中的host为目标服务器
+        pathRewrite: { '^/authdata': '/authdata' }, // 路径重写
+      },
     },
     after: require('./mock/mock-server.js')
   },