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

RMS-FrontEnd/src/views/product/components/category.vue

@@ -97,7 +97,7 @@
                 </span>
               </span>
               <!-- upload展示，preview-src-list大图展示 -->
-                <el-image ref="image" style="width:100%;height: 100%;" :src="categoryForm.pictures[0].id?$p2 + categoryForm.pictures[0].url:categoryForm.pictures[0].url" :preview-src-list="categoryForm.pictures"></el-image>
+                <el-image ref="image" style="width:100%;height: 100%;" :src="categoryForm.pictures[0].id?$p2 + categoryForm.pictures[0].url:categoryForm.pictures[0].url" :preview-src-list="categoryForm.pictures?categoryForm.pictures.map(item=>{return item.id? $p2 + item.url:item.url}):[]"></el-image>
             </span>
             <i v-else class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>

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

@@ -69,7 +69,7 @@
                       <i class="el-icon-zoom-in" @click.stop="handlePictureCardPreview"></i>
                       <i class="el-icon-delete" @click.stop="handleRemove"></i></span>
                     </span>
-                    <el-image ref="image" style="width:100%;height: 100%;" :src="frameworkForm.pictures[0].id? $p2 + frameworkForm.pictures[0].url:frameworkForm.pictures[0].url" :preview-src-list="frameworkForm.pictures"></el-image>
+                    <el-image ref="image" style="width:100%;height: 100%;" :src="frameworkForm.pictures[0].id? $p2 + frameworkForm.pictures[0].url:frameworkForm.pictures[0].url" :preview-src-list="frameworkForm.pictures?frameworkForm.pictures.map(item=>{return item.id? $p2 + item.url:item.url}):[]"></el-image>
                   </span>
                   <i v-else class="el-icon-plus avatar-uploader-icon"></i>
                 </el-upload>

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

@@ -163,7 +163,7 @@
               <i class="el-icon-zoom-in" @click.stop="handlePictureCardPreview"></i>
               <i class="el-icon-delete" @click.stop="handleRemove"></i></span>
             </span>
-            <el-image ref="image" style="width:100%;height: 100%;" :src="productForm.pictures[0].id? $p2 + productForm.pictures[0].url:productForm.pictures[0].url" :preview-src-list="productForm.pictures"></el-image>
+            <el-image ref="image" style="width:100%;height: 100%;" :src="productForm.pictures[0].id? $p2 + productForm.pictures[0].url:productForm.pictures[0].url" :preview-src-list="productForm.pictures?productForm.pictures.map(item=>{return item.id? $p2 + item.url:item.url}):[]"></el-image>
           </span>
           <i v-else class="el-icon-plus avatar-uploader-icon"></i>
         </el-upload>
@@ -207,7 +207,7 @@
                   <i class="el-icon-delete" @click.stop="handleRemove"></i>
                 </span>
               </span>
-                <el-image ref="image" style="width:100%;height: 100%;" :src="categoryForm.pictures[0].id?$p2 + categoryForm.pictures[0].url:categoryForm.pictures[0].url" :preview-src-list="categoryForm.pictures"></el-image>
+                <el-image ref="image" style="width:100%;height: 100%;" :src="categoryForm.pictures[0].id?$p2 + categoryForm.pictures[0].url:categoryForm.pictures[0].url" :preview-src-list="categoryForm.pictures?categoryForm.pictures.map(item=>{return item.id? $p2 + item.url:item.url}):[]"></el-image>
             </span>
             <i v-else class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>
