生成报告号

src/api/program/ProgramProjectListInfoService.js

@@ -58,4 +58,11 @@ export default class ProgramProjectListInfoService {
       data: data
     })
   }
+  saveReportNo (id) {
+    return request({
+      url: '/program/projectList/saveReportNo',
+      method: 'get',
+      params: {id: id}
+    })
+  }
 }

src/views/modules/finance/invoice/InvoiceList.vue

@@ -179,56 +179,56 @@
           :data="dataList"
           :checkbox-config="{}">
           <vxe-column type="seq" width="40"></vxe-column>
-          <vxe-column type="checkbox" width="" ></vxe-column>
-          <vxe-column width="150" title="项目名称"align="center" field="programName">
+          <vxe-column type="checkbox" width="40" ></vxe-column>
+          <vxe-column min-width="150" title="项目名称"align="center" field="programName">
             <template slot-scope="scope">
               <el-link  type="primary" :underline="false" @click="viewProject(scope.row.id)">{{commonJS.isEmpty(scope.row.financeInvoiceBaseDTOList[0].programId)?'其他：':''}}{{scope.row.programName}}</el-link>
             </template>
           </vxe-column>
-          <vxe-column width="150" title="发票申请编号"align="center" field="no">
+          <vxe-column min-width="150" title="发票申请编号"align="center" field="no">
             <template slot-scope="scope">
               <el-link  type="primary" :underline="false" @click="view(false, scope.row.id)">{{scope.row.no}}</el-link>
             </template>
           </vxe-column>
-          <vxe-column width="150" title="发票号"align="center" field="number"></vxe-column>
-          <vxe-column width="150" title="实际开票单位"align="center" field="billingWorkplaceReal"></vxe-column>
-          <vxe-column width="150" title="经办人"align="center" field="operator"></vxe-column>
-          <vxe-column width="150" title="经办人部门"align="center" field="operatorOffice"></vxe-column>
-          <vxe-column width="150" title="开票总金额（元）"align="center" field="account"></vxe-column>
-          <vxe-column width="150" title="开票金额（元）"align="center" field="accountDetail"></vxe-column>
-          <vxe-column width="120" title="开票内容"align="center" field="billingContent">
+          <vxe-column min-width="150" title="发票号"align="center" field="number"></vxe-column>
+          <vxe-column min-width="150" title="实际开票单位"align="center" field="billingWorkplaceReal"></vxe-column>
+          <vxe-column min-width="150" title="经办人"align="center" field="operator"></vxe-column>
+          <vxe-column min-width="150" title="经办人部门"align="center" field="operatorOffice"></vxe-column>
+          <vxe-column min-width="150" title="开票总金额（元）"align="center" field="account"></vxe-column>
+          <vxe-column min-width="150" title="开票金额（元）"align="center" field="accountDetail"></vxe-column>
+          <vxe-column min-width="120" title="开票内容"align="center" field="billingContent">
             <template slot-scope="scope">
               {{$dictUtils.getDictLabel('invoice_billing_content', scope.row.billingContent, '-')}}
             </template>
           </vxe-column>
-          <vxe-column width="100" title="收款类型"align="center" field="receivablesType">
+          <vxe-column min-width="100" title="收款类型"align="center" field="receivablesType">
             <template slot-scope="scope">
               {{$dictUtils.getDictLabel('invoice_receivables_type', scope.row.receivablesType, '-')}}
             </template>
           </vxe-column>
-          <vxe-column width="100" title="发票类型"align="center" field="type">
+          <vxe-column min-width="100" title="发票类型"align="center" field="type">
             <template slot-scope="scope">
               {{$dictUtils.getDictLabel('invoice_type', scope.row.type, '-')}}
             </template>
           </vxe-column>
-          <vxe-column width="120" title="开票日期"align="center" field="billingDate"></vxe-column>
-          <vxe-column width="120" title="收款日期"align="center" field="receivablesDate"></vxe-column>
-          <vxe-column width="110" fixed="right"align="center" title="是否收款" field="receivablesStatus">
+          <vxe-column min-width="120" title="开票日期"align="center" field="billingDate"></vxe-column>
+          <vxe-column min-width="120" title="收款日期"align="center" field="receivablesDate"></vxe-column>
+          <vxe-column min-width="110" fixed="right"align="center" title="是否收款" field="receivablesStatus">
             <template slot-scope="scope">
               {{scope.row.receivablesStatus === '1'?'已收款':'未收款'}}
             </template>
           </vxe-column>
