|
|
@@ -135,9 +135,6 @@
|
|
|
height="100">
|
|
|
</u--textarea>
|
|
|
<view class="title">上传凭证</view>
|
|
|
-<<<<<<< HEAD
|
|
|
- <zj-upload key="cp" @getFiles="getFiles" :fileList="aaa" :count="9" />
|
|
|
-=======
|
|
|
<!-- <zj-upload key="cp" @getFiles="getFiles" :fileList="reportForm.fileList" :count="9" /> -->
|
|
|
<view class="images">
|
|
|
<block v-for="(item, index) in reportForm.fileList" :key='index'>
|
|
|
@@ -151,7 +148,6 @@
|
|
|
<text class="text">点击上传</text>
|
|
|
</view>
|
|
|
</view>
|
|
|
->>>>>>> origin/master
|
|
|
</view>
|
|
|
</zj-dialog-box>
|
|
|
</view>
|
chenqilong