Merge branch 'develop' of http://git.censoft.com.cn/BCDH-HSE/bcdh-app into develop

src/views/danger/addDanger/addDanger.vue

@@ -15,6 +15,7 @@
         autosize
         label="退回原因"
         type="textarea"
+        class="gray"
       />
 
       <van-field
@@ -26,6 +27,7 @@
         placeholder="请选择"
         @click="showProjectName = true"
         :rules="[{ required: true, message: '所属项目不能为空' }]"
+        :class="{gray:isShowreturnCause}"
       />
       <van-popup
         v-model="showProjectName"
@@ -50,6 +52,7 @@
         placeholder="请选择"
         @click="showRange = true"
         :rules="[{ required: true, message: '适用范围不能为空' }]"
+        :class="{gray:isShowreturnCause}"
       />
       <van-popup
         v-model="showRange"
@@ -95,6 +98,7 @@
         placeholder="请选择"
         @click="showDangerName = true"
         :rules="[{ required: true, message: '隐患项目名称不能为空' }]"
+        :class="{gray:isShowreturnCause}"
       />
       <van-popup
         v-model="showDangerName"
@@ -111,6 +115,7 @@
       </van-popup>
 
       <van-field
+        class="gray"
         v-model="dangerNum"
         readonly
         name="hdProjectId"
@@ -119,6 +124,7 @@
         :rules="[{ required: true, message: '隐患项目编号不能为空' }]"
       />
       <van-field
+        class="gray"
         v-model="dangerLevel"
         readonly
         name="hdLev"
@@ -516,13 +522,17 @@ export default {
       formdata.append("hdDescribe", values.hdDescribe);
       formdata.append("hdExpirationTime", values.hdExpirationTime);
       formdata.append("rectificationUser", values.rectificationUser);
-
+      console.log(values.hdPicture1,'这是要上传的文件')        
       // 放图片路径 因为formdat存数组会自动变成字符串所以次用这种追加字段的方式
       values.hdPicture1.forEach((item) => {
-        formdata.append("hdPicture1[]", item.file);
+        if(item.file){
+          formdata.append("hdPicture1[]", item.file?item.file:item);
+        }
       });
       values.hdVideo1.forEach((item) => {
-        formdata.append("hdVideo1[]", item.file);
+        if(item.file){
+            formdata.append("hdVideo1[]", item.file);
+        }
       });
       this.$toast.loading({
         message: "提交中...",
@@ -757,6 +767,11 @@ export default {
   },
 };
 </script>
-<style scoped>
+<style scoped lang="less">
 /* @import url(); 引入css类 */
+.gray{
+  /deep/.van-field__control{
+    color:gray !important;
+  }
+}
 </style>

src/views/danger/standBook/normalDetail.vue

@@ -159,10 +159,10 @@
                   <van-col span="20">{{ item.confirmOpinion }}</van-col>
                 </van-row>
                 <van-row gutter="">
-                  <van-col span="8"
+                  <van-col span="9"
                     ><span class="field-title">隐患确认信息：</span></van-col
                   >
-                  <van-col span="16">{{item.confirmResult==0?'退回':'通过'}}</van-col>
+                  <van-col span="15">{{item.confirmResult==0?'退回':'通过'}}</van-col>
                 </van-row>
                 
               </div>
@@ -270,7 +270,7 @@
               </div>
             </van-col>
           </van-row>
-          <van-row gutter="">
+          <van-row gutter="" v-if="item.hdVideoList">
             <van-col span="7"
               ><span class="field-title">隐患视频：</span></van-col
             >