|
|
@ -98,7 +98,7 @@ |
|
|
<el-row style="margin-top: 18px; height: 55px;"> |
|
|
<el-row style="margin-top: 18px; height: 55px;"> |
|
|
<el-col style="text-align: center"> |
|
|
<el-col style="text-align: center"> |
|
|
<el-form-item> |
|
|
<el-form-item> |
|
|
<el-button type="primary" @click="finishScheduleBun" |
|
|
|
|
|
|
|
|
<el-button type="primary" @click="openRemarkDialog" |
|
|
style="margin-left: 10px; margin-bottom: 5px;"> |
|
|
style="margin-left: 10px; margin-bottom: 5px;"> |
|
|
{{ buttons.finishScheduleButton }} |
|
|
{{ buttons.finishScheduleButton }} |
|
|
</el-button> |
|
|
</el-button> |
|
|
@ -261,6 +261,24 @@ |
|
|
|
|
|
|
|
|
</el-dialog> |
|
|
</el-dialog> |
|
|
|
|
|
|
|
|
|
|
|
<!-- 备注对话框 --> |
|
|
|
|
|
<el-dialog title="填写备注" :visible.sync="remarkDialogVisible" width="500px" :close-on-click-modal="false"> |
|
|
|
|
|
<el-form :model="remarkForm" label-position="top"> |
|
|
|
|
|
<el-form-item label="备注信息:"> |
|
|
|
|
|
<el-input |
|
|
|
|
|
type="textarea" |
|
|
|
|
|
v-model="remarkForm.remark" |
|
|
|
|
|
:rows="5" |
|
|
|
|
|
placeholder="请填写结单备注信息"> |
|
|
|
|
|
</el-input> |
|
|
|
|
|
</el-form-item> |
|
|
|
|
|
</el-form> |
|
|
|
|
|
<el-footer style="height:35px;margin-top: 90px;text-align:center"> |
|
|
|
|
|
<el-button type="primary" @click="confirmRemark">确 定</el-button> |
|
|
|
|
|
<el-button @click="remarkDialogVisible = false">取 消</el-button> |
|
|
|
|
|
</el-footer> |
|
|
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
|
<!-- 异常原因录入的组件 --> |
|
|
<!-- 异常原因录入的组件 --> |
|
|
<comExceptionReason ref="comExceptionReason" :close-on-click-modal="false" |
|
|
<comExceptionReason ref="comExceptionReason" :close-on-click-modal="false" |
|
|
:visible.sync="showExceptionFlag" |
|
|
:visible.sync="showExceptionFlag" |
|
|
@ -305,6 +323,10 @@ |
|
|
titleCon: '', |
|
|
titleCon: '', |
|
|
showDefault: false, |
|
|
showDefault: false, |
|
|
showExceptionFlag: false, |
|
|
showExceptionFlag: false, |
|
|
|
|
|
remarkDialogVisible: false, |
|
|
|
|
|
remarkForm: { |
|
|
|
|
|
remark: '' |
|
|
|
|
|
}, |
|
|
scheduleNo: 0, |
|
|
scheduleNo: 0, |
|
|
pageData: { |
|
|
pageData: { |
|
|
site: this.$store.state.user.site, |
|
|
site: this.$store.state.user.site, |
|
|
@ -1310,6 +1332,24 @@ |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
/*打开备注对话框*/ |
|
|
|
|
|
openRemarkDialog() { |
|
|
|
|
|
// 清空之前的备注 |
|
|
|
|
|
this.remarkForm.remark = this.pageData.remark || ''; |
|
|
|
|
|
// 打开对话框 |
|
|
|
|
|
this.remarkDialogVisible = true; |
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
|
|
/*确认备注并继续结单*/ |
|
|
|
|
|
confirmRemark() { |
|
|
|
|
|
// 保存备注到pageData |
|
|
|
|
|
this.pageData.remark = this.remarkForm.remark; |
|
|
|
|
|
// 关闭备注对话框 |
|
|
|
|
|
this.remarkDialogVisible = false; |
|
|
|
|
|
// 继续执行原有的结单逻辑 |
|
|
|
|
|
this.finishScheduleBun(); |
|
|
|
|
|
}, |
|
|
|
|
|
|
|
|
/*结束当前的操作*/ |
|
|
/*结束当前的操作*/ |
|
|
finishScheduleBun() { |
|
|
finishScheduleBun() { |
|
|
//首先判断数值是否通过判断 |
|
|
//首先判断数值是否通过判断 |
|
|
|