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

src/views/houseSelfCollect/weighingManagement.vue

@@ -118,90 +118,6 @@
       title="粮食检斤单"
       id="dialog"
     >
-     <!-- <div class="number">{{dialogData.number}}</div>
-      <table class="table">
-        <tr class="row">
-          <td class="row col-bgc">客户姓名</td>
-          <td colspan="2">{{dialogData.customer}}</td>
-          <td class="row col-bgc">客户电话</td>
-          <td>{{dialogData.customerPhone}}</td>
-          <td class="row col-bgc">车牌号</td>
-          <td colspan="2">{{dialogData.carNumber}}</td>
-         
-        </tr>
-        <tr class="row">
-          <td class="row col-bgc">收货单位</td>
-          <td colspan="2">{{dialogData.compName}}</td>
-          <td class="row col-bgc">联系人</td>
-          <td>{{dialogData.person}}</td>
-          <td class="row col-bgc"> 联系电话</td>
-          <td colspan="2">{{dialogData.personPhone}}</td>
-          
-        </tr>
-        <tr class="row">
-          <td class="row col-bgc">货名</td>
-          <td>{{dialogData.goodsName}}</td>
-          <td class="row col-bgc">类型</td>
-          <td>{{dialogData.type}}</td>
-          <td class="row col-bgc">容重（克/升）</td>
-          <td>{{dialogData.qualityInspectionManagement.bulkDensity}}</td>
-          <td class="row col-bgc"> 不完整粒（%）</td>
-          <td class="row "> {{dialogData.qualityInspectionManagement.imperfectGrain}}</td>
-        </tr>
-        <tr class="row">
-          <td class="row col-bgc">等级</td>
-          <td>{{dialogData.qualityInspectionManagement.grade}}</td>
-          <td class="row col-bgc">水分（%）</td>
-          <td>{{dialogData.qualityInspectionManagement.waterContent}}</td>
-          <td class="row col-bgc"> 热损伤（%）</td>
-          <td>{{dialogData.qualityInspectionManagement.jiaorenli}}</td>
-          <td colspan="2" class="row col-bgc">质检 {{dialogData.qualityInspectionManagement.suqualityTestingDate}}</td>
-        </tr>
-        <tr class="row">
-          <td class="row col-bgc">杂质(%)</td>
-          <td>{{dialogData.qualityInspectionManagement.impurity}}</td>
-          <td class="row col-bgc">霉变粒（%）</td>
-          <td>{{dialogData.qualityInspectionManagement.mildewGrain}}</td>
-          <td class="row col-bgc">扣杂（公斤）</td>
-          <td>{{dialogData.buckleMiscellaneous}}</td>
-          <td class="row col-bgc">净重（公斤）</td>
-          <td>{{dialogData.netWeight}}</td>
-        </tr>
-        <tr class="row">
-          <td class="row col-bgc">毛重（公斤）</td>
-          <td>{{dialogData.grossWeight}}</td>
-          <td class="row col-bgc">皮重（公斤）</td>
-          <td>{{dialogData.tare}}</td>
-          <td colspan="4"></td>
-        </tr>
-        <tr class="row">
-          <td colspan="2" class="row col-bgc">毛重检斤时间</td>
-          <td colspan="2">{{dialogData.grossDate}}</td>
-          <td colspan="2" class="row col-bgc">皮重检斤时间</td>
-          <td colspan="2">{{dialogData.tareDate}}</td>
-        </tr>
-        
-      </table>
-      <div class="bottom">
-        <div class="bottom-row1">
-          <div>毛检：{{dialogData.secretaryWeigher}}</div>
-            <div style="margin-left:60px">皮检：{{ dialogData.skinInspector}}</div>
-       
-        </div>
-        <div class="bottom-row2">
-          <div class="left">
-            <img src="../../../public/img/add.png" alt="" />
-          </div>
-          <div class="config">收货单位签名或盖章：</div>
-          <div class="autograph">客户签名：</div>
-        </div>
-        <div class="bottom-row3">扫一扫</div>
-        <div class="bottom-row4">
-          <el-button type="primary" @click="isShowPrint = false">关闭</el-button>
-          <el-button type="primary" @click="printSmall">打印小票</el-button>
-          <el-button type="primary" @click="printBig">打印单据</el-button>
-        </div>
-      </div> -->
       <weightCheckPrint :tableData="dialogData"></weightCheckPrint>
     </el-dialog>
   </div>
@@ -259,16 +175,6 @@ export default {
           // EventBus.$emit('error', this.$t('showMessage.asteriskRequired'))
         })
     },
-    // printSmall(){
-    //   window.location.href =
-    //     '../../../static/weightCheck.html?type=1&dialogData=' +
-    //     JSON.stringify(this.dialogData)
-    // },
-    // printBig(){
-    //   window.location.href =
-    //     '../../../static/weightCheck.html?type=2&dialogData=' +
-    //     JSON.stringify(this.dialogData)
-    // },
     warehouseNameChange(e) {
       // this.warehouseName = e
       for (let i = 0; i < this.warehouseList.length; i++) {