18231669351
/
reagent_manage
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

搜索按钮type改为primary

Browse Source 
表单详情页改为公共页面
回到顶部按钮样式修改
master
toesbieya 6 years ago
parent adde5e8003
commit 64b538ab70
24 changed files with 49 additions and 30 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 21
      vue/src/layout/component/Main.vue
  2. 4
      vue/src/mixin/docDetailMixin.js
  3. 0
      vue/src/view/app/common/DetailPage/index.scss
  4. 6
      vue/src/view/app/common/DetailPage/index.vue
  5. 2
      vue/src/view/message/manage/indexPage.vue
  6. 2
      vue/src/view/purchase/inbound/component/OrderSelector.vue
  7. 4
      vue/src/view/purchase/inbound/detailPage.vue
  8. 2
      vue/src/view/purchase/inbound/indexPage.vue
  9. 2
      vue/src/view/purchase/order/component/SupplierSelector.vue
  10. 4
      vue/src/view/purchase/order/detailPage.vue
  11. 2
      vue/src/view/purchase/order/indexPage.vue
  12. 2
      vue/src/view/sell/order/component/CustomerSelector.vue
  13. 2
      vue/src/view/sell/order/component/StockSelector.vue
  14. 4
      vue/src/view/sell/order/detailPage.vue
  15. 2
      vue/src/view/sell/order/indexPage.vue
  16. 2
      vue/src/view/sell/outbound/component/OrderSelector.vue
  17. 2
      vue/src/view/sell/outbound/component/StockSelector.vue
  18. 4
      vue/src/view/sell/outbound/detailPage.vue
  19. 2
      vue/src/view/sell/outbound/indexPage.vue
  20. 2
      vue/src/view/stock/current/indexPage.vue
  21. 2
      vue/src/view/system/customer/indexPage.vue
  22. 2
      vue/src/view/system/role/indexPage.vue
  23. 2
      vue/src/view/system/supplier/indexPage.vue
  24. 2
      vue/src/view/system/user/indexPage.vue

21
vue/src/layout/component/Main.vue
Unescape View File

@ -22,7 +22,16 @@
width="100%" width="100%"
/> />
<el-backtop v-if="showBackToTop" target=".app-main .el-scrollbar__wrap" :visibility-height="400" :bottom="66"/> <el-backtop
v-if="showBackToTop"
target=".app-main .el-scrollbar__wrap"
:visibility-height="400"
:bottom="66"
>
<div class="back-to-top">
<v-icon icon="el-icon-top"/>
</div>
</el-backtop>
</main> </main>
</template> </template>
@ -97,5 +106,15 @@ export default {
} }
} }
} }
.back-to-top {
height: 100%;
width: 100%;
background-color: #f2f5f6;
box-shadow: 0 0 6px rgba(0, 0, 0, .12);
text-align: center;
line-height: 40px;
color: #1989fa;
}
} }
</style> </style>

4
vue/src/mixin/docDetailMixin.js
Unescape View File

