|
|
@@ -261,7 +261,6 @@
|
|
|
<script>
|
|
|
// menuActive("/customer/list");
|
|
|
var dataMap = {{.T.data}}
|
|
|
- console.log(dataMap)
|
|
|
var departArr = {{.T.depart}}
|
|
|
var tagruleArr = []
|
|
|
var ruleArr = []
|
|
|
@@ -340,13 +339,8 @@
|
|
|
if (dataMap.i_pushtype == 0) {
|
|
|
$('#pushTypeSelect').html("邮箱");
|
|
|
} else if (dataMap.i_pushtype && dataMap.i_pushmodel == 1) {
|
|
|
-<<<<<<< HEAD
|
|
|
$('#pushTypeSelect').html("接口");
|
|
|
} */
|
|
|
-=======
|
|
|
- $('#pushTypeSelect').html("接口");
|
|
|
- }
|
|
|
->>>>>>> 9c8b9f9702a7bc63727db3c7f7dce2b63d1cb38b
|
|
|
$('#S_name').html(dataMap.s_name);
|
|
|
$('#departTable').DataTable({
|
|
|
"paging": false,
|
