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

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

src/components/SearchFilesByTag.vue

@@ -62,6 +62,13 @@ const props = defineProps({
 const tagsOption = ref([])
 const tableConfig = reactive({
   columns: [
+    {
+      prop: 'index',
+      type: 'index',
+      label: '序号',
+      align: 'center',
+      width:85,
+    },
     {
       prop: 'originalFileName',
       label: '附件名称',

src/fvcomponents/fvTable/index.vue

@@ -59,7 +59,6 @@
           v-loading="localData.loading"
           :row-key="tableConfig?.rowKey || 'id'"
           v-bind="$attrs"
-          table-layout="auto"
           :show-overflow-tooltip="true"
           highlight-current-row
           @selection-change="selectionChange"

src/views/expense-management/share/index.vue

@@ -96,6 +96,13 @@ const searchConfig = reactive([
 const tableIns = ref()
 const tableConfig = reactive({
   columns: [
+    {
+      prop: 'index',
+      type: 'index',
+      label: '序号',
+      align: 'center',
+      width:85
+    },
     {
       prop: 'shareName',
       label: '分摊名称',

src/views/home/index.vue

@@ -123,6 +123,13 @@ const auths = {
 }
 const tableConfigBacklog = reactive({
   columns: [
+    {
+      prop: 'index',
+      type: 'index',
+      label: '序号',
+      align: 'center',
+      width:85,
+    },
     {
       prop: 'targetName',
       label: '流程名称',
@@ -181,6 +188,13 @@ const tableConfigReport = reactive({
     //   type: 'selection',
     //   prop: 'selection'
     // },
+    {
+      prop: 'index',
+      type: 'index',
+      label: '序号',
+      align: 'center',
+      width:85,
+    },
     {
       prop: 'requirementName',
       label: '征集名称',

src/views/plan/index.vue

@@ -28,6 +28,13 @@ const tableConfig = reactive({
     //   type: 'selection',
     //   prop: 'selection'
     // },
+    {
+      prop: 'index',
+      type: 'index',
+      label: '序号',
+      align: 'center',
+      width:85
+    },
     {
       prop: 'annualPlanName',
       label: '年度计划名称',

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

@@ -113,43 +113,53 @@ const tableConfig = reactive({
     //   type: 'selection',
     //   prop: 'selection'
     // },
+    {
+      prop: 'index',
+      type: 'index',
+      label: '序号',
+      align: 'center',
+      width:85,
+    },
     {
       prop: 'requirementName',
       label: '征集名称',
-      align: 'center'
+      align: 'center',
     },
     {
       prop: 'collectType',
       label: '征集类型',
-      align: 'center'
+      align: 'center',
+      // width: 200
     },
     {
       prop: 'companyName',
       label: '征集公司',
       align: 'center',
-      // currentRender: ({row, index}) => (
+      // width: 200
-      // <div style={{width: '300px', textOverflow: 'ellipsis',textAlign:'center'}}>{row.companyName}</div>)
     },
     {
       prop: 'approveName',
       label: '审批人',
-      align: 'center'
+      align: 'center',
+      // width: 100,
     },
     {
       prop: 'deadline',
-      label: '截止时间',
+      label: '需求上报截止时间',
-      align: 'center'
+      align: 'center',
+      // width: 150,
     },
     {
       prop: 'taskNode',
       label: '当前节点',
-      align: 'center'
+      align: 'center',
+      // width: 300
     },
     {
       prop: 'state',
       label: '状态',
       align: 'center',
-      width: 200,
+      // width: 100,
       showOverflowTooltip: false,
       currentRender: ({row, index}) => (<Tag dictType={'demand_collection'} value={row.state}/>)
     },
@@ -157,7 +167,7 @@ const tableConfig = reactive({
       prop: 'oper',
       label: '操作',
       align: 'center',
-      fixed: 'right',
+      width: 150,
       showOverflowTooltip: false,
       currentRender: ({row, index}) => {
         let btn = []

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

@@ -157,6 +157,13 @@ const tableConfig = reactive({
         return row.state === '4';
       }
     },
+    {
+      prop: 'index',
+      type: 'index',
+      label: '序号',
+      align: 'center',
+      width:60,
+    },
     {
       prop: 'requirementName',
       label: '征集名称',

src/views/project-management/filing/index.vue

@@ -138,15 +138,22 @@ const tableIns = ref()
 const tableConfig = reactive({
   columns: [
     {
-      prop: 'projectName',
+      prop: 'index',
-      label: '项目名称',
+      type: 'index',
-      align: 'center'
+      label: '序号',
+      align: 'center',
+      width:85,
     },
     {
       prop: 'affiliatedCompany',
       label: '征集公司',
       align: 'center'
     },
+    {
+      prop: 'projectName',
+      label: '项目名称',
+      align: 'center'
+    },
     {
       prop: 'approveName',
       label: '审批人',

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

@@ -141,15 +141,22 @@ const tableConfig = reactive({
     //   prop: 'selection'
     // },
     {
-      prop: 'projectName',
+      prop: 'index',
-      label: '项目名称',
+      type: 'index',
-      align: 'center'
+      label: '序号',
+      align: 'center',
+      width:85,
     },
     {
       prop: 'affiliatedCompany',
       label: '征集公司',
       align: 'center'
     },
+    {
+      prop: 'projectName',
+      label: '项目名称',
+      align: 'center'
+    },
     {
       prop: 'approveName',
       label: '审批人',

src/views/project-management/initiation/index.vue

@@ -135,15 +135,23 @@ const tableIns = ref()
 const tableConfig = reactive({
   columns: [
     {
-      prop: 'projectName',
+      prop: 'index',
-      label: '项目名称',
+      type: 'index',
-      align: 'center'
+      label: '序号',
+      align: 'center',
+      width:85,
     },
     {
       prop: 'affiliatedCompany',
       label: '征集公司',
       align: 'center'
     },
+    {
+      prop: 'projectName',
+      label: '项目名称',
+      align: 'center'
+    },
+
     {
       prop: 'approveName',
       label: '审批人',

src/views/special-fund/index.vue

@@ -64,6 +64,13 @@ const searchConfig = reactive([
 ])
 const tableConfig = reactive({
   columns: [
+    {
+      prop: 'index',
+      type: 'index',
+      label: '序号',
+      align: 'center',
+      width:85,
+    },
     {
       prop: 'name',
       label: '专项资金名称',