Browse Source

Merge branch 'dev' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc into dev

gjy 3 years ago
parent
commit
b2ba5109ac

+ 12 - 32
public/static/weightCheck.html

@@ -255,7 +255,7 @@
                 <td class="col col-bgc" v-if="item.serviceManagementType == 3">客户姓名</td>
                 <td class="col" colspan="2" v-if="item.serviceManagementType == 3">{{item.customer}}</td>
                 <td class="col col-bgc" v-if="item.serviceManagementType == 1">发货单位</td>
-                <td class="col" colspan="2" v-if="item.serviceManagementType == 1">{{item.contractManagement ? item.contractManagement.seller : ""}}</td>
+                <td class="col" colspan="2" v-if="item.serviceManagementType == 1">{{item.customer}}</td>
                 <td class="col col-bgc" v-if="item.serviceManagementType == 3">客户电话</td>
                 <td class="col" v-if="item.serviceManagementType == 3">{{item.customerPhone}}</td>
                 <td class="col col-bgc" v-if="item.serviceManagementType == 1">联系电话</td>
@@ -345,14 +345,8 @@
         </div>
       </div>
       <div v-else>
-<<<<<<< HEAD
-        <div class="content" v-if="bigContent" v-for="(_item,index) in tableData">
-
-          <!-- <div class="title">{{_item.compName}}</div> -->
-=======
-        <div class="content" v-if="bigContent">
-          <div class="title">{{tableData.compName}}</div>
->>>>>>> rukuguanli
+        <div class="content" v-if="bigContent" v-for="(_item,index) in tableData ">
+          <div class="title">{{_item.compName}}</div>
           <div class="title">入库检斤单</div>
           <div class="left">
             <img :src="_item.codeUrl" alt="">
@@ -360,21 +354,14 @@
           <div class="number">{{_item.number}}</div>
           <table class="table">
             <tr class="row">
-<<<<<<< HEAD
-              <td class="col col-bgc">客户姓名</td>
-              <td class="col" colspan="2">{{_item.customer}}</td>
-              <td class="col col-bgc">客户电话</td>
-              <td class="col">{{_item.customerPhone}}</td>
-=======
-              <td class="col col-bgc" v-if="tableData.serviceManagementType == 3">客户姓名</td>
-              <td class="col" colspan="2" v-if="tableData.serviceManagementType == 3">{{tableData.customer}}</td>
-              <td class="col col-bgc" v-if="tableData.serviceManagementType == 1">发货单位</td>
-              <td class="col" colspan="2" v-if="tableData.serviceManagementType == 1">{{tableData.contractManagement ? tableData.contractManagement.seller : ""}}</td>
-              <td class="col col-bgc" v-if="tableData.serviceManagementType == 3">客户电话</td>
-              <td class="col" v-if="tableData.serviceManagementType == 3">{{tableData.customerPhone}}</td>
-              <td class="col col-bgc" v-if="tableData.serviceManagementType == 1">联系电话</td>
-              <td class="col" v-if="tableData.serviceManagementType == 1">{{tableData.contractManagement ? tableData.contractManagement.sellerPhone : ""}}</td>
->>>>>>> rukuguanli
+              <td class="col col-bgc" v-if="_item.serviceManagementType == 3">客户姓名</td>
+              <td class="col" colspan="2" v-if="_item.serviceManagementType == 3">{{_item.customer}}</td>
+              <td class="col col-bgc" v-if="_item.serviceManagementType == 1">发货单位</td>
+              <td class="col" colspan="2" v-if="_item.serviceManagementType == 1">{{_item.customer}}</td>
+              <td class="col col-bgc" v-if="_item.serviceManagementType == 3">客户电话</td>
+              <td class="col" v-if="_item.serviceManagementType == 3">{{_item.customerPhone}}</td>
+              <td class="col col-bgc" v-if="_item.serviceManagementType == 1">联系电话</td>
+              <td class="col" v-if="_item.serviceManagementType == 1">{{_item.contractManagement ? _item.contractManagement.sellerPhone : ""}}</td>
               <td class="col col-bgc">车牌号</td>
               <td class="col" colspan="2">{{_item.carNumber}}</td>
             </tr>
