修复税率

This commit is contained in:
pushuo 2022-08-10 14:03:33 +08:00
parent 5de6d87f9d
commit 476a7c89dc
2 changed files with 4 additions and 15 deletions

View File

@ -171,8 +171,6 @@
var previewWindow = null; var previewWindow = null;
$('#preview-iframe').on('load', function(event) { $('#preview-iframe').on('load', function(event) {
previewWindow = document.getElementById("preview-iframe").contentWindow; previewWindow = document.getElementById("preview-iframe").contentWindow;
app.design.ready = true;
app.design.sidebar = true;
// 页面滚动到最底部 // 页面滚动到最底部
$(previewWindow.document).ready(function() { $(previewWindow.document).ready(function() {
@ -193,8 +191,6 @@
form: @json($design_settings), form: @json($design_settings),
design: { design: {
type: 'pc',
ready: false,
}, },
source: { source: {
@ -273,13 +269,6 @@
mounted () { mounted () {
}, },
}) })
// window.addEventListener('message', (event) => {
// event.stopPropagation()
// if (typeof(event.data.index) !== 'undefined') {
// app.editModuleButtonClicked(event.data.index)
// }
// }, false)
</script> </script>
</body> </body>
</html> </html>

View File

@ -69,7 +69,7 @@
</el-form-item> </el-form-item>
<el-form-item label="区域"> <el-form-item label="区域">
<el-select v-model="dialog.form.geo_zone_id" size="small" placeholder="请选择"> <el-select v-model="dialog.form.region_id" size="small" placeholder="请选择">
<el-option v-for="region in source.regions" :key="region.value" :label="region.name" :value="region.id"></el-option> <el-option v-for="region in source.regions" :key="region.value" :label="region.name" :value="region.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -106,7 +106,7 @@
name: '', name: '',
rate: '', rate: '',
type: 'percent', type: 'percent',
geo_zone_id: '', region_id: '',
}, },
}, },
@ -121,7 +121,7 @@
this.dialog.show = true this.dialog.show = true
this.dialog.type = type this.dialog.type = type
this.dialog.index = index this.dialog.index = index
this.dialog.form.geo_zone_id = this.source.regions[0].id this.dialog.form.region_id = this.source.regions[0].id
if (type == 'edit') { if (type == 'edit') {
let tax = this.tax_rates[index]; let tax = this.tax_rates[index];
@ -131,7 +131,7 @@
name: tax.name, name: tax.name,
rate: tax.rate, rate: tax.rate,
type: tax.type, type: tax.type,
geo_zone_id: tax.region.id, region_id: tax.region.id,
} }
} }
}, },