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

src/register.js

@@ -18,7 +18,7 @@ import {
     Comment, Result, Tag, Collapse, LocaleProvider, Transfer, Badge, Drawer, Empty, Avatar,Statistic
 } from 'ant-design-vue';
 
-// import sModal from '@/components/modal/modal'
+import sModal from '@/components/modal/modal'
 import BtnGroup from '@/components/btnGroup/index.vue'
 
 // import fModal from '@/components/modal/index'
@@ -32,7 +32,7 @@ import Viewer from "v-viewer"
 import 'viewerjs/dist/viewer.css'
 
 Vue.component('btn-group', BtnGroup);
-// Vue.component('sModal', sModal)
+Vue.component('sModal', sModal)
 Vue.component('fileLoad', fileLoad)
 Vue.component('upLoad', upLoad)
 // Vue.component('fModal', fModal)

src/views/assign/assignProject.vue

@@ -60,11 +60,9 @@
         </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} 条`" />
-      <s-modal title="项目详情" v-model="projectVisible" v-if="projectVisible">
-        <div slot="content">
-          <project-view v-model="projId" @close="() => this.projectVisible = false"></project-view>
-        </div>
-      </s-modal>
+      <a-modal v-model="projectVisible" v-if="projectVisible" title="项目详情" width="94%" :footer="null" :dialog-style="{ top: '8%' }" destroyOnClose :maskClosable="false">
+        <project-view v-model="projId" @close="() => this.projectVisible = false" />
+      </a-modal>
       <a-modal v-model="assignInfoVisible" title="分配详情" width="80%" :dialog-style="{ top: '15%' }" :footer="null" destroyOnClose>
         <project-assign-detail v-model="projId" @close="() =>  this.assignInfoVisible = false" />
       </a-modal>

src/views/assign/components/assignDetail.vue

@@ -47,11 +47,9 @@
       </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} 条`" />
-    <s-modal title="项目详情" v-model="visibleView" v-if="visibleView">
-      <div slot="content">
-        <project-view v-model="projId" @close="() => this.visibleView = false"></project-view>
-      </div>
-    </s-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="projId" @close="() => this.visibleView = false" />
+    </a-modal>
   </div>
 </template>
 

src/views/assign/components/groupDetail.vue

@@ -19,12 +19,9 @@
       </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} 条`" />
-
-    <s-modal title="项目详情" v-model="visibleView" v-if="visibleView">
-      <div slot="content">
-        <project-view v-model="projId" @close="() => this.visibleView = false"></project-view>
-      </div>
-    </s-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="projId" @close="() => this.visibleView = false" />
+    </a-modal>
   </div>
 </template>
 

src/views/assign/index.vue

@@ -117,11 +117,9 @@
     <a-modal v-model="expertVisibleView" title="查看专家" width="700px" :footer="null" destroyOnClose>
       <expert-view v-model="expertId"></expert-view>
     </a-modal>
-    <s-modal title="项目详情" v-model="projectVisibleView" v-if="projectVisibleView">
-      <div slot="content">
+    <a-modal v-model="projectVisibleView" v-if="projectVisibleView" title="项目详情" width="94%" :footer="null" :dialog-style="{ top: '8%' }" destroyOnClose :maskClosable="false">
       <project-view v-model="projectId" @close="() => this.projectVisibleView = false"></project-view>
-      </div>
-    </s-modal>
+    </a-modal>
     <a-modal v-model="evaluationVisibleView" title="查看专家评价" width="600px" :footer="null" destroyOnClose>
       <evaluation-view v-model="evaluationId" @close="closeWindow"></evaluation-view>
     </a-modal>

src/views/audit/conclusion/index.vue

@@ -48,11 +48,9 @@
     <a-modal v-model="visibleReportView" title="结题信息" width="70%" :dialog-style="{ top: '12%' }" :footer="null" destroyOnClose>
       <conclusion-view v-model="projId" @close="closeWindow" />
     </a-modal>
-    <s-modal title="项目详情" v-model="visibleView" v-if="visibleView">
-      <div slot="content">
-        <project-view v-model="projId" @close="() => this.visibleView = false"></project-view>
-      </div>
-    </s-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="projId" @close="() => this.visibleView = false" />
+    </a-modal>
     <a-modal v-model="auditView" title="结题审核" width="70%" :dialog-style="{ top: '5%' }" destroyOnClose>
       <conclusion-material-audit v-model="projId" :auditId="auditId" :objId="objId" @closeWindow="closeAuditWindow" ref="conclusionAudit"></conclusion-material-audit>
       <template slot="footer">

src/views/audit/thesis/index.vue

@@ -42,13 +42,9 @@
       </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} 条`" />