@@ -476,15 +463,7 @@
           <div>客户姓名</div>
           <div>{{tableData.customer}}</div>
         </div>
-<<<<<<< HEAD
-        <div class="small-row">
-          <div>客户身份证:</div>
-          <div>{{tableData.customerNumberCard}}</div>
-        </div>
-        <div class="small-row">
-=======
         <div class="small-row" v-if="tableData.serviceManagementType == 3">
->>>>>>> remotes/origin/rukuguanli
           <div>客户电话</div>
           <div>{{tableData.customerPhone}}</div>
         </div>
@@ -628,6 +607,7 @@
           this.tableData = JSON.parse(_data)
           console.log("sssss",this.tableData)
         }
+        console.log("ooooooo",this.tableData1)
         // sessionStorage.setItem('record_print', JSON.stringify(response))
         // this.tableData = JSON.parse(sessionStorage.getItem("record_print"))
 

+ 8 - 8
src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -105,14 +105,6 @@
                 <ws-form-item v-if='statusTypetext!="初检"&&serviceManagementType==1' label="经办人" span="1" prop="agent">
                   <ws-input v-model="deptBudgetList.agent" placeholder="自动获取,不可编辑" maxlength="100" disabled size="small" />
                 </ws-form-item>
-                <ws-form-item label="净重单价(元/公斤)" span="1" prop="tidalGrainPrice" v-if="deptBudgetList.type == '潮粮' && serviceManagementType == 3">
-                  <ws-input type="number" @mousewheel.native.prevent v-model="deptBudgetList.tidalGrainPrice" placeholder="请输入净重单价"
-                    maxlength="10" size="small"  />
-                </ws-form-item>
-                <ws-form-item label="干粮单价(元/公斤)" span="2" prop="dryGrainPrice" v-if="deptBudgetList.type == '干粮' && serviceManagementType == 3">
-                  <ws-input type="number" @mousewheel.native.prevent v-model="deptBudgetList.dryGrainPrice" placeholder="请输入干粮单价"
-                    maxlength="10" size="small"  />
-                </ws-form-item>
                 <ws-form-item v-if='serviceManagementType==3' label="类型" span="1" prop="type">
                   <ws-select v-model="deptBudgetList.type" disabled>
                     <ws-option v-for="item in typeList" :key="'leixin'+item" :label="item" :value="item" />
@@ -188,6 +180,14 @@
                 <ws-form-item label="封号-2" span="1" prop="titleNoOther" v-if="deptBudgetList.outType == '汽运' ||deptBudgetList.outType == '集装箱船'||serviceManagementType==3">
                   <ws-input :disabled='recheck' v-model="deptBudgetList.titleNoOther" placeholder="请输入封号" maxlength="20" size="small" />
                 </ws-form-item>
+                  <ws-form-item label="净重单价(元/公斤)" span="1" prop="tidalGrainPrice" v-if="deptBudgetList.type == '潮粮' && serviceManagementType == 3">
+                  <ws-input type="number" @mousewheel.native.prevent v-model="deptBudgetList.tidalGrainPrice" placeholder="请输入净重单价"
+                    maxlength="10" size="small"  />
+                </ws-form-item>
+                <ws-form-item label="干粮单价(元/公斤)" span="2" prop="dryGrainPrice" v-if="deptBudgetList.type == '干粮' && serviceManagementType == 3">
+                  <ws-input type="number" @mousewheel.native.prevent v-model="deptBudgetList.dryGrainPrice" placeholder="请输入干粮单价"
+                    maxlength="10" size="small"  />
+                </ws-form-item>
               </ws-info-table>
 
               <div class="title">质检数据</div>

+ 265 - 17
src/views/houseSelfCollect/newWeighingManagement.vue

