zhouchijian
/
fe-drone-ci
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Made fuel type radio for uk, page refresh after closing popup

This commit is contained in:
Chad Derya 2019-09-10 16:49:16 +01:00
parent f7c2b15c46
commit 84a41f2276
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/PopUps/Delete/index.vue
View File

@ -28,7 +28,7 @@
<div v-else-if="viewState==='confirmation'"> <div v-else-if="viewState==='confirmation'">
<i :class="confirmation.icon" :style="confirmation.iconStyle" /> <i :class="confirmation.icon" :style="confirmation.iconStyle" />
<p>{{ confirmation.text }}</p> <p>{{ confirmation.text }}</p>
<el-button @click="dialogVisible = false"> <el-button @click="closePopup">
Close Close
</el-button> </el-button>
</div> </div>
@ -65,7 +65,6 @@ export default {
isNameCorrect: true, isNameCorrect: true,
input: '', input: '',
viewState: 'input', viewState: 'input',
Error: false,
confirmation: { confirmation: {
text: 'Request has been sent, waiting for a response from the servers', text: 'Request has been sent, waiting for a response from the servers',
icon: 'el-icon-loading', icon: 'el-icon-loading',
@ -94,6 +93,10 @@ export default {
iconStyle: 'font-size: 75px;' iconStyle: 'font-size: 75px;'
} }
}, },
closePopup() {
this.dialogVisible = false
this.$emit('success', true)
},
checkAllSuccess() { checkAllSuccess() {
return Object.keys(this.listObj).every(item => this.listObj[item].hasSuccess) return Object.keys(this.listObj).every(item => this.listObj[item].hasSuccess)
}, },
@ -121,14 +124,13 @@ export default {
icon: 'el-icon-circle-check', icon: 'el-icon-circle-check',
iconStyle: 'font-size: 75px; color: green;' iconStyle: 'font-size: 75px; color: green;'
} }
this.$emit('success', true)
} else if (!response || response === 'error') { } else if (!response || response === 'error') {
this.confirmation = { this.confirmation = {
text: `Error deleting ${this.item.name} form ${this.type}s list. Please refresh your page and try again. If the Error persists, please contact dev team`, text: `Error deleting ${this.item.name} form ${this.type}s list. Please refresh your page and try again. If the Error persists, please contact dev team`,
icon: 'el-icon-circle-close', icon: 'el-icon-circle-close',
iconStyle: 'font-size: 75px; color: red;' iconStyle: 'font-size: 75px; color: red;'
} }
this.$emit('success', false)
} }
} }
} }

15
src/views/products/components/ProductDetail.vue
View File

@ -69,13 +69,26 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row v-if="$store.state.settings.platform === &quot;OLFDE&quot;">
<el-col :span="8"> <el-col :span="8">
<el-form-item label-width="120px" label="Category" class="postInfo-container-item"> <el-form-item label-width="120px" label="Category" class="postInfo-container-item">
<el-input v-model="postForm.meta.category" placeholder="Product Category" /> <el-input v-model="postForm.meta.category" placeholder="Product Category" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row v-else>
<el-col :span="8">
<el-form-item label-width="120px" label="Status" class="postInfo-container-item">
<el-radio-group v-model="postForm.meta.category">
<el-radio-button label="SPOT">SPOT</el-radio-button>
<el-radio-button label="BUNKERING">BUNKERING</el-radio-button>
<el-radio-button label="NOT4SALE">NOT4SALE</el-radio-button>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label-width="120px" label="Status" class="postInfo-container-item"> <el-form-item label-width="120px" label="Status" class="postInfo-container-item">