设备台账-分类 备注

src/dashoo.cn/frontend_web/src/pages/lims/checkequipmentlist/index.vue

@@ -52,10 +52,21 @@
                            placeholder="按设备分类查询"
                            @change="ProjectTypeChangeHandler"
                            @clear="ProjectTypeClearHandler">
-                  <el-option v-for="item in projectTypeList"
-                             :key="item.id"
-                             :label="item.FullName"
-                             :value="item.Id"></el-option>
+                  <el-option-group
+                    v-for="group in options"
+                    :key="group.label"
+                    :label="group.label">
+                    <el-option
+                      v-for="item in group.options"
+                      :key="item.Id"
+                      :label="item.FullName"
+                      :value="item.Id">
+                    </el-option>
+                  </el-option-group>
+                  <!--<el-option v-for="item in projectTypeList"-->
+                             <!--:key="item.id"-->
+                             <!--:label="item.FullName"-->
+                             <!--:value="item.Id"></el-option>-->
                 </el-select>
               </el-form-item>
 
@@ -279,10 +290,21 @@
                      filterable
                      placeholder="请选择"
                      @change="changeDetectionCycle">
-            <el-option v-for="item in projectTypeList"
-                       :key="item.id"
-                       :label="item.FullName"
-                       :value="item.Id"></el-option>
+            <el-option-group
+              v-for="group in options"
+              :key="group.label"
+              :label="group.label">
+              <el-option
+                v-for="item in group.options"
+                :key="item.Id"
+                :label="item.FullName"
+                :value="item.Id">
+              </el-option>
+            </el-option-group>
+            <!--<el-option v-for="item in projectTypeList"-->
+                       <!--:key="item.id"-->
+                       <!--:label="item.FullName"-->
+                       <!--:value="item.Id"></el-option>-->
           </el-select>
         </el-form-item>
         <el-form-item label="安装地点"
@@ -327,12 +349,13 @@
                        placeholder="请选择"
                        style="width: 85px"
                        disabled>
-              <el-option label="年"
-                         value="年"></el-option>
-              <el-option label="月"
-                         value="月"></el-option>
-              <el-option label="天"
-                         value="天"></el-option>
+              <template slot="append">{{formData.CycleUnit}}</template>
+              <!--<el-option label="年"-->
+                         <!--value="年"></el-option>-->
+              <!--<el-option label="月"-->
+                         <!--value="月"></el-option>-->
+              <!--<el-option label="天"-->
+                         <!--value="天"></el-option>-->
             </el-select>
           </el-input>
         </el-form-item>
@@ -558,7 +581,26 @@ export default {
         children: 'children'
       },
       customerForm: [],
-      CustomerId: 0
+      CustomerId: 0,
+      options: [{
+        label: '特检',
+        options: [
+          {Id: 179, FullName: '电气接地装置检测'},
+          {Id: 286, FullName: '防雷装置检测'},
+          {Id: 187, FullName: '防雷装置（等电位）检测'},
+          {Id: 181, FullName: '漏电保护器检测'}
+        ]
+      }, {
+        label: '宇信',
+        options: [
+          {Id: 156, FullName: '阻火器检测'},
+          {Id: 183, FullName: '呼吸阀检测'},
+          {Id: 154, FullName: '液压安全阀检测'},
+          {Id: 189, FullName: '空气泡沫产生器检测'},
+          {Id: 141, FullName: '游梁式抽油机检测'},
+          {Id: 173, FullName: '无游梁式抽油机检测'}
+        ]
+      }]
     }
   },
   created () {

src/dashoo.cn/frontend_web/src/pages/lims/reportairfoamgenerator/subdata/dataopera.vue

@@ -576,22 +576,18 @@
         this.formData.MainProducts = this.checkboxvalues.join(',')
       },
       setRemark1 () {
-        if (this.formData.Remark1) {
-          if (this.formData.Remark1.length > 0) {
+          if (this.formData.Remark1 && this.formData.Remark1.length > 0) {
             this.formData.Remark1 = this.formData.Remark1 + ',' + this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
           } else {
             this.formData.Remark1 = this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
           }
-        }
       },
       setRemark2 () {
-        if (this.formData.Remark1) {
-          if (this.formData.Remark2.length > 0) {
+          if (this.formData.Remark2 && this.formData.Remark2.length > 0) {
             this.formData.Remark2 = this.formData.Remark2 + ',' + this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
           } else {
             this.formData.Remark2 = this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
           }
-        }
       },
 
       setChosen () {

src/dashoo.cn/frontend_web/src/pages/lims/reportatmosvalve/subdata/dataopera.vue

@@ -1047,22 +1047,18 @@
           })
       },
       setRemark1 () {
-        if (this.formData.Remark1) {
-          if (this.formData.Remark1.length > 0) {
+          if (this.formData.Remark1 && this.formData.Remark1.length > 0) {
             this.formData.Remark1 = this.formData.Remark1 + ',' + this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
           } else {
             this.formData.Remark1 = this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
           }
-        }
       },
       setRemark2 () {
-        if (this.formData.Remark2) {
-          if (this.formData.Remark2.length > 0) {
+          if (this.formData.Remark2 && this.formData.Remark2.length > 0) {
             this.formData.Remark2 = this.formData.Remark2 + ',' + this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
           } else {
             this.formData.Remark2 = this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
           }
-        }
       },
       setAllPosBaseNum (num) {
         this.formData.PosBaseNum1 = num

src/dashoo.cn/frontend_web/src/pages/lims/reporthydraulicsafe/subdata/dataopera.vue

@@ -817,22 +817,18 @@
         }
       },
       setRemark1 () {
-        if (this.formData.Remark1) {
-          if (this.formData.Remark1.length > 0) {
+          if (this.formData.Remark1 && this.formData.Remark1.length > 0) {
             this.formData.Remark1 = this.formData.Remark1 + ',' + this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
           } else {
             this.formData.Remark1 = this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
           }
-        }
       },
       setRemark2 () {
-        if (this.formData.Remark2) {
-          if (this.formData.Remark2.length > 0) {
+          if (this.formData.Remark2 && this.formData.Remark2.length > 0) {
             this.formData.Remark2 = this.formData.Remark2 + ',' + this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
           } else {
             this.formData.Remark2 = this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
           }
-        }
       },
       setAllPosBaseNum (num) {
         this.formData.PosBaseNum1 = num

src/dashoo.cn/frontend_web/src/pages/lims/reportzuhq/subdata/dataopera.vue

@@ -594,22 +594,18 @@
       //   }
       // },
       setRemark1 () {
-        if (this.formData.Remark1) {
-          if (this.formData.Remark1.length > 0) {
+          if (this.formData.Remark1 && this.formData.Remark1.length > 0) {
             this.formData.Remark1 = this.formData.Remark1 + ',' + this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
           } else {
             this.formData.Remark1 = this.Problems.ProblemLocation1 + '-' + this.Problems.CommonProblem1
           }
-        }
       },
       setRemark2 () {
-        if (this.formData.Remark2) {
-          if (this.formData.Remark2.length > 0) {
+          if (this.formData.Remark2 && this.formData.Remark2.length > 0) {
             this.formData.Remark2 = this.formData.Remark2 + ',' + this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
           } else {
             this.formData.Remark2 = this.Problems.ProblemLocation2 + '-' + this.Problems.CommonProblem2
           }
-        }
       },
       getPwPaAvg () {
         var divisor = 0