打印修改

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -5606,6 +5606,11 @@
     >
       <el-radio v-model="radio" :label="1">吨（T）</el-radio>
       <el-radio v-model="radio" :label="2">千克（KG）</el-radio>
+      <el-button
+        type="primary"
+        size="mini"
+        @click="addprint('fxdkrkd');print_fxdkrkd = false;"
+      >打印</el-button>
       <div id="print_area99" class="print-div">
         <div v-for="(item, index) in Printinglist"
              :key="index">

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -924,6 +924,7 @@
                   <el-dropdown-item command="w">叉车出库单(空白)</el-dropdown-item>
                   <el-dropdown-item command="g">单车出库单</el-dropdown-item>
                   <el-dropdown-item command="h">装车存档出库单</el-dropdown-item>
+                  <el-dropdown-item command="hw">装车存档出库单(空白)</el-dropdown-item>
                   <el-dropdown-item command="q">签收单</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
@@ -3841,8 +3842,8 @@
               style="width: 100%; line-height: 30px"
           >
             <tr>
-              <td>品名</td>
-              <td colspan="3">{{ form.fProductName }}</td>
+              <td>品名 / 属性详情</td>
+              <td colspan="3">{{ form.fProductName }} / {{ form.fMarks }}</td>
               <td colspan="3">清单号</td>
               <td colspan="2">{{ form.fCustomno }}</td>
             </tr>
@@ -3935,8 +3936,8 @@
               style="width: 100%; line-height: 30px"
           >
             <tr>
-              <td>品名</td>
-              <td colspan="2">{{ form.fProductName }}</td>
+              <td>品名 / 属性详情</td>
+              <td colspan="2">{{ form.fProductName }} / {{ form.fMarks }}</td>
               <td>清单号</td>
               <td colspan="3">{{ form.fCustomsdeclartion }}</td>
             </tr>
@@ -4047,8 +4048,8 @@
             style="width: 100%; line-height: 30px"
           >
             <tr>
-              <td>品名</td>
-              <td colspan="3">{{ form.fProductName }}</td>
+              <td>品名 / 属性详情</td>
+              <td colspan="3">{{ form.fProductName }} / {{ form.fMarks }}</td>
               <td>清单号</td>
               <td colspan="4">{{ form.fCustomsdeclartion }}</td>
             </tr>
@@ -4166,8 +4167,8 @@
               style="width: 100%; line-height: 30px"
           >
             <tr>
-              <td>品名</td>
-              <td colspan="2">{{ form.fProductName }}</td>
+              <td>品名 / 属性详情</td>
+              <td colspan="2">{{ form.fProductName }} / {{ form.fMarks }}</td>
               <td>清单号</td>
               <td colspan="4">{{ form.fCustomsdeclartion }}</td>
             </tr>
@@ -4216,6 +4217,8 @@
             style="display: flex; justify-content: space-between; font-size: 12px"
         >
           <div>库管：{{ form.fStorekeeper | fStorekeeperFormat(userOptions) }}</div>
+          <div style="width: 100px">初审核人：{{ firstReviewer }}</div>
+          <div style="width: 130px;margin-right: 20px">复式审核人：{{ secondReviewer }}</div>
         </div>
       </div>
       <span slot="footer" class="dialog-footer">
@@ -4355,6 +4358,120 @@
         <el-button @click="print_zccdckd = false">取消 </el-button>
       </span>
     </el-dialog>
