Skip to content

E
ElectricitySheep
Commit c038abbd authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

修改样式

parent 495a80b5
Hide whitespace changes
Inline Side-by-side
Showing with 206 additions and 93 deletions
src/components/authorize.vue
View file @ c038abbd
......@@ -175,7 +175,7 @@
<li class="menu_item" :class="{'Fchecked':isChecked=='/materialQuery'}" @click="isChecked='/materialQuery',CommonJump('materialQuery')">
<i class="el-icon-menu"></i><span>物料查询</span>
</li>
<li class="menu_item" :class="{'Fchecked':isChecked=='/procurementMaage'}" @click="isChecked='/procurementMaage',CommonJump('procurementMaage')">
<li class="menu_item" :class="{'Fchecked':isChecked=='/procurementMange'}" @click="isChecked='/procurementMange',CommonJump('procurementMange')">
<i class="el-icon-menu"></i><span>采购管理</span>
</li>
<li class="menu_item" :class="{'Fchecked':isChecked=='/Materialwarehouse'}" @click="isChecked='/Materialwarehouse',CommonJump('Materialwarehouse')">
......
src/components/empower/printManage.vue
View file @ c038abbd
......@@ -59,7 +59,7 @@
<div class="printManage" >
<div class="tpEdit_header" >
<div>
<span style="color:rgb(64, 158, 255);cursor:pointer;" @click="CommonJump('procurementMaage')">采购管理</span><span
<span style="color:rgb(64, 158, 255);cursor:pointer;" @click="CommonJump('procurementMange')">采购管理</span><span
style="margin:0 9px;color:#C0C4CC">/</span><span>打印</span>
</div>
<el-button type="primary" size="small" @click="batchprint(1)">批量打印</el-button>
......
src/components/empower/procurementMange.vue
View file @ c038abbd
<style>
.materialQuery .template_comheader {
.procurementMange .template_comheader {
padding: 13px 20px;
border-bottom: 1px solid #EBEEF5;
-webkit-box-sizing: border-box;
......@@ -7,54 +7,54 @@
background: #fff;
}
.materialQuery .template_comheader>div {
.procurementMange .template_comheader>div {
display: flex;
justify-content: space-between;
align-items: center;
flex-direction: row;
}
.materialQuery .temp_content {
.procurementMange .temp_content {
margin-top: 10px;
background: #fff;
padding: 20px;
}
.materialQuery .temp_imgStyle {
.procurementMange .temp_imgStyle {
display: inline-block;
margin-right: 10px;
}
.materialQuery .app-add-cat .el-checkbox-group {
.procurementMange .app-add-cat .el-checkbox-group {
font-size: 14px !important;
}
.materialQuery .app-add-cat .el-checkbox {
.procurementMange .app-add-cat .el-checkbox {
margin-right: 0;
}
.materialQuery .app-add-cat .el-dialog__body {
.procurementMange .app-add-cat .el-dialog__body {
padding: 10px 20px !important;
}
.materialQuery .app-add-cat .tag-box .tag-item {
.procurementMange .app-add-cat .tag-box .tag-item {
margin-right: 5px;
}
.materialQuery .app-add-cat .tag-box {
.procurementMange .app-add-cat .tag-box {
margin: 20px 0;
}
.materialQuery .app-add-cat .app-goods-cat-list .active {
.procurementMange .app-add-cat .app-goods-cat-list .active {
background: #FAFAFA;
}
.materialQuery .app-add-cat .app-goods-cat-list .cat-item {
.procurementMange .app-add-cat .app-goods-cat-list .cat-item {
cursor: pointer;
padding: 5px 10px;
}
.materialQuery .app-add-cat .app-goods-cat-list {
.procurementMange .app-add-cat .app-goods-cat-list {
border: 1px solid #E8EAEE;
border-radius: 5px;
margin-top: -5px;
......@@ -63,55 +63,62 @@
height: 400px;
}
.materialQuery .el-table td,
.procurementMange .el-table td,
.el-table th {
padding: 5px 0;
font-size: 14px;
}
.materialQuery .el-form-item {
.procurementMange .el-form-item {
margin-bottom: 15px;
}
.materialQuery .flDig_choose {
.procurementMange .flDig_choose {
display: flex;
flex-direction: row;
align-items: center;
}
.materialQuery .flDig_choose_item {
.procurementMange .flDig_choose_item {
color: #089bab;
padding: 6px 12px;
border: 1px solid #089bab;
border-radius: 20px;
cursor: pointer;
}
.materialQuery .el-tag{
.procurementMange .el-tag{
color: #000;
}
.materialQuery .AttrList{
.procurementMange .AttrList{
margin-top: 10px; position: relative; margin-right: 15px;
overflow: hidden; white-space: nowrap; text-overflow: ellipsis; cursor: pointer;
}
.materialQuery .Attrlist_item{
width: 55%;
.procurementMange .AttrList2{
width: 100%;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
flex-wrap: wrap;
}
.procurementMange .Attrlist_item{
display: inline-block;
width: 50%;
}
.procurementMange .Attrlist_item .el-input__inner{
width: 80px;
}
.materialQuery .Detaildata_box{
.procurementMange .Detaildata_box{
margin-top: 50px;
width: 100%;
}
.materialQuery .Detaildata_box .Detaildata_item{
.procurementMange .Detaildata_box .Detaildata_item{
display: flex;
flex-direction: row;
align-items: center;
padding: 10px 0;
border-bottom: 1px solid #f5f5f5;
}
.materialQuery .Detaildata_item_r{
.procurementMange .Detaildata_item_r{
display: flex;
flex-direction: column;
justify-content: space-around;
......@@ -121,7 +128,7 @@
</style>
<template>
<div class="materialQuery">
<div class="procurementMange">
<div class="template_comheader">
<div>
<span>采购列表</span>
......@@ -140,6 +147,12 @@
<el-date-picker v-model="dateList" @change="msg.pageIndex=1,getList()" size="small" type="datetimerange"
range-separator="至" value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期">
</el-date-picker>
<span style='margin-left:10px;margin-right:5px'>入库状态</span>
<el-select v-model="msg.StockInStatus" placeholder="请选择" size="small" filterable @change="msg.pageIndex=1,getList()">
<el-option label="全部" :value="0"></el-option>
<el-option :label="item.Name" :value="item.ID" v-for="(item,index) in options2" :key="index"></el-option>
</el-select>
</div>
<el-table :data="dataList" border style="width: 100%;margin-Top:10px">
......@@ -186,7 +199,7 @@
</el-select>
</el-form-item>
<el-form-item label="供应商" prop="SupplierId">
<el-select v-model="addMsg.SupplierId" placeholder="请选择" size="small" filterable>
<el-select v-model="addMsg.SupplierId" placeholder="请选择" size="small" filterable @change="gyings">
<el-option :label="item.Name" :value="item.ID" v-for="(item,index) in options" :key="index"></el-option>
</el-select>
</el-form-item>
......@@ -199,15 +212,22 @@
<div class="flDig_choose_item" @click="addGoods">
<span>+选择商品</span>
</div>
<div class="flDig_choose_item" style="margin-left: 20px;" @click="selectGoods=[],AttrArray=[],addMsg.DetailList = []">
<div class="flDig_choose_item" style="margin-left: 20px;" @click="btndelete">
<span>-移除商品</span>
</div>
</div>
</el-form>
<div>
<el-table :data="selectGoods" border style="width: 100%;margin-Top:10px">
<div v-for="(x,i) in selectGoods" :key="i">
<el-table :data="[x]" border style="width: 100%;margin-Top:10px">
<el-table-column
width="55">
<template slot-scope="scope">
<el-checkbox-group v-model="scope.row.ChooseD" @change="handleCheckedCitiesChange2(scope.row)">
<el-checkbox></el-checkbox>
</el-checkbox-group>
</template>
</el-table-column>
<el-table-column prop="Id" label="ID" width="100"></el-table-column>
<el-table-column prop="Name" label="商品名称"></el-table-column>
......@@ -218,21 +238,22 @@
</el-table-column>
<el-table-column prop="CostPrice" label="成本价格" width="100"></el-table-column>
</el-table>
<div class="Attrlist" v-if="AttrArray.length>0">
<div v-for="(item,index) in AttrArray" :key="index" style="margin-top:15px" class="Attrlist_item">
<div>
<span class="el-tag el-tag--medium el-tag--light" style="top: 5px; position: relative; margin-right: 5px;max-width:300px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis;">
<div class="Attrlist2">
<span v-for="(item,index) in x.SpecificationList" :key="index" class="Attrlist_item" v-if="item.IScheck==true" :style="{height:item.IScheck==true?'32px':'0',' margin-top':item.IScheck==true?'20px':'0'}">
<span v-if="item.IScheck==true" class="el-tag el-tag--medium el-tag--light" style="top: 10px; position: relative; margin-right: 5px;max-width:300px;
overflow: hidden; white-space: nowrap; text-overflow: ellipsis;margin-left:20px">
<span v-for="(x,y) in item.AttrList" :key="y">{{x}} <span v-if="item.AttrList.length !== y+1"> , </span></span>
</span>
</div>
<span style="margin-left:30px">数量：
<el-input size='small' v-model="addMsg.DetailList[index].Number" placeholder="请输入内容" style="display:inline-block;width:150px"></el-input>
</span>
</div>
<!-- <span>数量：
<el-input size='small' v-model="item.Number" :min="0 " type="number" placeholder="请输入内容" ></el-input>
</span> -->
<el-input placeholder="请输入内容" size='small' v-model="item.Number" :min="0 " type="number" style="width:150px">
<template slot="prepend">数量</template>
</el-input>
</span>
</div>
<el-button type="text" @click="AtterDig=true" v-if='selectGoods.length>0'>+规格选择</el-button>
<el-button type="text" @click="AtterDigbtn(i)" v-if='selectGoods.length>0'>+规格选择</el-button>
</div>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="flDig = false">取 消</el-button>
......@@ -250,8 +271,9 @@
<el-tab-pane :dataId="3" label="售罄" name="fourth"></el-tab-pane>
</el-tabs>
</div>
<div>
<div class="searchInput" style="width:250px;margin-right: 0px;">
<div style="display: flex;flex-direction: row;align-items: center;">
<div class="searchInput" style="width:250px;margin-right: 20px;">
<el-input @keyup.enter.native="goodsMsg.pageIndex=1,getgoodslist()"
style="display:inline-block;width:225px;height:30px" placeholder="请输入商品名称" v-model="goodsMsg.Name"
@clear="goodsMsg.pageIndex=1,getgoodslist()" size="small" clearable>
......@@ -259,15 +281,20 @@
<span @click="goodsMsg.pageIndex=1,getgoodslist()" class="el-icon-search"
style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
</div>
<div style="width:600px;margin-right: 0px;"><span>供应商：{{gyinsName}}</span></div>
</div>
<el-table :data="goodList" border style="width: 100%;margin-Top:10px" v-loading="loading" >
<el-table :data="goodList" border style="width: 100%;margin-Top:10px" v-loading="loading">
<el-table-column label="选择" width="55">
<template slot-scope="scope">
<el-radio v-model="goodsId" :label="scope.row.Id"><i></i></el-radio>
</template>
</el-table-column>
<el-table-column
width="55">
<template slot-scope="scope">
<el-checkbox-group v-model="scope.row.Chooseg" @change="handleCheckedCitiesChange(scope.row)">
<el-checkbox></el-checkbox>
</el-checkbox-group>
</template>
</el-table-column>
<el-table-column prop="Id" label="ID" width="100"></el-table-column>
<el-table-column prop="Name" label="商品名称"></el-table-column>
......@@ -291,19 +318,19 @@
</el-dialog>
<!-- 规格选择 -->
<el-dialog custom-class="app-add-cat" title="规格选择" :visible.sync="AtterDig" width="1100px">
<div class="temp_content" v-if="selectGoods.length>0">
<div class="temp_content" v-if="SpecList.length>0">
<span class="el-tag el-tag--small el-tag--light AttrList" :style="{color: item.IScheck == true?'#409eff':'#000'}"
v-for="(item,index) in selectGoods[0].SpecificationList" :key="index"
v-for="(item,index) in SpecList" :key="index"
@click="chooseAttr(index)"
>
<span v-for="(x,y) in item.AttrList" :key="y">{{x}}<span v-if="item.AttrList.length !== y+1"> , </span></span>
</span>
</div>
<span slot="footer" class="dialog-footer">
<!-- <span slot="footer" class="dialog-footer">
<el-button size="small" @click="AtterDig = false">取 消</el-button>
<el-button @click="chooseA" size="small" type="primary">确 定</el-button>
</span>
</span> -->
</el-dialog>
<!-- 详情 -->
<el-dialog custom-class="app-add-cat" title="采购详情" :visible.sync="DetailDig" width="1100px">
......@@ -348,6 +375,13 @@
goodList: [],
dateList: [],
selectGoods: [],
staginggoods:[],//暂存选中的商品
stagingDelete:[],//暂存删除数组
SpecList:[],//规格数组
ggindex:0,//规格的索引
gyinsName:'',
flDig: false,
goodsDig: false,
AtterDig:false,
......@@ -361,6 +395,7 @@
GoodsName: '',
StartTime: '',
EndTime: '',
StockInStatus:0,
},
addMsg: {
IsPublic: '',
......@@ -381,6 +416,9 @@
total2: 0,
AccountList: [],
options: [],
options2:[
{'ID':1,'Name':'未入库'}, {'ID':2,'Name':'部分入库'}, {'ID':3,'Name':'已入库'}
],
getWareHouseList:[],
rules: {
IsPublic: [{
......@@ -470,6 +508,16 @@
this.loading = false
if (res.data.resultCode == 1) {
var tempArray = res.data.data.pageData;
tempArray.forEach(x=>{
x.Chooseg = false;
if( this.staginggoods.length>0){
this.staginggoods.forEach(j=>{
if(x.Id == j.Id){
x.Chooseg = true;
}
})
}
})
this.goodList = tempArray;
this.total2 = res.data.data.count;
} else {
......@@ -477,16 +525,56 @@
}
})
},
choosegoods() { //确实的选择商品事的确认
this.selectGoods=[]
for(let i = 0;i<this.goodList.length;i++){
if(this.goodsId == this.goodList[i].Id){
this.selectGoods.push(this.goodList[i])
}
handleCheckedCitiesChange(row){//选择商品
if(row.Chooseg==true){
this.staginggoods.push(row)
}else{
this.staginggoods.forEach((x,i)=>{
if(x.Id==row.Id){
this.staginggoods.splice(i,1)
}
})
}
this.selectGoods[0].SpecificationList.forEach(x=>{
x.IScheck=false
},
handleCheckedCitiesChange2(row){//选择删除的商品
if(row.ChooseD==true){
this.stagingDelete.push(row)
}else{
this.stagingDelete.forEach((x,i)=>{
if(x.Id==row.Id){
this.stagingDelete.splice(i,1)
}
})
}
},
btndelete(){ //删除商品
this.stagingDelete.forEach(x=>{
this.selectGoods.forEach((j,i)=>{
if(x.Id == j.Id){
this.selectGoods.splice(i,1)
}
})
this.staginggoods.forEach((j,i)=>{
if(x.Id == j.Id){
this.staginggoods.splice(i,1)
}
})
})
this.stagingDelete=[]
},
choosegoods() { //确实的选择商品时的确认
this.staginggoods.forEach(x=>{
x.ChooseD =false;//删除的对象
x.SpecificationList.forEach(j=>{
j.IScheck=false;
j.Number= 0
})
})
this.selectGoods= JSON.parse(JSON.stringify(this.staginggoods));
this.goodsMsg.pageIndex = 1;
this.goodsDig = false
},
......@@ -499,25 +587,63 @@
this.goodsMsg.SupplierId = this.addMsg.SupplierId;
this.getgoodslist()
},
gyings(val){
this.options.forEach(x=>{
if(x.ID == val){
this.gyinsName = x.Name
}
})
},
//生成采购单
chooseFl(msg) {
console.log(this.addMsg)
// console.log(this.addMsg)
this.$refs[msg].validate(valid => {
if (valid) {
if(this.selectGoods.length==0){
this.Error('请选择商品');
return
}
if(this.addMsg.DetailList.length==0){
this.Error('请选择规格');
return
let selectGoods = this.selectGoods;
let datalList = [];
for(let i = 0;i< selectGoods.length ; i++){
let Isguige= false;
let cainum = false;
for(let j = 0;j<selectGoods[i].SpecificationList.length;j++){
if(selectGoods[i].SpecificationList[j].IScheck==true){
Isguige=true;
if(selectGoods[i].SpecificationList[j].Number==0){
cainum=true
}else{//组装addMsg.DetailList数据
let obj = {};
                          obj.GoodsId = selectGoods[i].Id;
                          obj.CostMoney = selectGoods[i].CostPrice;
                          obj.Number = selectGoods[i].SpecificationList[j].Number;
                          obj.SpecificationKey = selectGoods[i].SpecificationList[j].SpecificationSort;
datalList.push(obj)
}
}
}
if(Isguige == false){
this.Error('请选择规格');
return
break
}else if(cainum == true){
this.Error('采购数量大于等于1');
return
break
}
}
this.addMsg.DetailList = datalList;
const loading = this.$loading({
lock: true,
text: '生成采购单中...',
spinner: 'el-icon-loading',
});
this.assetsApipost(
"/api/property/SetProcurementInfo",
this.addMsg,
......@@ -531,8 +657,7 @@
this.addMsg.SupplierId = '';
this.addMsg.WareHouseId = '';
this.addMsg.DetailList = [];
this.goodsId = 0;
this.AttrArray = [];
this.staginggoods=[];
this.selectGoods=[];
} else {
......@@ -562,29 +687,17 @@
this.goodsMsg.pageIndex=1
this.getgoodslist();
},
chooseAttr(row){
this.selectGoods[0].SpecificationList[row].IScheck = !this.selectGoods[0].SpecificationList[row].IScheck
this.$forceUpdate()
AtterDigbtn(i){ // 点击规格选择的处理
this.AtterDig =true;
this.SpecList = this.selectGoods[i].SpecificationList;
this.ggindex = i
},
chooseAttr(index){//没改变原数组但是还是 生效了 这里有疑问
this.SpecList[index].IScheck = !this.SpecList[index].IScheck;
},
chooseA(){
this.AtterDig =false
let data = this.selectGoods[0].SpecificationList;
let newArray = []
let newArray2 = []
data.forEach(x=>{
if(x.IScheck==true){
let obj ={}
obj.GoodsId = x.GoodsId,
obj.CostMoney=this.selectGoods[0].CostPrice,
obj.Number=1,
obj.SpecificationKey=x.SpecificationSort,
newArray.push(obj)
newArray2.push(x)
}
})
this.addMsg.DetailList = newArray
this.AttrArray = newArray2
},
EditeTemplate(row){
this.DetailDig=true;
......
src/components/empower/putinStorage.vue
View file @ c038abbd
......@@ -30,7 +30,7 @@
<template>
<div class="putinStorage">
<div class="tpEdit_header">
<span style="color:rgb(64, 158, 255);cursor:pointer;" @click="CommonJump('procurementMaage')">采购管理</span><span
<span style="color:rgb(64, 158, 255);cursor:pointer;" @click="CommonJump('procurementMange')">采购管理</span><span
style="margin:0 9px;color:#C0C4CC">/</span><span>入库</span>
</div>
<div class="mimitBody">
......@@ -128,7 +128,7 @@ export default {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
// this.getProcurementInfo(this.$route.query)
this.CommonJump('procurementMaage')
this.CommonJump('procurementMange')
} else {
this.Error(res.data.message);
}
......
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