Merge branch 'gst4base' of http://182.92.169.222:3000/zhc077/hnjd_comp into gst4base

.gitignore

@@ -1,24 +1,24 @@
-# Logs
+.DS_Store
-logs
+node_modules/
-*.log
+node_modules
+dist/
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
-pnpm-debug.log*
+**/*.log
-lerna-debug.log*
+pnpm-lock.yaml
-
+tests/**/coverage/
-node_modules
+tests/e2e/reports
-dist
+selenium-debug.log
-dist-ssr
-*.local
 
 # Editor directories and files
-.vscode/*
-!.vscode/extensions.json
 .idea
-.DS_Store
+.vscode
 *.suo
 *.ntvs*
 *.njsproj
 *.sln
-*.sw?
+*.local
+
+package-lock.json
+yarn.lock

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);
   };
   /**

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.applyStartTime='';
+    // record.applyStartTime='';
-    record.applyEndTime='';
+    // record.applyEndTime='';
-    record.topicStartTime='';
+    // record.topicStartTime='';
-    record.topicEndTime='';
+    // record.topicEndTime='';
-    record.uploadStartTime='';
+    // record.uploadStartTime='';
-    record.uploadEndTime='';
+    // record.uploadEndTime='';
-    record.scoreStartTime='';
+    // record.scoreStartTime='';
-    record.scoreEndTime='';
+    // record.scoreEndTime='';
-    record.uploadWorksType='';
+    // record.uploadWorksType='';
     //赋值
     Object.assign(formData, record);
   });

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;
     }
   );