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

更新

Browse Source
This commit is contained in:
liushuai
2020-02-25 13:38:25 +08:00
parent 159a289ca3
commit f26e3ec4ac
12 changed files with 533 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,13 +2,13 @@
<div class="app-container">
<el-card>
<el-row>
<el-col style="width: 280px;margin-top: 3px">
<span>物料类别:</span>
<el-col style="margin-top: 3px;width: 150px;margin-left: 10px">
<el-select
v-model="MaterialCategoryValue"
placeholder="请选择"
placeholder="物料类别"
size="small"
clearable
style="width: 140px"
@change="searchMaterialVariety">
<el-option
v-for="item in MaterialCategory"
@@ -17,13 +17,13 @@
:value="item.value"/>
</el-select>
</el-col>
<el-col style="width: 280px;margin-top: 3px">
<span>物料品种:</span>
<el-col style="margin-top: 3px;width: 150px;margin-left: 10px">
<el-select
v-model="MaterialVarietyValue"
placeholder="请选择"
placeholder="物料品种"
size="small"
clearable
style="width: 140px"
@change="searchMaterial">
<el-option
v-for="item in MaterialVariety"
@@ -32,55 +32,55 @@
:value="item.value"/>
</el-select>
</el-col>
<el-col style="width: 280px;margin-top: 3px">
<span>物料名称:</span>
<el-input v-model="MaterialName" placeholder="物料名称" size="small" clearable />
<el-col style="margin-top: 3px;width: 180px;margin-left: 10px">
<el-input v-model="MaterialName" placeholder="物料名称" size="small" clearable style="width: 170px"/>
</el-col>
<el-col style="width: 280px;margin-top: 3px">
<span>物料全称:</span>
<el-col style="margin-top: 3px;width: 180px;margin-left: 10px">
<el-input
v-model="FullNameOfMaterial"
placeholder="物料全称"
size="small"
clearable/>
clearable
style="width: 170px"/>
</el-col>
<el-col style="width: 280px;margin-top: 3px">
<span>物料规格:</span>
<el-col style="margin-top: 3px;width: 200px;margin-left: 10px">
<el-input
v-model="MaterialSpecification"
placeholder="物料规格"
size="small"
clearable/>
clearable
style="width: 190px"/>
</el-col>
<el-col style="width: 280px;margin-top: 3px">
<span>物料型号:</span>
<el-col style="margin-top: 3px;width: 200px;margin-left: 10px">
<el-input
v-model="MaterialModel"
placeholder="物料型号"
size="small"
clearable/>
clearable
style="width: 190px"/>
</el-col>
<el-col style="width: 280px">
<span>计算单位:</span>
<el-select
v-model="MeasurementUnitValue"
placeholder="请选择"
style="margin-bottom: 3px;margin-top: 10px"
size="small"
clearable>
<el-option
v-for="item in MeasurementUnit"
:key="item.value"
:label="item.label"
:value="item.value"/>
</el-select>
</el-col>
<el-col style="width: 280px">
<span>物料来源:</span>
</el-row>
<!--<el-col style="width: 280px">-->
<!--<span>计算单位:</span>-->
<!--<el-select-->
<!--v-model="MeasurementUnitValue"-->
<!--placeholder="请选择"-->
<!--style="margin-bottom: 3px;margin-top: 10px"-->
<!--size="small"-->
<!--clearable>-->
<!--<el-option-->
<!--v-for="item in MeasurementUnit"-->
<!--:key="item.value"-->
<!--:label="item.label"-->
<!--:value="item.value"/>-->
<!--</el-select>-->
<!--</el-col>-->
<el-row>
<el-col style="width: 150px;margin-left: 10px">
<el-select
v-model="MaterialSourceValue"
placeholder="请选择"
style="margin-bottom: 3px;margin-top: 10px"
placeholder="物料来源"
style="margin-bottom: 3px;margin-top: 10px;width: 140px"
size="small"
clearable>
<el-option
@@ -90,13 +90,12 @@
:value="item.value"/>
</el-select>
</el-col>
<el-col style="width: 280px">
<span style="margin-left: 25px">供货商:</span>
<el-col style="width: 150px;margin-left: 10px">
<el-select
v-model="GonghuoshangValue"
placeholder="请选择"
placeholder="供货商"
filterable
style="margin-bottom: 3px;margin-top: 10px"
style="margin-bottom: 3px;margin-top: 10px;width: 140px"
size="small"
clearable>
<el-option
@@ -113,27 +112,26 @@
<!--clearable-->
<!--@dblclick.native="param=0;openSupplier()"/>-->
</el-col>
<el-col style="width: 600px">
<el-col style="margin-left: 10px;width: 550px">
<el-button
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="distribution" style="margin-bottom: 3px;margin-top: 10px" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd()">新增</el-button>
<el-button :disabled="parseInt(token) !== 11 && parseInt(token) !== 36" type="distribution" 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"
:disabled="parseInt(token) !== 11 && parseInt(token) !== 36"
type="distribution"
icon="el-icon-refresh"
size="small"
style="margin:10px 5px 3px"
style="margin-left: 10px"
@click="CategoryMaintenance">维护物料类别
</el-button>
<el-button type="distribution" style="margin-bottom: 3px;margin-top: 10px" icon="el-icon-circle-plus-outline" size="small" @click="open()">新增供货商</el-button>
<el-button type="distribution" 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-button type="primary" plain size="small" style="margin-left: 10px" @click="daishenhe()">采购部新增物料审核</el-button>
</el-badge>
</el-col>
</el-row>
@@ -248,14 +246,14 @@
</div>
</el-dialog>
<el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="800px">
<el-dialog v-el-drag-dialog :title="title" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="680px">
<el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
<el-row>
<el-col :span="12">
<el-form-item label="物料类别" prop="物料类别流水号">
<el-select
v-model="form.物料类别流水号"
style="width:200px"
style="width:160px"
placeholder="请选择"
size="small"
clearable
@@ -270,7 +268,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="物料品种" prop="物料品种流水号">
<el-select v-model="form.物料品种流水号" style="width:200px" placeholder="请选择" size="small" clearable>
<el-select v-model="form.物料品种流水号" style="width:160px" placeholder="请选择" size="small" clearable>
<el-option
v-for="item in MaterialVariety1"
:key="item.value"
@@ -283,31 +281,31 @@
<el-row>
<el-col :span="12">
<el-form-item label="物料名称" prop="物料名称">
<el-input v-model="form.物料名称" placeholder="物料名称" size="small" clearable style="width:200px"/>
<el-input v-model="form.物料名称" placeholder="物料名称" size="small" clearable style="width:160px"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="物料全名" prop="物料全名">
<el-input v-model="form.物料全名" placeholder="物料全名" size="small" clearable style="width:200px"/>
<el-input v-model="form.物料全名" placeholder="物料全名" size="small" clearable style="width:160px"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="物料规格" prop="物料规格">
<el-input v-model="form.物料规格" placeholder="物料规格" size="small" clearable style="width:200px"/>
<el-input v-model="form.物料规格" placeholder="物料规格" size="small" clearable style="width:160px"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="物料型号" prop="物料型号">
<el-input v-model="form.物料型号" placeholder="物料型号" size="small" clearable style="width:200px"/>
<el-input v-model="form.物料型号" placeholder="物料型号" size="small" clearable style="width:160px"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="计量单位" prop="计量单位流水号">
<el-select v-model="form.计量单位流水号" style="width:200px" placeholder="请选择" size="small">
<el-select v-model="form.计量单位流水号" style="width:160px" placeholder="请选择" size="small">
<el-option
v-for="item in MeasurementUnit"
:key="item.value"
@@ -318,7 +316,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="物料来源" prop="物料来源流水号">
<el-select v-model="form.物料来源流水号" style="width:200px" placeholder="请选择" size="small">
<el-select v-model="form.物料来源流水号" style="width:160px" placeholder="请选择" size="small">
<el-option
v-for="item in MaterialSource"
:key="item.value"
@@ -335,7 +333,7 @@
v-model="form.GonghuoshangValue"
placeholder="请选择"
filterable
style="width:200px"
style="width:160px"
size="small"
clearable>
<el-option
@@ -374,8 +372,8 @@
<el-input v-model="MaterialCategory2" placeholder="物料类别" size="mini" clearable style="width:100px"/>
<span>类别编号:</span>
<el-input v-model="CategoryNumber" placeholder="类别编号" size="mini" clearable style="width:100px"/>
<el-button type="primary" size="mini" style="margin-left: 10px" @click="handleAdd1">增加</el-button>
<el-button type="warning" size="mini" @click="handleEdit1">编辑</el-button>
<el-button type="distribution" plain size="mini" icon="el-icon-circle-plus-outline" style="margin-left: 10px" @click="handleAdd1">新增</el-button>
<el-button type="warning" plain size="mini" icon="el-icon-edit" @click="handleEdit1">编辑</el-button>
<br>
</el-card>
<el-card>
@@ -405,7 +403,8 @@
<template slot-scope="scope">
<el-button
size="mini"
type="danger"
icon="el-icon-delete"
type="text"
@click="handleDelete1(scope.row)">删除
</el-button>
</template>
@@ -422,10 +421,10 @@
<span>规格1:</span>
<el-input v-model="Specifications1" placeholder="规格1" size="mini" clearable style="width:100px"/>
<br>
<span style="margin-left: 30px">规格2:</span>
<span style="margin-left: 20px">规格2:</span>
<el-input v-model="Specifications2" placeholder="规格2" size="mini" clearable style="width:100px"/>
<el-button type="primary" size="mini" style="margin-left: 10px" @click="handleAdd2">增加</el-button>
<el-button type="warning" size="mini" @click="handleEdit2">编辑</el-button>
<el-button type="distribution" plain size="mini" icon="el-icon-circle-plus-outline" style="margin-left: 10px" @click="handleAdd2">新增</el-button>
<el-button type="warning" plain size="mini" icon="el-icon-edit" @click="handleEdit2">编辑</el-button>
</el-card>
<el-card>
<el-table
@@ -459,7 +458,8 @@
<template slot-scope="scope">
<el-button
size="mini"
type="danger"
icon="el-icon-delete"
type="text"
@click="handleDelete2(scope.row)">删除
</el-button>
</template>
@@ -469,12 +469,12 @@
</div>
</el-dialog>
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible3" title="新增供应商" center style="min-height: 300px" width="400px">
<el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible3" title="新增供应商" center style="min-height: 300px" width="350px">
<el-form ref="form3" :model="form3" :rules="rules3" label-position="left" label-width="110px" class="demo-ruleForm">
<el-row>
<el-col :span="12">
<el-form-item label="供货商名称" prop="供货商名称">
<el-input v-model="form3.供货商名称" placeholder="供货商名称" size="small" clearable style="width:200px"/>
<el-input v-model="form3.供货商名称" placeholder="供货商名称" size="small" clearable style="width:150px"/>
</el-form-item>
</el-col>
</el-row>
@@ -1015,14 +1015,24 @@ export default {
</script>
<style scoped>
span {
margin: 10px 0px 10px 10px;
.el-form--label-left >>> .el-form-item__label {
text-align: right;
}
.el-select{
width:190px
>>>.el-dialog--center .el-dialog__body {
text-align: initial;
padding: 10px 20px 0px
}
.el-input{
width:190px
>>>.el-dialog__header {
padding: 20px 20px 0px;
}
>>>.el-dialog__footer {
padding: 0px 20px 20px;
/*text-align: right;*/
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
>>>.el-form-item {
margin-bottom: 13px;
}
</style>

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

@@ -1,7 +1,7 @@
<template>
<div class="app-container">
<el-card>
<el-table :data="tableData1" highlight-current-row height="810" style="width: 100%;" size="mini" border stripe>
<el-table :data="tableData1" :cell-style="changeCellStyle" highlight-current-row height="810" style="width: 100%;" size="mini" border>
<el-table-column label="序号" type="index" align="center" width="50"/>
<el-table-column label="项目名称" align="center" width="200px">
<template slot-scope="scope">
@@ -43,19 +43,17 @@
{{ scope.row.新物料型号 }}
</template>
</el-table-column>
<el-table-column label="是否同意修改" width="200px" align="center" fixed="right">
<el-table-column label="审核" width="200px" align="center" fixed="right">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
class="el-icon-edit"
icon="el-icon-circle-check"
@click="handleEdit1(scope.$index, scope.row)">同意</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-circle-close"
class="el-icon-edit"
@click="handleEdit2(scope.$index, scope.row)">不同意</el-button>
</template>
</el-table-column>
@@ -103,6 +101,15 @@ export default {
this.searchTable()
},
methods: {
changeCellStyle(row, column, rowIndex, columnIndex) {
if (row.column.label === '原物料名称' || row.column.label === '原物料规格' || row.column.label === '原物料型号') {
return 'background-color: #8FF4EA'
} else if (row.column.label === '新物料名称' || row.column.label === '新物料规格' || row.column.label === '新物料型号') {
return 'background-color: #9BD7FC'
} else {
return ''
}
},
searchTable() {
this.loading1 = true
this.tableData1 = []