-          <vxe-column width="110" fixed="right"align="center" title="是否作废" field="invalidStatus">
+          <vxe-column min-width="110" fixed="right"align="center" title="是否作废" field="invalidStatus">
             <template slot-scope="scope">
               {{scope.row.invalidStatus === '1'?'已作废':'未作废'}}
             </template>
           </vxe-column>
-          <vxe-column  width="110px" fixed="right"align="center" title="状态" field="status" >
+          <vxe-column  min-width="110px" fixed="right"align="center" title="状态" field="status" >
             <template slot-scope="scope">
               <el-button  type="text" @click="invoiceDetail(scope.row)" :type="$dictUtils.getDictLabel('invoice_status_info', scope.row.status, '-')" effect="dark" size="mini">{{$dictUtils.getDictLabel("invoice_status", scope.row.status, '-')}} </el-button>
             </template>
           </vxe-column>
-          <vxe-column width="300" title="操作"  fixed="right" align="center">
+          <vxe-column min-width="300" title="操作"  fixed="right" align="center">
             <template  slot-scope="scope">
               <el-button v-if="hasPermission('finance:invoice:edit')&&scope.row.status === '1'||scope.row.status === '3'||scope.row.status === '4'" type="text" icon="el-icon-edit" size="small" @click="invoicePush(scope.row)">修改</el-button>
               <el-button v-if="hasPermission('finance:invoice:edit')&&scope.row.status === '2'" type="text"  icon="el-icon-delete" size="small" @click="invoiceReback(scope.row)">撤回</el-button>

src/views/modules/program/registered/ProjectList.vue

@@ -63,9 +63,9 @@
     <div class="bg-white top" style="">
       <vxe-toolbar :refresh="{query: refreshList}" custom>
         <template #buttons>
-          <el-button v-if="hasPermission('program:configuration:type:add')" type="primary" size="small" icon="el-icon-plus" @click="start()">新建</el-button>
-          <el-button v-if="hasPermission('program:configuration:type:del')" type="danger"   size="small" icon="el-icon-delete" @click="del()" :disabled="$refs.typeDictTable && $refs.typeDictTable.getCheckboxRecords().length === 0" plain>删除</el-button>
-          <el-button v-if="hasPermission('sys:project:exportFile')"  type="warning" plain @click="exportFile()" size="small">导出</el-button>
+          <el-button v-if="hasPermission('program:registered:add')" type="primary" size="small" icon="el-icon-plus" @click="start()">新建</el-button>
+          <el-button v-if="hasPermission('program:registered:del')" type="danger"   size="small" icon="el-icon-delete" @click="del()" :disabled="$refs.typeDictTable && $refs.typeDictTable.getCheckboxRecords().length === 0" plain>删除</el-button>
+          <el-button v-if="hasPermission('program:registered:export')"  type="warning" plain @click="exportFile()" size="small">导出</el-button>
         </template>
       </vxe-toolbar>
       <div style="height: calc(100% - 90px)">
@@ -88,39 +88,42 @@
           :checkbox-config="{}">
           <vxe-column type="seq" width="40"></vxe-column>
           <vxe-column type="checkbox" width="40" ></vxe-column>
-          <vxe-column width="" title="项目名称" field="name" align="left">
+          <vxe-column min-width="170" align="center" title="项目名称" field="name" >
             <template slot-scope="scope">
               <el-link  type="primary" :underline="false" v-if="hasPermission('program:registered:view')" @click="view(scope.row.id)">{{scope.row.name}}</el-link>
               <el-link  type="primary" :underline="false" v-else-if="hasPermission('program:registered:view')" @click="view(scope.row.id)">{{scope.row.name}}</el-link>
               <span v-else>{{scope.row.name}}</span>
             </template>
           </vxe-column>
-          <vxe-column width="100" title="项目编号" field="no"></vxe-column>
-          <vxe-column width="180" title="合同名称" field="contractName">
+          <vxe-column min-width="100"align="center" title="项目编号" field="no"></vxe-column>
+          <vxe-column min-width="180"align="center" title="合同名称" field="contractName">
             <template slot-scope="scope">
               <el-link  type="primary" :underline="false" v-if="hasPermission('program:registered:view')" @click="viewContract(scope.row.contractId)">{{scope.row.contractName}}</el-link>
               <el-link  type="primary" :underline="false" v-else-if="hasPermission('program:registered:view')" @click="viewContract(scope.row.contractId)">{{scope.row.contractName}}</el-link>
               <span v-else>{{scope.row.name}}</span>
             </template>
           </vxe-column>
