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

src/register.js

@@ -27,6 +27,7 @@ import upLoad from '@/views/components/common/upLoad'
 import paraMultiSelect from '@/views/components/common/paraMultiSelect'
 import paraSelect from '@/views/components/common/paraSelect'
 import baseSelect from '@/views/components/common/baseSelect'
+import cascaderSelect from '@/views/components/common/cascaderSelect'
 import Viewer from "v-viewer"
 import 'viewerjs/dist/viewer.css'
 
@@ -39,6 +40,7 @@ Vue.component('fModal', fModal)
 Vue.component('paraMultiSelect', paraMultiSelect)
 Vue.component('paraSelect', paraSelect)
 Vue.component('baseSelect', baseSelect)
+Vue.component('cascaderSelect', cascaderSelect)
 
 // 设置ant日期选择框为中文样式
 import moment from 'moment'

src/views/audit/project/final.vue

@@ -47,9 +47,9 @@
         </span>
       </template>
       <template slot="option" slot-scope="record">
-        <a-button type="link" size="small" v-if="record.projState >= 50" @click="recordClick(record, 'viewProjectTask')">查看任务书</a-button>
+        <!-- <a-button type="link" size="small" v-if="record.projState >= 50" @click="recordClick(record, 'viewProjectTask')">查看任务书</a-button> -->
         <a-button type="link" size="small" @click="recordClick(record, 'evaluation')">专家评审明细</a-button>
-        <a-button type="link" size="small" v-if="(record.auditResult == 1 && isButten)" @click="recordClick(record, 'audit')">审核</a-button>
+        <a-button type="link" size="small" v-if="record.auditResult == 1" @click="recordClick(record, 'audit')">审核</a-button>
       </template>
     </a-table>
     <a-pagination v-if="pagination.total > 0" :total="pagination.total" show-size-changer show-quick-jumper v-model="pagination.pageIndex" :page-size="pagination.pageSize" :page-size-options="pagination.pageSizeOptions" @showSizeChange="showSizeChange" @change="change" :showTotal="() => `共 ${pagination.total} 条`" />

src/views/basicSetting/person/index.vue

