Merge branch 'master' of http://192.168.0.115:3000/chenzhiguang/xinjiang_army

new_backstage/src/components/editcomponent/editcon.vue

@@ -11,7 +11,7 @@
     <el-footer class="footer">
       <template v-if="staStr=='草稿中'||staStr=='审核不通过'">
         <el-button @click="$emit('cancel')">取消</el-button>
-        <el-button :type="($route.params.id&&$route.params.id=='none')?'primary':''" @click="$emit('save')">保存</el-button>
+        <el-button :type="($route.params.id&&$route.params.id=='none')?'primary':''" @click="$emit('save')" v-show="form.status!==3">保存</el-button>
         <el-button v-if="$route.params.id&&$route.params.id!='none'" @click="$emit('submit')" type="primary">提交</el-button>
       </template>
     

new_backstage/src/components/table/index.vue

@@ -86,7 +86,8 @@
             <span v-if="scope.row.status==1 && activeSub['审核']" class="o-span" @click="audit(scope.row)">审核</span>
 
             <!-- 审核不通过||草稿中 -->
-            <span v-if="(scope.row.status==2||scope.row.status==0) && activeSub['编辑']" class="o-span" @click="goto(scope.row)">编辑</span> 
+            <!-- <span v-if="(scope.row.status==2||scope.row.status==0) && activeSub['编辑']" class="o-span" @click="goto(scope.row)">编辑</span>  -->
+            <span v-if="activeSub['编辑']" class="o-span" :class="{disabletxt:scope.row.display}" @click="goto({...scope.row,status:0})">编辑</span> 
 
              <!-- 草稿中且有删除权限 -->  
             <span v-if="activeSub['删除']" :class="{disabletxt:scope.row.display}" class="o-span" @click="$emit('del',{item:scope.row,type})">删除</span>