Merge branch 'V0.0.3' of http://10.87.21.221:8000/jzyd_yyds/soc_web into V0.0.3

src/views/question/list/index.vue

@@ -7,7 +7,6 @@
           @defaultOrg="getDefaultOrg"
           @checkChange="checkChange"
           @click="clickTreeNode"
-          :businessTree="true"
         ></org-tree>
       </el-col>
       <el-col :span="20" :xs="24">
@@ -22,17 +21,16 @@
               v-show="showSearch"
               label-width="80px"
             >
-              <el-form-item label="关键字" label-width="60px">
+              <el-form-item label="关键字" prop="searchKey" label-width="60px">
                 <el-input
                   v-model="queryParams.searchKey"
-                  placeholder="请输入关键字"
+                  placeholder="请输入标准依据、隐患描述"
                   clearable
                   maxlength="50"
                 />
               </el-form-item>
               <el-form-item prop="confirmStatus" label="隐患状态">
                 <el-select
-                  prop="confirmStatus"
                   label="隐患状态"
                   v-model="queryParams.confirmStatus"
                   placeholder="请选择隐患状态"
@@ -137,10 +135,14 @@
             />
             <el-table-column
               header-align="center"
-              label="检查标准"
-              prop="checkItem"
+              label="标准依据"
+              prop="checkContent"
               v-if="columns[3].visible"
-            />
+            >
+              <template slot-scope="scope">
+                <pre>{{ scope.row.checkContent }}</pre>
+              </template>
+            </el-table-column>
             <el-table-column
               header-align="center"
               label="隐患描述"

src/views/question/reform/index.vue

@@ -7,7 +7,6 @@
           @defaultOrg="getDefaultOrg"
           @checkChange="checkChange"
           @click="clickTreeNode"
-          :businessTree="true"
         ></org-tree>
       </el-col>
       <el-col :span="20" :xs="24">
@@ -25,7 +24,7 @@
               <el-form-item label="关键字" prop="searchKey" label-width="60px">
                 <el-input
                   v-model="queryParams.searchKey"
-                  placeholder="请输入关键字"
+                  placeholder="请输入标准依据、隐患描述"
                   clearable
                   maxlength="50"
                 />

src/views/safetycheck/taskManager/components/checkRegister.vue

@@ -127,17 +127,6 @@
                       maxlength="255"
                     ></el-input>
                   </el-form-item>
-                  <el-form-item label="异常图片" prop="image">
-                    <imgUpload
-                      type="more"
-                      :value="
-                        point.imgData
-                          ? point.imgData.map((d) => d.imgPath).join(',')
-                          : ''
-                      "
-                      @input="onImageChanged(point, $event)"
-                    ></imgUpload>
-                  </el-form-item>
                   <el-form-item label="整改期限" prop="rectificationDeadline">
                     <el-select
                       v-model="point.rectificationDeadline"
@@ -151,6 +140,17 @@
                       ></el-option>
                     </el-select>
                   </el-form-item>
+                  <el-form-item label="异常图片" prop="image">
+                    <imgUpload
+                      type="more"
+                      :value="
+                        point.imgData
+                          ? point.imgData.map((d) => d.imgPath).join(',')
+                          : ''
+                      "
+                      @input="onImageChanged(point, $event)"
+                    ></imgUpload>
+                  </el-form-item>                  
                 </el-form>
               </div>
             </div>