Merge branch 'dev-shuju' into test

src/views/modules/communityService/measure/index.vue

@@ -342,12 +342,7 @@
           <span>{{ form.cancelTime }}</span>
         </el-form-item>
         <template v-if="addType == 'finish' || (addType == 'look' && form.status == 'finished')">
-          <el-form-item label="完成情况" prop="finishResult">
-            <el-radio v-model="form.finishResult" 
-            label="resolved" :disabled="disabled && addType != 'finish'" >已解决</el-radio>
-            <el-radio v-model="form.finishResult" label="unresolved" 
-            :disabled="disabled && addType != 'finish'" >未解决</el-radio>
-          </el-form-item>
+          
           <el-form-item label="实际服务时间" prop="serviceStartTime">
             <el-date-picker
               v-model="finishServiceTime"
@@ -363,6 +358,12 @@
               >
             </el-date-picker>
           </el-form-item>
+          <el-form-item label="完成情况" prop="finishResult">
+            <el-radio v-model="form.finishResult" 
+            label="resolved" :disabled="disabled && addType != 'finish'" >已解决</el-radio>
+            <el-radio v-model="form.finishResult" label="unresolved" 
+            :disabled="disabled && addType != 'finish'" >未解决</el-radio>
+          </el-form-item>
           <el-form-item label="评价" prop="score" class="form-score">
               <el-rate v-model="form.score" :allow-half="true" :disabled="disabled && addType != 'finish'" ></el-rate>
           </el-form-item>