Merge remote-tracking branch 'origin/pet' into dev

src/views/hiddenApi/publicMethod/list.vue

@@ -88,7 +88,9 @@
               :options="hiddenCreatorDeptList"
               :props="defaultProps1"
               v-model="condform.reorganizeDept"
-              clearable/>
+              collapse-tags
+              clearable
+            />
           </el-form-item>
         </el-col>
       </el-row>
@@ -247,7 +249,7 @@
       </span>
     </el-dialog>
     <el-dialog :visible.sync="addTempSafeMeasureDialogForm" title="添加临时安全措施" width="600px">
-      <el-form ref="AddTempSafeMeasureForm" :model="addSafeMeasureForm" :rules="rules" label-width="110px" style="width: 500px;">
+      <el-form ref="AddTempSafeMeasureForm" :model="addSafeMeasureForm" label-width="110px" style="width: 500px;">
         <el-form-item :rules="dayNum >= 1 ?addSafeMeasureFormRule.TEMPORARY_SAFE_MEASURE:[{required: false}]" label="临时安全措施" label-width="110px" prop="TEMPORARY_SAFE_MEASURE" >
           <el-input :rows="9" v-model="addSafeMeasureForm.TEMPORARY_SAFE_MEASURE" type="textarea" placeholder="请在此处输入临时安全措施..."/>
         </el-form-item>
@@ -396,6 +398,17 @@ export default {
     this.getHiddenNames()
   },
   methods: {
+    getSafeOptions(options) {
+      console.log('-------------------')
+      console.log(options)
+      console.log('-------------------')
+      return options
+    },
+    handleDeptChange(value) {
+      console.log('Selected department:', value)
+      // 确认选择后的值是否正确更新
+      this.reorganizeDept = value
+    },
     getEditMyInfo() { // 获取登录人信息
       requestFN(
         '/user/goEditMyInfo',
@@ -419,8 +432,9 @@ export default {
       this.listLoading = true
       const reorganizeDept = this.condform.reorganizeDept
       let deptIds = ''
+      console.log(reorganizeDept)
       if (reorganizeDept != null && reorganizeDept.length > 0) {
-        reorganizeDept.forEach(item => { deptIds = deptIds + ',' + item })
+        deptIds = reorganizeDept.join(',')
       }
       requestFN(
         '/hiddenApi/getList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
@@ -685,6 +699,10 @@ export default {
       data += '&ENDTIME=' + _this.condform.creatTime[1]
       data += '&sessionID=' + ssionID
       data += '&tm=' + new Date().getTime()
+      const reorganizeDept = this.condform.reorganizeDept
+      if (reorganizeDept != null && reorganizeDept.length > 0) {
+        data += '&reorganizeDept=' + reorganizeDept.join(',')
+      }
       window.location.href = config.httpurl + '/hiddenExcel/excel2' + data
 
       var timingTask = setInterval(function() {