Merge branch 'master' of http://119.23.210.103:3000/wy/mj_firm_former

src/views/platform/message/inner/detail/dialog.vue

@@ -44,11 +44,11 @@ export default {
       type: Boolean,
       default: false
     },
-    type: {
+    tableId: {
       type: String,
       default: ''
     },
-    tableId: {
+    tableName: {
       type: String,
       default: ''
     },
@@ -61,7 +61,8 @@ export default {
     return {
       dialogVisible: this.visible,
       dialogLoading: false,
-      toolbars: [{ key: 'cancel', label: '关闭' }]
+      toolbars: [{ key: 'cancel', label: '关闭' }],
+       type: ''
     }
   },
   watch: {
@@ -71,7 +72,7 @@ export default {
       },
       immediate: true
     },
-    type: {
+    tableId: {
       handler: function (val, oldVal) {
         const btn1 = [
           { key: 'confirm', label: '确认' },
@@ -80,7 +81,12 @@ export default {
         const btn2 = [
           { key: 'cancel', label: '关闭' }
         ]
-        this.toolbars = val ? btn1 : btn2
+        if (val) {
+          this.toolbars = btn1
+          this.type = '1'
+        } else {
+          this.toolbars = btn2
+        }
       }
     }
   },
@@ -136,7 +142,7 @@ export default {
             qian_ming_id_: ryjbqkDatas[0].qian_zi_tu_wen_
           }
           let returnParams = {
-            tableName: this.type,
+            tableName: this.tableName,
             paramWhere: [tempObj]
           }
           curdPost('add', JSON.stringify(returnParams)).then(() => { console.log('确认接收到发放文件') }).then(

src/views/platform/message/inner/receive.vue

@@ -36,6 +36,8 @@
             :title="title"
             :readonly="readonly"
             :visible="dialogFormVisible"
+            :tableId="tableId"
+            :tableName="tableName"
             @callback="search"
             @close="visible => closeDetail(visible)"
         />
@@ -80,6 +82,8 @@
                 listData: [],
                 pagination: {},
                 sorts: {},
+                tableId: '',
+                tableName: '',
                 listConfig: {
                     toolbars: [
                         {
@@ -138,14 +142,20 @@
                                 icon: 'ibps-icon-reply-all',
                                 label: '回复',
                                 hidden: function (row, index) {
-                                    return (row.canreply === 0 || row.messageType === 'system' || row.messageType === 'bulletin')
+                                    return (row.canreply === 0 || row.messageType === 'system' || row.messageType === 'bulletin'|| row.subject =='文件发放通知')
                                 }
                             },
                             {
-                                key: 'remove'
+                                key: 'remove',
+                                hidden: function (row, index) {
+                                    return (row.subject =='文件发放通知')
+                                }
                             },
                             {
-                                key: 'detail'
+                                key: 'detail',
+                                hidden: function (row, index) {
+                                    return (row.subject =='文件发放通知')
+                                }
                             }
                         ]
                     }
@@ -209,6 +219,8 @@
             },
             handleLinkClick(data, columns) {
                 this.handleEdit(data.id, true)
+                this.tableId = data.tableId
+                this.tableName = data.tableName
                 this.title = '信息明细'
             },
             /**
@@ -221,10 +233,19 @@
                         this.search()
                         break
                     case 'markRead': // 标记为已读
-                        ActionUtils.selectedMultiRecord(selection).then(id => {
+                        try {
+                            data.forEach(el => {
+                            if(el.subject='文件发放通知'){
+                                throw new Error('所选数据存在文件发放通知，文件发放通知请勿点击已读。')
+                            }
+                            ActionUtils.selectedMultiRecord(selection).then(id => {
                             this.handleAlreadyRead(id)
                             // this.isEnvelope = false
-                        }).catch(() => {})
+                            }).catch(() => { })
+                            });
+                        } catch (error) {
+                            ActionUtils.warning(error.message) 
+                        }
                         break
                     case 'reply': // 回复
                         ActionUtils.selectedRecord(selection).then(id => {

src/views/system/jbdScan/goods/caigourukudan.vue

@@ -17,32 +17,6 @@
               style="margin-bottom: 30px;margin: 0px -10px 0px 5px;width: 85%;"
             >
               <div style="page-break-after: always;">
-                <!-- <div class="word-title">
-                  <h4>采购入库单</h4>
-                </div>
-                <div class="tagBox">
-                  <div>
-                    <div style="font-size: 10px">
-                      申购部门:<span style="margin-left: 10px">{{
-                        item1[0].shen_gou_bu_men_ | bumenfilters(bumenList)
-                      }}</span>
-                    </div>
-                    <div style="font-size: 10px">
-                      供应商:<span style="margin-left: 10px">{{
-                        item1[0].gong_ying_shang_| gongyingshang(gongyingshangList)
-                      }}</span>
-                    </div>
-                  </div>
-                  <div style="text-align: left;">
-                    <div style="font-size: 10px;padding-right: 20px;">
-                      采购订单编号:<span>
-                        {{ item1[0].cai_gou_ding_dan_ }}</span>
-                    </div>
-                    <div style="font-size: 10px;">
-                      日期:<span>{{item1[0].dao_ku_ri_qi_}}</span>
-                    </div>
-                  </div>
-                </div> -->
                 <div style="margin: 0px -2px 0px 40px;">
                   <table :border="1">
                     <thead>
@@ -64,7 +38,7 @@
                             <div style="font-size: 10px; padding-right: 8px; width: 175px;text-align: left;">日期 :
                               <span >{{item1[0].dao_ku_ri_qi_}}</span>
                             </div>
-                            <div style="font-size: 10px; padding-right: 8px;">采购订单编号:
+                            <div style="font-size: 10px; padding-right: 8px;">采购单号:
                               <span > {{item1[0].cai_gou_ding_dan_}}</span>
                             </div>
                           </div>

src/views/system/jbdScan/goods/chnangguirukudan.vue

@@ -3,44 +3,52 @@
     <!-- 常规列表页面打印入库单 -->
     <el-dialog
       width="900px"
-      height="12cm"
+      height="279mm"
       :modal-append-to-body="false"
       title="采购入库单"
       :visible.sync="scanVisible"
     >
       <!-- 表单是否显示 -->
-      <div style="height: 500px; width: 95%; margin: 0 auto">
+      <div style="height: 500px; width: 90%; margin: 0 auto">
         <div ref="qrcode" id="box">
           <vue-easy-print tableShow ref="easyPrint" :onePageRow="onePageRow">
             <div
               v-for="(item1, index1) in list"
               :key="index1"
-              style="margin-bottom: 30px;width: 85%;margin: 0px -10px 0px 5px;"
+              style="margin-bottom: 30px;width: 89%;margin: 0px 0px 0px 0px;"
             >
               <div style="page-break-after: always">
-                <div style="margin: 0px -2px 0px 40px;">
+                <div style="margin: 0px 0px 0px 27px;">
                   <table :border="1">                   
                     <thead >
-                      <tr class="title titlet" style="background:#ffffff;">
-                        <th colspan="15" >
-                          <!-- <h1>采购入库单</h1> -->
-                          <div style="line-height: 16px;font-size: 18px;font-weight: bold;">采购入库单</div>
+                      <!-- <tr class="title" style="background:#ffffff">
+                        <th colspan="15" style="">
+                          <h1 style="display:block;line-height: 8px;font-size: 8px;">采购入库单</h1>
                         </th>
-                      </tr>
+                      </tr> -->
+
                       <tr class="title" style="background:#ffffff">
-                        <th colspan="15">
-                          <span style="float: left;">
-                            申购部门:<span style="margin-left: 10px">{{item1.shen_gou_bu_men_|bumenfilters(bumenList)}}</span>
-                          </span>
-                          <span style="float:right;padding-right: 8px;width: 175px;text-align: left;">日期 :{{item1.dao_huo_ri_qi_}}</span>
+                        <th colspan="15" style="line-height: 12px !important;font-size: 14px !important;">
+                          <h1 style="display:block;line-height: 12px;font-size: 14px;">采购入库单</h1>
                         </th>
                       </tr>
-                      <tr class="title" style="background:#ffffff">
-                        <th colspan="15">
-                          <span style="float:left;">供应商:<span style="margin-left: 10px">{{item1.gong_ying_shang_| gongyingshang(gongyingshangList)}}</span></span>
-                          <span style="float:right;padding-right: 8px;">采购订单编号:{{item1.cai_gou_ding_dan_}} </span>
+                      <tr class="title">
+                        <th colspan="15"  style="background:#ffffff;line-height: 9px;padding-top: 4px;padding-bottom: 7px;">
+                          <span style="float: left;">供应商: {{item1.gong_ying_shang_| gongyingshang(gongyingshangList)}}</span>  
+                          <span style="margin-left: 6px;float: left;">申购部门: {{item1.shen_gou_bu_men_|bumenfilters(bumenList)}}</span>
+                          <span style="margin-left: 6px;float: right;">日期:{{item1.dao_huo_ri_qi_}}</span>  
+                          <span style="margin-left: 6px;float: right;">采购单号:{{item1.cai_gou_ding_dan_}} </span>             
                         </th>
                       </tr>
+                      <!-- <tr class="title" style="background:#ffffff;line-height: 9px;">
+                        <th colspan="15">
+                          <span style="float: left;: 1px;">
+                            领料部门:<span style="margin-left: 10px">{{item1.bu_men_ming_cheng}}</span>
+                          </span>
+                          <span style="float:right;padding-right: 8px;padding: 1px;">领料单号:{{  item1.ling_liao_chu_ku_ }}</span>
+                          <span style="float:right;padding-right: 8px;padding: 1px;width: 165px;">领料日期:{{ item1.ling_liao_ri_qi_}}</span>
+                        </th>
+                      </tr> -->
                       <tr >
                         <th style="width: 40px; line-height: 22px">序号</th>
                         <th style="font-weight: normal">物料编码</th>
@@ -61,13 +69,13 @@
                     </thead>
                     <tbody>
                       <tr v-for="(item, index) in item1" :key="index">
-                        <td style="width: 30px">{{ index + 1 }}</td>
+                        <td style="width: 20px">{{ index + 1 }}</td>
                         <td style="width: 70px">{{ item.wu_liao_bian_ma_ }}</td>
-                        <td style="width: 120px">{{ item.wu_liao_ming_chen }}</td>
+                        <td style="width: 80px">{{ item.wu_liao_ming_chen }}</td>
                         <td style="width: 60px">{{ item.huo_hao_ }}</td>
                         <td style="width: 60px">{{ item.pi_hao_ }}</td>
                         <td style="width: 80px">{{ item.gui_ge_xing_hao_ }}</td>
-                        <td style="width: 120px"> {{ item.gong_ying_shang_| gongyingshang(gongyingshangList) }} </td>
+                        <td style="width: 100px"> {{ item.gong_ying_shang_| gongyingshang(gongyingshangList) }} </td>
                         <td style="width: 45px">{{ item.shu_liang_ }}</td>
                         <td style="width: 45px">{{ item.dan_wei_ }}</td>
                         <td style="width: 60px">{{ item.dan_jia_han_shui_ |numToFixed}}</td>
@@ -78,13 +86,13 @@
                         <td style="width: 60px">{{ item.dan_jia_han_shui_|jineToFixed(item.shu_liang_) }}</td>
                       </tr>
                       <tr>
-                        <td style="width: 30px"></td>
+                        <td style="width: 20px"></td>
                         <td style="width: 70px"></td>
-                        <td style="width: 120px"></td>
+                        <td style="width: 80px"></td>
                         <td style="width: 60px"></td>
                         <td style="width: 60px"></td>
                         <td style="width: 80px"></td>
-                        <td style="width: 120px"></td>
+                        <td style="width: 100px"></td>
                         <td style="width: 45px"></td>
                         <td style="width: 45px"></td>
                         <td style="width: 60px"></td>
@@ -98,13 +106,13 @@
                     <tfoot class="bottom">
                       <tr>
                         <td colspan="5" style="text-align:left">
-                          <div style="float: left;margin-top:2px">仓管员:{{ item1.name2 }}</div>
+                          <div style="float: left;margin-top:5px">仓管员:{{ item1.name2 }}</div>
                         </td>
                         <td colspan="1" class="footer-row">
-                          <div style="margin: 0 auto;margin-top:2px" ref="innerRef"></div>
+                          <div style="margin: 0 auto;margin-top:5px" ref="innerRef"></div>
                         </td>
                         <td colspan="9" style="text-align:right">
-                          <div style="margin-top:2px;padding-right: 2px;">审核人:{{ item1.name3 }} </div>
+                          <div style="margin-top:5px;">审核人:{{ item1.name3 }} </div>
                         </td>
                       </tr>
                     </tfoot>
@@ -339,9 +347,6 @@ export default {
 <style lang="scss" scoped>
 .bottom {
   margin-top: 15px;
-  // display: flex;
-  // justify-content: space-between;
-  // align-items: center;
   font-size: 12px;
 }
 .bottom {
@@ -350,10 +355,7 @@ export default {
   border-left: 1px solid #fff;
   border-right: 1px solid #fff;
 }
-.titlet>th>div{
-  font-size: 18px;
-  // font-weight: bold;
-}
+
 .title{
   border-top: 1px solid #fff;
   border-left: 1px solid #fff;
@@ -366,6 +368,12 @@ export default {
 thead {
   background: #f3f3f3;
 }
+thead > tr > th {
+  font-size: 10px;
+  text-align: center;
+  font-weight: normal;
+  color: #01060c;
+}
 .el-dialog__body {
   color: #0d0e0f;
   font-size: 10px !important;
@@ -394,7 +402,6 @@ thead > tr > th > td {
   // border: 1px solid #000000;
   padding: 5px;
   display: flex;
-  display: flex;
   justify-content: space-between;
   background-color: #fff;
 }

src/views/system/jbdScan/goods/lingliaodan.vue

@@ -14,55 +14,26 @@
             <div
               v-for="(item1, index1) in list"
               :key="index1"
-              style="margin-bottom: 30px;width: 85%;margin:0px -10px 0px 5px;"
+              style="margin-bottom: 30px;width: 89%;margin:0px 0px 0px 0px;"
             >
               <div style="page-break-after: always">
-                <div style="margin: 0px -2px 0px 40px;">
+                <div style="margin: 0px 0px 0px 27px;">
                   <table :border="1">
                     <thead>
                       <tr class="title" style="background:#ffffff">
-                        <th colspan="15">
-                          <h1 style="display:block">领料单</h1>
+                        <th colspan="15" style="line-height: 14px !important;font-size:14px !important;">
+                          <h1 style="display:block;line-height: 14px;font-size: 14px;">领料单</h1>
                         </th>
                       </tr>
-                      <tr class="title" style="background:#ffffff">
-                        <th colspan="15">
+                      <tr class="title" style="background:#ffffff;line-height: 9px;">
+                        <th colspan="15" style="padding-top: 4px;padding-bottom: 7px;">
                           <span style="float: left;">
                             领料部门:<span style="margin-left: 10px">{{item1.bu_men_ming_cheng}}</span>
                           </span>
-                          <span style="float:right;padding-right: 8px;text-align: left;width: 165px;">领 料 日 期:{{ item1.ling_liao_ri_qi_}}</span>
-                        </th>
-                      </tr>
-                      <tr class="title" style="background:#ffffff">
-                        <th colspan="15">
-                          <!-- <span style="float:left;">供应商:<span style="margin-left: 10px">{{item1.gong_ying_shang_| gongyingshang(gongyingshangList)}}</span></span> -->
-                          <span style="float:right;padding-right: 8px;">领料单编号:{{  item1.ling_liao_chu_ku_ }}</span>
+                          <span style="float:right;padding-right: 8px;padding: 1px;">领料单号:{{  item1.ling_liao_chu_ku_ }}</span>
+                          <span style="float:right;padding-right: 8px;padding: 1px;width: 165px;">领料日期:{{ item1.ling_liao_ri_qi_}}</span>
                         </th>
                       </tr>
-                      <!-- <tr class="title">
-                        <th colspan="15">
-                          <div class="word-title" style="background:#fff;">
-                            <h4 style="font-size:16px">领料单</h4>
-                          </div>
-                          <div class="tagBox">
-                            <div>
-                              <div style="font-size: 10px">
-                                领料部门:<span style="margin-left: 10px">{{item1.bu_men_ming_cheng}}</span>
-                              </div>
-                          </div>
-                          <div style="text-align: left;">
-                            <div style=" margin-left: 20px;  margin-right: 5px; font-size: 10px;padding-right: 10px;" >
-                              领料单编号：
-                              <span style="margin-left: 10px">{{  item1.ling_liao_chu_ku_ }}</span>
-                            </div>
-                            <div style="margin-left: 20px;  margin-right: 5px; font-size: 10px; ">
-                              领 料 日 期：
-                              <span style="margin-left: 10px">{{ item1.ling_liao_ri_qi_}}</span>
-                            </div>
-                          </div>
-                        </div>
-                        </th>
-                      </tr> -->
                       <tr>
                         <th style="width: 40px; line-height: 22px">序号</th>
                         <th style="font-weight: normal">物料编码</th>
@@ -111,20 +82,18 @@
                       </tr>
                     </tbody>
                     <tfoot >           
-                      <!-- <tr>
-                        <td colspan="13" style="text-align: right !important;height: 30px;padding-right: 17px;">
-                          合计：{{ item1.heji }}
-                        </td>
-                      </tr> -->
                       <tr class="bottom">
                         <td colspan="4" style="text-align:left">
-                          <div style="float: left;margin-top:10px">领用人/日期：{{ item1.name1 }}/{{ item1.ling_liao_ri_qi_ }}</div>
+                          <!-- <div style="float: left;margin-top:10px">领用人/日期：{{ item1.name1 }}/{{ item1.ling_liao_ri_qi_ }}</div> -->
+                          <div style="float: left;margin-top:5px">领用人:{{ item1.name1 }}</div>
                         </td>
                         <td colspan="4" class="footer-row">
-                          <div style="margin: 0 auto;margin-top:10px">审核人/日期 :{{ item1.name2 }} /{{item1.time2}}</div>
+                          <!-- <div style="margin: 0 auto;margin-top:10px">审核人/日期 :{{ item1.name2 }} /{{item1.time2}}</div> -->
+                          <div style="margin: 0 auto;margin-top:5px">审核人{{ item1.name2 }}</div>
                         </td>
                         <td colspan="5" style="text-align:right">
-                          <div style="margin-top:10px">发放人/日期 :{{ item1.name3 }}/{{ item1.time3 }}</div>
+                          <!-- <div style="margin-top:10px">发放人/日期 :{{ item1.name3 }}/{{ item1.time3 }}</div> -->
+                          <div style="margin-top:5px">发放人:{{ item1.name3 }}</div>
                         </td>
                       </tr>
                     </tfoot>
@@ -333,14 +302,11 @@ export default {
 
 <style lang="scss" scoped>
 .bottom {
-  margin-top: 15px;
-  // display: flex;
-  // justify-content: space-between;
-  // align-items: center;
+  margin-top: 5px;
   font-size: 12px;
 }
 .bottom {
-  margin-top: 15px;
+  margin-top: 5px;
   border-bottom: 1px solid #fff;
   border-left: 1px solid #fff;
   border-right: 1px solid #fff;
@@ -385,7 +351,6 @@ thead > tr > th > td {
   // border: 1px solid #000000;
   padding: 5px;
   display: flex;
-  display: flex;
   justify-content: space-between;
   background-color: #fff;
 }

src/views/system/jbdScan/wuliao/caigourukudan.vue

@@ -23,26 +23,18 @@
                 <div class="tagBox">
                   <div>
                     <div style="font-size: 10px">
-                      申购部门:<span style="margin-left: 10px">{{
-                        item1[0].shen_gou_bu_men_ | bumenfilters(bumenList)
-                      }}</span>
+                      申购部门:<span style="margin-left: 10px">{{item1[0].shen_gou_bu_men_ | bumenfilters(bumenList)}}</span>
                     </div>
                     <div style="font-size: 10px">
-                      供应商:<span style="margin-left: 10px">{{
-                        item1[0].gong_ying_shang_| gongyingshang(gongyingshangList)
-                      }}</span>
+                      供应商:<span style="margin-left: 10px">{{item1[0].gong_ying_shang_| gongyingshang(gongyingshangList)}}</span>
                     </div>
                   </div>
                   <div>
                     <div style="margin-left: 20px;margin-right: 5px;font-size: 10px;padding-right: 20px;">
-                      采购订单编号:<span style="margin-left: 10px;">
-                        {{ item1[0].cai_gou_ding_dan_ }}</span
-                      >
+                      采购单号:<span style="margin-left: 10px;">{{ item1[0].cai_gou_ding_dan_ }}</span>
                     </div>
                     <div style=" margin-left: 20px; margin-right: 5px; font-size: 10px;">
-                      日期:<span style="margin-left: 10px">{{
-                        item1[0].dao_ku_ri_qi_
-                      }}</span>
+                      日期:<span style="margin-left: 10px">{{item1[0].dao_ku_ri_qi_}}</span>
                     </div>
                   </div>
                 </div>

src/views/system/jbdScan/wuliao/chnangguirukudan.vue

@@ -15,29 +15,23 @@
             <div
               v-for="(item1, index1) in list"
               :key="index1"
-              style="margin-bottom: 30px;margin: 0px -10px 0px 5px;width: 85%;"
+              style="margin-bottom: 30px;width: 89%;margin: 0px 0px 0px 0px;"
             >
               <div style="page-break-after: always">
-                <div style="margin: 0px -2px 0px 40px;">
+                <div style="margin: 0px 0px 0px 27px;">
                   <table :border="1">
                     <thead>
                       <tr class="title" style="background:#ffffff">
-                        <th colspan="15">
-                          <div style="line-height: 16px;font-size: 18px;font-weight: bold;">采购入库单</div>
+                        <th colspan="15" style="line-height: 12px !important;font-size: 14px !important;">
+                          <h1 style="display:block;line-height: 12px;font-size: 14px;">采购入库单</h1>
                         </th>
                       </tr>
-                      <tr class="title" style="background:#ffffff">
-                        <th colspan="15">
-                          <span style="float: left;">
-                            申购部门:<span style="margin-left: 10px">{{item1.shen_gou_bu_men_|bumenfilters(bumenList)}}</span>
-                          </span>
-                          <span style="float:right;padding-right: 8px;">日期 :{{item1.dao_huo_ri_qi_}}</span>
-                        </th>
-                      </tr>
-                      <tr class="title" style="background:#ffffff">
-                        <th colspan="15">
-                          <span style="float:left;">供应商:<span style="margin-left: 10px">{{item1.gong_ying_shang_| gongyingshang(gongyingshangList)}}</span></span>
-                          <span style="float:right;padding-right: 8px;">采购订单编号:{{item1.cai_gou_ding_dan_}}</span>
+                      <tr class="title">
+                        <th colspan="15"  style="background:#ffffff;line-height: 9px;padding-top: 4px;padding-bottom: 7px;">
+                          <span style="float: left;">供应商: {{item1.gong_ying_shang_| gongyingshang(gongyingshangList)}}</span>  
+                          <span style="margin-left: 6px;float: left;">申购部门: {{item1.shen_gou_bu_men_|bumenfilters(bumenList)}}</span>
+                          <span style="margin-left: 6px;float: right;">日期:{{item1.dao_huo_ri_qi_}}</span>  
+                          <span style="margin-left: 6px;float: right;">采购单号:{{item1.cai_gou_ding_dan_}} </span>             
                         </th>
                       </tr>
                       <tr>
@@ -62,14 +56,14 @@
                       <tr v-for="(item, index) in item1" :key="index">
                         <td style="width: 30px">{{ index + 1 }}</td>
                         <td style="width: 70px">{{ item.wu_liao_bian_ma_ }}</td>
-                        <td style="width: 120px">{{ item.wu_liao_ming_chen }}</td>
+                        <td style="width: 80px">{{ item.wu_liao_ming_chen }}</td>
                         <td style="width: 60px">{{ item.huo_hao_ }}</td>
                         <td style="width: 60px">{{ item.pi_hao_ }}</td>
                         <td style="width: 80px">{{ item.gui_ge_xing_hao_ }}</td>
-                        <td style="width: 120px"> {{ item.gong_ying_shang_| gongyingshang(gongyingshangList) }} </td>
+                        <td style="width: 100px"> {{ item.gong_ying_shang_| gongyingshang(gongyingshangList) }} </td>
                         <td style="width: 45px">{{ item.shu_liang_ }}</td>
                         <td style="width: 45px">{{ item.dan_wei_ }}</td>
-                        <td style="width: 100px">{{ item.dan_jia_han_shui_|numToFixed }}</td>
+                        <td style="width: 60px">{{ item.dan_jia_han_shui_|numToFixed }}</td>
                         <td style="width: 40px">{{ item.shui_lv_ }}</td>
                         <td style="width: 40px">{{ item.dan_jia_|numToFixed}}</td>
                         <td style="width: 45px"> {{ item.dan_jia_han_shui_|shuieToFixed(item.shu_liang_,item.dan_jia_) }}</td>
@@ -79,11 +73,11 @@
                       <tr>
                         <td style="width: 30px"></td>
                         <td style="width: 70px"></td>
-                        <td style="width: 120px"></td>
+                        <td style="width: 80px"></td>
                         <td style="width: 60px"></td>
                         <td style="width: 60px"></td>
                         <td style="width: 80px"></td>
-                        <td style="width: 120px"></td>
+                        <td style="width: 100px"></td>
                         <td style="width: 45px"></td>
                         <td style="width: 45px"></td>
                         <td style="width: 60px"></td>
@@ -97,13 +91,13 @@
                      <tfoot class="bottom">             
                       <tr>
                         <td colspan="6" style="text-align:left">
-                          <div style="margin-top:10px">仓管员:{{ item1.name2 }}</div>
+                          <div style="margin-top:5px">仓管员:{{ item1.name2 }}</div>
                         </td>
                         <!-- <td colspan="1" class="footer-row">
                           <div style="margin-top:10px">{{index1}}</div>
                         </td> -->
                         <td colspan="9" style="text-align:right">
-                          <div style="margin-top:10px">审核人:{{ item1.name3 }} </div>
+                          <div style="margin-top:5px">审核人:{{ item1.name3 }} </div>
                         </td>
                       </tr>
                     </tfoot>

src/views/system/jbdScan/wuliao/lingliaodan.vue

@@ -7,59 +7,31 @@
       title="领料单"
       :visible.sync="alertVisible "
     >
-      <!-- 表单是否显示 -->
+      <!-- 表单是否显示 列表页面打印-->
       <div style="height: 500px; width: 90%; margin: 0 auto">
         <div ref="qrcode" id="box">
           <vue-easy-print tableShow ref="easyPrint" :onePageRow="onePageRow">
             <div
               v-for="(item1, index1) in list"
               :key="index1"
-              style="margin-bottom: 30px;width: 85%;margin:0px -10px 0px 5px;"
+              style="margin-bottom: 30px;width: 89%;margin:0px 0px 0px 0px;"
             >
               <div style="page-break-after: always">
-                <!-- <div class="word-title">
-                  <h4>领料单</h4>
-                </div>
-                <div class="tagBox">
-                  <div>
-                    <div style="font-size: 10px">
-                      领料部门:
-                      <span style="margin-left: 10px">
-                      {{item1.bu_men_ming_cheng}}</span>
-                    </div>
-                  </div>
-                  <div>
-                    <div style=" margin-left: 20px;  margin-right: 5px; font-size: 10px;padding-right: 10px;" >
-                      领料单编号：
-                      <span style="margin-left: 10px">{{  item1.ling_liao_chu_ku_ }}</span>
-                    </div>
-                    <div style="margin-left: 20px;  margin-right: 5px; font-size: 10px; ">
-                      领 料 日 期：
-                      <span style="margin-left: 10px">{{ item1.ling_liao_ri_qi_}}</span>
-                    </div>
-                  </div> -->
-                <!-- </div> -->
-                <div style="margin: 0px -2px 0px 40px;"> 
+                <div style="margin: 0px 0px 0px 27px;"> 
                   <table :border="1">
                     <thead>
                       <tr class="title" style="background:#ffffff">
-                        <th colspan="15">
-                          <!-- <h1 style="display:block;font-size: 18px;">领料单</h1> -->
-                          <div style="line-height: 16px;font-size: 18px;font-weight: bold;">领料单</div>
+                        <th colspan="15" style="line-height: 12px !important;font-size: 14px !important;">
+                          <h1 style="display:block;line-height: 12px;font-size: 14px;">领料单</h1>
                         </th>
-                      </tr>
-                      <tr class="title" style="background:#ffffff">
-                        <th colspan="15">
+                      </tr> 
+                      <tr class="title" style="background:#ffffff;line-height: 9px;">
+                        <th colspan="15" style="padding-top: 2px;padding-bottom: 7px;">
                           <span style="float: left;">
-                            领料部门:<span style="margin-left: 10px">{{item1.bu_men_ming_cheng}}</span>
+                            领料部门:<span style="">{{item1.bu_men_ming_cheng}}</span>
                           </span>
-                          <span style="float:right;padding-right: 8px;text-align: left;width: 165px;">领 料 日 期:{{ item1.ling_liao_ri_qi_}}</span>
-                        </th>
-                      </tr>
-                      <tr class="title" style="background:#ffffff">
-                        <th colspan="15">
-                          <!-- <span style="float:left;">供应商:<span style="margin-left: 10px">{{item1.gong_ying_shang_| gongyingshang(gongyingshangList)}}</span></span> -->
-                          <span style="float:right;padding-right: 8px;">领料单编号:{{  item1.ling_liao_chu_ku_ }}</span>
+                          <span style="float:right;padding-right: 8px;padding: 1px;margin-left: 10px">领料单号:{{  item1.ling_liao_chu_ku_ }}</span>
+                          <span style="float:right;padding-right: 8px;padding: 1px;width: 165px;margin-left: 10px">领料日期:{{ item1.ling_liao_ri_qi_}}</span>
                         </th>
                       </tr>
                       <tr>
@@ -112,18 +84,17 @@
                   </table>
                 </div>
                 <div class="bottom">
-                  <div></div>
-                  <div style="float: left;margin-left: 38px;">
-                    领用人/日期：
-                    {{ item1.name1 }}/{{ item1.ling_liao_ri_qi_ }}
+                  <div style="float: left;margin-left: 38px;margin-top:5px">
+                    领用人:
+                    {{ item1.name1 }}
                   </div> 
-                  <div style="float: left;margin-left: 80px;">
-                    审核人/日期 :
-                    {{ item1.name2 }} /{{item1.time2}}
+                  <div style="float: left;margin-left: 200px;margin-top:5px">
+                    审核人:
+                    {{ item1.name2 }}
                   </div>
-                  <div style="float: right">
-                    发放人/日期 :
-                    {{ item1.name3 }}/{{ item1.time3 }}
+                  <div style="float: right;margin-top:5px">
+                    发放人:
+                    {{ item1.name3 }}
                   </div>
                 </div>
               </div>
@@ -430,14 +401,14 @@ td {
 </style> -->
 <style lang="scss" scoped>
 .bottom {
-  margin-top: 15px;
+  margin-top: 5px;
   // display: flex;
   // justify-content: space-between;
   // align-items: center;
   font-size: 12px;
 }
 .bottom {
-  margin-top: 15px;
+  margin-top: 5px;
   border-bottom: 1px solid #fff;
   border-left: 1px solid #fff;
   border-right: 1px solid #fff;