打印

src/views/warehouseBusiness/inStock/index.vue

@@ -743,7 +743,7 @@
                 :disabled="contrOl || browseStatus"
               >
                 <el-option
-                  v-for="(dict,index) in businessTypeOption"
+                  v-for="(dict, index) in businessTypeOption"
                   :key="index.dictValue"
                   :label="dict.dictLabel"
                   :value="dict.dictValue"
@@ -2002,7 +2002,7 @@
                   disabled
                 >
                   <el-option
-                    v-for="(dict,index) in businessTypeOption"
+                    v-for="(dict, index) in businessTypeOption"
                     :key="index.dictValue"
                     :label="dict.dictLabel"
                     :value="dict.dictValue"
@@ -2101,7 +2101,7 @@
                   :disabled="browseStatus"
                 >
                   <el-option
-                    v-for="(dict,index) in fStltypeOptions"
+                    v-for="(dict, index) in fStltypeOptions"
                     :key="index.dictValue"
                     :label="dict.dictLabel"
                     :value="parseInt(dict.dictValue)"
@@ -2370,7 +2370,7 @@
                   disabled
                 >
                   <el-option
-                    v-for="(dic,index) in businessTypeOption"
+                    v-for="(dic, index) in businessTypeOption"
                     :key="index.dictValue"
                     :label="dict.dictLabel"
                     :value="dict.dictValue"
@@ -2472,7 +2472,7 @@
                   :disabled="browseStatus"
                 >
                   <el-option
-                    v-for="(dic,index) in fStltypeOptions"
+                    v-for="(dic, index) in fStltypeOptions"
                     :key="index.dictValue"
                     :label="dict.dictLabel"
                     :value="parseInt(dict.dictValue)"
@@ -2837,7 +2837,7 @@
                 clearable
               >
                 <el-option
-                  v-for="(dic,index) in jFeetunitOptions"
+                  v-for="(dic, index) in jFeetunitOptions"
                   :key="index.dictValue"
                   :label="dict.dictLabel"
                   :value="dict.dictValue"
@@ -3258,63 +3258,86 @@
         <div id="print_area1" class="print-div">
           <div
             class="print-title"
-            style="display: flex; justify-content: center; font-size: 24px;margin-bottom:5px"
+            style="
+              display: flex;
+              justify-content: center;
+              font-size: 24px;
+              margin-bottom: 5px;
+            "
           >
-            {{ company }}有限公司作业单
+            {{ company }}有限公司
           </div>
           <div
             class="print-title2"
-            style="display: flex; justify-content: center; font-size: 18px;margin-bottom:5px"
+            style="
+              display: flex;
+              justify-content: center;
+              font-size: 18px;
+              margin-bottom: 5px;
+            "
           >
             <div>入&nbsp;库&nbsp;计&nbsp;划&nbsp;单</div>
           </div>
-          <div style="display: flex; justify-content: space-around;margin-bottom:5px">
+          <div
+            style="
+              display: flex;
+              justify-content: space-around;
+              margin-bottom: 5px;
+            "
+          >
             <div>
-              <div>提单号：{{form.fMblno}}</div>
-              <div>客户名称：{{form.fCorpid}}</div>
-              <div>货物名称：{{form.fGoodsid}}</div>
-              <div>预计净重：{{form.fPlannetweight}}</div>
+              <div>提单号：{{ form.fMblno }}</div>
+              <div>客户名称：{{ form.fCorpidName }}</div>
+              <div>货物名称：{{ form.fGoodsid }}</div>
+              <div>预计净重：{{ form.fPlannetweight }}</div>
             </div>
             <div>
-              <div>入库计划单号：</div>
-              <div>计划入库日期：{{form.fBsdate}}</div>
-              <div>制单日期：</div>
+              <div>入库计划单号：{{ form.fBillno }}</div>
+              <div>计划入库日期：{{ form.fBstime }}</div>
+              <div>制单日期：{{ warehouseOptions[0].createTime }}</div>
               <div>实际毛重：</div>
             </div>
             <div>
               <div>清单号：</div>
-              <div>存放仓库：{{form.fWarehouseid}}</div>
-              <div>预计毛重：{{form.fPlangrossweight}}</div>
+              <div>
+                存放仓库：{{ warehouseOptions[0].fWarehouseInformation }}
+              </div>
+              <div>预计毛重：{{ form.fPlangrossweight }}</div>
               <div>实际净重：</div>
             </div>
           </div>
