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

template中的slot改为v-slot写法

Browse Source
master
toesbieya 6 years ago
parent bc78aed93c
commit 6169d0a2f6
17 changed files with 145 additions and 88 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. 4
      vue/full/element-ui-personal/component/Menu/MenuItem.vue
  2. 12
      vue/full/src/asset/style/cover/element-ui.scss
  3. 10
      vue/full/src/component/CollapseCard/index.vue
  4. 2
      vue/full/src/component/RegionSelector/Tab/index.vue
  5. 62
      vue/full/src/component/TreeSelect/index.vue
  6. 2
      vue/full/src/component/form/ValidateInfo/index.vue
  7. 5
      vue/full/src/component/menu/NavMenu/item.vue
  8. 4
      vue/full/src/globalMethod/Guide/main.vue
  9. 4
      vue/full/src/view/admin/purchase/inbound/detailPage.vue
  10. 28
      vue/full/src/view/admin/purchase/order/detailPage.vue
  11. 28
      vue/full/src/view/admin/sell/order/detailPage.vue
  12. 14
      vue/full/src/view/admin/sell/outbound/detailPage.vue
  13. 20
      vue/full/src/view/admin/system/menu/indexPage.vue
  14. 14
      vue/full/src/view/admin/system/role/EditDialog.vue
  15. 4
      vue/full/src/view/admin/userCenter/component/LoginHistory.vue
  16. 16
      vue/full/src/view/admin/userCenter/component/UserAction.vue
  17. 4
      vue/full/src/view/admin/userCenter/indexPage.vue

4
vue/full/element-ui-personal/component/Menu/MenuItem.vue
Unescape View File

@ -10,9 +10,9 @@
effect="dark" effect="dark"
placement="right" placement="right"
> >
<div slot="content"> <template v-slot:content>
<slot name="title"/> <slot name="title"/>
</div> </template>
<div :style="iconContainerStyle"> <div :style="iconContainerStyle">
<slot/> <slot/>
</div> </div>

12
vue/full/src/asset/style/cover/element-ui.scss
Unescape View File

@ -1,4 +1,16 @@
// cover some element-ui styles // cover some element-ui styles
.el-alert {
&--info.is-light {
color: $--color-text-regular;
background-color: rgba($--color-primary, .1);
border: 1px solid rgba($--color-primary, .5);
.el-icon-info {
color: $--color-primary;
}
}
}
.el-backtop { .el-backtop {
border-radius: 0; border-radius: 0;
} }

10
vue/full/src/component/CollapseCard/index.vue
Unescape View File

@ -1,9 +1,11 @@
<template> <template>
<el-card :class="{collapsed}"> <el-card :class="{collapsed}">
<div slot="header" class="clearfix"> <template v-slot:header>
<slot name="header">{{ header }}</slot> <div class="clearfix">
<i class="el-icon-arrow-up collapse-card-icon"/> <slot name="header">{{ header }}</slot>
</div> <i class="el-icon-arrow-up collapse-card-icon"/>
</div>
</template>
<slot/> <slot/>
</el-card> </el-card>
</template> </template>

2
vue/full/src/component/RegionSelector/Tab/index.vue
Unescape View File

@ -9,7 +9,7 @@
@clear="() => $emit('clear')" @clear="() => $emit('clear')"
@visible-change="visibleChange" @visible-change="visibleChange"
> >
<template slot="empty"> <template v-slot:empty>
<div class="rg-header"> <div class="rg-header">
<h3>行政区划选择</h3> <h3>行政区划选择</h3>

62
vue/full/src/component/TreeSelect/index.vue
Unescape View File

