From 4683c8a19e593e8f999c6f1a145e0bb73eb20dea Mon Sep 17 00:00:00 2001 From: chengsc <Demo@DESKTOP-CPA90BF> Date: 星期四, 12 九月 2024 08:17:12 +0800 Subject: [PATCH] 解决冲突 --- Web/src/views/device/wcsOderTask/component/editDialog.vue | 73 ++++++++++++++++++++++++++++++++---- 1 files changed, 65 insertions(+), 8 deletions(-) diff --git a/Web/src/views/device/wcsOderTask/component/editDialog.vue b/Web/src/views/device/wcsOderTask/component/editDialog.vue index 757ff67..652ccb2 100644 --- a/Web/src/views/device/wcsOderTask/component/editDialog.vue +++ b/Web/src/views/device/wcsOderTask/component/editDialog.vue @@ -42,8 +42,8 @@ </el-col> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="鐗╂枡鍚嶇О" prop="skuName"> - <el-input v-model="ruleForm.skuName" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�" maxlength="50" show-word-limit clearable /> - + <el-input v-model="ruleForm.skuName" placeholder="璇疯緭鍏ョ墿鏂欏悕绉�" maxlength="50" show-word-limit clearable/> + <el-button type="primary" icon="el-icon-search" @click="openBindDialog()">鎼滅储鐗╂枡</el-button> </el-form-item> </el-col> @@ -71,7 +71,7 @@ </el-form-item> </el-col> - <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> + <!-- <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="鐘舵��" prop="status"> <el-select clearable v-model="ruleForm.status" placeholder="璇烽�夋嫨鐘舵��"> <el-option v-for="(item,index) in dl('TaskStatusEnum')" :key="index" :value="Number(item.value)" :label="`${item.name} (${item.code}) [${item.value}]`"></el-option> @@ -80,8 +80,8 @@ </el-form-item> - </el-col> - <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> + </el-col> --> + <!-- <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-form-item label="鏄惁鍥為鎴愬姛" prop="isSuccess"> <el-select clearable v-model="ruleForm.isSuccess" placeholder="璇烽�夋嫨鏄惁鍥為鎴愬姛"> <el-option v-for="(item,index) in dl('TaskSuccessEnum')" :key="index" :value="Number(item.value)" :label="`${item.name} (${item.code}) [${item.value}]`"></el-option> @@ -104,7 +104,7 @@ </el-form-item> - </el-col> + </el-col> --> </el-row> </el-form> <template #footer> @@ -114,6 +114,32 @@ </span> </template> </el-dialog> + + <!-- 閫夋嫨鐗╂枡寮规 --> + <el-dialog v-model="bindDialogVisible" title="閫夋嫨鏁版嵁"> + <el-table + :data="bindBoxData" + highlight-current-row + @row-click="handleRowClick" + > + <el-table-column prop="skuNo" label="鐗╂枡缂栫爜" show-overflow-tooltip="" /> + <el-table-column prop="skuName" label="鐗╂枡鍚嶇О" show-overflow-tooltip="" /> + <el-table-column prop="lotNo" label="鎵规鍙�" show-overflow-tooltip="" /> + <el-table-column prop="lotText" label="鎵规鎻忚堪" show-overflow-tooltip="" /> + <el-table-column prop="custom" label="渚涘簲鍟嗕唬鐮�" show-overflow-tooltip="" /> + <el-table-column prop="customName" label="渚涘簲鍟嗗悕绉�" show-overflow-tooltip="" /> + <el-table-column prop="productionTime" label="鐢熶骇鏃ユ湡" show-overflow-tooltip="" /> + <el-table-column prop="expirationTime" label="杩囨湡鏃ユ湡" show-overflow-tooltip="" /> + <el-table-column prop="standard" label="鐗╂枡瑙勬牸" show-overflow-tooltip="" /> + <el-table-column prop="packageStandard" label="鍖呰瑙勬牸" show-overflow-tooltip="" /> + <el-table-column prop="packUnit" label="鍖呰鍗曚綅" show-overflow-tooltip="" /> + <el-table-column prop="storeTime" label="瀛樺偍鏈熻嚦" show-overflow-tooltip="" /> + </el-table> + <div slot="footer" class="dialog-footer"> + <el-button @click="bindDialogVisible = false">鍙栨秷</el-button> + <el-button type="primary" @click="confirmBinding">纭</el-button> + </div> + </el-dialog> </div> </template> <style lang="scss" scoped> @@ -129,7 +155,7 @@ import { getDictDataItem as di, getDictDataList as dl } from '/@/utils/dict-utils'; import { getDictLabelByVal as dv } from '/@/utils/dict-utils'; import { formatDate } from '/@/utils/formatTime'; - import { addWcsOderTask, updateWcsOderTask, detailWcsOderTask } from "/@/api/device/wcsOderTask"; + import { addWcsOderTask, updateWcsOderTask, detailWcsOderTask,GetGroupSkuList } from "/@/api/device/wcsOderTask"; import { getAPI } from '/@/utils/axios-utils'; import { SysEnumApi } from '/@/api-services/api'; @@ -153,6 +179,10 @@ onMounted(() => { }); + + const bindDialogVisible = ref(false); + const bindBoxData = ref<any>([]); + const selectedRow = ref<any>(null); // 鎵撳紑寮圭獥 const openDialog = async (row: any) => { @@ -198,10 +228,37 @@ }; + const handleQuery = async () => { + var res = await GetGroupSkuList(); + console.log('res:'+res) + bindBoxData.value = res.data.result; + }; + //鎵撳紑缁戝畾寮规 + function openBindDialog() { + selectedRow.value=null; + + bindDialogVisible.value = true; + handleQuery(); + } + //鐐瑰嚮琛屾椂璁剧疆閫変腑琛� + function handleRowClick(row) { + selectedRow.value = row; + } - + //纭閫夋嫨鐗╂枡鎿嶄綔 + function confirmBinding() { + if (selectedRow.value) { + ruleForm.value.skuNo=selectedRow.value.skuNo; + ruleForm.value.skuName=selectedRow.value.skuName; + ruleForm.value.lotNo=selectedRow.value.lotNo; + ruleForm.value.Standard=selectedRow.value.Standard; + bindDialogVisible.value = false; + } else { + ElMessage.error('璇烽�夋嫨鐗╂枡锛�'); + } + } //灏嗗睘鎬ф垨鑰呭嚱鏁版毚闇茬粰鐖剁粍浠� defineExpose({ openDialog }); </script> -- Gitblit v1.8.0