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

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

src/views/maintenance/subcontractingMainten/tabPage/tab1.vue

@@ -861,6 +861,7 @@ export default {
                       "contractId": "@insertSpotList.contractId",
                       "providerName": "@insertSpotList.providerName",
                       "contractCode": "@insertSpotList.contractCode",
+                      "remark": "@insertSpotList.remark",
                       "status":this.createTemp.status
                       }
                   }

src/views/maintenance/subcontractingMainten/tabPage/tab2.vue

@@ -523,7 +523,7 @@
     </el-dialog>
 
     <el-dialog  title="领用单" :visible.sync="dialogFormVisible_CollectionSparePartsSee" :close-on-click-modal="false" width="90%">
-      <div class="collectionSparePartsSee">
+      <div class="collectionSparePartsSee" style="height: 500px;">
         <el-form
           ref="collectionSparePartsSeeTemp"
           :rules="rules"
@@ -681,7 +681,8 @@
       </div>
       <div slot="footer" class="dialog-footer" style="bottom:5px">
         <el-button v-if="isPartCode" type="primary" :disabled="isokDisable" @click="createCollectionSparePartsData()">确认</el-button>
-        <el-button @click="dialogFormVisible_CollectionSparePartsSee = false;">关闭</el-button>
+        <!-- <el-button @click="dialogFormVisible_CollectionSparePartsSee = false;">关闭</el-button> -->
+        <el-button @click="closeCollectionSparePartsSee">关闭</el-button>
       </div>
     </el-dialog>
 
@@ -765,6 +766,7 @@ export default {
         }
       },
       dialogFormVisible_CollectionSparePartsSee: false,
+      beforedialog:'',
       listCreateCollectionSpareParts: [],
       isCreatePartDelete: false,
       isPartCode: true,
@@ -790,8 +792,8 @@ export default {
 
       rules: {
         equipmentName: [{ required: true, message: '必填', trigger: 'blur' }],
-        lcdate: [{ required: true, message: '必填', trigger: 'blur' }],
-        hcdate: [{ required: true, message: '必填', trigger: 'blur' }],
+        // lcdate: [{ required: true, message: '必填', trigger: 'blur' }],
+        // hcdate: [{ required: true, message: '必填', trigger: 'blur' }],
       },
       getPramPartApplyListBybig: {
         name:"getpartapplyListBybig",
@@ -1113,6 +1115,8 @@ export default {
 
     handleCollarUseSee(row, isStock) {
       console.log(row)
+      let beforedialog = ''
+      this.beforedialog = this.dialogStatus
       this.collectionSparePartsSeeTemp = Object.assign({}, row)
       this.dialogStatus = 'collectionSparePartsSee1'
 
@@ -1479,7 +1483,10 @@ export default {
       })
     },
 
-
+    closeCollectionSparePartsSee(){
+      this.dialogFormVisible_CollectionSparePartsSee = false
+      this.dialogStatus = this.beforedialog
+    },
     // 添加领用保存
     createCollectionSparePartsData() {
       this.isokDisable = true
@@ -1839,14 +1846,14 @@ export default {
         //牧场
         if(this.createTemp.applyType == 0){
           for(let i=0;i<this.listAddCont.length;i++){
-            if(this.listAddCont[i].sealNumber == ''){
-              this.$message({ type: 'warning', message: '请检查铅封号是否未填写', duration: 2000 })
-              return false
-            }
-            if(this.listAddCont[i].warrantydate == ''){
-              this.$message({ type: 'warning', message: '请检查质保日期是否未填写', duration: 2000 })
-              return false
-            }
+            // if(this.listAddCont[i].sealNumber == ''){
+            //   this.$message({ type: 'warning', message: '请检查铅封号是否未填写', duration: 2000 })
+            //   return false
+            // }
+            // if(this.listAddCont[i].warrantydate == ''){
+            //   this.$message({ type: 'warning', message: '请检查质保日期是否未填写', duration: 2000 })
+            //   return false
+            // }
           }