|
|
@@ -27,7 +27,6 @@
|
|
|
<el-button
|
|
|
style="margin-left:10px;"
|
|
|
type="primary"
|
|
|
- :disabled="disSearch"
|
|
|
@click="onSearch"
|
|
|
>查询</el-button>
|
|
|
</el-form-item>
|
|
|
@@ -41,10 +40,6 @@
|
|
|
<el-table-column align="center" prop="msg" label="消息文本"></el-table-column>
|
|
|
<el-table-column align="center" prop="status_text" label="消息类型文本"></el-table-column>
|
|
|
<el-table-column align="center" prop="datetime" label="消息日期"></el-table-column>
|
|
|
-
|
|
|
- <!-- <el-table-column align="center" prop="pic" label="图片">
|
|
|
- <el-image style="width:100%;height:80px;"></el-image>
|
|
|
- </el-table-column> -->
|
|
|
</el-table>
|
|
|
<el-row style="margin-top:10px;" type="flex" justify="end">
|
|
|
<el-pagination
|
|
|
@@ -63,7 +58,7 @@ import { msgList, cabinetList, boxList } from "@/api";
|
|
|
export default {
|
|
|
data() {
|
|
|
return {
|
|
|
- pageSize: 1,
|
|
|
+ pageSize: 20,
|
|
|
pageNumber: 1,
|
|
|
cabinetValue: "",
|
|
|
cabinetOptions: [],
|
|
|
@@ -104,18 +99,25 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
getBoxActionList() {
|
|
|
- msgList({
|
|
|
- cabinet_number: this.cabinetValue,
|
|
|
- box_number: this.boxValue,
|
|
|
- pageSize: this.pageSize,
|
|
|
- pageNumber: this.pageNumber,
|
|
|
- }).then((res) => {
|
|
|
- console.log(res);
|
|
|
- if (res && res.msg == "ok") {
|
|
|
- this.total = res.data.total;
|
|
|
- this.tableData = res.data.rows;
|
|
|
- }
|
|
|
- });
|
|
|
+ console.log(this.cabinetValue)
|
|
|
+ let cabinet = this.cabinetValue ? this.cabinetValue : 0;
|
|
|
+ let box = this.boxValue ? this.boxValue : 0;
|
|
|
+ if(box > 0 && cabinet == 0) {
|
|
|
+ alert("选定了箱子，必须选定柜子");
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ msgList({
|
|
|
+ cabinet_number: this.cabinetValue,
|
|
|
+ box_number: this.boxValue,
|
|
|
+ pageSize: this.pageSize,
|
|
|
+ pageNumber: this.pageNumber,
|
|
|
+ }).then((res) => {
|
|
|
+ console.log(res);
|
|
|
+ if (res && res.msg == "ok") {
|
|
|
+ this.total = res.data.total;
|
|
|
+ this.tableData = res.data.rows;
|
|
|
+ }
|
|
|
+ });
|
|
|
},
|
|
|
onPageChange(page) {
|
|
|
if (page == this.pageNumber) {
|
stanley-king