新增打印单

src/views/Warehousing/inStock/AddOrUpdate.vue

@@ -1276,12 +1276,12 @@
                   打印单据<i class="el-icon-arrow-down el-icon--right"></i>
                 </el-button>
                 <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item command="a">收货单</el-dropdown-item>
-                  <el-dropdown-item command="g">标准入库单</el-dropdown-item>
-                  <el-dropdown-item command="y">标准入库单(件数)</el-dropdown-item>
-                  <el-dropdown-item command="z">标准入库单(详情)</el-dropdown-item>
+                  <el-dropdown-item command="a" v-if="showPrint != 1">收货单</el-dropdown-item>
+                  <el-dropdown-item command="g" v-if="showPrint != 1">标准入库单</el-dropdown-item>
+                  <el-dropdown-item command="y" v-if="showPrint != 1">标准入库单(件数)</el-dropdown-item>
+                  <el-dropdown-item command="z" v-if="showPrint != 1">标准入库单(详情)</el-dropdown-item>
 <!--                  <el-dropdown-item command="o">标准入库单(其他)</el-dropdown-item>-->
-                  <el-dropdown-item command="b">进仓单</el-dropdown-item>
+                  <el-dropdown-item command="b" v-if="showPrint != 1">进仓单</el-dropdown-item>
                   <!--                  <el-dropdown-item command="c">理货单</el-dropdown-item>-->
                   <!--                  <el-dropdown-item command="d">货物确认</el-dropdown-item>-->
                   <!--                  <el-dropdown-item command="e">劳务确认</el-dropdown-item>-->
@@ -1291,7 +1291,8 @@
                   <el-dropdown-item command="i">客户入库单</el-dropdown-item>
                   <el-dropdown-item command="j">卸货存档入库单</el-dropdown-item>
                   <el-dropdown-item command="k">整票垛卡入库单</el-dropdown-item>
-                  <el-dropdown-item command="h">入库垛卡</el-dropdown-item>
+                  <el-dropdown-item command="h" v-if="showPrint != 1">入库垛卡</el-dropdown-item>
+                  <el-dropdown-item command="xjc">箱检查</el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
               <el-dropdown @command="detailedApproval" style="margin-left: 10px" v-if="showApproval == 0">
@@ -2220,7 +2221,7 @@
             style="display: flex; justify-content: space-between; font-size: 12px;margin-bottom: 5px"
         >
           <div>开单员：</div>
-          <div style="width: 150px">仓管员：{{ form.fStorekeeper }}</div>
+          <div style="width: 150px">仓管员：{{ form.fStorekeeper | fStorekeeperFormat(userOptions) }}</div>
         </div>
         <div
             style="display: flex; justify-content: space-between; font-size: 12px"
@@ -2799,7 +2800,7 @@
             style="display: flex; justify-content: space-between; font-size: 12px"
         >
           <div>操作：{{ form.createBy }}</div>
-          <div>库管：{{ form.fContacts }}</div>
+          <div>库管：{{ form.fStorekeeper | fStorekeeperFormat(userOptions) }}</div>
           <div style="width: 100px">叉车：</div>
         </div>
       </div>
@@ -2975,7 +2976,7 @@
         <div
             style="display: flex; justify-content: space-between; font-size: 12px"
         >
-          <div>库管：{{ form.fContacts }}</div>
+          <div>库管：{{ form.fStorekeeper | fStorekeeperFormat(userOptions) }}</div>
           <div style="width: 100px">叉车：</div>
         </div>
       </div>
@@ -3180,7 +3181,7 @@
             style="display: flex; justify-content: space-between; font-size: 12px"
         >
           <!--          <div>操作：{{ form.createBy }}</div>-->
-          <div>库管：{{ form.fContacts }}</div>
+          <div>库管：{{ form.fStorekeeper | fStorekeeperFormat(userOptions) }}</div>
           <div style="width: 100px">叉车：</div>
         </div>
       </div>
@@ -3387,7 +3388,7 @@
             style="display: flex; justify-content: space-between; font-size: 12px"
         >
           <!--          <div>操作：{{ form.createBy }}</div>-->