-          <div style="display:flex">
-            <table class="print_table" border="1" cellspacing="0" cellpadding="0" style="width:100%">
+          <div class="print_table" style="display: flex">
+            <table
+              border="0"
+              cellspacing="0"
+              cellpadding="0"
+              style="width: 100%"
+            >
               <tr>
-                <th>箱号</th>
-                <th>铅封号</th>
-                <th>预计件数</th>
-                <th>实际件数</th>
-                <th>垛位</th>
-                <th>实际入库日期</th>
-                <th>送货车号</th>
-                <th>送货司机</th>
-                <th>备注</th>
+                <td>箱号</td>
+                <td>铅封号</td>
+                <td>预计件数</td>
+                <td>实际件数</td>
+                <td>垛位</td>
+                <td>实际入库日期</td>
+                <td>送货车号</td>
+                <td>送货司机</td>
+                <td>备注</td>
               </tr>
               <tr>
-                <th>箱号</th>
-                <th>铅封号</th>
-                <th>预计件数</th>
-                <th>实际件数</th>
-                <th>垛位</th>
-                <th>实际入库日期</th>
-                <th>送货车号</th>
-                <th>送货司机</th>
-                <th>备注</th>
+                <td>箱号</td>
+                <td>铅封号</td>
+                <td>预计件数</td>
+                <td>实际件数</td>
+                <td>垛位</td>
+                <td>实际入库日期</td>
+                <td>送货车号</td>
+                <td>送货司机</td>
+                <td>备注</td>
               </tr>
             </table>
           </div>
-          <div style="display: flex; justify-content: space-around;">
+          <div style="display: flex; justify-content: space-around">
             <div>操作：</div>
             <div>库管：</div>
             <div>叉车：</div>
@@ -3336,46 +3359,61 @@
         <div id="print_area1" class="print-div">
           <div
             class="print-title"
-            style="display: flex; justify-content: center; font-size: 24px;margin-bottom:5px"
+            style="
+              display: flex;
+              justify-content: center;
+              font-size: 24px;
+              margin-bottom: 5px;
+            "
           >
             {{ company }}有限公司
           </div>
           <div
             class="print-title2"
-            style="display: flex; justify-content: center; font-size: 18px;margin-bottom:5px"
+            style="
+              display: flex;
+              justify-content: center;
+              font-size: 18px;
+              margin-bottom: 5px;
+            "
           >
             <div>入&nbsp;库&nbsp;单</div>
           </div>
-          <div style="margin-bottom:5px">
-            <div>客户名称：{{form.fCorpid}}</div>
+          <div style="margin-bottom: 5px">
+            <div>客户名称：{{ form.fCorpid }}</div>
           </div>
-          <div style="display:flex">
-            <table class="print_table" border="1" cellspacing="0" cellpadding="0" style="width:100%">
+          <div class="print_table" style="display: flex">
+            <table
+              border="0"
+              cellspacing="0"
+              cellpadding="0"
+              style="width: 100%"
+            >
               <tr>
-                <th>序号</th>
-                <th>实际入库日期</th>
-                <th>商品名称</th>
-                <th>提单号</th>
-                <th>箱号</th>
-                <th>件数</th>
-                <th>毛重</th>
-                <th>净重</th>
-                <th>备注</th>
+                <td>序号</td>
+                <td>实际入库日期</td>
+                <td>商品名称</td>
+                <td>提单号</td>
+                <td>箱号</td>
+                <td>件数</td>
+                <td>毛重</td>
+                <td>净重</td>
+                <td>备注</td>
               </tr>
               <tr>
-                <th>序号</th>
-                <th>实际入库日期</th>
-                <th>商品名称</th>
-                <th>提单号</th>
-                <th>箱号</th>
-                <th>件数</th>
-                <th>毛重</th>
-                <th>净重</th>
-                <th>备注</th>
+                <td>序号</td>
+                <td>实际入库日期</td>
+                <td>商品名称</td>
+                <td>提单号</td>
+                <td>箱号</td>
+                <td>件数</td>
+                <td>毛重</td>
+                <td>净重</td>
+                <td>备注</td>
               </tr>
             </table>
           </div>
-                 <div style="display: flex; justify-content: space-around;">
+          <div style="display: flex; justify-content: space-around">
             <div>制单人：</div>
             <div>审核人：</div>
           </div>
@@ -3396,36 +3434,53 @@
         <div id="print_area1" class="print-div">
           <div
             class="print-title"
-            style="display: flex; justify-content: center; font-size: 24px;margin-bottom:5px"
+            style="
+              display: flex;
+              justify-content: center;
+              font-size: 24px;
+              margin-bottom: 5px;
+            "
           >
             {{ company }}有限公司
           </div>
           <div
             class="print-title2"
