|
@@ -147,7 +147,7 @@
|
|
<el-option
|
|
<el-option
|
|
:label="item.name"
|
|
:label="item.name"
|
|
:value="item.name"
|
|
:value="item.name"
|
|
- v-for="item in arrProductUnit"
|
|
|
|
|
|
+ v-for="item in productUnitList"
|
|
:key="item.value"></el-option>
|
|
:key="item.value"></el-option>
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
@@ -307,9 +307,6 @@ export default {
|
|
arrBrandList() {
|
|
arrBrandList() {
|
|
return this.$store.state.common.arrBrandList
|
|
return this.$store.state.common.arrBrandList
|
|
},
|
|
},
|
|
- arrProductUnit() {
|
|
|
|
- return this.$store.state.common.arrProductUnit
|
|
|
|
- },
|
|
|
|
myPickerOptions() {
|
|
myPickerOptions() {
|
|
const temp = this.exData.id && this.exData.product_sale_at > 0 ? this.exData.product_sale_at * 1000 : Date.now()
|
|
const temp = this.exData.id && this.exData.product_sale_at > 0 ? this.exData.product_sale_at * 1000 : Date.now()
|
|
return {
|
|
return {
|
|
@@ -317,6 +314,18 @@ export default {
|
|
return time.getTime() < temp - 8.64e7
|
|
return time.getTime() < temp - 8.64e7
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ },
|
|
|
|
+ productUnitList() {
|
|
|
|
+ const temp = this.$store.state.common.objSystemConfig
|
|
|
|
+ if (Object.prototype.toString.call(temp) === '[object Object]' && Array.isArray(temp.product_unit_list)) {
|
|
|
|
+ return temp.product_unit_list.map((item, index) => {
|
|
|
|
+ return {
|
|
|
|
+ name: item,
|
|
|
|
+ value: index
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ }
|
|
|
|
+ return []
|
|
}
|
|
}
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|