Merge branch 'dev-online' into 'PrivateReleaseOfXC'

Dev online

See merge request crowd-2019/crowd-test-service-front!204

src/components/task/Task.vue

@@ -41,8 +41,8 @@
               <span class="badge" v-if="!isModifyMode">{{ task.serviceType }}</span>
             </el-form-item>
 
-            <el-form-item label="协同模式" prop="collaborativeType" style="width:700px;" v-if="currType.type==1">
-              <el-radio-group v-model="task.endPoint.collaborativeType" v-if="isModifyMode">
+            <el-form-item label="协同模式" prop="endPoint.collaborativeType" style="width:700px;" v-if="currType.type==1">
+              <el-radio-group v-model="task.endPoint.collaborativeType" v-if="isModifyMode" @change="$forceUpdate()">
                 <el-radio :label="0">协同</el-radio>
                 <el-radio :label="1">非协同</el-radio>
               </el-radio-group>
@@ -450,6 +450,18 @@ export default {
             }, trigger: 'blur'
           },
         ],
+
+        'endPoint.threePageUrl': [
+          {
+            validator: (rule, value, callback) => {
+              if (this.currType === 1 && this.task.endPoint.threePageUrl === '') {
+                callback(new Error('请上传测试大纲'))
+              } else {
+                callback()
+              }
+            }, trigger: 'change'
+          },
+        ],
         resource: [
           {required: true},
           {
@@ -549,7 +561,8 @@ export default {
       if (this.currType.type === 0) {
         this.$refs.task.clearValidate('endPoint');
       } else {
-        this.task.resource = '2'
+        this.task.resource = '2';
+        this.task.endPoint.collaborativeType = 0;
       }
     },
     init() {

src/components/task/TaskCreate.vue

@@ -93,7 +93,7 @@
               </span>
         </el-form-item>
 
-        <el-form-item label="测试大纲" prop="threePages" v-if="currType.type==1"
+        <el-form-item label="测试大纲" prop="endPoint.threePageUrl" v-if="currType.type==1"
                       class="three-page-upload">
           <el-upload
             drag
@@ -228,7 +228,7 @@ export default {
         ],
         desc: [{required: true, message: '请填写描述', trigger: 'blur'}],
 
-        threePages: [
+        'endPoint.threePageUrl': [
           {
             validator: (rule, value, callback) => {
               if (this.currType.type === 1 && this.task.endPoint.threePageUrl === '') {