修复导出功能设备台账右侧表格显示

src/dashoo.cn/backend/api/controllers/lims/Limscustomerposition.go

@@ -68,7 +68,7 @@ func (this *LimsCustomerpositionController) GetEntityList() {
 	}
 
 	if ParentId != "" && ParentId != "0" {
-		where = where + " and (ParentId = '" + ParentId + "' or Id = '" + ParentId + "')"
+		where = where + " and (ParentId = '" + ParentId + "' or Id = '" + ParentId +"' or ThrUnitId = '"+ParentId+ "')"
 	}
 
 	if PositionName != "" {

src/dashoo.cn/backend/api/controllers/lims/limscheckequipmentlist.go

@@ -667,7 +667,7 @@ func (this *LimsCheckEquipmentListController) ExportExcelAll() {
 	}
 
 	if len(strPositionList) > 0 {
-		where = where + " and PositionCheckId in ('" + strPositionList + "')"
+		where = where + " and PositionCheckId in (" + strPositionList + ")"
 	}
 
 	svc := limscheckequipmentlist.GetLimsCheckEquipmentListService(utils.DBE)

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

@@ -52,21 +52,10 @@
                            placeholder="按设备分类查询"
                            @change="ProjectTypeChangeHandler"
                            @clear="ProjectTypeClearHandler">
-                  <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-option v-for="item in projectTypeList"
+                             :key="item.id"
+                             :label="item.FullName"
+                             :value="item.Id"></el-option>
                 </el-select>
               </el-form-item>
 
@@ -290,21 +279,10 @@
                      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="安装地点"
@@ -349,13 +327,12 @@
                        placeholder="请选择"
                        style="width: 85px"
                        disabled>
-              <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-option label="年"
+                         value="年"></el-option>
+              <el-option label="月"
+                         value="月"></el-option>
+              <el-option label="天"
+                         value="天"></el-option>
             </el-select>
           </el-input>
         </el-form-item>
@@ -366,7 +343,7 @@
         </el-form-item>
 
         <el-form-item label="附件上传"
-                      :label-width="formLabelWidth">
+                      :label-width="formLabelWidth"  v-show="uploadvisit">
           <el-upload multiple
                      action=""
                      ref="refmaintainlogattach"
@@ -431,6 +408,7 @@ export default {
 
   data () {
     return {
+      uploadvisit: true,
       statusOptions: [{
         value: '-2',
         label: '已过期'
@@ -580,26 +558,7 @@ export default {
         children: 'children'
       },
       customerForm: [],
-      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: '无游梁式抽油机检测'}
-        ]
-      }],
+      CustomerId: 0
     }
   },
   created () {
@@ -915,6 +874,7 @@ export default {
       this.formData.ModifiedOn = ''
       this.formData.ModifiedUserId = 0
       this.formData.ModifiedBy = ''
+      this.uploadvisit = false
     },
     exportExcel () {
       let params = {
@@ -934,6 +894,7 @@ export default {
     ShowEntityDialog (entityId) {
       this.entityId = entityId
       this.addoredittitle = '编辑'
+      this.uploadvisit = true
       this.$nextTick(() => {
         this.$refs.refmaintainlogattach.clearFiles()
       })