@ -13,36 +13,38 @@
@change="e => $emit('change',e)" @change="e => $emit('change',e)"
@remove-tag="removeTag" @remove-tag="removeTag"
> >
<div class="tree-select-container" slot="empty"> <template v-slot:empty>
<el-input <div class="tree-select-container">
ref="search" <el-input
v-if="filterable && filterMethod" ref="search"
v-model="search" v-if="filterable && filterMethod"
size="mini" v-model="search"
clearable size="mini"
@input="onSearch" clearable
/> @input="onSearch"
<el-tree />
ref="tree" <el-tree
:data="data" ref="tree"
:node-key="nodeKey" :data="data"
:props="props" :node-key="nodeKey"
:show-checkbox="multiple" :props="props"
:default-checked-keys="defaultCheckedKeys" :show-checkbox="multiple"
:current-node-key="multiple ? undefined : value" :default-checked-keys="defaultCheckedKeys"
:highlight-current="!multiple" :current-node-key="multiple ? undefined : value"
:expand-on-click-node="false" :highlight-current="!multiple"
:check-on-click-node="multiple" :expand-on-click-node="false"
:filter-node-method="filterMethod" :check-on-click-node="multiple"
:accordion="accordion" :filter-node-method="filterMethod"
@node-click="nodeClick" :accordion="accordion"
@check="check" @node-click="nodeClick"
> @check="check"
<slot slot-scope="{node,data}"> >
<span :class="{'el-tree-node__label':true,'is-disabled':node.disabled}">{{ node.label }}</span> <slot slot-scope="{node,data}">
</slot> <span :class="{'el-tree-node__label':true,'is-disabled':node.disabled}">{{ node.label }}</span>
</el-tree> </slot>
</div> </el-tree>
</div>
</template>
</el-select> </el-select>
</template> </template>

2
vue/full/src/component/form/ValidateInfo/index.vue
Unescape View File

@ -15,7 +15,7 @@
<div class="form-validate-info-item-label">{{ i.label }}</div> <div class="form-validate-info-item-label">{{ i.label }}</div>
</div> </div>
</div> </div>
<template slot="reference"> <template v-slot:reference>
<span v-show="error.length > 0" class="form-validate-info-ref"> <span v-show="error.length > 0" class="form-validate-info-ref">
<i class="el-icon-circle-close"/> <i class="el-icon-circle-close"/>
{{ error.length }} {{ error.length }}

5
vue/full/src/component/menu/NavMenu/item.vue
Unescape View File

@ -16,7 +16,10 @@ const MenuItemContent = {
? title ? title
: getHighlightContent(h, title, highlight) : getHighlightContent(h, title, highlight)
return [<v-icon icon={icon}/>, <span slot="title" class="menu-item-content">{content}</span>] return [
<v-icon icon={icon}/>,
<span slot="title" class="menu-item-content">{content}</span>
]
} }
} }

4
vue/full/src/globalMethod/Guide/main.vue
Unescape View File

@ -22,7 +22,9 @@
</div> </div>
</div> </div>
<div slot="reference" v-show="showStage" id="guide-stage" :style="stageStyle"/> <template v-slot:reference>
<div v-show="showStage" id="guide-stage" :style="stageStyle"/>
</template>
</el-popover> </el-popover>
<div v-if="showStage" id="guide-highlight-element-cover" :style="stageStyle" @click.prevent.stop/> <div v-if="showStage" id="guide-highlight-element-cover" :style="stageStyle" @click.prevent.stop/>

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

@ -17,7 +17,9 @@
<collapse-card ref="base" header="基础信息"> <collapse-card ref="base" header="基础信息">
<abstract-form-item label="采购订单" prop="pid"> <abstract-form-item label="采购订单" prop="pid">
<el-input v-if="canSave" :value="form.pid" readonly> <el-input v-if="canSave" :value="form.pid" readonly>
<el-button slot="append" @click="parentDialog=true">选择</el-button> <template v-slot:append>
<el-button @click="parentDialog=true">选择</el-button>
</template>
</el-input> </el-input>
<template v-else>{{ form.pid }}</template> <template v-else>{{ form.pid }}</template>
</abstract-form-item> </abstract-form-item>

28
vue/full/src/view/admin/purchase/order/detailPage.vue
Unescape View File

