Commit 589b7e29 authored by 周远喜's avatar 周远喜

按钮样式统一处理

parent 8de5e800
......@@ -2,7 +2,7 @@
<div>
<div style="display:inline-flex;">
<Input search enter-button placeholder="订单编号、产品编码..." @on-search="easySearch" v-model="value" />&nbsp;&nbsp;
<Button @click="open" type="success">高级搜索</Button>
<Button @click="open" type="text"><Icon type="md-search" />高级</Button>
<!-- <Input v-model="value" placeholder="关键字" style="width:300px;" :clearable='true'>
<Button @click="easySearch" icon="ios-search-outline" slot="append" style="width:40px;background-color:#249E91;color:#FFF;"></Button>
</Input> -->
......@@ -20,7 +20,7 @@
<div slot="footer" >
<Button @click="close" style="margin-left:20px;">取消</Button>
<!-- <Button @click="formReset" style="margin-left:20px;">重置</Button> -->
<Button @click="complexSearch" type="success" style="margin-left:10px;">查询</Button>
<Button @click="complexSearch" type="primary" style="margin-left:10px;">查询</Button>
<!-- <Checkbox v-model="saveLog" label="保存此次搜索" style="margin-left:20px;">保存此次搜索</Checkbox> -->
</div>
</Modal>
......
......@@ -69,7 +69,7 @@
<slot name="searchForm"></slot>
<div slot="footer">
<Button @click="modalSearch=false" style="margin-left:20px;">取消</Button>
<Button @click="complexSearch" type="success" style="margin-left:10px;">查询</Button>
<Button @click="complexSearch" type="primary" style="margin-left:10px;">查询</Button>
</div>
</Modal>
<Drawer
......
......@@ -77,7 +77,7 @@
<slot name="searchForm"></slot>
<div slot="footer">
<Button @click="modalSearch=false" style="margin-left:20px;">取消</Button>
<Button @click="complexSearch" type="success" style="margin-left:10px;">查询</Button>
<Button @click="complexSearch" type="primary" style="margin-left:10px;">查询</Button>
</div>
</Modal>
<Drawer
......
<template>
<div>
<Auth :authority="['admin']" :access="['admin']">
<Alert type="success">通过</Alert>
<Alert type="primary">通过</Alert>
<Alert type="error" slot="noMatch">不通过</Alert>
</Auth>
<Auth :authority="true" :access="['admin']">
<Alert type="success">通过</Alert>
<Alert type="primary">通过</Alert>
<Alert type="error" slot="noMatch">不通过</Alert>
</Auth>
<Auth :authority="func" :access="['admin']">
<Alert type="success">通过</Alert>
<Alert type="primary">通过</Alert>
<Alert type="error" slot="noMatch">不通过</Alert>
</Auth>
<Auth :authority="['admin']" access="admin">
<Alert type="success">通过</Alert>
<Alert type="primary">通过</Alert>
<Alert type="error" slot="noMatch">不通过</Alert>
</Auth>
<Auth :authority="['admin']" access="admin" to="/city">
<Alert type="success">通过</Alert>
<Alert type="primary">通过</Alert>
<Alert type="error" slot="noMatch">不通过</Alert>
</Auth>
<Divider>prevent 模式</Divider>
......
......@@ -7,7 +7,7 @@
</div>
<div class="page-account-top-desc">iView Admin Pro 企业级中台前端/设计解决方案</div>
</div>
<Result type="success" :title="title" :desc="desc">
<Result type="primary" :title="title" :desc="desc">
<div slot="actions">
<Button size="large" type="primary" to="https://mail.qq.com" target="_blank">查看邮箱</Button>
<Button size="large" to="/">返回首页</Button>
......
......@@ -112,7 +112,7 @@
</Col>
</Row>
<FooterToolbar style="height:65px" v-show="showOperate&&footerToolbar">
<Button class="span ml20" type="success" @click="openDrawer">设置</Button>
<Button class="span ml20" type="primary" @click="openDrawer">设置</Button>
<Button @click="footerToolbar=false">取消</Button>
</FooterToolbar>
<Drawer title="排产设置盘" v-model="facilityModal" width="820" class="drawer_box">
......
......@@ -21,7 +21,7 @@
<!-- <div slot="footer" style="text-align:center">
<Button type="primary" @click="ok('formValidate')">保存</Button>
<Button
type="success"
type="primary"
style="border-color: rgb(204, 204, 204);background-color:white;color:black"
@click="cancel"
>取消</Button>
......
......@@ -56,7 +56,7 @@
<!-- <div slot="footer" style="text-align:center">
<Button type="primary" @click="ok('formValidate')">保存</Button>
<Button
type="success"
type="primary"
style="border-color: rgb(204, 204, 204);background-color:white;color:black"
@click="cancel"
>取消</Button>
......
......@@ -56,7 +56,7 @@
<!-- <div slot="footer" style="text-align:center">
<Button type="primary" @click="ok1('formValidate')">保存</Button>
<Button
type="success"
type="primary"
style="border-color: rgb(204, 204, 204);background-color:white;color:black"
@click="cancel1"
>取消</Button>
......
......@@ -27,7 +27,7 @@
</Input>
</div>
<Button slot="preappend" @click="openAddModal" type="success" style="float:right;">新增用户</Button>
<Button slot="preappend" @click="openAddModal" type="primary" style="float:right;">新增用户</Button>
</div>
<!-- 表格 -->
<div class="margin-top-10">
......
......@@ -3,7 +3,7 @@
<div class="new_box">
<div >
<Button v-if="isedit" style=" margin-left:10px" type="success" @click="handleAdd">添加</Button>
<Button v-if="isedit" style=" margin-left:10px" type="primary" @click="handleAdd">添加</Button>
<Table class="tableCommon" stripe ref="table" border :columns="moviecolumn" :data="moviedata">
<template slot-scope="{ row, index }" slot="data_content1">
......
......@@ -53,7 +53,7 @@
<slot name="searchForm"></slot>
<div slot="footer">
<Button @click="modalSearch=false" style="margin-left:20px;">取消</Button>
<Button @click="complexSearch" type="success" style="margin-left:10px;">查询</Button>
<Button @click="complexSearch" type="primary" style="margin-left:10px;">查询</Button>
</div>
</Modal>
<Drawer
......
......@@ -50,7 +50,7 @@
<slot name="searchForm"></slot>
<div slot="footer">
<Button @click="modalSearch=false" style="margin-left:20px;">取消</Button>
<Button @click="complexSearch" type="success" style="margin-left:10px;">查询</Button>
<Button @click="complexSearch" type="primary" style="margin-left:10px;">查询</Button>
</div>
</Modal>
<Drawer
......
......@@ -10,7 +10,7 @@
>
<div style="text-align:right">
<Button
type="success"
type="primary"
@click="$u.outPdf('.outPdf',resultDetils.length>0?resultDetils[0].code:'报价单')"
>导出pdf</Button>
</div>
......
......@@ -10,7 +10,7 @@
>
<div style="text-align:right">
<Button
type="success"
type="primary"
@click="$u.outPdf('.outPdf',resultDetils.length>0?resultDetils[0].code:'报价单')"
>导出pdf</Button>
</div>
......
......@@ -79,7 +79,7 @@
</Row>
</Form>
<div slot="footer">
<Button @click="complexSearch" style="margin-left:10px;" type="success">搜索</Button>
<Button @click="complexSearch" style="margin-left:10px;" type="primary">搜索</Button>
<Button @click="close" style="margin-left:20px;">取消</Button>
</div>
</Modal>
......
......@@ -19,7 +19,7 @@
@on-search="easySearch(mesCode)"
style="width:235px;flaot:left;"
/>
<Button @click="advancedSearch" type="success" style="margin-left:8px;">高级搜索</Button>
<Button @click="advancedSearch" type="primary" style="margin-left:8px;">高级搜索</Button>
</Col>
<Col span="12" style=" text-align: right;">
<Button type="primary" @click="orderQuotation">订单报价</Button>
......
......@@ -30,13 +30,13 @@
<Button type="primary" class="title_btn" @click="searchModel">高级查询</Button>
</div>
</div>
<Button @click="mainChange" type="success">创建主工艺</Button>
<Button @click="specialtyChange" type="success">创建专业工艺</Button>
<Button @click="testechart" type="success">创建临时工艺</Button>
<Button @click="TechnologyChange" type="success">工艺更改</Button>
<Button @click="editFun" v-show="isshowedit" type="success">编辑</Button>
<Button @click="deleteFun" v-show="isshowdel" type="success">删除</Button>
<Button @click="sendAuditFun" v-show="isshowedit" type="success">送审</Button>
<Button @click="mainChange" type="primary">创建主工艺</Button>
<Button @click="specialtyChange" type="primary">创建专业工艺</Button>
<Button @click="testechart" type="primary">创建临时工艺</Button>
<Button @click="TechnologyChange" type="primary">工艺更改</Button>
<Button @click="editFun" v-show="isshowedit" type="primary">编辑</Button>
<Button @click="deleteFun" v-show="isshowdel" type="primary">删除</Button>
<Button @click="sendAuditFun" v-show="isshowedit" type="primary">送审</Button>
</div>
<!-- 表格区域 :height="tbHeight"-->
<div class="table">
......@@ -188,7 +188,7 @@
</Form>
<div slot="footer">
<Button @click="searchclose" style="margin-left:20px;">取消</Button>
<Button @click="gjSearch" type="success" style="margin-left:10px;">查询</Button>
<Button @click="gjSearch" type="primary" style="margin-left:10px;">查询</Button>
</div>
</Modal>
<!-- 工艺更改弹框 -->
......
......@@ -2,7 +2,7 @@
<template>
<div class="new_box">
<div class="topTitle">
<Button v-if="!isview" @click="openNew" type="success">新增工序</Button>
<Button v-if="!isview" @click="openNew" type="primary">新增工序</Button>
</div>
<Table stripe ref="table" border :columns="column2" :data="data2" class="tableCommon"></Table>
<!-- 新增/编辑 工序弹框 -->
......
......@@ -2,7 +2,7 @@
<template>
<div>
<div class="out">
<Button class="fr" v-if="isoutpdf" type="success" @click="$u.outPdf('.outP','工艺规程')">导出pdf</Button>
<Button class="fr" v-if="isoutpdf" type="primary" @click="$u.outPdf('.outP','工艺规程')">导出pdf</Button>
</div>
<div class="outP">
<div class="iviewimg">
......
......@@ -13,7 +13,7 @@
<div class="inventory_box">
<h4>
产品类
<Button v-if="!isview" style=" margin-left:10px" type="success" @click="handleAdd01">添加</Button>
<Button v-if="!isview" style=" margin-left:10px" type="primary" @click="handleAdd01">添加</Button>
</h4>
<Table class="table_inventory01" border :columns="columns01" :data="data01">
......@@ -46,7 +46,7 @@
</Table>
<h4>
随炉旁证件/验证件类
<Button v-if="!isview" style=" margin-left:10px" type="success" @click="handleAdd02">添加</Button>
<Button v-if="!isview" style=" margin-left:10px" type="primary" @click="handleAdd02">添加</Button>
</h4>
<Table class="table_inventory01" border :columns="columns02" :data="data02">
<template slot-scope="{ row, index }" slot="name">
......@@ -78,7 +78,7 @@
</Table>
<h4>
随炉试棒/试片/试块类
<Button v-if="!isview" style=" margin-left:10px" type="success" @click="handleAdd03">添加</Button>
<Button v-if="!isview" style=" margin-left:10px" type="primary" @click="handleAdd03">添加</Button>
</h4>
<Table class="table_inventory01" border :columns="columns03" :data="data03">
<template slot-scope="{ row, index }" slot="name">
......
......@@ -21,7 +21,7 @@
<div class="inventory_box">
<h4>
产品实物类
<Button v-if="!isview" style=" margin-left:10px" type="success" @click="handleAdd01">添加</Button>
<Button v-if="!isview" style=" margin-left:10px" type="primary" @click="handleAdd01">添加</Button>
</h4>
<Table class="table_inventory01" border :columns="columns01" :data="data01">
......@@ -54,7 +54,7 @@
</Table>
<h4>
纸质文件类
<Button v-if="!isview" style=" margin-left:10px" type="success" @click="handleAdd02">添加</Button>
<Button v-if="!isview" style=" margin-left:10px" type="primary" @click="handleAdd02">添加</Button>
</h4>
<Table class="table_inventory01" border :columns="columns02" :data="data02">
<template slot-scope="{ row, index }" slot="name">
......@@ -86,7 +86,7 @@
</Table>
<h4>
电子文件类(光盘/U盘)
<Button v-if="!isview" style=" margin-left:10px" type="success" @click="handleAdd03">添加</Button>
<Button v-if="!isview" style=" margin-left:10px" type="primary" @click="handleAdd03">添加</Button>
</h4>
<Table class="table_inventory01" border :columns="columns03" :data="data03">
<template slot-scope="{ row, index }" slot="name">
......
......@@ -2,7 +2,7 @@
<template>
<div class="new_box">
<div class="topTitle">
<Button v-if="!isview" type="success" @click="openNew">新增</Button>
<Button v-if="!isview" type="primary" @click="openNew">新增</Button>
</div>
<Table stripe border :columns="column01" :data="data01" class="tableCommon">
<template slot-scope="{ row, index }" slot="step_seq">
......
......@@ -2,7 +2,7 @@
<template>
<div class="new_box">
<div class="topTitle">
<Button v-if="!isview" type="success" @click="openNew">新增</Button>
<Button v-if="!isview" type="primary" @click="openNew">新增</Button>
</div>
<Table stripe ref="table" border :columns="column1" :data="data1" class="tableCommon"></Table>
......
......@@ -3,7 +3,7 @@
<slot name="confimcon"><p>此操作将永久删除该文件, 是否继续?</p></slot>
<div slot="footer" style="">
<Button
type="success"
type="primary"
style="border-color: rgb(204, 204, 204);background-color:white;color:black"
@click="confirmcancel"
>取消</Button>
......
......@@ -20,7 +20,7 @@
<!-- <div slot="footer" style="text-align:center">
<Button type="primary" @click="ok0('ProcuctformValidate')">保存</Button>
<Button
type="success"
type="primary"
style="border-color: rgb(204, 204, 204);background-color:white;color:black"
@click="cancel0"
>取消</Button>
......@@ -44,7 +44,7 @@
<!-- <div slot="footer" style="text-align:center">
<Button type="primary" @click="ok('formValidate')">保存</Button>
<Button
type="success"
type="primary"
style="border-color: rgb(204, 204, 204);background-color:white;color:black"
@click="cancel"
>取消</Button>
......
......@@ -44,8 +44,8 @@
</div>
<div class="fr">
<Button type="primary">外协要求</Button>
<Button @click="specialtyProcess" v-if="this.tabstatus=='2'" type="success">创建专业工艺</Button>
<Button @click="creatematerialbill" v-if="this.tabstatus=='2'" type="success">创建料单</Button>
<Button @click="specialtyProcess" v-if="this.tabstatus=='2'" type="primary">创建专业工艺</Button>
<Button @click="creatematerialbill" v-if="this.tabstatus=='2'" type="primary">创建料单</Button>
<Button type="primary" @click="deleted">浏览详情</Button>
<div @click="drawerShow=true" class="divIco">
<Icon type="ios-list" class="icoListInfo" />
......@@ -212,7 +212,7 @@
</Form>
<div slot="footer">
<Button @click="close" style="margin-left:20px;">取消</Button>
<Button @click="search" type="success" style="margin-left:10px;">查询</Button>
<Button @click="search" type="primary" style="margin-left:10px;">查询</Button>
</div>
</Modal>
......
......@@ -30,12 +30,12 @@
<Button type="primary" class="title_btn" @click="searchModel">高级查询</Button>
</div>
</div>
<Button @click="mainChange" type="success">工艺创建</Button>
<Button @click="mainChange" type="primary">工艺创建</Button>
<Button @click="TechnologyChange" type="success">工艺更改</Button>
<Button @click="editFun" v-show="isshowedit" type="success">工艺编辑</Button>
<Button @click="deleteFun" v-show="isshowdel" type="success">工艺删除</Button>
<Button @click="sendAuditFun" v-show="isshowedit" type="success">工艺送审</Button>
<Button @click="TechnologyChange" type="primary">工艺更改</Button>
<Button @click="editFun" v-show="isshowedit" type="primary">工艺编辑</Button>
<Button @click="deleteFun" v-show="isshowdel" type="primary">工艺删除</Button>
<Button @click="sendAuditFun" v-show="isshowedit" type="primary">工艺送审</Button>
</div>
<!-- 表格区域 :height="tbHeight"-->
<div class="table">
......@@ -184,7 +184,7 @@
</Form>
<div slot="footer">
<Button @click="searchclose" style="margin-left:20px;">取消</Button>
<Button @click="gjSearch" type="success" style="margin-left:10px;">查询</Button>
<Button @click="gjSearch" type="primary" style="margin-left:10px;">查询</Button>
</div>
</Modal>
<!-- 工艺更改弹框 -->
......
......@@ -2,7 +2,7 @@
<template>
<div class="new_box">
<div class="topTitle">
<Button v-if="!isview" @click="openNew" type="success">新增工序</Button>
<Button v-if="!isview" @click="openNew" type="primary">新增工序</Button>
</div>
<Table stripe ref="table" border :columns="column2" :data="data2" class="tableCommon">
<template slot-scope="{ row,index }" slot="is_important">
......
......@@ -3,7 +3,7 @@
<div>
<div class="out">
<Row class="table_row" style="width:100%">
<Button class="fr" v-if="isoutpdf" type="success" @click="$u.outPdf('.outP','工艺规程')">导出pdf</Button>
<Button class="fr" v-if="isoutpdf" type="primary" @click="$u.outPdf('.outP','工艺规程')">导出pdf</Button>
</Row>
</div>
<div class="outP">
......
......@@ -2,7 +2,7 @@
<template>
<div class="new_box">
<div class="topTitle">
<Button v-if="!isview" type="success" @click="openNew">新增</Button>
<Button v-if="!isview" type="primary" @click="openNew">新增</Button>
</div>
<Table stripe border :columns="column01" :data="data01" class="tableCommon">
<template slot-scope="{ row, index }" slot="step_seq">
......
......@@ -2,7 +2,7 @@
<template>
<div class="new_box">
<div class="topTitle">
<Button v-if="!isview" type="success" @click="openNew">新增</Button>
<Button v-if="!isview" type="primary" @click="openNew">新增</Button>
</div>
<Table stripe ref="table" border :columns="column1" :data="data1" class="tableCommon">
......
......@@ -2,7 +2,7 @@
<template>
<div class="new_box">
<div class="topTitle">
<Button v-if="!isview" type="success" @click="openNew">新增</Button>
<Button v-if="!isview" type="primary" @click="openNew">新增</Button>
</div>
<Table stripe ref="table" border :columns="column1" :data="data1" class="tableCommon"></Table>
......
......@@ -200,7 +200,7 @@
</Form>
<div slot="footer">
<Button @click="close" style="margin-left:20px;">取消</Button>
<Button @click="easySearch" type="success" style="margin-left:10px;">查询</Button>
<Button @click="easySearch" type="primary" style="margin-left:10px;">查询</Button>
</div>
</Modal>
......
......@@ -167,7 +167,7 @@
</Form>
<div slot="footer">
<Button @click="close" style="margin-left:20px;">取消</Button>
<Button @click="complexSearch" type="success" style="margin-left:10px;">查询</Button>
<Button @click="complexSearch" type="primary" style="margin-left:10px;">查询</Button>
</div>
</Modal>
<!-- 配套确认弹框-材料消耗单 -->
......
......@@ -171,7 +171,7 @@
</Form>
<div slot="footer">
<Button @click="close" style="margin-left:20px;">取消</Button>
<Button @click="complexSearch" type="success" style="margin-left:10px;">查询</Button>
<Button @click="complexSearch" type="primary" style="margin-left:10px;">查询</Button>
</div>
</Modal>
<!-- 配套确认弹框-材料消耗单 -->
......
......@@ -175,7 +175,7 @@
</Form>
<div slot="footer" >
<Button @click="close" style="margin-left:20px;">取消</Button>
<Button @click="complexSearch" type="success" style="margin-left:10px;">查询</Button>
<Button @click="complexSearch" type="primary" style="margin-left:10px;">查询</Button>
</div>
</Modal>
<!-- 配套确认弹框-材料消耗单 -->
......
......@@ -192,7 +192,7 @@
</Form>
<div slot="footer" >
<Button @click="close" style="margin-left:20px;">取消</Button>
<Button @click="complexSearch" type="success" class="ml10">查询</Button>
<Button @click="complexSearch" type="primary" class="ml10">查询</Button>
</div>
</Modal>
<!-- 数据包追溯 -->
......@@ -200,7 +200,7 @@
<reviewCount ref='reviewCount' :basicData="itemData" :actValue="actValue"/>
<div slot="footer" >
<!-- <Button @click="close" style="margin-left:20px;">取消</Button> -->
<Button @click="reviewOk" type="success" style="margin-left:10px;">确定</Button>
<Button @click="reviewOk" type="primary" style="margin-left:10px;">确定</Button>
</div>
</Modal>
</div>
......
......@@ -175,7 +175,7 @@
</Form>
<div slot="footer" >
<Button @click="close" style="margin-left:20px;">取消</Button>
<Button @click="complexSearch" type="success" style="margin-left:10px;">查询</Button>
<Button @click="complexSearch" type="primary" style="margin-left:10px;">查询</Button>
</div>
</Modal>
<!-- 配套确认弹框-材料消耗单 -->
......
......@@ -64,7 +64,7 @@
<div slot="footer">
<!-- class="footers" -->
<Button @click="close">取消</Button>
<Button @click="saveOk" type="success">保存</Button>
<Button @click="saveOk" type="primary">保存</Button>
</div>
</Modal>
<Department
......
......@@ -20,7 +20,7 @@
style="width:235px;flaot:left;"
/>
<Button type="primary" class="" @click="easySearch">查询</Button>
<!-- <Button @click="advancedSearch" type="success" style="margin-left:8px;">高级搜索</Button> -->
<!-- <Button @click="advancedSearch" type="primary" style="margin-left:8px;">高级搜索</Button> -->
</Col>
<Col span="12" style=" text-align: right;">
<Button type="primary" @click="newEquipment">新增设备</Button>
......
......@@ -30,7 +30,7 @@
</FormItem>
</Col>
<Col span="4">
<Button class="add_btn" type="success" @click="addItem">新增</Button>
<Button class="add_btn" type="primary" @click="addItem">新增</Button>
</Col>
</Row>
<Row class="top_line">
......@@ -220,7 +220,7 @@
<Cascader :data="kuweiData" placeholder="请选择库位" ></Cascader>
</Col>
<Col span="6" >
<Button class="add_btn" type="success" @click="addItem">新增</Button>
<Button class="add_btn" type="primary" @click="addItem">新增</Button>
</Col>
</Row>
<Row class="mt20">
......
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