-            style="display: flex; justify-content: center; font-size: 18px;margin-bottom:5px"
+            style="
+              display: flex;
+              justify-content: center;
+              font-size: 18px;
+              margin-bottom: 5px;
+            "
           >
             <div>入&nbsp;库&nbsp;单</div>
           </div>
-          <div style="display: flex; justify-content: flex-end;margin-bottom:5px">
-            <div>存货地点：{{form.fMblno}}</div>
+          <div
+            style="display: flex; justify-content: flex-end; margin-bottom: 5px"
+          >
+            <div>存货地点：{{ form.fMblno }}</div>
           </div>
-          <div style="display:flex">
-            <table class="print_table" border="1" cellspacing="0" cellpadding="0" style="width:100%">
+          <div class="print_table" style="display: flex">
+            <table
+              border="0"
+              cellspacing="0"
+              cellpadding="0"
+              style="width: 100%"
+            >
               <tr>
-                <th>品名</th>
-                <th>XXXXXXXXXXXX</th>
-                <th>清单号</th>
-                <th>XXXXXXXXXX</th>
+                <td>品名</td>
+                <td>XXXXXXXXXXXX</td>
+                <td>清单号</td>
+                <td>XXXXXXXXXX</td>
               </tr>
               <tr>
-                <th>箱号</th>
-                <th>铅封号</th>
-                <th>预计件数</th>
-                <th>实际件数</th>
+                <td>品名</td>
+                <td>XXXXXXXXXXXX</td>
+                <td>清单号</td>
+                <td>XXXXXXXXXX</td>
               </tr>
             </table>
           </div>
-                     <div style="display: flex; justify-content: space-around;">
+          <div style="display: flex; justify-content: space-around">
             <div>库管：</div>
             <div>叉车：</div>
           </div>
@@ -3446,59 +3501,80 @@
         <div id="print_area1" class="print-div">
           <div
             class="print-title"
-            style="display: flex; justify-content: center; font-size: 24px;margin-bottom:5px"
+            style="
+              display: flex;
+              justify-content: center;
+              font-size: 24px;
+              margin-bottom: 5px;
+            "
           >
             {{ company }}有限公司货物标识卡
           </div>
           <div
             class="print-title2"
-            style="display: flex; justify-content: center; font-size: 18px;margin-bottom:5px"
+            style="
+              display: flex;
+              justify-content: center;
+              font-size: 18px;
+              margin-bottom: 5px;
+            "
           >
             <div>入&nbsp;库&nbsp;计&nbsp;划&nbsp;单</div>
           </div>
-          <div style="display: flex; justify-content: space-around;margin-bottom:5px">
+          <div
+            style="
+              display: flex;
+              justify-content: space-around;
+              margin-bottom: 5px;
+            "
+          >
             <div>
-              <div>提单号：{{form.fMblno}}</div>
-              <div>客户名称：{{form.fCorpid}}</div>
-              <div>货物名称：{{form.fGoodsid}}</div>
-              <div>预计净重：{{form.fPlannetweight}}</div>
+              <div>提单号：{{ form.fMblno }}</div>
+              <div>客户名称：{{ form.fCorpid }}</div>
+              <div>货物名称：{{ form.fGoodsid }}</div>
+              <div>预计净重：{{ form.fPlannetweight }}</div>
             </div>
             <div>
               <div>入库计划单号：</div>
-              <div>计划入库日期：{{form.fBsdate}}</div>
+              <div>计划入库日期：{{ form.fBsdate }}</div>
               <div>制单日期：</div>
               <div>实际毛重：</div>
             </div>
             <div>
               <div>清单号：</div>
-              <div>存放仓库：{{form.fWarehouseid}}</div>
-              <div>预计毛重：{{form.fPlangrossweight}}</div>
+              <div>存放仓库：{{ form.fWarehouseid }}</div>
+              <div>预计毛重：{{ form.fPlangrossweight }}</div>
               <div>实际净重：</div>
             </div>
           </div>
-          <div style="display:flex">
-            <table class="print_table" border="1" cellspacing="0" cellpadding="0" style="width:100%">
+          <div class="print_table" style="display: flex">
+            <table
+              border="0"
+              cellspacing="0"
+              cellpadding="0"
+              style="width: 100%"
+            >
               <tr>
