diff --git a/src/views/inventory/supInoutSearchOrder.vue b/src/views/inventory/supInoutSearchOrder.vue
new file mode 100644
index 00000000..ecb475cc
--- /dev/null
+++ b/src/views/inventory/supInoutSearchOrder.vue
@@ -0,0 +1,257 @@
+<template>
+ <div>
+ <el-card class="el-card">
+ <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
+ <el-row>
+ <el-col :span="6">
+ <el-form-item class="query-form-item" label="出入库单号:">
+ <el-input v-model="filterQuery.orderIdFk" placeholder="请输入出入库单号" style="width: 90%"
+ clearable="true"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item class="query-form-item" label="DI/物资编码:">
+ <el-input v-model="filterQuery.nameCode" placeholder="请输入DI/物资编码" style="width: 90%"
+ clearable="true"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item class="query-form-item" label="物资名称:">
+ <el-input v-model="filterQuery.coName" placeholder="请输入物资名称" style="width: 90%"
+ clearable="true"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item class="query-form-item" label="规格型号:">
+ <el-input v-model="filterQuery.spec" placeholder="请输入规格型号" style="width: 90%" clearable="true"></el-input>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="6">
+ <el-form-item class="query-form-item" label="批次号:">
+ <el-input v-model="filterQuery.batchNo" placeholder="请输入批次号" style="width: 90%"
+ clearable="true"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item class="query-form-item" label="注册/备案号:">
+ <el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="注册/备案号"
+ style="width: 90%"
+ clearable="true"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item class="query-form-item" label="生产企业:">
+ <el-input v-model="filterQuery.manufacturer" placeholder="生产企业"
+ style="width: 90%"
+ clearable="true"></el-input>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item class="query-form-item" label="出入库时间:">
+ <el-date-picker
+ :picker-options="pickerOptions"
+ v-model="actDateRange"
+ type="daterange"
+ format="yyyy 年 MM 月 dd 日"
+ value-format="yyyy-MM-dd"
+ range-separator="至"
+ start-placeholder="开始日期"
+ end-placeholder="结束日期"
+ style="width: 90%"
+ >
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ <div class="top-right-btn">
+ <el-button-group>
+ <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-refresh"
+ @click="onReset"
+ >重置
+ </el-button>
+ <el-button type="primary" icon="el-icon-search" @click="onSubmit"
+ >查询
+ </el-button
+ >
+ </el-button-group>
+ </div>
+ <el-divider style="margin: 15px"></el-divider>
+ <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row border>
+ <el-table-column label="序号" type="index"></el-table-column>
+ <el-table-column label="供应商" prop="fromCorpName" width="160" v-if="showSup"></el-table-column>
+ <el-table-column label="出入库单号" prop="orderIdFk" width="160"></el-table-column>
+ <el-table-column label="DI/物资编码" prop="nameCode" width="160"></el-table-column>
+ <el-table-column label="物资名称" prop="coName" width="160" show-overflow-tooltip></el-table-column>
+ <el-table-column label="规格型号" prop="spec" width="180" show-overflow-tooltip></el-table-column>
+ <el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
+ <el-table-column label="入库数量" prop="count" width="100"></el-table-column>
+ <el-table-column label="出库数量" prop="reCount" width="100" show-overflow-tooltip></el-table-column>
+ <el-table-column label="计量单位" prop="measname" width="120"></el-table-column>
+ <el-table-column label="单据类型" prop="billTypeName" width="120"></el-table-column>
+ <el-table-column label="生产日期" prop="productDate" width="120" show-overflow-tooltip></el-table-column>
+ <el-table-column label="失效日期" prop="expireDate" width="120" show-overflow-tooltip></el-table-column>
+ <el-table-column label="生产企业" prop="manufacturer" width="160" show-overflow-tooltip></el-table-column>
+ <el-table-column label="注册/备案号" prop="certCode" width="160" show-overflow-tooltip></el-table-column>
+ </el-table>
+
+ <pagination
+ v-show="total>0"
+ :total="total"
+ :limit.sync="filterQuery.limit"
+ :page.sync="filterQuery.page"
+ @pagination="getList"
+ ></pagination>
+ </el-card>
+ </div>
+</template>
+
+<script>
+import {getResultDetailList, getResultOrderList} from '@/api/inout/orderDetailResult'
+
+export default {
+ name: "supInoutSearchOrder",
+ data() {
+ return {
+ showSearch: true,
+ list: {},
+ filterQuery: {
+ id: "",
+ orderIdFk: null,
+ fromCorpName: null,
+ coName: null,
+ spec: null,
+ batchNo: null,
+ page: 1,
+ limit: 10,
+ startAduditTime: null,
+ endAduditTime: null,
+ actionType: "norDetail",
+ },
+ loading: false,
+ total: 0,
+ showSup: false,
+ customerId: this.$store.getters.customerId,
+ actDateRange: [],
+ actionType: "norDetail",
+ auditDateRange: [],
+ pickerOptions: {
+ shortcuts: [
+ {
+ text: "最近一周",
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+ picker.$emit("pick", [start, end]);
+ },
+ },
+ {
+ text: "最近一个月",
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+ picker.$emit("pick", [start, end]);
+ },
+ },
+ {
+ text: "最近三个月",
+ onClick(picker) {
+ const end = new Date();
+ const start = new Date();
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+ picker.$emit("pick", [start, end]);
+ },
+ },
+ ],
+ },
+ };
+ },
+ components: {},
+ methods: {
+ onReset() {
+ this.$router.push({
+ path: "",
+ });
+ this.filterQuery = {
+ id: "",
+ orderIdFk: null,
+ fromCorpName: null,
+ coName: null,
+ spec: null,
+ batchNo: null,
+ page: 1,
+ limit: 10,
+ startAduditTime: null,
+ endAduditTime: null,
+ };
+ this.getList();
+ },
+
+
+ onSubmit() {
+ this.loading = true;
+ if (this.actDateRange !== null) {
+ this.filterQuery.startAduditTime = this.actDateRange[0];
+ this.filterQuery.endAduditTime = this.actDateRange[1];
+ } else {
+ this.filterQuery.startAduditTime = null;
+ this.filterQuery.endAduditTime = null;
+ }
+ this.filterQuery.page = 1;
+
+ this.getList();
+ },
+ hideSearch() {
+ this.showSearch = !this.showSearch;
+ },
+ getList() {
+ this.loading = true;
+ this.filterQuery.actionType = this.actionType;
+ getResultOrderList(this.filterQuery)
+ .then((response) => {
+ if (response.code === 20000) {
+ this.list = response.data.list || [];
+ this.total = response.data.total || 0;
+ } else {
+ this.$message.error(response.message);
+ }
+ this.loading = false;
+ })
+ .catch(() => {
+ this.loading = false;
+ this.list = [];
+ this.total = 0;
+ });
+ },
+ }
+ ,
+ mounted() {
+ document.body.ondrop = function (event) {
+ event.preventDefault();
+ event.stopPropagation();
+ };
+ }
+ ,
+ created() {
+ let supId = this.$store.getters.customerId;
+ if (supId == "110") {
+ this.showSup = true;
+ }
+ this.actionType = this.$route.query.name;
+ this.getList();
+ }
+ ,
+}
+;
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
+
diff --git a/src/views/remind/invRemindMsg.vue b/src/views/remind/invRemindMsg.vue
index c6787515..05122f7d 100644
--- a/src/views/remind/invRemindMsg.vue
+++ b/src/views/remind/invRemindMsg.vue
@@ -136,7 +136,7 @@
<el-table-column type="index" label="序号" width="50"></el-table-column>
<el-table-column label="仓库名称" prop="invName" width="120"></el-table-column>
<el-table-column label="货位名称" prop="invSpaceName" width="120"></el-table-column>
- <el-table-column label="产品名称" prop="productName" width="180" show-overflow-tooltip></el-table-column>
+ <el-table-column label="物资名称" prop="productName" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="120" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="180" show-overflow-tooltip></el-table-column>
<el-table-column label="消息状态" prop="status" width="120">
diff --git a/src/views/remind/supCertRemindMsg.vue b/src/views/remind/supCertRemindMsg.vue
index 3523de67..bb0d7238 100644
--- a/src/views/remind/supCertRemindMsg.vue
+++ b/src/views/remind/supCertRemindMsg.vue
@@ -68,27 +68,30 @@
<el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row>
<el-table-column type="index" label="序号" width="50"></el-table-column>
- <el-table-column :label="msgName" prop="name" width="300"></el-table-column>
- <el-table-column label="证书名称" prop="certName" width="300"></el-table-column>
- <el-table-column label="有效期" prop="vailDate" width="200"></el-table-column>
- <el-table-column label="失效期" prop="expireDate" width="300" show-overflow-tooltip></el-table-column>
+ <el-table-column :label="msgName" prop="name" width="160" show-overflow-tooltip></el-table-column>
+ <el-table-column label="证书名称" prop="certName" width="160" show-overflow-tooltip></el-table-column>
+ <el-table-column label="有效期" prop="vailDate" width="120"></el-table-column>
+ <el-table-column label="失效期" prop="expireDate" width="120" show-overflow-tooltip></el-table-column>
<el-table-column label="消息状态" prop="status" width="100">
<template slot-scope="scope">
- <el-tag>{{ statusMap[scope.row.status] }}</el-tag>
- </template>
- </el-table-column>
- <el-table-column label="忽略预警" prop="ignoreStatus" width="100">
- <template slot-scope="scope">
- <el-tag>{{ ignoreStatusMap[scope.row.ignoreStatus] }}</el-tag>
+ <el-tag :type="statusFilterType(scope.row.status)">{{
+ statusMap[scope.row.status]
+ }}
+ </el-tag>
</template>
</el-table-column>
+ <!-- <el-table-column label="忽略预警" prop="ignoreStatus" width="100">-->
+ <!-- <template slot-scope="scope">-->
+ <!-- <el-tag>{{ ignoreStatusMap[scope.row.ignoreStatus] }}</el-tag>-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
<el-table-column label="预警类型" prop="type" width="150">
<template slot-scope="scope">
- <el-tag>{{ typeMap[scope.row.type] }}</el-tag>
+ <el-tag type="danger">{{ typeMap[scope.row.type] }}</el-tag>
</template>
</el-table-column>
- <el-table-column label="预警内容" prop="msg" show-overflow-tooltip></el-table-column>
- <el-table-column label="处理方式" prop="handleMsg" show-overflow-tooltip></el-table-column>
+ <el-table-column label="预警内容" prop="msg" show-overflow-tooltip width="180"></el-table-column>
+ <el-table-column label="处理方式" prop="handleMsg" show-overflow-tooltip width="180"></el-table-column>
<el-table-column label="操作" width="100" fixed="right">
<template slot-scope="scope">
<el-button
@@ -98,13 +101,13 @@
@click.native="confirmMsg(scope.row)"
>确认
</el-button>
- <el-button
- type="text"
- size="small"
- v-if="scope.row.ignoreStatus === 0"
- @click.native="ignoreMsg(scope.row)"
- >忽略
- </el-button>
+ <!-- <el-button-->
+ <!-- type="text"-->
+ <!-- size="small"-->
+ <!-- v-if="scope.row.ignoreStatus === 0"-->
+ <!-- @click.native="ignoreMsg(scope.row)"-->
+ <!-- >忽略-->
+ <!-- </el-button>-->
</template>
</el-table-column>
</el-table>
@@ -270,7 +273,13 @@ export default {
},
typeChange(val) {
this.msgName = this.msgNameMap[val];
- }
+ },
+ statusFilterType(status) {
+ const statusMap = {
+ 1: "warning",
+ 2: "success",
+ };
+ },
},
created() {
// 加载表格数据