62

src/views/ChipPrintScreen/ChipPrintScreen.vue

@@ -232,9 +232,12 @@
       <Modal
         class="selection-modal"
         v-model="selectionModal"
-        :title="currencySelectedObj.title"
+        
         width="80%"
       >
+      <div slot="header">
+        <h1>{{currencySelectedObj.title}}</h1>
+      </div>
         <van-number-keyboard
           :show="show"
           @blur="show = false"
@@ -562,9 +565,12 @@
         class="selection-modal"
         v-model="roomModal"
         @on-cancel ='handleRoomCancel'
-        title="选择房间号"
+        
         width="80%"
       >
+      <div slot="header">
+        <h1>选择房间号</h1>
+      </div>
         <div class="selection-modal-body">
           <div
             :class="[
@@ -577,7 +583,7 @@
             @click="handleSelectedRoomClick(modalRoomList, block)"
           >
             <div>
-              <span>{{ block.house }}</span>
+              <span style="font-size:25px">{{ block.house }}</span>
             </div>
           </div>
         </div>
@@ -589,18 +595,19 @@
             :total="modal_room_total"
           />
         </div>
-        <div slot="footer">
+        <div slot="footer" style="display:flex;justify-content: space-around;">
           <Button
             @click="handleRoomCancel"
             type="primary"
-            style="margin-right: 10px"
+            style="margin-right: 10px;width:20%;height:60px;font-size:29px"
           >
             返回
           </Button>
-           <Button @click="handlePrintComfirm(selectedObj, 1)" type="primary">
+           <Button @click="handlePrintComfirm(selectedObj, 1)" type="primary"
+           style="width:20%;height:60px;font-size:29px">
             芯片打印
           </Button>
-          <Button @click="Print(selectedObj, 1)" type="primary">
+          <Button @click="Print(selectedObj, 1)" type="primary" style="width:20%;height:60px;font-size:29px">
             标签打印
           </Button>
          
@@ -1243,6 +1250,9 @@ export default {
         this.selectedInfo.order_no = this.chooseOrderNo.order_no;
         this.selectedInfo.residential_name = this.chooseOrderNo.residential_name;
         this.selectionModal = false;
+        this.selectedAll = false;
+        this.contentData = [];
+        this.selectedInfo.url_number = '';
         row.list.map(v=>{
           if(v.isCurrent){
                order_no = v.order_no;
@@ -1250,6 +1260,7 @@ export default {
         })
        this.handleGetType(order_no);
       } else if (row.type == 2) {
+        this.selectedAll = false;
         this.selectedInfo.url_number = this.chooseUrlNo.url_number;
         this.selectedInfo.product_id = this.chooseUrlNo.product_id;
         this.selectionDetailModal = false;

src/views/ChipPrintScreen/ChipPrintScreenCheck.vue

@@ -1524,16 +1524,17 @@ export default {
     border-bottom: 1px solid #e8eaec;
     .fullscreen-content-select-block {
       display: flex;
-      justify-content: center;
+      justify-content: flex-start;
       align-items: center;
     }
     .fullscreen-content-select-block:nth-child(1) {
       width: 30%;
     }
     .fullscreen-content-select-block:nth-child(2) {
-      width: 20%;
+      width: 30%;
     }
     .fullscreen-content-select-block:nth-child(3) {
+      width:30%
     }
   }
   .fullscreen-content-choose {