diff --git a/src/components/inventory/apply/DetailApply.vue b/src/components/inventory/apply/DetailApply.vue index 6666755..422f82e 100644 --- a/src/components/inventory/apply/DetailApply.vue +++ b/src/components/inventory/apply/DetailApply.vue @@ -216,7 +216,6 @@ const getUserInfo = () => { const detail = (id: any) => { isShow.value = true post("inventory/apply/getApplyDetail", {id}).then((res: any) => { - formData.value = res.useInfo; tableList.value = JSON.parse(res); }) } diff --git a/src/components/inventory/goods/Search.vue b/src/components/inventory/goods/Search.vue index eadac72..1f83aa6 100644 --- a/src/components/inventory/goods/Search.vue +++ b/src/components/inventory/goods/Search.vue @@ -18,8 +18,8 @@ highlight-current-row @current-change="change_current_search_data_index" :row-class-name="tableRowClassName"> - - + + { type.value = _type; keyword.value = _name; show.value = true; + if (keyword.value && keyword.value != ""){ + search_social() + } + }; defineExpose({init}); diff --git a/src/components/inventory/purchase/AddOrder.vue b/src/components/inventory/purchase/AddOrder.vue index a979884..32dfaa4 100644 --- a/src/components/inventory/purchase/AddOrder.vue +++ b/src/components/inventory/purchase/AddOrder.vue @@ -277,7 +277,14 @@ let confirm = async () => { ElMessage.error('请至少添加一个采购药品') return } - + //生产批号 + for (let i = 0; i < table_list.value.length; i++) { + debugger + if (!table_list.value[i].productionBatchCode) { + ElMessage.error('生产批号不能为空') + return + } + } // 检查每个药品的有效期 for (let i = 0; i < table_list.value.length; i++) { if (!checkProductionDate(table_list.value[i])) { diff --git a/src/views/social/accountRecords.vue b/src/views/social/accountRecords.vue index 14a6990..2646211 100644 --- a/src/views/social/accountRecords.vue +++ b/src/views/social/accountRecords.vue @@ -68,10 +68,12 @@ const detailsDo = (row: any) => { let data = {...row}; data.beginTime = selectDate.value[0]; data.endTime = selectDate.value[1]; - // post("social/reconciliation/detailDo", {data: data}) - post("social/reconciliation/testDetailDo", {data: data}).then((res: any) => { + post("social/reconciliation/detailDo", {data: data}).then((res: any) => { openDetailList(res) }) + // post("social/reconciliation/testDetailDo", {data: data}).then((res: any) => { + // openDetailList(res) + // }) } const detailListRef = ref();