合并代码

src/views/auditPages/taskManagement/index.vue

@@ -125,6 +125,15 @@
             <el-form-item label="任务名称" prop="taskName">
               <el-input v-model="ruleForm.taskName" placeholder="请输入任务名称"></el-input>
             </el-form-item>
+            <el-form-item label="核查资产类型" prop="hczclx">
+              <el-checkbox-group v-model="ruleForm.hczclx">
+                <el-checkbox label="0">web资产</el-checkbox>
+                <el-checkbox label="1">小程序资产</el-checkbox>
+                <el-checkbox label="2">公众号资产</el-checkbox>
+                <el-checkbox label="3" >电子邮件资产</el-checkbox>
+                <el-checkbox label="4" >移动应用程序资产</el-checkbox>
+              </el-checkbox-group>
+            </el-form-item>
             <el-form-item label="核查单位" prop="dwmc" class="select-box">
               <el-col >
                 <el-select v-model="ruleForm.dwmc" placeholder="请选择核查单位" multiple collapse-tags>
@@ -188,10 +197,11 @@ export default {
         taskName: "",
         dwmc: [],
         taskDeadline: "",
+        hczclx:[]
       },
       rules: {
         taskName: [
-          { required: true, message: '请输入', trigger: 'blur' },
+          { required: true, message: '请输入', trigger: 'change' },
         ],
         dwmc: [
           { required: true, message: '请选择', trigger: 'change' }
@@ -199,8 +209,34 @@ export default {
         taskDeadline: [
           { required: true, message: '请选择日期', trigger: 'change' }
         ],
+        hczclx:[
+        { required: true, message: '请选择', trigger: 'change' }
+        ]
       },
-      tabclicklist: []
+      tabclicklist: [],
+   
+      chanckList:[
+        {
+          lable:"0",
+          conent:"web资产"
+        },
+        {
+          lable:"1",
+          conent:"小程序资产"
+        },
+        {
+          lable:"2",
+          conent:"公众号资产"
+        },
+        {
+          lable:"3",
+          conent:"电子邮件资产"
+        },
+        {
+          lable:"4",
+          conent:"移动应用程序资产"
+        },
+      ]
     }
   },
   mounted() {
@@ -218,11 +254,15 @@ export default {
         dwmc: [],
         taskName: "",
         taskDeadline: "",
+        hczclx:[]
+
       }
       this.$refs.taskDialog.close()
       this.tabclicklist = []
     },
     submitForm(formName) {
+      console.log(this.ruleForm);
+      
       this.$refs[formName].validate((valid) => {
         if (valid) {
           this.ruleForm.dwmc = this.ruleForm.dwmc.join(",")
@@ -281,7 +321,10 @@ export default {
     },
     //打开列表
     addliebiao() {
-      this.$refs.liebiaoDialog.open()
+      console.log(this.ruleForm.hczclx);
+      
+      if(this.ruleForm.hczclx.length >0){
+        this.$refs.liebiaoDialog.open()
       setTimeout(() => {
       this.$refs.danweiList.getList()
         
@@ -291,6 +334,10 @@ export default {
           this.$refs.danweiList.dakai(this.tabclicklist)
         }, 100);
       }
+      }else{
+        this.$message('请先选择核查资产类型');
+      }
+     
 
     },
     liebiaoClose() {

src/views/auditPages/taskManagement/info.vue

@@ -96,6 +96,10 @@
           </el-row>
         </el-form>
         <section v-if="index == 1">
+          <el-tabs v-model="activeName" @tab-click="handleClick">
+            <el-tab-pane :label="item.conent" :name="item.lable" v-for="item in chanckList"></el-tab-pane>
+           
+          </el-tabs>
           <el-table v-loading="loading" :data="tableData" :height="tabHeader" :max-height="tabHeader"
             :row-class-name="tableRowClassName">
             <el-table-column type="index" width="50" label="序号" align="center" />
@@ -216,6 +220,7 @@ export default {
   components: { myPagination,myDialog },
   data() {
     return {
+      activeName:0,
       index: 1,
       formInline: {
         xtlx:""
@@ -238,7 +243,29 @@ export default {
       tabHeader: undefined,
       timeLineData: [],
       titleInfoObj: {},
-      chakanyuanyin:""
+      chakanyuanyin:"",
+      chanckList:[
+        {
+          lable:"0",
+          conent:"web资产"
+        },
+        {
+          lable:"1",
+          conent:"小程序资产"
+        },
+        {
+          lable:"2",
+          conent:"公众号资产"
+        },
+        {
+          lable:"3",
+          conent:"电子邮件资产"
+        },
+        {
+          lable:"4",
+          conent:"移动应用程序资产"
+        },
+      ]
     }
   },
   mounted() {
@@ -253,6 +280,9 @@ export default {
   },
 
   methods: {
+    handleClick(tab, event) {
+        console.log(tab.name);
+      },
     //返回图片
     returnidimg(iswenzi){
       // let obj = {