diff --git a/src/components/TableModel/index.vue b/src/components/TableModel/index.vue index 85aecd8..5552f89 100644 --- a/src/components/TableModel/index.vue +++ b/src/components/TableModel/index.vue @@ -127,6 +127,7 @@ width="45" align="center" v-if="showSel" + :selectable="selectable" /> { + return true + } } }, computed: { @@ -444,7 +451,7 @@ export default { handleSelectionChange(e) { this.msgList = e this.$emit('transIdList', this.msgList) - } + }, }, } diff --git a/src/views/material/type/components/form-type.vue b/src/views/material/type/components/form-type.vue index a22d151..4544a63 100644 --- a/src/views/material/type/components/form-type.vue +++ b/src/views/material/type/components/form-type.vue @@ -673,9 +673,8 @@ export default { { label: '否', value: '0' }, ], manageTypeRange: [ - { label: '编码追溯', value: '0' }, - { label: '数量 + 编码', value: '1' }, - { label: '数量', value: '2' }, + { label: '编码', value: '0' }, + { label: '数量', value: '1' }, ], meterRange: [], editLevel: undefined, diff --git a/src/views/purchase/arrival/components/table-notice.vue b/src/views/purchase/arrival/components/table-notice.vue index 2297120..6419d08 100644 --- a/src/views/purchase/arrival/components/table-notice.vue +++ b/src/views/purchase/arrival/components/table-notice.vue @@ -131,17 +131,21 @@ export default { startReceive() { let phoneList = [] let tableData = this.$refs.tableRef.tableList - tableData.forEach(item => { - phoneList.push(item.phone) - }) - // 开始验收 - startReceiveApi({ - taskId: this.editParams.id, - phoneArray: phoneList - }).then(res => { - this.$modal.msgSuccess('发送成功') - this.closeDialogOuterNoticeAdd() - }).catch(err => {}) + if(tableData.length === 0) { + this.$modal.msgError('没有可通知的相关人员,请前往添加') + } else { + tableData.forEach(item => { + phoneList.push(item.phone) + }) + // 开始验收 + startReceiveApi({ + taskId: this.editParams.id, + phoneArray: phoneList + }).then(res => { + this.$modal.msgSuccess('发送成功') + this.closeDialogOuterNoticeAdd() + }).catch(err => {}) + } } }, } diff --git a/src/views/purchase/arrival/config.js b/src/views/purchase/arrival/config.js index 411141c..b9a5a6d 100644 --- a/src/views/purchase/arrival/config.js +++ b/src/views/purchase/arrival/config.js @@ -1,9 +1,23 @@ +import { + queryStatusSelApi +} from '@/api/purchase/receive' + +export const queryStatusSelData = () => { + queryStatusSelApi().then(res => { + formLabel[3].f_selList = res.data.data.map(item => { + return { + label: item.dictLabel, + value: item.dictCode + } + }) + }) +} export const formLabel = [ { f_label: '开始时间', f_model: 'startTime', f_type: 'date' }, { f_label: '结束时间', f_model: 'endTime', f_type: 'date' }, { f_label: '关键字', f_model: 'keyWord', f_type: 'ipt' }, - { f_label: '状态', f_model: 'keyWord', f_type: 'ipt' }, + { f_label: '状态', f_model: 'status', f_type: 'sel', f_selList: [] }, ] export const columnsList = [ { t_props: 'arrivalTime', t_label: '到货时间', }, diff --git a/src/views/purchase/arrival/index.vue b/src/views/purchase/arrival/index.vue index 9d2685d..36589ac 100644 --- a/src/views/purchase/arrival/index.vue +++ b/src/views/purchase/arrival/index.vue @@ -133,7 +133,7 @@