hydrz/vd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

设置提示

Browse Source
This commit is contained in:
邓皓元 2019-04-04 14:57:45 +08:00
parent b2d6d36cce
commit ee8cd61d1e
9 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Domains/Virtual/Http/Controllers/PropertyController.php
View File

@ -111,7 +111,7 @@ class PropertyController extends Controller
];
foreach ($data as $i => $item) {
$row = $i + 1;
$row = $i + 2;
foreach ($item as $v => $value) {
if (strpos($v, '*') !== false) {

4
app/Domains/Virtual/Services/PropertyService.php
View File

@ -266,14 +266,14 @@ class PropertyService extends Service
$value['created_at'] = date('Y-m-d H:i:s');
$value['updated_at'] = date('Y-m-d H:i:s');
$data[] = $value;
$data[$value['company_id'] . '_' . $value['package_id']] = $value;
}
if (empty($data)) {
throw new NotAllowedException('数据未修改');
}
$this->propertyRepository->upsert($data, ['company_id', 'package_id']);
$this->propertyRepository->upsert(array_values($data), ['company_id', 'package_id']);
$this->propertyRepository->forgetCached();

7
frontend/src/views/virtual/properties/index.vue
View File

@ -64,6 +64,13 @@
</Select>
</li>
<li class="handle-item w-250">
<Select placeholder="设置状态" v-model.trim="params.status" clearable>
<Option :value="0">已设置</Option>
<Option :value="1">未设置</Option>
</Select>
</li>
<li class="f-r">
<div class="handle-item">
<Upload :before-upload="importExcel" action="/" :format="['xls','xlsx','csv']">

10
frontend/src/views/virtual/properties/js/index.js
View File

@ -137,7 +137,7 @@ export default {
if (this.haveJurisdiction('update')) {
let button = h('Button', {
props: {
type: row.province ? 'primary' : 'error',
type: row.province ? 'success' : 'primary',
size: 'small'
},
class: ['btn'],
@ -303,6 +303,14 @@ export default {
properties = properties.filter(el => { return el.package_id == this.params.package_id; });
}
if (this.params.status !== '' && this.params.status !== undefined) {
if (this.params.status === 0) {
properties = properties.filter(el => { return el.product !== '' && el.province !== null; });
} else if (this.params.status === 1) {
properties = properties.filter(el => { return el.product === '' || el.province === null; });
}
}
this.page.total = properties.length;
this.showData = properties.slice((page - 1) * this.page.limit, page * this.page.limit);

2
public/js/app.ec25931e.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/js/app.ec25931e.js.map Normal file
View File

File diff suppressed because one or more lines are too long

15
public/js/chunk-f284e446.24e1265a.js Normal file
View File

File diff suppressed because one or more lines are too long

1
public/js/chunk-f284e446.24e1265a.js.map Normal file
View File

File diff suppressed because one or more lines are too long

2
resources/views/index.blade.php
View File

@ -1 +1 @@
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=\favicon.ico><script src=\config.js></script><title></title><link href=/css/chunk-996b1e80.5cadf3d0.css rel=prefetch><link href=/css/chunk-f284e446.60854bc0.css rel=prefetch><link href=/js/chunk-00ae0766.3874cd10.js rel=prefetch><link href=/js/chunk-07a274ec.c3ad5dec.js rel=prefetch><link href=/js/chunk-996b1e80.d3b45e46.js rel=prefetch><link href=/js/chunk-f284e446.ee2db358.js rel=prefetch><link href=/css/app.d71a8195.css rel=preload as=style><link href=/css/chunk-vendors.3c3b2e85.css rel=preload as=style><link href=/js/app.a4f6ae07.js rel=preload as=script><link href=/js/chunk-vendors.ed6443e8.js rel=preload as=script><link href=/css/chunk-vendors.3c3b2e85.css rel=stylesheet><link href=/css/app.d71a8195.css rel=stylesheet></head><body><noscript><strong>很抱歉，如果没有启用JavaScript，程序不能正常工作，若要继续使用请启用它。</strong></noscript><div id=app></div><script src=/js/chunk-vendors.ed6443e8.js></script><script src=/js/app.a4f6ae07.js></script></body></html>
<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=\favicon.ico><script src=\config.js></script><title></title><link href=/css/chunk-996b1e80.5cadf3d0.css rel=prefetch><link href=/css/chunk-f284e446.60854bc0.css rel=prefetch><link href=/js/chunk-00ae0766.3874cd10.js rel=prefetch><link href=/js/chunk-07a274ec.c3ad5dec.js rel=prefetch><link href=/js/chunk-996b1e80.d3b45e46.js rel=prefetch><link href=/js/chunk-f284e446.24e1265a.js rel=prefetch><link href=/css/app.d71a8195.css rel=preload as=style><link href=/css/chunk-vendors.3c3b2e85.css rel=preload as=style><link href=/js/app.ec25931e.js rel=preload as=script><link href=/js/chunk-vendors.ed6443e8.js rel=preload as=script><link href=/css/chunk-vendors.3c3b2e85.css rel=stylesheet><link href=/css/app.d71a8195.css rel=stylesheet></head><body><noscript><strong>很抱歉，如果没有启用JavaScript，程序不能正常工作，若要继续使用请启用它。</strong></noscript><div id=app></div><script src=/js/chunk-vendors.ed6443e8.js></script><script src=/js/app.ec25931e.js></script></body></html>