Merge branch 'dev' of http://1.116.113.26:8088/zhuliu/RMS-FrontEnd into dev

RMS-FrontEnd/src/views/product/components/framework/frameworkTree.vue

@@ -108,7 +108,7 @@ export default {
       options:[],
       rules: {
         productName:[{ required: true, message: '请输入产品名称', trigger: 'blur' },],
-        elementName:[{ required: true, message: '请输入产品架构名称', trigger: 'blur' },],
+        structureName:[{ required: true, message: '请输入产品架构名称', trigger: 'blur' },],
       },
       visible: false,
       parentId:null,

RMS-FrontEnd/src/views/report/components/CreateReport.vue

@@ -16,14 +16,14 @@
             <el-form-item label="报告名称" prop="name">
               <el-input v-model="form.name" autocomplete="off" placeholder="请输入报告名称"></el-input>
             </el-form-item>
-            <el-form-item label="是否完成" v-show="!form.id"> 
+            <el-form-item label="是否完成" v-if="!form.id"> 
               <el-switch
                 v-model="form.status"
                 active-color="#13ce66"
                 inactive-color="#ff4949"
                 @change="changeStatus"
                 :active-value="3"
-                inactive-value="0">
+                :inactive-value="1">
               </el-switch>
             </el-form-item> 
             <el-form-item label="核心结论" v-if="!form.id && form.status == 3">
@@ -357,7 +357,7 @@ export default {
       this.isEndTime=false
       this.$refs.TaskForm.validate((valid) => {
         if (valid) {
-          this.form.status = 0
+          // this.form.status = 0
         let formData = new FormData()
           if(this.file){
             for (var i = 0; i < this.file.length; i++) {

RMS-FrontEnd/src/views/report/index.vue

@@ -408,7 +408,7 @@ export default {
        var a= Number((row.name).substring((row.name).length-1)) + 1
        form.name = (row.name).substring(0,(row.name).length-1)+a
       }
-      form.status = 0
+      form.status = 1
       form.id = null
       form.track = true
       this.$refs.ReportForm.open(form)

RMS-FrontEnd/src/views/report/reportDetails/components/SelectedPatent.vue

@@ -10,7 +10,7 @@
               </el-tooltip>
             </div>
             <el-button @click="importPatent(reportId,true)" type="primary" size="small" style=" margin-left: 10px;" v-if="$reportPermission(reportId,[0,1])">导入</el-button>
-            <el-button @click="taskFeil" type="primary" size="small" style="margin-left: 10px;" v-if="row.status!=3 && $reportPermission(reportId,[0,1])">任务分配</el-button>
+            <el-button @click="taskFeil" type="primary" size="small" style="margin-left: 10px;" v-if="( reportMessage.status!=3) && $reportPermission(reportId,[0,1])">任务分配</el-button>
             <!-- <el-button @click="taskWork" type="primary" size="small" style="float: right; margin-left: 10px;" >协同办公</el-button> -->
             <div >
                 <div class="btnSelected" @click="sift" style="width:80px;height:32px;right: 100px;display:flex;justify-content:space-around;border-radius:5px; cursor: pointer; ">
@@ -131,7 +131,8 @@ export default {
     // this.signPatentNo = this.$route.query.signPatentNo
     //console.log(this.$route.query.personId,this.row);
     this.personId = this.$route.query.personId?this.$route.query.personId:this.$s.getSession('row').personId
-    this.reportMessage = this.$s.getSession('row')?this.$s.getSession('row'):this.$s.getSession('reportMessage')
+    this.reportMessage =this.row?this.row: (this.$s.getSession('row') ? this.$s.getSession('row') : this.$s.getSession('reportMessage'))
+
   },
   mounted() {