Commit ce93e134 authored by 黄媛媛's avatar 黄媛媛

修改

parent 49d1f1c1
...@@ -40,16 +40,26 @@ ...@@ -40,16 +40,26 @@
<vxe-table-column field="OutNo" title="出库订单号"></vxe-table-column> <vxe-table-column field="OutNo" title="出库订单号"></vxe-table-column>
<vxe-table-column field="Delivered" title="已发货数"></vxe-table-column> <vxe-table-column field="Delivered" title="已发货数"></vxe-table-column>
<vxe-table-column field="NotOutStock" title="未发货数"></vxe-table-column> <vxe-table-column field="NotOutStock" title="未发货数"></vxe-table-column>
<vxe-table-column field="Name" title="资产状态">
<template v-slot="{ row }">
<span v-if="row.OutStatus==1">未出库</span>
<span v-if="row.OutStatus==2">部分出库</span>
<span v-if="row.OutStatus==3">全部出库</span>
</template>
</vxe-table-column>
<vxe-table-column field="address" title="操作"> <vxe-table-column field="address" title="操作">
<template v-slot="{ row }"> <template v-slot="{ row }">
<el-tooltip class="item" effect="dark" content="审批" placement="top"> <!-- <el-tooltip class="item" effect="dark" content="审批" placement="top">
<img @click="See(row,1)" style="width:24px;height:24px;margin-right:10px;" src="../../assets/img/shenpi.png" alt=""> <img @click="See(row,1)" style="width:24px;height:24px;margin-right:10px;" src="../../assets/img/shenpi.png" alt="">
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="拒绝" placement="top"> <el-tooltip class="item" effect="dark" content="拒绝" placement="top">
<img @click="See(row,2)" style="width:24px;height:24px;margin-right:10px;" src="../../assets/img/qx.png" alt=""> <img @click="See(row,2)" style="width:24px;height:24px;margin-right:10px;" src="../../assets/img/qx.png" alt="">
</el-tooltip> </el-tooltip> -->
<el-tooltip class="item" effect="dark" content="查看详情" placement="top" >
<img @click="SeeDetails(row,'/outboundDetails')" style="width:24px;height:24px;margin-right:10px;" src="../../assets/img/chakan.png" alt="" />
</el-tooltip>
<el-tooltip class="item" effect="dark" content="出库" placement="top"> <el-tooltip class="item" effect="dark" content="出库" placement="top">
<span class="outBand_div" v-if="row.ApplyStatus==2&&(row.OutStatus==0||row.OutStatus==1)" @click="goUrl('outboundDetail',row.ID)"> <span class="outBand_div" v-if="row.ApplyStatus==2&&(row.OutStatus==0||row.OutStatus==1)" @click="goUrl('outboundDetail',row.ID)">
<i class="iconfont icon-chuku"></i> <i class="iconfont icon-chuku"></i>
...@@ -139,6 +149,15 @@ ...@@ -139,6 +149,15 @@
}, },
methods: { methods: {
SeeDetails(item,path){
this.$router.push({
path: path,
query: {
ID:item.ID
}
});
},
getList() { getList() {
this.loading = true; this.loading = true;
this.apiJavaPost( this.apiJavaPost(
......
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
<div class="xiangq"> <div class="xiangq">
<div> <div>
<span class="topkuang">申请状态: <span class="topkuang">申请状态:
<span v-if="tableData.ApplyStatus==1">待审核</span> <span style="color:#FFA87C" v-if="tableData.ApplyStatus==1">待审核</span>
<span v-if="tableData.ApplyStatus==2">已审核</span> <span style="color:#FFA87C" v-if="tableData.ApplyStatus==2">已审核</span>
<span v-if="tableData.ApplyStatus==3">拒绝</span> <span style="color:#7B78FF;" v-if="tableData.ApplyStatus==3">拒绝</span>
</span> </span>
<span class="topkuang">出库状态: <span class="topkuang">出库状态:
<span v-if="tableData.OutStatus==0">未出库</span> <span v-if="tableData.OutStatus==0">未出库</span>
......
...@@ -87,6 +87,11 @@ export default { ...@@ -87,6 +87,11 @@ export default {
name: 'outboundDetail', name: 'outboundDetail',
component: resolve => require(['@/components/assetsman/outboundDetail'], resolve), component: resolve => require(['@/components/assetsman/outboundDetail'], resolve),
}, },
                {
                    path: '/outboundDetails', 
                    name: 'outboundDetails',
                    component: resolve => require(['@/components/assetsman/outboundDetails'], resolve),
            },
// 派发&退库 // 派发&退库
{ {
path: '/PaiTui', path: '/PaiTui',
......
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