打包倍思特

src/routerMap/index.js

@@ -1002,12 +1002,13 @@ const routerMap = [
       ], resolve),
   },
   // 2021年06月22日09:39:50
+  //2021年12月17日
   {
     path: "/cms/PurchasingManage/RequisitionOrder/list",
-    name: "RequisitionOrderList", //采购模块-->请购单列表
+    name: "RequisitionOrderList", //采购模块-->请购单列表(现改称采购计划)
     meta: {
       index: 3,
-      keepAlive: true,
+      // keepAlive: true,
     },
     component: (resolve) =>
       require(["@/views/PurchasingManage/RequisitionOrder/list"], resolve),
@@ -1026,7 +1027,7 @@ const routerMap = [
     name: "PurchasingOrderList", //采购模块-->采购单列表
     meta: {
       index: 3,
-      keepAlive: true,
+      // keepAlive: true,
     },
     component: (resolve) =>
       require(["@/views/PurchasingManage/PurchasingOrder/list"], resolve),

src/views/ChipPrintScreen/ChipPrintScreen.vue

@@ -274,6 +274,7 @@
             v-for="(block, index) in currencySelectedObj.list"
             :key="index"
             @click="handleSelectionClick(currencySelectedObj, block)"
+            style="font-size:1.4em"
           >
             <div v-show="currencySelectedObj.type == 1">
               <span>订单编号：</span>
@@ -312,11 +313,11 @@
             "
           />
         </div>
-        <div slot="footer">
+        <div slot="footer" style="text-align:center">
           <Button
             @click="selectionModal = false"
             type="primary"
-            style="margin-right: 10px"
+            style="margin-right: 10px;width:30%;height:1rem;font-size:2em"
           >
             返回
           </Button>
@@ -332,9 +333,10 @@
       <Modal
         class="selection-modal"
         v-model="selectionDetailModal"
-        :title="currencySelectedObj.title"
+       
         width="80%"
       >
+      <div slot="header"><h1>{{currencySelectedObj.title}}</h1></div>
         <div class="selection-modal-body" v-if="currencySelectedObj.hasChild">
           <div
             :class="[
@@ -345,20 +347,21 @@
             v-for="(block, index) in chooseDetailUrlNo.children"
             :key="index"
             @click="handleSelectionDetailClick(chooseDetailUrlNo, block)"
+            style="font-size: 1.4em;"
           >
             <div>
               <span>{{ block.url_number }}</span>
             </div>
           </div>
         </div>
-        <div slot="footer">
+        <div slot="footer" style='text-align:center'>
           <Button
             @click="
               selectionDetailModal = false;
               selectionModal = true;
             "
             type="primary"
-            style="margin-right: 10px"
+            style="margin-right: 10px;width:30%;height:1rem;font-size:2em"
           >
             返回
           </Button>
@@ -373,9 +376,10 @@
       <Modal
         class="selection-rowno-modal"
         v-model="selectionRownolModal"
-        title="行号选择"
+       
         width="80%"
       >
+      <div slot="header"><h1>行号选择</h1></div>
         <div class="selection-rowno-modal-body">
           <van-number-keyboard
             :show="show2"
@@ -389,7 +393,7 @@
             v-for="(block, index) in chooseLineNo"
             :key="index"
           >
-            <span>行号区间：</span>
+            <span style="font-size:2em;">行号区间：</span>
             <Input
               v-model="block.start"
               @on-focus="handleRowNoInput(block, 1)"
@@ -425,15 +429,16 @@
             </Button>
           </div>
         </div>
-        <div slot="footer">
+        <div slot="footer" style="text-align:center">
           <Button
             @click="selectionRownolModal = false"
             type="primary"
-            style="margin-right: 10px"
+            style="margin-right: 10px;width:30%;height:1rem;font-size:2em"
           >
             返回
           </Button>
-          <Button @click="handleRowNoComfirm(chooseLineNo)" type="primary">
+          <Button @click="handleRowNoComfirm(chooseLineNo)" type="primary"
+          style="margin-right: 10px;width:30%;height:1rem;font-size:2em">
             确认
           </Button>
         </div>
@@ -669,7 +674,7 @@
       </Modal>
     </Modal>
     <div ref='printRow' class="printRow">
-      <div v-for="(item,index) in tagPrintList" :key="index" class="printRow_content" style="width:300px">
+      <div v-for="(item,index) in tagPrintList" :key="index" class="printRow_content" style="width:400px">
       <div style="display:flex"><span style="width:140px">项目：{{item.client_name}}</span><span>区域：{{item.house ? item.house + "-" : ""}}{{item.layer ? item.layer : ""}}{{item.position ? item.position : ""}}</span></div>
       <div style="display:flex"><span style="width:140px">房号：{{item.number_detail}}</span><span>产品：{{item.product_title}}</span></div>
       <div style="display:flex"><span style="width:140px">图号：{{item.url_number}}</span><span>部件：{{item.part_title}}</span></div>
@@ -2143,6 +2148,8 @@ export default {
 }
 .selection-rowno-modal {
   .selection-rowno-modal-body {
+    max-height: 7rem;
+    overflow: auto;
     .selection-rowno-modal-body-block {
       margin: 0.5rem 0;
       text-align: center;
@@ -2250,8 +2257,15 @@ export default {
         .printRow{
             display: block;
             width: 100%;
+            margin-top: 10mm;
             .printRow_content{
               page-break-after: always;
             }
-        }}
+        }
+               @page{
+
+margin:10mm 1mm
+
+}
+        }
 </style>

src/views/ChipPrintScreen/ChipPrintScreenCheck.vue

@@ -402,9 +402,10 @@
     <Modal
       class="selection-print-modal"
       v-model="printModal"
-      title="打印"
+     
       width="60%"
     >
+     <div slot="header" style="text-align:center;font-weight:bold"><h1>打  印</h1></div>
       <div class="selection-print-modal-body">
         <div class="selection-print-modal-body-top">
           <div>
@@ -456,7 +457,7 @@
           </div>
         </div>
       </div>
-      <div slot="footer">
+      <div slot="footer" class="selection-print-modal-body-footer">
         <Button
           @click="printModal = false"
           type="primary"
@@ -465,8 +466,11 @@
           返回
         </Button>
         <Button @click="handlePrintComfirm(selectedObj)" type="primary">
-          确认
-        </Button>
+            芯片打印
+          </Button>
+          <Button @click="Print(selectedObj)" type="primary">
+            标签打印
+          </Button>
       </div>
     </Modal>
     <Modal
@@ -500,20 +504,34 @@
           :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>
+       <Button @click="handlePrintComfirm(selectedObj, 1)" type="primary"
+           style="width:20%;height:60px;font-size:29px">
+            芯片打印
+          </Button>
+          <Button @click="Print(selectedObj, 1)" type="primary" style="width:20%;height:60px;font-size:29px">
+            标签打印
+          </Button>
       </div>
     </Modal>
-  </Modal></div>
+  </Modal>
+   <div ref='printRow' class="printRow">
+      <div v-for="(item,index) in tagPrintList" :key="index" class="printRow_content" style="width:380px">
+      <div style="display:flex"><span style="width:140px">项目：{{item.client_name}}</span><span>区域：{{item.house ? item.house + "-" : ""}}{{item.layer ? item.layer : ""}}{{item.position ? item.position : ""}}</span></div>
+      <div style="display:flex"><span style="width:140px">房号：{{item.number_detail}}</span><span>产品：{{item.product_title}}</span></div>
+      <div style="display:flex"><span style="width:140px">图号：{{item.url_number}}</span><span>部件：{{item.part_title}}</span></div>
+      <div><span>尺寸：{{item.measure}}</span></div>
+      <div><span>木皮：{{item.color_title}}</span></div>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
@@ -529,6 +547,7 @@ export default {
   data() {
     // 这里存放数据
     return {
+      tagPrintList:[],
       show: false,
       show2: false,
       show3: false,
@@ -598,6 +617,50 @@ export default {
     this.getChipDetail();
   },
   methods: {
+     Print(row,type){
+       if (
+        type &&
+        this.modalRoomListSelected.length != this.selectedObj.print_num
+      ) {
+        return this.$Message.warning("与打印数量不符");
+      }
+      let ids = this.modalRoomListSelected.map((v) => {
+        return v.id;
+      });
+      let data = type
+        ? {
+            order_no: this.selectedInfo.order_no,
+            product_id: this.selectedInfo.product_id,
+            rows: this.selectedInfo.rows,
+            num: this.selectedObj.print_num,
+            id: row.id,
+            ids,
+            type,
+          }
+        : {
+            order_no: this.selectedInfo.order_no,
+            product_id: this.selectedInfo.product_id,
+            rows: this.selectedInfo.rows,
+            num: this.selectedObj.print_num,
+            id: row.id,
+          };
+      // 获取打印数据
+      this.axios({
+        method: "post",
+        url: "/api/station_print",
+        data,
+      }).then((resp) => {
+        if (resp.code == 200) {
+          console.log(resp)
+          this.tagPrintList = resp.data;
+          setTimeout(()=>{
+               this.$print(this.$refs.printRow);
+          })
+         
+        }
+        });
+       
+    },
      cancel(){
        this.fullscreenModals = false;
        this.$forceUpdate();
@@ -1232,19 +1295,19 @@ export default {
     keyboardPrintTap(value) {
       let max = this.selectedObj.on_print + this.selectedObj.un_print;
       this.selectedObj.print_num =
-        (this.selectedObj.print_num ? this.selectedObj.print_num : "") +
+          Number((this.selectedObj.print_num ? this.selectedObj.print_num : "") +
         "" +
-        value;
+        value);
       if (this.selectedObj.print_num * 1 > max) {
         this.selectedObj.print_num = max;
       }
       this.$forceUpdate();
     },
     keyboardPrintDele() {
-      this.selectedObj.print_num = (this.selectedObj.print_num + "").substring(
+    this.selectedObj.print_num = Number((this.selectedObj.print_num + "").substring(
         0,
         this.selectedObj.print_num.length - 1
-      );
+      ));
       this.$forceUpdate();
     },
     keyboardTap(value) {
@@ -1646,6 +1709,8 @@ export default {
 }
 .selection-rowno-modal {
   .selection-rowno-modal-body {
+    font-size: 0.5rem;
+    height: 4.5rem;
     .selection-rowno-modal-body-block {
       margin: 0.5rem 0;
       text-align: center;
@@ -1664,9 +1729,21 @@ export default {
       padding-top: 16px;
       border-top: 1px solid #e8eaec;
       text-align: center;
+        button{
+         height: 2em;
+      font-size: 1em;
     }
   }
-}
+   .selection-print-modal-body-footer{
+    height: 1rem;
+    display: flex;
+    justify-content: space-around;
+    button{
+      height: 1.5em;
+      font-size: 3em;
+    }
+  }
+}}
 .icon-wrapper {
   position: relative;
   font-size: 0.25rem;
@@ -1722,4 +1799,22 @@ export default {
     background-color: #2d8cf0;
   }
 }
+.printRow{
+  display: none;
+}
+@media print {
+        .printRow{
+            display: block;
+            width: 100%;
+             margin-top: 10mm;
+            .printRow_content{
+              page-break-after: always;
+            }
+        }
+        @page{
+
+margin:10mm 1mm
+
+}
+        }
 </style>

src/views/PurchasingManage/RequisitionOrder/list.vue

@@ -1,6 +1,6 @@
   <template>
   <div class="requisition_order">
-    <Toptitle title="请购列表">
+    <Toptitle title="采购计划">
       <slot name="titleButton">
         <!-- <Button @click="handleCodeRule"
                 type="primary"

src/views/leadMatch/MatchList/matchCheck.vue

@@ -354,6 +354,8 @@ export default {
       matchedSheetTableColumns: [
         { title: "序号", align: "center", type: "index", resizable: true,
                         width: 100 },
+         { title: "组合名称", align: "center", key:'compose_name', resizable: true,
+                        width: 100 },
         { title: "区域名称", align: "center", key: "region",  resizable: true,
                         width: 160 },
         { title: "房号", align: "center", key: "house_number",  resizable: true,

src/views/leadMatch/MatchList/matchList.vue

@@ -237,7 +237,7 @@ export default {
   padding-top: 20px;
 }
 .match_list{
-  height:620px;
+  height:80%;
   overflow: hidden;
 }
 /deep/ .ivu-col{

src/views/leadMatch/MatchList/matchPage.vue

@@ -816,6 +816,7 @@ export default {
           },
         },
         { title: "序号", align: "center", type: "index", minWidth: 60 },
+          { title: "组合名称", align: "center", key: "compose_name", minWidth: 100 },
         { title: "部件名称", align: "center", key: "part_name", minWidth: 100 },
         { title: "行号", align: "center", key: "line", minWidth: 70 },
         { title: "木皮1", align: "center", key: "skin1", minWidth: 60 },
@@ -865,6 +866,7 @@ export default {
       matchedSheetTableColumns: [
         // { title: "全选", align: "center", minWidth: 60, type: "selection" },
         { title: "序号", align: "center", type: "index", minWidth: 60 },
+         { title: "组合名称", align: "center", key:'compose_name', minWidth: 100 },
         { title: "区域名称", align: "center", key: "region", minWidth: 100 },
         { title: "房号", align: "center", key: "house_number", minWidth: 100 },
         { title: "部件名称", align: "center", key: "part_name", minWidth: 100 },

src/views/leadMatch/roomList/list.vue

@@ -175,7 +175,7 @@ export default {
 </script>
 <style scoped lang='scss'>
 .weight_memo_content{
-    height: 650px;
+    height: 80%;
     overflow: auto;
 }
 .content_body_page{

src/views/leadMatch/weightMemo/edit.vue

@@ -119,6 +119,8 @@ export default {
       tableColumns:[
             { title: "序号", type:'index', align: "center",resizable: true,
                         width: 100 },
+                { title: "组合名称", key:'compose_name', align: "center",resizable: true,
+                        width: 100 },
               { title: "部件名称", key: "part_title", align: "center",resizable: true,
                         width: 140 },
                 { title: "行号", key: "line_number", align: "center", resizable: true,

src/views/leadMatch/weightMemo/list.vue

@@ -172,7 +172,7 @@ export default {
 </script>
 <style scoped lang='scss'>
 .weight_memo_content{
-    height: 650px;
+    height: 80%;
     overflow: auto;
 }
 .content_body_page{