Merge remote-tracking branch 'origin/develop' into develop

src/pages/localTool/standCalendar/index.vue

@@ -103,10 +103,10 @@
 
     <!--  会议编辑抽屉  -->
     <el-drawer
-      title="编辑人员信息"
+      title="编辑会议信息"
       :visible.sync="meetFlag"
       :before-close="falseDrawer"
-      size="600px"
+      size="800px"
     >
       <div class="content_form" style="height: calc(100% - 20px);overflow-y: auto">
         <el-form class="label-input-form" ref="editMeetForm" :model="editMeetForm" label-width="80px">
@@ -241,9 +241,9 @@
 
     <!--  编辑框内的人员的table上的编辑  -->
     <el-drawer
-      title="编辑人员信息"
+      :title="dialogTitle"
       :visible.sync="editFlag"
-      size="500px"
+      size="600px"
       :before-close="falseDrawerTab"
       custom-class="demo-drawer"
     >
@@ -339,6 +339,7 @@ export default {
       // 议题选中时储存数组
       deleteTable: [],
       loading: false,
+      dialogTitle: ''
     }
   },
   mounted() {
@@ -619,10 +620,19 @@ export default {
         fillFile: this.fillFile = []
       }
       this.editMeetForm.attend.push(list)
+      this.dialogTitle = '新增人员信息'
+      this.add_partDialog(list)
     },
 
