Skip to content

肖康 / cloudSystem

Go to a project
Commit 656c1186 by LJM
Options

跳转地址的

parent 500203e7
Inline Side-by-side
Showing with 22 additions and 14 deletions
src/views/List/inquire.vue
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
<!--未成单--> <!--未成单-->
<span v-if="scope.row.is_purchased == 0">{{ scope.row.is_purchased_val }}</span> <span v-if="scope.row.is_purchased == 0">{{ scope.row.is_purchased_val }}</span>
<!--成单--> <!--成单-->
<a target="_blank" v-if="scope.row.is_purchased == 1" class="alink" :href="'/#/orderTrackGoods?inquiry_item_id='+scope.row.id">{{ scope.row.is_purchased_val }}</a> <a v-if="scope.row.is_purchased == 1" class="alink" :href="'/#/orderTrackGoods?inquiry_item_id='+scope.row.id">{{ scope.row.is_purchased_val }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="customer_tag" label="客户性质" width="80" :show-overflow-tooltip="true" align="center"></el-table-column> <el-table-column prop="customer_tag" label="客户性质" width="80" :show-overflow-tooltip="true" align="center"></el-table-column>
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag v-if="scope.row.quote_status==1" type="info">确认中</el-tag> <el-tag v-if="scope.row.quote_status==1" type="info">确认中</el-tag>
<el-tag v-else-if="scope.row.quote_status==2" type="success">已选中</el-tag> <el-tag v-else-if="scope.row.quote_status==2" type="success">已选中</el-tag>
<a v-else-if="scope.row.quote_status==3" class="alink" target="_blank" :href="'/#/orderTrackGoods?inquiry_item_id='+scope.row.inquiry_items_id">已成单</a> <a v-else-if="scope.row.quote_status==3" class="alink" :href="'/#/orderTrackGoods?inquiry_item_id='+scope.row.inquiry_items_id">已成单</a>
<el-tag v-else-if="scope.row.quote_status==4" type="warning">已关闭</el-tag> <el-tag v-else-if="scope.row.quote_status==4" type="warning">已关闭</el-tag>
<el-tag v-else-if="scope.row.quote_status==7">待确认</el-tag> <el-tag v-else-if="scope.row.quote_status==7">待确认</el-tag>
<template v-if="scope.row.status_tips"> <template v-if="scope.row.status_tips">
......
src/views/OrderTrack/goods.vue
...@@ -106,9 +106,9 @@ ...@@ -106,9 +106,9 @@
</el-table-column> </el-table-column>
<el-table-column prop="shipping_status_val" label="发货状态" width="100" align="center"> <el-table-column prop="shipping_status_val" label="发货状态" width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag type="primary" v-if="scope.row.shipping_status_val == '待发货'" disable-transitions>{{ scope.row.shipping_status_val }}</el-tag> <span v-if="scope.row.shipping_status_val == '待发货'">{{ scope.row.shipping_status_val }}</span>
<el-tag type="warning" v-if="scope.row.shipping_status_val == '部分发货'" disable-transitions>{{ scope.row.shipping_status_val }}</el-tag> <span class="f-yellow1" v-if="scope.row.shipping_status_val == '部分发货'">{{ scope.row.shipping_status_val }}</span>
<el-tag type="success" v-if="scope.row.shipping_status_val == '全部发货'" disable-transitions>{{ scope.row.shipping_status_val }}</el-tag> <a class="alink" v-if="scope.row.shipping_status_val == '全部发货'" :href="'/#/orderTrackInvoice?purchase_id='+scope.row.purchase_id">{{ scope.row.shipping_status_val }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="buyer_name" label="订单人员" width="100" align="center"> <el-table-column prop="buyer_name" label="订单人员" width="100" align="center">
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
</el-popover> </el-popover>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="source_type" label="订单来源" width="100" align="center"> <el-table-column prop="source_type" label="订单来源" width="150" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.source_type }}</span> <span>{{ scope.row.source_type }}</span>
<el-tooltip :aa="scope" class="item" effect="dark" placement="top-start"> <el-tooltip :aa="scope" class="item" effect="dark" placement="top-start">
...@@ -365,7 +365,7 @@ export default { ...@@ -365,7 +365,7 @@ export default {
} }
em { em {
color: #FF0000; color: #D9001B;
font-weight: bold; font-weight: bold;
margin-right: 15px; margin-right: 15px;
} }
......
src/views/OrderTrack/invoice.vue
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<el-table :data="tableData" border max-height="600" @selection-change="handleSelectionChange"> <el-table :data="tableData" border max-height="600" @selection-change="handleSelectionChange">
<el-table-column fixed type="selection" width="40" align="center"></el-table-column> <el-table-column fixed type="selection" width="40" align="center"></el-table-column>
<el-table-column label="发货信息"> <el-table-column label="发货信息">
<el-table-column prop="stock_in_sn" label="发货单号" width="160" :show-overflow-tooltip="true" align="center"></el-table-column> <el-table-column prop="stock_in_sn" label="发货单号" width="160" :show-overflow-tooltip="true"></el-table-column>
<el-table-column prop="goods_name" label="型号" min-width="150" :show-overflow-tooltip="true" align="center"></el-table-column> <el-table-column prop="goods_name" label="型号" min-width="150" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="brand_name" label="品牌" min-width="150" :show-overflow-tooltip="true" align="center"></el-table-column> <el-table-column prop="brand_name" label="品牌" min-width="150" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="out_qty" label="发货数量" min-width="80" :show-overflow-tooltip="true" align="center"></el-table-column> <el-table-column prop="out_qty" label="发货数量" min-width="80" :show-overflow-tooltip="true" align="center"></el-table-column>
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
<el-table-column prop="create_time" label="创建时间" width="150" align="center"></el-table-column> <el-table-column prop="create_time" label="创建时间" width="150" align="center"></el-table-column>
</el-table-column> </el-table-column>
<el-table-column label="质检信息"> <el-table-column label="质检信息">
<el-table-column prop="qc_type_val" label="质检结果" width="100" align="center"> <el-table-column prop="qc_type_val" label="质检结果" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<template v-if="scope.row.qc_type_val"> <template v-if="scope.row.qc_type_val">
<span>{{ scope.row.qc_type_val }}</span> <span>{{ scope.row.qc_type_val }}</span>
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
<el-table-column prop="silk_screen" label="丝印" width="100" align="center"></el-table-column> <el-table-column prop="silk_screen" label="丝印" width="100" align="center"></el-table-column>
<el-table-column prop="" label="质检图片" width="100" align="center"> <el-table-column prop="" label="质检图片" width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<template v-if="scope.row.is_upload_image == 0">暂无图片</template> <template v-if="scope.row.is_upload_image == 0">-</template>
<template v-else> <template v-else>
<a href="javascript:;" class="alink" @click="viewPic(scope.row.qc_id)">查看图片</a> <a href="javascript:;" class="alink" @click="viewPic(scope.row.qc_id)">查看图片</a>
</template> </template>
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="" label="质检附件" width="100" align="center"> <el-table-column prop="" label="质检附件" width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<template v-if="scope.row.is_upload_attachment == 0">暂无附件</template> <template v-if="scope.row.is_upload_attachment == 0">-</template>
<template v-else> <template v-else>
<a href="javascript:;" class="alink" @click="viewPic(scope.row.qc_id,2)">查看附件</a> <a href="javascript:;" class="alink" @click="viewPic(scope.row.qc_id,2)">查看附件</a>
</template> </template>
...@@ -154,6 +154,8 @@ export default { ...@@ -154,6 +154,8 @@ export default {
qc_time_val: '',//质检时间 qc_time_val: '',//质检时间
qcImage: [],//质检图片 qcImage: [],//质检图片
qcAttachments: [],//质检附件 qcAttachments: [],//质检附件
purchase_id: '',//记录从已采购订单页面跳转来的
stock_in_sn: '',//记录从退货单页面跳转来的
formInline: { formInline: {
create_time: '',//创建时间 create_time: '',//创建时间
qc_time: '',//质检时间 qc_time: '',//质检时间
...@@ -167,6 +169,8 @@ export default { ...@@ -167,6 +169,8 @@ export default {
}; };
}, },
created() { created() {
this.purchase_id = this.$route.query.purchase_id || '';
this.stock_in_sn = this.$route.query.stock_in_sn || '';
this.getData(); this.getData();
}, },
computed: {}, computed: {},
...@@ -183,7 +187,7 @@ export default { ...@@ -183,7 +187,7 @@ export default {
} else { } else {
this.formInline.qc_time = ''; this.formInline.qc_time = '';
} }
var params = Object.assign({}, {page: this.page}, {limit: this.limit}, this.formInline) var params = Object.assign({}, {page: this.page}, {limit: this.limit}, this.formInline, {purchase_id: this.purchase_id}, {stock_in_sn: this.stock_in_sn});
this.$http('post', "/api/purchase/getDeliveryList", params).then(res => { this.$http('post', "/api/purchase/getDeliveryList", params).then(res => {
if (res.code === 0) { if (res.code === 0) {
this.tableData = res.data.list || []; this.tableData = res.data.list || [];
......
src/views/OrderTrack/returnGoods.vue
...@@ -43,7 +43,11 @@ ...@@ -43,7 +43,11 @@
<!--列表区--> <!--列表区-->
<div class="data-box th-all" v-if="tableData"> <div class="data-box th-all" v-if="tableData">
<el-table :data="tableData" border max-height="600" @selection-change="handleSelectionChange"> <el-table :data="tableData" border max-height="600" @selection-change="handleSelectionChange">
<el-table-column prop="stock_in_sn" label="对应发货单" width="160" :show-overflow-tooltip="true" align="center"></el-table-column> <el-table-column prop="stock_in_sn" label="对应发货单" width="160" :show-overflow-tooltip="true" align="center">
<template slot-scope="scope">
<a class="alink" :href="'/#/orderTrackInvoice?stock_in_sn='+scope.row.stock_in_sn">{{ scope.row.stock_in_sn }}</a>
</template>
</el-table-column>
<el-table-column prop="status_val" label="状态" width="100" :show-overflow-tooltip="true" align="center"> <el-table-column prop="status_val" label="状态" width="100" :show-overflow-tooltip="true" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag type="danger" v-if="scope.row.status==-3">作废</el-tag> <el-tag type="danger" v-if="scope.row.status==-3">作废</el-tag>
...@@ -143,7 +147,7 @@ export default { ...@@ -143,7 +147,7 @@ export default {
this.getData(); this.getData();
}, },
resetForm(formName) { resetForm(formName) {
this.create_time_val=''; this.create_time_val = '';
this.$refs[formName].resetFields(); this.$refs[formName].resetFields();
}, },
/** /**
......
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 sign in to comment