@ -17,7 +17,9 @@
<collapse-card ref="base" header="基础信息"> <collapse-card ref="base" header="基础信息">
<abstract-form-item label="供应商" prop="sname"> <abstract-form-item label="供应商" prop="sname">
<el-input v-if="canSave" :value="form.sname" readonly> <el-input v-if="canSave" :value="form.sname" readonly>
<el-button slot="append" @click="supplierDialog=true">选择</el-button> <template v-slot:append>
<el-button @click="supplierDialog = true">选择</el-button>
</template>
</el-input> </el-input>
<template v-else>{{ form.sname }}</template> <template v-else>{{ form.sname }}</template>
</abstract-form-item> </abstract-form-item>
@ -75,17 +77,19 @@
<el-button type="text" @click="() => delSub(row,$index)">删除</el-button> <el-button type="text" @click="() => delSub(row,$index)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
<div v-if="canSave" slot="append" class="table-add-btn"> <template v-if="canSave" v-slot:append>
<el-button <div class="table-add-btn">
plain <el-button
type="dashed" plain
icon="el-icon-plus" type="dashed"
:disabled="!canAddSub" icon="el-icon-plus"
@click="addSub" :disabled="!canAddSub"
> @click="addSub"
添加采购商品 >
</el-button> 添加采购商品
</div> </el-button>
</div>
</template>
</abstract-table> </abstract-table>
</collapse-card> </collapse-card>

28
vue/full/src/view/admin/sell/order/detailPage.vue
Unescape View File

@ -17,7 +17,9 @@
<collapse-card ref="base" header="基础信息"> <collapse-card ref="base" header="基础信息">
<abstract-form-item label="客 户" prop="customerName"> <abstract-form-item label="客 户" prop="customerName">
<el-input v-if="canSave" :value="form.customerName" readonly> <el-input v-if="canSave" :value="form.customerName" readonly>
<el-button slot="append" @click="customerDialog=true">选择</el-button> <template v-slot:append>
<el-button @click="customerDialog=true">选择</el-button>
</template>
</el-input> </el-input>
<template v-else>{{ form.customerName }}</template> <template v-else>{{ form.customerName }}</template>
</abstract-form-item> </abstract-form-item>
@ -58,17 +60,19 @@
{{ row.remainNum === 0 ? '已全部出库' : '未全部出库' }} {{ row.remainNum === 0 ? '已全部出库' : '未全部出库' }}
</template> </template>
</el-table-column> </el-table-column>
<div v-if="canSave" slot="append" class="table-add-btn"> <template v-if="canSave" v-slot:append>
<el-button <div class="table-add-btn">
plain <el-button
type="dashed" plain
icon="el-icon-plus" type="dashed"
:disabled="!canAddSub" icon="el-icon-plus"
@click="stockDialog=true" :disabled="!canAddSub"
> @click="stockDialog=true"
添加销售商品 >
</el-button> 添加销售商品
</div> </el-button>
</div>
</template>
</abstract-table> </abstract-table>
</collapse-card> </collapse-card>

14
vue/full/src/view/admin/sell/outbound/detailPage.vue
Unescape View File

@ -17,7 +17,9 @@
<collapse-card ref="base" header="基础信息"> <collapse-card ref="base" header="基础信息">
<abstract-form-item label="销售订单" prop="pid"> <abstract-form-item label="销售订单" prop="pid">
<el-input v-if="canSave" :value="form.pid" readonly> <el-input v-if="canSave" :value="form.pid" readonly>
<el-button slot="append" @click="parentDialog=true">选择</el-button> <template v-slot:append>
<el-button @click="parentDialog=true">选择</el-button>
</template>
</el-input> </el-input>
<template v-else>{{ form.pid }}</template> <template v-else>{{ form.pid }}</template>
</abstract-form-item> </abstract-form-item>
@ -30,9 +32,15 @@
:summary-method="summaryStock(row)"> :summary-method="summaryStock(row)">
<el-table-column align="center" label="#" type="index" width="80"/> <el-table-column align="center" label="#" type="index" width="80"/>
<el-table-column align="center"> <el-table-column align="center">
<template slot="header"> <template v-slot:header>
出库数量 出库数量
<el-button v-if="canSave" type="text" size="small" @click="openStock(row)">选择库存 <el-button
v-if="canSave"
type="text"
size="small"
@click="openStock(row)"
>
选择库存
</el-button> </el-button>
</template> </template>
<template v-slot="d"> <template v-slot="d">