-          <vxe-column width="100" title="项目经理" field="projectManagerName"></vxe-column>
-          <vxe-column width="180" title="委托方" field="clientName"></vxe-column>
-          <vxe-column width="100" title="创建日期" field="createDate"></vxe-column>
-          <vxe-column  width="120px" title="状态" field="status" >
+          <vxe-column min-width="100"align="center" title="项目经理" field="projectManagerName"></vxe-column>
+          <vxe-column min-width="180"align="center" title="委托方" field="clientName"></vxe-column>
+          <vxe-column min-width="210"align="center" title="报告号" field="reportNo"></vxe-column>
+          <vxe-column min-width="120"align="center" title="创建日期" field="createDate"></vxe-column>
+          <vxe-column  min-width="150px"align="center" title="状态" field="status" >
             <template slot-scope="scope">
               <el-button  type="text" @click="registeredDetail(scope.row)" :type="$dictUtils.getDictLabel('program_project_list_info_status_info', scope.row.status, '-')" effect="dark" size="mini">{{$dictUtils.getDictLabel("program_project_list_info_status", scope.row.status, '-')}} </el-button>
             </template>
           </vxe-column>
-          <vxe-column title="操作" width="230px" fixed="right" align="center">
+          <vxe-column title="操作" min-width="230px" fixed="right" align="center">
             <template  slot-scope="scope">
-              <el-button v-if="hasPermission('program:configuration:type:edit')&&scope.row.status === '1'" type="text"  icon="el-icon-delete" size="small" @click="registeredPush(scope.row)">送审</el-button>
-              <el-button v-if="hasPermission('program:configuration:type:edit')&&(scope.row.status === '1' || scope.row.status === '3'||scope.row.status === '4')" type="text"  icon="el-icon-delete" size="small" @click="registeredPush(scope.row)">修改</el-button>
+              <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status === '1'" type="text"  icon="el-icon-delete" size="small" @click="registeredPush(scope.row)">送审</el-button>
+              <el-button v-if="hasPermission('program:registered:edit')&&(scope.row.status === '1' || scope.row.status === '3'||scope.row.status === '4')" type="text"  icon="el-icon-delete" size="small" @click="registeredPush(scope.row)">修改</el-button>
               <!--管理员角色登记完成后可修改-->
-              <el-button v-if="hasPermission('program:configuration:type:edit')&&scope.row.status === '5' && isAdmin" type="text"  icon="el-icon-delete" size="small" @click="edit(scope.row.id)">修改</el-button>
-              <el-button v-if="hasPermission('program:configuration:type:edit')&&scope.row.status === '2'" type="text"  icon="el-icon-delete" size="small" @click="registeredReback(scope.row)">撤回</el-button>
-              <el-button v-if="hasPermission('program:configuration:type:del')&&scope.row.status !== '2' && scope.row.status !== '5'" type="text"  icon="el-icon-delete" size="small" @click="del(scope.row.id)">删除</el-button>
+              <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status === '5' && isAdmin" type="text"  icon="el-icon-delete" size="small" @click="edit(scope.row.id)">修改</el-button>
+              <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status === '2'" type="text"  icon="el-icon-delete" size="small" @click="registeredReback(scope.row)">撤回</el-button>
+              <el-button v-if="hasPermission('program:registered:del')&&scope.row.status !== '2' && scope.row.status !== '5'" type="text"  icon="el-icon-delete" size="small" @click="del(scope.row.id)">删除</el-button>
               <!--管理员角色登记完成后可删除-->
-              <el-button v-if="hasPermission('program:configuration:type:del')&&scope.row.status === '5' && isAdmin" type="text"  icon="el-icon-delete" size="small" @click="del(scope.row.id)">删除</el-button>
+              <el-button v-if="hasPermission('program:registered:del')&&scope.row.status === '5' && isAdmin" type="text"  icon="el-icon-delete" size="small" @click="del(scope.row.id)">删除</el-button>
+
+              <el-button v-if="hasPermission('program:registered:edit')&&scope.row.status === '5' && commonJS.isEmpty(scope.row.reportNo)" type="text"  icon="el-icon-circle-check" size="small" @click="saveReportNo(scope.row.id)">生成报告号</el-button>
             </template>
           </vxe-column>
         </vxe-table>
@@ -395,6 +398,16 @@
             console.log(err.response)
           }
         })
+      },
+      saveReportNo (id) {
+        this.loading = true
+        this.programProjectListInfoService.saveReportNo(id).then((data) => {
+          this.$message.success(data.data)
+          this.refreshList()
+          this.loading = false
+        }).catch((e) => {
+          this.loading = false
+        })
       }
     }
   }