Browse Source

设备基础信息维修人不可选修改

duanxiaoduan 1 year ago
parent
commit
fd26e71d03
3 changed files with 29 additions and 16 deletions
  1. 0 0
      dist/index.html
  2. 1 1
      src/permission.js
  3. 28 15
      src/views/asset/basics/index.vue

File diff suppressed because it is too large
+ 0 - 0
dist/index.html


+ 1 - 1
src/permission.js

@@ -7,7 +7,7 @@ import { getToken,removeToken } from '@/utils/auth' // get token from cookie
 import Cookies from 'js-cookie'
 import getPageTitle from '@/utils/get-page-title'
 // 1为单点登录,其他不是
-Cookies.set('sso',0)
+Cookies.set('sso',1)
 NProgress.configure({ showSpinner: false }) // NProgress Configuration
 
 const whiteList = ['/login'] // no redirect whitelist

+ 28 - 15
src/views/asset/basics/index.vue

@@ -307,19 +307,19 @@
           <el-row>
             <el-col :span="6">
               <el-form-item label="状态:" prop="status">
-                <el-select v-model="createTemp.status" placeholder="状态" class="filter-item">
+                <el-select v-model="createTemp.status" placeholder="状态" class="filter-item" style="width:100%">
                   <el-option v-for="item in getDictByName" :key="item.id" :label="item.label" :value="item.id" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="购置日期:" prop="purchaseDate">
-                <el-date-picker v-model="createTemp.purchaseDate" type="date" placeholder="选择日期" style="width:170px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
+                <el-date-picker v-model="createTemp.purchaseDate" type="date" placeholder="选择日期" style="width:100%" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="入场日期:" prop="entranceDate">
-                <el-date-picker v-model="createTemp.entranceDate" type="date" placeholder="选择日期" style="width:170px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
+                <el-date-picker v-model="createTemp.entranceDate" type="date" placeholder="选择日期" style="width:100%" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -346,7 +346,7 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="保养级别:" prop="upkeepgrade">
-                <el-select ref="upkeepgrade" v-model="createTemp.upkeepgrade" placeholder="保养级别" class="filter-item" @visible-change="upkeepgradeChange" @change="changeUpkeepgrade">
+                <el-select ref="upkeepgrade" v-model="createTemp.upkeepgrade" placeholder="保养级别" style="width:100%" class="filter-item" @visible-change="upkeepgradeChange" @change="changeUpkeepgrade">
                   <el-option v-for="item in upkeepgrades" :key="item.id" :label="item.label" :value="item.id" />
                 </el-select>
               </el-form-item>
@@ -395,14 +395,14 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="录入人:" prop="inputUser">
-                <el-select v-model="createTemp.inputUser" placeholder="录入人" class="filter-item">
+                <el-select v-model="createTemp.inputUser" placeholder="录入人" class="filter-item" style="width:100%">
                   <el-option v-for="item in findAllEmploye" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="录入时间:" prop="inputDatetime">
-                <el-date-picker v-model="createTemp.inputDatetime" :picker-options="pickerOptions1" type="date" placeholder="录入时间" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width:170px;" />
+                <el-date-picker v-model="createTemp.inputDatetime" :picker-options="pickerOptions1" type="date" placeholder="录入时间" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width:100%" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -423,21 +423,21 @@
             </el-col> -->
             <el-col :span="6">
               <el-form-item label="一级督办:" prop="levelone">
-                <el-select v-model="createTemp.levelone" filterable placeholder="设备主管" class="filter-item">
+                <el-select v-model="createTemp.levelone" filterable placeholder="设备主管" class="filter-item" style="width:100%">
                   <el-option v-for="item in findAllEmploye" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="一级间隔时间(小时)" prop="leveloneTime">
-                <el-select v-model="createTemp.leveloneTime" placeholder="间隔时间" class="filter-item">
+                <el-select v-model="createTemp.leveloneTime" placeholder="间隔时间" class="filter-item" style="width:100%">
                   <el-option v-for="item in pushNameList2" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="二级督办:" prop="leveltwo">