@@ -48,7 +48,10 @@ export default {
       this.$api.person.getAppPersonInfo().then(({ data = {} }) => {
         if (data) {
           this.formData = data.person
-          setComplete(data.isComplete)
+          if (data.isComplete) {
+            setComplete(data.isComplete)
+            this.$emit('sub', data.isComplete)
+          }
         }
         this.loading = false
       }).catch(() => { this.loading = false })

src/views/basicSetting/unit/edit.vue

@@ -56,7 +56,10 @@ export default {
       this.$api.unit.getAppUnitInfo().then(({ data = {} }) => {
         if (data) {
           this.formData = data.unit
-          setUnitComplete(data.isComplete)
+          if (data.isComplete) {
+            setUnitComplete(data.isComplete)
+            this.$emit('sub', data.isComplete)
+          }
         }
         this.loading = false
       }).catch(() => {

src/views/components/common/cascaderSelect.vue

 <template>
-  <a-cascader :options="options" change-on-select :show-search="{ filter }" :display-render="displayRender" expand-trigger="hover" placeholder="Please select" @change="onChange" />
+  <a-cascader v-model="selected" :style="{width:'80%'}" :options="options" :show-search="{ filter }" :display-render="displayRender" expand-trigger="hover" placeholder="Please select" @change="onChange" />
 </template>
 <script>
-import { specList } from "@/views/components/common/config"
+import { specList, getSpecArray } from "@/views/components/common/config"
 export default {
   name: "cascaderSelect",
   data () {
     return {
-      options: specList
+      options: specList,
+      selected: null,
     };
   },
+  props: {
+    value: {
+      type: String,
+      default () {
+        return null
+      }
+    },
+  },
   created () {
-    console.log(this.options)
+    if (!!this.value) {
+      this.selected = getSpecArray(this.value)
+      // this.$emit("change");
+      // this.$emit("input", this.selected)
+    }
+    console.log(this.selected)
   },
   methods: {
     onChange (value, selectedOptions) {
       console.log(value, selectedOptions);
+      this.selected = value
+      if (!!this.selected && this.selected.length == 3) {
+        this.$emit("input", this.selected[2])
+        this.$emit("change");
+      }
     },
-    displayRender({ labels }) {
+    displayRender ({ labels }) {
       return labels[labels.length - 1];
     },
     filter (inputValue, path) {
       return path.some(option => option.label.toLowerCase().indexOf(inputValue.toLowerCase()) > -1);
     },
   },
+  watch: {
+    value: {
+      handler (value) {
+        if (!!value) {
+          this.selected = getSpecArray(this.value)
+          if (!!this.selected && this.selected.length == 3) {
+            this.$emit("input", this.selected[2])
+            this.$emit("change");
+          }
+        }
+      },
+    },
+  }
 };
 </script>

src/views/evaluation/evaluation.vue

@@ -96,7 +96,7 @@ export default {
   methods: {
     moment,
     getYear () {
-      this.$api.batch.getCurrentYearBatch({ type: 3, projType: getType() }).then(({ data = {} }) => {
+      this.$api.batch.getCurrentYearBatch({ type: 5, projType: getType() }).then(({ data = {} }) => {
         if (data) {
           this.isButten = data.disabled
           this.description = data.description

src/views/query/project/Index.vue

@@ -15,15 +15,13 @@
       </a-form-item>
       <a-form-item>
         <a-button type="primary" icon="search" @click="search">搜索</a-button>
-        <a-button icon="reload" style="margin-left: 10px" @click="reset" class="bt-normal">重置</a-button>
-        <cascader-select/>
+        <a-button icon="reload" style="margin-left: 10px" @click="reset" class="bt-normal">重置</a-button>       
       </a-form-item>
     </a-form>
     <a-divider style="height: 1px; background-color: #e8e8e8;" />
     <div class="submit-btn">
-      {{  }}
       <a-button type="primary" @click="exportData" icon="download">Excel</a-button>
-      <a-button type="primary" @click="scoreClick" icon="download">评分</a-button>
+      <!-- <a-button type="primary" @click="scoreClick" icon="download">评分</a-button> -->
     </div>
     <a-table :dataSource="tableData" :columns="columns" :scroll="{ x: 'max-content' }" rowKey="id" :pagination="false" :loading="loading">
       <template slot="projName" slot-scope="record">
@@ -54,11 +52,10 @@ import moment from 'moment'
 import { isEmptyParams, filterExportExcelData, tableColumnsName } from "@/views/utils/common";
 import projectView from '@/views/report/project/components/projectView'
 import scoreEdit from '@/views/evaluation/components/scoreEdit'
-import cascaderSelect from '@/views/components/common/cascaderSelect'
 export default {
   name: 'queryProject',
   components: {
-    projectView, scoreEdit, cascaderSelect
+    projectView, scoreEdit
   },
   data () {
     return {

src/views/report/project/components/projectEdit.vue

@@ -311,7 +311,8 @@
         </a-col>
         <a-col :span="20">
           <a-form-model-item prop="knowledgeId">
-            <para-multi-select v-model="formData.knowledgeId" :typeId="57" />
+            <cascader-select v-model="formData.knowledgeId"/>
+            <!-- <para-multi-select v-model="formData.knowledgeId" :typeId="57" /> -->
           </a-form-model-item>
         </a-col>
       </a-row>
@@ -603,7 +604,7 @@ export default {
         unitLinkEmail: [{ required: true, message: '请填写电子邮箱', trigger: 'blur' },],
         unitLinkFax: [{ required: true, message: '请填写传真', trigger: 'blur' },],
         projName: [{ required: true, message: '请填写项目名称', trigger: 'blur' },],
-        knowledgeId: { required: true, message: '请选择>项目所属学科类别', trigger: 'change' },
+        knowledgeId: { required: true, message: '请选择学科代码', trigger: 'change' },
         subjectScope: [{ required: true, message: '请填写选题范围', trigger: 'blur' },],
         projClass: [{ required: true, message: '请填写项目类别', trigger: 'blur' },],
         remark: [{ required: true, message: '请填写附注说明', trigger: 'blur' },],
@@ -691,6 +692,7 @@ export default {
       }
     },
     submit () {
+      console.log(this.formData)
       this.processProjectYearTarget()
       this.$refs.form.validate(valid => {
         if (valid) {

src/views/report/project/components/projectInfo.vue

@@ -519,6 +519,20 @@
       <!-- 附件 -->
       <file-info :fileList.sync="value.fileList" />
     </div>
+    <div v-if="tabsData[7].isShow">
+      <a-row>
+        <a-col :span="24">
+          <div class="main-title">
+            <span>审核记录</span>
+          </div>
+        </a-col>
+      </a-row>
+      <a-row>
+        <a-col :span="24">
+          <audit-list v-model="value.auditList" />
+        </a-col>
+      </a-row>
+    </div>
   </div>
 </template>
 

src/views/timeSet/batch/Index.vue

@@ -32,12 +32,12 @@ export default {
         { key: '2', title: '批次', dataIndex: 'batch', align: 'center' },
         { key: '3', title: '项目申报时间', dataIndex: 'reportStart', colSpan: 2, ellipsis: true },
         { key: '4', title: '项目申报时间', dataIndex: 'reportEnd', colSpan: 0, ellipsis: true },
-        { key: '5', title: '州市级及以下单位上报时间', dataIndex: 'unitStart', colSpan: 2, ellipsis: true },
-        { key: '6', title: '州市级及以下单位上报时间', dataIndex: 'unitEnd', colSpan: 0, ellipsis: true },
-        { key: '7', title: '州市级行政单位审核时间', dataIndex: 'prefectureStart', colSpan: 2, ellipsis: true },
-        { key: '8', title: '州市级行政单位审核时间', dataIndex: 'prefectureEnd', colSpan: 0, ellipsis: true },
-        { key: '9', title: '省直单位上报时间', dataIndex: 'provinceStart', colSpan: 2, ellipsis: true },
-        { key: '10', title: '省直单位上报时间', dataIndex: 'provinceEnd', colSpan: 0, ellipsis: true },
+        // { key: '5', title: '州市级及以下单位上报时间', dataIndex: 'unitStart', colSpan: 2, ellipsis: true },
+        // { key: '6', title: '州市级及以下单位上报时间', dataIndex: 'unitEnd', colSpan: 0, ellipsis: true },
+        // { key: '7', title: '州市级行政单位审核时间', dataIndex: 'prefectureStart', colSpan: 2, ellipsis: true },
+        // { key: '8', title: '州市级行政单位审核时间', dataIndex: 'prefectureEnd', colSpan: 0, ellipsis: true },
+        // { key: '9', title: '省直单位上报时间', dataIndex: 'provinceStart', colSpan: 2, ellipsis: true },
+        // { key: '10', title: '省直单位上报时间', dataIndex: 'provinceEnd', colSpan: 0, ellipsis: true },
         { key: '11', title: '专家评审时间', dataIndex: 'expertStart', colSpan: 2, ellipsis: true },
         { key: '12', title: '专家评审时间', dataIndex: 'expertEnd', colSpan: 0, ellipsis: true },
         { key: '13', title: '备注', dataIndex: 'remark', align: 'center', ellipsis: true },

src/views/timeSet/batch/components/batchEdit.vue

@@ -30,7 +30,7 @@
             </a-form-model-item>
           </a-col>
         </a-row>
-        <a-row>
+        <!-- <a-row>
           <a-col :span="6" class="bg-gray">
             <div class="required">州市级及以下单位上报时间</div>
           </a-col>
@@ -59,7 +59,7 @@
               <a-range-picker v-model="formData.provinceRange" show-time format="YYYY-MM-DD HH:mm:ss" valueFormat="YYYY-MM-DD HH:mm:ss" @change="provinceDateChange" :placeholder="['开始时间', '结束时间']" />
             </a-form-model-item>
           </a-col>
-        </a-row>
+        </a-row> -->
         <a-row>
           <a-col :span="6" class="bg-gray">
             <div class="required">专家审核时间</div>
@@ -126,9 +126,9 @@ export default {
         year: { required: true, message: '请输入申报年度' },
         batch: { required: true, message: '请输入申报批次' },
         reportRange: [{ required: true, validator: checkDateRange, trigger: 'blur' }],
-        unitRange: [{ required: true, validator: checkDateRange, trigger: 'blur' }],
-        prefectureRange: [{ required: true, validator: checkDateRange, trigger: 'blur' }],
-        provinceRange: [{ required: true, validator: checkDateRange, trigger: 'blur' }],
+        // unitRange: [{ required: true, validator: checkDateRange, trigger: 'blur' }],
+        // prefectureRange: [{ required: true, validator: checkDateRange, trigger: 'blur' }],
+        // provinceRange: [{ required: true, validator: checkDateRange, trigger: 'blur' }],
         expertRange: [{ required: true, validator: checkDateRange, trigger: 'blur' }],
         remark: [{ required: false }]
       },
@@ -165,9 +165,9 @@ export default {
           this.formData.expertEnd = data.expertEnd
           this.formData.remark = data.remark
           this.formData.reportRange = [data.reportStart, data.reportEnd]
-          this.formData.unitRange = [data.unitStart, data.unitEnd]
-          this.formData.prefectureRange = [data.prefectureStart, data.prefectureEnd]
-          this.formData.provinceRange = [data.provinceStart, data.provinceEnd]
+          // this.formData.unitRange = [data.unitStart, data.unitEnd]
+          // this.formData.prefectureRange = [data.prefectureStart, data.prefectureEnd]
+          // this.formData.provinceRange = [data.provinceStart, data.provinceEnd]
           this.formData.expertRange = [data.expertStart, data.expertEnd]
         }
         this.loading = false