@@ -140,7 +140,7 @@
               <div class="but">
                 <!-- <el-button @click="print" type="primary" :disabled="submitAllow">提交</el-button> -->
                 <el-button @click="print" v-if="information == '毛重'" type="primary">保存</el-button>
-                <el-button @click="print" v-if="information == '皮重'" type="primary" :disabled="submitAllow">保存并打印
+                <el-button @click="print(1)" v-if="information == '皮重'" type="primary" :disabled="submitAllow">保存并打印
                 </el-button>
               </div>
             </div>
@@ -217,6 +217,55 @@
         <el-button type="primary" @click="printBig">打印单据</el-button>
       </div>
     </el-dialog>
+    <div class="mask" v-show="isShowPrintType"></div>
+    <div class="print-type" v-show="isShowPrintType">
+      <div class="print-type-content">
+        <div class="print-type-title">请选择打印类型</div>
+        <div class="print-type-checkbox">
+          <!-- <el-radio-group v-model="radio">
+            <el-radio label="A4" class="label-width" @change="selectType">A4</el-radio>
+            <el-radio label="A5" class="label-width" @change="selectType">A5</el-radio>
+          </el-radio-group> -->
+        </div>
+        <div class="shdw-style" v-if="checked||(!ddchecked&&!checked)">
+          <div>收货单位:</div>
+          <!-- <div>{{companyName}}</div> -->
+          <el-select v-model="companyName" placeholder="请选择" style="width: 75%;">
+            <el-option v-for="item in companyNameOptions" :key="item.value" :label="item.label" :value="item.value">
+            </el-option>
+          </el-select>
+        </div>
+        <div v-if="warehouseName=='鲅鱼圈金信库'||warehouseName=='白城内陆港'">
+          <div class="print-type-ew">
+            <el-checkbox v-model="checked" @change="changeEw">打印额外票据</el-checkbox>
+            <el-checkbox v-model="ddchecked" @change="changeEwDD">单独打印额外票据</el-checkbox>
+          </div>
+          <div class="ew-print" v-if="printSeparately">
+            <div class="row">
+              <div>额外客户姓名:</div>
+              <!-- <div>{{companyName}}</div> -->
+              <el-select v-model="ewCustomer" placeholder="请选择" style="width: 75%;">
+                <el-option v-for="item in ewCustomerOptions" :key="item.value" :label="item.label" :value="item.value">
+                </el-option>
+              </el-select>
+            </div>
+            <div class="row">
+              <div>额外收货单位:</div>
+              <!-- <div>{{companyNameEW}}</div> -->
+              <el-select v-model="companyNameEW" placeholder="请选择" style="width: 75%;">
+                <el-option v-for="item in companyNameEWOptions" :key="item.value" :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bottom-btn">
+        <el-button @click="typePrintClick">确定</el-button>
+        <el-button @click="typePrintCannelClick">取消</el-button>
+      </div>
+    </div>
   </div>
 </template>
 <script>
@@ -325,6 +374,47 @@
         submitAllow: false,
         id: "",
         inOutDate: {},
