Commit f5157ae93770a5daa7d12fb07c1fad44971a2a06
Merge remote-tracking branch 'origin/dev' into dev
Showing
3 changed files
with
17 additions
and
2 deletions
trash-ui/dist.rar
No preview for this file type
trash-ui/src/views/business/threestep/threestepInfo.vue
| ... | ... | @@ -42,6 +42,7 @@ |
| 42 | 42 | <el-input v-model="infoData.selfCheckTime" :maxlength="20" show-word-limit disabled /> |
| 43 | 43 | </el-form-item> |
| 44 | 44 | </el-col> |
| 45 | + | |
| 45 | 46 | </el-row> |
| 46 | 47 | <el-row type="flex" justify="center" v-show="infoData.type == 0"> |
| 47 | 48 | <el-col :span="12"> |
| ... | ... | @@ -55,6 +56,14 @@ |
| 55 | 56 | </el-form-item> |
| 56 | 57 | </el-col> |
| 57 | 58 | </el-row> |
| 59 | + <el-row type="flex" justify="center" > | |
| 60 | + <el-col> | |
| 61 | + | |
| 62 | + <el-form-item label="申请人"> | |
| 63 | + <el-input v-model="infoData.createBy" disabled /> | |
| 64 | + </el-form-item> | |
| 65 | + </el-col> | |
| 66 | + </el-row> | |
| 58 | 67 | <el-row type="flex" justify="center"> |
| 59 | 68 | <el-col :span="12"> |
| 60 | 69 | <el-form-item label="现场负责人"> | ... | ... |
trash-ui/src/views/h5/task/threestepInfo.vue
| ... | ... | @@ -55,7 +55,13 @@ |
| 55 | 55 | <el-input type="textarea" v-model="infoData.companyTrucks" disabled/> |
| 56 | 56 | </el-form-item> |
| 57 | 57 | </el-row> |
| 58 | - | |
| 58 | + <el-row type="flex" justify="center" > | |
| 59 | + <el-col> | |
| 60 | + <el-form-item label="申请人"> | |
| 61 | + <el-input v-model="infoData.createBy" disabled /> | |
| 62 | + </el-form-item> | |
| 63 | + </el-col> | |
| 64 | + </el-row> | |
| 59 | 65 | |
| 60 | 66 | <el-row> |
| 61 | 67 | <el-form-item label="现场负责人"> |
| ... | ... | @@ -326,7 +332,7 @@ |
| 326 | 332 | <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video> |
| 327 | 333 | </div> |
| 328 | 334 | <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a> |
| 329 | - | |
| 335 | + | |
| 330 | 336 | </el-row> |
| 331 | 337 | </el-col> |
| 332 | 338 | </el-row> | ... | ... |