+    add_partDialog(row) {
+      // 用来储存取消时原来的数据，防止取消时修改
+      localStorage.setItem('obj', JSON.stringify(row))
+      this.editForm = row
+      this.editFlag = true
+    },
     // 编辑按钮
     edit_partForm(row) {
+      this.dialogTitle = '编辑人员信息'
       // 用来储存取消时原来的数据，防止取消时修改
       localStorage.setItem('obj', JSON.stringify(row))
       this.editForm = row
@@ -679,13 +689,26 @@ export default {
       this.editFlag = false
     },
     falseDrawerTab() {
-      let Item = JSON.parse(localStorage.getItem('obj'))
+      if (this.dialogTitle = '新增人员信息') {
-      this.editForm.fillPeopleId = Item.fillPeopleId
+        let Items = JSON.parse(localStorage.getItem('objs'))
-      this.editForm.fillPeople = Item.fillPeople
+        this.editMeetForm.attend = Items.attend
-      this.editForm.fillUnit = Item.fillUnit
+        this.editMeetForm.content = Items.content
-      this.editForm.fillDept = Item.fillDept
+        this.editMeetForm.date = Items.date
-      this.editForm.fillTel = Item.fillTel
+        this.editMeetForm.files = Items.files
-      this.editForm.fillMail = Item.fillMail
+        this.editMeetForm.id = Items.id
+        this.editMeetForm.partPeople = Items.partPeople
+        this.editMeetForm.place = Items.place
+        this.editMeetForm.title = Items.title
+        this.editMeetForm.type = Items.type
+      } else {
+        let Item = JSON.parse(localStorage.getItem('obj'))
+        this.editForm.fillPeopleId = Item.fillPeopleId
+        this.editForm.fillPeople = Item.fillPeople
+        this.editForm.fillUnit = Item.fillUnit
+        this.editForm.fillDept = Item.fillDept
+        this.editForm.fillTel = Item.fillTel
+        this.editForm.fillMail = Item.fillMail
+      }
       this.editFlag = false
     },
 

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

@@ -295,7 +295,7 @@
       </div>
     </div>
     <el-drawer
-      title="编辑人员信息"
+      :title="isTitle"
       :visible.sync="editFlag"
       size="500px"
     >
@@ -478,6 +478,7 @@ export default {
       acceptShow: false,
       roleShowflag: false,
       nodeList: [],
+      isTitle: ''
     }
   },
   computed: {
@@ -539,6 +540,8 @@ export default {
         fillFile: this.fillFile = []
       }
       this.rh_pageData.myPartRole.push(list)
+      this.isTitle = '新增人员信息'
+      this.add_partDialog(list)
     },
 
     fillFile_up(row) {
@@ -625,8 +628,17 @@ export default {
     handleClose() {
       this.upDialog = false
     },
+    add_partDialog(row) {
+      // 用来储存取消时原来的数据，防止取消时修改
+      localStorage.setItem('obj', JSON.stringify(row))
+      this.fileListData = row
+      this.reData = this.fileListData.fillFile
+      this.editForm = row
+      this.editFlag = true
+    },
     // 编辑按钮
     edit_partForm(row) {
+      this.isTitle = '编辑人员信息'
       // 用来储存取消时原来的数据，防止取消时修改
       localStorage.setItem('obj', JSON.stringify(row))
       this.fileListData = row
@@ -639,15 +651,19 @@ export default {
       this.editFlag = false
     },
     falseDrawer() {
-      let Item = JSON.parse(localStorage.getItem('obj'))
+      if (this.isTitle === '新增人员信息') {
-      this.editForm.fillPeopleId = Item.fillPeopleId
+        this.getData()
-      this.editForm.fillPeople = Item.fillPeople
+      } else {
-      this.editForm.fillUnit = Item.fillUnit
+        let Item = JSON.parse(localStorage.getItem('obj'))
-      this.editForm.fillDept = Item.fillDept
+        this.editForm.fillPeopleId = Item.fillPeopleId
-      this.editForm.fillPost = Item.fillPost
+        this.editForm.fillPeople = Item.fillPeople
-      this.editForm.fillTel = Item.fillTel
+        this.editForm.fillUnit = Item.fillUnit
-      this.editForm.fillMail = Item.fillMail
+        this.editForm.fillDept = Item.fillDept
-      this.editForm.fillFile = Item.fillFile
+        this.editForm.fillPost = Item.fillPost
+        this.editForm.fillTel = Item.fillTel
+        this.editForm.fillMail = Item.fillMail
+        this.editForm.fillFile = Item.fillFile
+      }
       this.editFlag = false
     },
     // 编辑框选人

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

@@ -257,7 +257,7 @@
       </div>
     </div>
     <el-drawer
-      title="编辑人员信息"
+      :title="isTitle"
       :visible.sync="editFlag"
       size="500px"
       custom-class="demo-drawer"
@@ -356,7 +356,8 @@ export default {
         fillDept: '',
         fillTel: '',
         fillMail: '',
-      }
+      },
+      isTitle: ''
     }
   },
   computed: {
@@ -416,21 +417,35 @@ export default {
         fillMail: this.fillMail,
       }
       this.ch_pageData.myPartRole.push(list)
+      this.isTitle = '新增人员信息'
+      this.add_partDialog(list)
     },
     // 编辑框确认按钮
     OkDrawer() {
       this.editFlag = false
     },
     falseDrawer() {
-      let Item = JSON.parse(localStorage.getItem('obj'))
+      if (this.isTitle = '新增人员信息') {
-      this.editForm.fillPeopleId = Item.fillPeopleId
+        this.getData()
-      this.editForm.fillPeople = Item.fillPeople
+      } else {
-      this.editForm.fillUnit = Item.fillUnit
+        let Item = JSON.parse(localStorage.getItem('obj'))
-      this.editForm.fillDept = Item.fillDept
+        this.editForm.fillPeopleId = Item.fillPeopleId
-      this.editForm.fillTel = Item.fillTel
+        this.editForm.fillPeople = Item.fillPeople
-      this.editForm.fillMail = Item.fillMail
+        this.editForm.fillUnit = Item.fillUnit
+        this.editForm.fillDept = Item.fillDept
+        this.editForm.fillTel = Item.fillTel
+        this.editForm.fillMail = Item.fillMail
+      }
       this.editFlag = false
     },
+
+    add_partDialog(row) {
+      // 用来储存取消时原来的数据，防止取消时修改
+      localStorage.setItem('obj', JSON.stringify(row))
+      this.fileListData = row
+      this.editForm = row
+      this.editFlag = true
+    },
     /** 入会人员编辑 */
     edit_partForm(row) {
       // 用来储存取消时原来的数据，防止取消时修改

src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue

@@ -252,20 +252,18 @@
                     </el-select>
                 </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="汇总评审意见文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
+                <div  v-if="summaryFileList.length>0" v-for="(value,index)  in this.summaryFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
+                  <!-- {{ value.name }} -->
+                  {{value.name}}
+                </div>
+                <div v-else>
+                  - -
+                </div>
+              </el-form-item>
+            </el-col>
         </el-row>
-      <el-row :gutter="24">
-        <el-col :span="12">
-          <el-form-item label="汇总评审意见文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
-            <div  v-if="summaryFileList.length>0" v-for="(value,index)  in this.summaryFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">
-              <!-- {{ value.name }} -->
-              {{value.name}}
-            </div>
-            <div v-else>
-              - -
-            </div>
-          </el-form-item>
-        </el-col>
-      </el-row>
     </div>
 </form>
 </template>