-          <div>库管：{{ form.fContacts }}</div>
+          <div>库管：{{ form.fStorekeeper | fStorekeeperFormat(userOptions) }}</div>
           <div style="width: 100px">叉车：</div>
         </div>
       </div>
@@ -3491,7 +3492,7 @@
             style="display: flex; justify-content: space-between; font-size: 12px"
         >
           <!--          <div>操作：{{ form.createBy }}</div>-->
-          <div>库管：{{ form.fContacts }}</div>
+          <div>库管：{{ form.fStorekeeper | fStorekeeperFormat(userOptions) }}</div>
           <div style="width: 100px">叉车：</div>
         </div>
       </div>
@@ -3679,7 +3680,7 @@
               <td>入库日期</td>
               <td colspan="2">{{ form.fBsdate | fBsdateFormat }}</td>
               <td>仓管员</td>
-              <td colspan="2">{{ form.fStorekeeper }}</td>
+              <td colspan="2">{{ form.fStorekeeper | fStorekeeperFormat(userOptions) }}</td>
             </tr>
             <tr>
               <td>出库日期</td>
@@ -3795,7 +3796,7 @@
             style="display: flex; justify-content: space-between; font-size: 12px"
         >
           <!--          <div>操作：{{ form.createBy }}</div>-->
-          <div>库管：{{ form.fContacts }}</div>
+          <div>库管：{{ form.fStorekeeper | fStorekeeperFormat(userOptions) }}</div>
           <div style="width: 100px">叉车：</div>
         </div>
       </div>
@@ -3880,7 +3881,7 @@
             style="display: flex; justify-content: space-between; font-size: 12px"
         >
           <!--          <div>操作：{{ form.createBy }}</div>-->
-          <div>库管：{{ form.fContacts }}</div>
+          <div>库管：{{ form.fStorekeeper | fStorekeeperFormat(userOptions) }}</div>
           <div style="width: 100px">叉车：</div>
         </div>
       </div>
@@ -4073,7 +4074,7 @@
             style="display: flex; justify-content: space-between; font-size: 12px"
         >
           <!--          <div>操作：{{ form.createBy }}</div>-->
-          <div>库管：{{ form.fContacts }}</div>
+          <div>库管：{{ form.fStorekeeper | fStorekeeperFormat(userOptions) }}</div>
           <div style="width: 100px">叉车：</div>
         </div>
       </div>
@@ -4169,7 +4170,7 @@
             style="display: flex; justify-content: space-between; font-size: 12px"
         >
           <!--          <div>操作：{{ form.createBy }}</div>-->
-          <div>库管：{{ form.fContacts }}</div>
+          <div>库管：{{ form.fStorekeeper | fStorekeeperFormat(userOptions) }}</div>
           <div style="width: 100px">叉车：</div>
         </div>
       </div>
@@ -4579,7 +4580,7 @@
             style="display: flex; justify-content: space-between; font-size: 12px"
         >
           <!--          <div>操作：{{ form.createBy }}</div>-->
-          <div>库管：{{ form.fContacts }}</div>
+          <div>库管：{{ form.fStorekeeper | fStorekeeperFormat(userOptions) }}</div>
           <div style="width: 100px">叉车：</div>
         </div>
       </div>
@@ -4675,7 +4676,7 @@
             style="display: flex; justify-content: space-between; font-size: 12px"
         >
           <!--          <div>操作：{{ form.createBy }}</div>-->
-          <div>库管：{{ form.fContacts }}</div>
+          <div>库管：{{ form.fStorekeeper | fStorekeeperFormat(userOptions) }}</div>
           <div style="width: 100px">叉车：</div>
         </div>
       </div>
@@ -5065,7 +5066,7 @@
             style="display: flex; justify-content: space-between; font-size: 12px"
         >
           <!--          <div>操作：{{ form.createBy }}</div>-->
-          <div>库管：{{ form.fContacts }}</div>
+          <div>库管：{{ form.fStorekeeper | fStorekeeperFormat(userOptions) }}</div>
           <div style="width: 100px">叉车：</div>
         </div>
       </div>
