meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://123.56.95.229:10010/r/高精

Browse Source
This commit is contained in:
sujiaqi
2020-02-08 21:28:16 +08:00
parent 6544fe4823 47e25ccf26
commit 30e041c70f
68 changed files with 967 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue
View File

@@ -118,7 +118,7 @@
<h4 style="margin: 0px;display: inline-block;width: 150px;">发票结算申请单明细</h4>
<span>发票号：</span>
<el-input v-model="invoiceNumber" size="small" placeholder="请选择发票结算申请单" readonly style="margin: 5px 0 5px 0"/>
<el-table :data="tableData2" border stripe highlight-current-row style="width: 100%;max-height: 250px;" height="250px" size="mini">
<el-table :data="tableData2" border highlight-current-row style="width: 100%;max-height: 250px;" height="250px" size="mini">
<el-table-column label="名称" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.采购物料名称 || scope.row.离线物料名称 || scope.row.采购零件名称 }}

26
src/views/PurchasingCenter/MaterialManagement/index.vue
View File

@@ -115,22 +115,23 @@
</el-col>
<el-col style="width: 600px">
<el-button
type="success"
type="primary"
icon="el-icon-search"
size="small"
style="margin-left: 10px"
plain
@click="pageCurrent=1;searchMaterial()">查询
</el-button>
<el-button :disabled="token !== 11 && token !== 36" type="primary" style="margin-bottom: 3px;margin-top: 10px" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd()">新增</el-button>
<el-button :disabled="token !== 11 && token !== 36" class="button111" style="margin-bottom: 3px;margin-top: 10px" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd()">新增</el-button>
<el-button
:disabled="token !== 11 && token !== 36"
type="warning"
class="button111"
icon="el-icon-refresh"
size="small"
style="margin:10px 5px 3px"
@click="CategoryMaintenance">维护物料类别
</el-button>
<el-button type="primary" style="margin-bottom: 3px;margin-top: 10px" icon="el-icon-circle-plus-outline" size="small" @click="open()">新增供货商</el-button>
<el-button class="button111" style="margin-bottom: 3px;margin-top: 10px" icon="el-icon-circle-plus-outline" size="small" @click="open()">新增供货商</el-button>
<el-badge :value="weishenhe" class="item">
<el-button type="primary" plain size="small" @click="daishenhe()">采购部新增物料审核</el-button>
</el-badge>
@@ -1024,3 +1025,20 @@ export default {
width:190px
}
</style>
<style lang="scss">
.button111{
background:rgb(253,246,236);
border-color: #ff9759;
color: #ff9759;
&:hover{
background: #ff9759;
border-color: #ff9759;
color: white;
}
&:focus{
background: #ff9759;
border-color: #ff9759;
color: white;
}
}
</style>

6
src/views/PurchasingCenter/PurchaseMaterielModify/index.vue
View File

@@ -47,12 +47,14 @@
<template slot-scope="scope">
<el-button
size="mini"
type="primary"
type="text"
class="el-icon-edit"
icon="el-icon-circle-check"
@click="handleEdit1(scope.$index, scope.row)">同意</el-button>
<el-button
size="mini"
type="danger"
type="text"
icon="el-icon-circle-close"
class="el-icon-edit"
@click="handleEdit2(scope.$index, scope.row)">不同意</el-button>
</template>