@@ -681,6 +681,7 @@ export default {
     handleRemove() {
       this.file = []
         this.productForm.pictures = []
+        this.categoryForm.pictures = []
     },
     handleChange(file, fileList) {
       this.$set(this.productForm,'pictures', [{url:file.url}])

RMS-FrontEnd/src/views/product/components/products.vue

@@ -111,7 +111,7 @@
               <i class="el-icon-zoom-in" @click.stop="handlePictureCardPreview"></i>
               <i class="el-icon-delete" @click.stop="handleRemove"></i></span>
             </span>
-            <el-image ref="image" style="width:100%;height: 100%;" :src="productForm.pictures[0].id? $p2 + productForm.pictures[0].url:productForm.pictures[0].url" :preview-src-list="productForm.pictures"></el-image>
+            <el-image ref="image" style="width:100%;height: 100%;" :src="productForm.pictures[0].id? $p2 + productForm.pictures[0].url:productForm.pictures[0].url" :preview-src-list="productForm.pictures?productForm.pictures.map(item=>{return item.id? $p2 + item.url:item.url}):[]"></el-image>
           </span>
           <i v-else class="el-icon-plus avatar-uploader-icon"></i>
         </el-upload>

RMS-FrontEnd/src/views/product/components/relatedPatents/components/import/SystemTask.vue

@@ -124,7 +124,7 @@ export default {
   computed: {
     // ...mapGetters(['webSocket', 'userinfo'])
     userinfo() {
-      return this.$store.state.admin.userinfo
+        return this.$store.state.admin.userinfo
     }
 
   },
@@ -136,18 +136,23 @@ export default {
         this.getQueueList()
       }
     },
+    'userinfo.id'() {
+      this.connectWebSocket(this.userinfo.id)
+    }
   },
   mounted() {
     // this.queryParams.type = this.form
     this.getList()
    this.getQueueList()
     // this.initTask()
-    this.connectWebSocket(this.userinfo.id)
+    if (this.userinfo.id) {
+      this.connectWebSocket(this.userinfo.id)
+    }
   },
   methods: {
     connectWebSocket(userId) {
       this.webSocket1 = new WebSocket(`ws://139.224.24.90:8877/api/v2/ws/` + userId)
-      // this.webSocket1 = new WebSocket(`ws://192.168.1.24:8111/api/quartz/ws/` + userId)
+      // this.webSocket1 = new WebSocket(`ws://192.168.1.24:8877/api/v2/ws/` + userId)
 
       // Store.commit('SET_WEB_SOCKET', webSocket)
       this.webSocket1.onopen = () => {

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

@@ -736,30 +736,7 @@ export default {
         if (valid) {
           this.loading = false
           if(!this.form.id){
-            if(this.form.status == 3){
-              try{
-                        var keyList={
-                            followUpName:'',
-                            remark:'',
-                            agent:'',
-                            assistPerson:'',
-                            timeLimit:''
-                        }
-                        this.form.followUps.forEach(item=>{
-                            var a = false
-                            for(let key in keyList){
-                                if(item[key] !='' && item[key] != null){
-                                    a = true
-                                }
-                            }
-                            if(a == true){
-                                if(item.followUpName!='') {
-                                    
-                                }else{
-                                    throw new Error()
-                                }
-                            }
-                        })
+            if (this.form.status == 3) {
                         let formData = new FormData()
                         if(this.file){
                           for (var i = 0; i < this.file.length; i++) {
@@ -776,9 +753,6 @@ export default {
                             this.handleClose()
                           }
                         })
-                    }catch(e){
-                        this.$message.error('后续事项名称不能为空')
-                    }  
                  return false
             }
             this.$confirm('是否需要审核?', '提示', {
@@ -805,6 +779,7 @@ export default {
                         // for(let key in this.form){
                         //   formData.append(key, this.form[key])
                         // }
+                        this.form.status = 1
                         formData.append('report',JSON.stringify(this.form))
                         // formData.append('status', 1)
                       this.$api.AddReport(formData).then(response=>{

RMS-FrontEnd/src/views/task/MyHandle.vue

@@ -482,7 +482,7 @@ import Menu from '@/views/components/common/menu/index.vue'
 			status:1,
 			// remark:this.remark,
 			result: this.btn.value,
-			reportStatus:![4,5].includes(this.form.type)?this.btn.value:2
+			reportStatus:![4,5].includes(this.form.type)?this.btn.value:this.btn.value==1?2:this.btn.value
       }
       this.$api.AuditTask(a).then(response => {
       //console.log(response);