diff --git a/.gitignore b/.gitignore index a547bf36..808e19ab 100644 --- a/.gitignore +++ b/.gitignore @@ -1,24 +1,24 @@ -# Logs -logs -*.log +.DS_Store +node_modules/ +node_modules +dist/ npm-debug.log* yarn-debug.log* yarn-error.log* -pnpm-debug.log* -lerna-debug.log* - -node_modules -dist -dist-ssr -*.local +**/*.log +pnpm-lock.yaml +tests/**/coverage/ +tests/e2e/reports +selenium-debug.log # Editor directories and files -.vscode/* -!.vscode/extensions.json .idea -.DS_Store +.vscode *.suo *.ntvs* *.njsproj *.sln -*.sw? +*.local + +package-lock.json +yarn.lock diff --git a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue index e2a634d3..1a1b421b 100644 --- a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue +++ b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue @@ -134,6 +134,8 @@ */ const handleDetail = (record) => { registerModal.value.disableSubmit = true; + console.log(record.value,'record.value', raceList.value); + registerModal.value.edit(record.value); }; /** @@ -142,6 +144,8 @@ const registerModalscgl = ref(); const handleEditscgl = (record) => { registerModalscgl.value.disableSubmit = false; + console.log(record.value,'record.value'); + registerModalscgl.value.edit(record.value); }; /** diff --git a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/AnnualCompPointFormscgl.vue b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/AnnualCompPointFormscgl.vue index 0050dd72..d4c8e713 100644 --- a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/AnnualCompPointFormscgl.vue +++ b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/AnnualCompPointFormscgl.vue @@ -328,16 +328,16 @@ function add() { function edit(record) { nextTick(() => { resetFields(); - record.applyStartTime=''; - record.applyStartTime=''; - record.applyEndTime=''; - record.topicStartTime=''; - record.topicEndTime=''; - record.uploadStartTime=''; - record.uploadEndTime=''; - record.scoreStartTime=''; - record.scoreEndTime=''; - record.uploadWorksType=''; + // record.applyStartTime=''; + // record.applyStartTime=''; + // record.applyEndTime=''; + // record.topicStartTime=''; + // record.topicEndTime=''; + // record.uploadStartTime=''; + // record.uploadEndTime=''; + // record.scoreStartTime=''; + // record.scoreEndTime=''; + // record.uploadWorksType=''; //赋值 Object.assign(formData, record); }); diff --git a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/cardItem.vue b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/cardItem.vue index 3b223e82..9896c93b 100644 --- a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/cardItem.vue +++ b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/components/cardItem.vue @@ -63,9 +63,12 @@ emits('delChange', data); }; const info = () => { + console.log(data.value,'子'); emits('infoChange', data); }; const editscgl = () => { + console.log(data.value,'子'); + emits('editscglChange', data); }; const updateApply = () => { @@ -126,6 +129,8 @@ watch( () => props.data, (newVal) => { + console.log(newVal,'newVal'); + data.value = newVal; } );