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

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

src/components/AttachmentUpload.vue

@@ -12,15 +12,15 @@
           </template>
           <template
               v-else-if="!preview||JSON.stringify(singleFile) == '{}'||singleFile==null||formData.singleFile==null">
-            <file-upload @getFile="getAttachment"  :multiple="false" :maxSize="1"  :showFileList="showFileList" @delete="deleteAttachment"
-                         :disabled="isSingleFile" />
-<!--           -->
-<!--            <fvTable style="width: 100%;max-height: 80px;" v-if="showSingleTable" :tableConfig="singleTableConfig"-->
-<!--                     :data="singleFileList" :isSettingCol="false" :pagination="false">-->
-<!--              <template #empty>-->
-<!--                <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>-->
-<!--              </template>-->
-<!--            </fvTable>-->
+            <file-upload @getFile="getAttachment" :multiple="false"
+                         :disabled="isSingleFile" ref="fileUploadRef"/>
+            <!--           :showFileList="showFileList" @delete="deleteAttachment"-->
+            <fvTable style="width: 100%;max-height: 80px;" v-if="showSingleTable" :tableConfig="singleTableConfig"
+                     :data="singleFileList" :isSettingCol="false" :pagination="false">
+              <template #empty>
+                <el-empty :image-size="90" description="暂无数据" style="padding: 0"/>
+              </template>
+            </fvTable>
           </template>
         </el-form-item>
       </el-col>
@@ -209,6 +209,7 @@ const singleTableConfig = reactive({
     }
   ]
 })
+const fileUploadRef=ref()
 const rules = reactive({
   attachment: [{required: true, message: '请上传附件', trigger: ['blur', 'change']}],
 })
@@ -216,6 +217,7 @@ const applyForm = ref()
 const singleFile = ref(props.formData.singleFile)
 const isSingleFile = ref(false)
 const allFileList = ref([])
+const deleteFileVal = ref({})
 const singleFileList = ref([])
 if (props.formData.fileList !== null && props.formData.fileList?.length > 0) {
   allFileList.value = props.formData.fileList
@@ -277,11 +279,14 @@ const handleDelete = (row,type) => {
   });
 }
 const handleSingleDelete = (row) => {
+  console.log('row',row)
+  // fileUploadRef.value.handleRemove(deleteFileVal.value.id)
   handleDelete(row, 'single')
 }
 const getAttachment = (val) => {
   console.log('getAttachment', val)
   isSingleFile.value = true
+  // deleteFileVal.value=val
   emit('getAttachment', val)
 }
 const getOtherFile = (val) => {

src/components/DetailComponent/CompanyPicker.vue

@@ -168,26 +168,26 @@ const show = () => {
   getList()
 };
 
-const updateTreeCheck = (item, flag) => {
-  // list.forEach(item => {
+const updateTreeCheck = (list, flag) => {
+  list.forEach(item => {
+    if (item.value !== -1) {
       tree.value.setChecked(item, flag)
       if (item.children !== undefined) {
         updateTreeCheck(item.children, flag)
       }
-  // })
+    }
+  })
 }
 const handleChange = (data, checked) => {
   if (data.value == -1) {
     if(checked){
-      for (const item of dataList.value) {
-        if (item.value !== -1) {
-          console.log('item',item)
-          updateTreeCheck(item, false)
-        }
-      }
+      updateTreeCheck(dataList.value, false)
       tree.value.setChecked(data,true);
     }
   }
+  if(tree.value.getCheckedKeys().length>1&&tree.value.getCheckedKeys().indexOf(-1)!==-1){
+    tree.value.setChecked(-1,false);
+  }
   // 左侧有选择框 + 多选
   if (props.multiple) {
     //不添加重复的数据到右边

src/components/FileUpload.vue

@@ -44,10 +44,12 @@ const props = defineProps({
   showFileList: {
     type: Boolean,
     default: false
-  }, disabled: {
+  },
+  disabled: {
     type: Boolean,
     default: false
-  }, multiple: {
+  },
+  multiple: {
     type: Boolean,
     default: true
   }
@@ -98,7 +100,9 @@ const uploadError = () => {
     type: 'error'
   })
 }
-
+defineExpose({
+  handleRemove
+})
 </script>
 
 <style lang="scss" scoped>

src/views/project-demand/requirement/add.vue

@@ -35,14 +35,14 @@
         <el-col :span="8">
           <el-form-item label="是否专项资金" prop="isSpecialFund">
             <el-select v-model="formData.isSpecialFund" placeholder="是否专项资金" clearable filterable>
-              <el-option value="true" label="是"></el-option>
-              <el-option value="false" label="否"></el-option>
+              <el-option :value="true" label="是"></el-option>
+              <el-option :value="false" label="否"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="专项资金名称" prop="specialFundId">
-            <el-select v-model="formData.specialFundId" placeholder="请选择专项资金名称" clearable filterable :disabled="formData.isSpecialFund==='false'">
+            <el-select v-model="formData.specialFundId" placeholder="请选择专项资金名称" clearable filterable :disabled="!formData.isSpecialFund">
               <el-option
                   v-for="item in specialFundOption"
                   :key="item.value"
@@ -52,7 +52,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="24" style="margin-bottom: -18px">
+        <el-col :span="24" style="margin-bottom: -25px">
           <el-form-item label="征集公司" prop="companyIds" class="tree-select" label-width="96">
             <div style="width: 100%">
               <el-button color="#DED0B2" @click="showCompany">{{ selectedCompanyList.length === 0 ? '请选择征集公司' : '更改' }}
@@ -149,15 +149,13 @@ const formData = ref({
   deadline: '',
   collectExplain: '',
   fileList: [],
-  isSpecialFund: 'false'
+  isSpecialFund: false
 })
-const showTinymce = ref(true)
 const routerName = ref(router.currentRoute.value.name)
 const processDiagramViewer = ref(false)
 const companyOption = ref([])
 const specialFundOption = ref([])
 const form = ref(null)
-const expendClass = ref()
 const fileList = ref([])
 const loading = ref(false)
 const showTable = ref(false)
@@ -423,12 +421,12 @@ const getDetailInfo = async () => {
     if (res.code === 1000) {
       selectedCompanyList.value = getCompanyOptionItem(res.data.companyIds)
       formData.value = res.data
-      showTinymce.value = false
+      if(res.data.fileList.length!==0){
         showTable.value = false
         nextTick(() => {
-        showTinymce.value = true
           showTable.value = true
         })
+      }
     } else {
       ElNotification({
         title: '提示',