3333

src/views/audit/components/auditEdit.vue

@@ -2,15 +2,15 @@
   <div>
     <a-row>
       <a-col :span="24">
-        <div class="tb-title">
+        <div class="main-title">
           <span>审核</span>
         </div>
       </a-col>
     </a-row>
     <a-row>
-      <a-col :span="24" style="margin-top: 6px;text-align: center;">
+      <a-col :span="24" style="text-align: center;">
         <a-form-model-item prop="auditContent">
-          <a-textarea v-model="auditObj.auditContent" :auto-size="{ minRows: 5, maxRows: 8 }" :max-length="500" style="width: 60%;height: 115px;" />
+          <a-textarea v-model="auditObj.auditContent" :auto-size="{ minRows: 5, maxRows: 8 }" :max-length="500" style="margin: 4px 4px; width: 60%;height: 115px;" />
         </a-form-model-item>
       </a-col>
     </a-row>

src/views/audit/project/Index.vue

@@ -51,7 +51,7 @@
     <a-modal v-model="visibleAudit" v-if="visibleAudit" title="审核" :footer="null" width="94%" :dialog-style="{ top: '8%' }" destroyOnClose :maskClosable="false">
       <audit v-model="id" :objId="objectId" @close="closeWindow" @changeScroll="() => {this.$refs.s_modal.changeScroll()}"></audit>
     </a-modal>
-    <a-modal v-model="visibleBatch" v-if="visibleBatch" title="审核" :footer="null" width="94%" :dialog-style="{ top: '8%' }" destroyOnClose :maskClosable="false">
+    <a-modal v-model="visibleBatch" v-if="visibleBatch" title="批量审核" :footer="null" width="660" :dialog-style="{ top: '8%' }" destroyOnClose :maskClosable="false">
       <batch-audit v-model="id" :objId="objectId" @close="closeWindow" />
     </a-modal>
     <a-modal v-model="visibleView" v-if="visibleView" title="项目详情" width="94%" :footer="null" :dialog-style="{ top: '8%' }" destroyOnClose :maskClosable="false">

src/views/audit/project/batchAudit.vue

 
 <template>
-  <div class="app-content" style="height: 76vh;overflow: auto;">
+  <div class="app-content" style="height:300px;overflow: auto;">
     <a-spin :spinning="loading" style="width: 100%;height: 100%;">
-      <div class="page-content">
-        <div style=" width: 100%;height: 50px;">
-          <a-tabs type="card" hideAdd size="small" @change="callback">
-            <a-tab-pane :key="item.key" :tab="item.title" v-for="(item) in tabsData">
-            </a-tab-pane>
-          </a-tabs>
-        </div>
-        <div style="width: 100%;height: calc(100% - 50px);overflow: auto;" ref="main">
-          <div class="x_modal_content">
-            <project-info v-model="formData" :tabsData.sync="tabsData" v-if="projType=='1'" />
-            <project-info-Key v-model="formData" :tabsData.sync="tabsData" v-if="projType=='2'" />
-            <a-form-model ref="form" :model="auditObj" :rules="rules" class="from-table font-line-space">
-              <audit-edit :auditObj.sync="auditObj" />
-            </a-form-model>
-          </div>
-        </div>
+      <div>
+        <a-form-model ref="form" :model="auditObj" :rules="rules" class="from-table font-line-space">
+          <audit-edit :auditObj.sync="auditObj" />
+        </a-form-model>
       </div>
-      <div class="page-footer">
+      <div style="text-align: center;margin-top: 12px;">
         <a-button type="primary" @click="submit" style="margin-left:16px;">提交</a-button>
       </div>
     </a-spin>
   </div>
 </template>
 <script>
-const projectKPI = {
-  reportYear: "",
-  projName: "",
-  appUnitName: "",
-  managerDept: "",
-  projAttribute: "",
-  projDeadline: "",
-  startDate: "",
-  endData: "",
-  yearTarget: "",
-  year1Goal: "",
-  year2Goal: "",
-  year3Goal: "",
-  totalBudget: 0.00,
-  applyFunds: 0.00,
-  selfFunds: 0.00,
-  yearTotal: 0.00,
-  yearApply: 0.00,
-  yearSelf: 0.00,
-  totalRowSpan: 0, //总合并行数
-  outTarget: 0, //一级指标(产出指标)
-  benefitTarget: 0, //一级指标(效益指标)
-  satisfactionDegree: 0, //一级指标(满意度指标)
-  quantityTarget: 0, //二级指标(数量指标)
-  qualityTarget: 0, //二级指标(质量指标)
-  validityTarget: 0, //二级指标(时效指标)
-  costTarget: 0, //二级指标(成本指标)
-  economicTarget: 0, //二级指标(经济效益指标)
-  socialTarget: 0, //二级指标(社会效益指标)
-  ecologicalTarget: 0, //二级指标(生态效益指标)
-  sustainableTarget: 0, //二级指标(可持续影响指标)
-  serviceTarget: 0, //二级指标(服务对象满意度指标)
-  threeLevel: [],
-  kpiList: [],
-};
+
 import { isEmptyParams } from "@/views/utils/common";
