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

src/views/hidden/rectify/components/change.vue

@@ -33,7 +33,7 @@
             <el-form-item :rules="form.IS_NORMAL =='1' ?formRule.RECTIFICATIONTIME:[{required: false}]" label="整改时间" prop="RECTIFICATIONTIME">
               <el-date-picker v-model="form.RECTIFICATIONTIME" value-format="yyyy-MM-dd HH:mm:ss" type="datetime" placeholder="选择日期" />
             </el-form-item>
-            <el-form-item :rules="DAYNUM >= 1 ?formRule.TEMPORARY_SAFE_MEASURE:[{required: false}]" label="临时安全措施" label-width="110px" prop="TEMPORARY_SAFE_MEASURE" >
+            <el-form-item :rules="DAYNUM >= 1 ?formRule.TEMPORARY_SAFE_MEASURE:[{required: false}]" label="临时安全措施" prop="TEMPORARY_SAFE_MEASURE" >
               <el-input :rows="3" v-model="form.TEMPORARY_SAFE_MEASURE" type="textarea" placeholder="请在此处输入临时安全措施..."/>
             </el-form-item>
             <el-form-item :rules="[{required: true}]" label="整改后图片" label-width="100px">
@@ -426,7 +426,7 @@ export default {
       this.loading = true
       if (this.DAYNUM >= 1 && this.form.TEMPORARY_SAFE_MEASURE == '') {
         this.$message({
-          message: '临时安全措施不能为空，请先返回上个页面填写临时安全措施！！！',
+          message: '请先输入临时安全措施！！！',
           type: 'error'
         })
         this.loading = false

src/views/hiddenApi/publicMethod/list.vue

@@ -18,7 +18,7 @@
           <el-form-item label="发现部门" prop="keyFindUserDept">
             <SelectTree
               ref="deptTree_Select"
-              :clearable="false"
+              :clearable="true"
               :options="hiddenCreatorDeptList"
               :props="defaultProps"
               v-model="condform.creatorUserDept"
@@ -43,7 +43,7 @@
             <SelectTree
               v-if="hiddenlevelList.length !== 0"
               ref="hlTree_Select"
-              :clearable="false"
+              :clearable="true"
               :options="hiddenlevelList"
               :props="defaultProps"
               v-model="condform.hiddenlevel"
@@ -102,7 +102,7 @@
           <el-form-item label="隐患部位">
             <SelectTree
               ref="hiddenPart_Select"
-              :clearable="false"
+              :clearable="true"
               :options="hiddenPartList"
               :props="defaultProps"
               v-model="condform.hiddenpart"
@@ -471,10 +471,10 @@ export default {
         hiddenType: '', // 隐患类型
         creatorUserDept: ''// 隐患发现部门
       }
-      this.$refs.deptTree_Select3.clearHandle()
       this.$refs.deptTree_Select.clearHandle()
       this.$refs.hlTree_Select.clearHandle()
       this.$refs.hiddenPart_Select.clearHandle()
+      this.$refs.deptTree_Select3.clearHandle()
       this.getList()
     },
     // 获取数据字典数据
@@ -784,14 +784,20 @@ export default {
     },
     // 添加临时安全措施的点击事件
     AddTempSafeMeasureClick() {
-      if (!this.addSafeMeasureForm.TEMPORARY_SAFE_MEASURE && this.dayNum >= 1) {
-        this.$message({
-          message: '请填写临时安全措施',
-          type: 'error'
-        })
-        this.loading = false
-        return false
+      if (!this.addSafeMeasureForm.TEMPORARY_SAFE_MEASURE) {
+        alert(this.dayNum)
+        if (this.dayNum >= 1) {
+          this.$message({
+            message: '请填写临时安全措施',
+            type: 'error'
+          })
+          this.loading = false
+          return false
+        } else {
+          this.addSafeMeasureForm.TEMPORARY_SAFE_MEASURE = ''
+        }
       }
+
       const loading = this.$loading({
         lock: true,
         text: '加载中......',

src/views/safetyenvironmental/archive/components/info.vue

@@ -370,7 +370,7 @@ export default {
     // 导出表格的数据
     goExport() {
       var dataStr = '?INSPECTION_ID=' + encodeURIComponent(this.$parent.INSPECTION_ID)
-      window.location.href = config.httpurl + 'safetyenvironmental/exportInfo' + dataStr
+      window.location.href = config.httpurl + '/safetyenvironmental/exportInfo' + dataStr
     }
   }
 }

src/views/safetyenvironmental/inspection/components/list.vue

@@ -389,7 +389,7 @@ export default {
       dataStr += '&INSPECTION_SUBJECT=' + encodeURIComponent(this.search.INSPECTION_SUBJECT) // 检查题目
       dataStr += '&INSPECTION_TIME_START=' + encodeURIComponent(this.search.INSPECTION_TIME[0]) // 开始检查时间
       dataStr += '&INSPECTION_TIME_END=' + encodeURIComponent(this.search.INSPECTION_TIME[1]) // 结束检查时间
-      window.location.href = config.httpurl + 'safetyenvironmental/exportexcel' + dataStr
+      window.location.href = config.httpurl + '/safetyenvironmental/exportexcel' + dataStr
     },
     // 获取列表
     getList() {