20
vue/full/src/view/admin/system/menu/indexPage.vue
Unescape View File

@ -7,17 +7,22 @@
<el-button icon="el-icon-plus" size="small" type="primary" @click="addRoot">添加根节点</el-button> <el-button icon="el-icon-plus" size="small" type="primary" @click="addRoot">添加根节点</el-button>
<el-button icon="el-icon-plus" size="small" type="primary" @click="addChild">添加子节点</el-button> <el-button icon="el-icon-plus" size="small" type="primary" @click="addChild">添加子节点</el-button>
</template> </template>
<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>
<el-dropdown placement="bottom" size="small" @command="more"> <el-dropdown placement="bottom" size="small" @command="more">
<el-button plain size="small"> <el-button plain size="small">
更多操作 更多操作
<i class="el-icon-arrow-down el-icon--right"/> <i class="el-icon-arrow-down el-icon--right"/>
</el-button> </el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="{action:'expand',level:0}">展开全部</el-dropdown-item> <template v-slot:dropdown>
<el-dropdown-item :command="{action:'collapse',level:0}">收起全部</el-dropdown-item> <el-dropdown-menu>
<el-dropdown-item :command="{action:'expand',level:1}">仅展开一级</el-dropdown-item> <el-dropdown-item :command="{action:'expand',level:0}">展开全部</el-dropdown-item>
</el-dropdown-menu> <el-dropdown-item :command="{action:'collapse',level:0}">收起全部</el-dropdown-item>
<el-dropdown-item :command="{action:'expand',level:1}">仅展开一级</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown> </el-dropdown>
</el-row> </el-row>
@ -69,7 +74,10 @@
placeholder="请选择类型" placeholder="请选择类型"
@change="typeChange" @change="typeChange"
> >
<v-icon slot="prefix" :icon="getNodeInfo({data:form}).icon"/> <template v-slot:prefix>
<v-icon :icon="getNodeInfo({data:form}).icon"/>
</template>
<el-option <el-option
v-for="{label,value,icon} in nodeType" v-for="{label,value,icon} in nodeType"
:key="value" :key="value"

14
vue/full/src/view/admin/system/role/EditDialog.vue
Unescape View File

@ -49,12 +49,16 @@
权限树操作 权限树操作
<i class="el-icon-arrow-up el-icon--right"/> <i class="el-icon-arrow-up el-icon--right"/>
</el-button> </el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="{action:'expand',level:0}">展开全部</el-dropdown-item> <template v-slot:dropdown>
<el-dropdown-item :command="{action:'collapse',level:0}">收起全部</el-dropdown-item> <el-dropdown-menu>
<el-dropdown-item :command="{action:'expand',level:1}">仅展开一级</el-dropdown-item> <el-dropdown-item :command="{action:'expand',level:0}">展开全部</el-dropdown-item>
</el-dropdown-menu> <el-dropdown-item :command="{action:'collapse',level:0}">收起全部</el-dropdown-item>
<el-dropdown-item :command="{action:'expand',level:1}">仅展开一级</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown> </el-dropdown>
<el-button plain size="small" @click="closeDialog">取 消</el-button> <el-button plain size="small" @click="closeDialog">取 消</el-button>
<el-button v-if="canEdit" size="small" type="primary" @click="confirm">确 定</el-button> <el-button v-if="canEdit" size="small" type="primary" @click="confirm">确 定</el-button>
</template> </template>

4
vue/full/src/view/admin/userCenter/component/LoginHistory.vue
Unescape View File

