|
|
@@ -76,55 +76,61 @@
|
|
|
>
|
|
|
<el-form
|
|
|
ref="form"
|
|
|
- :model="oilOpen"
|
|
|
+ :model="oilForm"
|
|
|
:rules="rules"
|
|
|
label-width="80px"
|
|
|
label-position="top"
|
|
|
>
|
|
|
<el-row>
|
|
|
-
|
|
|
<el-col :span="11">
|
|
|
<el-form-item label="类型" prop="oilClass">
|
|
|
<el-input
|
|
|
- v-model="oilOpen.oilClass"
|
|
|
+ v-model="oilForm.oilClass"
|
|
|
placeholder="请输入油品类型"
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
|
|
|
+
|
|
|
<el-col :span="11" :offset="1">
|
|
|
<el-form-item label="品名" prop="oilName">
|
|
|
- <el-input
|
|
|
- v-model="oilOpen.oilName"
|
|
|
+ <el-select
|
|
|
+ v-model="oilForm.oilName"
|
|
|
placeholder="请输入品名"
|
|
|
- />
|
|
|
+ clearable
|
|
|
+ size="small"
|
|
|
+ @change="onOilNameChang"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="dict in filterOilList"
|
|
|
+ :key="dict.dictLabel"
|
|
|
+ :label="dict.dictLabel"
|
|
|
+ :value="dict.dictLabel"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
-
|
|
|
<el-col :span="11">
|
|
|
<el-form-item label="型号" prop="oilType">
|
|
|
- <el-input
|
|
|
- v-model="oilOpen.oilType"
|
|
|
- placeholder="请输入型号"
|
|
|
- />
|
|
|
+ <el-input v-model="oilForm.oilType" placeholder="请输入型号" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
-
|
|
|
+<!--
|
|
|
<el-col :span="11" :offset="1">
|
|
|
<el-form-item label="单位" prop="unitCode">
|
|
|
<el-select
|
|
|
- v-model="oilForm.type"
|
|
|
- placeholder="请选择单位"
|
|
|
- clearable
|
|
|
- :style="{ width: '100%' }"
|
|
|
- >
|
|
|
- <el-option label="升" value="1"></el-option>
|
|
|
- <el-option label="千克" value="2"></el-option>
|
|
|
- <el-option label="公斤" value="3"></el-option>
|
|
|
- </el-select>
|
|
|
+ v-model="oilForm.type"
|
|
|
+ placeholder="请选择单位"
|
|
|
+ clearable
|
|
|
+ :style="{ width: '100%' }"
|
|
|
+ >
|
|
|
+ <el-option label="升" value="1"></el-option>
|
|
|
+ <el-option label="千克" value="2"></el-option>
|
|
|
+ <el-option label="公斤" value="3"></el-option>
|
|
|
+ </el-select>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
-
|
|
|
+ -->
|
|
|
</el-row>
|
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
@@ -156,6 +162,7 @@ export default {
|
|
|
components: { Treeselect },
|
|
|
data() {
|
|
|
return {
|
|
|
+ allOilList: [],
|
|
|
regionDataOptions: regionData, // 地址组件
|
|
|
selectedRegionData: [],
|
|
|
// 遮罩层
|
|
|
@@ -285,18 +292,33 @@ export default {
|
|
|
groupOpen: false,
|
|
|
oilOpen: true,
|
|
|
oilForm: {
|
|
|
- oilClass:"",//类型
|
|
|
- oilName:"", // 品名
|
|
|
- oilType:"",//型号
|
|
|
- unitCode:'1'// 单位 1L 2kg 3公斤
|
|
|
+ oilClass: "", //类型
|
|
|
+ oilName: "", // 品名
|
|
|
+ oilType: "", //型号
|
|
|
},
|
|
|
};
|
|
|
},
|
|
|
created() {
|
|
|
this.getList();
|
|
|
+ this.getDicts("oil_name").then((response) => {
|
|
|
+ this.allOilList = response.data;
|
|
|
+ });
|
|
|
+ },
|
|
|
+ computed: {
|
|
|
+ filterOilList() {
|
|
|
+ return this.allOilList.filter((ele) => {
|
|
|
+ let flag = true;
|
|
|
+ this.addedOilList.map((item) => {
|
|
|
+ if (item.oilName === ele.dictLabel) {
|
|
|
+ flag = false;
|
|
|
+ }
|
|
|
+ });
|
|
|
+ return flag;
|
|
|
+ });
|
|
|
+ },
|
|
|
},
|
|
|
methods: {
|
|
|
- handlePayAdd(){
|
|
|
+ handlePayAdd() {
|
|
|
this.oilForm = {};
|
|
|
this.oilOpen = true;
|
|
|
},
|
|
|
@@ -388,7 +410,6 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
-
|
|
|
},
|
|
|
};
|
|
|
</script>
|
Joe