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

RMS-FrontEnd/src/views/components/articles/index.vue

@@ -379,7 +379,7 @@ export default {
   methods: {
     // 返回
     goBack() {
-      this.$router.push({
+      this.$router.replace({
         path: '/admin/task/MyHandle',
       })
     },

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

@@ -490,6 +490,6 @@
   
 <style>
 .red{
-    background: #e99385 !important;
+    background: #f4b8ae !important;
   }
   </style>

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

@@ -100,7 +100,7 @@
             </el-form-item>
 
         </el-form>
-        <span slot="footer" class="dialog-footer" v-if="form.taskStatus==0">
+        <span slot="footer" class="dialog-footer" v-if="form.taskStatus!=1">
               <el-button @click="handleClose">取 消</el-button>
               <el-button type="primary" @click="submit" >确认</el-button>
         </span>