+        idPrint:"",
+        ewCustomerOptions: [{
+            value: '黑龙江利润元粮食贸易有限公司',
+            label: '黑龙江利润元粮食贸易有限公司'
+          }, {
+            value: '黑龙江众利合粮食贸易有限公司',
+            label: '黑龙江众利合粮食贸易有限公司'
+          }, {
+            value: '黑龙江鑫满仓粮食贸易有限公司',
+            label: '黑龙江鑫满仓粮食贸易有限公司'
+          }, {
+            value: '黑龙江中天昊元贸易有限公司',
+            label: '黑龙江中天昊元贸易有限公司'
+          }],
+        companyNameOptions: [{
+          value: '黑龙江利润元粮食贸易有限公司',
+          label: '黑龙江利润元粮食贸易有限公司'
+        }, {
+          value: '黑龙江众利合粮食贸易有限公司',
+          label: '黑龙江众利合粮食贸易有限公司'
+        }, {
+          value: '黑龙江鑫满仓粮食贸易有限公司',
+          label: '黑龙江鑫满仓粮食贸易有限公司'
+        }, {
+          value: '黑龙江中天昊元贸易有限公司',
+          label: '黑龙江中天昊元贸易有限公司'
+        }, ],
+        companyNameEWOptions: [{
+          value: '厦门建发物产有限公司',
+          label: '厦门建发物产有限公司'
+        }],
+        companyName: '黑龙江利润元粮食贸易有限公司',
+        companyNameEW: "厦门建发物产有限公司",
+        ewCustomer: "黑龙江利润元粮食贸易有限公司",
+         ewradio: '',
+        ddchecked: false,
+        checked: false,
+        isShowPrintType:false,
+        dialogDataList:[],
+        jjSelectPrintList:[],
+        printSeparately:false,
       }
     },
     activated() {
@@ -402,6 +492,61 @@
 
     },
     methods: {
+      changeEw(e) {
+        this.ddchecked = false
+        if (e) {
+          this.printSeparately = true
+        } else {
+          this.printSeparately = false
+        }
+      },
+        changeEwDD(e) {
+        this.checked = false
+        if (e) {
+          this.printSeparately = true
+        } else {
+          this.printSeparately = false
+        }
+      },
+       typePrintCannelClick() {
+           this.ddchecked =  false,
+        this.checked = false,
+        this.dialogDataList = []//打个打印取消时数组至空
+        this.isShowPrintType = false
+      },
+      async typePrintClick(type) {
+           getPrint({
+              id: this.idPrint
+            })
+            .toPromise()
+            .then((response) => {
+              this.dialogDataList = []//点击确认时先清空要打印的数组
+              this.dialogData = response
+              if (response.compName == '黑龙江秋收有限公司') {
+                this.dialogData.compName = '黑龙江中天昊元贸易有限公司'
+              }
+              if (this.checked) {
+                this.dialogDataList.push( this.dialogData)
+                var _datas = JSON.stringify(this.dialogData) 
+                _datas = JSON.parse(_datas)
+                _datas.compName = this.companyNameEW;
+                _datas.customer = this.ewCustomer
+                this.dialogDataList.push(_datas)
+             }else if(this.ddchecked){
+                _datas = this.dialogData
+                _datas.compName = this.companyNameEW;
+                _datas.customer = this.ewCustomer
+                this.dialogDataList.push(_datas)
+             }else{
+                this.dialogData.compName = this.companyName
+                this.dialogDataList.push( this.dialogData)
+             }
+             console.log("dsdi",this.dialogDataList)
+              window.open('../../../../static/weightCheck.html?type=2&tableData=' + JSON.stringify(this.dialogDataList))
+              // this.printBig("", this.radio)
+            })
+            .catch((response) => {})
+      },
       warehouseNameChange() {
         localStorage.setItem('ck', this.warehouseName)
         this.weighingList.warehouseName = this.warehouseName
@@ -1127,6 +1272,8 @@
                     title: '成功',
                     message: '保存成功',
                   })
+                  this.idPrint = response
+                  this.isShowPrintType = true
                   this.getList()
                   //贸易入库需要再走入库接口
                   if (this.inWarehouseType == 1) {
@@ -1147,22 +1294,6 @@
                       addstorageputList(inOutDate).toPromise().then((response) => {})
                     })
                   }
-                  getPrint({
-                      id: response,
-                    })
-                    .toPromise()
-                    .then((response) => {
-                      this.isShowPrint = true
-                      this.inspect = response
-                      // this.inspect.qrCodeUrl = res
-                      if (response.compName == '黑龙江秋收有限公司') {
-                        this.inspect.compName = '黑龙江中天昊元贸易有限公司'
-                      }
-                      this.inspect.a = '中天'
-                      // })
-                    })
-                    .catch((response) => {
-                    })
                 })
                 .catch((response) => {
                 })
@@ -1599,4 +1730,121 @@
     font-weight: 600;
     text-align: left;
   }
