Merge branch 'master' of http://121.40.242.89:8888/Guoyan/new_huozhou_frontend

src/views/projectLib/projectPlan/projectPlan.data.ts

@@ -191,6 +191,11 @@ export const unitedTechnicalRevieColumns: BasicColumn[] = [
   {
     title: '是否完成',
     dataIndex: 'utrIsfinish',
+    filters: [
+      { text: '未完成', value: '0' },
+      { text: '审批中', value: '1' },
+      { text: '已完成', value: '2' },
+  ],
     customRender: ({ record }) => {
       if (record.utrIsfinish == 1) {
         return "审批中"

src/views/projectLib/projectPlan/uploadURTfile.vue

@@ -8,6 +8,7 @@
                     :before-upload="beforeUpload" :on-exceed="handleExceed" :limit="10" :on-remove="removeFile">
                     <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
                     <div slot="tip" class="el-upload__tip">文件大小且不超过500M</div>
+                    <div slot="tip" class="el-upload__tip">必须上传《部门联审意见》</div>
                 </el-upload>
             </el-form-item>
 
@@ -87,7 +88,17 @@ async function submitImportForm() {
         });
         return;
     }
-
+    let cunzai = false;
+    fileList.forEach((x) => {
+        console.log('xxxxxxxxxx', x, x.file);
+       if(x.file.name.includes('部门联审意见')){
+           cunzai = true;
+       }
+    });
+    if(!cunzai){
+        ElMessage.error('请上传《部门联审意见》');
+        return;
+    }
     // // 使用form表单的数据格式
     const params = new FormData();
     // 将上传文件数组依次添加到参数paramsData中