Skip to content

肖康 / cloudSystem

Go to a project
Commit a07959a1 by LJM
Options

css

parent 1a6aa765
Inline Side-by-side
Showing with 101 additions and 42 deletions
src/views/OrderTrack/invoice.vue
...@@ -21,19 +21,19 @@ ...@@ -21,19 +21,19 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="质检结果" prop="status"> <el-form-item label="质检结果" prop="status">
<el-select v-model="formInline.status" placeholder="请选择"> <el-select v-model="formInline.qc_result_type" placeholder="请选择">
<el-option label="全部" value=""></el-option> <el-option label="全部" value=""></el-option>
<el-option label="待处理" value="1"></el-option> <el-option label="退货" value="1"></el-option>
<el-option label="正常入库" value="2"></el-option> <el-option label="正常入库" value="2"></el-option>
<el-option label="特批入库" value="-3"></el-option> <el-option label="特批入库" value="3"></el-option>
<el-option label="退货" value="-3"></el-option> <el-option label="待处理" value="4"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="创建时间"> <el-form-item label="创建时间">
<el-date-picker v-model="formInline.date" value-format="yyyy-MM-dd" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker> <el-date-picker v-model="create_time_val" value-format="yyyy-MM-dd" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="质检时间"> <el-form-item label="质检时间">
<el-date-picker v-model="formInline.date" value-format="yyyy-MM-dd" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker> <el-date-picker v-model="qc_time_val" value-format="yyyy-MM-dd" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" @click="submit">查询</el-button> <el-button type="primary" @click="submit">查询</el-button>
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<el-tag type="primary" v-else>{{ scope.row.status_val }}</el-tag> <el-tag type="primary" v-else>{{ scope.row.status_val }}</el-tag>
<el-tooltip :aa="scope" class="item" effect="dark" placement="top-start"> <el-tooltip :aa="scope" class="item" effect="dark" placement="top-start">
<i class="el-icon-question" style="color:#ff7e11;margin-left:5px;cursor:pointer;font-size:16px;"></i> <i class="el-icon-question" style="color:#ff7e11;margin-left:5px;cursor:pointer;font-size:16px;"></i>
<div slot="content">历史记录有过猎芯采购员跟我司采购过该型号品牌</div> <div slot="content">{{ scope.row.status_tips }}</div>
</el-tooltip> </el-tooltip>
</template> </template>
</el-table-column> </el-table-column>
...@@ -78,24 +78,54 @@ ...@@ -78,24 +78,54 @@
<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="create_time" label="质检结果" width="100" align="center"> <el-table-column prop="qc_type_val" label="质检结果" width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>正常入库</span> <span>{{ scope.row.qc_type_val }}</span>
<el-tooltip :aa="scope" class="item" effect="dark" placement="top-start"> <el-tooltip :aa="scope" class="item" effect="dark" placement="top-start">
<i class="el-icon-question" style="color:#ff7e11;margin-left:5px;cursor:pointer;font-size:16px;"></i> <i class="el-icon-question" style="color:#ff7e11;margin-left:5px;cursor:pointer;font-size:16px;"></i>
<div slot="content">历史记录有过猎芯采购员跟我司采购过该型号品牌</div> <div slot="content">{{ scope.row.qc_type_tips }}</div>
</el-tooltip> </el-tooltip>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="create_time" label="封装" width="150" align="center"></el-table-column> <el-table-column prop="package" label="封装" width="100" align="center"></el-table-column>
<el-table-column prop="create_time" label="丝印" width="150" align="center"></el-table-column> <el-table-column prop="silk_screen" label="丝印" width="100" align="center"></el-table-column>
<el-table-column prop="create_time" label="质检图片" width="150" align="center"></el-table-column> <el-table-column prop="" label="质检图片" width="100" align="center">
<el-table-column prop="create_time" label="质检附件" width="150" align="center"></el-table-column> <template slot-scope="scope">
<el-table-column prop="create_time" label="质检时间" width="150" align="center"></el-table-column> <template v-if="scope.row.is_upload_image == 0">暂无图片</template>
<template v-else>
<a href="javascript:;" class="alink" @click="viewPic(scope.row.qc_id)">查看图片</a>
</template>
</template>
</el-table-column>
<el-table-column prop="" label="质检附件" width="100" align="center">
<template slot-scope="scope">
<template v-if="scope.row.is_upload_attachment == 0">暂无附件</template>
<template v-else>
<a href="javascript:;" class="alink" @click="viewPic(scope.row.qc_id,2)">查看附件</a>
</template>
</template>
</el-table-column>
<el-table-column prop="qc_time" label="质检时间" width="150" align="center"></el-table-column>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-pagination layout="total, sizes, prev, pager, next, jumper" :page-sizes="[10, 20, 50, 100, 200]" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="page"></el-pagination> <el-pagination layout="total, sizes, prev, pager, next, jumper" :page-sizes="[10, 20, 50, 100, 200]" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="page"></el-pagination>
</div> </div>
<!--质检图片-->
<el-dialog title="质检图片" :close-on-click-modal="false" :visible.sync="dialogVisible" width="700px" class="xx">
<div class="pic-list row">
<template v-for="v in qcImage">
<el-image style="width: 100px; height: 100px" :src="v.small_image_url" :preview-src-list="v.big_image_url.split(',')"></el-image>
</template>
</div>
</el-dialog>
<!--质检附件-->
<el-dialog title="质检附件" :close-on-click-modal="false" :visible.sync="dialogFileVisible" width="700px" class="xx">
<div class="pic-list row">
<template v-for="v in qcAttachments">
<el-link type="primary" :href="v.file_url" target="_blank" style="margin-right: 5px">{{ v.file_name }}</el-link>
</template>
</div>
</el-dialog>
</div> </div>
<Menu/> <Menu/>
</section> </section>
...@@ -103,11 +133,11 @@ ...@@ -103,11 +133,11 @@
<script> <script>
import Vue from 'vue'; import Vue from 'vue';
import Menu from "@/components/menu.vue"; import Menu from "@/components/menu.vue";
import {Autocomplete, Button, DatePicker, Dialog, Form, FormItem, Input, Message, MessageBox, Option, Pagination, Select, Table, TableColumn, Tag} from 'element-ui' import {Autocomplete, Button, DatePicker, Dialog, Form, FormItem, Image, Input, Link, Message, MessageBox, Option, Pagination, Select, Table, TableColumn, Tag} from 'element-ui'
Vue.prototype.$message = Message; Vue.prototype.$message = Message;
Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Pagination); Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(Dialog).use(Pagination);
Vue.use(TableColumn).use(Table).use(Autocomplete).use(Tag).use(DatePicker); Vue.use(TableColumn).use(Table).use(Autocomplete).use(Tag).use(DatePicker).use(Image).use(Link);
export default { export default {
name: "orderTrackInvoice", name: "orderTrackInvoice",
data() { data() {
...@@ -116,9 +146,15 @@ export default { ...@@ -116,9 +146,15 @@ export default {
limit: 10, limit: 10,
page: 1, page: 1,
dialogVisible: false, dialogVisible: false,
dialogFileVisible: false,
logs: [], logs: [],
create_time_val: '',//创建时间
qc_time_val: '',//质检时间
qcImage: [],//质检图片
qcAttachments: [],//质检附件
formInline: { formInline: {
date: '', create_time: '',//创建时间
qc_time: '',//质检时间
stock_in_sn: "", stock_in_sn: "",
goods_name: '', goods_name: '',
brand_name: '', brand_name: '',
...@@ -134,14 +170,19 @@ export default { ...@@ -134,14 +170,19 @@ export default {
computed: {}, computed: {},
methods: { methods: {
getData() { getData() {
this.$http('post', "/api/purchase/getDeliveryList", { //格式化时间
page: this.page, if (this.create_time_val) {
limit: this.limit, this.formInline.create_time = this.create_time_val[0] + '~' + this.create_time_val[1];
stock_in_sn: this.formInline.stock_in_sn, } else {
brand_name: this.formInline.brand_name, this.formInline.create_time = '';
goods_name: this.formInline.goods_name, }
status: this.formInline.status, if (this.qc_time_val) {
}).then(res => { this.formInline.qc_time = this.qc_time_val[0] + '~' + this.qc_time_val[1];
} else {
this.formInline.qc_time = '';
}
var params = Object.assign({}, {page: this.page}, {limit: this.limit}, this.formInline)
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 || [];
this.total = Number(res.data.total) || 0; this.total = Number(res.data.total) || 0;
...@@ -150,6 +191,30 @@ export default { ...@@ -150,6 +191,30 @@ export default {
} }
}) })
}, },
/**
* 查看图片
*/
viewPic(qc_id, type) {
if (type == 2) {
this.$http('POST', "/api/purchase/getQcAttachments", {qc_id: qc_id}).then(res => {
if (res.code === 0) {
this.dialogFileVisible = true;
this.qcAttachments = res.data.list;
} else {
this.$message(res.msg);
}
})
} else {
this.$http('POST', "/api/purchase/getQcImages", {qc_id: qc_id}).then(res => {
if (res.code === 0) {
this.dialogVisible = true;
this.qcImage = res.data.list;
} else {
this.$message(res.msg);
}
})
}
},
handleCurrentChange(val) { handleCurrentChange(val) {
this.page = val; this.page = val;
this.getData(); this.getData();
...@@ -161,22 +226,6 @@ export default { ...@@ -161,22 +226,6 @@ export default {
handleSelectionChange(val) { handleSelectionChange(val) {
this.multipleSelection = val; this.multipleSelection = val;
}, },
getLogs(obj_type, obj_id) {
this.$http('GET', "/api/log/getLogs", {
obj_type: obj_type,
obj_id: obj_id
}).then(res => {
if (res.code === 0) {
this.dialogVisible = true;
this.logs = res.data.list;
} else {
this.$message({
message: res.msg,
type: 'warning'
});
}
});
},
submit() { submit() {
this.page = 1; this.page = 1;
this.getData(); this.getData();
...@@ -298,4 +347,13 @@ export default { ...@@ -298,4 +347,13 @@ export default {
</script> </script>
<style scoped> <style scoped>
@import "../../assets/css/goods/goods.min.css"; @import "../../assets/css/goods/goods.min.css";
.pic-list {
flex-wrap: wrap;
}
.pic-list .el-image {
margin-right: 10px;
margin-bottom: 10px;
}
</style> </style>
\ No newline at end of file
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