+  .mask {
+    background: black;
+    width: 100vw;
+    height: 100vh;
+    position: fixed;
+    top: 0;
+    z-index: 99;
+    opacity: 0.3;
+  }
+
+  .print-type-title {
+    text-align: center;
+    font-size: 18px;
+    margin: 20px;
+  }
+
+  .bottom-btn {
+    display: flex;
+    margin-top: 20px;
+    justify-content: space-around;
+  }
+
+  .print-type-checkbox {
+    // padding-left: 20px;
+  }
+
+  .print-type {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    margin: auto;
+    width: 440px;
+    height: 320px;
+    background: white;
+    border-radius: 10px;
+    z-index: 999;
+  }
+
+  /deep/.el-radio-group {
+    width: 100%;
+    display: flex;
+  }
+
+  /deep/.el-radio__label {
+    font-size: 20px;
+  }
+
+  /deep/.el-radio__inner {
+    // background: red;
+    height: 20px;
+    width: 20px;
+  }
+
+  .label-width {
+    width: 100%;
+    text-align: center;
+    font-size: 20px;
+  }
+
+  .show-excel {
+    opacity: 0;
+  }
+
+  /deep/.base_header_layout .find.el-button--primary {
+    width: 30px;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+  }
+
+  /deep/.base_header_layout .findinput input {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+  }
+
+  .ew-print {
+    padding: 0 20px;
+    margin-top: 10px;
+
+    // display: flex;
+    // justify-content: space-between;
+    // align-content: center;
+    .row {
+      display: flex;
+      margin-top: 10px;
+      align-items: center;
+    }
+  }
+
+  .sh-address {
+    display: flex;
+  }
+
+  .print-type-ew {
+    display: flex;
+    justify-content: space-between;
+    padding: 0 20px;
+
+    /deep/.el-radio__label {
+      font-size: 14px;
+    }
+
+    margin-top: 10px;
+  }
+
+  /deep/.el-table .cell {
+    text-align: center;
+  }
+
+  .shdw-style {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 0 20px;
+    margin-top: 20px;
+  }
 </style>

+ 1 - 1
src/views/houseSelfCollect/weighingManagement.vue

@@ -527,7 +527,7 @@
                 _datas.customer = this.ewCustomer
                 this.dialogDataList.push(_datas)
              }else{
-              this.dialogData.companyName = this.companyName
+              this.dialogData.compName = this.companyName
                 this.dialogDataList.push( this.dialogData)
              }
               this.printBig("", this.radio)

+ 333 - 16
src/views/houseSelfCollect/weightCheckRecord.vue

@@ -33,7 +33,9 @@
        <el-button :type="choice == ''?'primary':''" size="small" @click="screen()" class="btn_css">全部</el-button>
           <el-button :type="choice == 2?'primary':''" size="small" @click="screen(2)" class="btn_css">已称毛重</el-button>
           <el-button :type="choice == 3?'primary':''" size="small" @click="screen(3)" class="btn_css">已称皮重</el-button>
-      <el-table class="forData" :data="weighingRecordList" style="width: 100%; margin-top: 20px" height="780">
+          <el-button  size="small" @click="print('',1)">批量打印</el-button>
+      <el-table class="forData" :data="weighingRecordList" style="width: 100%; margin-top: 20px" height="780" @selection-change="handleSelectionChange">
+           <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column type="index" label="序号" width="80">
           <template scope="scope">
             <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
@@ -73,6 +75,56 @@
         :total="deptBudgetTotal">
       </el-pagination>
     </div>
