Skip to content

T
tl_estate
Commit 1f2b58f3 authored by hujun's avatar hujun
Browse files
Options

Merge remote-tracking branch 'origin/wx0604' into wx0604

parents 8c23baae bb5fa2b3
Hide whitespace changes
Inline Side-by-side
Showing with 363 additions and 19 deletions
public/app/dist/index.html
View file @ 1f2b58f3
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>同联商业</title><script type=text/javascript src=./static/js/vconsole.min.js></script><script type=text/javascript>if(~location.origin.indexOf('api.tonglianjituan.com')){console.log('正式服')}else{var vConsole=new VConsole()};</script><link href=./static/css/app.33f238917fc813b45f4cf9d1450ba68f.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.94d51f6620cb57f6116c.js></script><script type=text/javascript src=./static/js/app.ce726b7129b5ddaf08eb.js></script></body></html>
\ No newline at end of file
<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>同联商业</title><script type=text/javascript src=./vconsole.min.js></script><script type=text/javascript>if(~location.origin.indexOf('api.tonglianjituan.com')){console.log('正式服')}else{var vConsole=new VConsole()};</script><link href=./static/css/app.32769812f4333e70049b1824f32be8bc.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.94d51f6620cb57f6116c.js></script><script type=text/javascript src=./static/js/app.9bc169c9e5196c1dad63.js></script></body></html>
\ No newline at end of file
public/app/dist/static/css/app.32769812f4333e70049b1824f32be8bc.css.map 0 → 100644
View file @ 1f2b58f3
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/dist/static/css/app.33f238917fc813b45f4cf9d1450ba68f.css.map deleted 100644 → 0
View file @ 8c23baae
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/dist/static/js/app.9bc169c9e5196c1dad63.js 0 → 100644
View file @ 1f2b58f3
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/dist/static/js/app.9bc169c9e5196c1dad63.js.map 0 → 100644
View file @ 1f2b58f3
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/dist/static/js/app.ce726b7129b5ddaf08eb.js deleted 100644 → 0
View file @ 8c23baae
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/dist/static/js/app.ce726b7129b5ddaf08eb.js.map deleted 100644 → 0
View file @ 8c23baae
This source diff could not be displayed because it is too large. You can view the blob instead.
public/app/dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
View file @ 1f2b58f3
{"version":3,"sources":["webpack:///webpack/bootstrap 2b35489d6b39c1dfd6fb"],"names":["parentJsonpFunction","window","chunkIds","moreModules","executeModules","moduleId","chunkId","result","i","resolves","length","installedChunks","push","Object","prototype","hasOwnProperty","call","modules","shift","__webpack_require__","s","installedModules","2","exports","module","l","m","c","d","name","getter","o","defineProperty","configurable","enumerable","get","n","__esModule","object","property","p","oe","err","console","error"],"mappings":"aACA,IAAAA,EAAAC,OAAA,aACAA,OAAA,sBAAAC,EAAAC,EAAAC,GAIA,IADA,IAAAC,EAAAC,EAAAC,EAAAC,EAAA,EAAAC,KACQD,EAAAN,EAAAQ,OAAoBF,IAC5BF,EAAAJ,EAAAM,GACAG,EAAAL,IACAG,EAAAG,KAAAD,EAAAL,GAAA,IAEAK,EAAAL,GAAA,EAEA,IAAAD,KAAAF,EACAU,OAAAC,UAAAC,eAAAC,KAAAb,EAAAE,KACAY,EAAAZ,GAAAF,EAAAE,IAIA,IADAL,KAAAE,EAAAC,EAAAC,GACAK,EAAAC,QACAD,EAAAS,OAAAT,GAEA,GAAAL,EACA,IAAAI,EAAA,EAAYA,EAAAJ,EAAAM,OAA2BF,IACvCD,EAAAY,IAAAC,EAAAhB,EAAAI,IAGA,OAAAD,GAIA,IAAAc,KAGAV,GACAW,EAAA,GAIA,SAAAH,EAAAd,GAGA,GAAAgB,EAAAhB,GACA,OAAAgB,EAAAhB,GAAAkB,QAGA,IAAAC,EAAAH,EAAAhB,IACAG,EAAAH,EACAoB,GAAA,EACAF,YAUA,OANAN,EAAAZ,GAAAW,KAAAQ,EAAAD,QAAAC,IAAAD,QAAAJ,GAGAK,EAAAC,GAAA,EAGAD,EAAAD,QAKAJ,EAAAO,EAAAT,EAGAE,EAAAQ,EAAAN,EAGAF,EAAAS,EAAA,SAAAL,EAAAM,EAAAC,GACAX,EAAAY,EAAAR,EAAAM,IACAhB,OAAAmB,eAAAT,EAAAM,GACAI,cAAA,EACAC,YAAA,EACAC,IAAAL,KAMAX,EAAAiB,EAAA,SAAAZ,GACA,IAAAM,EAAAN,KAAAa,WACA,WAA2B,OAAAb,EAAA,SAC3B,WAAiC,OAAAA,GAEjC,OADAL,EAAAS,EAAAE,EAAA,IAAAA,GACAA,GAIAX,EAAAY,EAAA,SAAAO,EAAAC,GAAsD,OAAA1B,OAAAC,UAAAC,eAAAC,KAAAsB,EAAAC,IAGtDpB,EAAAqB,EAAA,KAGArB,EAAAsB,GAAA,SAAAC,GAA8D,MAApBC,QAAAC,MAAAF,GAAoBA","file":"static/js/manifest.3ad1d5771e9b13dbdad2.js","sourcesContent":[" \t// install a JSONP callback for chunk loading\n \tvar parentJsonpFunction = window[\"webpackJsonp\"];\n \twindow[\"webpackJsonp\"] = function webpackJsonpCallback(chunkIds, moreModules, executeModules) {\n \t\t// add \"moreModules\" to the modules object,\n \t\t// then flag all \"chunkIds\" as loaded and fire callback\n \t\tvar moduleId, chunkId, i = 0, resolves = [], result;\n \t\tfor(;i < chunkIds.length; i++) {\n \t\t\tchunkId = chunkIds[i];\n \t\t\tif(installedChunks[chunkId]) {\n \t\t\t\tresolves.push(installedChunks[chunkId][0]);\n \t\t\t}\n \t\t\tinstalledChunks[chunkId] = 0;\n \t\t}\n \t\tfor(moduleId in moreModules) {\n \t\t\tif(Object.prototype.hasOwnProperty.call(moreModules, moduleId)) {\n \t\t\t\tmodules[moduleId] = moreModules[moduleId];\n \t\t\t}\n \t\t}\n \t\tif(parentJsonpFunction) parentJsonpFunction(chunkIds, moreModules, executeModules);\n \t\twhile(resolves.length) {\n \t\t\tresolves.shift()();\n \t\t}\n \t\tif(executeModules) {\n \t\t\tfor(i=0; i < executeModules.length; i++) {\n \t\t\t\tresult = __webpack_require__(__webpack_require__.s = executeModules[i]);\n \t\t\t}\n \t\t}\n \t\treturn result;\n \t};\n\n \t// The module cache\n \tvar installedModules = {};\n\n \t// objects to store loaded and loading chunks\n \tvar installedChunks = {\n \t\t2: 0\n \t};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"./\";\n\n \t// on error function for async loading\n \t__webpack_require__.oe = function(err) { console.error(err); throw err; };\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap 2b35489d6b39c1dfd6fb"],"sourceRoot":""}
\ No newline at end of file
{"version":3,"sources":["webpack:///webpack/bootstrap 6dcf5dab15638f5ef7de"],"names":["parentJsonpFunction","window","chunkIds","moreModules","executeModules","moduleId","chunkId","result","i","resolves","length","installedChunks","push","Object","prototype","hasOwnProperty","call","modules","shift","__webpack_require__","s","installedModules","2","exports","module","l","m","c","d","name","getter","o","defineProperty","configurable","enumerable","get","n","__esModule","object","property","p","oe","err","console","error"],"mappings":"aACA,IAAAA,EAAAC,OAAA,aACAA,OAAA,sBAAAC,EAAAC,EAAAC,GAIA,IADA,IAAAC,EAAAC,EAAAC,EAAAC,EAAA,EAAAC,KACQD,EAAAN,EAAAQ,OAAoBF,IAC5BF,EAAAJ,EAAAM,GACAG,EAAAL,IACAG,EAAAG,KAAAD,EAAAL,GAAA,IAEAK,EAAAL,GAAA,EAEA,IAAAD,KAAAF,EACAU,OAAAC,UAAAC,eAAAC,KAAAb,EAAAE,KACAY,EAAAZ,GAAAF,EAAAE,IAIA,IADAL,KAAAE,EAAAC,EAAAC,GACAK,EAAAC,QACAD,EAAAS,OAAAT,GAEA,GAAAL,EACA,IAAAI,EAAA,EAAYA,EAAAJ,EAAAM,OAA2BF,IACvCD,EAAAY,IAAAC,EAAAhB,EAAAI,IAGA,OAAAD,GAIA,IAAAc,KAGAV,GACAW,EAAA,GAIA,SAAAH,EAAAd,GAGA,GAAAgB,EAAAhB,GACA,OAAAgB,EAAAhB,GAAAkB,QAGA,IAAAC,EAAAH,EAAAhB,IACAG,EAAAH,EACAoB,GAAA,EACAF,YAUA,OANAN,EAAAZ,GAAAW,KAAAQ,EAAAD,QAAAC,IAAAD,QAAAJ,GAGAK,EAAAC,GAAA,EAGAD,EAAAD,QAKAJ,EAAAO,EAAAT,EAGAE,EAAAQ,EAAAN,EAGAF,EAAAS,EAAA,SAAAL,EAAAM,EAAAC,GACAX,EAAAY,EAAAR,EAAAM,IACAhB,OAAAmB,eAAAT,EAAAM,GACAI,cAAA,EACAC,YAAA,EACAC,IAAAL,KAMAX,EAAAiB,EAAA,SAAAZ,GACA,IAAAM,EAAAN,KAAAa,WACA,WAA2B,OAAAb,EAAA,SAC3B,WAAiC,OAAAA,GAEjC,OADAL,EAAAS,EAAAE,EAAA,IAAAA,GACAA,GAIAX,EAAAY,EAAA,SAAAO,EAAAC,GAAsD,OAAA1B,OAAAC,UAAAC,eAAAC,KAAAsB,EAAAC,IAGtDpB,EAAAqB,EAAA,KAGArB,EAAAsB,GAAA,SAAAC,GAA8D,MAApBC,QAAAC,MAAAF,GAAoBA","file":"static/js/manifest.3ad1d5771e9b13dbdad2.js","sourcesContent":[" \t// install a JSONP callback for chunk loading\n \tvar parentJsonpFunction = window[\"webpackJsonp\"];\n \twindow[\"webpackJsonp\"] = function webpackJsonpCallback(chunkIds, moreModules, executeModules) {\n \t\t// add \"moreModules\" to the modules object,\n \t\t// then flag all \"chunkIds\" as loaded and fire callback\n \t\tvar moduleId, chunkId, i = 0, resolves = [], result;\n \t\tfor(;i < chunkIds.length; i++) {\n \t\t\tchunkId = chunkIds[i];\n \t\t\tif(installedChunks[chunkId]) {\n \t\t\t\tresolves.push(installedChunks[chunkId][0]);\n \t\t\t}\n \t\t\tinstalledChunks[chunkId] = 0;\n \t\t}\n \t\tfor(moduleId in moreModules) {\n \t\t\tif(Object.prototype.hasOwnProperty.call(moreModules, moduleId)) {\n \t\t\t\tmodules[moduleId] = moreModules[moduleId];\n \t\t\t}\n \t\t}\n \t\tif(parentJsonpFunction) parentJsonpFunction(chunkIds, moreModules, executeModules);\n \t\twhile(resolves.length) {\n \t\t\tresolves.shift()();\n \t\t}\n \t\tif(executeModules) {\n \t\t\tfor(i=0; i < executeModules.length; i++) {\n \t\t\t\tresult = __webpack_require__(__webpack_require__.s = executeModules[i]);\n \t\t\t}\n \t\t}\n \t\treturn result;\n \t};\n\n \t// The module cache\n \tvar installedModules = {};\n\n \t// objects to store loaded and loading chunks\n \tvar installedChunks = {\n \t\t2: 0\n \t};\n\n \t// The require function\n \tfunction __webpack_require__(moduleId) {\n\n \t\t// Check if module is in cache\n \t\tif(installedModules[moduleId]) {\n \t\t\treturn installedModules[moduleId].exports;\n \t\t}\n \t\t// Create a new module (and put it into the cache)\n \t\tvar module = installedModules[moduleId] = {\n \t\t\ti: moduleId,\n \t\t\tl: false,\n \t\t\texports: {}\n \t\t};\n\n \t\t// Execute the module function\n \t\tmodules[moduleId].call(module.exports, module, module.exports, __webpack_require__);\n\n \t\t// Flag the module as loaded\n \t\tmodule.l = true;\n\n \t\t// Return the exports of the module\n \t\treturn module.exports;\n \t}\n\n\n \t// expose the modules object (__webpack_modules__)\n \t__webpack_require__.m = modules;\n\n \t// expose the module cache\n \t__webpack_require__.c = installedModules;\n\n \t// define getter function for harmony exports\n \t__webpack_require__.d = function(exports, name, getter) {\n \t\tif(!__webpack_require__.o(exports, name)) {\n \t\t\tObject.defineProperty(exports, name, {\n \t\t\t\tconfigurable: false,\n \t\t\t\tenumerable: true,\n \t\t\t\tget: getter\n \t\t\t});\n \t\t}\n \t};\n\n \t// getDefaultExport function for compatibility with non-harmony modules\n \t__webpack_require__.n = function(module) {\n \t\tvar getter = module && module.__esModule ?\n \t\t\tfunction getDefault() { return module['default']; } :\n \t\t\tfunction getModuleExports() { return module; };\n \t\t__webpack_require__.d(getter, 'a', getter);\n \t\treturn getter;\n \t};\n\n \t// Object.prototype.hasOwnProperty.call\n \t__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };\n\n \t// __webpack_public_path__\n \t__webpack_require__.p = \"./\";\n\n \t// on error function for async loading\n \t__webpack_require__.oe = function(err) { console.error(err); throw err; };\n\n\n\n// WEBPACK FOOTER //\n// webpack/bootstrap 6dcf5dab15638f5ef7de"],"sourceRoot":""}
\ No newline at end of file
public/app/dist/test_code.txt
View file @ 1f2b58f3
<script type=text/javascript src=./static/js/vconsole.min.js></script><script type=text/javascript>if(~location.origin.indexOf('api.tonglianjituan.com')){console.log('正式服')}else{var vConsole=new VConsole()};</script>
\ No newline at end of file
<script type=text/javascript src=./vconsole.min.js></script><script type=text/javascript>if(~location.origin.indexOf('api.tonglianjituan.com')){console.log('正式服')}else{var vConsole=new VConsole()};</script>
\ No newline at end of file
public/appnew/src/components/achieveMain/achieveRegion.vue
View file @ 1f2b58f3
......@@ -132,7 +132,7 @@
},
'jiandu': {
'title': '监督',
'href': '/achieveLookatResource?urltype=lookat',
'href': '/achieveSuperviseResource',
'num': 0
}
},
......
public/appnew/src/components/achieveMain/agentResourceLi.vue
View file @ 1f2b58f3
......@@ -69,7 +69,7 @@
}
.content-area>div:nth-of-type(1)>p:nth-of-type(1){
font-size: .34rem;
font-weight: 500;
font-weight: 600;
color: #1a1a1a;
}
.content-area>div:nth-of-type(1)>p:nth-of-type(2){
......
public/appnew/src/components/achieveMain/superviseResource.vue 0 → 100644
View file @ 1f2b58f3
<template>
<div>
<header-pulic :data="headerData"></header-pulic>
<pagination-load :canload="!isStop" :distance="10" @load="getLoad">
<ul>
<li is="self-defined-li" v-for="(item, index) in mainDataList" :data="item" :dataindex="index"></li>
</ul>
</pagination-load>
<div class="loading-gif-block" v-show="isLoading">正在加载...</div>
<div class="no-data-block" v-if="noDataFlag">暂无数据</div>
<div class="no-more-block" v-if="!noDataFlag&&isStop">没有更多了...</div>
</div>
</template>
<script>
import '@/assets/js/layer041002.js';
import paginationLoad from '@/components/publicEg/paginationLoad';
import selfDefinedLi from '@/components/achieveMain/superviseResourceLi';
export default {
name: '',
components: {
'pagination-load': paginationLoad,
'self-defined-li': selfDefinedLi
},
data() {
let _this = this;
return {
headerData: {
'title': '执行记录',
'noborder': false,
'isBack': true
},
ajaxUrl: '/broker/superviseList',
isStop: false,
isLoading: false,
noDataFlag: false,
page: 1,
pageSize: 10,
token: localStorage.getItem('token'),
userid: localStorage.getItem('userid'),
type: _this.$route.query.type,
startDate: _this.$route.query.startTime,
endDate: _this.$route.query.endTime,
mainDataList: []
}
},
created() {
let _this = this;
_this.common.duringRequest({
'urlStr': _this.ajaxUrl,
startAction() {
_this.isLoading = true;
},
endAction() {
_this.isLoading = false;
}
});
},
mounted() {
let _this = this;
_this.getLoad();
},
methods: {
getLoad() {
let _this = this;
if(!_this.isLoading && !_this.isStop) {
_this.axios({
method: 'get',
url: _this.ajaxUrl,
responseType: 'json',
data: {
'type': _this.type,
'agent_id': _this.userid,
'start_time': _this.startDate,
'end_time': _this.endDate,
'page_no': _this.page,
'page_size': _this.pageSize,
'AuthToken': _this.token
}
})
.then(function(response) {
if(response.data.code == 200) {
let _list = response.data.data;
if(Array.isArray(_list)){
if(_list.length === 0) {
_this.page === 1 && (_this.noDataFlag = true);
_this.isStop = true;
} else {
_this.mainDataList.push(..._list); //这里使用push要注意，先把数组展开
_list.length < _this.pageSize && (_this.isStop = true);
_this.page++;
};
};
} else {
layer.tipsX(response.data.msg);
}
})
.catch(function(error) {
layer.tipsX(error);
});
}
}
},
computed: {
}
}
</script>
<style scoped>
</style>
\ No newline at end of file
public/appnew/src/components/achieveMain/superviseResourceLi.vue 0 → 100644
View file @ 1f2b58f3
<template>
<li data-id="data.id">
<div>
<p class="p-time">上传时间：{{data.create_time}}</p>
<section class="li-main-area">
<div>上传人：{{data.agent_name}}</div>
<div class="div-gengjin"><span class="row-title">备注：</span><span class="row-details">{{data.remark}}</span></div>
<div>
<div class="address-area">{{data.address}}</div>
</div>
<div>
<a href="javascript:;">
<img-error :datasrc="data.img" :imgtype="'div'"></img-error>
</a>
</div>
</section>
<div class="log-left"></div>
</div>
</li>
</template>
<script>
import '@/assets/js/layer041002.js';
export default {
name: '',
props: {
data: {
type: Object,
default: () => ({
message: 'hello'
})
},
dataindex: {
type: [Number, String],
default: 0
},
isreceipt: {
type: Boolean,
default: false
}
},
components: {
},
data: () => ({
}),
created() {
let _this = this;
},
mounted() {
let _this = this;
},
methods: {
},
computed: {
}
}
</script>
<style scoped>
li{
padding: 0 0.6rem 0 0.44rem;
}
li:nth-of-type(1){
padding-top: .5rem;
}
li>div {
padding-left: 0.3rem;
padding-bottom: 0.5rem;
border-left: 1px dashed #9c9c9c;
position: relative;
}
li>div>p.p-time {
font-size: 0.32rem;
color: #333;
height: 0.32rem;
line-height: 0.32rem;
padding-bottom: 0.2rem;
}
li>div>section.li-main-area {
background-color: white;
font-size: 0.2rem;
padding-left: 0.3rem;
box-shadow: 0 0 0.14rem rgba(0, 0, 0, .05);
}
li>div>div.log-left {
position: absolute;
width: 0.3rem;
height: 0.3rem;
top: 0;
left: -0.15rem;
background: #f8f9fb url(images/time_nor_ic@2x.png) center center no-repeat;
background-size: 0.3rem 0.3rem;
}
li:nth-of-type(1)>div.log-left {
background: #f8f9fb url(images/time_sel_ic@2x.png) center center no-repeat;
background-size: 0.3rem 0.3rem;
}
.li-main-area>div:nth-of-type(-n+2) {
font-size: 0.3rem;
color: #999;
line-height: 0.5rem;
}
.li-main-area>div.div-gengjin {
overflow: hidden;
height: auto;
}
.li-main-area>div.div-gengjin>span {
float: left;
}
span.row-title {
width: 16%;
text-overflow: clip;
}
span.row-details {
width: 80%;
}
.li-main-area>div:nth-of-type(1) {
padding-top: 0.2rem;
color: #999;
}
.li-main-area>div:nth-of-type(3) {
padding: 0.1rem 0 0.2rem;
overflow: hidden;
}
.li-main-area>div:nth-of-type(3)>.address-area {
height: auto;
line-height: 0.44rem;
border-radius: 0.22rem;
background: #f5f5f5 url(images/weizhi_icon@2x.png) no-repeat .22rem center/.22rem .36rem;
padding: 0 1em 0 .48rem;
color: #89ADFD;
font-size: 0.24rem;
overflow: hidden;
float: left;
}
.li-main-area>div:nth-of-type(4) {
width: 2rem;
height: 2rem;
overflow: hidden;
padding-bottom: 0.3rem;
}
.li-main-area>div:nth-of-type(4)>a {
float: left;
overflow: hidden;
width: 100%;
height: 100%;
}
.li-main-area>div:nth-of-type(4)>a>img {
float: left;
width: 100%;
height: 100%;
object-fit: cover;
}
</style>
\ No newline at end of file
public/appnew/src/router/index.js
View file @ 1f2b58f3
......@@ -8,6 +8,7 @@ import achieveHouseResource from '@/components/achieveMain/houseResource'
import achieveAgentResource from '@/components/achieveMain/agentResource'
import achieveReceiptResource from '@/components/achieveMain/receiptResource'
import achieveLookatResource from '@/components/achieveMain/lookatResource'
import achieveSuperviseResource from '@/components/achieveMain/superviseResource'
import feeds from '@/components/feed/feeds'
import reportDetails from '@/components/reportDetails/reportDetails'
import announcementDetails from '@/components/announcementDetails/announcementDetails'
......@@ -57,6 +58,11 @@ export default new Router({
name: 'v-achieve-receipt-resource',
component: achieveReceiptResource
},
{
path: '/achieveSuperviseResource',
name: 'v-achieve-supervise-resource',
component: achieveSuperviseResource
},
{
path: '/achieveLookatResource',
name: 'v-achieve-lookat-resource',
......
public/resource/js/carryOut.js
View file @ 1f2b58f3
......@@ -28,8 +28,8 @@ define(['doT', 'text!temp/carry_out_template_tpl.html', 'css!style/home.css', 'c
$('.iframe-time-line').attr('src', '/app_broker/timeline_pc?order_id='+follow.house_id);
});
//二级联动
follow.getDistrict(function(){
_doc.on('input', '#district_id, #district_id2', function(){
follow.getDistrict(function(){//有了列表 点击 调用门店列表
_doc.on('input', '#district_id', function(){
var _this = $(this);
var _id = _this.val();
_this.next().html('');//先清空
......@@ -41,6 +41,7 @@ define(['doT', 'text!temp/carry_out_template_tpl.html', 'css!style/home.css', 'c
_str += '<option value="'+item.id+'">'+item.store_name+'</option>';
});
_this.next().html(_str);
// console.log(_this.next());
});
}else{
};
......@@ -153,7 +154,7 @@ define(['doT', 'text!temp/carry_out_template_tpl.html', 'css!style/home.css', 'c
'excel='+ excel_two +'&user_name=' + user_name + '&start_time=' + start_time + '&end_time=' + end_time + '&internal_title=' + internal_title + '&user_phone=' + user_phone + '&id=' + id+ '&store_name=' + store_name+ '&report_phone=' + report_phone+ '&report_name=' + report_name);
},
//调用部门 和 门店的接口
getDistrict : function (fn) {
getDistrict : function (fn) {//调用接口 产生列表 部门
$.ajax ({
url: '/index/getDistrict',
type: 'GET',
......
public/resource/js/commission.js
View file @ 1f2b58f3
define(['doT', 'text!temp/commission_template_tpl.html', 'text!temp/reportList_shuiFee_template_tpl.html', 'text!temp/reportList_maidtwo_template_tpl.html', 'text!temp/reportList_maid_sub1_template_tpl.html', 'css!style/home.css', 'css!style/report_list.css', 'ckfinder', 'ckfinderStart', 'pagination', 'bootstrapJs'], function(doT, template, template_tax, template_maid, template_maid_sub1) {
define(['doT', 'text!temp/commission_template_tpl.html', 'text!temp/reportList_shuiFee2_template_tpl.html', 'text!temp/reportList_maidtwo_template_tpl.html', 'text!temp/reportList_maid_sub1_template_tpl.html', 'css!style/home.css', 'css!style/report_list.css', 'ckfinder', 'ckfinderStart', 'pagination', 'bootstrapJs'], function(doT, template, template_tax, template_maid, template_maid_sub1) {
bargain = {
pageNo: 1,
/*第几页*/
......@@ -141,7 +141,7 @@ define(['doT', 'text!temp/commission_template_tpl.html', 'text!temp/reportList_s
alert('最多添加5条');
return false;
}else{
_iYJAAObj.append('<div class="form-group detail-modal-bargaininfo-commission-sec"><label class="">实收佣金：</label><div class="input-group"><input type="number"class="form-control"placeholder="请输入"><div class="input-group-addon">元</div></div><label class="">收佣日期：</label><div class="input-group"><input type="date"class="form-control"placeholder="请输入"></div><mark href="javascript:;"class="detail-modal-bargaininfo-commission-cancel-pic"><img src="/resource/image/search_gb.png"/></mark></div>');
_iYJAAObj.append('<div class="form-group detail-modal-bargaininfo-commission-sec"><label class="">实收佣金：</label><div class="input-group"><input type="number"class="form-control"placeholder="请输入"disabled="disabled"><div class="input-group-addon">元</div></div><label class="">收佣日期：</label><div class="input-group"><input type="date"class="form-control"placeholder="请输入"disabled="disabled"></div><mark href="javascript:;"class="detail-modal-bargaininfo-commission-cancel-pic"></mark></div>');
};
});
......@@ -483,10 +483,10 @@ define(['doT', 'text!temp/commission_template_tpl.html', 'text!temp/reportList_s
if(data.data.practical_fee.length > 0){
_inputAreaTempObj.html('');
}else{
_inputAreaTempObj.html('<div class="form-group detail-modal-bargaininfo-commission-sec"><label class="">实收佣金：</label><div class="input-group"><input type="number"class="form-control"placeholder="请输入"><div class="input-group-addon">元</div></div><label class="">收佣日期：</label><div class="input-group"><input type="date"class="form-control"placeholder="请输入"></div><mark href="javascript:;"class="detail-modal-bargaininfo-commission-cancel-pic"><img src="/resource/image/search_gb.png"/></mark></div>');
_inputAreaTempObj.html('<div class="form-group detail-modal-bargaininfo-commission-sec"><label class="">实收佣金：</label><div class="input-group"><input type="number"class="form-control"placeholder="请输入"disabled="disabled"><div class="input-group-addon">元</div></div><label class="">收佣日期：</label><div class="input-group"><input type="date"class="form-control"placeholder="请输入"disabled="disabled"></div><mark href="javascript:;"class="detail-modal-bargaininfo-commission-cancel-pic"></mark></div>');
};
$.each(data.data.practical_fee, function(i, v) {
_inputAreaTempObj.append('<div data-id="{id}" class="form-group detail-modal-bargaininfo-commission-sec"><label class="">实收佣金：</label><div class="input-group"><input type="number"class="form-control"placeholder="请输入"value="{0}"><div class="input-group-addon">元</div></div><label class="">收佣日期：</label><div class="input-group"><input type="date"class="form-control"placeholder="请输入"value="{1}"></div></div>'.stringFormatObj({
_inputAreaTempObj.append('<div data-id="{id}" class="form-group detail-modal-bargaininfo-commission-sec"><label class="">实收佣金：</label><div class="input-group"><input type="number"class="form-control"placeholder="请输入"value="{0}"disabled="disabled"><div class="input-group-addon">元</div></div><label class="">收佣日期：</label><div class="input-group"><input type="date"class="form-control"placeholder="请输入"value="{1}"disabled="disabled"></div></div>'.stringFormatObj({
'0': v.money,
'1': v.income_time,
'id': v.fee_id
......
public/resource/js/tax.js
View file @ 1f2b58f3
define(['doT', 'text!temp/tax_template_tpl.html', 'text!temp/reportList_shuiFee_template_tpl.html', 'text!temp/reportList_maidtwo_template_tpl.html', 'text!temp/reportList_maid_sub1_template_tpl.html', 'css!style/home.css', 'css!style/report_list.css', 'ckfinder', 'ckfinderStart', 'pagination', 'bootstrapJs'], function(doT, template, template_tax, template_maid, template_maid_sub1) {
define(['doT', 'text!temp/tax_template_tpl.html', 'text!temp/reportList_shuiFee2_template_tpl.html', 'text!temp/reportList_maidtwo_template_tpl.html', 'text!temp/reportList_maid_sub1_template_tpl.html', 'css!style/home.css', 'css!style/report_list.css', 'ckfinder', 'ckfinderStart', 'pagination', 'bootstrapJs'], function(doT, template, template_tax, template_maid, template_maid_sub1) {
bargain = {
pageNo: 1,
/*第几页*/
......@@ -137,7 +137,7 @@ define(['doT', 'text!temp/tax_template_tpl.html', 'text!temp/reportList_shuiFee_
alert('最多添加5条');
return false;
}else{
_iYJAAObj.append('<div class="form-group detail-modal-bargaininfo-commission-sec"><label class="">实收佣金：</label><div class="input-group"><input type="number"class="form-control"placeholder="请输入"><div class="input-group-addon">元</div></div><label class="">收佣日期：</label><div class="input-group"><input type="date"class="form-control"placeholder="请输入"></div><mark href="javascript:;"class="detail-modal-bargaininfo-commission-cancel-pic"><img src="/resource/image/search_gb.png"/></mark></div>');
_iYJAAObj.append('<div class="form-group detail-modal-bargaininfo-commission-sec"><label class="">实收佣金：</label><div class="input-group"><input type="number"class="form-control"placeholder="请输入"disabled="disabled"><div class="input-group-addon">元</div></div><label class="">收佣日期：</label><div class="input-group"><input type="date"class="form-control"placeholder="请输入"disabled="disabled"></div><mark href="javascript:;"class="detail-modal-bargaininfo-commission-cancel-pic"></mark></div>');
};
});
......@@ -479,10 +479,10 @@ define(['doT', 'text!temp/tax_template_tpl.html', 'text!temp/reportList_shuiFee_
if(data.data.practical_fee.length > 0){
_inputAreaTempObj.html('');
}else{
_inputAreaTempObj.html('<div class="form-group detail-modal-bargaininfo-commission-sec"><label class="">实收佣金：</label><div class="input-group"><input type="number"class="form-control"placeholder="请输入"><div class="input-group-addon">元</div></div><label class="">收佣日期：</label><div class="input-group"><input type="date"class="form-control"placeholder="请输入"></div><mark href="javascript:;"class="detail-modal-bargaininfo-commission-cancel-pic"><img src="/resource/image/search_gb.png"/></mark></div>');
_inputAreaTempObj.html('<div class="form-group detail-modal-bargaininfo-commission-sec"><label class="">实收佣金：</label><div class="input-group"><input type="number"class="form-control"placeholder="请输入"disabled="disabled"><div class="input-group-addon">元</div></div><label class="">收佣日期：</label><div class="input-group"><input type="date"class="form-control"placeholder="请输入"disabled="disabled"></div><mark href="javascript:;"class="detail-modal-bargaininfo-commission-cancel-pic"></mark></div>');
};
$.each(data.data.practical_fee, function(i, v) {
_inputAreaTempObj.append('<div data-id="{id}" class="form-group detail-modal-bargaininfo-commission-sec"><label class="">实收佣金：</label><div class="input-group"><input type="number"class="form-control"placeholder="请输入"value="{0}"><div class="input-group-addon">元</div></div><label class="">收佣日期：</label><div class="input-group"><input type="date"class="form-control"placeholder="请输入"value="{1}"></div></div>'.stringFormatObj({
_inputAreaTempObj.append('<div data-id="{id}" class="form-group detail-modal-bargaininfo-commission-sec"><label class="">实收佣金：</label><div class="input-group"><input type="number"class="form-control"placeholder="请输入"value="{0}"disabled="disabled"><div class="input-group-addon">元</div></div><label class="">收佣日期：</label><div class="input-group"><input type="date"class="form-control"placeholder="请输入"value="{1}"disabled="disabled"></div></div>'.stringFormatObj({
'0': v.money,
'1': v.income_time,
'id': v.fee_id
......
public/resource/template/reportList_shuiFee2_template_tpl.html 0 → 100644
View file @ 1f2b58f3
<script id="reportList_shuiFee_list_tpl" type="text/template">
[% if(it && it.length && it.length>0) { %]
[% for(var item in it){ %]
[% var getInfoType=function(r){switch(Number(r)){case 1:return"盘方";case 2:return"客方";case 3:return"反签";case 4:return"独家";case 5:return"合作方";default:return"未定义"}}; %]
<section>
<div>
<table class="detail-modal-tax-table table-haveborder">
<tr>
<td>开票金额</td>
<td>[%= it[item]['total_fee'] %]</td>
<td>开票日期</td>
<td>[%= it[item]['operation_date'] %]</td>
</tr>
<tr>
<td>分佣方</td>
<td>业务员</td>
<td>分佣比例</td>
<td>税费</td>
</tr>
[% if(it[item]['fee_list'] && it[item]['fee_list'].length && it[item]['fee_list'].length>0) { %]
[% for(var item2 in it[item]['fee_list']){ %]
<tr data-feeid="[%= it[item]['fee_list'][item2]['fee_id'] %]">
<td>[%= getInfoType(it[item]['fee_list'][item2]['role']) %]</td>
<td>[%= it[item]['fee_list'][item2]['name']+'-'+it[item]['fee_list'][item2]['phone'] %]</td>
<td>[%= it[item]['fee_list'][item2]['scale'] %]</td>
<td>[%= it[item]['fee_list'][item2]['fee'] %]</td>
</tr>
[% } %]
[% }else{ %]
<tr>暂无</tr>
[% } %]
</table>
</div>
<div>
<!--<a class="btn btn-default" href="#modal_new_tax" data-recordid="[%= it[item]['id'] %]" data-toggle="modal">编辑</a>-->
</div>
</section>
[% } %]
[% }else{ %]
<section>暂无数据</section>
[% } %]
</script>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment