设备档案卡： 岗位分组因为存在多个情况使用模糊查询方式，存放地点采用对话框方式，

页面label修改为检定/校准证书编号，检定/校准证书编号。

src/views/component/device/deviceDialog.vue

@@ -569,7 +569,7 @@
                                             <el-col :span="8">
                                                 <el-row>
                                                     <el-col>
-                                                        <el-form-item label="是否校准：" prop="shiFouXiaoZhun">
+                                                        <el-form-item label="是否校准：" prop="shiFouXiaoZhun" label-width="140px">
                                                             <el-select v-if="!readonly" v-model="form.shiFouXiaoZhun" placeholder="请选择" size="mini" style="width:100%">
                                                                 <el-option
                                                                     v-for="item in ['是','否']"
@@ -585,7 +585,7 @@
                                                 </el-row>
                                                 <el-row v-if="form.shiFouXiaoZhun==='是'">
                                                     <el-col>
-                                                        <el-form-item label="检定/校准周期(月)：" label-width="140">
+                                                        <el-form-item label="检定/校准周期(月)：" label-width="140px">
                                                             <el-input v-if="!readonly" v-model="form.xiaoZhunZQ" size="mini" type="number" style="width:100%" />
                                                             <span v-else>{{ form.xiaoZhunZQ ||'/' }}
                                                             </span>
@@ -594,7 +594,7 @@
                                                 </el-row>
                                                 <el-row v-if="form.shiFouXiaoZhun==='是'">
                                                     <el-col>
-                                                        <el-form-item label="检定/校准单位：">
+                                                        <el-form-item label="检定/校准单位：" label-width="140px">
                                                             <ibps-custom-dialog
                                                                 v-model="form.shiYongKeShi"
                                                                 size="mini"
@@ -611,7 +611,7 @@
                                                 </el-row>
                                                 <el-row v-if="form.shiFouXiaoZhun==='是'">
                                                     <el-col>
-                                                        <el-form-item label="最近校准时间：">
+                                                        <el-form-item label="最近校准时间：" label-width="140px">
                                                             <el-date-picker
                                                                 v-if="!readonly"
                                                                 v-model="form.yiXiaoRiQi"
@@ -629,7 +629,7 @@
                                                 </el-row>
                                                 <el-row v-if="form.shiFouXiaoZhun==='是'">
                                                     <el-col>
-                                                        <el-form-item label="校准有效期至：">
+                                                        <el-form-item label="检定/校准有效期至：" label-width="140px">
                                                             <el-date-picker
                                                                 v-if="!readonly"
                                                                 v-model="form.xiaoZhunYouXia"
@@ -647,7 +647,7 @@
                                                 </el-row>
                                                 <el-row v-if="form.shiFouXiaoZhun==='是'">
                                                     <el-col>
-                                                        <el-form-item label="校准证书编号：">
+                                                        <el-form-item label="检定/校准证书编号：" label-width="140px">
                                                             <el-input v-if="!readonly" v-model="form.zhengShuBianHa" size="mini" />
                                                             <span v-else>{{ form.zhengShuBianHa ||'/' }}
                                                             </span>

src/views/component/device/index.vue

@@ -299,8 +299,21 @@
                             />
                         </el-select>
                     </template>
-                    <template slot="place">
+                    <!-- <template slot="place">
                         <el-input v-model="search.place" size="mini" />
+                    </template> -->
+                    <template slot="place">
+                        <ibps-custom-dialog
+                            v-model="search.place"
+                            size="mini"
+                            template-key="fjxzkdd"
+                            multiple
+                            :disabled="false"
+                            type="dialog"
+                            class="custom-dialog"
+                            placeholder="请选择"
+                            icon="el-icon-search"
+                        />
                     </template>
                     <template slot="managePeople">
                         <ibps-user-selector
@@ -784,9 +797,16 @@ export default {
                 parameters.parameters.push(obj)
             }
             // 放置地点搜索
+            // if (this.search.place) {
+            //     const obj = { relation: 'AND', parameters: [] }
+            //     obj.parameters.push({ key: 'Q^cun_fang_di_dian_^SL', value: this.search.place, param: this.$utils.guid() })
+            //     parameters.parameters.push(obj)
+            // }
             if (this.search.place) {
-                const obj = { relation: 'AND', parameters: [] }
-                obj.parameters.push({ key: 'Q^cun_fang_di_dian_^SL', value: this.search.place, param: this.$utils.guid() })
+                const obj = { relation: 'OR', parameters: [] }
+                this.search.place.split(',').forEach(item => {
+                    obj.parameters.push({ key: 'Q^cun_fang_wei_zhi_^S', value: item, param: this.$utils.guid() })
+                })
                 parameters.parameters.push(obj)
             }
             // 保管人搜索(可多选)
@@ -801,7 +821,7 @@ export default {
             if (this.search.deviceClass) {
                 const obj = { relation: 'OR', parameters: [] }
                 this.search.deviceClass.split(',').forEach(item => {
-                    obj.parameters.push({ key: 'Q^wei_hu_fang_shi_^S', value: item, param: this.$utils.guid() })
+                    obj.parameters.push({ key: 'Q^wei_hu_fang_shi_^SL', value: item, param: this.$utils.guid() })
                 })
                 parameters.parameters.push(obj)
             }