Commit d85e8e61d480a53111d0dd28db0b4501c33d0b63
1 parent
56aae8e7
m
Showing
1 changed file
with
22 additions
and
1 deletions
trash-ui/src/views/activiti/task/index.vue
| @@ -406,7 +406,27 @@ | @@ -406,7 +406,27 @@ | ||
| 406 | <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button> | 406 | <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button> |
| 407 | </div> | 407 | </div> |
| 408 | </el-dialog> | 408 | </el-dialog> |
| 409 | - | 409 | + |
| 410 | + | ||
| 411 | + <!-- 投放点 --> | ||
| 412 | + <el-dialog :title="title" :visible.sync="dropInfoOpen" width="500px" append-to-body | ||
| 413 | + :close-on-click-modal="false"> | ||
| 414 | + <dropInfo :idInfo="idInfo" v-if="dropInfoOpen"/> | ||
| 415 | + <el-table :data="hisfromData" v-if="hisfromData != null"> | ||
| 416 | + <div v-for="item in this.form.formData"> | ||
| 417 | + <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue" | ||
| 418 | + placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/> | ||
| 419 | + </div> | ||
| 420 | + <el-table-column label="处理意见" align="center" prop="controlValue"/> | ||
| 421 | + <el-table-column label="处理人" align="center" prop="createName"/> | ||
| 422 | + <el-table-column label="处理时间" align="center" prop="createTime"/> | ||
| 423 | + </el-table> | ||
| 424 | + <div slot="footer" class="dialog-footer"> | ||
| 425 | + <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)">驳回</el-button> | ||
| 426 | + <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button> | ||
| 427 | + </div> | ||
| 428 | + </el-dialog> | ||
| 429 | + | ||
| 410 | <!-- 后勤管理 --> | 430 | <!-- 后勤管理 --> |
| 411 | <el-dialog :title="title" :visible.sync="logisticsInfoOpen" width="500px" append-to-body | 431 | <el-dialog :title="title" :visible.sync="logisticsInfoOpen" width="500px" append-to-body |
| 412 | :close-on-click-modal="false"> | 432 | :close-on-click-modal="false"> |
| @@ -696,6 +716,7 @@ | @@ -696,6 +716,7 @@ | ||
| 696 | import companyInfo from "@/views/activiti/task/companyInfo"; | 716 | import companyInfo from "@/views/activiti/task/companyInfo"; |
| 697 | import driverInfo from "@/views/activiti/task/driverInfo"; | 717 | import driverInfo from "@/views/activiti/task/driverInfo"; |
| 698 | import vehicleInfo from "@/views/activiti/task/vehicleInfo"; | 718 | import vehicleInfo from "@/views/activiti/task/vehicleInfo"; |
| 719 | + import dropInfo from "@/views/unit/dropPointInfo/info"; | ||
| 699 | 720 | ||
| 700 | import taskmethod from '@/api/taskmethod' | 721 | import taskmethod from '@/api/taskmethod' |
| 701 | 722 |