Merge pull request 'master' (#756) from master into prod

Reviewed-on: http://git.feashow.cn/clay/mosr-web/pulls/756

src/components/AttachmentUpload.vue

@@ -370,8 +370,12 @@ const handleDelete = (row, type) => {
         _singleFileValue.value.splice(_singleFileValue.value.findIndex((item) => item.fileId === row.fileId), 1);
         isSingleFile.value = false
       } else {
-        isHaveOneFile.value=false
         allFileList.value.splice(allFileList.value.findIndex((item) => item.fileId === row.fileId), 1);
+        if(allFileList.value&&allFileList.value?.length==0){
+          isHaveOneFile.value=false
+        }else{
+          isHaveOneFile.value=true
+        }
       }
     }
   });

src/components/DetailComponent/ProjectApply.vue

@@ -480,7 +480,6 @@ const getFileParam = (item) => {
   }
 }
 const handleSubmit = async () => {
-  console.log(' projectPersonUserList.value', projectPersonUserList.value)
   let files = []
   if (props.mode === 'resubmit') {
     attachment.value.allFileList.forEach(item => {
@@ -491,6 +490,7 @@ const handleSubmit = async () => {
       files.push(getFileParam(item))
     })
   }
+  // console.info("🚀 ~method:handleSubmit -----", files,attachment.value.isHaveOneFile)
   if (!attachment.value.isHaveOneFile) {
     attachment.value.validate()
     ElNotification({
@@ -510,7 +510,7 @@ const handleSubmit = async () => {
     deploymentId: deploymentId.value,
     requirementId: route.query.id,
     fileList: files,
-    singleFile: attachment.value.singleFile,
+    // singleFile: attachment.value.singleFile,
     projectId: projectId.value,
     preProcess: JSON.stringify(localFormData.value.preProcess)
   }

src/views/project-management/implementation/share.vue

@@ -232,7 +232,8 @@ const searchConfig = reactive([
     prop: 'researchPersonnel',
     component: 'el-input',
     props: {
-      placeholder: '请输入研发人员查询'
+      placeholder: '请输入研发人员查询',
+      clearable: true,
     }
   },
   {

src/views/project-management/implementation/updateTable.vue

@@ -18,28 +18,30 @@
         </el-col>
         <el-col :span="6">
           <el-form-item prop="startTime" label="项目开始时间">
-            <el-date-picker
-                v-model="tableForm.startTime"
-                type="date"
-                format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD"
-                placeholder="选择项目开始时间"
-            >
-            </el-date-picker>
+<!--            <el-date-picker-->
+<!--                v-model="tableForm.startTime"-->
+<!--                type="date"-->
+<!--                format="YYYY-MM-DD"-->
+<!--                value-format="YYYY-MM-DD"-->
+<!--                placeholder="选择项目开始时间"-->
+<!--            >-->
+<!--            </el-date-picker>-->
+            <span>{{ tableForm.startTime }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item prop="endTime" label="项目预计持续时间" :title="!tableForm.startTime?'请先选择项目开始时间!':''">
-            <el-date-picker
-                v-model="tableForm.endTime"
-                type="date"
-                format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD"
-                placeholder="选择项目预计持续时间"
-                :disabled="!tableForm.startTime"
-                :disabled-date="disabledDate"
-            >
-            </el-date-picker>
+<!--            <el-date-picker-->
+<!--                v-model="tableForm.endTime"-->
+<!--                type="date"-->
+<!--                format="YYYY-MM-DD"-->
+<!--                value-format="YYYY-MM-DD"-->
+<!--                placeholder="选择项目预计持续时间"-->
+<!--                :disabled="!tableForm.startTime"-->
+<!--                :disabled-date="disabledDate"-->
+<!--            >-->
+<!--            </el-date-picker>-->
+            <span>{{ tableForm.endTime }}</span>
           </el-form-item>
         </el-col>
         <el-col :span="24">