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

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

src/components/filePreview/ImagePreview.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="img-preview" >
-    <img id="previewImg" :src="fileUrl" :style="{width: fullscreen?windowWidth+'px':'',height: fullscreen?'auto':'650px;'}" alt="Preview"/>
+    <img id="previewImg" :src="fileUrl" :style="{width: fullscreen?windowWidth+'px':'100%',height: fullscreen?'auto':'650px;'}" alt="Preview"/>
   </div>
 </template>
 
@@ -51,6 +51,24 @@ nextTick(() => {
 .img-preview {
   display: flex;
   justify-content: center;
+  overflow-y: auto;
+  overflow-x: auto;
+  &::-webkit-scrollbar {
+    width: 6px;
+    height: 6px;
+  }
+
+  // 滚动条轨道
+  &::-webkit-scrollbar-track {
+    background: rgb(239, 239, 239);
+    border-radius: 2px;
+  }
+
+  // 小滑块
+  &::-webkit-scrollbar-thumb {
+    background: rgba(80, 81, 82, 0.29);
+    border-radius: 10px;
+  }
 }
 
 </style>

src/components/filePreview/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="file-preview">
-    <el-dialog id="dialog" :border="false" width="1500" :style="{height: fullscreen?'':'750px;'}" top="10vh"
+    <el-dialog id="dialog" :border="false" width="1200" :style="{height: fullscreen?'':'650px;'}" top="10vh"
                :fullscreen="fullscreen"
                :title="fileName" :show-close="true" :visible.sync="showPreview" v-model="showPreview"
                :append-to-body="false"
@@ -54,7 +54,7 @@ if(props.fileType!=='pdf'&&props.fileType!=='docx'&&!checkImgType(props.fileType
 }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .file-preview {
   .el-overlay-dialog {
     left: 0 !important;
@@ -69,6 +69,8 @@ if(props.fileType!=='pdf'&&props.fileType!=='docx'&&!checkImgType(props.fileType
   }
 
   .el-dialog__body {
+    overflow: hidden;
+
     padding: 0 !important;
   }
 }

src/views/expense-management/project-ledger/index.vue

@@ -0,0 +1,333 @@
+<template>
+  <fvSearchForm :searchConfig="searchConfig" @search="search" style="margin-left: 16px"></fvSearchForm>
+  <fvTable ref="tableIns" :tableConfig="tableConfig">
+    <template #empty>
+      <el-empty description="暂无数据"/>
+    </template>
+  </fvTable>
+</template>
+
+<script setup lang="jsx">
+import fvSelect from '@/fvcomponents/fvSelect/index.vue'
+import {toThousands} from '@/utils/changePrice.js'
+import { getSubCompOpt } from '@/api/user/user.js';
+
+const route = useRoute()
+const router = useRouter()
+const shortcuts = [
+  {
+    text: '上周',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+      return [start, end]
+    },
+  },
+  {
+    text: '上月',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+      return [start, end]
+    },
+  },
+  {
+    text: '三月前',
+    value: () => {
+      const end = new Date()
+      const start = new Date()
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 90)
+      return [start, end]
+    },
+  },
+]
+const searchConfig = ref([
+  {
+    label: '征集公司',
+    prop: 'affiliatedCompanyId',
+    component: 'el-tree-select',
+    props: {
+      placeholder: '请输入征集公司查询',
+      clearable: true,
+      data: [],
+      filterable: true,
+      checkStrictly: true,
+      remote: true
+    }
+  },
+  {
+    label: '项目名称',
+    prop: 'projectName',
+    component: 'el-input',
+    props: {
+      placeholder: '请输入项目名称查询',
+      clearable: true,
+      filterable: true,
+      checkStrictly: true
+    }
+  },
+  {
+    label: '项目类型',
+    prop: 'projectType',
+    component: shallowRef(fvSelect),
+    props: {
+      placeholder: '请选择项目类型',
+      cacheKey: 'project_type',
+      clearable: true,
+      filterable: true,
+      remote: true
+    }
+  },
+  {
+    label: '项目影响',
+    prop: 'projectImpact',
+    component: shallowRef(fvSelect),
+    props: {
+      placeholder: '请选择项目影响',
+      cacheKey: 'project_impact',
+      clearable: true,
+      filterable: true,
+      remote: true
+    },
+    colProps: {}
+  },
+  {
+    label: '研发主体',
+    prop: 'rdSubject',
+    component: shallowRef(fvSelect),
+    props: {
+      placeholder: '请选择研发主体',
+      cacheKey: 'rd_subject',
+      clearable: true,
+      filterable: true,
+      remote: true
+    }
+  },
+  {
+    label: '起止时间',
+    prop: 'dateValue',
+    component: 'el-date-picker',
+    props: {
+      clearable: true,
+      type: 'daterange',
+      startPlaceholder: '开始日期',
+      endPlaceholder: '结束日期',
+      valueFormat: 'YYYY-MM-DD HH:mm:ss',
+      shortcuts: shortcuts
+    }
+  }
+])
+const tableIns = ref()
+const tableConfig = reactive({
+  columns: [
+    // {
+    //   type: 'selection',
+    //   prop: 'selection'
+    // },
+    {
+      prop: 'index',
+      type: 'index',
+      label: '序号',
+      align: 'center',
+      width:85,
+      index: index => {
+        return (tableIns.value.getQuery().pageNum - 1) * tableIns.value.getQuery().pageSize + index + 1
+      }
+    },
+    {
+      prop: 'affiliatedCompany',
+      label: '征集公司',
+      align: 'center'
+    },
+    {
+      prop: 'projectName',
+      label: '项目名称',
+      align: 'center'
+    },
+    {
+      prop: 'projectType',
+      label: '项目类型',
+      align: 'center',
+      width: 100,
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        if (row.projectType && row.projectType !== null && row.projectType !== undefined) {
+          return (<Tag dictType={'project_type'} value={row.projectType}/>)
+        } else {
+          return '--'
+        }
+      }
+    },
+    {
+      prop: 'rdSubject',
+      label: '研发主体',
+      align: 'center',
+      width: 100,
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        if (row.rdSubject && row.rdSubject !== null && row.rdSubject !== undefined) {
+          return (<Tag dictType={'rd_subject'} value={row.rdSubject}/>)
+        } else {
+          return '--'
+        }
+      }
+    },
+    {
+      prop: 'researchStage',
+      label: '研发阶段',
+      align: 'center',
+      width: 100,
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        if (row.researchStage && row.researchStage !== null && row.researchStage !== undefined) {
+          return (<Tag dictType={'research_stage'} value={row.researchStage}/>)
+        } else {
+          return '--'
+        }
+      }
+    },
+    {
+      prop: 'projectImpact',
+      label: '项目影响',
+      align: 'center',
+      width: 100,
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        if (row.projectImpact && row.projectImpact !== null && row.projectImpact !== undefined) {
+          return (<Tag dictType={'project_impact'} value={row.projectImpact}/>)
+        } else {
+          return '--'
+        }
+      }
+    },
+    {
+      prop: 'economicEstimate',
+      label: '经费预算(元)',
+      align: 'center',
+      width: 150,
+      currentRender:({row})=>{
+        return <span>{toThousands(row.economicEstimate)}</span>
+      }
+    },
+    {
+      prop: 'startTime',
+      label: '起止时间',
+      align: 'center',
+      currentRender: ({row}) => {
+        return row.startTime + ' 至 ' + row.endTime
+      }
+    },
+    {
+      prop: 'approveName',
+      label: '当前审批节点',
+      align: 'center',
+      width: 120,
+      currentRender: ({row, index}) => {
+        if(row.state=='3'||row.state=='4'){
+          return <span>{row.taskNode}</span>
+        }else  if(row.state=='1'){
+          return <span>{row.approveName}</span>
+        }else {
+          return <span>--</span>
+        }
+      }
+    },
+    {
+      prop: 'state',
+      label: '状态',
+      align: 'center',
+      width: 100,
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        if (row.state && row.state !== null && row.state !== undefined) {
+          return (<Tag dictType={'project_implementation'} value={row.state}/>)
+        } else {
+          return '--'
+        }
+      }
+    },
+    {
+      prop: 'oper',
+      label: '操作',
+      align: 'center',
+      fixed:'right',
+      showOverflowTooltip: false,
+      currentRender: ({row, index}) => {
+        let btn = []
+        let buttons = new Set(Array.from(row.buttons))
+        if (buttons.has("standing")) {
+          btn.push({label: '台账', prem: ['project:management:implementation:account'], func: () => handleStandingBook(row), type: 'primary'})
+        }
+        return (
+            <div style={{width: '100%'}}>
+              {
+                btn.map(item => (
+                    <el-button
+                        type={item.type}
+                        v-perm={item.prem}
+                        onClick={() => item.func()}
+                        link
+                    >
+                      {item.label}
+                    </el-button>
+                ))
+              }
+            </div>
+        )
+      }
+    }
+  ],
+  api: '/workflow/mosr/project/implementation',
+  params: {
+    state:0
+  },
+  btns: [
+    // {name: '生成分摊报表', key: '_export', color: '#DED0B2', auth: ''}
+  ]
+})
+
+const search = (val) => {
+  let obj = {...val}
+  if(obj.dateValue) {
+    obj.startTime = obj.dateValue[0]
+    obj.endTime = obj.dateValue[1]
+    delete obj.dateValue
+  }
+  tableConfig.params = obj
+  tableIns.value.refresh()
+}
+
+const handleStandingBook = (row) => {
+  router.push({
+    name: 'Implementation/account',
+    query: {
+      id: row.projectId
+    }
+  })
+}
+const init = async () => {
+  const res = await getSubCompOpt()
+  searchConfig.value.find(item=>item.prop == 'affiliatedCompanyId').props.data = res.data
+}
+
+init()
+</script>
+<style scoped lang="scss">
+:deep(.el-table__header) {
+  .is-leaf:first-child {
+    .cell {
+      margin-left: -25px !important;
+    }
+  }
+}
+
+:deep(.el-table__body) {
+  .el-table__cell:first-child {
+    .cell {
+      margin-left: -13px !important;
+    }
+  }
+}
+</style>

src/views/research-fund/add.vue

@@ -94,9 +94,8 @@ const sureSelectedCompany = (select) => {
 }
 
 const cancelSelectedCompany=(select)=>{
-  console.info("🚀 ~ file:add method:cancelSelectedCompany line:287 -----", select)
-  formData.value.rdCompanyId =''
-  formData.value.rdCompany =''
+  // formData.value.rdCompanyId =''
+  // formData.value.rdCompany =''
   selectedCompanyList.value = select
 }
 const handleExpend = () => {
@@ -163,7 +162,6 @@ const handleSubmit = async (instance) => {
       })
       return;
     }
-    console.info("🚀 ~method:'formData.value.rdCompanyId -----", formData.value.rdCompanyId)
     if (!formData.value.rdCompanyId) {
       ElNotification({
         title: '提示',