+    <div class="mask" v-show="isShowPrintType"></div>
+    <div class="print-type" v-show="isShowPrintType">
+      <div class="print-type-content">
+        <div class="print-type-title">请选择打印纸张类型</div>
+        <div class="print-type-checkbox">
+          <!-- <el-radio-group v-model="radio">
+            <el-radio label="A4" class="label-width" @change="selectType">A4</el-radio>
+            <el-radio label="A5" class="label-width" @change="selectType">A5</el-radio>
+          </el-radio-group> -->
+        </div>
+
+        <div class="shdw-style" v-if="checked||(!ddchecked&&!checked)">
+          <div>收货单位:</div>
+          <!-- <div>{{companyName}}</div> -->
+          <el-select v-model="companyName" placeholder="请选择" style="width: 75%;">
+            <el-option v-for="item in companyNameOptions" :key="item.value" :label="item.label" :value="item.value">
+            </el-option>
+          </el-select>
+        </div>
+        <div v-if="warehouseName=='鲅鱼圈金信库'||warehouseName=='白城内陆港'">
+          <div class="print-type-ew">
+            <el-checkbox v-model="checked" @change="changeEw">打印额外票据</el-checkbox>
+            <el-checkbox v-model="ddchecked" @change="changeEwDD">单独打印额外票据</el-checkbox>
+          </div>
+          <div class="ew-print" v-if="printSeparately">
+            <div class="row">
+              <div>额外客户姓名:</div>
+              <!-- <div>{{companyName}}</div> -->
+              <el-select v-model="ewCustomer" placeholder="请选择" style="width: 75%;">
+                <el-option v-for="item in ewCustomerOptions" :key="item.value" :label="item.label" :value="item.value">
+                </el-option>
+              </el-select>
+            </div>
+            <div class="row">
+              <div>额外收货单位:</div>
+              <!-- <div>{{companyNameEW}}</div> -->
+              <el-select v-model="companyNameEW" placeholder="请选择" style="width: 75%;">
+                <el-option v-for="item in companyNameEWOptions" :key="item.value" :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="bottom-btn">
+        <el-button @click="typePrintClick">确定</el-button>
+        <el-button @click="typePrintCannelClick">取消</el-button>
+      </div>
+    </div>
     <el-dialog width="70%" class="table-content" center :visible.sync="isShowPrint" title="粮食检斤单">
       <weightCheckPrint :tableData="dialogData"></weightCheckPrint>
       <div style="text-align:center">
@@ -117,6 +169,48 @@
         isShowPrint:false,
         dialogData:{},
         title:"",
