Merge branch 'develop' into 'FOTON'

Develop

See merge request LAWS/laws-system-front-FOTON!240

src/pages/localTool/standCalendar/index.vue

@@ -33,8 +33,8 @@
                     </span>
                     <!-- 获取当前登录人的会议并表示出来-->
                     <span v-for="item in dealMyDate(data.day)" :value="item.fillPeopleId">
-                      <el-tag class="tagOne"/>
                       <el-tag v-if="userId === item.fillPeopleId" class="tagTwo"/>
+                      <el-tag v-else class="tagOne"/>
                     </span>
                   </span>
                 </div>
@@ -58,7 +58,7 @@
           </span>
           <el-card class="card_info" v-else v-for="(item, index) in todayData" :value="item" :key="index">
             <span v-for="res in item.attend" :key="res.fillPeopleId">
-               <el-tag v-if="userId === res.fillPeopleId" type="success" size="mini">会议</el-tag>
+              <el-tag v-if="userId === res.fillPeopleId" type="success" size="mini">会议</el-tag>
               <el-tag v-else type="warning" size="mini">会议</el-tag>
             </span>
             <i style="margin-left: 10px;font-weight: bold">{{ item.title }}</i>
@@ -71,6 +71,9 @@
             <div class="content_text2">
               <span>会议内容 : {{ item.content }}</span>
             </div>
+            <div class="content_text2">
+              <span>会议地点 : {{ item.place }}</span>
+            </div>
             <div class="content_text">
                 <span>会议附件 :
                  <span v-if="item.files.length === 0">{{ '-' }}</span>

src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue

@@ -562,7 +562,7 @@
                         this.$refs['Form'].validate((valid) => {
                             if (valid) {
                                 this.isSubmit = true
-                                this.$http.get('lawss/activiti/startProcess', {
+                                this.$http.post('lawss/activiti/startProcessRollBack', {
                                     type: '2'
                                 }, {}, res => {
                                     if (res.ok) {

src/pages/processCenter/pages/creatProcess/bzdy/step1.vue

@@ -559,7 +559,7 @@ export default {
           this.$refs['Form'].validate((valid) => {
             if (valid) {
               this.isSubmit = true
-              this.$http.get('lawss/activiti/startProcessRollBack', {
+              this.$http.post('lawss/activiti/startProcessRollBack', {
                 id: this.bpnId || '',
                 createUser: this.$store.getters.userInfo.userId,
                 createUserName: this.$store.getters.userInfo.userName,

src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue

@@ -299,7 +299,7 @@
       :visible.sync="editFlag"
       size="500px"
     >
-      <div class="content_form">
+      <div class="content_form" style="height: 100%">
         <el-form class="label-input-form" ref="editForm" :model="editForm" label-width="80px">
           <el-form-item class="add-form-item" label="参与人员:">
             <el-input v-model="editForm.fillPeopleId" style="display: none;"></el-input>

src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue

@@ -260,8 +260,9 @@
       title="编辑人员信息"
       :visible.sync="editFlag"
       size="500px"
+      custom-class="demo-drawer"
     >
-      <div class="content_form">
+      <div class="content_form" style="height: 100%">
         <el-form class="label-input-form" ref="editForm" :model="editForm" label-width="80px">
           <el-form-item class="add-form-item" label="参与人员:">
             <el-input v-model="editForm.fillPeopleId" style="display: none;"></el-input>
@@ -300,6 +301,13 @@
       @submit="handleSubmit"
     >
     </ProcessFooter>
+    <Role-tree
+      check-box
+      is-title="选择入会人员"
+      :is-visible.sync="roleShowflag"
+      :nodeList="nodeList"
+      @checkedRole="drawerCheck"
+    />
   </div>
 </template>
 
@@ -338,6 +346,8 @@ export default {
 
       uploadFileLength: '',
       commentText: '',
+      roleShowflag: false,
+      nodeList: [],
       // 人员编辑
       editFlag: false,
       editForm: {
@@ -424,6 +434,7 @@ export default {
     edit_partForm(row) {
       // 用来储存取消时原来的数据，防止取消时修改
       localStorage.setItem('obj', JSON.stringify(row))
+      this.fileListData = row
       this.editForm = row
       this.editFlag = true
     },

src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue

@@ -1181,7 +1181,7 @@
                                     this.$message.warning('请选择责任人')
                                 } else {
                                     this.isSubmit = true
-                                    this.$http.get('lawss/activiti/startProcess', {
+                                    this.$http.post('lawss/activiti/startProcessRollBack', {
                                         type: '9'
                                     }, {}, res => {
                                         if (res.ok) {

src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue

@@ -813,7 +813,7 @@ export default {
           this.$refs['Form'].validate((valid) => {
             if (valid) {
               this.isSubmit = true
-              this.$http.get('lawss/activiti/startProcess', {
+              this.$http.post('lawss/activiti/startProcessRollBack', {
                 type: '3'
               }, {}, res => {
                 if (res.ok) {

src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue

@@ -829,7 +829,7 @@ export default {
           this.$refs['Form'].validate((valid) => {
             if (valid) {
               this.isSubmit = true
-              this.$http.get('lawss/activiti/startProcess', {
+              this.$http.post('lawss/activiti/startProcessRollBack', {
                 id: this.bpnId || '',
                 createUser: this.$store.getters.userInfo.userId,
                 createUserName: this.$store.getters.userInfo.userName,

src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue

@@ -48,6 +48,7 @@
                   multiple
                   ref="uploadFile"
                   :action="uploadPath"
+                  name="file"
                   :file-list="fileTextList"
                   accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
                   :before-upload="handleBeforeUpload"