Merge branch 'web-v2' into web-v2-pro

src/views/safetyCheck/snapshotManagement/infoPage.vue

@@ -76,7 +76,7 @@
             <el-input
               type="textarea"
               :autosize="{ minRows: 4, maxRows: 4}"
-              placeholder="请输入整改措施"
+              :placeholder="upFormData.rectifyStatus==1?'请输入整改措施':(upFormData.rectifyStatus==2?'请输入原因描述':'')"
               v-model="upFormData.rectifyDescribe"
               maxlength="100"
               resize="none"