@ -2,7 +2,7 @@ import {commonMethods} from "@/mixin/docTableMixin"
import AbstractForm from '@/component/AbstractForm' import AbstractForm from '@/component/AbstractForm'
import AbstractFormItem from "@/component/AbstractForm/item" import AbstractFormItem from "@/component/AbstractForm/item"
import AbstractTable from "@/component/AbstractTable" import AbstractTable from "@/component/AbstractTable"
import DetailForm from "@/component/AbstractForm/DetailForm" import DetailPage from "@/view/app/common/DetailPage"
import DocHistory from '@/component/biz/doc/DocHistory' import DocHistory from '@/component/biz/doc/DocHistory'
import DocSteps from '@/component/biz/doc/DocSteps' import DocSteps from '@/component/biz/doc/DocSteps'
import FormCard from '@/component/AbstractForm/FormCard' import FormCard from '@/component/AbstractForm/FormCard'
@ -18,7 +18,7 @@ export default {
AbstractForm, AbstractForm,
AbstractFormItem, AbstractFormItem,
AbstractTable, AbstractTable,
DetailForm, DetailPage,
DocHistory, DocHistory,
DocSteps, DocSteps,
FormCard, FormCard,

0
vue/src/component/AbstractForm/DetailForm.scss → vue/src/view/app/common/DetailPage/index.scss
Unescape View File

6
vue/src/component/AbstractForm/DetailForm.vue → vue/src/view/app/common/DetailPage/index.vue
Unescape View File

@ -1,4 +1,4 @@
<script type="text/jsx"> <script type="jsx">
import FormAnchor from "@/component/AbstractForm/FormAnchor" import FormAnchor from "@/component/AbstractForm/FormAnchor"
import FormValidateInfo from "@/component/AbstractForm/FormValidateInfo" import FormValidateInfo from "@/component/AbstractForm/FormValidateInfo"
@ -51,7 +51,7 @@ const renderButtons = (h, buttons, close) => {
} }
export default { export default {
name: "DetailForm", name: "DetailPage",
functional: true, functional: true,
@ -91,4 +91,4 @@ export default {
} }
</script> </script>
<style lang="scss" src="./DetailForm.scss"></style> <style lang="scss" src="./index.scss"></style>

2
vue/src/view/message/manage/indexPage.vue
Unescape View File

@ -20,7 +20,7 @@
</search-form> </search-form>
<el-row class="button-group"> <el-row class="button-group">
<el-button icon="el-icon-search" size="small" type="success" @click="search">查 询</el-button> <el-button icon="el-icon-search" size="small" type="primary" @click="search">查 询</el-button>
<el-button v-if="canAdd" icon="el-icon-plus" size="small" type="primary" @click="add">添 加</el-button> <el-button v-if="canAdd" icon="el-icon-plus" size="small" type="primary" @click="add">添 加</el-button>
<el-button icon="el-icon-view" size="small" type="primary" @click="see">查 看</el-button> <el-button icon="el-icon-view" size="small" type="primary" @click="see">查 看</el-button>
<el-button v-if="canUpdate" icon="el-icon-edit" size="small" type="primary" @click="edit">编 辑</el-button> <el-button v-if="canUpdate" icon="el-icon-edit" size="small" type="primary" @click="edit">编 辑</el-button>

2
vue/src/view/purchase/inbound/component/OrderSelector.vue
Unescape View File

@ -11,7 +11,7 @@
> >
<el-scrollbar> <el-scrollbar>
<el-row> <el-row>
<el-button icon="el-icon-search" size="small" type="success" @click="search">查 询</el-button> <el-button icon="el-icon-search" size="small" type="primary" @click="search">查 询</el-button>
<el-button plain size="small" @click="closeDialog">取 消</el-button> <el-button plain size="small" @click="closeDialog">取 消</el-button>
</el-row> </el-row>

4
vue/src/view/purchase/inbound/detailPage.vue
Unescape View File

@ -1,5 +1,5 @@
<template> <template>
<detail-form <detail-page
:loading="loading" :loading="loading"
:reference="() => $refs" :reference="() => $refs"
:anchors="anchors" :anchors="anchors"
@ -69,7 +69,7 @@
</abstract-form> </abstract-form>
<order-selector v-model="parentDialog" @select="selectParent"/> <order-selector v-model="parentDialog" @select="selectParent"/>
</detail-form> </detail-page>
</template> </template>
<script> <script>

2
vue/src/view/purchase/inbound/indexPage.vue
Unescape View File

@ -41,7 +41,7 @@
</search-form> </search-form>
<el-row class="button-group"> <el-row class="button-group">
<el-button icon="el-icon-search" size="small" type="success" @click="search">查 询</el-button> <el-button icon="el-icon-search" size="small" type="primary" @click="search">查 询</el-button>
<el-button v-if="canAdd" icon="el-icon-plus" size="small" type="primary" @click="add">添 加</el-button> <el-button v-if="canAdd" icon="el-icon-plus" size="small" type="primary" @click="add">添 加</el-button>
<el-button icon="el-icon-view" size="small" type="primary" @click="see">查 看</el-button> <el-button icon="el-icon-view" size="small" type="primary" @click="see">查 看</el-button>
<el-button v-if="canUpdate" icon="el-icon-edit" size="small" type="primary" @click="edit">编 辑</el-button> <el-button v-if="canUpdate" icon="el-icon-edit" size="small" type="primary" @click="edit">编 辑</el-button>

2
vue/src/view/purchase/order/component/SupplierSelector.vue
Unescape View File

@ -10,7 +10,7 @@
@open="search" @open="search"
> >
<el-row> <el-row>
<el-button icon="el-icon-search" size="small" type="success" @click="search">查 询</el-button> <el-button icon="el-icon-search" size="small" type="primary" @click="search">查 询</el-button>
<el-button size="small" type="primary" @click="confirm">确 定</el-button> <el-button size="small" type="primary" @click="confirm">确 定</el-button>
<el-button plain size="small" @click="closeDialog">取 消</el-button> <el-button plain size="small" @click="closeDialog">取 消</el-button>
<el-button <el-button

4
vue/src/view/purchase/order/detailPage.vue
Unescape View File

@ -1,5 +1,5 @@
<template> <template>
<detail-form <detail-page
:loading="loading" :loading="loading"
:reference="() => $refs" :reference="() => $refs"
:anchors="anchors" :anchors="anchors"
@ -115,7 +115,7 @@
</abstract-form> </abstract-form>
<supplier-selector v-model="supplierDialog" @select="selectSupplier"/> <supplier-selector v-model="supplierDialog" @select="selectSupplier"/>
</detail-form> </detail-page>
</template> </template>
<script> <script>

2
vue/src/view/purchase/order/indexPage.vue
Unescape View File

@ -57,7 +57,7 @@
</search-form> </search-form>
<el-row class="button-group"> <el-row class="button-group">
<el-button icon="el-icon-search" size="small" type="success" @click="search">查 询</el-button> <el-button icon="el-icon-search" size="small" type="primary" @click="search">查 询</el-button>
<el-button v-if="canAdd" icon="el-icon-plus" size="small" type="primary" @click="add">添 加</el-button> <el-button v-if="canAdd" icon="el-icon-plus" size="small" type="primary" @click="add">添 加</el-button>
<el-button icon="el-icon-view" size="small" type="primary" @click="see">查 看</el-button> <el-button icon="el-icon-view" size="small" type="primary" @click="see">查 看</el-button>
<el-button v-if="canUpdate" icon="el-icon-edit" size="small" type="primary" @click="edit">编 辑</el-button> <el-button v-if="canUpdate" icon="el-icon-edit" size="small" type="primary" @click="edit">编 辑</el-button>

2
vue/src/view/sell/order/component/CustomerSelector.vue
Unescape View File

@ -10,7 +10,7 @@
@open="search" @open="search"
> >
<el-row> <el-row>
<el-button icon="el-icon-search" size="small" type="success" @click="search">查 询</el-button> <el-button icon="el-icon-search" size="small" type="primary" @click="search">查 询</el-button>
<el-button size="small" type="primary" @click="confirm">确 定</el-button> <el-button size="small" type="primary" @click="confirm">确 定</el-button>
<el-button plain size="small" @click="closeDialog">取 消</el-button> <el-button plain size="small" @click="closeDialog">取 消</el-button>
</el-row> </el-row>

2
vue/src/view/sell/order/component/StockSelector.vue
Unescape View File

@ -11,7 +11,7 @@
> >
<el-scrollbar> <el-scrollbar>
<el-row> <el-row>
<el-button icon="el-icon-search" size="small" type="success" @click="search">查 询</el-button> <el-button icon="el-icon-search" size="small" type="primary" @click="search">查 询</el-button>
<el-button size="small" type="primary" @click="confirm">确 定</el-button> <el-button size="small" type="primary" @click="confirm">确 定</el-button>
<el-button plain size="small" @click="closeDialog">取 消</el-button> <el-button plain size="small" @click="closeDialog">取 消</el-button>
</el-row> </el-row>

4
vue/src/view/sell/order/detailPage.vue
Unescape View File

@ -1,5 +1,5 @@
<template> <template>
<detail-form <detail-page
:loading="loading" :loading="loading"
:reference="() => $refs" :reference="() => $refs"
:anchors="anchors" :anchors="anchors"
@ -100,7 +100,7 @@
<stock-selector v-model="stockDialog" @select="selectStock"/> <stock-selector v-model="stockDialog" @select="selectStock"/>
<customer-selector v-model="customerDialog" @select="selectCustomer"/> <customer-selector v-model="customerDialog" @select="selectCustomer"/>
</detail-form> </detail-page>
</template> </template>
<script> <script>

2
vue/src/view/sell/order/indexPage.vue
Unescape View File

@ -57,7 +57,7 @@
</search-form> </search-form>
<el-row class="button-group"> <el-row class="button-group">
<el-button icon="el-icon-search" size="small" type="success" @click="search">查 询</el-button> <el-button icon="el-icon-search" size="small" type="primary" @click="search">查 询</el-button>
<el-button v-if="canAdd" icon="el-icon-plus" size="small" type="primary" @click="add">添 加</el-button> <el-button v-if="canAdd" icon="el-icon-plus" size="small" type="primary" @click="add">添 加</el-button>
<el-button icon="el-icon-view" size="small" type="primary" @click="see">查 看</el-button> <el-button icon="el-icon-view" size="small" type="primary" @click="see">查 看</el-button>
<el-button v-if="canUpdate" icon="el-icon-edit" size="small" type="primary" @click="edit">编 辑</el-button> <el-button v-if="canUpdate" icon="el-icon-edit" size="small" type="primary" @click="edit">编 辑</el-button>

2
vue/src/view/sell/outbound/component/OrderSelector.vue
Unescape View File

@ -11,7 +11,7 @@
> >
<el-scrollbar> <el-scrollbar>
<el-row> <el-row>
<el-button icon="el-icon-search" size="small" type="success" @click="search">查 询</el-button> <el-button icon="el-icon-search" size="small" type="primary" @click="search">查 询</el-button>
<el-button plain size="small" @click="closeDialog">取 消</el-button> <el-button plain size="small" @click="closeDialog">取 消</el-button>
</el-row> </el-row>

2
vue/src/view/sell/outbound/component/StockSelector.vue
Unescape View File

@ -11,7 +11,7 @@
> >
<el-scrollbar> <el-scrollbar>
<el-row> <el-row>
<el-button icon="el-icon-search" size="small" type="success" @click="search">查 询</el-button> <el-button icon="el-icon-search" size="small" type="primary" @click="search">查 询</el-button>
<el-button size="small" type="primary" @click="confirm">确 定</el-button> <el-button size="small" type="primary" @click="confirm">确 定</el-button>
<el-button plain size="small" @click="closeDialog">取 消</el-button> <el-button plain size="small" @click="closeDialog">取 消</el-button>
</el-row> </el-row>

4
vue/src/view/sell/outbound/detailPage.vue
Unescape View File

@ -1,5 +1,5 @@
<template> <template>
<detail-form <detail-page
:loading="loading" :loading="loading"
:reference="() => $refs" :reference="() => $refs"
:anchors="anchors" :anchors="anchors"
@ -86,7 +86,7 @@
<order-selector v-model="parentDialog" @select="selectParent"/> <order-selector v-model="parentDialog" @select="selectParent"/>
<stock-selector v-model="stockDialog" :cid="row ? row.cid : null" @select="selectStock"/> <stock-selector v-model="stockDialog" :cid="row ? row.cid : null" @select="selectStock"/>
</detail-form> </detail-page>
</template> </template>
<script> <script>

2
vue/src/view/sell/outbound/indexPage.vue
Unescape View File

@ -41,7 +41,7 @@
</search-form> </search-form>
<el-row class="button-group"> <el-row class="button-group">
<el-button icon="el-icon-search" size="small" type="success" @click="search">查 询</el-button> <el-button icon="el-icon-search" size="small" type="primary" @click="search">查 询</el-button>
<el-button v-if="canAdd" icon="el-icon-plus" size="small" type="primary" @click="add">添 加</el-button> <el-button v-if="canAdd" icon="el-icon-plus" size="small" type="primary" @click="add">添 加</el-button>
<el-button icon="el-icon-view" size="small" type="primary" @click="see">查 看</el-button> <el-button icon="el-icon-view" size="small" type="primary" @click="see">查 看</el-button>
<el-button v-if="canUpdate" icon="el-icon-edit" size="small" type="primary" @click="edit">编 辑</el-button> <el-button v-if="canUpdate" icon="el-icon-edit" size="small" type="primary" @click="edit">编 辑</el-button>

2
vue/src/view/stock/current/indexPage.vue
Unescape View File

@ -36,7 +36,7 @@
</search-form> </search-form>
<el-row class="button-group"> <el-row class="button-group">
<el-button icon="el-icon-search" size="small" type="success" @click="search">查 询</el-button> <el-button icon="el-icon-search" size="small" type="primary" @click="search">查 询</el-button>
<el-button icon="el-icon-download" size="small" type="info" @click="downloadExcel">导 出</el-button> <el-button icon="el-icon-download" size="small" type="info" @click="downloadExcel">导 出</el-button>
</el-row> </el-row>

2
vue/src/view/system/customer/indexPage.vue
Unescape View File

@ -41,7 +41,7 @@
</search-form> </search-form>
<el-row class="button-group"> <el-row class="button-group">
<el-button icon="el-icon-search" size="small" type="success" @click="search">查 询</el-button> <el-button icon="el-icon-search" size="small" type="primary" @click="search">查 询</el-button>
<el-button v-if="canAdd" icon="el-icon-plus" size="small" type="primary" @click="add">添 加</el-button> <el-button v-if="canAdd" icon="el-icon-plus" size="small" type="primary" @click="add">添 加</el-button>
<el-button v-if="canUpdate" icon="el-icon-edit" size="small" type="primary" @click="edit">编 辑</el-button> <el-button v-if="canUpdate" icon="el-icon-edit" size="small" type="primary" @click="edit">编 辑</el-button>
<el-button v-if="canDel" icon="el-icon-delete" size="small" type="danger" @click="del">删 除</el-button> <el-button v-if="canDel" icon="el-icon-delete" size="small" type="danger" @click="del">删 除</el-button>

2
vue/src/view/system/role/indexPage.vue
Unescape View File

@ -25,7 +25,7 @@
</search-form> </search-form>
<el-row class="button-group"> <el-row class="button-group">
<el-button icon="el-icon-search" size="small" type="success" @click="search">查 询</el-button> <el-button icon="el-icon-search" size="small" type="primary" @click="search">查 询</el-button>
<el-button v-if="canAdd" icon="el-icon-plus" size="small" type="primary" @click="add">添 加</el-button> <el-button v-if="canAdd" icon="el-icon-plus" size="small" type="primary" @click="add">添 加</el-button>
<el-button v-if="canUpdate" icon="el-icon-edit" size="small" type="primary" @click="edit">编 辑</el-button> <el-button v-if="canUpdate" icon="el-icon-edit" size="small" type="primary" @click="edit">编 辑</el-button>
<el-button v-if="canDel" icon="el-icon-delete" size="small" type="danger" @click="del">删 除</el-button> <el-button v-if="canDel" icon="el-icon-delete" size="small" type="danger" @click="del">删 除</el-button>

2
vue/src/view/system/supplier/indexPage.vue
Unescape View File

@ -41,7 +41,7 @@
</search-form> </search-form>
<el-row class="button-group"> <el-row class="button-group">
<el-button icon="el-icon-search" size="small" type="success" @click="search">查 询</el-button> <el-button icon="el-icon-search" size="small" type="primary" @click="search">查 询</el-button>
<el-button v-if="canAdd" icon="el-icon-plus" size="small" type="primary" @click="add">添 加</el-button> <el-button v-if="canAdd" icon="el-icon-plus" size="small" type="primary" @click="add">添 加</el-button>
<el-button v-if="canUpdate" icon="el-icon-edit" size="small" type="primary" @click="edit">编 辑</el-button> <el-button v-if="canUpdate" icon="el-icon-edit" size="small" type="primary" @click="edit">编 辑</el-button>
<el-button v-if="canDel" icon="el-icon-delete" size="small" type="danger" @click="del">删 除</el-button> <el-button v-if="canDel" icon="el-icon-delete" size="small" type="danger" @click="del">删 除</el-button>

2
vue/src/view/system/user/indexPage.vue
Unescape View File

@ -28,7 +28,7 @@
</search-form> </search-form>
<el-row class="button-group"> <el-row class="button-group">
<el-button icon="el-icon-search" size="small" type="success" @click="search">查 询</el-button> <el-button icon="el-icon-search" size="small" type="primary" @click="search">查 询</el-button>
<el-button v-if="canAdd" icon="el-icon-plus" size="small" type="primary" @click="add">添 加</el-button> <el-button v-if="canAdd" icon="el-icon-plus" size="small" type="primary" @click="add">添 加</el-button>
<el-button v-if="canUpdate" icon="el-icon-edit" size="small" type="primary" @click="edit">编 辑</el-button> <el-button v-if="canUpdate" icon="el-icon-edit" size="small" type="primary" @click="edit">编 辑</el-button>
<el-button v-if="canResetPwd" icon="el-icon-edit" size="small" type="dashed" plain @click="resetPwd">重置密码 <el-button v-if="canResetPwd" icon="el-icon-edit" size="small" type="dashed" plain @click="resetPwd">重置密码

Write Preview
Loading…
Cancel
Save