+    <el-dialog
+      :visible.sync="print_kbzccd"
+      width="70%"
+      :close-on-click-modal="false"
+      :modal="false"
+    >
+      <el-radio v-model="radio" :label="1">吨（T）</el-radio>
+      <el-radio v-model="radio" :label="2">千克（KG）</el-radio>
+      <div id="print_area11" class="print-div">
+        <div
+          class="print-title"
+          style="
+            display: flex;
+            justify-content: center;
+            font-size: 24px;
+            margin-bottom: 5px;
+          "
+        >
+          {{ fCompanyName? fCompanyName: company }}
+        </div>
+
+        <div
+          style="
+            margin-bottom: 5px;
+            width: 100%;
+            position: relative;
+          "
+        >
+          <div style="font-size: 18px;text-align: center">出&nbsp;库&nbsp;单</div>
+          <div style="position: absolute;right: 5px;bottom: 5px;">
+            <div style="margin-bottom: 5px">{{ form.fBillno }}</div>
+          </div>
+        </div>
+        <div style="width: 90%;margin: 3px auto;border-bottom: 1px solid #000"></div>
+        <div style="display: flex;justify-content: space-between; margin: 5px 0">
+          <div style="width: 50%">客户名称：{{ form.fCorpidName }}</div>
+          <div>存放地点：{{ stockName }}</div>
+        </div>
+        <div class="print_table" style="display: flex">
+          <table
+            border="0"
+            cellspacing="0"
+            cellpadding="0"
+            style="width: 100%; line-height: 30px"
+          >
+            <tr>
+              <td>品名 / 属性详情</td>
+              <td>{{ form.fProductName }} / {{ form.fMarks }}</td>
+              <td colspan="2">清单号</td>
+              <td colspan="3">{{ form.fCustomsdeclartion }}</td>
+            </tr>
+            <tr>
+              <td>提单号</td>
+              <td>{{ form.fMblno }}</td>
+              <td colspan="2">出库日期</td>
+              <td colspan="3">{{ fBsdate }}</td>
+            </tr>
+            <tr>
+              <td width="24%">原入库箱号</td>
+              <td width="24%">出库车号</td>
+              <td>件数</td>
+              <td v-if="radio == 1">净重(吨)</td>
+              <td v-if="radio == 2">净重(千克)</td>
+              <td>提货人签字手印</td>
+              <td>所收费用</td>
+              <td>备注</td>
+            </tr>
+            <tr v-for="(item, index) in 28" :key="index">
+              <td style="height: 20px"></td>
+              <td></td>
+              <td></td>
+              <td v-if="radio == 1"></td>
+              <td v-if="radio == 2"></td>
+              <td></td>
+              <td></td>
+              <td></td>
+            </tr>
+            <tr>
+              <td colspan="2">合计：</td>
+              <td></td>
+              <td></td>
+              <td></td>
+              <td></td>
+              <td></td>
+            </tr>
+          </table>
+        </div>
+        <div
+          style="display: flex; justify-content: space-between; font-size: 12px;margin-bottom: 20px"
+        >
+          <div>库管：{{ form.fStorekeeper | fStorekeeperFormat(userOptions) }}</div>
+          <div style="width: 130px;margin-right: 20px">叉车：</div>
+        </div>
+        <div
+          style="display: flex; justify-content: space-between; font-size: 12px"
+        >
+          <div>制单人：{{ form.createBy }}</div>
+          <div style="width: 100px">初审核人：{{ firstReviewer }}</div>
+          <div style="width: 130px;margin-right: 20px">复式审核人：{{ secondReviewer }}</div>
+        </div>
+      </div>
+
+      <span slot="footer" class="dialog-footer">
+        <el-button
+          type="primary"
+          @click="
+            addprint('kbzccd');
+            print_kbzccd = false;
+          "
+        >打印
+        </el-button>
+        <el-button @click="print_kbzccd = false">取消 </el-button>
+      </span>
+    </el-dialog>
 <!--    费用确认单-->
     <el-dialog
       :visible.sync="print_fyqr"
@@ -5022,6 +5139,7 @@ export default {
       print_bzckd: false,
       print_xqckd: false,
       print_kbccd: false,
+      print_kbzccd: false,
       company: "",
       Printinglist: [],
       // 收款信息明细
@@ -7526,10 +7644,10 @@ export default {
             fPlanqty = Number(e.fQty) + Number(fPlanqty)
           }
           if (e.fGrossweight) {
-            fPlannetweight = Number(e.fGrossweight) + Number(fPlannetweight)
+            fPlangrossweight = Number(e.fGrossweight) + Number(fPlannetweight)
           }
           if (e.fNetweight) {
-            fPlangrossweight = Number(e.fNetweight) + Number(fPlangrossweight)
+            fPlannetweight = Number(e.fNetweight) + Number(fPlangrossweight)
           }
         });
         // 如果计划件数、计划净重、计划毛重 为空或为0带入明细
@@ -8428,6 +8546,8 @@ export default {
               this.print_xqckd = true;
             } else if (command == "w") {
               this.print_kbccd = true;
+            } else if (command == "hw") {
+              this.print_kbzccd = true;
             }
           }
         });
@@ -8453,6 +8573,27 @@ export default {
               this.print_kbccd = true
             }
           })
