Skip to content

A
assets
Commit e1fa4739 authored by Mac's avatar Mac
Browse files
Options

1

parent d094fad6
Hide whitespace changes
Inline Side-by-side
Showing with 167 additions and 68 deletions
src/components/Materialman/rukuDetails.vue
View file @ e1fa4739
......@@ -28,11 +28,7 @@
</el-col>
<el-col :span="12">
<span>仓库名称 :</span>
<span>{{GetDetail.StockInNum}}</span>
</el-col>
<el-col :span="12">
<span>数量:</span>
<span>{{GetDetail.StockInNum}}</span>
<span>{{GetDetail.WareHouseName}}</span>
</el-col>
<el-col :span="12">
<span>金额:</span>
......
src/components/Materialman/rukuExamine.vue
View file @ e1fa4739
......@@ -28,7 +28,7 @@
<el-input class="w200" size="small" v-model="msg.SupplierName" placeholder="供应商" @keyup.enter.native="msg.pageIndex=1,getList()"></el-input>
</li>
<li>
<el-input class="w200" size="small" v-model="msg.FinanceId" placeholder="财务单Id" @keyup.enter.native="msg.pageIndex=1,getList()"></el-input>
<el-input class="w200" size="small" v-model="msg.FinanceId" placeholder="采购单据" @keyup.enter.native="msg.pageIndex=1,getList()"></el-input>
</li>
<li>
<el-select size="small" filterable clearable v-model="msg.WarehouseId" placeholder="仓库" @change="msg.pageIndex=1,getList()">
......@@ -94,7 +94,7 @@
<td>{{delist.UnitPrice}}</td>
<td>{{delist.Money}}</td>
<td>{{delist.Number}}</td>
<td >{{item.FinanceId}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.FinanceId}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">
<p>{{item.UpdateBy}}</p>
<p>{{item.UpdateDate}}</p>
......@@ -106,6 +106,9 @@
<el-tooltip class="item" effect="dark" content="审批" placement="top">
<img v-show="showTable==1" @click="See(item,'rukuDetails','rukuExamine','shenpi')" style="width:24px;height:24px" src="../../assets/img/shenpi.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="转交" placement="top">
<img v-show="showTable==1" @click="ZhuanJiao(item)" style="width:24px;height:24px" src="../../assets/img/huifu.png" alt="">
</el-tooltip>
</td>
</tr>
......@@ -126,6 +129,35 @@
:total="total">
</el-pagination>
</div>
<el-dialog :close-on-click-modal="false"
title="转交"
:visible.sync="dialogState"
width="530px">
<el-form class="MyEditForm" :model="addMsg" :rules="rules" ref="addMsg" label-width="0px">
<div class="basefix">
<el-form-item label="" prop="AuditEmId">
<span class="label">转交人</span>
<el-select filterable size="small" v-model="addMsg.AuditEmId" placeholder="转交人" :filter-method="getEmployee">
<el-option
v-for="item in EmployeeList2"
:key="item.EmployeeId"
:label="item.EmName"
:value="item.EmployeeId">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="">
<span class="label">备注</span>
<el-input v-model="addMsg.Description"></el-input>
</el-form-item>
</div>
<div class="btnformItem">
<span class="submitBtn" type="primary" @click="submitForm('addMsg')">确定</span>
<span class="exitBtn" @click="dialogState=false">取消</span>
</div>
</el-form>
</el-dialog>
</div>
</template>
......@@ -141,8 +173,10 @@
morequery:false,
dateList:[],
tableData: [],
EmployeeList2:[],
loading:false,
total:0,
EmName:'',
msg:{
pageIndex:1,
pageSize:10,
......@@ -154,11 +188,23 @@
EndTime:'',
},
getWareHouseList:[],
rules:{
AuditEmId: [
{ required: true, message: '请选择转交人', trigger: 'change' }
]
},
addMsg:{
AuditEmId:'',
WorkFlowId:'',
// TransferEmpId:'',
Description:'',
},
dialogState:false,
}
},
mounted(){
this.getList()
this.getWareHouse()
this.getList();
this.getWareHouse();
},
methods:{
getList(){
......@@ -222,6 +268,44 @@
null
);
},
submitForm(formName) {
let arr=[];
arr.push(this.addMsg);
this.$refs[formName].validate((valid) => {
if (valid) {
this.apiJavaPost("/api/Supplies/AuditCareOf",arr,
res => {
if (res.data.resultCode === 1) {
this.getList();
this.Success(res.data.message)
this.dialogState=false;
} else {
this.Error(res.data.message);
}
},
null
);
} else {
return false;
}
});
},
getEmployee(val){//用户列表
if(val!=''){
this.EmName=val;
}
this.apiJavaPost("/api/User/GetEmployeeList",{EmName:this.EmName},
res => {
if (res.data.resultCode === 1) {
this.EmployeeList2=res.data.data;
} else {
this.Error(res.data.message);
}
},
null
);
},
See(item,path,backto,type){
let shenpistr=type;
this.$router.push({
......@@ -238,6 +322,11 @@
this.msg.pageIndex = val;
this.getList();
},
ZhuanJiao(item){
this.dialogState=true;
this.addMsg.WorkFlowId=item.Id;
},
}
}
</script>
......
src/components/Materialman/rukudan.vue
View file @ e1fa4739
......@@ -16,10 +16,10 @@
</div>
<div class="padContent">
<ul v-show="morequery" class="queryul">
<li>
<li>
<el-input class="w200" size="small" v-model="msg.StockInNum" placeholder="编码" @keyup.enter.native="msg.pageIndex=1,getList()"></el-input>
</li>
<li>
<li>
<el-input class="w200" size="small" v-model="msg.SuppliesNum" placeholder="耗材编码" @keyup.enter.native="msg.pageIndex=1,getList()"></el-input>
</li>
<li>
......@@ -29,11 +29,11 @@
<el-input class="w200" size="small" v-model="msg.SupplierName" placeholder="供应商" @keyup.enter.native="msg.pageIndex=1,getList()"></el-input>
</li>
<li>
<el-input class="w200" size="small" v-model="msg.FinanceId" placeholder="财务单Id" @keyup.enter.native="msg.pageIndex=1,getList()"></el-input>
<el-input class="w200" size="small" v-model="msg.FinanceId" placeholder="采购单据" @keyup.enter.native="msg.pageIndex=1,getList()"></el-input>
</li>
<li>
<el-select size="small" filterable clearable v-model="msg.WarehouseId" placeholder="仓库" @change="msg.pageIndex=1,getList()">
<el-option
<el-option
v-for="item in getWareHouseList"
:key="item.Id"
:label="item.Name"
......@@ -62,9 +62,9 @@
<th>入库单编码</th>
<th>仓库名称</th>
<th>供应商名称</th>
<th>耗材名称</th>
<th>规格</th>
<th>耗材编码</th>
<th>分类名称</th>
......@@ -72,7 +72,7 @@
<th>单价</th>
<th>金额</th>
<th>数量</th>
<th>财务单ID</th>
<th>采购单据</th>
<th>操作人/时间</th>
<th>操作</th>
</thead>
......@@ -84,47 +84,49 @@
<span class="ColorSpan huangSpan" v-if="item.StockInState==2">待</span>
<span class="ColorSpan greenSpan" v-if="item.StockInState==1">已</span>
{{item.StockInStateStr}}
</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.StockInDate}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.StockInNum}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.WareHouseName}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.SupplierName}}</td>
<td style="width:300px">{{delist.SuppliesName}}</td>
</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.StockInDate}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.StockInNum}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.WareHouseName}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.SupplierName}}</td>
<td style="width:300px">{{delist.SuppliesName}}</td>
<td>
<p v-for="(x,y) in delist.GoodsSpecificationList" :key="y">{{x}}{{y+1==delist.GoodsSpecificationList.length?'':'，'}}</p>
</td>
<td>{{delist.SuppliesNum}}</td>
<td>{{delist.CategoryName}}</td>
<td>{{delist.BrandName}}</td>
<td>{{delist.UnitPrice}}</td>
<td>{{delist.Money}}</td>
<td>{{delist.Number}}</td>
<td >{{item.FinanceId}}</td>
<p v-for="(x,y) in delist.GoodsSpecificationList" :key="y">{{x}}{{y+1==delist.GoodsSpecificationList.length?'':'，'}}</p>
</td>
<td>{{delist.SuppliesNum}}</td>
<td>{{delist.CategoryName}}</td>
<td>{{delist.BrandName}}</td>
<td>{{delist.UnitPrice}}</td>
<td>{{delist.Money}}</td>
<td>{{delist.Number}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.FinanceId}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">
<p>{{item.UpdateBy}}</p>
<p>{{item.UpdateDate}}</p>
</td>
<p>{{item.UpdateBy}}</p>
<p>{{item.UpdateDate}}</p>
</td>
<td :class="index1==tableData.length-1?'lastTdRight':''" :rowspan="item.DetailList.length" v-if="index==0">
<el-tooltip class="item" effect="dark" content="流程查看" placement="top">
<img @click="See(item,'rukuDetails','rukudan','chakan')" style="width:24px;height:24px" src="../../assets/img/chakan.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="编辑" placement="top">
<img v-if="item.StockInState!=1" @click="Edit(item)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt="">
<img v-if="item.StockInState!=1 && (item.ProcurementId==0)" @click="Edit(item)" style="width:24px;height:24px" src="../../assets/img/edit.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top">
<img v-if="item.StockInState!=1" @click="Delete(item)" style="width:24px;height:24px" src="../../assets/img/delete.png" alt="">
<img v-if="item.StockInState!=1 && (item.ProcurementId==0)" @click="Delete(item)" style="width:24px;height:24px" src="../../assets/img/delete.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="取消入库单" placement="top">
<img v-show="item.StockInState==1" @click="Quxiao(item)" style="width:24px;height:24px" src="../../assets/img/qx.png" alt="">
<img v-show="item.StockInState==1 && (item.ProcurementId==0)" @click="Quxiao(item)" style="width:24px;height:24px" src="../../assets/img/qx.png" alt="">
</el-tooltip>
<el-tooltip class="item" effect="dark" content="恢复入库单" placement="top">
<img v-show="item.StockInState==2" @click="Huifu(item)" style="width:24px;height:24px" src="../../assets/img/huifu.png" alt="">
<img v-show="item.StockInState==2 && (item.ProcurementId==0)" @click="Huifu(item)" style="width:24px;height:24px" src="../../assets/img/huifu.png" alt="">
</el-tooltip>
<!-- <span class="commonStyle hoverSpan2"></span> -->
</td>
</tr>
</template>
<tr v-show="tableData.length==0">
<td colspan="14" align="center">暂无数据</td>
</tr>
......@@ -140,7 +142,7 @@
:total="total">
</el-pagination>
</div>
<el-dialog
title="入库管理"
:close-on-click-modal="false"
......@@ -152,7 +154,7 @@
<el-form-item label="" prop="WarehouseId">
<span class="label">仓库</span>
<el-select size="mini" v-model="addMsg.WarehouseId" placeholder="请选择" @change="getWarehouseL">
<el-option
<el-option
v-for="item in getWareHouseList"
:key="item.Id"
:label="item.Name"
......@@ -215,8 +217,8 @@
<td>{{item.SuppliesNum}}</td>
<td>{{item.SuppliesName}}</td>
<td>
<p v-for="(x,y) in item.GoodsSpecificationList" :key="y">{{x}}{{y+1==item.GoodsSpecificationList.length?'':'，'}}</p>
</td>
<p v-for="(x,y) in item.GoodsSpecificationList" :key="y">{{x}}{{y+1==item.GoodsSpecificationList.length?'':'，'}}</p>
</td>
<td>{{item.CategoryName}}</td>
<td>{{item.BrandName}}</td>
<td><el-input @input="UnitPriceChange(item,index)" v-model="item.UnitPrice"></el-input></td>
......@@ -229,7 +231,7 @@
</tr>
</tbody>
</table>
</div>
<div class="btnformItem">
......@@ -273,7 +275,7 @@
<table style="width:1250px;min-width: 1250px;" class="myTable" border="0" cellspacing="0" cellpadding="0">
<thead>
<th><input class="color-input-red" type="checkbox" v-model="wlisCkedAll" @click='wlcheckAll()'></th>
<th>档案编码</th>
<th>档案编码</th>
<th>物料名称</th>
<th>分类名称</th>
<th>品牌名</th>
......@@ -301,7 +303,7 @@
<td>{{item.SuppliesModel}}</td>
<td>{{item.UpdateBy}}</td>
<td>{{item.Remark}}</td>
</tr>
<tr v-show="wuliaoList.length==0">
<td colspan="12" align="center">暂无数据</td>
......@@ -390,7 +392,7 @@ export default {
ItemisCkedAll:false,
ItemCheckList:[],
tableHeight:0,
pickerOptions: {
pickerOptions: {
　　disabledDate(time) {
　　　　return time.getTime() < Date.now() - 24 * 60 * 60 * 1000
}
......@@ -407,9 +409,9 @@ export default {
this.getList();
this.getWareHouse();
this.getWuliao();
},
methods:{
Export(){
......@@ -436,7 +438,7 @@ export default {
null
);
}
},
UnitPriceChange(item,index){
if(item.Number!='0' && item.Number!='' && item.UnitPrice!='0' && item.UnitPrice!=''){
......@@ -469,7 +471,7 @@ export default {
this.wlItemList.forEach(x=>{
this.addMsg.Money+=Number(x.Money)
})
this.$forceUpdate()
this.$forceUpdate()
},
ItemcheckOne(){
if(this.ItemCheckList.length < this.wlItemList.length) {
......@@ -491,7 +493,7 @@ export default {
ycwuitemList(){
if(this.ItemCheckList.length==0){
return;
}
}
this.$confirm("确认移除物料？","提示", {
confirmButtonText:"确定",
cancelButtonText: "取消",
......@@ -505,7 +507,7 @@ export default {
this.addMsg.Money+=Number(x.Money)
})
}).catch(() => {
});
},
OpenWldig(){
......@@ -515,14 +517,14 @@ export default {
},
chooseWu(){
this.wlcheckList.forEach(item=>{
this.wlItemList.push(item);
this.wlItemList.push(item);
})
let obj = {};
let peon = this.wlItemList.reduce((cur,next) => {
obj[next.SuppliesId] ? "" : obj[next.SuppliesId] = true && cur.push(next);
return cur;
},[])
},[])
this.wlItemList=peon
this.wuliaodig=false;
......@@ -575,7 +577,7 @@ export default {
null
);
},
// 仓库列表
// 仓库列表
getWareHouse(){
this.apiJavaPost("/api/Supplies/GetWareHouseList",{Name:''},
res => {
......@@ -588,6 +590,18 @@ export default {
null
);
},
See(item,path,backto,type){
let shenpistr=type;
this.$router.push({
path: "/" + path,
query: {
Id:item.Id,
backto:backto,
showTable:this.showTable,
compType:shenpistr,
}
});
},
addSupplier(){
this.addMsg={
Id:0,
......@@ -658,7 +672,7 @@ export default {
}
else{
this.msg.StartTime='';
this.msg.EndTime='';
this.msg.EndTime='';
}
this.apiJavaPost("/api/Supplies/GetStockInPageList",this.msg,
res => {
......@@ -674,10 +688,10 @@ export default {
x.itemOperation= true;
break
}
}
})
}
}
this.total=res.data.data.count;
} else {
this.Error(res.data.message);
......@@ -707,7 +721,7 @@ export default {
}
this.wlItemList=item.DetailList;
}
},
Delete(item){
if(item.itemOperation == true){
......@@ -735,7 +749,7 @@ export default {
this.$message.info('已取消删除！')
});
}
},
Quxiao(item){
if(item.itemOperation == true){
......@@ -761,9 +775,9 @@ export default {
}).catch(() => {
this.$message.info('已取消删除！')
});
});
}
},
//获取盘点仓库的列表
getSuppliesCheckList(){
......@@ -787,12 +801,12 @@ export default {
this.Error('此仓库正在盘点，无法操作！')
break
}
}
},
},
}
</script>
......@@ -825,7 +839,7 @@ export default {
font-size: 18px;font-weight: bold;
}
.rukudan{
position: relative;
width:100%;
height:100%;
......
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