Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/PrintPageN.vue

@@ -56,6 +56,16 @@
                     <my-RVB-Bill :loopNumN="loopNumN" :disabled.sysc="disabled1" v-on:helloPP="numAdd" :Num="num" :ID="id" :width="widthSon" :isPrintPage="true" :OrderSource="OrderSource" :color="colorSon" :name='index+1'></my-RVB-Bill>
                 </div>
             </template>
+            <template v-else-if="type==='1'&&(Merge==='1'&&hedan==1)">
+                <div class="SetDiv">
+                    <span v-if="Merge==='1' " @click="goUrl(1)">切换</span>
+                    <span @click="disabled1=false">编辑</span>
+                    <span @click="disabled1=true">保存</span>
+                </div>
+                <div class="_border_1" v-for="(item,index) in 1">
+                    <my-RVB-Bill :loopNumN="loopNumN" :disabled.sysc="disabled1" v-on:helloPP="numAdd" :Num="num" :ID="id" :width="widthSon" :isPrintPage="true" :OrderSource="OrderSource" :color="colorSon" :name='index+1'></my-RVB-Bill>
+                </div>
+            </template>
             <template v-if="type==='7'&&(Merge==='0'||Merge===null)">
                 <div class="_border_1" v-for="(item,index) in loopNumT">
                     <my-GZ-Bill :ID="id" :width="widthSon" :isPrintPage="true" :color="colorSon" :OrderSource="OrderSource" :name='index+1'></my-GZ-Bill>