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

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

src/components/AttachmentUpload.vue

@@ -222,9 +222,6 @@ const singleFileList = ref([])
 if (props.formData.fileList !== null && props.formData.fileList?.length > 0) {
   allFileList.value = props.formData.fileList
 }
-watch(() => props.showTable, (newVal) => {
-  props.showTable = newVal
-}, {deep: true})
 watch(() => props.showSingleTable, (newVal) => {
   props.showSingleTable = newVal
 }, {deep: true})
@@ -237,7 +234,7 @@ watch(() => props.formData.fileList, (newVal) => {
   }
 }, {deep: true})
 watch(() => props.otherFileList, (newVal) => {
-  // console.log('newotherFileList', newVal, props.formData)
+  // console.log('newotherFileList', newVal)
   if (props.preview) {
     if (props.formData.fileList === null || props.formData.fileList?.length === 0) {
       allFileList.value = newVal
@@ -250,6 +247,10 @@ watch(() => props.otherFileList, (newVal) => {
     allFileList.value = newVal
   }
 }, {deep: true})
+
+watch(() => props.showTable, (newVal) => {
+  props.showTable = newVal
+}, {deep: true})
 watch(() => props.singleList, (newVal) => {
   // console.log('singleFile', newVal)
   singleFileList.value = newVal

src/components/DetailComponent/AllocationSummaryDetail.vue

@@ -1,5 +1,5 @@
 <template>
-<!--  <el-button color="#DED0B2" style="float: right;margin: 0 10px 10px 0" @click="exportTable">导出</el-button>-->
+  <el-button color="#DED0B2" style="float: right;margin: 0 10px 10px 0" @click="exportTable">导出</el-button>
   <el-table ref="table" :data="tableData" style="width: 100%;height: 479px" :show-summary="true" border
             :summary-method="getSummaries" v-loading="loading" :header-cell-style="{background:'#f5f7fa'}">
     <el-table-column type="index" label="序号" align="center" width="60"/>
@@ -16,7 +16,6 @@
       <template #default="scope">
         <div v-if="scope.row.researchStage !== null && scope.row.researchStage !== null && scope.row.researchStage !== undefined">
           <el-tag effect="plain">{{scope.row.researchStage==1?'开发阶段':'研究阶段'}}</el-tag>
-<!--          <Tag dictType="research_stage" :value="scope.row.researchStage"/>-->
         </div>
         <div v-else>--</div>
       </template>
@@ -30,6 +29,8 @@
       </template>
     </el-table-column>
   </el-table>
+
+  <!--          <Tag dictType="research_stage" :value="scope.row.researchStage"/>-->
 </template>
 
 <script setup>

src/components/DetailComponent/FileComponent.vue

@@ -50,7 +50,7 @@ const tableConfig = reactive({
       type: 'index',
       label: '序号',
       align: 'center',
-      width: 90,
+      width: 85,
     },
     {
       prop: 'originalFileName',

src/utils/request.js

@@ -35,12 +35,12 @@ serveice.interceptors.response.use(response => {
     const status = response.status;
     switch (status) {
         case 401:
-            ElMessageBox.confirm('登录状态已过期,请重新登录', '系统提示', {
+            // ElMessageBox.confirm('登录状态已过期,请重新登录', '系统提示', {
-                confirmButtonText: '重新登录',
+            //     confirmButtonText: '重新登录',
-                cancelButtonText: '取消',
+            //     cancelButtonText: '取消',
-                type: 'warning',
+            //     type: 'warning',
-                closeOnClickModal: false
+            //     closeOnClickModal: false
-            }).then(() => {
+            // }).then(() => {
                 removeToken()
                 let path = window.location.pathname;
                 let query = window.location.search
@@ -49,7 +49,7 @@ serveice.interceptors.response.use(response => {
                     query: query
                 }))
                 window.location.href = `${window.location.origin}/api/auth/cas/login`
-            })
+            // })
             return Promise.reject('会话已过期,请重新登录')
         case 402:
             break;

src/views/expense-management/share/moblieDetail/AllocationSummaryDetailMoblie.vue

@@ -1,5 +1,5 @@
 <template>
-<!--  <el-button color="#DED0B2" style="float: right;margin: 0 10px 10px 0" @click="exportTable">导出</el-button>-->
+  <el-button color="#DED0B2" style="float: right;margin: 0 10px 10px 0" @click="exportTable">导出</el-button>
   <el-table ref="table" :data="tableData" style="width: 100%;height: 479px" :show-summary="true" border
             :summary-method="getSummaries" v-loading="loading" :header-cell-style="{background:'#f5f7fa'}">
     <el-table-column type="index" label="序号" align="center" width="60"/>
@@ -16,7 +16,7 @@
       <template #default="scope">
         <div
             v-if="scope.row.researchStage !== null && scope.row.researchStage !== null && scope.row.researchStage !== undefined">
-          <Tag dictType="research_stage" :value="scope.row.researchStage"/>
+          <el-tag effect="plain">{{scope.row.researchStage==1?'开发阶段':'研究阶段'}}</el-tag>
         </div>
         <div v-else>--</div>
       </template>

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

@@ -382,9 +382,11 @@ const getOtherFile = (val) => {
     showTable.value = true
   })
 }
-watch(() => otherFileList.value, (newVal) => {
+// watch(() => otherFileList.value, (newVal) => {
-  showTable.value = newVal.length !== 0;
+//   console.log('newVal',newVal)
-}, {deep: true})
+//   showTable.value = newVal.length !== 0;
+//   console.log('showTable.value',showTable.value)
+// }, {deep: true})
 watch(() => singleList.value, (newVal) => {
   showSingleTable.value = newVal.length !== 0;
 }, {deep: true})

src/views/project-management/mobledetail/AllocationSummaryDetailMobile.vue

@@ -16,7 +16,7 @@
       <template #default="scope">
         <div
             v-if="scope.row.researchStage !== null && scope.row.researchStage !== null && scope.row.researchStage !== undefined">
-          <Tag dictType="research_stage" :value="scope.row.researchStage"/>
+          <el-tag effect="plain">{{scope.row.researchStage==1?'开发阶段':'研究阶段'}}</el-tag>
         </div>
         <div v-else>--</div>
       </template>

src/views/project-management/mobledetail/SpecialFundDetailMobile.vue

@@ -153,7 +153,7 @@ const fileTable = reactive({
       type: 'index',
       label: '序号',
       align: 'center',
-      width: '80',
+      width: 85,
     },
     {
       prop: 'originalFileName',
@@ -169,6 +169,7 @@ const fileTable = reactive({
       prop: 'size',
       label: '文件大小',
       align: 'center',
+      width: 150,
       currentRender: ({row, index}) => (parseInt(row.size / 1024) + 'KB')
     },
     {

src/views/project-management/mobledetail/StepsMoblie.vue

@@ -1,7 +1,6 @@
 <template>
   <baseTitle title="基础信息"></baseTitle>
   <fvForm :schema="schema" @getInstance="(e)=>baseForm = e"></fvForm>
-  <baseTitle title="各流程信息"></baseTitle>
   <div class="steps-box">
     <el-steps :active="localActive" finish-status="success">
       <el-step
@@ -22,6 +21,7 @@
 
   <!-- 步骤内容 -->
   <div>
+    <baseTitle title="各流程信息"></baseTitle>
     <slot name="content" :localActive="localActive"></slot>
     <!-- <template v-for="(item, index) in stepList" :key="item.key">
       <component v-if="localActive == index" v-bind="item.props || {}" :is="item.component" />
@@ -101,28 +101,28 @@ const schema = computed(() => {
       label: '征集名称',
       prop: 'requirementName',
       colProps: {
-        span: 12
+        span: 24
-      }
-    },
-    {
-      label: '项目名称',
-      prop: 'projectName',
-      colProps: {
-        span: 12
       }
     },
     {
       label: '征集描述',
       prop: 'collectExplain',
       colProps: {
-        span: 12
+        span: 24
+      }
+    },
+    {
+      label: '项目名称',
+      prop: 'projectName',
+      colProps: {
+        span: 24
       }
     },
     {
       label: '所属公司',
       prop: 'affiliatedCompany',
       colProps: {
-        span: 12
+        span: 24
       }
     },
   ]

src/views/project-management/mobledetail/SummaryDetailMoblie.vue

@@ -240,12 +240,24 @@ const _value = computed({
 const filterDict = (data, value) => {
   if (data === undefined || value === undefined) return;
   let label = ''
-  if (data instanceof Array) {
+  let result = []
-    data.find(item => {
+  if (JSON.parse(value) instanceof Array) {
-      if (item.value == value) {
+    JSON.parse(value).forEach(item1 => {
-        label = item.label
+      data.find(item => {
-      }
+        if (item.value == item1) {
+          result.push(item.label)
+        }
+      })
     })
+    label = result.map(item => item).join('，')
+  } else {
+    if (data instanceof Array) {
+      data.find(item => {
+        if (item.value == value) {
+          label = item.label
+        }
+      })
+    }
   }
   return label
 }

src/views/system/department/index.vue

@@ -32,6 +32,11 @@
     <el-table-column prop="departmentMark" label="部门标志"/>
     <el-table-column prop="departmentCode" label="部门编码"/>
     <el-table-column prop="departmentName" label="部门名称"/>
+    <el-table-column prop="matrix" label="矩阵审批">
+      <template #default="scope">
+       <el-tag :type="scope.row.matrix?'success':'danger'"> {{scope.row.matrix?'完备':'缺失'}}</el-tag>
+      </template>
+    </el-table-column>
     <el-table-column prop="createTime" label="创建时间"/>
     <el-table-column prop="oper" label="操作">
       <template #default="{ row }">