-import { getType } from '@/views/utils/auth'
-import projectInfo from '@/views/report/project/components/projectInfo'
-import projectInfoKey from "@/views/report/project/components/keyProject/projectInfo"
-import AuditList from '@/views/audit/components/auditInfo'
 import AuditEdit from '@/views/audit/components/auditEdit'
 export default {
   name: "Audit",
   components: {
-    projectInfo, projectInfoKey, AuditList, AuditEdit
+    AuditEdit
   },
   data () {
     return {
-      tabsData: [
-        { title: '全部', key: '0', isShow: true },
-        { title: '项目基本信息', key: '1', isShow: true },
-        { title: '项目组主要成员', key: '2', isShow: true },
-        { title: '绩效目标表', key: '3', isShow: true },
-        { title: '项目经费预算表', key: '4', isShow: true },
-        { title: '申请书正文', key: '5', isShow: true },
-        { title: '附件信息', key: '6', isShow: true },
-        { title: '项目审核记录', key: '7', isShow: true },
-      ],
-      formData: {
-        id: null,
-        appPersonName: null,
-        sex: null,
-        birthday: null,
-        nationName: null,
-        degreeName: null,
-        titleName: null,
-        mobile: null,
-        email: null,
-        jobTime: null,
-        address: null,
-        appUnitName: null,
-        mainResearchAreas: null,
-        unitLinkName: null,
-        unitLinkMobile: null,
-        unitLinkEmail: null,
-        unitLinkFax: null,
-        projName: null,
-        knowledgeId: null,
-        subjectScope: null,
-        projClass: null,
-        remark: null,
-        startDate: null,
-        endDate: null,
-        totalFunding: null,
-        govFunding: null,
-        projAbstract: null,
-        projKeywords: null,
-        yearTarget: null,
-        year1Goal: null,
-        year2Goal: null,
-        year3Goal: null,
-        projectKPI: projectKPI,
-        cooperativeUnits: [],
-        members: [],
-        budget: [],
-        fundPlan: [],
-        fileList: [],
-        auditList: [],
-        managerDept: "",
-      },
       auditObj: { id: this.value, auditObjectId: this.objId, auditResult: null, auditType: 1, auditContent: '' },
       rules: {
         auditContent: { required: true, message: '请填写审核意见', trigger: 'blur' },
         auditResult: { required: true, message: '请选择审核结果', trigger: 'change' },
       },
       loading: false,
-      projType: getType()
     };
   },
   props: {
@@ -150,29 +47,16 @@ export default {
     },
   },
   created () {
-    this.loadProject()
+
   },
   methods: {
-    loadProject () {
-      let pars = { id: this.objId }
-      if (this.objId != null) {
-        this.loading = true
-        this.$api.project.getProjectInfoById(pars).then(({ data = {} }) => {
-          if (data) {
-            this.formData = data
-            this.loading = false
-          } else
-            this.$emit('close', 'error')
-        }).catch(() => { this.$emit('close', 'error') })
-      }
-    },
     submit () {
       this.$refs.form.validate(valid => {
         if (valid) {
           this.loading = true
           let pars = isEmptyParams(this.auditObj)
           let par = { ...pars }
-          this.$api.auditManager.projectAudit(par).then(({ data = {} }) => {
+          this.$api.auditManager.projectBatchAudit(par).then(({ data = {} }) => {
             if (data) {
               if (data === '项目上报已经到达上限！') {
                 this.$message.info('项目上报已经到达上限！')
@@ -190,20 +74,6 @@ export default {
         }
       })
     },
-    changeScroll () {
-      this.$refs.main.scrollTop = document.getElementsByClassName('x_modal_content')[0].offsetHeight
-    },
-    callback (key) {
-      var index = parseInt(key)
-      this.tabsData.forEach(e => {
-        if (key == '0')
-          e.isShow = true
-        else
-          e.isShow = false
-      })
-      this.tabsData[0].isShow = true;
-      this.tabsData[index].isShow = true;
-    },
   },
 }
 </script>
@@ -212,18 +82,6 @@ export default {
   width: 100%;
   height: 100%;
 }
-::v-deep .page-content {
-  width: 100%;
-  height: calc(100% - 40px);
-  overflow: auto;
-}
-::v-deep .page-footer {
-  width: 100%;
-  height: 40px;
-  line-height: 40px;
-  background: rgb(248, 248, 248);
-  text-align: center;
-}
 textarea {
   height: 115px;
 }

src/views/report/expert/index.vue

@@ -206,9 +206,7 @@ export default {
         this.deleteExpert(record.id, record.userRoleId)
       }
       else if (type === 'report') {
-        let request={...record}
-        request.reportState=2
-        this.$api.expert.update(request).then(({ data = {} }) => {
+        this.$api.expert.update({ id: record.id, reportState: 2 }).then(({ data = {} }) => {
           if (data) {
             this.$message.success('上报成功！')
             this.getListByPage()