+        } else if (command == 'hw') {
+          this.$refs["form"].validate((valid) => {
+            if (valid) {
+              this.warehouseOptions.map((e) => {
+                if (e.fId == this.form.fWarehouseid) {
+                  this.stockName = e.fName;
+                  this.stockaddr = e.fAddr;
+                }
+              });
+              if (!this.form.fBsdate) this.$set(this.form, 'fBsdate', this.form.fBstime)
+              let date = new Date(this.form.fBsdate);
+              let Y = date.getFullYear();
+              let M =
+                date.getMonth() + 1 < 10
+                  ? "0" + (date.getMonth() + 1)
+                  : date.getMonth() + 1;
+              let D = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+              this.fBsdate = Y + "-" + M + "-" + D;
+              this.print_kbzccd = true
+            }
+          })
         } else {
           this.$message.error("请选择需要打印的明细!");
         }
@@ -8981,6 +9122,14 @@ export default {
             scanStyles: false,
           });
           break;
+        case "kbzccd":
+          print({
+            printable: "print_area11",
+            type: "html",
+            style: style, // 亦可使用引入的外部css;
+            scanStyles: false,
+          });
+          break;
         case "fyqrd":
           print({
             printable: "print_fyqr",

src/views/Warehousing/stockTransfer/AddOrUpdate.vue

@@ -2865,13 +2865,13 @@
           </div>
           <div>
             <div>存放地址：{{ stockName }}</div>
-            <div>调拨：</div>
+            <div>调拨人：{{ form.fStorekeeper }}</div>
           </div>
         </div>
         <div class="print_table" style="display: flex">
           <table border="0" cellspacing="0" cellpadding="0" style="width: 100%">
             <tr>
-              <td>箱号</td>
+              <td style="height: 20px">箱号</td>
               <td>现存库区</td>
               <td>件数</td>
               <td v-if="radio == 1">毛重(吨)</td>
@@ -2881,7 +2881,7 @@
               <td>移入库区</td>
             </tr>
             <tr v-for="(item, index) in Printinglist" :key="index">
-              <td>{{ item.fCntrno }}</td>
+              <td style="height: 20px">{{ item.fCntrno }}</td>
               <td>{{ item.fOrgwarehouseInformation }}</td>
               <td>{{ item.fQty }}</td>
               <td v-if="radio == 1">{{ (item.fGrossweight / 1000).toFixed(4) }}</td>
@@ -2891,10 +2891,23 @@
 
               <td>{{ item.fWarehouseInformation }}</td>
             </tr>
+            <tr>
+              <td colspan="2" style="height: 20px">合 计</td>
+              <td>{{allfQty}}</td>
+              <td v-if="radio == 1">{{ (allfNetweight / 1000).toFixed(4) }}</td>
+              <td v-if="radio == 1">{{ (allfGrossweight / 1000).toFixed(4) }}</td>
+              <td v-if="radio == 2">{{ allfNetweight }}</td>
+              <td v-if="radio == 2">{{ allfGrossweight }}</td>
+              <td></td>
+            </tr>
+            <tr>
+              <td style="height: 20px">备注</td>
+              <td colspan="5">{{ form.remark }}</td>
+            </tr>
           </table>
         </div>
         <div
-          style="display: flex; justify-content: space-between; font-size: 12px"
+          style="display: flex; justify-content: space-around; font-size: 12px"
         >
           <div>库管：{{ form.fContacts }}</div>
           <div style="width: 100px">叉车：</div>

src/views/finance/contrast/index.vue

@@ -100,17 +100,17 @@
                   ></el-date-picker>
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
-                <el-form-item label="业务编号" prop="fBillno">
-                  <el-input
-                    v-model="tablefilter.fBillno"
-                    placeholder="请输入业务编号"
-                    clearable
-                    style="width: 100%"
-                    @keyup.enter.native="handleQuery"
-                  />
-                </el-form-item>
-              </el-col>
+<!--              <el-col :span="6">-->
+<!--                <el-form-item label="业务编号" prop="fBillno">-->
+<!--                  <el-input-->
+<!--                    v-model="tablefilter.fBillno"-->
+<!--                    placeholder="请输入业务编号"-->
+<!--                    clearable-->
+<!--                    style="width: 100%"-->
+<!--                    @keyup.enter.native="handleQuery"-->
+<!--                  />-->
+<!--                </el-form-item>-->
+<!--              </el-col>-->
               <el-col :span="6">
                 <el-form-item label="备注" prop="fRemarks">
                   <el-input
@@ -1129,9 +1129,9 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="业务日期" prop="acceptDateList">
+                <el-form-item label="业务日期" prop="timeInterval">
                   <el-date-picker
-                    v-model="TWareHouseFees.acceptDateList"
+                    v-model="TWareHouseFees.timeInterval"
                     size="small"
                     unlink-panels
                     style="width: 100%"