@@ -5258,7 +5259,7 @@
             style="display: flex; justify-content: space-between; font-size: 12px"
         >
           <!--          <div>操作：{{ form.createBy }}</div>-->
-          <div>库管：{{ form.fContacts }}</div>
+          <div>库管：{{ form.fStorekeeper | fStorekeeperFormat(userOptions) }}</div>
           <div style="width: 100px">叉车：</div>
         </div>
       </div>
@@ -5354,7 +5355,7 @@
             style="display: flex; justify-content: space-between; font-size: 12px"
         >
           <!--          <div>操作：{{ form.createBy }}</div>-->
-          <div>库管：{{ form.fContacts }}</div>
+          <div>库管：{{ form.fStorekeeper | fStorekeeperFormat(userOptions) }}</div>
           <div style="width: 100px">叉车：</div>
         </div>
       </div>
@@ -5461,7 +5462,7 @@
             style="display: flex; justify-content: space-between; font-size: 12px"
         >
           <div>操作：</div>
-          <div>库管：{{ form.fContacts }}</div>
+          <div>库管：{{ form.fStorekeeper | fStorekeeperFormat(userOptions) }}</div>
           <div style="width: 100px">叉车：</div>
         </div>
       </div>
@@ -5686,7 +5687,7 @@
             style="display: flex; justify-content: space-between; font-size: 12px"
           >
             <!--          <div>操作：{{ form.createBy }}</div>-->
-            <div>库管：{{ form.fContacts }}</div>
+            <div>库管：{{ form.fStorekeeper | fStorekeeperFormat(userOptions) }}</div>
             <div style="width: 100px">叉车：</div>
           </div>
         </div>
@@ -5795,7 +5796,7 @@
             style="display: flex; justify-content: space-between; font-size: 12px"
         >
           <!--          <div>操作：{{ form.createBy }}</div>-->
-          <div>库管：{{ form.fContacts }}</div>
+          <div>库管：{{ form.fStorekeeper | fStorekeeperFormat(userOptions) }}</div>
           <div style="width: 100px">叉车：</div>
         </div>
       </div>
@@ -5811,6 +5812,81 @@
             <el-button @click="print_khrkd = false">取消 </el-button>
           </span>
     </el-dialog>
+    <el-dialog
+      :visible.sync="print_xjc"
+      width="70%"
+      :close-on-click-modal="false"
+      :modal="false"
+    >
+      <div id="print_xjc" class="print-div">
+        <div
+          class="print-title"
+          style="
+                display: flex;
+                justify-content: center;
+                font-size: 24px;
+                margin-bottom: 5px;
+              "
+        >
+          货车、集装箱检查记录表
+        </div>
+        <div class="print_table" style="display: flex">
+          <table border="0" cellspacing="0" cellpadding="0" style="width: 100%; line-height: 30px">
+            <tr>
+              <td rowspan="2" style="width: 70px">车牌号</td>
+              <td colspan="12">十点检查内容</td>
+              <td rowspan="2">检查人</td>
+              <td rowspan="2">时间</td>
+            </tr>
+            <tr>
+              <td>集装箱号</td>
+              <td>第五轮区域检查自然隔离/车底护板</td>
+              <td>外部:前面/侧面</td>
+              <td>尾部：保险杠/门</td>
+              <td>前壁</td>
+              <td>左侧</td>
+              <td>右侧</td>
+              <td>地板</td>
+              <td>顶部</td>
+              <td>内外门</td>
+              <td>铅封号、铰链、门栓、把守</td>
+              <td>外部：起落架</td>
+            </tr>
+            <tr v-for="(item, index) in Printinglist" :key="index">
+              <td style="height: 30px"></td>
+              <td>{{ item.fCntrno }}</td>
+              <td style="width: 100px"></td>
+              <td></td>
+              <td></td>
+              <td></td>
+              <td></td>
+              <td></td>
+              <td></td>
+              <td></td>
+              <td></td>
+              <td></td>
+              <td></td>
+              <td style="width: 90px"></td>
+              <td style="width: 90px"></td>
+            </tr>
+            <tr>
+              <td colspan="15">备注：以上每项无问题的划√,有异议的划×,并及时向上级负责人汇报。</td>
+            </tr>
+          </table>
+        </div>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button
+          type="primary"
+          @click="
+            addprint('xjcd');
+            print_xjc = false;
+          "
+        >打印
+        </el-button>
+        <el-button @click="print_xjc = false">取消 </el-button>
+      </span>
+    </el-dialog>
     <!--        <el-dialog-->
     <!--          :visible.sync="print_xhcdrkd"-->
     <!--          width="70%"-->