+        modification:[],
+        ewCustomerOptions: [{
+            value: '黑龙江利润元粮食贸易有限公司',
+            label: '黑龙江利润元粮食贸易有限公司'
+          }, {
+            value: '黑龙江众利合粮食贸易有限公司',
+            label: '黑龙江众利合粮食贸易有限公司'
+          }, {
+            value: '黑龙江鑫满仓粮食贸易有限公司',
+            label: '黑龙江鑫满仓粮食贸易有限公司'
+          }, {
+            value: '黑龙江中天昊元贸易有限公司',
+            label: '黑龙江中天昊元贸易有限公司'
+          }],
+        companyNameOptions: [{
+          value: '黑龙江利润元粮食贸易有限公司',
+          label: '黑龙江利润元粮食贸易有限公司'
+        }, {
+          value: '黑龙江众利合粮食贸易有限公司',
+          label: '黑龙江众利合粮食贸易有限公司'
+        }, {
+          value: '黑龙江鑫满仓粮食贸易有限公司',
+          label: '黑龙江鑫满仓粮食贸易有限公司'
+        }, {
+          value: '黑龙江中天昊元贸易有限公司',
+          label: '黑龙江中天昊元贸易有限公司'
+        }, ],
+        companyNameEWOptions: [{
+          value: '厦门建发物产有限公司',
+          label: '厦门建发物产有限公司'
+        }],
+        companyName: '黑龙江利润元粮食贸易有限公司',
+        companyNameEW: "厦门建发物产有限公司",
+        ewCustomer: "黑龙江利润元粮食贸易有限公司",
+         ewradio: '',
+        ddchecked: false,
+        checked: false,
+        isShowPrintType:false,
+        dialogDataList:[],
+        jjSelectPrintList:[],
+        printSeparately:false,
+        onePrint:false,
       }
     },
     activated() {
@@ -134,6 +228,37 @@
       this.getList()
     },
     methods: {
+       typePrintCannelClick() {
+        this.onePrint = false//单个打印标识
+        this.dialogDataList = []//打个打印取消时数组至空
+        this.isShowPrintType = false
+      },
+       handleSelectionChange(val) {
+        this.modification = val;
+      },
+      // batchPrint(){
+      //   if(this.modification.length == 0){
+      //     this.$message.error("请选择批量打印的条目!")
+      //     return
+      //   }
+      //   // this.isShowPrintType = true
+      // },
+      changeEw(e) {
+        this.ddchecked = false
+        if (e) {
+          this.printSeparately = true
+        } else {
+          this.printSeparately = false
+        }
+      },
+        changeEwDD(e) {
+        this.checked = false
+        if (e) {
+          this.printSeparately = true
+        } else {
+          this.printSeparately = false
+        }
+      },
       lookup(){
         this.getList()
       },
@@ -148,36 +273,111 @@
       returnsales() {
         this.$router.go(-1)
       },
-     print(row) {
-          getPrint({
-              id: row.id
+      async typePrintClick(type) {
+        if(this.onePrint){//判断是否是单个打印
+           getPrint({
+              id: this.idPrint
             })
             .toPromise()
             .then((response) => {
-              this.isShowPrint = true
+              this.dialogDataList = []//点击确认时先清空要打印的数组
               this.dialogData = response
               if (response.compName == '黑龙江秋收有限公司') {
                 this.dialogData.compName = '黑龙江中天昊元贸易有限公司'
               }
+              if (this.checked) {
+                this.dialogDataList.push( this.dialogData)
+                var _datas = JSON.stringify(this.dialogData) 
+                _datas = JSON.parse(_datas)
+                _datas.compName = this.companyNameEW;
+                _datas.customer = this.ewCustomer
+                this.dialogDataList.push(_datas)
+             }else if(this.ddchecked){
+                _datas = this.dialogData
+                _datas.compName = this.companyNameEW;
+                _datas.customer = this.ewCustomer
+                this.dialogDataList.push(_datas)
+             }else{
+                this.dialogData.companyName = this.companyName
+                this.dialogDataList.push( this.dialogData)
+             }
+              this.printBig("", this.radio)
             })
             .catch((response) => {
               // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
             })
+        }else{
+        //   if (this.isExcelPrint) {
+        //   this.printBig(2, this.radio)
+        //   this.isExcelPrint = false
+        // } else {
+          this.jjSelectPrintList = []
+          let index1 = 0;
+          for (let i = 0; i < this.modification.length; i++) {
+            await getPrint({
+                id: this.modification[i].id
+              })
+              .toPromise()
+              .then((response) => {
+                index1++;
+                response.compName = this.companyName
+                if (response.compName == '黑龙江秋收有限公司') {
+                  response.compName = '黑龙江中天昊元贸易有限公司'
+                }
+                this.jjSelectPrintList.push(response)
+                if (index1 == this.modification.length) {
+                  this.printBig(1, this.radio)
+                }
+              })
+              .catch((response) => {})
+          }
+        // }
+        }
+      },
+      makeEWjjSelectPrintList() {
+        let _selectPrint_EWjjSelectPrintList = JSON.parse(JSON.stringify(this.jjSelectPrintList));
+        for (let i = 0; i < _selectPrint_EWjjSelectPrintList.length; i++) {
+          let _data = _selectPrint_EWjjSelectPrintList[i];
+          _data.compName = this.companyNameEW;
+          _data.customer = this.ewCustomer
+        }
+        localStorage.setItem('selectPrint_EWjjSelectPrintList', JSON.stringify(_selectPrint_EWjjSelectPrintList))
+      },
+    print(row, type, pageType) {
+      //打印
+        if (type == 1) {
+            if(this.modification.length == 0){
+              this.$message.error("请选择批量打印的条目!")
+              return
+            }
+          this.isShowPrintType = true
+        } else {
+          this.idPrint = row.id
+           this.isShowPrintType = true
+           this.onePrint = true //单个打印标识
+        }
+
       },
       printSmall() {
         window.open('../../../../static/weightCheck.html?type=1&tableData=' + JSON.stringify(this.dialogData))
       },
-      printBig(type, radioType) {
-        // if (type == 1) {
-        //   localStorage.setItem('selectPrint_jjSelectPrintList', JSON.stringify(this.jjSelectPrintList))
-        //   window.open('../../../../static/weightCheck.html?type=2&radioType=' + radioType)
-        // } else if (type == 2) {
-        //   localStorage.setItem('selectPrint_jjSelectPrintList', JSON.stringify(this.excelPrintData))
-        //   window.open('../../../../static/weightCheck.html?type=2&radioType=' + radioType)
-        // } else {
-
-          window.open('../../../../static/weightCheck.html?type=2&tableData=' + JSON.stringify(this.dialogData))
-        // }
+       printBig(type, radioType) {
+        // 打印额外
+        if (this.checked || this.ddchecked) {
+          this.makeEWjjSelectPrintList()
+          //  this.selectEW = true;
+        }
+        if (type == 1) {
+          localStorage.setItem('selectPrint_jjSelectPrintList', JSON.stringify(this.jjSelectPrintList))
+          window.open('../../../../static/weightCheck.html?type=2&radioType=' + radioType + '&selectEW=' + this
+            .checked + '&selectEWDD=' + this.ddchecked)
+        } else if (type == 2) {
+          localStorage.setItem('selectPrint_jjSelectPrintList', JSON.stringify(this.excelPrintData))
+          window.open('../../../../static/weightCheck.html?type=2&radioType=' + radioType)
+        } else {
+          console.log(this.dialogDataList)
+          window.open('../../../../static/weightCheck.html?type=2&tableData=' + JSON.stringify(this.dialogDataList))
+        }
       },
       warehouseNameChange() {
         this.getList()
@@ -313,4 +513,121 @@
     .search_css{
       margin: 0 20px;
     }
+    .mask {
+    background: black;
+    width: 100vw;
+    height: 100vh;
+    position: fixed;
+    top: 0;
+    z-index: 99;
+    opacity: 0.3;
+  }
+
+  .print-type-title {
+    text-align: center;
+    font-size: 18px;
+    margin: 20px;
+  }
+
+  .bottom-btn {
+    display: flex;
+    margin-top: 20px;
+    justify-content: space-around;
+  }
+
+  .print-type-checkbox {
+    // padding-left: 20px;
+  }
+
+  .print-type {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    margin: auto;
+    width: 440px;
+    height: 320px;
+    background: white;
+    border-radius: 10px;
+    z-index: 999;
+  }
+
+  /deep/.el-radio-group {
+    width: 100%;
+    display: flex;
+  }
+
+  /deep/.el-radio__label {
+    font-size: 20px;
+  }
+
+  /deep/.el-radio__inner {
+    // background: red;
+    height: 20px;
+    width: 20px;
+  }
+
+  .label-width {
+    width: 100%;
+    text-align: center;
+    font-size: 20px;
+  }
+
+  .show-excel {
+    opacity: 0;
+  }
+
+  /deep/.base_header_layout .find.el-button--primary {
+    width: 30px;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+  }
+
+  /deep/.base_header_layout .findinput input {
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+  }
+
+  .ew-print {
+    padding: 0 20px;
+    margin-top: 10px;
+
+    // display: flex;
+    // justify-content: space-between;
+    // align-content: center;
+    .row {
+      display: flex;
+      margin-top: 10px;
+      align-items: center;
+    }
+  }
+
+  .sh-address {
+    display: flex;
+  }
+
+  .print-type-ew {
+    display: flex;
+    justify-content: space-between;
+    padding: 0 20px;
+
+    /deep/.el-radio__label {
+      font-size: 14px;
+    }
+
+    margin-top: 10px;
+  }
+
+  /deep/.el-table .cell {
+    text-align: center;
+  }
+
+  .shdw-style {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 0 20px;
+    margin-top: 20px;
+  }
 </style>