|
|
@@ -43,6 +43,36 @@
|
|
|
placeholder="请选择物资类型"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="物资规格种类" prop="propertyId">
|
|
|
+ <el-select
|
|
|
+ style="width: 215px"
|
|
|
+ v-model="queryParams.propertyId"
|
|
|
+ placeholder="请选择物资规格种类"
|
|
|
+ @change="handlePropertyChange"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="property in PropertyList"
|
|
|
+ :key="property.propertyId"
|
|
|
+ :label="property.propertyName"
|
|
|
+ :value="property.propertyId"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item label="物资规格" prop="recordId">
|
|
|
+ <el-select
|
|
|
+ style="width: 215px"
|
|
|
+ v-model="queryParams.recordId"
|
|
|
+ placeholder="请选择物资规格"
|
|
|
+ :disabled="!queryParams.propertyId"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="value in filteredPropertyValues"
|
|
|
+ :key="value.recordId"
|
|
|
+ :label="value.valueName"
|
|
|
+ :value="value.recordId"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item label="RFID" prop="materialsRfid">
|
|
|
<el-input
|
|
|
v-model="queryParams.materialsRfid"
|
|
|
@@ -102,36 +132,7 @@
|
|
|
/>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="物资规格种类" prop="propertyId">
|
|
|
- <el-select
|
|
|
- style="width: 215px"
|
|
|
- v-model="queryParams.propertyId"
|
|
|
- placeholder="请选择物资规格种类"
|
|
|
- @change="handlePropertyChange"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="property in PropertyList"
|
|
|
- :key="property.propertyId"
|
|
|
- :label="property.propertyName"
|
|
|
- :value="property.propertyId"
|
|
|
- />
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- <el-form-item label="物资规格" prop="recordId">
|
|
|
- <el-select
|
|
|
- style="width: 215px"
|
|
|
- v-model="queryParams.recordId"
|
|
|
- placeholder="请选择物资规格"
|
|
|
- :disabled="!queryParams.propertyId"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="value in filteredPropertyValues"
|
|
|
- :key="value.recordId"
|
|
|
- :label="value.valueName"
|
|
|
- :value="value.recordId"
|
|
|
- />
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
+
|
|
|
<el-form-item>
|
|
|
<el-button
|
|
|
v-no-more-click
|
|
|
@@ -222,7 +223,7 @@
|
|
|
prop="cabinetName"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
- <span v-if="scope.row.cabinetName">{{scope.row.cabinetName}}</span>
|
|
|
+ <span v-if="scope.row.cabinetName">{{ scope.row.cabinetName }}</span>
|
|
|
<span v-else>-</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -260,9 +261,11 @@
|
|
|
<span v-else>-</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="RFID" align="center" prop="materialsRfid" >
|
|
|
+ <el-table-column label="RFID" align="center" prop="materialsRfid">
|
|
|
<template slot-scope="scope">
|
|
|
- <span v-if="scope.row.materialsRfid">{{scope.row.materialsRfid}}</span>
|
|
|
+ <span v-if="scope.row.materialsRfid">{{
|
|
|
+ scope.row.materialsRfid
|
|
|
+ }}</span>
|
|
|
<span v-else>-</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
@@ -317,7 +320,7 @@
|
|
|
icon="el-icon-edit"
|
|
|
@click="handleUpdate(scope.row)"
|
|
|
v-hasPermi="['iscs:materials:edit']"
|
|
|
- >编辑
|
|
|
+ >修改
|
|
|
</el-button>
|
|
|
<el-button
|
|
|
v-no-more-click
|
|
|
@@ -346,6 +349,23 @@
|
|
|
</div>
|
|
|
<el-form ref="form" :model="form" :rules="rules" label-width="110px">
|
|
|
<el-row>
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-form-item label="绑定物资柜" prop="materialsCabinetId">
|
|
|
+ <el-select
|
|
|
+ :disabled="visibleSelect"
|
|
|
+ style="width: 348px"
|
|
|
+ v-model="form.materialsCabinetId"
|
|
|
+ placeholder="请选择绑定物资柜"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="dict in cabinets"
|
|
|
+ :key="dict.value"
|
|
|
+ :label="dict.label"
|
|
|
+ :value="dict.value"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="物资名称" prop="materialsName">
|
|
|
<el-input
|
|
|
@@ -354,6 +374,8 @@
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
+ </el-row>
|
|
|
+ <el-row>
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="物资类型" prop="materialsTypeId">
|
|
|
<treeselect
|
|
|
@@ -365,6 +387,37 @@
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-form-item label="物资规格" prop="properties">
|
|
|
+ <div
|
|
|
+ v-for="(property, index) in PropertyList"
|
|
|
+ :key="property.propertyId"
|
|
|
+ class="property-container"
|
|
|
+ >
|
|
|
+ <h3>{{ property.propertyName }}</h3>
|
|
|
+ <div class="property-values">
|
|
|
+ <!-- 循环渲染属性值 -->
|
|
|
+ <div
|
|
|
+ v-for="(value, valueIndex) in PropertyValueList.filter(
|
|
|
+ (v) => v.propertyId === property.propertyId
|
|
|
+ )"
|
|
|
+ :key="value.recordId"
|
|
|
+ :class="[
|
|
|
+ 'property-value',
|
|
|
+ {
|
|
|
+ selected:
|
|
|
+ selectedValues[property.propertyId] ===
|
|
|
+ value.recordId,
|
|
|
+ },
|
|
|
+ ]"
|
|
|
+ @click="selectValue(property.propertyId, value.recordId)"
|
|
|
+ >
|
|
|
+ {{ value.valueName }}
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
<el-col :span="12">
|
|
|
@@ -377,21 +430,24 @@
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="12">
|
|
|
- <el-form-item label="物资柜" prop="materialsCabinetId">
|
|
|
- <el-select
|
|
|
- :disabled="visibleSelect"
|
|
|
- style="width: 348px"
|
|
|
- v-model="form.materialsCabinetId"
|
|
|
- placeholder="请选择所属物资柜"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="dict in cabinets"
|
|
|
- :key="dict.value"
|
|
|
- :label="dict.label"
|
|
|
- :value="dict.value"
|
|
|
- />
|
|
|
- </el-select>
|
|
|
+ <el-col :span="12" style="height: 110px">
|
|
|
+ <el-form-item label="物资图片" prop="materialsTypePicture">
|
|
|
+ <div class="img-box2" v-if="form.materialsTypePicture">
|
|
|
+ <el-image
|
|
|
+ style="width: 90px; height: 90px"
|
|
|
+ :preview-teleported="true"
|
|
|
+ class="images"
|
|
|
+ :hide-on-click-modal="true"
|
|
|
+ :src="form.materialsTypePicture"
|
|
|
+ :zoom-rate="1.2"
|
|
|
+ :preview-src-list="[form.materialsTypePicture]"
|
|
|
+ :initial-index="1"
|
|
|
+ fit="cover"
|
|
|
+ >
|
|
|
+ </el-image>
|
|
|
+ <i class="el-icon-zoom-in" id="eyeicon"></i>
|
|
|
+ </div>
|
|
|
+ <span v-else>-</span>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -414,56 +470,6 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
- <el-row>
|
|
|
- <el-form-item label="物资规格" prop="properties">
|
|
|
- <div
|
|
|
- v-for="(property, index) in PropertyList"
|
|
|
- :key="property.propertyId"
|
|
|
- class="property-container"
|
|
|
- >
|
|
|
- <h3>{{ property.propertyName }}</h3>
|
|
|
- <div class="property-values">
|
|
|
- <!-- 循环渲染属性值 -->
|
|
|
- <div
|
|
|
- v-for="(value, valueIndex) in PropertyValueList.filter(
|
|
|
- (v) => v.propertyId === property.propertyId
|
|
|
- )"
|
|
|
- :key="value.recordId"
|
|
|
- :class="[
|
|
|
- 'property-value',
|
|
|
- {
|
|
|
- selected:
|
|
|
- selectedValues[property.propertyId] === value.recordId,
|
|
|
- },
|
|
|
- ]"
|
|
|
- @click="selectValue(property.propertyId, value.recordId)"
|
|
|
- >
|
|
|
- {{ value.valueName }}
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- </el-form-item>
|
|
|
- </el-row>
|
|
|
- <el-row style="height: 110px">
|
|
|
- <el-form-item label="物资图片" prop="materialsTypePicture">
|
|
|
- <div class="img-box2" v-if="form.materialsTypePicture">
|
|
|
- <el-image
|
|
|
- style="width: 90px; height: 90px"
|
|
|
- :preview-teleported="true"
|
|
|
- class="images"
|
|
|
- :hide-on-click-modal="true"
|
|
|
- :src="form.materialsTypePicture"
|
|
|
- :zoom-rate="1.2"
|
|
|
- :preview-src-list="[form.materialsTypePicture]"
|
|
|
- :initial-index="1"
|
|
|
- fit="cover"
|
|
|
- >
|
|
|
- </el-image>
|
|
|
- <i class="el-icon-zoom-in" id="eyeicon"></i>
|
|
|
- </div>
|
|
|
- <span v-else>-</span>
|
|
|
- </el-form-item>
|
|
|
- </el-row>
|
|
|
</el-form>
|
|
|
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
@@ -1055,7 +1061,7 @@ export default {
|
|
|
});
|
|
|
}
|
|
|
this.open = true;
|
|
|
- this.title = "编辑物资信息";
|
|
|
+ this.title = "修改物资信息";
|
|
|
this.optType = "edit";
|
|
|
// 设置 selectedValues
|
|
|
if (response.data.properties) {
|
|
|
@@ -1144,11 +1150,12 @@ export default {
|
|
|
},
|
|
|
|
|
|
/** 删除按钮操作 */
|
|
|
+ // confirm('是否确认删除编号为"' + materialsCodes + '"的数据项？')
|
|
|
handleDelete(row) {
|
|
|
const materialsIds = row.materialsId || this.ids;
|
|
|
const materialsCodes = row.materialsId || this.ids;
|
|
|
this.$modal
|
|
|
- .confirm('是否确认删除编号为"' + materialsCodes + '"的数据项？')
|
|
|
+ .confirm("是否确认删除所选数据项？")
|
|
|
.then(function () {
|
|
|
return deleteMaterials(materialsIds);
|
|
|
})
|
