Skip to content

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

样式修改

parent 5f561cde
Hide whitespace changes
Inline Side-by-side
Showing with 151 additions and 79 deletions
src/components/empower/empowerManage.vue
View file @ ffbae918
...@@ -44,19 +44,20 @@ ...@@ -44,19 +44,20 @@
<span v-if="scope.row.Type==2">集团</span> <span v-if="scope.row.Type==2">集团</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="状态">
<template slot-scope="scope">
<span v-if="scope.row.Status==1">待审核</span>
<span v-if="scope.row.Status==2">已审核</span>
<span v-if="scope.row.Status==3">已拒绝</span>
<span v-if="scope.row.Status==4">已作废</span>
</template>
</el-table-column>
<!-- <el-table-column prop="CreateBy" label="创建人Id"></el-table-column> --> <!-- <el-table-column prop="CreateBy" label="创建人Id"></el-table-column> -->
<el-table-column prop="EmpName" label="创建人姓名"></el-table-column>
<el-table-column prop="DomainName" label="域名"></el-table-column> <el-table-column prop="DomainName" label="域名"></el-table-column>
<el-table-column prop="Account" label="关联erp账号"></el-table-column> <el-table-column prop="Account" label="关联erp账号"></el-table-column>
<el-table-column prop="MallUserName" label="电商员工姓名"></el-table-column> <el-table-column prop="MallUserName" label="电商员工姓名"></el-table-column>
<el-table-column prop="EmpName" label="创建人姓名"></el-table-column>
<el-table-column label="状态">
<template slot-scope="scope">
<span v-if="scope.row.Status==1">待审核</span>
<span v-if="scope.row.Status==2">已审核</span>
<span v-if="scope.row.Status==3">已拒绝</span>
<span v-if="scope.row.Status==4">已作废</span>
</template>
</el-table-column>
<el-table-column prop="CreateDate" label="创建时间"></el-table-column> <el-table-column prop="CreateDate" label="创建时间"></el-table-column>
<el-table-column prop="UpdateDate" label="更新时间"></el-table-column> <el-table-column prop="UpdateDate" label="更新时间"></el-table-column>
<el-table-column label="操作"> <el-table-column label="操作">
......
src/components/empower/materialQuery.vue
View file @ ffbae918
...@@ -58,6 +58,11 @@ ...@@ -58,6 +58,11 @@
padding: 5px 0; padding: 5px 0;
font-size: 14px; font-size: 14px;
} }
.materialQuery .shopinformation{
display: flex;
flex-direction: row;
font-size: 12px;
}
</style> </style>
<template> <template>
<div class="materialQuery"> <div class="materialQuery">
...@@ -69,16 +74,11 @@ ...@@ -69,16 +74,11 @@
</div> </div>
<div class="temp_content"> <div class="temp_content">
<div> <div>
<div class="searchInput" style="width:150px;margin-right: 0px;"> <span>仓库</span>
<el-input @keyup.enter.native="msg.pageIndex=1,getList()" style="display:inline-block;width:125px;height:30px" <el-select v-model="msg.WareHouseId" placeholder="请选择" size="small" filterable @change="msg.pageIndex=1,getList()">
placeholder="请输入仓库id" <el-option label="不限" :value="0"></el-option>
v-model="msg.WareHouseId" <el-option :label="item.Name" :value="item.Id" v-for="(item,index) in getWareHouseList" :key="index"></el-option>
@clear="msg.pageIndex=1,getList()" </el-select>
size="small"
clearable>
</el-input>
<span @click="msg.pageIndex=1,getList()" class="el-icon-search" style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
</div>
<div class="searchInput" style="width:150px;margin-right: 10px;"> <div class="searchInput" style="width:150px;margin-right: 10px;">
<el-input @keyup.enter.native="msg.pageIndex=1,getList()" style="display:inline-block;width:125px;height:30px" <el-input @keyup.enter.native="msg.pageIndex=1,getList()" style="display:inline-block;width:125px;height:30px"
placeholder="请输入商品id" placeholder="请输入商品id"
...@@ -100,33 +100,49 @@ ...@@ -100,33 +100,49 @@
<span @click="msg.pageIndex=1,getList()" class="el-icon-search" style="color:#979dad;font-size:14px;position:relative;top:1px"></span> <span @click="msg.pageIndex=1,getList()" class="el-icon-search" style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
</div> </div>
</div> </div>
<el-table :data="dataList" border style="width: 100%;margin-Top:10px"> <el-table :data="dataList" border style="width: 100%;margin-Top:10px" v-loading="loading">
<el-table-column prop="Id" label="ID" width="60"></el-table-column> <el-table-column prop="Id" label="ID" width="60"></el-table-column>
<el-table-column prop="Name" label="商品名称" width="400"></el-table-column> <el-table-column prop="Name" label="商品信息" width="500">
<el-table-column prop="Money" label="成本价格"></el-table-column>
<el-table-column prop="Units" label="单位"></el-table-column>
<el-table-column label="图片列表" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-for="(item,index) in scope.row.ImageList" :key="index" style="width: 50px; height: 50px;"> <div class="shopinformation">
<img :src="item" alt="" style="width: 50px; height: 50px;"> <img :src=" scope.row.ImageList[0]" alt="" style="width: 60px; height: 60px;">
<div style="margin-left:5px">
<span>{{scope.row.Name}}</span>
<div>
<span>
商品分类：
<span v-for="(item,index3) in scope.row.GoodsCategoryList" :key="index3" >{{item}} </span>
</span>
<span style="margin-left:10px">物料编码:{{scope.row.SuppliesNum}}</span>
</div>
</div>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="Remark" label="备注"></el-table-column>
<el-table-column prop="SupplierName" label="供应商名称"></el-table-column>
<el-table-column prop="SuppliesNum" label="物料编码"></el-table-column>
<el-table-column prop="InventoryNum" label="库存（选择仓库后有值）"></el-table-column>
<el-table-column label="商品规格列表"> <el-table-column label="商品规格列表">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-for="(item,index2) in scope.row.GoodsSpecificationList" :key="index2" >{{item}} </span> <span v-for="(item,index2) in scope.row.GoodsSpecificationList" :key="index2" >{{item}} </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="商品分类列表"> <el-table-column prop="Money" label="成本价格" width="80"></el-table-column>
<el-table-column prop="Units" label="单位" width="80"></el-table-column>
<el-table-column width="80">
<template slot="header" >
库存
<el-tooltip effect="dark" content="选择仓库后有值" placement="top">
<i class="el-icon-info"></i>
</el-tooltip>
</template>
<template slot-scope="scope"> <template slot-scope="scope">
<span v-for="(item,index3) in scope.row.GoodsCategoryList" :key="index3" >{{item}} </span>
<span >{{scope.row.InventoryNum}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="Remark" label="备注"></el-table-column>
<el-table-column prop="UpdateDate" label="操作时间"></el-table-column> <el-table-column prop="UpdateDate" label="操作时间"></el-table-column>
</el-table> </el-table>
<el-pagination style="text-align:right" background @current-change="handleCurrentChange" :current-page.sync="msg.pageIndex" <el-pagination style="text-align:right" background @current-change="handleCurrentChange" :current-page.sync="msg.pageIndex"
...@@ -202,15 +218,17 @@ ...@@ -202,15 +218,17 @@
export default { export default {
data() { data() {
return { return {
loading:false,
dataList: [], dataList: [],
fenleiData:[], fenleiData:[],
childList2:[], childList2:[],
childList3:[], childList3:[],
checkList:[], checkList:[],
getWareHouseList:[],
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 15, pageSize: 10,
WareHouseId:'', WareHouseId:0,
GoodsId:'', GoodsId:'',
Name:'', Name:'',
}, },
...@@ -225,11 +243,22 @@ ...@@ -225,11 +243,22 @@
handleCurrentChange(val) { handleCurrentChange(val) {
this.msg.pageIndex = val; this.msg.pageIndex = val;
this.getList(); this.getList();
},
// 仓库列表
getWareHouse(){
this.apiJavaPost("/api/Supplies/GetWareHouseList",{Name:''},
res => {
if (res.data.resultCode === 1) {
this.getWareHouseList=res.data.data;
} else {
this.Error(res.data.message);
}
},
null
);
}, },
getList() { getList() {
if(this.msg.WareHouseId!=''){
this.msg.WareHouseId = Number(this.msg.WareHouseId)
}
if(this.msg.GoodsId!=''){ if(this.msg.GoodsId!=''){
this.msg.GoodsId = Number(this.msg.GoodsId) this.msg.GoodsId = Number(this.msg.GoodsId)
} }
...@@ -260,9 +289,11 @@ ...@@ -260,9 +289,11 @@
}) })
}, },
setSyncGoodsToMaterial(CategoryIds){ setSyncGoodsToMaterial(CategoryIds){
this.loading = true
this.assetsApipost("/api/property/SetSyncGoodsToMaterial", {CategoryIds:CategoryIds}, res => { this.assetsApipost("/api/property/SetSyncGoodsToMaterial", {CategoryIds:CategoryIds}, res => {
this.loading = false
if(res.data.resultCode==1){ if(res.data.resultCode==1){
this.Success(res.data.message);
}else{ }else{
this.Info(res.data.message); this.Info(res.data.message);
} }
...@@ -298,6 +329,7 @@ ...@@ -298,6 +329,7 @@
mounted() { mounted() {
this.getList(); this.getList();
this.getTree(); this.getTree();
this.getWareHouse()
} }
}; };
......
src/components/empower/printManage.vue
View file @ ffbae918
...@@ -56,15 +56,16 @@ ...@@ -56,15 +56,16 @@
} }
</style> </style>
<template> <template>
<div class="printManage"> <div class="printManage" >
<div class="tpEdit_header"> <div class="tpEdit_header" >
<div> <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('procurementMaage')">采购管理</span><span
style="margin:0 9px;color:#C0C4CC">/</span><span>打印</span> style="margin:0 9px;color:#C0C4CC">/</span><span>打印</span>
</div> </div>
<el-button type="primary" size="small" @click="batchprint(1)">批量打印</el-button> <el-button type="primary" size="small" @click="batchprint(1)">批量打印</el-button>
</div> </div>
<div class="mimitBody"> <div class="mimitBody" v-loading="loading"
element-loading-text="拼命打印中..." >
<div> <div>
<el-checkbox v-model="allchecked" @change="allcheckbtn">全选</el-checkbox> <el-checkbox v-model="allchecked" @change="allcheckbtn">全选</el-checkbox>
<span style='margin-left:10px'>入库批次</span> <span style='margin-left:10px'>入库批次</span>
...@@ -119,7 +120,7 @@ ...@@ -119,7 +120,7 @@
</el-row> </el-row>
</div> </div>
<div class="xuanzhong" id = 'xuanzhong' style="display:none"> <div class="xuanzhong" id = 'xuanzhong' style="display:none" >
<!-- <div v-for="(item,index) in checkList" :key="index" class="xuanzhong_item" :id = "item.page" > --> <!-- <div v-for="(item,index) in checkList" :key="index" class="xuanzhong_item" :id = "item.page" > -->
<div v-for="(item,index) in checkList" :key="index" :id = "item.page" style=" width: 283px; height: 283px;padding: 10px;display: flex;flex-direction: column; justify-content: space-around;"> <div v-for="(item,index) in checkList" :key="index" :id = "item.page" style=" width: 283px; height: 283px;padding: 10px;display: flex;flex-direction: column; justify-content: space-around;">
<div style=" width:100%; height:40px;text-overflow: ellipsis; display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 2;overflow: hidden;"> <div style=" width:100%; height:40px;text-overflow: ellipsis; display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp: 2;overflow: hidden;">
...@@ -174,6 +175,7 @@ export default { ...@@ -174,6 +175,7 @@ export default {
data() { data() {
return { return {
loading:false,
Detaildata:{}, Detaildata:{},
msg:{ msg:{
ProcurementId:0, ProcurementId:0,
...@@ -187,8 +189,7 @@ export default { ...@@ -187,8 +189,7 @@ export default {
}, },
created() {}, created() {},
methods: { methods: {
getProcurementInfo(data) {//获取采购单 入库批次
getProcurementInfo(data) {//获取采购单 入库批次
this.assetsApipost("/api/property/GetProcurementSotckInBatchList", {ProcurementId:data.ID}, res => { this.assetsApipost("/api/property/GetProcurementSotckInBatchList", {ProcurementId:data.ID}, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.options = res.data.data; this.options = res.data.data;
...@@ -248,29 +249,45 @@ export default { ...@@ -248,29 +249,45 @@ export default {
} }
this.$forceUpdate() this.$forceUpdate()
}, },
batchprint(num){//批量打印
if(this.checkList.length>0){ batchprint(n){//批量打印
// debugger;
let conunt = this.checkList.length;
let that = this
if(conunt>0){
// http://www.c-lodop.com/LodopDemo.html 官网地址 // http://www.c-lodop.com/LodopDemo.html 官网地址
 let page = 'page'+num if(n ==1){
this.loading = true
}
 let page = 'page'+n
let LODOP = getLodop()//调用getLodop获取LODOP对象 let LODOP = getLodop()//调用getLodop获取LODOP对象
LODOP.PRINT_INIT(num) LODOP.PRINT_INIT(page)
LODOP.NewPage();
var strFormHtml="<body>"+document.getElementById(page).innerHTML+"</body>"; var strFormHtml="<body>"+document.getElementById(page).innerHTML+"</body>";
LODOP.ADD_PRINT_HTM(20,15,300,300,strFormHtml); LODOP.ADD_PRINT_HTM(20,15,300,300,strFormHtml);
// LODOP.PREVIEW()//预览打印 // LODOP.PREVIEW()//预览打印
LODOP.PRINT()//直接打印打印 // LODOP.PRINT_DESIGN()//进入打印设计
// LODOP.PRINT()//直接打印打印
console.log(page)
let num = n
if(LODOP.CVERSION){ if(LODOP.CVERSION){
LODOP.On_Return = function(TaskID, Value){ LODOP.On_Return = function(TaskID, Value){
console.log(TaskID)
console.log(Value)
console.log(123123)
if(Value){ if(Value){
console.log(num)
num++;//循环打印 num++;//循环打印
if(this.checkList.length>=num){ console.log(num)
if(conunt>=num){
console.log(2)
setTimeout(()=>{ setTimeout(()=>{
this.batchprint(num) that.batchprint(num)
},1000) },200)
if(conunt == num){
that.loading = false
}
}else{
return
} }
}else{ }else{
console.log('错误') console.log('错误')
...@@ -278,20 +295,23 @@ export default { ...@@ -278,20 +295,23 @@ export default {
} }
LODOP.PRINT() LODOP.PRINT()
}else{
console.log('进入')
if( LODOP.PRINT()){
num++;//循环打印
if(this.checkList.length>=num){
setTimeout(()=>{
this.batchprint(num)
},1000)
}
}else{
console.log('错误')
}
} }
// else{
// if(LODOP.PRINT()){
// num++;//循环打印
// if(conunt>=num){
// setTimeout(()=>{
// that.batchprint(num)
// },200)
// }else{
// return
// }
// }else{
// console.log('错误')
// }
// }
......
src/components/empower/procurementMaage.vue
View file @ ffbae918
...@@ -147,19 +147,17 @@ ...@@ -147,19 +147,17 @@
<el-table-column prop="WareHouseName" label="仓库名称"></el-table-column> <el-table-column prop="WareHouseName" label="仓库名称"></el-table-column>
<el-table-column prop="TotalCostMoney" label="总价格"></el-table-column> <el-table-column prop="TotalCostMoney" label="总价格"></el-table-column>
<el-table-column prop="TotalNumber" label="总数量" width="90"></el-table-column> <el-table-column prop="TotalNumber" label="总数量" width="150"></el-table-column>
<el-table-column prop="Remark" label="备注"></el-table-column> <el-table-column prop="FinanceId" label="绑定财务单据id" width="150"></el-table-column>
<el-table-column prop="Remark" label="备注" width="260"></el-table-column>
<el-table-column prop="StockInStatus" label="入库状态" width="150">
<el-table-column prop="FinanceId" label="绑定财务单据id"></el-table-column>
<el-table-column prop="CreateDate" label="创建时间"></el-table-column>
<el-table-column prop="StockInStatus" label="入库状态" width="90">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.StockInStatus==1">未入库</span> <span v-if="scope.row.StockInStatus==1">未入库</span>
<span v-if="scope.row.StockInStatus==2">部分入库</span> <span v-if="scope.row.StockInStatus==2">部分入库</span>
<span v-if="scope.row.StockInStatus==3">已入库</span> <span v-if="scope.row.StockInStatus==3">已入库</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="CreateDate" label="创建时间" width="120"></el-table-column>
<el-table-column label="操作" width="150"> <el-table-column label="操作" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip class="item" effect="dark" content="打印" placement="top"> <el-tooltip class="item" effect="dark" content="打印" placement="top">
...@@ -181,7 +179,7 @@ ...@@ -181,7 +179,7 @@
</div> </div>
<!-- 生成采购单 --> <!-- 生成采购单 -->
<el-dialog custom-class="app-add-cat" title="新增采购单" :visible.sync="flDig" width="1100px"> <el-dialog custom-class="app-add-cat" title="新增采购单" :visible.sync="flDig" width="1100px">
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="135px" style="width:50%"> <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="90px" style="width:50%">
<el-form-item label="账户类型" prop="IsPublic"> <el-form-item label="账户类型" prop="IsPublic">
<el-select v-model="addMsg.IsPublic" placeholder="请选择" size="small" filterable> <el-select v-model="addMsg.IsPublic" placeholder="请选择" size="small" filterable>
<el-option :label="item.Name" :value="item.Id" v-for="(item,index) in AccountList" :key="index"></el-option> <el-option :label="item.Name" :value="item.Id" v-for="(item,index) in AccountList" :key="index"></el-option>
...@@ -238,7 +236,7 @@ ...@@ -238,7 +236,7 @@
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button size="small" @click="flDig = false">取 消</el-button> <el-button size="small" @click="flDig = false">取 消</el-button>
<el-button @click="chooseFl('addMsg')" size="small" type="primary">确 定</el-button> <el-button @click="chooseFl('addMsg')" size="small" type="primary" >新 增</el-button>
</span> </span>
</el-dialog> </el-dialog>
<!-- 商品列表 --> <!-- 商品列表 -->
...@@ -335,6 +333,7 @@ ...@@ -335,6 +333,7 @@
export default { export default {
data() { data() {
return { return {
fullscreenLoading: false,
loading: false, loading: false,
dataList: [], dataList: [],
goodList: [], goodList: [],
...@@ -503,10 +502,17 @@ ...@@ -503,10 +502,17 @@
this.Error('请选择规格'); this.Error('请选择规格');
return return
} }
const loading = this.$loading({
lock: true,
text: '生成采购单中...',
spinner: 'el-icon-loading',
});
this.assetsApipost( this.assetsApipost(
"/api/property/SetProcurementInfo", "/api/property/SetProcurementInfo",
this.addMsg, this.addMsg,
res => { res => {
loading.close();
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Success(res.data.message); this.Success(res.data.message);
this.flDig=false; this.flDig=false;
......
src/components/empower/putinStorage.vue
View file @ ffbae918
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<span v-for="(x,y) in scope.row.MaterialModel.GoodsSpecificationList" :key="y">{{x}} <span v-if="scope.row.MaterialModel.GoodsSpecificationList.length !== y+1"> , </span></span> <span v-for="(x,y) in scope.row.MaterialModel.GoodsSpecificationList" :key="y">{{x}} <span v-if="scope.row.MaterialModel.GoodsSpecificationList.length !== y+1"> , </span></span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="Number" label="数量" width="60"></el-table-column> <el-table-column prop="Number" label="采购数量" width="80"></el-table-column>
<el-table-column prop="StockInNum" label="已入数量" width="80"> <el-table-column prop="StockInNum" label="已入数量" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{scope.row.StockInNum!=null?scope.row.StockInNum:0}}</span> <span>{{scope.row.StockInNum!=null?scope.row.StockInNum:0}}</span>
...@@ -66,6 +66,7 @@ ...@@ -66,6 +66,7 @@
<el-input v-model="scope.row.InStockNum" type="number" :min='0' <el-input v-model="scope.row.InStockNum" type="number" :min='0'
:max="scope.row.Number -(scope.row.StockInNum!=null?scope.row.StockInNum:0)" :max="scope.row.Number -(scope.row.StockInNum!=null?scope.row.StockInNum:0)"
:disabled="(scope.row.Number -(scope.row.StockInNum!=null?scope.row.StockInNum:0))==0? true:false" :disabled="(scope.row.Number -(scope.row.StockInNum!=null?scope.row.StockInNum:0))==0? true:false"
@input='validation(scope.row.Number -(scope.row.StockInNum!=null?scope.row.StockInNum:0),scope.row,$event)'
placeholder="请输入"></el-input> placeholder="请输入"></el-input>
</template> </template>
</el-table-column> </el-table-column>
...@@ -133,6 +134,18 @@ export default { ...@@ -133,6 +134,18 @@ export default {
} }
}) })
},
validation(v,row,value){
let that = this
if(value>v){
this.Error('数量不足');
that.Detaildata.DetailList.forEach(x=>{
if(x.Id == row.Id){
x.InStockNum=0
}
})
}
} }
......
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