fix: BUG修复

src/components/file/upload.vue

@@ -53,7 +53,7 @@ const props = defineProps({
   }
 });
 
-const emit = defineEmits(["update:files"]);
+const emit = defineEmits(["update:files", "success"]);
 
 const files = ref(props.files);
 
@@ -106,6 +106,7 @@ function handleSuccess(data, file) {
         console.log("file", filterFiles[0]);
     }
     emit("update:files", files.value);
+    emit("success", file);
 }
 
 function handleError(e, file) {

src/components/negative/verify-description.vue

@@ -92,6 +92,10 @@
                     <label>办理结果</label>
                     <span>{{ negative.processResult }}</span>
                 </div>
+                <div class="col col-24" v-if="negative.disciplinaryActionDesc">
+                    <label>处分处理情况</label>
+                    <span>{{ negative.disciplinaryActionDesc }}</span>
+                </div>
             </div>
         </el-collapse-item>
         <el-collapse-item

src/views/data/Mail12337.vue

@@ -223,9 +223,13 @@
                                 <span class="text-danger">核查办理单位*</span>
                             </template>
                             <template #default="{ row }">
+                                <template v-if="row.departId">
+                                    <span>{{ row.departName }}</span>
+                                </template>
                                 <depart-tree-select
                                     size="small"
                                     v-model="row.departId"
+                                    v-else
                                 />
                             </template>
                         </el-table-column>

src/views/superviseReport/Notice.vue

@@ -81,50 +81,16 @@ const delReportData = async (row)=>{
   await getList();
 }
 
-//督察问题
-const negativeShow = ref(false)
-const negativeTable = ref();
-const negativeQuery = ref({
-  current: 1,
-  size: 10,
-  departBranch:false
-})
-const negativeTotal = ref(0);
-const negativeLoging = ref(false);
-
-const handleNegativeTable =async (row)=>{
-  if(row.superviseNumber > 0){
-    try{
-      negativeLoging.value=true;
-      await getNegativePageFun(row);
-      negativeShow.value = true;
-    }catch (e){
-      console.log("督察问题获取失败")
-      negativeLoging.value=false;
-    }
-  }
-}
-
-const getNegativePageFun = async (row)=>{
-  negativeQuery.value.id =row.id;
-  const res = await getNegativePageByQuery(row);
-  negativeTable.value =res.records;
-  negativeTotal.value = res.total;
-  negativeLoging.value=false;
-}
 
 const closeAdd =()=>{
-  editRow.value={}
-  console.log(editRow.value)
+  editRow.value={ type: 2 }
 }
-watch(()=>editRow.value.files,(val)=>{
-  console.log(val)
-  if(val){
-    console.log(val[0]?.fileName.split(".")[0])
-    editRow.value.reportName = val[0]?.fileName.split(".")[0]
-  }
 
-})
+function onUploadSuccess(file) {
+  if (!editRow.value.reportName) {
+    editRow.value.reportName = file.name.split(".")[0]
+  }
+}
 
 </script>
 
@@ -167,11 +133,7 @@ watch(()=>editRow.value.files,(val)=>{
         >
           <el-table-column prop="reportName" label="通知标题" show-overflow-tooltip></el-table-column>
           <el-table-column prop="departName" label="通知单位" show-overflow-tooltip></el-table-column>
-          <el-table-column prop="crtTime" label="创建时间" width="100">
-            <template #default="{row}">
-              {{ timeFormat(row.crtTime) }}
-            </template>
-          </el-table-column>
+          <el-table-column prop="crtTime" label="创建时间" width="120"></el-table-column>
           <el-table-column prop="crtUser" label="创建人" width="100"></el-table-column>
           <el-table-column label="操作" fixed="right" width="260">
             <template #default="{ row }">
@@ -219,7 +181,7 @@ watch(()=>editRow.value.files,(val)=>{
           <file-upload
               style="width: 100%"
               :uploadDrag="true"
-              v-model:files="editRow.files"></file-upload>
+              v-model:files="editRow.files" @success="onUploadSuccess"></file-upload>
         </el-form-item>
       </el-form>
       <footer class="flex end" style="margin-top: 10px">

src/views/superviseReport/superviseReport.vue

@@ -118,18 +118,14 @@ const getNegativePageFun = async (row)=>{
 }
 
 const closeAdd =()=>{
-  console.log('12-----')
   editRow.value={}
-  console.log(editRow.value)
 }
-watch(()=>editRow.value.files,(val)=>{
-  console.log(val)
-  if(val){
-    console.log(val[0]?.fileName.split(".")[0])
-    editRow.value.reportName = val[0]?.fileName.split(".")[0]
-  }
 
-})
+function onUploadSuccess(file) {
+  if (!editRow.value.reportName) {
+    editRow.value.reportName = file.name.split(".")[0]
+  }
+}
 
 </script>
 
@@ -176,11 +172,7 @@ watch(()=>editRow.value.files,(val)=>{
             style="width: 100%"
         >
           <el-table-column prop="reportName" label="督察报告名称" show-overflow-tooltip></el-table-column>
-          <el-table-column prop="crtTime" label="创建时间" width="100">
-            <template #default="{row}">
-              {{ timeFormat(row.crtTime) }}
-            </template>
-          </el-table-column>
+          <el-table-column prop="crtTime" label="创建时间" width="120"></el-table-column>
           <el-table-column prop="crtDepart" label="创建单位名称" width="160"></el-table-column>
           <el-table-column prop="crtUser" label="创建警员" width="100"></el-table-column>
           <el-table-column prop="superviseNumber" label="督察问题数" width="120" align="center">
@@ -231,7 +223,7 @@ watch(()=>editRow.value.files,(val)=>{
           <file-upload
               style="width: 100%"
               :uploadDrag="true"
-              v-model:files="editRow.files"></file-upload>
+              v-model:files="editRow.files" @success="onUploadSuccess"></file-upload>
         </el-form-item>
       </el-form>
       <footer class="flex end" style="margin-top: 10px">