|
|
@@ -51,7 +51,7 @@ class ChildProject extends Controller
|
|
|
$category_id = $this->request->get('category_id');
|
|
|
$query = $this->_query($this->table)
|
|
|
->like('project_name,design_life,decorate_standard,other_parameters')
|
|
|
- ->equal('structure_type,building_fortification_intensity,seismic_grade,base_type')
|
|
|
+ ->equal('structure_type,building_fortification_intensity,seismic_grade,base_type,template')
|
|
|
->fieldBetween('construction_layer','construction_layer_start,construction_layer_end')
|
|
|
->fieldBetween('upper_number','upper_number_start,upper_number_end')
|
|
|
->fieldBetween('underground','underground_start,underground_end')
|
|
|
@@ -109,6 +109,8 @@ class ChildProject extends Controller
|
|
|
}
|
|
|
$menus = Db::name('system_goods_cate')->where(['status' => '1'])->where('is_deleted', 0)->order('id asc')->column('id,pid,title');
|
|
|
$this->menus = Data::arr2table(array_merge([['id' => '', 'pid' => '-1', 'title' => '--全部--']],$menus ));
|
|
|
+ $template = Db::name('system_template')->where('is_del',1)->field('id,title')->select();
|
|
|
+ $this->template = array_merge([['id' => '', 'title' => '--全部--']],$template );
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -177,6 +179,9 @@ class ChildProject extends Controller
|
|
|
|
|
|
$menus = Db::name('system_goods_cate')->where(['status' => '1'])->where('is_deleted', 0)->order('id asc')->column('id,pid,title');
|
|
|
$this->menus = Data::arr2table($menus);
|
|
|
+
|
|
|
+ $template = Db::name('system_template')->where('is_del',1)->field('id,title')->select();
|
|
|
+ $this->template = array_merge([['id' => '', 'title' => '--全部--']],$template );
|
|
|
}
|
|
|
}
|
|
|
|
songxingwei