@@ -6371,6 +6447,7 @@ export default {
       print_bzrkd_xq: false,
       print_bzrkd_qt: false,
       print_dk: false,
+      print_xjc: false,
       company: "",
       Printinglist: [],
       //库位
@@ -6647,6 +6724,7 @@ export default {
       ifsamplingList: [],
       ifweightRecoveryList: [],
       showApproval: null,
+      showPrint: null,
       downloadTemplateVisible: false,
       uploadExcel: false,
       rkTime: null,
@@ -6689,7 +6767,6 @@ export default {
     });
     this.getDicts("data_stltype_type").then((response) => {
       this.fStltypeOptions = response.data;
-      console.log(this.fStltypeOptions)
     });
     this.getDicts("data_unitfees").then((response) => {
       this.fFeetUnitOptions = response.data;
@@ -6769,6 +6846,9 @@ export default {
     this.getConfigKey("instock.orders.approval").then((response) => {
       this.showApproval = response.msg;
     });
+    this.getConfigKey("warehouse.inStock.showPrint").then((response) => {
+      this.showPrint = response.msg;
+    });
     // 业务员获取
     selectUserByRole().then(res => {
       this.fSalesmanOption = res.rows
@@ -6950,6 +7030,15 @@ export default {
       });
       return name;
     },
+    fStorekeeperFormat(row, userOptions) {
+      let nickName;
+      userOptions.map(e => {
+        if (row == e.userName) {
+          nickName = e.nickName;
+        }
+      });
+      return nickName;
+    },
   },
   methods: {
     init() {
@@ -8625,7 +8714,6 @@ export default {
             this.allfNetweight = 0;
             this.allfPlannetweight=0;
             this.allfQty = 0;
-            console.log(this.Printinglist)
             this.Printinglist.map((e) => {
               if (e.fCntqty) {
                 this.allfCntqty += Number(e.fCntqty);
@@ -8771,6 +8859,8 @@ export default {
               this.print_bzrkd_xq = true;
             } else if (command == "o") {
               this.print_bzrkd_qt = true;
+            } else if (command == 'xjc') {
+              this.print_xjc = true;
             }
           }
         })
@@ -9164,6 +9254,14 @@ export default {
             scanStyles: false,
           });
           break
+        case 'xjcd':
+          print({
+            printable: "print_xjc",
+            type: "html",
+            style: style, // 亦可使用引入的外部css;
+            scanStyles: false,
+          });
+          break
         default:
           print({
             printable: "print_area4",
@@ -9283,7 +9381,6 @@ export default {
       })
     },
     changePlannetWeight() {
-      console.log(this.bring)
       if (this.bring == '0') {
         this.$set(this.form, 'fPlangrossweight', this.form.fPlannetweight)
       }

src/views/Warehousing/inStock/index.vue

@@ -950,7 +950,6 @@ export default {
       this.fSbuOptions = response.rows;
     });
     this.company = Cookies.get("companyName")
-    console.log(this.company)
     this.getRow();
     this.getList();
   },
@@ -1084,7 +1083,6 @@ export default {
         if (res.code == 200) {
           this.showSetting = false;
           this.getRowList = this.setRowList.filter((e) => e.checked == 0);
-          console.log(this.tableDate);
         }
       });
     },
@@ -1192,7 +1190,6 @@ export default {
       const fId = row.fId || this.ids[0] || row;
       this.copyStatus = null;
       this.formId = fId;
-      console.log(this.formId)
       this.$nextTick(() => {
         this.$refs.addOrUpdateRef.init();
       });