Merge branch 'V0.0.4' of http://10.87.21.221:8000/jzyd_yyds/soc_app into V0.0.4

src/components/orgTree/index.vue

@@ -15,6 +15,7 @@
       :noChildrenText="''"
       noResultsText="暂无符合条件的数据">
     </tree-select>
+    <!-- <van-checkbox v-model="checked" shape="square">复选框</van-checkbox> -->
   </div>
 </template>
 <script>
@@ -48,6 +49,7 @@ export default  {
     return {
       treeData: [],
       selected: null,
+      checked:false,
     }
   },
   computed: {
@@ -59,7 +61,7 @@ export default  {
         if(!val){
           this.selected = null
         }else {
-         
+
           this.selected = this.value
         }
       },

src/views/menu/resumption/detail.vue

@@ -792,21 +792,21 @@ export default {
                   })
                   throw new Error('存在未编辑完成履职项，无法提交')
                 }
-                if(point.imgs.length < 1){
-                  this.changeSwitch()
-                  this.areas.forEach((area, i) => {
-                    if (area.areaId === item.areaId) {
-                      this.activeArea(area, i)
-                      //切换后验证表单
-                      this.$refs.resumption_form.validate()
-                      this.$toast.fail({
-                        message: '请拍照上传异常图片！',
-                        position: 'top'
-                      })
-                      throw new Error('请上传异常图片！');
-                    }
-                  })
-                }
+                // if(point.imgs.length < 1){
+                //   this.changeSwitch()
+                //   this.areas.forEach((area, i) => {
+                //     if (area.areaId === item.areaId) {
+                //       this.activeArea(area, i)
+                //       //切换后验证表单
+                //       this.$refs.resumption_form.validate()
+                //       this.$toast.fail({
+                //         message: '请拍照上传异常图片！',
+                //         position: 'top'
+                //       })
+                //       throw new Error('请上传异常图片！');
+                //     }
+                //   })
+                // }
               }
             }
 

src/views/menu/resumptionEvaluate/evaluate.vue

@@ -24,7 +24,7 @@
           :title="
             item.code +
             '.' +
-            'item.content评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容content评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容评价内容'
+            item.content
           "
           v-for="item in formData.coreEvaluateContentList"
           :key="item.id"