Commit b83d6f759c6560e79c4ab33238b8786960dde827
1 parent
e7e60e07
m
Showing
2 changed files
with
4 additions
and
4 deletions
trash-garbage/src/main/resources/mapper/GarOrderMatchAskMapper.xml
| ... | ... | @@ -141,7 +141,7 @@ |
| 141 | 141 | from gar_order_match_ask a |
| 142 | 142 | left join drop_point_info b |
| 143 | 143 | on a.drop_point_id = b.id |
| 144 | - where gar_order_id = #{gar_order_id} | |
| 144 | + where gar_id = #{gar_id} | |
| 145 | 145 | </select> |
| 146 | 146 | |
| 147 | 147 | <insert id="insertGarOrderMatchAsk" parameterType="GarOrderMatchAsk"> | ... | ... |
trash-ui/src/views/gar/order/index.vue
| ... | ... | @@ -225,13 +225,13 @@ |
| 225 | 225 | </div> |
| 226 | 226 | |
| 227 | 227 | <el-row :gutter="20"> |
| 228 | - <el-col :span="12" v-if="form.putOnImages"> | |
| 228 | + <el-col :span="12" v-if="form.putOnImages && form.putOnImages.length > 0"> | |
| 229 | 229 | <el-form-item label="现场图片" prop="putOnImages"> |
| 230 | 230 | <el-image style="width: 100px; height: 100px" :src="form.putOnImages[0]" :preview-src-list="form.putOnImages"> |
| 231 | 231 | </el-image> |
| 232 | 232 | </el-form-item> |
| 233 | 233 | </el-col> |
| 234 | - <el-col :span="12" v-if="form.putDownImages"> | |
| 234 | + <el-col :span="12" v-if="form.putDownImages && form.putDownImages.length > 0"> | |
| 235 | 235 | <el-form-item label="现场图片" prop="putDownImages"> |
| 236 | 236 | <el-image style="width: 100px; height: 100px" :src="form.putDownImages[0]" |
| 237 | 237 | :preview-src-list="form.putDownImages"> |
| ... | ... | @@ -283,7 +283,7 @@ |
| 283 | 283 | </el-row> |
| 284 | 284 | </div> |
| 285 | 285 | |
| 286 | - <el-row :gutter="20" v-if="form.panoramas"> | |
| 286 | + <el-row :gutter="20" v-if="form.panoramas && form.panoramas.length > 0"> | |
| 287 | 287 | <el-col :span="24"> |
| 288 | 288 | <el-form-item label="现场图片" prop="putOnImages"> |
| 289 | 289 | <el-image style="width: 100px; height: 100px" :src="form.panoramas[0]" :preview-src-list="form.panoramas"> | ... | ... |