|
@@ -6,71 +6,7 @@
|
|
|
<div style="width: 100%">
|
|
|
<el-row style="padding: 20px 0 0 30px">
|
|
|
<el-col :span="24" style="width: 220px">
|
|
|
- <el-cascader
|
|
|
- placeholder="请选择仓库"
|
|
|
- filterable
|
|
|
- clearable
|
|
|
- :size="searchSize"
|
|
|
- v-model="value"
|
|
|
- :options="options"
|
|
|
- style="width: 100%"
|
|
|
- @change="
|
|
|
- pageInfo.curr = 1;
|
|
|
- parmValue.page = 1;
|
|
|
- stockName();
|
|
|
- "
|
|
|
- ></el-cascader>
|
|
|
-
|
|
|
- <!-- 请选择仓库 -->
|
|
|
- <!-- <el-col :span="5" style="width: 220px">
|
|
|
- <el-select
|
|
|
- :size="searchSize"
|
|
|
- v-model="parmValue.status"
|
|
|
- filterable
|
|
|
- clearable
|
|
|
- placeholder="请选择仓库"
|
|
|
- style="width: 100%"
|
|
|
- @change="
|
|
|
- pageInfo.curr = 1;
|
|
|
- parmValue.page = 1;
|
|
|
- searchList();
|
|
|
- "
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="item in stock"
|
|
|
- :key="item.id"
|
|
|
- :label="`${item.name} ${item.id}`"
|
|
|
- :value="item.id"
|
|
|
- />
|
|
|
- </el-select>
|
|
|
- </el-col> -->
|
|
|
-
|
|
|
- <!-- <el-col
|
|
|
- :span="4"
|
|
|
- style="width: 66px"
|
|
|
- >
|
|
|
- <el-button
|
|
|
- type="warning"
|
|
|
- class="fr"
|
|
|
- :size="searchSize"
|
|
|
- @click="restSearch"
|
|
|
- >
|
|
|
- 重置
|
|
|
- </el-button>
|
|
|
- </el-col>
|
|
|
- <el-col
|
|
|
- :span="3"
|
|
|
- style="width: 66px; float: right"
|
|
|
- >
|
|
|
- <el-button
|
|
|
- :size="searchSize"
|
|
|
- type="primary"
|
|
|
- style="float: right; margin-left: 5px"
|
|
|
- @click="searchList"
|
|
|
- >
|
|
|
- 刷新
|
|
|
- </el-button>
|
|
|
- </el-col> -->
|
|
|
+ <StockSearch :options="options" @searchCard="a()"></StockSearch>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
</div>
|
|
@@ -114,80 +50,10 @@
|
|
|
"
|
|
|
>
|
|
|
<template #table-header="{}">
|
|
|
- <div style="width: 100%; height: 30px"></div>
|
|
|
+ <div style="width: 100%; height: 30px; line-height: 30px">
|
|
|
+ <i class="el-icon-s-unfold" style="height: 10px"></i>库存操作记录
|
|
|
+ </div>
|
|
|
</template>
|
|
|
- <!-- <template #status="{ scope }">
|
|
|
- <el-tag
|
|
|
- :size="tablebtnSize"
|
|
|
- :type="scope.row.status == '0' ? 'warning' : ''"
|
|
|
- v-text="
|
|
|
- (statusOptions.find((item) => item.id == scope.row.status) || {})
|
|
|
- .label || '--'
|
|
|
- "
|
|
|
- ></el-tag>
|
|
|
- </template> -->
|
|
|
- <!-- <template #operation="{ scope }">
|
|
|
- <el-tooltip
|
|
|
- v-if="powers.some((item) => item == '002')"
|
|
|
- effect="dark"
|
|
|
- content="重置密码"
|
|
|
- placement="top"
|
|
|
- >
|
|
|
- <i
|
|
|
- class="el-icon-refresh-left tb-icon"
|
|
|
- @click="openPasswordModal(scope.row.id, false)"
|
|
|
- ></i>
|
|
|
- </el-tooltip>
|
|
|
-
|
|
|
- <el-tooltip
|
|
|
- v-if="powers.some((item) => item == '007')"
|
|
|
- effect="dark"
|
|
|
- content="详情"
|
|
|
- placement="top"
|
|
|
- >
|
|
|
- <i
|
|
|
- class="el-icon-view tb-icon"
|
|
|
- @click="openModal(scope.row.id, true, scope.row)"
|
|
|
- ></i>
|
|
|
- </el-tooltip>
|
|
|
- <el-tooltip
|
|
|
- v-if="powers.some((item) => item == '005')"
|
|
|
- effect="dark"
|
|
|
- content="修改"
|
|
|
- placement="top"
|
|
|
- >
|
|
|
- <i
|
|
|
- class="el-icon-edit tb-icon"
|
|
|
- @click="openModal(scope.row.id, false, scope.row)"
|
|
|
- ></i>
|
|
|
- </el-tooltip>
|
|
|
- <el-tooltip
|
|
|
- v-if="
|
|
|
- powers.some((item) => item == '004') && scope.row.status === '1'
|
|
|
- "
|
|
|
- effect="dark"
|
|
|
- content="禁用"
|
|
|
- placement="top"
|
|
|
- >
|
|
|
- <i
|
|
|
- class="el-icon-video-pause tb-icon"
|
|
|
- @click="statusConfirm(scope.row.id, scope.row.status)"
|
|
|
- ></i>
|
|
|
- </el-tooltip>
|
|
|
- <el-tooltip
|
|
|
- v-if="
|
|
|
- powers.some((item) => item == '004') && scope.row.status === '0'
|
|
|
- "
|
|
|
- effect="dark"
|
|
|
- content="启用"
|
|
|
- placement="top"
|
|
|
- >
|
|
|
- <i
|
|
|
- class="el-icon-video-play tb-icon"
|
|
|
- @click="statusConfirm(scope.row.id, scope.row.status)"
|
|
|
- ></i>
|
|
|
- </el-tooltip>
|
|
|
- </template> -->
|
|
|
</ex-table>
|
|
|
<add-edit
|
|
|
:id="modelId"
|
|
@@ -201,7 +67,6 @@
|
|
|
<div v-else>
|
|
|
<no-auth></no-auth>
|
|
|
</div>
|
|
|
-
|
|
|
<add-edit
|
|
|
:showModel="showModel"
|
|
|
:id="modelId"
|
|
@@ -221,6 +86,7 @@ import asyncRequest from "@/mock/service/stock/survey";
|
|
|
import countTo from "vue-count-to";
|
|
|
import addEdit from "./addEdit";
|
|
|
import { mapGetters } from "vuex";
|
|
|
+import StockSearch from "@/views/stock/allotFlow/components/stockSearch.vue";
|
|
|
|
|
|
export default {
|
|
|
name: "survey",
|
|
@@ -229,6 +95,7 @@ export default {
|
|
|
addEdit,
|
|
|
ExTable,
|
|
|
countTo,
|
|
|
+ StockSearch,
|
|
|
},
|
|
|
computed: {
|
|
|
...mapGetters(["tablebtnSize", "searchSize", "size"]),
|
|
@@ -287,6 +154,8 @@ export default {
|
|
|
endVal: 0,
|
|
|
},
|
|
|
],
|
|
|
+ arr1:[],
|
|
|
+
|
|
|
loading: true,
|
|
|
showModel: false,
|
|
|
isDetail: false,
|
|
@@ -296,7 +165,7 @@ export default {
|
|
|
// 表格 - 参数
|
|
|
stripe: true,
|
|
|
border: true,
|
|
|
- _defaultHeader_: ["setcol"],
|
|
|
+ // _defaultHeader_: ["setcol"],
|
|
|
},
|
|
|
// 表格 - 分页
|
|
|
pageInfo: {
|
|
@@ -367,11 +236,16 @@ export default {
|
|
|
},
|
|
|
mounted() {
|
|
|
this.searchList(); //获取表格信息
|
|
|
- this.stockList(); //获取卡片内库存数据信息
|
|
|
+ // this.stockList(); //获取卡片内库存数据信息
|
|
|
this.stockName(); //获取多级仓库列表信息
|
|
|
},
|
|
|
|
|
|
methods: {
|
|
|
+ wchange(e){
|
|
|
+
|
|
|
+ console.log(e);
|
|
|
+
|
|
|
+ },
|
|
|
restSearch() {
|
|
|
//清空入参参数
|
|
|
// this.parmValue = {
|
|
@@ -421,6 +295,10 @@ export default {
|
|
|
// console.log("取消");
|
|
|
// });
|
|
|
},
|
|
|
+ a() {
|
|
|
+ console.log("获取卡片数据");
|
|
|
+ this.stockList();
|
|
|
+ },
|
|
|
async stockList() {
|
|
|
//获取表格上方的卡片数据
|
|
|
// console.log(this.stock_list);
|
|
@@ -460,7 +338,7 @@ export default {
|
|
|
});
|
|
|
this.options.push(item);
|
|
|
});
|
|
|
- // console.log(this.options);
|
|
|
+ console.log(this.options);
|
|
|
// console.log(this.pageInfo.total);
|
|
|
},
|
|
|
async searchList() {
|