Merge branch 'master' of http://gitlab.yiboshi.com/XuJun/yn-science-front

src/main.js

@@ -27,7 +27,7 @@ Vue.prototype.$api = api
 Vue.prototype.$message = message
 Vue.prototype.$confirm = confirm
 Vue.prototype.$defaultPageSize = 10
-Vue.prototype.$defaultPageSizeOptions = ["10", "20", "50", "100"]
+Vue.prototype.$defaultPageSizeOptions = ["10", "20", "50", "100", "500"]
 //导出Excel
 Vue.prototype.$ToDoExcel = ToDoExcel;
 

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

@@ -26,12 +26,13 @@
         <btn-group :data="tabDate" :itemCount="itemCount" v-model="activekey" @change="callback" />
       </div>
       <div style="display: inline-block;width:50%;text-align: right;">
+        <a-button type="primary" @click="batchAudit" style="margin-right: 8px;">批量审核</a-button>
         <a-button type="primary" @click="exportData" icon="download">Excel</a-button>
       </div>
     </div>
     <a-divider style="height: 1px; background-color: #e8e8e8;" />
     <span class="form-description" v-if="description"> ※ 审核时间：{{ description }}</span>
-    <a-table :dataSource="tableData" :columns="columns" :scroll="{ x: 'max-content' }" rowKey="id" :pagination="false" :loading="loading">
+    <a-table :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :dataSource="tableData" :columns="columns" :scroll="{ x: 'max-content' }" rowKey="id" :pagination="false" :loading="loading">
       <template slot="projName" slot-scope="record">
         <a @click="recordClick(record, 'view')">{{record.projName}}</a>
       </template>
@@ -50,6 +51,9 @@
     <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="700px" :dialog-style="{ top: '15%' }" 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">
       <project-view v-model="objectId" @close="closeWindow"></project-view>
     </a-modal>
@@ -64,16 +68,18 @@ import { getType } from '@/views/utils/auth'
 import moment from 'moment'
 import { isEmptyParams, filterExportExcelData, tableColumnsName } from "@/views/utils/common";
 import audit from '@/views/audit/project/audit'
+import batchAudit from '@/views/audit/project/batchAudit'
 import projectView from '@/views/report/project/components/projectView'
 import taskFileInfo from '@/views/report/task/components/taskFileInfo'
 
 export default {
   name: "projectAudit",
   components: {
-    projectView, audit, taskFileInfo
+    projectView, audit, taskFileInfo, batchAudit
   },
   data () {
     return {
+      selectedRowKeys: [],
       // 选项卡
       panes: { count1: 0, count2: 0, count3: 0, count4: 0, count5: 0, },
       form: this.$form.createForm(this, { name: 'advanced_search' }),
@@ -123,6 +129,7 @@ export default {
       // 弹窗标志
       visibleAudit: false,
       visibleView: false,
+      visibleBatch: false,
       isButten: false,
       description: '',
       id: null,
@@ -135,6 +142,14 @@ export default {
     this.getYear()
   },
   methods: {
+    onSelectChange (selectedRowKeys) {
+      console.log('selectedRowKeys changed: ', selectedRowKeys);
+      this.selectedRowKeys = selectedRowKeys;
+    },
+    batchAudit () {
+      console.log('selectedRowKeys changed: ', this.selectedRowKeys);
+      this.visibleBatch = true
+    },
     search () {
       this.pagination.pageIndex = 1
       this.getListByPage();

src/views/audit/project/batchAudit.vue

+
+<template>
+  <div class="app-content" style="height:260px;overflow: auto;">
+    <a-spin :spinning="loading" style="width: 100%;height: 100%;">
+      <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 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>
+
+import { isEmptyParams } from "@/views/utils/common";
+import AuditEdit from '@/views/audit/components/auditEdit'
+export default {
+  name: "Audit",
+  components: {
+    AuditEdit
+  },
+  data () {
+    return {
+      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,
+    };
+  },
+  props: {
+    value: {
+      type: String,
+      default: () => {
+        return null
+      }
+    },
+    objId: {
+      type: String,
+      default () {
+        return null
+      }
+    },
+  },
+  created () {
+
+  },
+  methods: {
+    submit () {
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          // this.loading = true
+          // let pars = isEmptyParams(this.auditObj)
+          // let par = { ...pars }
+          // this.$api.auditManager.projectBatchAudit(par).then(({ data = {} }) => {
+          //   if (data) {
+          //     if (data === '项目上报已经到达上限！') {
+          //       this.$message.info('项目上报已经到达上限！')
+          //     } else {
+          //       this.$message.success('审核成功！')
+          //       this.$emit('close', 'audit')
+          //     }
+          //   }
+          //   this.loading = false
+          // }).catch(() => { this.loading = false })
+        } else {
+          this.$message.error('请选择审核结果或填写审核意见！')
+          return false
+        }
+      })
+    },
+  },
+}
+</script>
+<style scoped lang="less">
+::v-deep .ant-spin-container {
+  width: 100%;
+  height: 100%;
+}
+textarea {
+  height: 115px;
+}
+</style>

src/views/expert/index.vue

@@ -200,7 +200,7 @@ export default {
       let self = this
       this.$confirm({
         title: '重置密码',
-        content: '重置后密码为"kycz123456"确定要重置密码？',
+        content: '重置后密码为"ky123456"确定要重置密码？',
         okText: '确定',
         okType: 'danger',
         cancelText: '取消',

src/views/manager/unit/components/managerSetting.vue

@@ -284,7 +284,7 @@ export default {
       let self = this
       this.$confirm({
         title: '重置密码',
-        content: '重置后密码为"kycz123456"确定要重置密码？',
+        content: '重置后密码为"ky123456"确定要重置密码？',
         okText: '确定',
         okType: 'danger',
         cancelText: '取消',

src/views/manager/user/index.vue

@@ -151,7 +151,7 @@ export default {
       let self = this
       this.$confirm({
         title: '重置密码',
-        content: '重置后密码为"kycz123456"确定要重置密码？',
+        content: '重置后密码为"ky123456"确定要重置密码？',
         okText: '确定',
         okType: 'danger',
         cancelText: '取消',

src/views/person/index.vue

@@ -146,7 +146,7 @@ export default {
       let self = this
       this.$confirm({
         title: '重置密码',
-        content: '重置后密码为"kycz123456"确定要重置密码？',
+        content: '重置后密码为"ky123456"确定要重置密码？',
         okText: '确定',
         okType: 'danger',
         cancelText: '取消',

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()
@@ -221,7 +219,7 @@ export default {
       let self = this
       this.$confirm({
         title: '重置密码',
-        content: '重置后密码为"kycz123456"确定要重置密码？',
+        content: '重置后密码为"ky123456"确定要重置密码？',
         okText: '确定',
         okType: 'danger',
         cancelText: '取消',

src/views/unit/components/managerSetting.vue

@@ -266,7 +266,7 @@ export default {
       let self = this
       this.$confirm({
         title: '重置密码',
-        content: '重置后密码为"kycz123456"确定要重置密码？',
+        content: '重置后密码为"ky123456"确定要重置密码？',
         okText: '确定',
         okType: 'danger',
         cancelText: '取消',