metapp
/
dzadsod
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

调整道闸方位为门口方位 

完善订单信息
This commit is contained in:
cloud 2020-03-06 01:21:01 +08:00
parent 9633c1e533
commit a8aa0979ca
11 changed files with 78 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/index.class.php
View File

File diff suppressed because one or more lines are too long

5
admin/info_off.class.php
View File

@ -226,7 +226,10 @@ class info_off extends appadmin {
'h_starttime' => $this->form['h_starttime'],
'h_endtime' => $this->form['h_endtime'],
'h_noticeday' => arrayto_string(array_unique(stringto_array($this->form['h_noticeday'],',')),','), //对数组进行去重处理
'h_text' => $this->form['h_text']
'h_text' => $this->form['h_text'],
'h_tower' => $this->form['h_tower'],
'h_texta' => $this->form['h_texta'],
'h_medium' => $this->form['h_medium']
];
if($this->form['id']){

8
admin/info_on.class.php
View File

@ -102,7 +102,7 @@ class info_on extends appadmin
$this->input['data']['e_number_readonly'] = 'readonly';
// 二次编辑时采用单选
//道闸方位
//门口方位
$para = $this->tsql->table('para')->where(['p_type' => 3])->all();
parent::para_radio($para,'e_bno',$this->input['data']['e_bno'],$this->input['para']['e_bno_radio'])
->setparahtml(3,$this->input['para']['e_bno_radio']);
@ -117,7 +117,7 @@ class info_on extends appadmin
$this->input['data']['e_enable'] = 1;
// 新增编辑时采用多选
//道闸方位
//门口方位
$para = $this->tsql->table('para')->where(['p_type' => 3])->all();
parent::para_checkbox($para,'e_bno',$this->input['data']['e_bno'],$this->input['para']['e_bno_radio'])
->setparahtml(3,$this->input['para']['e_bno_radio']);
@ -148,6 +148,10 @@ class info_on extends appadmin
$this->input['data']['e_vid'] = $_M['form']['e_vid'];
$this->input['data']['h_noticeday'] = 7;
}
$para = $this->tsql->table('para')->where(['p_type' => 4])->all();
parent::para_checkbox($para,'h_medium',$this->input['data']['h_medium'],$this->input['para']['h_medium_radio'])
->setparahtml(4,$this->input['para']['h_medium_radio']);
$this->input['remote_url'] = $_M['url']['own_name'].'c=ajax&a=dohnumber&id='.$_M['form']['id'];
}

25
admin/templates/contract.php
View File

@ -65,6 +65,25 @@ $met_title = $data['met_title'];
</select>
</dd>
</dl>
<dl>
<dt><label class='form-control-label'>备注信息</label></dt>
<dd class="form-group">
<div class="input-group">
<span class="input-group-addon">周期</span>
<input type="text" name="h_texta"
value="{$data.data.h_texta}"
class="form-control"
placeholder='投放周期' >
<span class="input-group-addon">--</span>
<input type="text" name="h_tower"
value="{$data.data.h_tower}"
class="form-control"
placeholder='投放台数' >
<span class="input-group-addon">台</span>
</div>
<span class="text-help m-l-10"></span>
</dd>
</dl>
<dl>
<dt><label class='form-control-label'>广告时间段</label></dt>
<dd class="form-group">
@ -89,6 +108,12 @@ $met_title = $data['met_title'];
<span class="text-help m-l-10">影响后期的投放计划时间区间</span>
</dd>
</dl>
<dl>
<dt><label class='form-control-label'>投放媒介</label></dt>
<dd class="form-group">
{$data.para.h_medium_radio}
</dd>
</dl>
<dl>
<dt><label class='form-control-label'>合同到期通知</label></dt>
<dd>

4
include/class/appadmin.class.php
View File