-
-    <s-modal title="项目详情" v-model="visibleView" v-if="visibleView">
-      <div slot="content">
-        <project-view v-model="projId" @close="() => this.visibleView = false"></project-view>
-      </div>
-    </s-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="projId" @close="() => this.visibleView = false" />
+    </a-modal>
     <a-modal v-model="auditEdit" title="论文审核" width="80%" :dialog-style="{ top: '5%' }" destroyOnClose>
       <audit v-model="id" :projId="projId" :objectId="objectId" @closeWindow="closeWindow" ref="thesisAudit"></audit>
       <template slot="footer">

src/views/conclusion/audit/Index.vue

@@ -31,11 +31,9 @@
       </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} 条`" />
     </div>
-    <s-modal title="项目详情" v-model="visibleView" v-if="visibleView">
-      <div slot="content">
-        <project-view v-model="id" @close="() => this.visibleView = false"></project-view>
-      </div>
-    </s-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="id" @close="() => this.visibleView = false" />
+    </a-modal>
     <a-modal v-model="visibleReportView" title="结题信息" width="70%" :dialog-style="{ top: '12%' }" :footer="null" destroyOnClose>
       <conclusion-view v-model="id" @close="closeWindow" />
     </a-modal>

src/views/conclusion/index.vue

@@ -40,11 +40,9 @@
       </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} 条`" />
     </div>
-    <s-modal title="项目详情" v-model="visibleView" v-if="visibleView">
-      <div slot="content">
-        <project-view v-model="projId" @close="() => this.visibleView = false"></project-view>
-      </div>
-    </s-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="projId" @close="() => this.visibleView = false" />
+    </a-modal>
     <a-modal v-model="visibleEdit" title="结题报告" width="90%" :dialog-style="{ top: '30px' }" destroyOnClose :maskClosable="false">
       <template slot="footer">
         <div style="width:100%;text-align:center">

src/views/evaluation/evaluation.vue

@@ -34,17 +34,6 @@
     <a-modal v-model="projectVisibleView" title="查看项目" :width="'80%'" :footer="null" destroyOnClose>
       <project-view v-model="projectId"></project-view>
     </a-modal>
-
-    <s-modal title="项目详情" v-moloadingdel="visibleView" v-if="visibleView">
-      <div slot="content">
-        <project-view v-model="projectId" @close="() => this.visibleView = false"></project-view>
-      </div>
-      <template slot="footer">
-        <!-- <a-button type="primary" @click="() => visibleView = false">
-          确定
-        </a-button> -->
-      </template>
-    </s-modal>
   </div>
 </template>
 

src/views/evaluation/index.vue

@@ -43,11 +43,9 @@
     <a-modal v-model="visibleStandard" title="专家评分标准" width="1000px" :dialog-style="{ top: '10%' }" :footer="null" destroyOnClose>
       <pdf-view v-model="url.downloadUrl" :fileName="url.fileDownload"></pdf-view>
     </a-modal>
-    <s-modal title="项目详情" v-model="visibleView" v-if="visibleView">
-      <div slot="content">
-        <project-view v-model="projectId" @close="() => this.visibleView = false"></project-view>
-      </div>
-    </s-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="projectId" @close="() => this.visibleView = false" />
+    </a-modal>
   </div>
 </template>
 

src/views/evaluation/query.vue

