wenningning 2 months ago
parent
commit
44f7ec3a3c

+ 1 - 1
manager-admin/src/views/dashboard/index.vue

@@ -11,7 +11,7 @@
     <el-divider></el-divider>
     <el-card>
       <div>
-        <b>202500422-wnn</b>
+        <b>20250422-wnn</b>
         <p>- 在订单明细-生成发货情况,增加打印签收单功能</p>
         <b>20250103-wnn</b>
         <p>- 订单里面的服务相关信息重新梳理</p>

+ 16 - 16
manager-admin/src/views/pjOrder/shipped.vue

@@ -99,9 +99,9 @@
           label="本次发货数量"
           width="150">
           <template slot-scope="scope">
-            <el-input-number 
-              v-model="scope.row.printQty" 
-              :min="1" 
+            <el-input-number
+              v-model="scope.row.printQty"
+              :min="1"
               :max="scope.row.qty"
               size="small"
               controls-position="right"
@@ -210,7 +210,7 @@
       </div>
       <div style="margin-top: 15px;">
         <div style="display: flex; justify-content: center; margin-bottom: 5px;">
-          <div style="width: 33.33%; text-align: left;">货负责:{{ adminUser.realname }}</div>
+          <div style="width: 33.33%; text-align: left;">货负责:{{ adminUser.realname }}</div>
           <div style="width: 33.33%; text-align: left;">下单:{{ orderInfo.sales || '未填写' }}</div>
           <div style="width: 33.33%; text-align: left;">电话:0755-83204332</div>
         </div>
@@ -333,7 +333,7 @@ export default {
         printRemark: item.remark || ''
       }))
       this.orderItems = items
-      
+
       // 初始化打印表单数据
       const today = new Date()
       const year = today.getFullYear()
@@ -343,7 +343,7 @@ export default {
         shipped_time: `${year}-${month}-${day}`,
         address: this.orderInfo.address || ''
       }
-      
+
       this.printDialogVisible = true
     },
     handleSelectionChange(val) {
@@ -381,31 +381,31 @@ export default {
           <head>
             <title>签收单</title>
             <style>
-              body { 
+              body {
                 font-family: Arial, sans-serif;
                 font-size: 12px;
                 margin: 0;
                 padding: 5mm;
               }
-              table { 
-                width: 100%; 
+              table {
+                width: 100%;
                 border-collapse: collapse;
                 font-size: 11px;
               }
-              th, td { 
-                border: 1px solid #000; 
-                padding: 2px; 
-                text-align: center; 
+              th, td {
+                border: 1px solid #000;
+                padding: 2px;
+                text-align: center;
               }
-              h2 { 
+              h2 {
                 font-size: 16px;
                 margin: 5px 0;
               }
-              h3 { 
+              h3 {
                 font-size: 14px;
                 margin: 5px 0;
               }
-              p { 
+              p {
                 margin: 5px 0;
                 font-size: 11px;
               }