@ -2,7 +2,9 @@
<div v-loading="config.loading"> <div v-loading="config.loading">
<abstract-table :data="tableData" :highlight-current-row="false"> <abstract-table :data="tableData" :highlight-current-row="false">
<el-table-column align="center" type="index" width="60"> <el-table-column align="center" type="index" width="60">
<el-button icon="el-icon-refresh-right" slot="header" style="padding: 0" type="text" @click="search"/> <template v-slot:header>
<el-button icon="el-icon-refresh-right" style="padding: 0" type="text" @click="search"/>
</template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="ip" prop="ip" show-overflow-tooltip/> <el-table-column align="center" label="ip" prop="ip" show-overflow-tooltip/>
<el-table-column align="center" label="地址" prop="address" show-overflow-tooltip/> <el-table-column align="center" label="地址" prop="address" show-overflow-tooltip/>

16
vue/full/src/view/admin/userCenter/component/UserAction.vue
Unescape View File

@ -2,7 +2,9 @@
<div v-loading="config.loading"> <div v-loading="config.loading">
<abstract-table :data="tableData" :highlight-current-row="false"> <abstract-table :data="tableData" :highlight-current-row="false">
<el-table-column align="center" label="#" type="index" width="60"> <el-table-column align="center" label="#" type="index" width="60">
<el-button icon="el-icon-refresh-right" slot="header" style="padding: 0" type="text" @click="search"/> <template v-slot:header>
<el-button icon="el-icon-refresh-right" style="padding: 0" type="text" @click="search"/>
</template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="ip" prop="ip" show-overflow-tooltip/> <el-table-column align="center" label="ip" prop="ip" show-overflow-tooltip/>
<el-table-column align="center" label="操作" prop="action" show-overflow-tooltip/> <el-table-column align="center" label="操作" prop="action" show-overflow-tooltip/>
@ -12,11 +14,13 @@
<el-table-column align="center" label="状态" width="80"> <el-table-column align="center" label="状态" width="80">
<template v-slot="{row}"> <template v-slot="{row}">
<el-tooltip :disabled="row.success" placement="left"> <el-tooltip :disabled="row.success" placement="left">
<div slot="content" style="max-width: 60vw"> <template v-slot:content>
<el-scrollbar wrap-class="el-select-dropdown__wrap"> <div style="max-width: 60vw">
<p>{{ row.error }}</p> <el-scrollbar wrap-class="el-select-dropdown__wrap">
</el-scrollbar> <p>{{ row.error }}</p>
</div> </el-scrollbar>
</div>
</template>
<el-tag :type="row.success ? 'success' : 'danger'" size="small" effect="dark"> <el-tag :type="row.success ? 'success' : 'danger'" size="small" effect="dark">
{{ row.success ? '成功' : '失败' }} {{ row.success ? '成功' : '失败' }}
</el-tag> </el-tag>

4
vue/full/src/view/admin/userCenter/indexPage.vue
Unescape View File

@ -8,12 +8,12 @@
<el-card> <el-card>
<el-tabs v-model="activeTab" stretch> <el-tabs v-model="activeTab" stretch>
<el-tab-pane v-for="i in tabs" v-once :key="i.label" :name="i.name"> <el-tab-pane v-for="i in tabs" v-once :key="i.label" :name="i.name">
<span slot="label"> <template v-slot:label>
{{ i.label }} {{ i.label }}
<el-tooltip :content="i.intro" placement="top"> <el-tooltip :content="i.intro" placement="top">
<i v-if="i.intro" class="el-icon-question" style="color: #4AB7BD"/> <i v-if="i.intro" class="el-icon-question" style="color: #4AB7BD"/>
</el-tooltip> </el-tooltip>
</span> </template>
</el-tab-pane> </el-tab-pane>
<transition mode="out-in" name="el-fade-in-linear"> <transition mode="out-in" name="el-fade-in-linear">

Write Preview
Loading…
Cancel
Save