@@ -31,11 +31,10 @@
     <a-modal v-model="visibleEvaluationView" title="查看专家评价" width="600px" :footer="null" destroyOnClose>
       <assign-expert-view v-model="id" :hideDeleteBTN="false" @close="closeWindow"></assign-expert-view>
     </a-modal>
-    <s-modal title="项目详情" v-model="visibleView" v-if="visibleView">
-      <div slot="content">
-        <project-view v-model="projectId" @close="() => this.visibleView = false"></project-view>
-      </div>
-    </s-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="projectId" @close="() => this.visibleView = false" />
+    </a-modal>
+    projId
   </div>
 </template>
 

src/views/manager/project/index.vue

@@ -56,11 +56,9 @@
         </a-button>
       </template>
     </s-modal>
-    <s-modal title="项目详情" v-model="visibleView" v-if="visibleView">
-      <div slot="content">
-        <project-view v-model="id" @close="() => this.visibleView = false"></project-view>
-      </div>
-    </s-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="id" @close="() => this.visibleView = false" />
+    </a-modal>
     <a-modal v-model="visibleImport" title="导入" width="80%" :dialog-style="{ top: '8%' }" :footer="null" destroyOnClose>
       <project-import />
     </a-modal>

src/views/peAssign/components/groupDetail.vue

@@ -25,11 +25,9 @@
       </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} 条`" />
-    <s-modal title="项目详情" v-model="visibleView" v-if="visibleView">
-      <div slot="content">
-        <project-view v-model="projId" @close="() => this.visibleView = false"></project-view>
-      </div>
-    </s-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="projId" @close="() => this.visibleView = false" />
+    </a-modal>
     <a-modal v-model="groupEditVisible" title="选择项目" width="70%" :dialog-style="{ top: '15%' }" :maskClosable="false" destroyOnClose>
       <template slot="footer">
         <div style="text-align:center; width:100%">

src/views/register/Index.vue

@@ -18,7 +18,7 @@
             </div>
             <div class="card-container">
               <a-tabs type="card" :default-active-key="active" @change="callback">
-                <a-tab-pane key="1" tab="用户注册">
+                <a-tab-pane key="1" tab="立项用户注册">
                 </a-tab-pane>
                 <a-tab-pane key="2" tab="单位注册">
                 </a-tab-pane>

src/views/register/components/unitRegister.vue

@@ -34,13 +34,6 @@
           </a-form-model-item>
         </a-col>
       </a-row>
-      <a-row>
-        <a-col :span="24">
-          <a-form-model-item prop="organizationCode" ref="organizationCode" label="机构代码">
-            <a-input placeholder="组织机构代码/统一社会信用代码" v-model="formData.organizationCode" :maxLength="100" style="width:350px;" />
-          </a-form-model-item>
-        </a-col>
-      </a-row>
       <a-row>
         <a-col :span="24">
           <a-form-model-item ref="unitAddress" label="单位地址" prop="unitAddress">

src/views/report/task/projectTask.vue

@@ -35,11 +35,9 @@
     <a-modal v-model="taskFileEditView" title="上传项目任务书" :width="'60%'" :maskClosable="false" :footer="null" destroyOnClose class="sc_modal">
       <task-file-edit v-model="selectProjId" @close="closeTaskFileEditWindow" />
     </a-modal>
-    <s-modal title="项目详情" v-model="visibleView" v-if="visibleView">
-      <div slot="content">
-        <project-view v-model="selectProjId" @close="() => this.visibleView = false"></project-view>
-      </div>
-    </s-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="selectProjId" @close="() => this.visibleView = false" />
+    </a-modal>
   </div>
 </template>
 

src/views/thesis/index.vue

@@ -40,11 +40,9 @@
       </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} 条`" />
-    <s-modal title="项目详情" v-model="visibleView" v-if="visibleView">
-      <div slot="content">
-        <project-view v-model="projId" @close="() => this.visibleView = false"></project-view>
-      </div>
-    </s-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="projId" @close="() => this.visibleView = false" />
+    </a-modal>
   </div>
 </template>