|
|
@@ -316,7 +316,7 @@
|
|
|
:reserve-selection="true"
|
|
|
fixed="left"
|
|
|
/>
|
|
|
- <el-table-column
|
|
|
+ <!-- <el-table-column
|
|
|
v-if="columnsList[0].visible"
|
|
|
:key="columnsList[0].key"
|
|
|
label="索引号"
|
|
|
@@ -325,7 +325,7 @@
|
|
|
width="180"
|
|
|
show-overflow-tooltip
|
|
|
fixed="left"
|
|
|
- />
|
|
|
+ /> -->
|
|
|
<el-table-column
|
|
|
v-if="columnsList[1].visible"
|
|
|
:key="columnsList[1].key"
|
|
|
@@ -362,6 +362,19 @@
|
|
|
width="150"
|
|
|
show-overflow-tooltip
|
|
|
/>
|
|
|
+ <el-table-column
|
|
|
+ v-if="columnsList[21].visible"
|
|
|
+ :key="columnsList[21].key"
|
|
|
+ label="状态"
|
|
|
+ align="center"
|
|
|
+ prop="status"
|
|
|
+ width="120"
|
|
|
+ show-overflow-tooltip
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <dict-tag :type="'in_storage_status'" :value="scope.row.status" />
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column
|
|
|
v-if="columnsList[20].visible"
|
|
|
:key="columnsList[20].key"
|
|
|
@@ -469,7 +482,7 @@
|
|
|
width="120"
|
|
|
show-overflow-tooltip
|
|
|
/>
|
|
|
- <el-table-column
|
|
|
+ <!-- <el-table-column
|
|
|
v-if="columnsList[9].visible"
|
|
|
:key="columnsList[9].key"
|
|
|
label="是否拆批物料"
|
|
|
@@ -483,8 +496,8 @@
|
|
|
:value="scope.row.splitFlag"
|
|
|
/>
|
|
|
</template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
+ </el-table-column> -->
|
|
|
+ <!-- <el-table-column
|
|
|
v-if="columnsList[10].visible"
|
|
|
:key="columnsList[10].key"
|
|
|
label="被拆批物料条码"
|
|
|
@@ -492,8 +505,8 @@
|
|
|
prop="oldQrCodeSplit"
|
|
|
width="120"
|
|
|
show-overflow-tooltip
|
|
|
- />
|
|
|
- <el-table-column
|
|
|
+ /> -->
|
|
|
+ <!-- <el-table-column
|
|
|
v-if="columnsList[11].visible"
|
|
|
:key="columnsList[11].key"
|
|
|
label="是否合批物料"
|
|
|
@@ -507,8 +520,8 @@
|
|
|
:value="scope.row.mergeFlag"
|
|
|
/>
|
|
|
</template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column
|
|
|
+ </el-table-column> -->
|
|
|
+ <!-- <el-table-column
|
|
|
v-if="columnsList[12].visible"
|
|
|
:key="columnsList[12].key"
|
|
|
label="合批物料条码(已作废)"
|
|
|
@@ -516,8 +529,8 @@
|
|
|
prop="oldQrCodeMerge"
|
|
|
width="160"
|
|
|
show-overflow-tooltip
|
|
|
- />
|
|
|
- <el-table-column
|
|
|
+ /> -->
|
|
|
+ <!-- <el-table-column
|
|
|
v-if="columnsList[13].visible"
|
|
|
:key="columnsList[13].key"
|
|
|
label="被合批物料条码(已作废)"
|
|
|
@@ -525,7 +538,7 @@
|
|
|
prop="mergeQrCode"
|
|
|
width="180"
|
|
|
show-overflow-tooltip
|
|
|
- />
|
|
|
+ /> -->
|
|
|
<el-table-column
|
|
|
label="操作"
|
|
|
align="center"
|
|
|
@@ -600,6 +613,8 @@ import LocationSelect from "../incoming/wareHousing/components/LocationSelect.vu
|
|
|
import { getFormColumnsList } from "@/api/system/saveColumns/index";
|
|
|
import { mapGetters } from "vuex";
|
|
|
import { isArray } from "min-dash";
|
|
|
+import { DICT_TYPE } from "@/utils/dict";
|
|
|
+import DictTag from "@/components/DictTag";
|
|
|
|
|
|
export default {
|
|
|
name: "MaterialDemolitionBatch",
|
|
|
@@ -611,6 +626,7 @@ export default {
|
|
|
AreaSelect,
|
|
|
LabelPrinter,
|
|
|
LocationSelect,
|
|
|
+ DictTag,
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
@@ -693,6 +709,7 @@ export default {
|
|
|
{ key: 1, label: "物料批次", visible: true },
|
|
|
{ key: 2, label: "物料编码", visible: true },
|
|
|
{ key: 3, label: "物料名称", visible: true },
|
|
|
+ { key: 21, label: "状态", visible: true },
|
|
|
{ key: 20, label: "呆滞料超期天数", visible: true },
|
|
|
{ key: 4, label: "仓库", visible: true },
|
|
|
{ key: 5, label: "区域", visible: true },
|