|
|
@@ -26,7 +26,7 @@
|
|
|
</el-form-item>
|
|
|
<el-form-item label="物资类型" prop="materialsTypeId">
|
|
|
<treeselect
|
|
|
- style="width: 215px"
|
|
|
+ style="width: 210px"
|
|
|
v-model="queryParams.materialsTypeId"
|
|
|
:options="materialstypeOptions"
|
|
|
:normalizer="materialnormalizer"
|
|
|
@@ -92,6 +92,16 @@
|
|
|
>
|
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="操作类型" prop="operateType">
|
|
|
+ <el-select v-model="queryParams.operateType" placeholder="请选择操作类型">
|
|
|
+ <el-option
|
|
|
+ v-for="dict in dict.type.material_change_type"
|
|
|
+ :key="dict.value"
|
|
|
+ :label="dict.label"
|
|
|
+ :value="dict.value"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item>
|
|
|
<el-button
|
|
|
v-no-more-click
|
|
|
@@ -192,6 +202,16 @@
|
|
|
<span v-else>-</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ label="操作类型"
|
|
|
+ align="center"
|
|
|
+ prop="operateType"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span v-if="scope.row.operateType==3">维修</span>
|
|
|
+ <span v-else>更换</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
<!-- <el-table-column-->
|
|
|
<!-- label="操作"-->
|
|
|
<!-- align="center"-->
|
|
|
@@ -376,7 +396,7 @@ export default {
|
|
|
}
|
|
|
|
|
|
},
|
|
|
- dicts: ['material_status','checking_status'],
|
|
|
+ dicts: ['material_status','checking_status','material_change_type'],
|
|
|
data() {
|
|
|
return {
|
|
|
//自动生成编码
|
|
|
@@ -415,7 +435,8 @@ export default {
|
|
|
newMaterialsId:'',
|
|
|
newMaterialsRfid:'',
|
|
|
changeUserName:'',
|
|
|
- recordId:''
|
|
|
+ recordId:'',
|
|
|
+ operateType:'',//操作类型
|
|
|
},
|
|
|
title:'',
|
|
|
// 表单参数
|