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

src/register.js

@@ -18,29 +18,26 @@ 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 EComment from '@/components/comment/index.vue'
-import fModal from '@/components/modal/index'
+
+// import fModal from '@/components/modal/index'
 import fileLoad from '@/views/components/common/fileLoad'
 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'
 
-Vue.component('e-comment', EComment);
 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)
+// 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/components/auditInfo.vue

 <template>
   <e-comment :dataSource="value"></e-comment>
-  <!-- <a-list class="comment-list" :header="''" item-layout="horizontal" :data-source="value">
-    <a-list-item slot="renderItem" slot-scope="item">
-      <a-comment :author="item.auditUnitName" :avatar="''" :name="1">
-        <p slot="content"> {{ item.auditContent }}</p>
-        <a-tooltip slot="datetime" :title="item.auditDate">
-          <span>{{ item.auditDate}}</span>
-        </a-tooltip>
-      </a-comment>
-    </a-list-item>
-  </a-list> -->
 </template>
 <script>
+
+import EComment from '@/components/comment/index.vue'
 export default {
   name: "audit",
+  components: {
+    EComment
+  },
   data() {
     return {
       auditList: [{ auditContent: '', auditUnitName: '', auditDate: '', photo: 'https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png', },],

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

@@ -345,8 +345,8 @@
           </div>
         </a-col>
         <a-col :span="20">
-          <a-form-model-item prop="projClass">
-            <a-input placeholder="附注说明" v-model="formData.remark" :maxLength="100" style="width: 80%" />
+          <a-form-model-item prop="remark">
+            <a-input placeholder="附注说明" v-model="formData.remark" :maxLength="300" style="width: 80%" />
           </a-form-model-item>
         </a-col>
       </a-row>
@@ -557,11 +557,11 @@ const projectKPI = {
   threeLevel: [],
   kpiList: [],
 };
-
+import cascaderSelect from '@/views/components/common/cascaderSelect'
 export default {
   name: 'projectEdit',
   components: {
-    projectMemberEdit, cooperativeUnitsEdit, budgetEdit, fundPlanEdit, projectKpiEdit, fileEdit, previewFile, documentView
+    projectMemberEdit, cooperativeUnitsEdit, budgetEdit, fundPlanEdit, projectKpiEdit, fileEdit, previewFile, documentView,cascaderSelect
   },
   props: {
     value: {