Browse Source

Merge remote-tracking branch 'origin/master'

master
fanzongzhe 1 year ago
parent
commit
e4cc14dfde
  1. 4
      anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl
  2. 2785
      anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl
  3. 4
      anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl
  4. 2790
      anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black.ftl
  5. 1070
      anrui-base/anrui-base-biz/src/main/resources/ftl/receiveCar.ftl
  6. 14
      anrui-system-ui/src/views/Home/Home.vue

4
anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl

@ -2402,7 +2402,7 @@
<w:sz-cs w:val="19"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> ${invoiceNo!} </w:t>
<w:t> ${invoiceNo!} </w:t>
</w:r>
<w:r wsp:rsidRPr="000B0934">
<w:rPr>
@ -2455,7 +2455,7 @@
<w:sz-cs w:val="19"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> ${invoiceType!} </w:t>
<w:t>${invoiceType!} </w:t>
</w:r>
<w:r wsp:rsidRPr="000B0934">
<w:rPr>

2785
anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl

File diff suppressed because it is too large

4
anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar.ftl

@ -2525,7 +2525,7 @@
<w:sz-cs w:val="19"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> ${invoiceNo!} </w:t>
<w:t> ${invoiceNo!} </w:t>
</w:r>
<w:r wsp:rsidRPr="0071392F">
<w:rPr>
@ -2556,7 +2556,7 @@
<w:sz-cs w:val="19"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> ${invoiceType!} </w:t>
<w:t>${invoiceType!} </w:t>
</w:r>
<w:r wsp:rsidRPr="0071392F">
<w:rPr>

2790
anrui-base/anrui-base-biz/src/main/resources/ftl/orderacar_black.ftl

File diff suppressed because it is too large

1070
anrui-base/anrui-base-biz/src/main/resources/ftl/receiveCar.ftl

File diff suppressed because it is too large

14
anrui-system-ui/src/views/Home/Home.vue

@ -103,15 +103,15 @@
</el-dialog>
<el-dialog :visible.sync="TZGGVisible" width="50%">
<el-form :model="formobj" class="formaddcopy02">
<div style="text-align: center;font-weight: bold;font-size: 16px">{{ formobj.title }}</div>
<div style="text-align: center;font-weight: bold;font-size: 20px">{{ formobj.title }}</div>
<el-row style="border-left: 0px;margin-top: 10px">
<el-col :span="12" style="border-right: 0px;border-bottom: 0px">
<div class="span-sty" style="border-right: 0px">发布日期:</div>
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
<div class="span-sty" style="border-right: 0px;font-family: 'SimSun';font-size: 10px;">发布日期:</div>
<el-form-item><span style="font-family: 'SimSun';font-weight: bold;margin-left: 60px">{{ formobj.createTime }}</span></el-form-item>
</el-col>
<el-col :span="12" style="border-right: 0px;border-bottom: 0px">
<div class="span-sty" style="border-right: 0px">有效期至:</div>
<el-form-item><span class="addinputInfo">{{ formobj.validityDate }}</span></el-form-item>
<div class="span-sty" style="border-right: 0px;font-family: 'SimSun';font-size: 10px;">有效期至:</div>
<el-form-item><span style="font-family: 'SimSun';font-weight: bold;margin-left: 60px">{{ formobj.validityDate }}</span></el-form-item>
</el-col>
</el-row>
<el-row style="border-left: 0px">
@ -121,8 +121,8 @@
</el-row>
<el-row style="border-left: 0px">
<el-col :span="24" style="border-right: 0px;border-bottom: 0px">
<div class="span-sty" style="border-right: 0px">附件:</div>
<el-form-item><span class="bluezi addinputInfo" v-for="(item, index) in formobj.filesList" :key="index" @click="handleDownLoad(item.url)">{{ item.name }}</span></el-form-item>
<div class="span-sty" style="border-right: 0px;font-family: 'SimSun';font-size: 10px;">附件:</div>
<el-form-item><span class="bluezi" style="font-family: 'SimSun';font-weight: bold;margin-left: 60px" v-for="(item, index) in formobj.filesList" :key="index" @click="handleDownLoad(item.url)">{{ item.name }}</span></el-form-item>
</el-col>
</el-row>
</el-form>

Loading…
Cancel
Save