|
|
@@ -138,16 +138,16 @@
|
|
|
@keyup.enter.native="handleQuery"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
-<!-- <el-form-item label="物资柜状态" prop="status">-->
|
|
|
-<!-- <el-select v-model="queryParams.status" placeholder="物资柜状态">-->
|
|
|
-<!-- <el-option-->
|
|
|
-<!-- v-for="dict in dict.type.cabinet_status"-->
|
|
|
-<!-- :key="dict.value"-->
|
|
|
-<!-- :label="dict.label"-->
|
|
|
-<!-- :value="dict.value"-->
|
|
|
-<!-- />-->
|
|
|
-<!-- </el-select>-->
|
|
|
-<!-- </el-form-item>-->
|
|
|
+ <!-- <el-form-item label="物资柜状态" prop="status">-->
|
|
|
+ <!-- <el-select v-model="queryParams.status" placeholder="物资柜状态">-->
|
|
|
+ <!-- <el-option-->
|
|
|
+ <!-- v-for="dict in dict.type.cabinet_status"-->
|
|
|
+ <!-- :key="dict.value"-->
|
|
|
+ <!-- :label="dict.label"-->
|
|
|
+ <!-- :value="dict.value"-->
|
|
|
+ <!-- />-->
|
|
|
+ <!-- </el-select>-->
|
|
|
+ <!-- </el-form-item>-->
|
|
|
<el-form-item>
|
|
|
<el-button
|
|
|
v-no-more-click
|
|
|
@@ -222,7 +222,7 @@
|
|
|
/>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="异常原因" prop="exReason" width="100" >
|
|
|
+ <el-table-column label="异常原因" prop="exReason" width="100">
|
|
|
<template slot-scope="scope">
|
|
|
<dict-tag
|
|
|
:options="dict.type.exception_reason"
|
|
|
@@ -254,7 +254,7 @@
|
|
|
icon="el-icon-edit"
|
|
|
@click="handleUpdate(scope.row)"
|
|
|
v-hasPermi="['iscs:cabinet:edit']"
|
|
|
- >编辑
|
|
|
+ >修改
|
|
|
</el-button>
|
|
|
<el-button
|
|
|
v-no-more-click
|
|
|
@@ -305,15 +305,6 @@
|
|
|
placeholder="请输入物资柜名称"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="所属区域" prop="workstationId">
|
|
|
- <treeselect
|
|
|
- style="width: 348px"
|
|
|
- v-model="form.workstationId"
|
|
|
- :options="marsOptions"
|
|
|
- :normalizer="Marsnormalizer"
|
|
|
- placeholder="选择所属区域"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
<el-form-item label="物资柜图片" prop="cabinetPicture">
|
|
|
<ImageUploadSingle
|
|
|
:limit="1"
|
|
|
@@ -323,6 +314,15 @@
|
|
|
@onRemoved="handleIconRemoved"
|
|
|
></ImageUploadSingle>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="所属区域" prop="workstationId">
|
|
|
+ <treeselect
|
|
|
+ style="width: 348px"
|
|
|
+ v-model="form.workstationId"
|
|
|
+ :options="marsOptions"
|
|
|
+ :normalizer="Marsnormalizer"
|
|
|
+ placeholder="选择所属区域"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
<el-form-item label="备注" prop="remark">
|
|
|
<el-input
|
|
|
v-model="form.remark"
|
|
|
@@ -370,7 +370,7 @@ export default {
|
|
|
components: {
|
|
|
Treeselect,
|
|
|
},
|
|
|
- dicts: ["material_status", "cabinet_status",'exception_reason'],
|
|
|
+ dicts: ["material_status", "cabinet_status", "exception_reason"],
|
|
|
data() {
|
|
|
return {
|
|
|
//自动生成编码
|
|
|
@@ -719,7 +719,7 @@ export default {
|
|
|
selectMaterialsCabinetById(row.cabinetId).then((response) => {
|
|
|
this.form = response.data;
|
|
|
this.open = true;
|
|
|
- this.title = "编辑物资柜信息";
|
|
|
+ this.title = "修改物资柜信息";
|
|
|
this.optType = "edit";
|
|
|
});
|
|
|
},
|
|
|
@@ -746,11 +746,12 @@ export default {
|
|
|
});
|
|
|
},
|
|
|
/** 删除按钮操作 */
|
|
|
+ // confirm('是否确认删除编号为"' + cabinetCodes + '"的数据项？')
|
|
|
handleDelete(row) {
|
|
|
const cabinetIds = row.cabinetId || this.ids;
|
|
|
const cabinetCodes = row.cabinetCode || this.codes;
|
|
|
this.$modal
|
|
|
- .confirm('是否确认删除编号为"' + cabinetCodes + '"的数据项？')
|
|
|
+ .confirm("是否确认删除所选数据项？")
|
|
|
.then(function () {
|
|
|
return deleteMaterialsCabinet(cabinetIds);
|
|
|
})
|
