Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/device_management/index.vue

src/views/device_management/index.vue

@@ -299,16 +299,16 @@ const defaultForm = form({
   checkDate: ''
 })
 
-// // 自定义模板内容
+// 自定义模板内容
-// const PrefixPlusText = {
+const PrefixPlusText = {
-//   props: ['value', 'functions'],
+  props: ['value', 'functions'],
-//   template: `
+  template: `
-//     <el-tag v-if="functions(value) === '在用'" effect="dark"><span v-html="functions(value)"></span></el-tag>
+    <el-tag v-if="functions(value) === '在用'" effect="dark"><span v-html="functions(value)"></span></el-tag>
-//     <el-tag v-else-if="functions(value) === '停用'" type="danger" effect="dark"><span v-html="functions(value)"></span></el-tag>
+    <el-tag v-else-if="functions(value) === '停用'" type="danger" effect="dark"><span v-html="functions(value)"></span></el-tag>
-//     <el-tag v-else-if="functions(value) === '待报废'" type="warning" effect="dark"><span v-html="functions(value)"></span></el-tag>
+    <el-tag v-else-if="functions(value) === '待报废'" type="warning" effect="dark"><span v-html="functions(value)"></span></el-tag>
-//     <el-tag v-else type="info" effect="dark"><span v-html="functions(value)"></span></el-tag>
+    <el-tag v-else type="info" effect="dark"><span v-html="functions(value)"></span></el-tag>
-//   `
+  `
-// }
+}
 
 export default {
   name: 'InstrumentList',
@@ -400,6 +400,17 @@ export default {
       instrumentId: 0,
       moveDialogVisible: false,
       ifMeasure: false
+      /* pickerOptions1: {
+        //disabledDate是日期组件的一个方法
+        disabledDate: (time) => {
+          //这里就涉及到日期的指定了  setMonth()函数可以设置月份
+          let currentTime = this.value1;
+          let threeMonths = currentTime.setMonth(currentTime.getMonth()+3);
+          //一开始我没加下面减三个月的那个语句，他的值会一直累加
+          currentTime.setMonth(currentTime.getMonth()-3)
+          return time.getTime() < this.value1 || time.getTime() > threeMonths ;
+        }
+      }*/
     }
   },
   mounted() {