rrrr

src/api/index.js

@@ -528,7 +528,7 @@ export default {
             return fetch(`/v1/science-admin/com-project-check/getCount`, params)
         },
     },
-    auditManager: {
+    audit: {
         getListByPage (params) {
             return fetch(`/v1/science-admin/com_project_audit/getListByPage`, params)
         },

src/views/audit/conclusion/index.vue

@@ -134,7 +134,7 @@ export default {
       this.loading = true;
       let pars = isEmptyParams(this.searchForm);
       let par = { ...pars, pageIndex: this.pagination.pageIndex, pageSize: this.pagination.pageSize, }
-      this.$api.auditManager.getAuditListByPage(par).then(({ data = {} }) => {
+      this.$api.audit.getAuditListByPage(par).then(({ data = {} }) => {
         if (data) {
           const { dataList = [], total = 0 } = data;
           this.tableData = dataList;
@@ -149,7 +149,7 @@ export default {
     },
     getCount () {
       let pars = isEmptyParams({ auditType: 4, projType: getType() });
-      this.$api.auditManager.getConclusionAuditCount(pars).then(({ data = {} }) => {
+      this.$api.audit.getConclusionAuditCount(pars).then(({ data = {} }) => {
         if (data) {
           this.panes = data
           this.itemCount = [data.count1, data.count2, data.count3, data.count4, data.count5]

src/views/audit/project/Index.vue

@@ -186,7 +186,7 @@ export default {
       this.loading = true;
       let pars = isEmptyParams(this.searchForm);
       let par = { ...pars, pageIndex: this.pagination.pageIndex, pageSize: this.pagination.pageSize, }
-      this.$api.auditManager.getAuditListByPage(par).then(({ data = {} }) => {
+      this.$api.audit.getAuditListByPage(par).then(({ data = {} }) => {
         if (data) {
           const { dataList = [], total = 0 } = data;
           this.pagination.total = total;
@@ -206,7 +206,7 @@ export default {
     },
     getCount () {
       let pars = isEmptyParams({ auditType: 1, reportYear: this.searchForm.reportYear, projType: getType() });
-      this.$api.auditManager.getCount(pars).then(({ data = {} }) => {
+      this.$api.audit.getCount(pars).then(({ data = {} }) => {
         if (data) {
           this.panes = data
           this.itemCount = [data.count1, data.count2, data.count3, data.count4, data.count5]

src/views/audit/project/audit.vue

@@ -176,7 +176,7 @@ export default {
           this.loading = true
           let pars = isEmptyParams(this.auditObj)
           let par = { ...pars }
-          this.$api.auditManager.projectAudit(par).then(({ data = {} }) => {
+          this.$api.audit.projectAudit(par).then(({ data = {} }) => {
             if (data) {
               if (data === '项目上报已经到达上限！') {
                 this.$message.info('项目上报已经到达上限！')

src/views/audit/project/batchAudit.vue

@@ -50,7 +50,7 @@ export default {
           this.loading = true
           let pars = isEmptyParams(this.auditObj)
           let par = { ...pars }
-          this.$api.auditManager.projectBatchAudit(par).then(({ data = {} }) => {
+          this.$api.audit.projectBatchAudit(par).then(({ data = {} }) => {
             if (data) {
               this.$message.success('审核成功！')
               this.$emit('close', 'audit')

src/views/audit/project/final.vue

@@ -229,7 +229,7 @@ export default {
       this.loading = true;
       let pars = isEmptyParams(this.searchForm);
       let par = { ...pars, pageIndex: this.pagination.pageIndex, pageSize: this.pagination.pageSize, }
-      this.$api.auditManager.getFinalAuditListByPage(par).then(({ data = {} }) => {
+      this.$api.audit.getFinalAuditListByPage(par).then(({ data = {} }) => {
         if (data) {
           const { dataList = [], total = 0 } = data;
           this.tableData = dataList;
@@ -260,7 +260,7 @@ export default {
     },
     getCount () {
       let pars = isEmptyParams({ auditType: 1, reportYear: this.searchForm.reportYear, projType: getType() });
-      this.$api.auditManager.getFinalCount(pars).then(({ data = {} }) => {
+      this.$api.audit.getFinalCount(pars).then(({ data = {} }) => {
         if (data) {
           this.panes = data
           this.itemCount = [data.count1, data.count2, data.count3, data.count4, data.count5]
@@ -320,7 +320,7 @@ export default {
       this.loading = true;
       let pars = isEmptyParams(this.searchForm);
       let par = { ...pars, pageIndex: -1, pageSize: -1, }
-      this.$api.auditManager.getFinalAuditListByPage(par).then(({ data = {} }) => {
+      this.$api.audit.getFinalAuditListByPage(par).then(({ data = {} }) => {
         if (data) {
           const { dataList = [], total = 0 } = data
           dataList.forEach(e => {

src/views/audit/task/Index.vue

@@ -171,7 +171,7 @@ export default {
         pageIndex: this.pagination.pageIndex,
         pageSize: this.pagination.pageSize
       }
-      this.$api.auditManager.getAuditListByPage(par).then(({ data = {} }) => {
+      this.$api.audit.getAuditListByPage(par).then(({ data = {} }) => {
         if (data) {
           const { dataList = [], total = 0 } = data
           this.tableData = dataList
@@ -184,7 +184,7 @@ export default {
     },
     getCount () {
       let pars = isEmptyParams({ auditType: 2, reportYear: this.searchForm.reportYear });
-      this.$api.auditManager.getCount(pars).then(({ data = {} }) => {
+      this.$api.audit.getCount(pars).then(({ data = {} }) => {
         if (data) {
           this.panes = data
         }

src/views/audit/task/audit.vue

@@ -131,7 +131,7 @@ export default {
         if (valid) {
           let pars = isEmptyParams(this.auditObj)
           let par = { ...pars }
-          this.$api.auditManager.testAudit(par).then(({ data = {} }) => {
+          this.$api.audit.testAudit(par).then(({ data = {} }) => {
             if (data) {
               this.$message.success('审核成功！')
               this.$emit('closeWindow', 'audit')

src/views/audit/thesis/index.vue

@@ -129,7 +129,7 @@ export default {
       this.loading = true;
       let pars = isEmptyParams(this.searchForm);
       let par = { ...pars, pageIndex: this.pagination.pageIndex, pageSize: this.pagination.pageSize, }
-      this.$api.auditManager.getAuditListByPage(par).then(({ data = {} }) => {
+      this.$api.audit.getAuditListByPage(par).then(({ data = {} }) => {
         if (data) {
           const { dataList = [], total = 0 } = data;
           this.tableData = dataList;
@@ -144,7 +144,7 @@ export default {
     },
     getCount () {
       let pars = isEmptyParams({ auditType: 5, projType: getType() });
-      this.$api.auditManager.getConclusionAuditCount(pars).then(({ data = {} }) => {
+      this.$api.audit.getConclusionAuditCount(pars).then(({ data = {} }) => {
         if (data) {
           this.panes = data
           this.itemCount = [data.count1, data.count2, data.count3, data.count4, data.count5]

src/views/manager/project/components/auditRecord.vue

@@ -74,7 +74,7 @@ export default {
         this.loading = true
         this.searchForm.auditObjectId = this.value
         let par = { ...this.searchForm, pageIndex: this.pagination.pageIndex, pageSize: this.pagination.pageSize }
-        this.$api.auditManager.getListByPage(par).then(({ data = {} }) => {
+        this.$api.audit.getListByPage(par).then(({ data = {} }) => {
           if (data) {
             const { dataList = [], total = 0 } = data
             this.tableData = dataList
@@ -116,7 +116,7 @@ export default {
         this.visible = true
       } else if (type === 'del') {
         this.loading = true
-        this.$api.auditManager.deleteRecord({ id: record.id }).then(({ data = {} }) => {
+        this.$api.audit.deleteRecord({ id: record.id }).then(({ data = {} }) => {
           if (data) {
             this.$message.success('删除成功')
             this.getListByPage()

src/views/manager/project/components/recordEdit.vue

@@ -173,7 +173,7 @@ export default {
           this.loading = true
           let pars = isEmptyParams(this.formData)
           let par = { ...pars }
-          this.$api.auditManager.save(par).then(({ data = {} }) => {
+          this.$api.audit.save(par).then(({ data = {} }) => {
             if (data) {
               this.$message.success('成功！')
               this.$emit('close', 'edit')

src/views/report/task/Index.vue

@@ -24,6 +24,9 @@
     <span class="form-description"> ※填报时间：{{ description }}</span>
     <!-- <a-table :dataSource="tableData" :columns="columns" rowKey="projId" :pagination="false" :loading="loading" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type: 'radio' }"> -->
     <a-table :dataSource="tableData" :columns="columns" :scroll="{ x: 'max-content' }" rowKey="projId" :pagination="false" :loading="loading">
+      <template slot="projName" slot-scope="record">
+        <a @click="recordClick(record, 'projView')">{{record.projName}}</a>
+      </template>
       <template slot="taskStateName" slot-scope="record">
         <span>{{record.taskStateName}}</span>
       </template>
@@ -41,6 +44,9 @@
     <a-modal v-model="visibleView" title="查看合同书" :width="'94%'" :dialog-style="{ top: '8%' }" :footer="null" destroyOnClose :maskClosable="false">
       <task-view v-model="projId" @close="closeWindow" />
     </a-modal>
+    <a-modal v-model="visibleProjView" v-if="visibleProjView" title="项目详情" width="94%" :footer="null" :dialog-style="{ top: '8%' }" destroyOnClose :maskClosable="false">
+      <project-view v-model="projId" @close="closeWindow"></project-view>
+    </a-modal>
   </div>
 </template>
 
@@ -49,11 +55,12 @@ import { getType } from '@/views/utils/auth'
 import { isEmptyParams, filterExportExcelData, tableColumnsName } from "@/views/utils/common";
 import taskCreate from "@/views/report/task/components/taskCreate.vue"
 import taskView from "@/views/report/task/components/taskView.vue"
+import projectView from '@/views/report/project/components/projectView'
 
 export default {
   name: 'reportTask',
   components: {
-    taskCreate, taskView
+    taskCreate, taskView, projectView
   },
   data () {
     return {
@@ -70,7 +77,7 @@ export default {
       searchForm: { projName: '', projNo: '', taskState: '1', reportYear: null },
       tableData: [],
       columns: [
-        { title: '项目名称', dataIndex: 'projName', align: 'center' },
+        { title: "项目名称", scopedSlots: { customRender: 'projName' }, align: 'center' },
         { title: '项目编号', dataIndex: 'projNo', align: 'center' },
         { title: '开始时间', dataIndex: 'startDate', align: 'center' },
         { title: '结束时间', dataIndex: 'endDate', align: 'center' },
@@ -83,6 +90,7 @@ export default {
       // 弹窗
       visibleEdit: false,
       visibleView: false,
+      visibleProjView: false,
       id: null,
       projId: null,
       selectedRowKeys: [],
@@ -153,6 +161,9 @@ export default {
       if (type === 'view') {
         this.projId = record.projId
         this.visibleView = true
+      } else if (type === 'projView') {
+        this.projId = record.projId
+        this.visibleProjView = true
       } else if (type === 'create') {
         this.projId = record.projId
         this.visibleEdit = true
@@ -179,10 +190,10 @@ export default {
         this.getListByPage()
       }
       else if (value === 'error') {
-        this.id = null
         this.projId = null
         this.visibleEdit = false
         this.visibleView = false
+        this.visibleProjView = false
       }
     },
     callback (key) {
@@ -190,7 +201,7 @@ export default {
       this.getListByPage()
     },
     exportData () {
-      this.$ToDoExcel(`任务书列表`, tableColumnsName(this.columns), filterExportExcelData(this.columns, this.tableData))
+      this.$ToDoExcel(`合同书列表`, tableColumnsName(this.columns), filterExportExcelData(this.columns, this.tableData))
     }
   },
   watch: {

src/views/report/task/components/taskEdit.vue

@@ -580,7 +580,11 @@
         </a-col>
         <a-col :span="8">
           <div class="special-middle">
-            <div>{{formData.totalFunding}}</div>
+            <div>
+              <a-form-model-item prop="isTechnologyReport">
+                {{formData.totalFunding}}
+              </a-form-model-item>
+            </div>
           </div>
         </a-col>
         <a-col :span="4" class="bg-gray">
@@ -590,7 +594,11 @@
         </a-col>
         <a-col :span="8">
           <div class="special-middle">
-            <div>{{formData.govFunding}}</div>
+            <div>
+              <a-form-model-item prop="isTechnologyReport">
+                {{formData.govFunding}}
+              </a-form-model-item>
+            </div>
           </div>
         </a-col>
       </a-row>
@@ -604,11 +612,7 @@
           <div class="special-middle">
             <div>
               <a-form-model-item prop="isTechnologyReport">
-                <a-select v-model="formData.isTechnologyReport" style="width: 100px">
-                  <a-select-option value="">--请选择--</a-select-option>
-                  <a-select-option value="1">是</a-select-option>
-                  <a-select-option value="0">否</a-select-option>
-                </a-select>
+                <base-select v-model="formData.isTechnologyReport" :type="12" :isAll="true" :width="80" />
               </a-form-model-item>
             </div>
           </div>
@@ -708,7 +712,30 @@ export default {
         projectSubList: [],
         fileList: [],
         auditList: [],
-        managerDept: "",
+        managerDept: null,
+        organizationCode: null,
+        unitAddress: null,
+        registeredAddress: null,
+        postCode: null,
+        legalPerson: null,
+        workforce: null,
+        specializedPersonnel: null,
+        researchPersonnel: null,
+        depositBank: null,
+        bankAccount: null,
+        depositBankAddress: null,
+        interbankNumber: null,
+        projWork: null,
+        fax: null,
+        telephone: null,
+        keyAreas: null,
+        startDate: null,
+        endDate: null,
+        linkName: null,
+        linkMobile: null,
+        linkEmail: null,
+        linkFax: null,
+        isTechnologyReport: null,
       },
       rules: {
         organizationCode: [{ required: true, message: '请填写统一社会信用代码', trigger: 'blur' },],