Skip to content

F
factory_front
Commit 0d5acd12 by zhuzhequan
Options

Merge branch 'dev' into 'master' 

Dev

See merge request !76
parents f18d4579 b553e00f
Showing with 10 additions and 10 deletions
src/views/order/podCN/index.vue
...@@ -316,8 +316,8 @@ ...@@ -316,8 +316,8 @@
<ElDropdownMenu> <ElDropdownMenu>
<ElDropdownItem <ElDropdownItem
:loading="tifDownloadLoading" :loading="tifDownloadLoading"
@click="downloadTif('tiff', 40)" @click="downloadTif('tiff', 42)"
>TIF(40cm)</ElDropdownItem >TIF(40+2cm)</ElDropdownItem
> >
<ElDropdownItem <ElDropdownItem
:loading="tifDownloadLoading" :loading="tifDownloadLoading"
...@@ -326,8 +326,8 @@ ...@@ -326,8 +326,8 @@
> >
<ElDropdownItem <ElDropdownItem
:loading="pngDownloadLoading" :loading="pngDownloadLoading"
@click="downloadTif('png', 40)" @click="downloadTif('png', 42)"
>PNG(40cm)</ElDropdownItem >PNG(40+2cm)</ElDropdownItem
> >
<ElDropdownItem <ElDropdownItem
:loading="pngDownloadLoading" :loading="pngDownloadLoading"
...@@ -2215,7 +2215,7 @@ ...@@ -2215,7 +2215,7 @@
</el-form-item> </el-form-item>
<el-form-item label="排版宽度：" prop="type"> <el-form-item label="排版宽度：" prop="type">
<el-radio-group v-model="typesettingForm.templateWidth"> <el-radio-group v-model="typesettingForm.templateWidth">
<el-radio :value="40">40cm</el-radio> <el-radio :value="42">40+2cm</el-radio>
<el-radio :value="60">60cm</el-radio> <el-radio :value="60">60cm</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
......
src/views/order/podUs/index.vue
...@@ -280,8 +280,8 @@ ...@@ -280,8 +280,8 @@
<ElDropdownMenu> <ElDropdownMenu>
<ElDropdownItem <ElDropdownItem
:loading="tifDownloadLoading" :loading="tifDownloadLoading"
@click="downloadTif('tiff', 40)" @click="downloadTif('tiff', 42)"
>TIF(40cm)</ElDropdownItem >TIF(40+2cm)</ElDropdownItem
> >
<ElDropdownItem <ElDropdownItem
:loading="tifDownloadLoading" :loading="tifDownloadLoading"
...@@ -290,8 +290,8 @@ ...@@ -290,8 +290,8 @@
> >
<ElDropdownItem <ElDropdownItem
:loading="pngDownloadLoading" :loading="pngDownloadLoading"
@click="downloadTif('png', 40)" @click="downloadTif('png', 42)"
>PNG(40cm)</ElDropdownItem >PNG(40+2cm)</ElDropdownItem
> >
<ElDropdownItem <ElDropdownItem
:loading="pngDownloadLoading" :loading="pngDownloadLoading"
...@@ -2504,7 +2504,7 @@ ...@@ -2504,7 +2504,7 @@
</el-form-item> </el-form-item>
<el-form-item label="排版宽度：" prop="type"> <el-form-item label="排版宽度：" prop="type">
<el-radio-group v-model="typesettingForm.templateWidth"> <el-radio-group v-model="typesettingForm.templateWidth">
<el-radio :value="40">40cm</el-radio> <el-radio :value="42">40+2cm</el-radio>
<el-radio :value="60">60cm</el-radio> <el-radio :value="60">60cm</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment