Commit 395d968b authored by 沈翠玲's avatar 沈翠玲

问题清单

parent 44e79501
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<uni-pagination :show-icon="true" style="margin-top: 10rpx;" v-if="total" :total="total" :current="queryParams.pageNum" :pageSize="queryParams.pageSize" @change="handlePage" /> <uni-pagination :show-icon="true" style="margin-top: 10rpx;" v-if="total" :total="total" :current="queryParams.pageNum" :pageSize="queryParams.pageSize" @change="handlePage" />
</u-modal> </u-modal>
<!-- 添加或修改生产报工记录对话框 --> <!-- 添加或修改生产报工记录对话框 -->
<u-modal :cancelText="$t('取消')" :confirmText="$t('确认')" :title="title" v-model="open" width="80%" :show-confirm-button="optType !='view' " show-cancel-button <u-modal :cancelText="$t('取消')" ref="uModal" :async-close="true" :confirmText="$t('确认')" :title="title" v-model="open" width="80%" :show-confirm-button="optType !='view' " show-cancel-button
@confirm="submitForm" :title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px' }" :content-style="{ padding: '20rpx', 'max-height': '87vh' }"> @confirm="submitForm" :title-style="{ 'background-color': '#1E3770', color: '#FFFFFF', 'line-height': '37px', 'padding-top': '0px' }" :content-style="{ padding: '20rpx', 'max-height': '87vh' }">
<u-form ref="form" :model="form" label-width="100px"> <u-form ref="form" :model="form" label-width="100px">
<u-row> <u-row>
...@@ -336,6 +336,12 @@ export default { ...@@ -336,6 +336,12 @@ export default {
}, },
submitForm() { submitForm() {
if (this.form.recordId != null) { if (this.form.recordId != null) {
if(this.form.quantityUnqualify && Number(this.form.quantityUnqualify) > 0 && !this.form.abnormalReason) {
this.$u.toast(i18n.t('不合格原因不能为空'))
this.open = true
this.$refs.uModal.clearLoading()
return
}
this.form.sizeReportData = this.form.sizeReportData ? this.form.sizeReportData : [] this.form.sizeReportData = this.form.sizeReportData ? this.form.sizeReportData : []
this.form.directiveReportData = this.form.directiveReportData ? this.form.directiveReportData : [] this.form.directiveReportData = this.form.directiveReportData ? this.form.directiveReportData : []
this.$u.api.updateFeedback(this.form).then(response => { this.$u.api.updateFeedback(this.form).then(response => {
......
...@@ -12,6 +12,8 @@ ...@@ -12,6 +12,8 @@
<view class="public-input" style="width: 250px"> <view class="public-input" style="width: 250px">
<u-input <u-input
v-model="tableParams.arrangeCode" v-model="tableParams.arrangeCode"
:focus="arrangeCodeFocus"
@blur="arrangeCodeFocus = false"
@confirm="confirmArrange($event)" @confirm="confirmArrange($event)"
:placeholder="$t('请输入生产工单号和工序任务单号')" :placeholder="$t('请输入生产工单号和工序任务单号')"
/> />
...@@ -718,6 +720,7 @@ export default { ...@@ -718,6 +720,7 @@ export default {
getWorkorderDirectiveLoading: false, getWorkorderDirectiveLoading: false,
editFeedingVisible: false, editFeedingVisible: false,
reasonOBJ: {}, reasonOBJ: {},
arrangeCodeFocus: true,
tableOrderColumn: [ tableOrderColumn: [
{ {
name: 'quantity', name: 'quantity',
...@@ -1408,6 +1411,7 @@ export default { ...@@ -1408,6 +1411,7 @@ export default {
] ]
} }
this.arrangeCodeFocus = true
}) })
uni.$on('taskStatusChanged', () => { uni.$on('taskStatusChanged', () => {
...@@ -2664,7 +2668,8 @@ export default { ...@@ -2664,7 +2668,8 @@ export default {
this.$u.toast(res.msg) this.$u.toast(res.msg)
} }
console.log('准备刷新') console.log('准备刷新')
this.tableParams.arrangeCode = ''
this.arrangeCodeFocus = true
this.getTaskList() this.getTaskList()
} }
if (item.isSerialReport && Number(item.isSerialReport) === 1) { if (item.isSerialReport && Number(item.isSerialReport) === 1) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment