|
|
@@ -391,6 +391,19 @@
|
|
|
/>
|
|
|
</el-select>
|
|
|
</template>
|
|
|
+ <template slot="yanShouRiQi">
|
|
|
+ <el-date-picker
|
|
|
+ v-model="search.yanShouRiQi"
|
|
|
+ size="mini"
|
|
|
+ type="daterange"
|
|
|
+ :picker-options="pickerOptions"
|
|
|
+ range-separator="至"
|
|
|
+ start-placeholder="开始日期"
|
|
|
+ end-placeholder="结束日期"
|
|
|
+ align="right"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ />
|
|
|
+ </template>
|
|
|
</ibps-crud>
|
|
|
|
|
|
</template>
|
|
|
@@ -629,7 +642,8 @@ export default {
|
|
|
managePeople: '',
|
|
|
deviceClass: '',
|
|
|
renKeXiangMu: '',
|
|
|
- validity: ''
|
|
|
+ validity: '',
|
|
|
+ yanShouRiQi: ''
|
|
|
},
|
|
|
showDeptSeach: false, //部门选择搜索是否禁用
|
|
|
loading: false,
|
|
|
@@ -764,6 +778,12 @@ export default {
|
|
|
label: '类别',
|
|
|
fieldType: 'slot',
|
|
|
slotName: 'renKeXiangMuSlot'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ prop: '',
|
|
|
+ label: '验收日期',
|
|
|
+ fieldType: 'slot',
|
|
|
+ slotName: 'yanShouRiQi'
|
|
|
}
|
|
|
// {
|
|
|
// prop: '',
|
|
|
@@ -1134,6 +1154,21 @@ export default {
|
|
|
})
|
|
|
parameters.parameters.push(obj)
|
|
|
}
|
|
|
+
|
|
|
+ if (this.search.yanShouRiQi && this.search.yanShouRiQi.length === 2) {
|
|
|
+ const obj = { relation: 'AND', parameters: [] }
|
|
|
+ obj.parameters.push({
|
|
|
+ key: 'Q^yan_shou_ri_qi_^DL^yyyy-MM-dd',
|
|
|
+ value: this.search.yanShouRiQi[0],
|
|
|
+ param: this.$utils.guid()
|
|
|
+ })
|
|
|
+ obj.parameters.push({
|
|
|
+ key: 'Q^yan_shou_ri_qi_^DG^yyyy-MM-dd',
|
|
|
+ value: this.search.yanShouRiQi[1],
|
|
|
+ param: this.$utils.guid()
|
|
|
+ })
|
|
|
+ parameters.parameters.push(obj)
|
|
|
+ }
|
|
|
if (this.search.validity && this.search.validity.length === 2) {
|
|
|
const obj = { relation: 'AND', parameters: [] }
|
|
|
obj.parameters.push({
|