Merge branch 'master' into feature/merge_report

# Conflicts:
#	dist/index.html

src/views/asset/basics/index.vue

@@ -105,7 +105,7 @@
                   <div style="display:block;line-height: 50px;">{{ row.eqName }}</div>
                 </div>
               </template>
-            </el-table-column> 
+            </el-table-column>
             <el-table-column label="设备内部编号" align="center" prop="eqCode" />
            <el-table-column label="财务编号" align="center" prop="financeCode" />
             <el-table-column label="规格" align="center" prop="specification" />
@@ -141,6 +141,7 @@
             <el-table-column label="使用时长(年)" sortable align="center" prop="serviceDuration" />
             <el-table-column label="使用率(%)" sortable align="center" prop="utilizationRate" />
             <el-table-column label="物联网编码" sortable align="center" prop="license" />
+            <el-table-column label="标准工作时长" sortable align="center" prop="duration" />
 
             <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width" fixed="right">
               <template slot-scope="{row}">
@@ -464,6 +465,18 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="物联网编码" prop="license">
+                <el-input ref="license" v-model="createTemp.license" placeholder="物联网编码" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="标准工作时长" prop="duration">
+                <el-input ref="duration" v-model="createTemp.duration" placeholder="标准工作时长" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col :span="6">
@@ -1237,7 +1250,7 @@ export default {
       uploadImageUrl: process.env.VUE_APP_BASE_API + 'authdata/uploaderimage',
       width: '',
 
-      createTemp: { inputDatetime: parseTime(new Date(), '{y}-{m}-{d}'), employeId: this.$store.state.user.employeid, inputUser: this.$store.state.user.employeid, deptId: this.$store.state.user.departmentid, departmentName: Cookies.get('departmentname'), pastureId: this.$store.state.user.pastureid, assetCode: '', eqClassName: '', eqClassId: '', eqCode: '', eqName: '', specification: '', providerName: '', brandName: '', financeCode: '', status: '正常', purpose: '', purchaseDate: parseTime(new Date(), '{y}-{m}-{d}'), entranceDate: parseTime(new Date(), '{y}-{m}-{d}'), yearUpkeepCost: '', yearMaintainDost: '', yuanzhi: '', baseHours: '', upkeepgrade: '', salvage: '', subtractvalue: '', yearMaintainCost: '', brandId: '', providerId: '', inputUserName: '', employeName: this.$store.state.user.employename, depreciation: '5', maintenance: '', levelone: '', leveltwo: '', levelthree: '', pushTime: '', leveloneTime: '', leveltwoTime: '', levelthreeTime: '' },
+      createTemp: { license:'',duration:'',inputDatetime: parseTime(new Date(), '{y}-{m}-{d}'), employeId: this.$store.state.user.employeid, inputUser: this.$store.state.user.employeid, deptId: this.$store.state.user.departmentid, departmentName: Cookies.get('departmentname'), pastureId: this.$store.state.user.pastureid, assetCode: '', eqClassName: '', eqClassId: '', eqCode: '', eqName: '', specification: '', providerName: '', brandName: '', financeCode: '', status: '正常', purpose: '', purchaseDate: parseTime(new Date(), '{y}-{m}-{d}'), entranceDate: parseTime(new Date(), '{y}-{m}-{d}'), yearUpkeepCost: '', yearMaintainDost: '', yuanzhi: '', baseHours: '', upkeepgrade: '', salvage: '', subtractvalue: '', yearMaintainCost: '', brandId: '', providerId: '', inputUserName: '', employeName: this.$store.state.user.employename, depreciation: '5', maintenance: '', levelone: '', leveltwo: '', levelthree: '', pushTime: '', leveloneTime: '', leveltwoTime: '', levelthreeTime: '' },
       requestParam: { name: 'insertAsset', offset: 0, pagecount: 0, parammaps: {}},
       seeTemp: {},
       dialogFormVisible_Examine: false,
@@ -1381,7 +1394,7 @@ export default {
       return {
         name: 'importStockUse',
         pastureId: Cookies.get('pastureid'),
-        importParams: '牧场,设备类别,资产编号,设备名称,设备内部编号,设备规格,品牌,供应商,用途,状态,购置日期,入场日期,折旧年限,财务编号,原值,残值,月核减值,保养级别,保养费用,维修费用,维修费用,基数(小时),部门,责任人,录入人,录入时间,使用时长(年),使用率(%),SignColumn',
+        importParams: '牧场,设备类别,资产编号,设备名称,设备内部编号,设备规格,品牌,供应商,用途,状态,购置日期,入场日期,折旧年限,财务编号,原值,残值,月核减值,保养级别,保养费用,维修费用,维修费用,基数(小时),部门,责任人,录入人,录入时间,使用时长(年),使用率(%),物联网编码,标准工作时长,SignColumn',
         sheetname: 'SheetJS'
       }
     },
@@ -2005,6 +2018,8 @@ export default {
       this.showUpload = false
       this.createTemp.fileList = []
       this.createTemp.depreciation = '5'
+      this.createTemp.license = ''
+      this.createTemp.duration = ''
     },
 
 
@@ -3016,8 +3031,8 @@ export default {
 
         const elecExcelDatas = [
           {
-            tHeader: ['牧场','设备类别', '资产编号', '设备名称', '设备内部编号', '设备规格', '品牌', '供应商', '用途', '状态', '购置日期', '入场日期', '折旧年限', '财务编号', '原值', '残值', '月核减值', '保养级别', '保养费用', '维修费用', '基数(小时)',  '部门', '责任人', '录入人', '录入时间', '使用时长(年)', '使用率(%)', '指定维修人', '一级督办', '一级间隔时间', '二级督办', '二级间隔时间', '三级督办', '三级间隔时间',],
-            filterVal: ['pastureName','eqClassName', 'assetCode', 'eqName', 'eqCode', 'specification', 'brandName', 'providerName', 'purpose', 'status', 'purchaseDate', 'entranceDate', 'depreciation', 'financeCode', 'yuanzhi', 'salvage', 'subtractvalue', 'upkeepgrade', 'yearUpkeepCost', 'yearMaintainCost', 'baseHours', 'deptName', 'employeName', 'inputUserName', 'inputDatetime', 'serviceDuration', 'utilizationRate', 'maintenanceName',  'leveloneName', 'leveloneTime','leveltwoName', 'leveltwoTime','levelthreeName','levelthreeTime' ],
+            tHeader: ['牧场','设备类别', '资产编号', '设备名称', '设备内部编号', '设备规格', '品牌', '供应商', '用途', '状态', '购置日期', '入场日期', '折旧年限', '财务编号', '原值', '残值', '月核减值', '保养级别', '保养费用', '维修费用', '基数(小时)',  '部门', '责任人', '录入人', '录入时间', '使用时长(年)', '使用率(%)', '指定维修人', '一级督办', '一级间隔时间', '二级督办', '二级间隔时间', '三级督办', '三级间隔时间','物联网编码','标准工作时长'],
+            filterVal: ['pastureName','eqClassName', 'assetCode', 'eqName', 'eqCode', 'specification', 'brandName', 'providerName', 'purpose', 'status', 'purchaseDate', 'entranceDate', 'depreciation', 'financeCode', 'yuanzhi', 'salvage', 'subtractvalue', 'upkeepgrade', 'yearUpkeepCost', 'yearMaintainCost', 'baseHours', 'deptName', 'employeName', 'inputUserName', 'inputDatetime', 'serviceDuration', 'utilizationRate', 'maintenanceName',  'leveloneName', 'leveloneTime','leveltwoName', 'leveltwoTime','levelthreeName','levelthreeTime','license','duration' ],
             tableDatas: this.downLoadList,
             sheetName: '设备基础信息'
           }

src/views/cost/diesel/index.vue

@@ -915,7 +915,7 @@ export default {
       this.isokDisable = true
       setTimeout(() => {
         this.isokDisable = false
-      }, 1000)
+      }, 10000)
       this.$refs['temp'].validate(valid => {
         if (valid) {
           if(this.temp.oilType){
@@ -965,6 +965,7 @@ export default {
                 duration: 2000
               })
             }
+            this.isokDisable = false
           })
         }
       })
@@ -974,7 +975,7 @@ export default {
       this.isokDisable = true
       setTimeout(() => {
         this.isokDisable = false
-      }, 1000)
+      }, 10000)
 
       this.$refs['temp'].validate(valid => {
         if (valid) {
@@ -1026,6 +1027,7 @@ export default {
                 duration: 2000
               })
             }
+            this.isokDisable = false
           })
         }
       })
@@ -1042,6 +1044,10 @@ export default {
 
     // 修改加油信息
     edit_dialog_save() {
+      this.isokDisable = true
+      setTimeout(() => {
+        this.isokDisable = false
+      }, 10000)
       this.$refs['temp'].validate(valid => {
         if (valid) {
           if(this.temp.oilType){
@@ -1084,6 +1090,7 @@ export default {
                 duration: 2000
               })
             }
+            this.isokDisable = false
           })
         }
       })

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
+            // }
           }