Skip to content

A
assets
Commit 1124f12b authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

增加列表规格

parent 6cbc75b3
Hide whitespace changes
Inline Side-by-side
Showing with 122 additions and 46 deletions
src/components/Materialman/Archivesmaterials.vue
View file @ 1124f12b
......@@ -47,6 +47,11 @@
<span class="underline" @click="getCheckDes(row)">{{row.Name}}</span>
</template>
</vxe-table-column>
<vxe-table-column field="SuppliesName" title="规格" width='200'>
<template v-slot="{ row }">
<span v-for="(x,y) in row.GoodsSpecificationList" :key="y">{{x}}{{y+1==row.GoodsSpecificationList.length?'':'，'}}</span>
</template>
</vxe-table-column>
<vxe-table-column field="CategoryName" title="分类名称"></vxe-table-column>
<vxe-table-column field="BrandName" title="品牌"></vxe-table-column>
<vxe-table-column field="Money" title="成本价"></vxe-table-column>
......
src/components/Materialman/ConsumRecipients.vue
View file @ 1124f12b
......@@ -69,6 +69,11 @@
<vxe-table-column field="Number" title="领取数量"></vxe-table-column>
<vxe-table-column field="Money" title="金额"></vxe-table-column>
<vxe-table-column field="SuppliesName" title="耗材名称"></vxe-table-column>
<vxe-table-column field="SuppliesName" title="规格" width='200'>
<template v-slot="{ row }">
<span v-for="(x,y) in row.GoodsSpecificationList" :key="y">{{x}}{{y+1==row.GoodsSpecificationList.length?'':'，'}}</span>
</template>
</vxe-table-column>
<vxe-table-column field="CategoryName" title="分类名称"></vxe-table-column>
<vxe-table-column field="StockOutNum" title="领取单号"></vxe-table-column>
<vxe-table-column field="StockOutDate" title="领取人/领取日期">
......
src/components/Materialman/SpotQuery.vue
View file @ 1124f12b
......@@ -46,11 +46,16 @@
<span class="underline" @click="getCheckDes(row)">{{row.SuppliesNum}}</span>
</template>
</vxe-table-column>
<vxe-table-column field="SuppliesName" title="耗材名称">
<vxe-table-column field="SuppliesName" title="耗材名称" width='300'>
<template v-slot="{ row }">
<span class="underline" @click="getCheckDes(row)">{{row.SuppliesName}}</span>
</template>
</vxe-table-column>
<vxe-table-column field="SuppliesName" title="规格" width='200'>
<template v-slot="{ row }">
<span v-for="(x,y) in row.GoodsSpecificationList" :key="y">{{x}}{{y+1==row.GoodsSpecificationList.length?'':'，'}}</span>
</template>
</vxe-table-column>
<vxe-table-column field="CategoryName" title="分类名称"></vxe-table-column>
<vxe-table-column field="SuppliesModel" title="耗材型号"></vxe-table-column>
<vxe-table-column field="WareHouseName" title="仓库名称"></vxe-table-column>
......
src/components/Materialman/chukudan.vue
View file @ 1124f12b
......@@ -66,6 +66,7 @@
<th>出库时间</th>
<th>仓库名称</th>
<th>耗材名称</th>
<th>规格</th>
<th>耗材编码</th>
<th>分类名称</th>
<th>品牌名称</th>
......@@ -88,7 +89,11 @@
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.StockOutNum}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.StockOutDate}}</td>
<td :rowspan="item.DetailList.length" v-if="index==0">{{item.WareHouseName}}</td>
<td>{{delist.SuppliesName}}</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>
......
src/components/Materialman/rukudan.vue
View file @ 1124f12b
......@@ -59,6 +59,8 @@
<th>仓库名称</th>
<th>供应商名称</th>
<th>耗材名称</th>
<th>规格</th>
<th>耗材编码</th>
<th>分类名称</th>
<th>品牌名称</th>
......@@ -81,7 +83,10 @@
<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:340px">{{delist.SuppliesName}}</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>
......
src/components/assetsman/outboundDetails.vue
View file @ 1124f12b
......@@ -13,17 +13,49 @@
<div class="padContent">
<div class="xiangq">
<div>
<span class="topkuang">申请状态:
<!-- <span class="topkuang">申请状态:
<span style="color:#FFA87C" v-if="tableData.ApplyStatus==1">待审核</span>
<span style="color:#FFA87C" v-if="tableData.ApplyStatus==2">已审核</span>
<span style="color:#7B78FF;" v-if="tableData.ApplyStatus==3">拒绝</span>
</span>
<span class="topkuang">出库状态:
<span v-if="tableData.OutStatus==0">未出库</span>
<span v-if="tableData.OutStatus==1">部分出库</span>
<span v-if="tableData.OutStatus==2">全部出库</span>
</span>
<span class="topkuang">审核理由:{{tableData.ExamineReason}}</span>
</span>
<span class="topkuang">出库状态:
<span v-if="tableData.OutStatus==0">未出库</span>
<span v-if="tableData.OutStatus==1">部分出库</span>
<span v-if="tableData.OutStatus==2">全部出库</span>
</span>
<span class="topkuang">审核理由:{{tableData.ExamineReason}}</span> -->
<el-form class="MyEditForm" label-width="0">
<div class="basefix">
<el-form-item>
<span class="label" style="font-size:12px">申请状态</span>
<div style="padding:5px 15px">
<span style="color:#FFA87C" v-if="tableData.ApplyStatus==1">待审核</span>
<span style="color:#FFA87C" v-if="tableData.ApplyStatus==2">已审核</span>
<span style="color:#7B78FF;" v-if="tableData.ApplyStatus==3">拒绝</span>
</div>
</el-form-item>
<el-form-item>
<span class="label" style="font-size:12px">出库状态</span>
<div style="padding:5px 15px">
<span v-if="tableData.OutStatus==0">未出库</span>
<span v-if="tableData.OutStatus==1">部分出库</span>
<span v-if="tableData.OutStatus==2">全部出库</span>
</div>
</el-form-item>
<el-form-item>
<span class="label" style="font-size:12px">审核理由</span>
<div style="padding:5px 15px">
<span>{{tableData.ExamineReason}}</span>
</div>
</el-form-item>
</div>
</el-form>
</div>
<div>
<el-button v-if="tableData.ApplyStatus==1" class='butoons' type="primary" round @click="See(2)">审核</el-button>
......@@ -35,8 +67,8 @@
<!-- #e2e2e2 -->
<div>
<vxe-table stripe style="margin-top:15px" :loading="loading"
:data="tableData.WarehouseOutGoodsList">
<vxe-table stripe style="margin-top:15px" :loading="loading"
:data="tableData.WarehouseOutGoodsList" >
<vxe-table-column field="OrderNo" title="订单号" width='300'></vxe-table-column>
<vxe-table-column field="GoodsName" title="商品名称"></vxe-table-column>
<vxe-table-column field="Specification" title="规则" width='300'></vxe-table-column>
......@@ -44,8 +76,8 @@
<vxe-table-column field="Name" title="出库状态" width='180'>
<template v-slot="{ row }">
<span class="commonStyle hoverSpan1"></span>
<span v-if="row.IsOut==0">未出库</span>
<span v-if="row.IsOut==1">已出库</span>
<span v-if="row.IsOut==0" style='height:26px;line-height:26px'>未出库</span>
<span v-if="row.IsOut==1" style='height:26px;line-height:26px'>已出库</span>
</template>
</vxe-table-column>
......@@ -212,7 +244,7 @@ export default {
padding: 15px 0;
display: flex;
flex-direction: row;
align-items: center;
/* align-items: center; */
justify-content: space-between;
}
.outboundDetails .butoons{
......
src/components/assetsman/procurementDetails.vue
View file @ 1124f12b
......@@ -12,45 +12,64 @@
</div>
<div class="padContent">
<div class="xiangq">
<div>
<!-- <div>
<span class="topkuang">仓库名称: {{tableData.WareHouseName}}</span>
<span class="topkuang">备注: {{tableData.Remark}}</span>
</div>
</div> -->
<el-form class="MyEditForm" label-width="0">
<div class="basefix">
<el-form-item>
<span class="label" style="font-size:12px">仓库名称</span>
<div style="padding:5px 15px">
<span>{{tableData.WareHouseName}}</span>
</div>
</el-form-item>
<el-form-item>
<span class="label" style="font-size:12px">备注</span>
<div style="padding:5px 15px">
<span>{{tableData.Remark}}</span>
</div>
</el-form-item>
</div>
</el-form>
</div>
<div>
<vxe-table stripe style="margin-top:15px" :loading="loading"
:data="tableData.DetailList">
<vxe-table stripe style="margin-top:15px" :loading="loading"
:data="tableData.DetailList">
<vxe-table-column field="Id" title="ID" width='60'></vxe-table-column>
<vxe-table-column field="GoodsName" title="封面图" width='80'>
<template v-slot="{ row }">
<img :src="row.MaterialModel.ImageList[0]" alt="" style="width: 50px; height: 50px;">
</template>
</vxe-table-column>
<vxe-table-column field="Name" title="商品名称" >
<template v-slot="{ row }">
<span>{{row.MaterialModel.Name}}</span>
</template>
</vxe-table-column>
<vxe-table-column field="GoodsSpecificationList" title="规格" width='450' >
<template v-slot="{ row }">
<span v-for="(x,y) in row.MaterialModel.GoodsSpecificationList" :key="y">{{x}} <span v-if="row.MaterialModel.GoodsSpecificationList.length !== y+1"> , </span></span>
</template>
</vxe-table-column>
<vxe-table-column field="Number" title="采购数量" width='150'></vxe-table-column>
<vxe-table-column field="Id" title="ID" width='60'></vxe-table-column>
<vxe-table-column field="GoodsName" title="封面图" width='80'>
<vxe-table-column field="StockInNum" title="已入数量" width='150'>
<template v-slot="{ row }">
<img :src="row.MaterialModel.ImageList[0]" alt="" style="width: 50px; height: 50px;">
</template>
</vxe-table-column>
<vxe-table-column field="Name" title="商品名称" >
<template v-slot="{ row }">
<span>{{row.MaterialModel.Name}}</span>
<span>{{row.StockInNum!=null?row.StockInNum:0}}</span>
</template>
</vxe-table-column>
<vxe-table-column field="GoodsSpecificationList" title="规格" width='450' >
<template v-slot="{ row }">
<span v-for="(x,y) in row.MaterialModel.GoodsSpecificationList" :key="y">{{x}} <span v-if="row.MaterialModel.GoodsSpecificationList.length !== y+1"> , </span></span>
</template>
</vxe-table-column>
<vxe-table-column field="Number" title="采购数量" width='150'></vxe-table-column>
<vxe-table-column field="StockInNum" title="已入数量" width='150'>
<template v-slot="{ row }">
<span>{{row.StockInNum!=null?row.StockInNum:0}}</span>
</template>
</vxe-table-column>
</vxe-table>
</vxe-table-column>
</vxe-table>
</div>
......@@ -161,11 +180,11 @@ export default {
margin-right: 25px;
}
.procurementDetails .xiangq{
padding: 15px 0;
/* padding: 15px 0;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
justify-content: space-between; */
}
.procurementDetails .butoons{
/* float: right; */
......
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