Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
tl_estate
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hujun
tl_estate
Commits
5ee9494c
Commit
5ee9494c
authored
May 18, 2018
by
clone
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'test' of
https://gitee.com/zwyjjc/tl_estate
into test
parents
99071e15
6b51f22d
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
23 additions
and
12 deletions
+23
-12
auth_rule_index.html
application/index/view/auth/auth_rule_index.html
+1
-1
index.html
application/index/view/store/index.html
+2
-1
agent.js
public/resource/js/agent.js
+16
-6
auth_rule_index.js
public/resource/js/auth_rule_index.js
+1
-1
storeList.js
public/resource/js/storeList.js
+2
-2
agent_template_tpl.html
public/resource/template/agent_template_tpl.html
+1
-1
No files found.
application/index/view/auth/auth_rule_index.html
View file @
5ee9494c
...
...
@@ -8,7 +8,7 @@
<div
class=
"panel panel-default"
>
<div
class=
"panel-heading breadcrumb"
>
<li><a
href=
"#"
>
权限管理
</a></li>
<li
class=
"active"
>
新增
</li>
<li
class=
"active"
>
新增
66
</li>
<div
class=
"pull-right"
>
<ul
class=
"bread_btn"
>
<li>
...
...
application/index/view/store/index.html
View file @
5ee9494c
...
...
@@ -289,7 +289,8 @@
<div
class=
"form-group"
>
<label
class=
"col-sm-3 control-label"
>
所属部门:
</label>
<!--<input type="text" value="" name="ss-store" class="form-control btn6" placeholder="所属部门">-->
<select
name=
"ss-store"
class=
"form-control btn6"
id=
"ss-store"
>
<select
name=
"ss-store"
class=
"form-control btn6"
id=
"ss-store"
>
<option
value=
""
selected=
"selected"
>
请选择
</option>
</select>
</div>
...
...
public/resource/js/agent.js
View file @
5ee9494c
...
...
@@ -42,9 +42,11 @@ define(['doT', 'text!temp/agent_template_tpl.html', 'css!style/home.css', 'pagin
agent
.
Submit_edit
();
});
$
(
document
).
delegate
(
"#role"
,
"click"
,
function
()
{
//变更角色
$
(
document
).
delegate
(
"#role"
,
"click"
,
function
(
e
)
{
//变更角色
var
_this
=
$
(
this
);
var
_tempVal
=
_this
.
closest
(
'tr'
).
attr
(
'data-groupname'
);
agent
.
agent_id
=
$
(
this
).
attr
(
"data-id"
);
agent
.
getRole
();
agent
.
getRole
(
_tempVal
);
});
$
(
document
).
delegate
(
".submit_user"
,
"click"
,
function
()
{
//提交变更
...
...
@@ -118,6 +120,8 @@ define(['doT', 'text!temp/agent_template_tpl.html', 'css!style/home.css', 'pagin
$
(
"#remarks"
).
val
(
data
.
data
.
remarks
);
$
(
"#password"
).
val
(
data
.
data
.
password
);
$
(
"input[name='password']"
).
attr
(
'form-group'
);
// store.getDistrict(data.data.district_name);
if
(
data
.
data
.
sex
==
'0'
)
{
$
(
"#sex0"
).
attr
(
'checked'
,
true
);
}
else
if
(
data
.
data
.
sex
==
'1'
)
{
...
...
@@ -145,6 +149,7 @@ define(['doT', 'text!temp/agent_template_tpl.html', 'css!style/home.css', 'pagin
params
.
remarks
=
$
(
"#remarks"
).
val
();
params
.
status
=
$
(
"#status"
).
val
();
params
.
password
=
$
(
"input[name='password']"
).
val
();
if
(
params
.
phone
==
''
)
{
alert
(
'手机号必填!'
);
...
...
@@ -202,7 +207,7 @@ define(['doT', 'text!temp/agent_template_tpl.html', 'css!style/home.css', 'pagin
}
})
},
getRole
:
function
()
{
getRole
:
function
(
tempval
)
{
$
.
ajax
({
url
:
'/index/getAuth2'
,
type
:
'GET'
,
...
...
@@ -211,14 +216,20 @@ define(['doT', 'text!temp/agent_template_tpl.html', 'css!style/home.css', 'pagin
dataType
:
'json'
,
success
:
function
(
data
)
{
var
User_add
=
""
;
var
_tempid
;
$
.
each
(
data
.
data
.
list
,
function
(
i
,
item
){
User_add
+=
'<option value="'
+
item
.
id
+
'">'
+
item
.
title
+
'</option>'
;
if
(
item
.
title
==
tempval
){
_tempid
=
item
.
id
;
console
.
log
(
item
.
id
);
};
});
$
(
"#edit_role"
).
html
(
User_add
);
console
.
log
(
_tempid
);
$
(
"#edit_role"
).
html
(
User_add
).
val
(
_tempid
);
}
});
}
};
return
agent
;
});
\ No newline at end of file
});
public/resource/js/auth_rule_index.js
View file @
5ee9494c
...
...
@@ -84,7 +84,7 @@ authRule={
dataType
:
"json"
,
success
:
function
(
data
)
{
$
(
"input[name = id]"
).
val
(
data
.
data
.
id
);
$
(
"input[name = title]"
).
val
(
data
.
data
.
title
);
$
(
"input[name = title]"
).
val
(
data
.
data
.
title
2
);
$
(
"input[name = name]"
).
val
(
data
.
data
.
name
);
$
(
"input[name = sort]"
).
val
(
data
.
data
.
sort
);
$
(
"#pid"
).
val
(
data
.
data
.
pid
);
...
...
public/resource/js/storeList.js
View file @
5ee9494c
...
...
@@ -360,10 +360,10 @@ define(['doT', 'text!temp/store_template_tpl.html', 'css!style/home.css', 'ckfin
dataType
:
'json'
,
success
:
function
(
data
)
{
if
(
data
.
code
==
200
)
{
var
_html
=
''
;
var
_html
=
'
<option value="" selected="selected">请选择</option>
'
;
$
.
each
(
data
.
data
,
function
(
i
,
n
)
{
if
(
n
.
district_name
==
name
&&
(
typeof
name
!=
undefined
))
{
_html
+=
'<option
selected="selected
" value="'
+
n
.
id
+
'">'
+
n
.
district_name
+
'</option>'
;
_html
+=
'<option" value="'
+
n
.
id
+
'">'
+
n
.
district_name
+
'</option>'
;
}
else
{
_html
+=
'<option value="'
+
n
.
id
+
'">'
+
n
.
district_name
+
'</option>'
;
}
...
...
public/resource/template/agent_template_tpl.html
View file @
5ee9494c
<script
id=
"agent_tpl"
type=
"text/template"
>
[
%
if
(
it
)
{
%
]
[
%
for
(
var
item
in
it
){
%
]
<
tr
>
<
tr
data
-
groupname
=
"[%= it[item]['groupname'] %]"
>
<
td
>
[
%=
it
[
item
][
"create_time"
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
"id"
]
%
]
<
/td
>
<
td
>
[
%=
it
[
item
][
"name"
]
%
]
<
/td
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment