lucky 4 mesiacov pred
rodič
commit
da55e221f9

+ 2 - 0
zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/AutomaticSchedulingOnSiteController.java

@@ -12,6 +12,7 @@ import com.zkqy.common.enums.BusinessType;
 import com.zkqy.common.utils.poi.ExcelUtil;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -44,6 +45,7 @@ public class AutomaticSchedulingOnSiteController extends BaseController
     public TableDataInfo list(AutomaticSchedulingOnSite automaticSchedulingOnSite)
     {
         startPage();
+//        StringUtils.
         List<AutomaticSchedulingOnSite> list = automaticSchedulingOnSiteService.selectAutomaticSchedulingOnSiteList(automaticSchedulingOnSite);
         return getDataTable(list);
     }

+ 6 - 6
zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/BpInspectionController.java

@@ -40,7 +40,7 @@ public class BpInspectionController extends BaseController
     /**
      * 查询白胚检验信息列表
      */
-    @PreAuthorize("@ss.hasPermi('system:inspection:list')")
+//    @PreAuthorize("@ss.hasPermi('system:inspection:list')")
     @GetMapping("/list")
     public TableDataInfo list(BpInspection bpInspection)
     {
@@ -52,7 +52,7 @@ public class BpInspectionController extends BaseController
     /**
      * 导出白胚检验信息列表
      */
-    @PreAuthorize("@ss.hasPermi('system:inspection:export')")
+//    @PreAuthorize("@ss.hasPermi('system:inspection:export')")
     @Log(title = "白胚检验信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BpInspection bpInspection)
@@ -65,7 +65,7 @@ public class BpInspectionController extends BaseController
     /**
      * 获取白胚检验信息详细信息
      */
-    @PreAuthorize("@ss.hasPermi('system:inspection:query')")
+//    @PreAuthorize("@ss.hasPermi('system:inspection:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -75,7 +75,7 @@ public class BpInspectionController extends BaseController
     /**
      * 新增白胚检验信息
      */
-    @PreAuthorize("@ss.hasPermi('system:inspection:add')")
+//    @PreAuthorize("@ss.hasPermi('system:inspection:add')")
     @Log(title = "白胚检验信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BpInspection bpInspection)
@@ -86,7 +86,7 @@ public class BpInspectionController extends BaseController
     /**
      * 修改白胚检验信息
      */
-    @PreAuthorize("@ss.hasPermi('system:inspection:edit')")
+//    @PreAuthorize("@ss.hasPermi('system:inspection:edit')")
     @Log(title = "白胚检验信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BpInspection bpInspection)
@@ -97,7 +97,7 @@ public class BpInspectionController extends BaseController
     /**
      * 删除白胚检验信息
      */
-    @PreAuthorize("@ss.hasPermi('system:inspection:remove')")
+//    @PreAuthorize("@ss.hasPermi('system:inspection:remove')")
     @Log(title = "白胚检验信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

+ 6 - 6
zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/BpLeaveFactoryController.java

@@ -40,7 +40,7 @@ public class BpLeaveFactoryController extends BaseController
     /**
      * 查询出厂检验列表
      */
-    @PreAuthorize("@ss.hasPermi('bpleavefactory:bpleavefactory:list')")
+//    @PreAuthorize("@ss.hasPermi('bpleavefactory:bpleavefactory:list')")
     @GetMapping("/list")
     public TableDataInfo list(BpLeaveFactory bpLeaveFactory)
     {
@@ -52,7 +52,7 @@ public class BpLeaveFactoryController extends BaseController
     /**
      * 导出出厂检验列表
      */
-    @PreAuthorize("@ss.hasPermi('bpleavefactory:bpleavefactory:export')")
+//    @PreAuthorize("@ss.hasPermi('bpleavefactory:bpleavefactory:export')")
     @Log(title = "出厂检验", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BpLeaveFactory bpLeaveFactory)
@@ -65,7 +65,7 @@ public class BpLeaveFactoryController extends BaseController
     /**
      * 获取出厂检验详细信息
      */
-    @PreAuthorize("@ss.hasPermi('bpleavefactory:bpleavefactory:query')")
+//    @PreAuthorize("@ss.hasPermi('bpleavefactory:bpleavefactory:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -75,7 +75,7 @@ public class BpLeaveFactoryController extends BaseController
     /**
      * 新增出厂检验
      */
-    @PreAuthorize("@ss.hasPermi('bpleavefactory:bpleavefactory:add')")
+//    @PreAuthorize("@ss.hasPermi('bpleavefactory:bpleavefactory:add')")
     @Log(title = "出厂检验", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BpLeaveFactory bpLeaveFactory)
@@ -86,7 +86,7 @@ public class BpLeaveFactoryController extends BaseController
     /**
      * 修改出厂检验
      */
-    @PreAuthorize("@ss.hasPermi('bpleavefactory:bpleavefactory:edit')")
+//    @PreAuthorize("@ss.hasPermi('bpleavefactory:bpleavefactory:edit')")
     @Log(title = "出厂检验", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BpLeaveFactory bpLeaveFactory)
@@ -97,7 +97,7 @@ public class BpLeaveFactoryController extends BaseController
     /**
      * 删除出厂检验
      */
-    @PreAuthorize("@ss.hasPermi('bpleavefactory:bpleavefactory:remove')")
+//    @PreAuthorize("@ss.hasPermi('bpleavefactory:bpleavefactory:remove')")
     @Log(title = "出厂检验", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

+ 6 - 6
zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/JlIncomingInspectionController.java

@@ -40,7 +40,7 @@ public class JlIncomingInspectionController extends BaseController
     /**
      * 查询进料日志详情列表
      */
-    @PreAuthorize("@ss.hasPermi('jl_inspection:inspection:list')")
+//    @PreAuthorize("@ss.hasPermi('jl_inspection:inspection:list')")
     @GetMapping("/list")
     public TableDataInfo list(JlIncomingInspection jlIncomingInspection)
     {
@@ -52,7 +52,7 @@ public class JlIncomingInspectionController extends BaseController
     /**
      * 导出进料日志详情列表
      */
-    @PreAuthorize("@ss.hasPermi('jl_inspection:inspection:export')")
+//    @PreAuthorize("@ss.hasPermi('jl_inspection:inspection:export')")
     @Log(title = "进料日志详情", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, JlIncomingInspection jlIncomingInspection)
@@ -65,7 +65,7 @@ public class JlIncomingInspectionController extends BaseController
     /**
      * 获取进料日志详情详细信息
      */
-    @PreAuthorize("@ss.hasPermi('jl_inspection:inspection:query')")
+//    @PreAuthorize("@ss.hasPermi('jl_inspection:inspection:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -75,7 +75,7 @@ public class JlIncomingInspectionController extends BaseController
     /**
      * 新增进料日志详情
      */
-    @PreAuthorize("@ss.hasPermi('jl_inspection:inspection:add')")
+//    @PreAuthorize("@ss.hasPermi('jl_inspection:inspection:add')")
     @Log(title = "进料日志详情", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody JlIncomingInspection jlIncomingInspection)
@@ -86,7 +86,7 @@ public class JlIncomingInspectionController extends BaseController
     /**
      * 修改进料日志详情
      */
-    @PreAuthorize("@ss.hasPermi('jl_inspection:inspection:edit')")
+//    @PreAuthorize("@ss.hasPermi('jl_inspection:inspection:edit')")
     @Log(title = "进料日志详情", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody JlIncomingInspection jlIncomingInspection)
@@ -97,7 +97,7 @@ public class JlIncomingInspectionController extends BaseController
     /**
      * 删除进料日志详情
      */
-    @PreAuthorize("@ss.hasPermi('jl_inspection:inspection:remove')")
+//    @PreAuthorize("@ss.hasPermi('jl_inspection:inspection:remove')")
     @Log(title = "进料日志详情", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

+ 7 - 7
zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/QualityinspectioninformationController.java

@@ -57,7 +57,7 @@ public class QualityinspectioninformationController extends BaseController
     /**
      * 查询质检信息列表
      */
-    @PreAuthorize("@ss.hasPermi('qualityinspectioninformation:qualityinspectioninformation:list')")
+//    @PreAuthorize("@ss.hasPermi('qualityinspectioninformation:qualityinspectioninformation:list')")
     @GetMapping("/list")
     public TableDataInfo list(Qualityinspectioninformation qualityinspectioninformation)
     {
@@ -69,7 +69,7 @@ public class QualityinspectioninformationController extends BaseController
     /**
      * 导出质检信息列表
      */
-    @PreAuthorize("@ss.hasPermi('qualityinspectioninformation:qualityinspectioninformation:export')")
+//    @PreAuthorize("@ss.hasPermi('qualityinspectioninformation:qualityinspectioninformation:export')")
     @Log(title = "质检信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, Qualityinspectioninformation qualityinspectioninformation)
@@ -82,7 +82,7 @@ public class QualityinspectioninformationController extends BaseController
     /**
      * 获取质检信息详细信息
      */
-    @PreAuthorize("@ss.hasPermi('qualityinspectioninformation:qualityinspectioninformation:query')")
+//    @PreAuthorize("@ss.hasPermi('qualityinspectioninformation:qualityinspectioninformation:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -92,7 +92,7 @@ public class QualityinspectioninformationController extends BaseController
     /**
      * 新增质检信息
      */
-    @PreAuthorize("@ss.hasPermi('qualityinspectioninformation:qualityinspectioninformation:add')")
+//    @PreAuthorize("@ss.hasPermi('qualityinspectioninformation:qualityinspectioninformation:add')")
     @Log(title = "质检信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody Qualityinspectioninformation qualityinspectioninformation)
@@ -103,7 +103,7 @@ public class QualityinspectioninformationController extends BaseController
     /**
      * 修改质检信息
      */
-    @PreAuthorize("@ss.hasPermi('qualityinspectioninformation:qualityinspectioninformation:edit')")
+//    @PreAuthorize("@ss.hasPermi('qualityinspectioninformation:qualityinspectioninformation:edit')")
     @Log(title = "质检信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody Qualityinspectioninformation qualityinspectioninformation)
@@ -114,7 +114,7 @@ public class QualityinspectioninformationController extends BaseController
     /**
      * 删除质检信息
      */
-    @PreAuthorize("@ss.hasPermi('qualityinspectioninformation:qualityinspectioninformation:remove')")
+//    @PreAuthorize("@ss.hasPermi('qualityinspectioninformation:qualityinspectioninformation:remove')")
     @Log(title = "质检信息", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
@@ -122,7 +122,7 @@ public class QualityinspectioninformationController extends BaseController
         return toAjax(qualityinspectioninformationService.deleteQualityinspectioninformationByIds(ids));
     }
 
-    @PreAuthorize("@ss.hasPermi('amichi:onSiteProgramDetails:add')")
+//    @PreAuthorize("@ss.hasPermi('amichi:onSiteProgramDetails:add')")
     @Log(title = "场内计划详情crud", businessType = BusinessType.INSERT)
     @PostMapping("/importExcelData")
     @ApiOperation(value = "导入Excel数据")

+ 1 - 0
zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/controller/RingTerminalController.java

@@ -137,4 +137,5 @@ public class RingTerminalController extends BaseController
     {
         return toAjax(ringTerminalService.deleteRingTerminalByIds(ids));
     }
+
 }

+ 0 - 1
zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/jd/service/impl/JdProductionOrderServiceImpl.java

@@ -163,7 +163,6 @@ public class JdProductionOrderServiceImpl implements JdProductionOrderService
                         "    \"Limit\": 5000,\n" +
                         "    \"SubSystemId\": \"\"\n" +
                         "}";
-                //
                 //查询结果
                 String resultJson = api.billQuery(query);
                 //生产信息

+ 1 - 1
zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/service/impl/RingScanInformationServiceImpl.java

@@ -63,7 +63,7 @@ public class RingScanInformationServiceImpl implements IRingScanInformationServi
         Map<String, List<RingScanInformationLogVo>> mapByOrderNumber = ringScanInformations.stream()
                 .collect(
                         Collectors.groupingBy(
-                                RingScanInformationLogVo::getProductionOrderNumber, LinkedHashMap::new, // 使用 LinkedHashMap 保持插入顺序
+                                RingScanInformationLogVo::getOrderNumber, LinkedHashMap::new, // 使用 LinkedHashMap 保持插入顺序
                                 Collectors.toList()));
         return mapByOrderNumber;
     }

+ 2 - 2
zkqy-fujian-amichi/src/main/java/com/zkqy/amichi/service/impl/StationInformationServiceImpl.java

@@ -471,7 +471,7 @@ public class StationInformationServiceImpl implements IStationInformationService
                            this.generateWarehouseWarrant(ringScanInformation.getProductionOrderNumber(),ringScanInformation.getProcessName(),"3");//生产订单号,工序名
                         }
                     }
-                    else if(materialId.startsWith("1")&&ringScanInformation.getProcessName().equals("入库")){//1卡头并且当前工序未包装,扫描信息为,更新包装数量
+                    else if(materialId.startsWith("1")&&ringScanInformation.getProcessName().equals("入库")){//1开头产品的入库逻辑
                         RingScanInformation ringScanInformation1=new RingScanInformation();
                         ringScanInformation1.setNativeNumbering(ringScanInformation.getNativeNumbering());
                         ringScanInformation1.setProcessName(ringScanInformation.getProcessName());//工序
@@ -484,7 +484,7 @@ public class StationInformationServiceImpl implements IStationInformationService
 //                            this.generateWarehouseWarrant(ringScanInformation.getProductionOrderNumber(),ringScanInformation.getProcessName());//生产订单号,工序名
                             this.generateWarehouseWarrant(ringScanInformation.getProductionOrderNumber(),ringScanInformation.getProcessName(),"1");
                         }
-                    }else if(materialId.startsWith("2")&&ringScanInformation.getProcessName().equals("入库")) {
+                    }else if(materialId.startsWith("2")&&ringScanInformation.getProcessName().equals("入库")) {  //2开头产品的入库逻辑
                         //有关于这个产品的扫描信息就不更新数量了
                         RingScanInformation ringScanInformation1=new RingScanInformation();
                         ringScanInformation1.setNativeNumbering(ringScanInformation.getNativeNumbering());

+ 2 - 1
zkqy-fujian-amichi/src/main/resources/mapper/RingScanInformationMapper.xml

@@ -238,7 +238,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sub.order_number,
         sub.process_name
         ORDER BY
-        rsif.start_time desc,sub.sort
+        sub.sort,
+        rsif.start_time desc
     </select>
 
 

+ 7 - 0
zkqy-ui/src/router/index.js

@@ -87,6 +87,13 @@ export const constantRoutes = [
     },
     hidden: true
   },
+  {
+    path: '/amichi/print/ygmPrint2',
+    component: () => {
+      return import('@/views/amichi/print/ygmPrint2.vue')
+    },
+    hidden: true
+  },
   {
     path: '/amichi/print/rkadyPrint',
     component: () => {

+ 171 - 142
zkqy-ui/src/views/amichi/print/ygmPrint.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="tools" style="width: 100%;height:80px;margin: 0 auto ">
+    <div class="tools" style="width: 100%;height:80px;margin: 0 auto">
       <div style="width:800px;height:80px;display: flex; justify-content: space-between; align-items: center;margin: 0 auto">
         <div style="width: 800px;height: 40px">
           <pagination
@@ -8,8 +8,8 @@
             :total="total"
             :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize"
-            @pagination="generateEmployeeCodeList"
-            :page-sizes="[9]"
+            @pagination="flowCardListApi"
+            :page-sizes="[5,10,30]"
           />
         </div>
         <div style="width: 200px;height: 40px">
@@ -18,26 +18,18 @@
       </div>
     </div>
     <div class="base" id="printView" >
-      <div class="box" style="page-break-after:always;margin-bottom: 10px">
-        <div class="ygmboxfj">
-          <!--卡片-->
-          <div class="ygmbox" v-for="(item,index) in listDate">
-            <div class="ygmbox_top">
-              <div class="tpdiv">
-                <img :src="item.images" style="width: 180px;height: 180px" alt="">
-              </div>
-            </div>
-            <div class="ygmbox_bottom">
-              <table  class="ygmbox_bottom_table">
-                <tr>
-                  <td  class="xingming">姓名</td>
-                  <td  class="xingmingValue">{{item.personnelName}}</td>
-                </tr>
-                <tr>
-                  <td class="gdName">工段</td>
-                  <td class="gdValue">{{item.processName}}</td>
-                </tr>
-              </table>
+      <!--      <div class="box" style="page-break-after:always;margin-top: 10px;">-->
+      <!--        <div  class="bj" v-for="(item,index) in listDate" style="margin-top: 20px">-->
+      <!--          <div class="erweima"><img :src="item.base46MaD"  alt=""></div>-->
+      <!--          <div class="xh">{{item.serialNumber}}</div>-->
+      <!--        </div>-->
+      <!--      </div>-->
+      <div class="fj">
+        <div class="abc" v-for="(item,index) in listDate" >
+          <div class="label-container">
+            <div class="content-inner">
+              <div id="qrcode1"><img :src="item.base46MaD"  :alt="item.serialNumber"></div>
+              <div class="order-number">{{item.serialNumber}}</div>
             </div>
           </div>
         </div>
@@ -47,18 +39,16 @@
 </template>
 
 <script>
-import {generateEmployeeCodeList} from "@/api/amichi/planTask/planTaskDetails.js";
-import Table from "@/views/dragform/tableList.vue";
+import {listInfoRkK} from "@/api/amichi/planTask/planTaskDetails.js";
 
 export default {
   name: "rkadyPrint",
-  components: {Table},
   data () {
     return {
       queryParams:{
         pageNum: 1,
-        pageSize: 9,
-        userIds:[],
+        pageSize: 30,
+        orderNumberList:[],
       },
       total:0,
       listDate:[],
@@ -91,24 +81,68 @@ export default {
     }
   },
   methods: {
+    getNextOrderNumber(index) {
+      if (index < this.listDate.length - 1) {
+        return this.listDate[index + 1];
+      } else {
+        return 0
+      }
+    },
+
     //渲染表格内容
-    async generateEmployeeCodeList(){
-      let res = await generateEmployeeCodeList(this.queryParams)
+    async flowCardListApi(){
+      let res = await listInfoRkK(this.queryParams)
       if (res.code == 200) {
         this.listDate = res.rows;
         this.total = res.total;
         this.isDataLoaded = true;
+        this.$nextTick(()=>{
+          this.adjustFontSize();
+          this.adjustFontSizebzxsm()
+        })
+
+      }
+    },
+
+    adjustFontSize() {
+      const element = this.$refs.bzx;
+      if (!element) return; // 如果元素不存在,直接返回
+
+      for (let i=0;i<element.length;i++) {
+        const maxHeight = 115;
+        let currentFontSize = 21;
+        while (element[i].scrollHeight > maxHeight && currentFontSize > 8) {
+          currentFontSize -= 0.5; // 每次减少0.5px
+          element[i].style.fontSize = `${currentFontSize}px`;
+        }
       }
+      console.log(element[0].style)
     },
+    adjustFontSizebzxsm() {
+      const element = this.$refs.bzxsm;
+      console.log(element.length)
+      if (!element) return; // 如果元素不存在,直接返回
+      for (let i=0;i<element.length;i++){
+        const maxHeight = 50;
+        let currentFontSize = 21;
+        while (element[i].scrollHeight > maxHeight && currentFontSize > 8) {
+          currentFontSize -= 0.5; // 每次减少0.5px
+          element[i].style.fontSize = `${currentFontSize}px`;
+        }
+      }
+
+      console.log(element[0].style)
+    }
   },
   mounted() {
+    // this.adjustFontSize();
   },
   created(){
-    this.queryParams.userIds =this.$route.query.orderNumberSTwo;
-    console.log(this.queryParams.userIds,"1111111111111");
-    // let obj={"userIds":this.queryParams.orderNumberList}
-    // console.log(obj)
-    this.generateEmployeeCodeList();
+    // console.log(this.$route.query.orderNumberS)
+    // this.queryParams.orderNumberList =this.$route.query.orderNumberS;
+    this.queryParams.orderNumberList =this.$route.query.orderNumberSTwo;
+    // console.log(this.queryParams.orderNumberList)
+    this.flowCardListApi();
   },
 }
 
@@ -117,123 +151,118 @@ export default {
 ::v-deep .pagination-container {
   margin-top: -10px;
 }
+body {
+  padding: 0;
+  margin: 0;
+  box-sizing: border-box;
+  background-color: #2c2b2b;
+}
+
+.fj {
+  width: 220mm;  /* 足够放下5个标签的宽度 */
+  margin: 20px auto;
+  display: flex;
+  flex-wrap: wrap;
+  gap: 10px;
+  justify-content: flex-start;
+}
+
+.abc {
+  width: 40mm;
+  height: 30mm;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top: 15px;
+}
+
+.label-container {
+  width: 38mm;
+  height: 28mm;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  box-sizing: border-box;
+  border: 1px dashed #000;
+  page-break-after: always;
+}
+
+.content-inner {
+  transform: rotate(270deg);
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  width: 38mm;
+  height: 28mm;
+  position: relative;
+}
+
+#qrcode1, #qrcode2, #qrcode3, #qrcode4, #qrcode5 {
+  width: 24mm;
+  height: 24mm;
+  margin: 0;
+  position: relative;
+  top: -0.5mm;
+}
+
+.order-number {
+  display: flex;
+  flex-direction: column;
+  font-size: 14px;
+  position: absolute;
+  right: -8mm;
+  top: 50%;
+  transform: translateY(-50%) rotate(90deg);
+  line-height: 1.2;
+  background: white;
+}
+
 @media print {
-  /* 隐藏页眉页脚 */
-  @page {
-    margin: 0 auto;
-    size: auto;
-    .box{
-      margin-top: 10px;
-    }
+  .fj {
+    width: 40mm;
+    margin: 0;
+    gap: 0;
   }
-  html {
-    zoom: 100%; /* 缩放比例设置 */
+
+  @page {
+    size: 40mm 30mm;
+    margin: 0;
   }
-  .noprint {
-    display: none; /* 隐藏打印区域不需要打印的内容 */
+
+  body {
+    width: 40mm;
+    margin: 0;
+    padding: 0;
   }
-}
-.base {
-  .page-break {
+
+  .abc {
+    width: 40mm;
+    height: 30mm;
+    margin: 0;
     page-break-after: always;
-    position: relative;
+    overflow: hidden;
+    margin-top: 0px;
   }
 
-  .tools {
-    margin-top: 10px;
-    display: flex;
-    justify-content: flex-end;
-    margin-bottom: 10px;
+  .label-container {
+    border: 1px dashed #000;
+    transform: scale(0.95);
   }
 
-  .box {
-    font-size: 21px;
-    width: 800px;
-    //border: 1px solid red;
-    margin-bottom: 10px;
-    margin: 0 auto;
-
-    .ygmboxfj {
-      width: 800px;
-      margin: 0 auto;
-      display: flex;
-      //border: 1px solid red;
-      justify-content: flex-start;
-      flex-wrap: wrap;
-
-      .ygmbox {
-        width: 240px;
-        height: 315px;
-        border: 2px solid black;
-        margin-top: 20px;
-        //overflow: hidden;
-         margin-left: 19px;
-        .ygmbox_top {
-          //overflow: hidden;
-          width: 180px;
-          height: 180px;
-          margin: 0 auto;
-          margin-top: 30px;
-
-          .tpdiv {
-            width: 180px;
-            height: 180px;
-            //border: 1px solid gold;
-            margin-top: 27px;
-          }
-        }
+  .content-inner {
+    transform: rotate(270deg);
+  }
 
-        .ygmbox_bottom {
-          width: 240px;
-          height: 86px;
-          //background-color: red;
-          margin-top: 26px;
-
-          .ygmbox_bottom_table {
-            width: 99%;
-            text-align: center;
-            border-left: 0px;
-            border-right: 0px;
-            border-bottom: 0px;
-
-            tr {
-              td {
-                height: 38px;
-              }
-
-              .xingming {
-                width: 30%;
-                border-top: 2px solid black;
-                border-bottom: 2px solid black;
-                border-right: 2px solid black
-              }
-
-              .xingming {
-                width: 30%;
-                border-top: 2px solid black;
-                border-bottom: 2px solid black;
-                border-right: 2px solid black
-              }
-
-              .xingmingValue {
-                width: 40%;
-                border-top: 2px solid black;
-                border-bottom: 2px solid black
-              }
-
-              .gdName {
-                width: 20%;
-                border-right: 2px solid black
-              }
-
-              .gdValue {
-                width: 30%;
-              }
-            }
-          }
-        }
-      }
-    }
+  .order-number {
+    display: block;
+    position: static;
+    transform: none;
+    margin-top: 2mm;
+    text-align: center;
+    font-size: 17px;
+    background: none;
+    color: black;
+    font-weight: bold;
   }
 }
 </style>

+ 24 - 0
zkqy-ui/src/views/amichi/stationInformation/indexCopyV4.vue

@@ -86,6 +86,15 @@
           icon="el-icon-plus"
           size="mini"
           @click="dyygmxi"
+        >A4打印员工码信息</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="dyygmxirkkdx"
         >打印员工码信息</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -305,6 +314,21 @@ export default {
     this.getList();
   },
   methods: {
+    //入库卡大小
+    dyygmxirkkdx(){
+      console.log("入库卡大小")
+      if(this.personnelId.length<=0){
+        console.log("请先勾选对应数据");
+        this.$message.warning("请先勾选对应数据");
+        return;
+      }
+      this.$router.push({
+        path: '/amichi/print/ygmPrint2',
+        query: {
+          "orderNumberSTwo": this.personnelId,
+        }
+      });
+    },
     dyygmxi(){
       if(this.personnelId.length<=0){
         console.log("请先勾选对应数据");

+ 22 - 2
zkqy-ui/src/views/amichi/system/user/index.vue

@@ -37,10 +37,19 @@
           v-show="showSearch"
           label-width="68px"
         >
-          <el-form-item label="用户名称" prop="userName">
+          <el-form-item label="登录账号" prop="userName">
             <el-input
               v-model="queryParams.userName"
-              placeholder="请输入用户名称"
+              placeholder="请输入登录账号"
+              clearable
+              style="width: 240px"
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+          <el-form-item label="用户昵称" prop="userName">
+            <el-input
+              v-model="queryParams.nickName"
+              placeholder="请输入用户昵称"
               clearable
               style="width: 240px"
               @keyup.enter.native="handleQuery"
@@ -116,6 +125,17 @@
               >新增
             </el-button>
           </el-col>
+          <el-col :span="1.5">
+            <el-button
+              type="primary"
+              plain
+              icon="el-icon-plus"
+              size="mini"
+              @click="handleAdd"
+              v-hasPermi="['system:user:add']"
+            >打印员工二维码
+            </el-button>
+          </el-col>
           <!-- <el-col :span="1.5">
             <el-button
               type="success"