-                <th>箱号</th>
-                <th>铅封号</th>
-                <th>预计件数</th>
-                <th>实际件数</th>
-                <th>垛位</th>
-                <th>实际入库日期</th>
-                <th>送货车号</th>
-                <th>送货司机</th>
-                <th>备注</th>
+                <td>箱号</td>
+                <td>铅封号</td>
+                <td>预计件数</td>
+                <td>实际件数</td>
+                <td>垛位</td>
+                <td>实际入库日期</td>
+                <td>送货车号</td>
+                <td>送货司机</td>
+                <td>备注</td>
               </tr>
               <tr>
-                <th>箱号</th>
-                <th>铅封号</th>
-                <th>预计件数</th>
-                <th>实际件数</th>
-                <th>垛位</th>
-                <th>实际入库日期</th>
-                <th>送货车号</th>
-                <th>送货司机</th>
-                <th>备注</th>
+                <td>箱号</td>
+                <td>铅封号</td>
+                <td>预计件数</td>
+                <td>实际件数</td>
+                <td>垛位</td>
+                <td>实际入库日期</td>
+                <td>送货车号</td>
+                <td>送货司机</td>
+                <td>备注</td>
               </tr>
             </table>
           </div>
@@ -4279,6 +4355,11 @@ export default {
   },
   methods: {
     handleCommand(command) {
+      for (let corp in this.fMblnoOptions) {
+        if (this.form.fCorpid === this.fMblnoOptions[corp].fId) {
+          this.$set(this.form, "fCorpidName", this.fMblnoOptions[corp].fName);
+        }
+      }
       console.log(command);
       if (command == "a") {
         this.showEditDialog_ss();
@@ -4286,11 +4367,11 @@ export default {
         this.showEditDialog_s();
       } else if (command == "c") {
         this.print_lhd = true;
-      }else if (command == "d") {
+      } else if (command == "d") {
         this.print_hwqr = true;
-      }else if (command == "e") {
+      } else if (command == "e") {
         this.print_lwqr = true;
-      }else if (command == "f") {
+      } else if (command == "f") {
         this.print_dpxx = true;
       }
     },
@@ -6509,7 +6590,7 @@ export default {
     addprint() {
       const style =
         "@page {  } " +
-        "@media print { .print-div{ padding:8px;background-color:#cccccc;} .print-title{display:flex;justify-content: center;font-size:24px}";
+        "@media print { .print-div{ padding:8px;background-color:#cccccc;} .print-title{display:flex;justify-content: center;font-size:24px} .print_table table {border-right: 1px solid #000;border-bottom: 1px solid #000;} .print_table table td {border-left: 1px solid #000;border-top: 1px solid #000;padding:2px;vertical-align:middle;text-align: center;}";
       print({
         printable: "print_area1",
         type: "html",
@@ -7444,12 +7525,20 @@ export default {
   border-bottom: 1px solid #dfe6ec !important;
   border-bottom: 1px solid #dfe6ec !important;
 }
-.print_table > tr > td {
-  text-align: center;
-  border-right: 1px solid #000000 !important;
-  border-bottom: 1px solid #000000 !important;
-  border-bottom: 1px solid #000000 !important;
+.print_table {
+  table {
+    border-right: 1px solid #000;
+    border-bottom: 1px solid #000;
+  }
+  table td {
+    border-left: 1px solid #000;
+    border-top: 1px solid #000;
+    vertical-align: middle;
+    padding: 2px;
+    text-align: center;
+  }
 }
+
 .el-table thead th {
   background: #1890ff;
   color: #fff;
@@ -7511,4 +7600,7 @@ export default {
 .el-icon-full-screen:before {
   content: "\e719";
 }
+.print-div {
+  color: #000;
+}
 </style>

src/views/warehouseBusiness/outStock/index.vue

@@ -718,7 +718,7 @@
               >
                 <el-option
                   v-for="(dict, index) in businessTypeOption"
-                  :key="dict.dictValue"
+                  :key="index.dictValue"
                   :label="dict.dictLabel"
                   :value="dict.dictValue"
                 ></el-option>
@@ -1834,7 +1834,7 @@
                 >
                   <el-option
                     v-for="(dict, index) in businessTypeOption"
-                    :key="dict.dictValue"
+                    :key="index.dictValue"
                     :label="dict.dictLabel"
                     :value="dict.dictValue"
                   ></el-option>
@@ -2200,7 +2200,7 @@
                 >
                   <el-option
                     v-for="(dict, index) in businessTypeOption"
-                    :key="dict.dictValue"
+                    :key="index.dictValue"
                     :label="dict.dictLabel"
                     :value="dict.dictValue"
                   ></el-option>