Browse Source

Merge branch 'hotfix/repair-bugs' of Epans/modernDairy into master

duanxiaoduan 1 year ago
parent
commit
e0111e26a8
3 changed files with 17 additions and 4 deletions
  1. 0 0
      dist/index.html
  2. 1 1
      src/permission.js
  3. 16 3
      src/views/maintenance/repair/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',1)
+Cookies.set('sso',0)
 NProgress.configure({ showSpinner: false }) // NProgress Configuration
 
 const whiteList = ['/login'] // no redirect whitelist

+ 16 - 3
src/views/maintenance/repair/index.vue

@@ -2475,9 +2475,22 @@ export default {
               return false
             }
           }
-
-
-
+          if (this.listAddCont[j].providerName == null || this.listAddCont[j].providerName === '') {
+            this.$message({ type: 'warning', message: '请检查供应商是否未填写', duration: 2000 })
+            return false
+          }
+          if (this.listAddCont[j].eqCode == null || this.listAddCont[j].eqCode === '') {
+            this.$message({ type: 'warning', message: '请检查设备名称是否未填写', duration: 2000 })
+            return false
+          }
+          if (this.listAddCont[j].eqName == null || this.listAddCont[j].eqName === '') {
+            this.$message({ type: 'warning', message: '请检查设备内部编号是否未填写', duration: 2000 })
+            return false
+          }
+          if (this.listAddCont[j].typea == null || this.listAddCont[j].typea === '') {
+            this.$message({ type: 'warning', message: '请检查费用类型是否未填写', duration: 2000 })
+            return false
+          }
 
         }
         var amount = 0

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