Merge remote-tracking branch 'origin/master'

src/views/modules/finance/invoice/ProgramPageForm.vue

@@ -72,8 +72,8 @@
         <el-form  label-width="80px" class="query-form" ref="searchForm" :model="searchForm" @keyup.enter.native="refreshList()" @submit.native.prevent>
           <el-row  :gutter="15">
             <el-col :span="21">
-              <el-form-item label="开票详情" prop="detail">
-                <el-input style="width: 100%" type="textarea" maxlength="500" v-model="detail" placeholder="请输入开票详情" show-word-limit></el-input>
+              <el-form-item label="详情" prop="detail">
+                <el-input style="width: 100%" type="textarea" maxlength="500" v-model="detail" placeholder="请输入详情" show-word-limit></el-input>
               </el-form-item>
             </el-col>
           </el-row>

src/views/modules/knowledgeShare/InfoForm.vue

@@ -6,13 +6,12 @@
       v-dialogDrag
       width="1300px"
       @close="close"
-      @keyup.enter.native="doSubmit"
       :visible.sync="visible">
       <el-form size="middle" :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''" :disabled="method === 'view'"
                label-width="150px" @submit.native.prevent>
         <el-row  :gutter="15">
 
-          <el-col :span="21">
+          <el-col :span="24">
             <el-form-item label="知识分享类型" prop="typeId"
                           :rules="[
                           {required: true, message:'分享类型不能为空', trigger:'blur'}
@@ -27,7 +26,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="21">
+          <el-col :span="24">
             <el-form-item label="主题" prop="title"
                           :rules="[
                           {required: true, message:'主题不能为空', trigger:'blur'}
@@ -202,6 +201,7 @@
         this.visible = true
         this.loading = false
         this.$nextTick(() => {
+          this.$refs.uploadComponent.setDividerName('附件')
           if (method === 'add') {
             this.$refs.contentEditor.enable()
           }
@@ -212,6 +212,7 @@
             this.is()
             this.create = JSON.parse(localStorage.getItem('user')).id
             this.$refs.inputForm.resetFields()
+            this.$refs.uploadComponent.clearUpload()
             this.knowledgeShareInfoService.findById(this.inputForm.id, method).then(({data}) => {
               // 富文本处理
               if (method === 'view') {
@@ -274,9 +275,8 @@
         }
         this.loading = true
         this.knowledgeShareInfoService.addComment(this.commentForm).then(({data}) => {
-          this.close()
+          this.init('view', this.inputForm.id)
           this.$message.success(data)
-          this.$emit('refreshDataList')
           this.loading = false
         })
       },
@@ -297,7 +297,6 @@
         this.$refs.knowledgeShareTypePageForm.init()
       },
       getProgram (rows) {
-        console.log('aaaaaaaaaaa', rows[0])
         this.inputForm.typeId = rows[0].id
         this.inputForm.typeName = rows[0].klgsType
         this.$forceUpdate()

src/views/modules/knowledgeShare/InfoList.vue

@@ -24,7 +24,7 @@
       </vxe-toolbar>
 
       <el-tabs v-model="typeId" type="card" @tab-click="handleClick">
-        <el-tab-pane :key="index" v-for="(item,index) in typeList" :label="item.klgsType" :name="item.klgsType" :value="item.id"></el-tab-pane>
+        <el-tab-pane :key="index" v-for="(item,index) in typeList" :label="item.klgsType" :name="item.id" :value="item.id"></el-tab-pane>
       </el-tabs>
 
       <div style="height: calc(100% - 50px)">
@@ -114,10 +114,6 @@
     created () {
       this.knowledgeShareInfoService = new KnowledgeShareInfoService()
       this.knowledgeShareTypeService = new KnowledgeShareTypeService()
-      this.userService = new UserService()
-      this.knowledgeShareTypeService.list().then(({data}) => {
-        this.typeList = data.records
-      })
     },
     components: {
       InfoForm,
@@ -144,6 +140,10 @@
       },
       // 获取数据列表
       refreshList () {
+        this.userService = new UserService()
+        this.knowledgeShareTypeService.list().then(({data}) => {
+          this.typeList = data.records
+        })
         this.loading = true
         this.is()
         this.create = JSON.parse(localStorage.getItem('user')).name

src/views/modules/knowledgeShare/TypeList.vue

@@ -3,7 +3,7 @@
     <el-form size="small" :inline="true" class="query-form" ref="searchForm" :model="searchForm" @keyup.enter.native="refreshList()" @submit.native.prevent>
       <!-- 搜索框-->
       <el-form-item label="分享类型" prop="type">
-        <el-input size="small" v-model="searchForm.type" placeholder="请输入分享类型" clearable></el-input>
+        <el-input size="small" v-model="searchForm.klgsType" placeholder="请输入分享类型" clearable></el-input>
       </el-form-item>
 
       <el-form-item>

src/views/modules/sys/dashboard/workBench/Pending.vue

@@ -199,7 +199,7 @@
         </div>
       </el-col>
 
-      <!--<el-col :span="12">
+      <el-col :span="12">
         <div class="page" style="height: 600px">
           <div class="top bg-white">
             <div style="height: 18px" >
@@ -256,11 +256,11 @@
                 @page-change="currentChangeHandle">
               </vxe-pager>
             </div>
-            &lt;!&ndash; 弹窗, 新增 / 修改 &ndash;&gt;
+            <!-- 弹窗, 新增 / 修改 -->
             <NotifyForm  ref="notifyForm" @refreshDataList="refreshList"></NotifyForm>
           </div>
         </div>
-      </el-col>-->
+      </el-col>
     </el-row>
   </div>
 </template>