@ -248,7 +248,7 @@ class appadmin extends admin{
return $this;
}
//参数单选组成
//参数多选组成
public function para_checkbox($para,$name,$checked,&$html,$exists = false) {
global $_M,$_YW;
$html = '';
@ -300,7 +300,7 @@ class appadmin extends admin{
//返回广告位对照地址
public function e_address($elevator) {
global $_M,$_YW;
//道闸方位
//门口方位
$e_bno = self::paralist(['p_type' => 3, 'p_value' => $elevator['e_bno'] ]);
//广告位置
$e_aps = self::paralist(['p_type' => 0, 'p_value' => $elevator['e_aps'] ]);

2
include/class/appweb.class.php
View File

@ -211,7 +211,7 @@ class appweb extends web {
//返回广告位对照地址
public function e_address($elevator) {
global $_M,$_YW;
//道闸方位
//门口方位
$e_bno = self::paralist(['p_type' => 3, 'p_value' => $elevator['e_bno'] ]);
//广告位置
$e_aps = self::paralist(['p_type' => 0, 'p_value' => $elevator['e_aps'] ]);

21
include/class/table_theme.class.php
View File

@ -430,9 +430,9 @@ class table_theme {
//位置
$para = $tsql->table('para')->where(['p_type' => 0])->all();
$this->search[] = self::para_select($para,['e_aps','位置']);
//道闸方位
//门口方位
$para = $tsql->table('para')->where(['p_type' => 3])->all();
$this->search[] = self::para_select($para,['e_bno','道闸方位']);
$this->search[] = self::para_select($para,['e_bno','门口方位']);
$this->select2 = [
'_fiend' => ['e_vid','选择场所',$_M['form']['e_vid']],
'placeholder' => '输入场所名称',
@ -652,7 +652,8 @@ class table_theme {
['广告位置',0],
['企业职位',1],
['投放进度',2],
['场所道闸方位',3],
['门口方位',3],
['投放媒介',4],
['场所分类',6],
['广告类型',7]
];
@ -724,9 +725,9 @@ class table_theme {
'allnone' => 2
];
$this->search['left'][] = self::input_select_search();
//道闸方位
//门口方位
$para = $tsql->table('para')->where(['p_type' => 3])->all();
$this->search['left'][] = self::para_select($para,['e_bno','道闸方位']);
$this->search['left'][] = self::para_select($para,['e_bno','门口方位']);
//位置
$para = $tsql->table('para')->where(['p_type' => 0])->all();
$this->search['left'][] = self::para_select($para,['e_aps','位置']);
@ -773,9 +774,9 @@ class table_theme {
//位置
$para = $tsql->table('para')->where(['p_type' => 0])->all();
$this->search[] = self::para_select($para,['e_aps','位置']);
//道闸方位
//门口方位
$para = $tsql->table('para')->where(['p_type' => 3])->all();
$this->search[] = self::para_select($para,['e_bno','道闸方位']);
$this->search[] = self::para_select($para,['e_bno','门口方位']);
$this->select2 = [
'_fiend' => ['e_vid','选择场所',$_M['form']['e_vid']],
'placeholder' => '输入场所名称',
@ -852,7 +853,7 @@ class table_theme {
'v_endday' => self::th_tooltip(['默认7天内即将到期的广告位','top'],self::th_replace_order('v_endday'),false),
'v_prerow' => self::th_replace_order('v_prerow'),
'v_ebnonum' => self::th_replace_order('v_ebnonum'),
'v_bno' => self::th_tooltip(['存在一个广告空位则所属道闸方位就算有空','top'],self::th_replace_order('v_bno')),
'v_bno' => self::th_tooltip(['存在一个广告空位则所属门口方位就算有空','top'],self::th_replace_order('v_bno')),
];
$this->th_head = is_array($rselect)?array_merge($this->table_fiend,$rselect):$this->table_fiend;
@ -925,9 +926,9 @@ class table_theme {
//位置
$para = $tsql->table('para')->where(['p_type' => 0])->all();
$this->search[] = self::para_select($para,['e_aps','位置']);
//道闸方位
//门口方位
$para = $tsql->table('para')->where(['p_type' => 3])->all();
$this->search[] = self::para_select($para,['e_bno','道闸方位']);
$this->search[] = self::para_select($para,['e_bno','门口方位']);
$this->select2 = [
'url' => $_M['url']['site'].'app/index.php?n=dzadsod&c=select&a=doselect',
'_fiend' => ['e_vid','场所',$_M['form']['e_vid']],

2
include/traits/appcmp.class.php
View File

File diff suppressed because one or more lines are too long

15
include/traits/tfield.class.php
View File

@ -10,7 +10,7 @@ trait tfield {
'e_enable' => '状态',
'e_number' => '广告位编号',
'e_vid' => '场所名称',
'e_bno' => '道闸方位',
'e_bno' => '门口方位',
'e_aps' => '广告位位置',
'e_size' => '广告位规格',
'e_label' => '相关标签',
@ -56,7 +56,7 @@ trait tfield {
'e_enable' => '状态',
'e_number' => '广告位编号',
'e_vid' => '场所名称',
'e_bno' => '道闸方位',
'e_bno' => '门口方位',
'e_aps' => '广告位位置',
'h_cid' => '签定的公司',
'l_hnumber' => '合同编号',
@ -73,6 +73,7 @@ trait tfield {
global $_M,$_YW;
return [
'h_number' => '合同编号',
'h_medium' => '投放媒介',
'h_signtime' => '签订日期',
'h_cid' => '签定公司',
'h_tprice' => '合同总额',
@ -83,6 +84,8 @@ trait tfield {
'h_noticeday' => '提前通知天数',
'h_addtime' => '录入时间',
'h_updatetime' => '修改时间',
'h_texta' => '投放周期',
'h_tower' => '投放台数',
'h_text' => '备注'
];
}
@ -200,9 +203,9 @@ trait tfield {
'v_district' => '所属区域',
'v_address' => '场所地址',
'v_enum' => '广告位',
'v_ebnonum' => '道闸方位',
'v_ebnonum' => '门口方位',
'v_free' => '广告位',
'v_bno' => '道闸方位',
'v_bno' => '门口方位',
'v_lease' => '排期中的个数',
'v_endday' => '到期个数',
'v_prerow' => '预排的个数',
@ -210,9 +213,9 @@ trait tfield {
];
if($this->bsign){
$array['v_free'] = '闲置广告位总数';
$array['v_bno'] = '闲置道闸方位';
$array['v_bno'] = '闲置门口方位';
$array['v_enum'] = '广告位总数';
$array['v_ebnonum'] = '道闸方位总数';
$array['v_ebnonum'] = '门口方位总数';
$array['v_price'] = '场所均价';
$array['v_psize'] = '居住规模';
}else{

16
include/traits/tlist.class.php
View File

@ -75,7 +75,7 @@ trait tlist {
//广告位详细地址转换
protected function eaddress(&$val,$_address = 'e_address',$sign = false){
global $_M,$_YW;
//道闸方位
//门口方位
if(empty(self::$para['e_bno'])) self::$para['e_bno'] = parent::translate(3);
//广告位置
if(empty(self::$para['e_aps'])) self::$para['e_aps'] = parent::translate();
@ -114,7 +114,7 @@ trait tlist {
<label></label>
</span>';
//对字段处理
//道闸方位
//门口方位
if(empty(self::$para['e_bno'])) self::$para['e_bno'] = parent::translate(3);
//广告位置
if(empty(self::$para['e_aps'])) self::$para['e_aps'] = parent::translate();
@ -212,6 +212,12 @@ trait tlist {
//对字段处理
//公司名称
if(empty(self::$customer[$val['h_cid']])) self::$customer[$val['h_cid']] = parent::customerlist($val['h_cid']);
//投放媒介
if(empty(self::$para['h_medium'])) self::$para['h_medium'] = parent::translate(4);
$h_mediumid = stringto_array($val['h_medium'],'#@met@#');
foreach ($h_mediumid as $hmid) {
$hmediumid[] = self::$para['h_medium'][$val['h_medium']];
}
//相关人员
$workerswid = stringto_array($val['h_wid'],',');
@ -219,6 +225,7 @@ trait tlist {
if(empty(self::$workers[$hwid])) self::$workers[$hwid] = parent::workerslist($hwid);
$workersstr[] = self::$workers[$hwid];
}
//内连接
$h_number = $val['h_number']; //避免后面采用
$launchurl = $this->own_name_table.'launch&l_hnumber='.$h_number;
@ -228,7 +235,7 @@ trait tlist {
$val['h_cid'] = self::$customer[$val['h_cid']];
$val['h_wid'] = parent::tab_tokenfield(arrayto_string($workersstr),1);
$val['h_noticeday'] = parent::tab_tokenfield($val['h_noticeday'],2);
$val['h_medium'] = parent::tab_tokenfield(arrayto_string($hmediumid,','));
$val['h_starttime'] = strtotime($val['h_starttime']) > strtotime($curdate)?parent::str_color(2,$val['h_starttime'],600):$val['h_starttime'];
$val['h_endtime'] = strtotime($val['h_endtime']) < strtotime($curdate)?parent::str_color(0,$val['h_endtime'],600):$val['h_endtime'];
@ -351,7 +358,8 @@ trait tlist {
<option value="0">广告位置</option>
<option value="1">企业职位</option>
<option value="2">投放进度</option>
<option value="3">道闸方位</option>
<option value="3">门口方位</option>
<option value="4">投放媒介</option>
<option value="6">场所分类</option>
<option value="7">广告类型</option>
</select>

91
src/update/update.class.php
View File

@ -60,14 +60,6 @@ class update extends admin{
//更新版本内容
self::update_1_1();
break;
case 1.2:
//更新版本内容
self::update_1_2();
break;
case 1.3:
//更新版本内容
self::update_1_3();
break;
default:
break;
@ -102,84 +94,10 @@ class update extends admin{
// 1.1 版本
public function update_1_1() {
global $_M;
//执行SQL其他操作
$tview = self::tview();
foreach ($tview as $key => $val){
$tname[] = $key;
$table_name = self::split_table_name($key);
$table[] = $table_name;
DB::query($val);
}
//记录表名
add_table(arrayto_string($table,'|'));
$filetable = PATH_ALL_APP.$this->m_name.'/config/table';
//先获取之前已经存在的简短表名
if(file_exists($filetable)) {
$tnamestr = file_get_contents($filetable);
$tname = array_merge($tname,stringto_array($tnamestr,','));
}else{
//创建
makefile($filetable);
}
//写入
file_put_contents($filetable,arrayto_string($tname,','));
// 对一个表新增字段
}
// 1.2 版本
public function update_1_2() {
global $_M;
//执行SQL其他操作
$tables = self::table_field();
$table = $tname = [];
foreach ($tables as $key => $val) {
$tname[] = $key;
$table_name = self::split_table_name($key);
$table[] = $table_name;
if($val) DB::query("CREATE TABLE `{$_M['config']['tablepre']}{$table_name}` ( {$val} ) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8");
}
//记录表名
add_table(arrayto_string($table,'|'));
$filetable = PATH_ALL_APP.$this->m_name.'/config/table';
//先获取之前已经存在的简短表名
if(file_exists($filetable)) {
$tnamestr = file_get_contents($filetable);
$tname = array_merge($tname,stringto_array($tnamestr,','));
}else{
//创建
makefile($filetable);
}
//写入
file_put_contents($filetable,arrayto_string($tname,','));
}
// 1.3 版本
public function update_1_3() {
global $_M;
//执行SQL其他操作
$tview = self::tview();
foreach ($tview as $key => $val){
$tname[] = $key;
$table_name = self::split_table_name($key);
$table[] = $table_name;
DB::query($val);
}
//记录表名
add_table(arrayto_string($table,'|'));
$filetable = PATH_ALL_APP.$this->m_name.'/config/table';
//先获取之前已经存在的简短表名
if(file_exists($filetable)) {
$tnamestr = file_get_contents($filetable);
$tname = array_merge($tname,stringto_array($tnamestr,','));
}else{
//创建
makefile($filetable);
}
//写入
file_put_contents($filetable,arrayto_string($tname,','));
}
/*
+ 应用新安装操作
+-------------------------------------------------------------------------------------------
@ -245,7 +163,7 @@ class update extends admin{
$zdytable['elevator'] = " `id` int(11) NOT NULL AUTO_INCREMENT,
`e_vid` int(11) COMMENT '场所ID',
`e_number` varchar(100) NOT NULL COMMENT '广告位编号，用于后期各表操作',
`e_bno` int(11) NOT NULL COMMENT '道闸方位',
`e_bno` int(11) NOT NULL COMMENT '门口方位',
`e_aps` int(11) NOT NULL COMMENT '广告位置',
`e_size` varchar(255) NOT NULL COMMENT '广告位尺寸大小',
`e_enable` tinyint(1) NOT NULL DEFAULT '1' COMMENT '是否启用 0 不启用，1 为启用',
@ -267,6 +185,9 @@ class update extends admin{
`h_starttime` varchar(255) COMMENT '广告开始时间',
`h_endtime` varchar(255) COMMENT '广告结束时间',
`h_noticeday` varchar(255) COMMENT '提前通知天数',
`h_medium` int(11) COMMENT '投放媒介',
`h_tower` text COMMENT '投放台数',
`h_texta` text COMMENT '投放周期备注，天月年',
`h_text` text COMMENT '备注',
`h_updatetime` datetime DEFAULT NULL COMMENT '修改时间',
`h_addtime` datetime DEFAULT NULL COMMENT '录入时间',
@ -304,7 +225,7 @@ class update extends admin{
// 参数配置
$zdytable['para'] = " `id` int(11) NOT NULL AUTO_INCREMENT,
`p_type` tinyint(1) NOT NULL DEFAULT '0' COMMENT '参数分类 0广告位置,1职位,2合同状态,3道闸方位',
`p_type` tinyint(1) NOT NULL DEFAULT '0' COMMENT '参数分类 0广告位置,1职位,2合同状态,3门口方位',
`p_order` int(11) DEFAULT '0' COMMENT '排序',
`p_name` varchar(255) COMMENT '名称',
`p_value` int(11) COMMENT '参数值,必须为数字',