-                <el-select v-model="createTemp.leveltwo"  filterable placeholder="设备助理" class="filter-item">
+                <el-select v-model="createTemp.leveltwo"  filterable placeholder="设备助理" class="filter-item" style="width:100%">
                   <el-option v-for="item in findAllEmploye" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
               </el-form-item>
@@ -446,21 +446,21 @@
           <el-row>
             <el-col :span="6">
               <el-form-item label="二级间隔时间(小时)" prop="leveltwoTime">
-                <el-select v-model="createTemp.leveltwoTime" placeholder="间隔时间" class="filter-item">
+                <el-select v-model="createTemp.leveltwoTime" placeholder="间隔时间" class="filter-item" style="width:100%">
                   <el-option v-for="item in pushNameList2" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="三级督办:" prop="levelthree">
-                <el-select v-model="createTemp.levelthree"  filterable placeholder="场长" class="filter-item">
+                <el-select v-model="createTemp.levelthree"  filterable placeholder="场长" class="filter-item" style="width:100%">
                   <el-option v-for="item in findAllEmploye" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="三级间隔时间(小时)" prop="levelthreeTime">
-                <el-select v-model="createTemp.levelthreeTime" placeholder="间隔时间" class="filter-item">
+                <el-select v-model="createTemp.levelthreeTime" placeholder="间隔时间" style="width:100%">
                   <el-option v-for="item in pushNameList2" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
               </el-form-item>
@@ -2032,6 +2032,7 @@ export default {
       this.createTemp.depreciation = '5'
       this.createTemp.license = ''
       this.createTemp.duration = ''
+      this.createTemp.maintenance = []
     },
 
 
@@ -2257,7 +2258,7 @@ export default {
       }
 
 
-      if (row.maintenance !== undefined) {
+      if (row.maintenance && row.maintenance.length>0) {
         var newArr = row.maintenance.split(",")
         var arr2 = []
         newArr.forEach(function(item){
@@ -2265,6 +2266,8 @@ export default {
         })
         console.log('arr2',arr2)
         this.createTemp.maintenance = arr2
+      }else{
+        this.$set(this.createTemp,'maintenance',[])
       }
 
 
@@ -2331,6 +2334,7 @@ export default {
               this.createTemp.upkeepgrade = this.createTemp.upkeepgradeId
               this.createTemp.upkeepgradeId = ''
             }
+
             this.createTemp.deptId = this.createTemp.deptId
             this.createTemp.departmentName = this.createTemp.departmentName
             this.createTemp.employeeId = this.createTemp.employeId
@@ -2358,8 +2362,11 @@ export default {
 
             this.requestParam.parammaps.maintenance = this.requestParam.parammaps.maintenance.toString()
           }
-
-
+          if(this.requestParam.parammaps.duration == undefined || this.requestParam.parammaps.duration == "" || this.requestParam.parammaps.duration == null){
+            this.requestParam.parammaps.duration == 0
+            this.$set(this.requestParam.parammaps,'duration',0)
+          }
+            console.log(this.createTemp.maintenance,'maintenance')
             PostDataByName(this.requestParam).then(response => {
               console.log(response)
               if (response.msg !== 'fail') {
@@ -2372,6 +2379,12 @@ export default {
                 this.$notify({ title: '成功', message: '保存成功-', type: 'success', duration: 2000 })
                 // this.reload()
               } else {
+                let arr = this.requestParam.parammaps.maintenance.split(",")
+                let arr1 = []
+                for(let i =0 ;i<arr.length;i++){
+                  arr1.push(parseInt(arr[i]))
+                }
+                this.$set(this.createTemp,'maintenance',arr1)
                 failproccess(response, this.$notify)
               }
             })

Some files were not shown because too many files changed in this diff