Home Explore Help
Register Sign In
wangchao
/
yiliangyiyun-pc-jj
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

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

gjy 3 years ago
parent
8a76757fd5 b16d7054ed
commit
2be215fbc9
8 changed files with 1936 additions and 1405 deletions
Unified View Show Diff Stats
  1. 361 0
      public/static/outWeightPrint.html
  2. 49 11
      src/views/contractManagement/purchaseContractCost.vue
  3. 48 8
      src/views/contractManagement/salesContractCost.vue
  4. 8 17
      src/views/outboundManagement/component/weightCheckPrint.vue
  5. 1415 1317
      src/views/outboundManagement/weighingManagementNew.vue
  6. 36 36
      src/views/outboundManagement/weighingManagementrecord.vue
  7. 8 9
      src/views/profitable/contractOtherMoney.vue
  8. 11 7
      src/views/warehousenew/warehouseManagementRecord.vue

+ 361 - 0
public/static/outWeightPrint.html
View File 

@@ -0,0 +1,361 @@
 
+<!DOCTYPE html>
 
+<html>
 
+
 
+<head>
 
+    <meta charset="utf-8">
 
+    <link rel="stylesheet" href="https://unpkg.com/element-ui/lib/theme-chalk/index.css">
 
+    <title></title>
 
+    <style>
 
+        .number {
 
+            width: 50%;
 
+            text-align: right;
 
+            margin: 0 0 10px 0;
 
+        }
 
+
 
+        .No {
 
+            width: 50%;
 
+            text-align: left;
 
+        }
 
+
 
+        .title {
 
+            text-align: center;
 
+            font-size: 28px;
 
+            font-weight: 600;
 
+        }
 
+
 
+        .title_top {
 
+            display: flex
 
+        }
 
+
 
+        table,
 
+        table tr th,
 
+        table tr td {
 
+            border: 2px solid #333333;
 
+            padding: 5px 0;
 
+        }
 
+
 
+        table {
 
+            width: 100%;
 
+            min-height: 25px;
 
+            line-height: 25px;
 
+            text-align: center;
 
+            border-collapse: collapse;
 
+            border: 3px solid #333333;
 
+        }
 
+
 
+        .col-bgc {
 
+            background: #f6f7fb;
 
+        }
 
+
 
+        .bottom-row1 {
 
+            display: flex;
 
+            margin: 10px 0;
 
+        }
 
+
 
+        .bottom-row2 {
 
+            display: flex;
 
+            margin: 10px 0;
 
+        }
 
+
 
+        img {
 
+            width: 120px;
 
+            height: 120px;
 
+            margin-right: 118px;
 
+        }
 
+
 
+        .config {
 
+            margin-top: 20px;
 
+            margin-right: 120px;
 
+        }
 
+
 
+        .autograph {
 
+            margin-top: 20px;
 
+            margin-right: 120px;
 
+        }
 
+
 
+        .bottom-row3 {
 
+            margin: 10px 0;
 
+        }
 
+
 
+        .bottom-row4 {
 
+            margin-top: 50px;
 
+            text-align: center;
 
+        }
 
+
 
+        .small-content {
 
+            width: 400px;
 
+            margin: 0 auto;
 
+            border: 1px solid #ccc;
 
+            padding: 20px 20px 160px 20px;
 
+            position: absolute;
 
+            top: 0;
 
+            bottom: 0;
 
+            left: 0;
 
+            right: 0;
 
+            margin: auto;
 
+            height: 650px;
 
+            margin-top: 20px;
 
+        }
 
+
 
+        .small-title {
 
+            text-align: center;
 
+            font-size: 18px;
 
+            display: flex;
 
+            justify-content: space-between;
 
+            align-items: center;
 
+        }
 
+
 
+        .small-row {
 
+            display: flex;
 
+            justify-content: space-between;
 
+            margin: 10px;
 
+        }
 
+        .listName{
 
+            font-size: 22px;
 
+            font-weight: 600;
 
+            margin-top: 20px;
 
+        }
 
+        .img_css{
 
+            width: 70px;
 
+            height: 70px;
 
+            margin-right: 0px;
 
+        }
 
+    </style>
 
+</head>
 
+
 
+<body>
 
+    <div id="app">
 
+        <div v-if="bigContent">
 
+            <div class="title">出库检斤单</div>
 
+            <div class="title_top">
 
+                <div class="No" v-if="tableData.contractNo">{{tableData.contractNo}}</div>
 
+                <div class="No" else>{{tableData.moveTaskNo}}</div>
 
+                <div class="number">{{tableData.number}}</div>
 
+            </div>
 
+
 
+            <table class="table">
 
+                <tr class="row">
 
+                    <td class="col col-bgc">收货单位</td>
 
+                    <td class="col" colspan="2">{{tableData.contractManagement?tableData.contractManagement.buyer:""}}</td>
 
+                    <td class="col col-bgc">客户电话</td>
 
+                    <td class="col">{{tableData.contractManagement?tableData.contractManagement.buyerPhone:""}}</td>
 
+                    <td class="col col-bgc">车牌号</td>
 
+                    <td class="col" colspan="2">{{tableData.carNumber}}</td>
 
+                </tr>
 
+                <tr class="row">
 
+                    <td class="col col-bgc">出库单位</td>
 
+                    <td class="col" colspan="2">{{tableData.compName}}</td>
 
+                    <td class="col col-bgc">联系人</td>
 
+                    <td class="col">{{tableData.person}}</td>
 
+                    <td class="col col-bgc">联系电话</td>
 
+                    <td class="col" colspan="2">{{tableData.personPhone}}</td>
 
+                </tr>
 
+                <tr class="row">
 
+                    <td class="col col-bgc">货名</td>
 
+                    <td class="col">{{tableData.goodsName}}</td>
 
+                    <td class="col col-bgc">类型</td>
 
+                    <td class="col">{{tableData.type}}</td>
 
+                    <td class="col col-bgc">容量（克/升）</td>
 
+                    <td class="col">{{tableData.qualityInspectionManagement ?
 
+                        tableData.qualityInspectionManagement.bulkDensity:""}}</td>
 
+                    <td class="col col-bgc">不完善粒（%）</td>
 
+                    <td class="col">{{tableData.qualityInspectionManagement ?
 
+                        tableData.qualityInspectionManagement.imperfectGrain:""}}</td>
 
+                </tr>
 
+                <tr class="row">
 
+                    <td class="col col-bgc">等级</td>
 
+                    <td class="col">{{tableData.qualityInspectionManagement ?
 
+                        tableData.qualityInspectionManagement.grade:""}}</td>
 
+                    <td class="col col-bgc">水分（%）</td>
 
+                    <td class="col">{{ tableData.qualityInspectionManagement ?
 
+                        tableData.qualityInspectionManagement.waterContent:""}}</td>
 
+                    <td class="col col-bgc">热损伤（%）</td>
 
+                    <td class="col">{{tableData.qualityInspectionManagement ?
 
+                        tableData.qualityInspectionManagement.jiaorenli:""}}</td>
 
+                    <td class="col" colspan="2"></td>
 
+                </tr>
 
+                <tr class="row">
 
+                    <td class="col col-bgc">杂质（%）</td>
 
+                    <td class="col">{{ tableData.qualityInspectionManagement ?
 
+                        tableData.qualityInspectionManagement.impurity:""}}</td>
 
+                    <td class="col col-bgc">霉变粒（%）</td>
 
+                    <td class="col">{{tableData.qualityInspectionManagement ?
 
+                        tableData.qualityInspectionManagement.mildewGrain:""}}</td>
 
+                    <td class="col col-bgc">扣杂</td>
 
+                    <td class="col">{{tableData.qualityInspectionManagement ?
 
+                        tableData.qualityInspectionManagement.buckleMiscellaneous:""}}</td>
 
+                    <td class="col" colspan="2"></td>
 
+                </tr>
 
+                <tr class="row">
 
+                    <td class="col col-bgc">毛重（公斤）</td>
 
+                    <td class="col">{{tableData.grossWeight}}</td>
 
+                    <td class="col col-bgc">皮重（公斤）</td>
 
+                    <td class="col">{{tableData.tare}}</td>
 
+                    <td class="col col-bgc">扣重（公斤）</td>
 
+                    <td class="col">{{tableData.buckleMiscellaneous}}</td>
 
+                    <td class="col col-bgc">净重（公斤）</td>
 
+                    <td class="col">{{tableData.netWeight}}</td>
 
+                </tr>
 
+                <tr class="row">
 
+                    <td class="col col-bgc" colspan="2">毛重检斤时间</td>
 
+                    <td class="col" colspan="2">{{tableData.grossDate}}</td>
 
+                    <td class="col col-bgc" colspan="2"> 皮重检斤时间</td>
 
+                    <td class="col" colspan="2">{{tableData.tareDate}}</td>
 
+                </tr>
 
+            </table>
 
+            <div class="bottom">
 
+                <div class="bottom-row1">
 
+                    <div>毛检：{{tableData.secretaryWeigher}}</div>
 
+                    <div style="margin-left:60px">皮检：{{tableData.skinInspector}}</div>
 
+                    <!-- <div>{{tableData.qualityDate}}</div> -->
 
+                </div>
 
+                <div class="bottom-row2">
 
+                    <div class="left">
 
+                        <img :src="tableData.codeUrl" alt="" />
 
+                    </div>
 
+                    <div class="config">收货单位签名或盖章：</div>
 
+                    <div class="autograph">客户签名：</div>
 
+                    <div class="autograph">司机签名：</div>
 
+                </div>
 
+                <div class="bottom-row3">扫一扫</div>
 
+            </div>
 
+        </div>
 
+        <div class="small-content" v-if="smallContent">
 
+            <div  class="small-row">
 
+                <div class="listName">出库检斤单</div>
 
+                <img :src="tableData.codeUrl" alt="" class="img_css" />
 
+            </div>
 
+            <div class="small-row" v-if="tableData.number">
 
+                <div>业务编号</div>
 
+                <div>{{tableData.number}}</div>
 
+            </div>
 
+            <div class="small-row" else>
 
+                <div>移库任务编号</div>
 
+                <div>{{tableData.moveTaskNo}}</div>
 
+            </div>
 
+            <div class="small-row">
 
+                <div>收货单位</div>
 
+                <div v-if="tableData.number">{{tableData.contractManagement?tableData.contractManagement.buyer:""}}</div>
 
+                <div else>{{tableData.compName}}</div>
 
+            </div>
 
+            <div class="small-row">
 
+                <div>车牌号</div>
 
+                <div>{{tableData.carNumber}}</div>
 
+            </div>
 
+            <div class="small-row">
 
+                <div>出库单位</div>
 
+                <div>{{tableData.compName}}</div>
 
+            </div>
 
+            <div class="small-row">
 
+                <div>联系人</div>
 
+                <div>{{tableData.person}}</div>
 
+            </div>
 
+            <div class="small-row">
 
+                <div>联系电话</div>
 
+                <div>{{tableData.personPhone}}</div>
 
+            </div>
 
+            <div class="small-row">
 
+                <div>货名</div>
 
+                <div>{{tableData.goodsName}}</div>
 
+            </div>
 
+            <div class="small-row">
 
+                <div>类型</div>
 
+                <div>{{tableData.type}}</div>
 
+            </div>
 
+            <div class="small-row">
 
+                <div>毛重（公斤）</div>
 
+                <div>{{tableData.grossWeight}}</div>
 
+            </div>
 
+            <div class="small-row">
 
+                <div>毛检时间</div>
 
+                <div>{{tableData.grossDate}}</div>
 
+            </div>
 
+            <div class="small-row">
 
+                <div>皮重（公斤</div>
 
+                <div>{{tableData.tare}}</div>
 
+            </div>
 
+            <div class="small-row">
 
+                <div>皮检时间</div>
 
+                <div>{{tableData.tareDate}}</div>
 
+            </div>
 
+            <div class="small-row">
 
+                <div>扣重（公斤）</div>
 
+                <div>{{tableData.buckleMiscellaneous}}</div>
 
+            </div>
 
+            <div class="small-row">
 
+                <div>净重（公斤）</div>
 
+                <div>{{tableData.netWeight}}</div>
 
+            </div>
 
+            <div class="small-row">
 
+                <div>发货单位签名或盖章：</div>
 
+            </div>
 
+            <div class="small-row">
 
+                <div>客户签名：</div>
 
+            </div>
 
+        </div>
 
+    </div>
 
+</body>
 
+<script src="../cdn/vue/2.6.10/vue.min.js"></script>
 
+<script src="https://unpkg.com/element-ui/lib/index.js"></script>
 
+<script type="text/javascript">
 
+    new Vue({
 
+        el: '#app',
 
+        data: {
 
+            tableData: {
 
+                // qualityInspectionManagement:{}
 
+            },
 
+            name: "",
 
+            bigContent: false,
 
+            smallContent: false
 
+        },
 
+        computed: {},
 
+        methods: {
 
+            tableRowClassName({
 
+                row,
 
+                rowIndex
 
+            }) {
 
+                if (rowIndex === 1) {
 
+                    return 'warning-row';
 
+                } else if (rowIndex === 3) {
 
+                    return 'success-row';
 
+                }
 
+                return '';
 
+            },
 
+            getQueryVariable(variable) {
 
+                var query = window.location.search.substring(1);
 
+                var vars = query.split("&");
 
+                for (var i = 0; i < vars.length; i++) {
 
+                    var pair = vars[i].split("=");
 
+                    if (pair[0] == variable) {
 
+                        return pair[1];
 
+                    }
 
+                }
 
+                return (false);
 
+            },
 
+            printSmall() { },
 
+            printBig() { },
 
+        },
 
+        mounted() {
 
+            let _data = JSON.parse(localStorage.getItem('ck_bd_printData1'))
 
+            let _type = this.getQueryVariable("type")
 
+            if (_type == 2) {
 
+                this.bigContent = true
 
+                this.smallContent = false
 
+            } else {
 
+                this.smallContent = true
 
+                this.bigContent = false
 
+            }
 
+            console.log(_data, "sddsd")
 
+            this.tableData = _data
 
+            console.log(this.tableData)
 
+            document.title = "粮食检斤单"
 
+            window.print()
 
+            window.onafterprint = function (event) {
 
+                window.history.back(-1)
 
+            };
 
+        },
 
+        watch: {}
 
+    })
 
+</script>
 
+
 
+</html>

+ 49 - 11
src/views/contractManagement/purchaseContractCost.vue
View File 

@@ -104,9 +104,8 @@
 
             <div style='display:inline-block;' v-if='scope.row.taskId'>
 
             <div style='display:inline-block;' v-if='scope.row.taskId'>
 
               <ws-button type="primary" @click="handleaudit(scope.row)">审核</ws-button>
 
               <ws-button type="primary" @click="handleaudit(scope.row)">审核</ws-button>
 
             </div>
 
             </div>
 
-             <div style='display:inline-block;' v-if='scope.row.status=="未付款"'>
 
-                <ws-button type="primary" @click="handlepayment(scope.row)"
 
-            v-hasPermission="`contractManagement.nonContract.nonContractInfo.status`">付款</ws-button>
 
+             <div style='display:inline-block;' v-if='scope.row.status=="待付款"'>
 
+                <ws-button type="primary" @click="handlepayment(scope.row)" v-hasPermission="`contractManagement.nonContract.nonContractInfo.status`">付款</ws-button>
 
              </div>
 
              </div>
 
             <div style='display:inline-block;' v-if='scope.row.personName==staffName'>
 
             <div style='display:inline-block;' v-if='scope.row.personName==staffName'>
 
             <ws-button type="primary" @click="handleedit(scope.row)"
 
             <ws-button type="primary" @click="handleedit(scope.row)"
 
@@ -192,14 +191,19 @@
 
       </div>
 
       </div>
 
     </el-dialog>
 
     </el-dialog>
 
     
     
-    <el-dialog width='50%' :visible.sync="dialogVisible1" title="审核记录">
 
-      <div v-for="item in recordList">
 
-        <div style='width:100%;justify-content: space-between;' class='flex'>
 
-          <div>{{item.operateUser}}</div>
 
-          <div>{{item.dealMsg}}</div>
 
-          <div>{{item.createDate}}</div>
 
+    <el-dialog :visible.sync="dialogVisible1" title="审核记录"  width="30%" top="20vh" class="title_css">
 
+      <div v-for="(item,index) in recordList" :key="index" class="audit">
 
+        <div class="audit_item">
 
+          <div class="audit_left">
 
+            <span class="audit_name">{{item.operateUser}}</span><span
 
+              v-if="item.approveResult">{{item.approveResult == 0 ? "驳回" : "通过"}}</span><span
 
+              v-else>{{item.dealMsg}}</span>
 
+          </div>
 
+          <span class="audit_date">{{item.operateDate}}</span>
 
+        </div>
 
+        <div class="audit_opinion" v-if="item.dealMsg != '付款' && item.approveResult">审核意见：{{item.verifyRemark}}</div>
 
+        <div class="audit_opinion" v-if="item.dealMsg == '请款' && item.approveResult == null">备注信息：{{item.verifyRemark}}
 
         </div>
 
         </div>
 
-        <div style='width:100%;text-align:center;'>{{item.verifyRemark}}</div>
 
       </div>
 
       </div>
 
     </el-dialog>
 
     </el-dialog>
 
   </div>
 
   </div>
 
@@ -530,7 +534,7 @@
 
               this.deptBudgetList.costType=this.costType
 
               this.deptBudgetList.costType=this.costType
 
               this.deptBudgetList.compId=this.compId
 
               this.deptBudgetList.compId=this.compId
 
               this.deptBudgetList.addressUrl=this.paymentScreenshot.toString()
 
               this.deptBudgetList.addressUrl=this.paymentScreenshot.toString()
 
-              this.deptBudgetList.personName=localStorage.getItem('ws-pf_staffName')
 
+              // this.deptBudgetList.personName=localStorage.getItem('ws-pf_staffName')
 
             if(this.status==1||this.status==2){
 
             if(this.status==1||this.status==2){
 
               this.deptBudgetList.type=this.status
 
               this.deptBudgetList.type=this.status
 
               // this.deptBudgetList.personName=localStorage.getItem('ws-pf_roleName')+localStorage.getItem('ws-pf_staffName')
 
               // this.deptBudgetList.personName=localStorage.getItem('ws-pf_roleName')+localStorage.getItem('ws-pf_staffName')
 
@@ -801,4 +805,38 @@
 
     text-align: center !important;
 
     text-align: center !important;
 
     border-radius: 4px;
 
     border-radius: 4px;
 
   }
 
   }
 
+  /deep/.title_css .el-dialog__header {
 
+    text-align: center !important;
 
+    border-radius: 4px;
 
+  }
 
+   .audit {
 
+    margin-bottom: 20px;
 
+    border-bottom: 1px solid #AFB3BF;
 
+    height: 70px;
 
+
 
+    .audit_item {
 
+      width: 100%;
 
+      display: flex;
 
+      height: 30px;
 
+
 
+      .audit_name {
 
+        margin-right: 30px;
 
+        font-size: 16px;
 
+        font-weight: 600;
 
+      }
 
+
 
+      .audit_left {
 
+        width: 60%;
 
+      }
 
+
 
+      .audit_date {
 
+        width: 40%;
 
+        justify-content: flex-end;
 
+        display: flex;
 
+        color: #AFB3BF;
 
+      }
 
+    }
 
+
 
+    .audit_opinion {}
 
+  }
 
 </style>
 
 </style>

+ 48 - 8
src/views/contractManagement/salesContractCost.vue
View File 

@@ -189,14 +189,19 @@
 
         <el-button @click='confirm' type="primary">通过</el-button>
 
         <el-button @click='confirm' type="primary">通过</el-button>
 
       </div>
 
       </div>
 
     </el-dialog>
 
     </el-dialog>
 
-    <el-dialog width='50%' :visible.sync="dialogVisible1" title="审核记录" >
 
-      <div v-for="item in recordList">
 
-        <div style='width:100%;justify-content: space-between;' class='flex'>
 
-          <div>{{item.operateUser}}</div>
 
-          <div>{{item.dealMsg}}</div>
 
-          <div>{{item.createDate}}</div>
 
+    <el-dialog width='30%' :visible.sync="dialogVisible1" title="审核记录" top="20vh">
 
+      <div v-for="(item,index) in recordList" :key="index" class="audit">
 
+        <div class="audit_item">
 
+          <div class="audit_left">
 
+            <span class="audit_name">{{item.operateUser}}</span><span
 
+              v-if="item.approveResult">{{item.approveResult == 0 ? "驳回" : "通过"}}</span><span
 
+              v-else>{{item.dealMsg}}</span>
 
+          </div>
 
+          <span class="audit_date">{{item.operateDate}}</span>
 
+        </div>
 
+        <div class="audit_opinion" v-if="item.dealMsg != '付款' && item.approveResult">审核意见：{{item.verifyRemark}}</div>
 
+        <div class="audit_opinion" v-if="item.dealMsg == '请款' && item.approveResult == null">备注信息：{{item.verifyRemark}}
 
         </div>
 
         </div>
 
-        <div style='width:100%;text-align:center;'>{{item.verifyRemark}}</div>
 
       </div>
 
       </div>
 
     </el-dialog>
 
     </el-dialog>
 
   </div>
 
   </div>
 
@@ -528,7 +533,7 @@
 
               this.deptBudgetList.costType=this.costType
 
               this.deptBudgetList.costType=this.costType
 
               this.deptBudgetList.compId=this.compId
 
               this.deptBudgetList.compId=this.compId
 
               this.deptBudgetList.addressUrl=this.paymentScreenshot.toString()
 
               this.deptBudgetList.addressUrl=this.paymentScreenshot.toString()
 
-              this.deptBudgetList.personName=localStorage.getItem('ws-pf_staffName')
 
+              // this.deptBudgetList.personName=localStorage.getItem('ws-pf_staffName')
 
             if(this.status==1||this.status==2){
 
             if(this.status==1||this.status==2){
 
               this.deptBudgetList.type=this.status
 
               this.deptBudgetList.type=this.status
 
               // this.deptBudgetList.personName=localStorage.getItem('ws-pf_roleName')+localStorage.getItem('ws-pf_staffName')
 
               // this.deptBudgetList.personName=localStorage.getItem('ws-pf_roleName')+localStorage.getItem('ws-pf_staffName')
 
@@ -799,4 +804,39 @@
 
     text-align: center !important;
 
     text-align: center !important;
 
     border-radius: 4px;
 
     border-radius: 4px;
 
   }
 
   }
 
+  //审核记录弹框样式
 
+   /deep/.title_css .el-dialog__header {
 
+    text-align: center !important;
 
+    border-radius: 4px;
 
+  }
 
+  .audit {
 
+    margin-bottom: 20px;
 
+    border-bottom: 1px solid #AFB3BF;
 
+    height: 70px;
 
+
 
+    .audit_item {
 
+      width: 100%;
 
+      display: flex;
 
+      height: 30px;
 
+
 
+      .audit_name {
 
+        margin-right: 30px;
 
+        font-size: 16px;
 
+        font-weight: 600;
 
+      }
 
+
 
+      .audit_left {
 
+        width: 60%;
 
+      }
 
+
 
+      .audit_date {
 
+        width: 40%;
 
+        justify-content: flex-end;
 
+        display: flex;
 
+        color: #AFB3BF;
 
+      }
 
+    }
 
+
 
+    .audit_opinion {}
 
+  }
 
 </style>
 
 </style>

+ 8 - 17
src/views/outboundManagement/component/weightCheckPrint.vue
View File 

@@ -4,19 +4,15 @@
 
         <div class="number">{{tableData.number}}</div>
 
         <div class="number">{{tableData.number}}</div>
 
         <table class="table">
 
         <table class="table">
 
           <tr class="row">
 
           <tr class="row">
 
-            <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>
 
+            <td class="col col-bgc">收货单位</td>
 
+            <td class="col" colspan="2">{{tableData.contractManagement?tableData.contractManagement.buyer:""}}</td>
 
+            <td class="col col-bgc">客户电话</td>
 
+            <td class="col">{{tableData.contractManagement?tableData.contractManagement.buyerPhone:""}}</td>
 
             <td class="col col-bgc">车牌号</td>
 
             <td class="col col-bgc">车牌号</td>
 
             <td class="col" colspan="2">{{tableData.carNumber}}</td>
 
             <td class="col" colspan="2">{{tableData.carNumber}}</td>
 
           </tr>
 
           </tr>
 
           <tr class="row">
 
           <tr class="row">
 
-            <td class="col col-bgc">收货单位</td>
 
+            <td class="col col-bgc">出库单位</td>
 
             <td class="col" colspan="2">{{tableData.compName}}</td>
 
             <td class="col" colspan="2">{{tableData.compName}}</td>
 
             <td class="col col-bgc">联系人</td>
 
             <td class="col col-bgc">联系人</td>
 
             <td class="col" >{{tableData.person}}</td>
 
             <td class="col" >{{tableData.person}}</td>
 
@@ -40,7 +36,7 @@
 
             <td class="col">{{tableData.qualityInspectionManagement.waterContent}}</td>
 
             <td class="col">{{tableData.qualityInspectionManagement.waterContent}}</td>
 
             <td class="col col-bgc">热损伤（%）</td>
 
             <td class="col col-bgc">热损伤（%）</td>
 
             <td class="col">{{tableData.qualityInspectionManagement.jiaorenli}}</td>
 
             <td class="col">{{tableData.qualityInspectionManagement.jiaorenli}}</td>
 
-            <td class="col col-bgc" colspan="2">质检&nbsp;&nbsp;{{tableData.qualityInspectionManagement.qualityDate}}</td>
 
+            <td class="col" colspan="2"></td>
 
           </tr>
 
           </tr>
 
           <tr class="row">
 
           <tr class="row">
 
             <td class="col col-bgc">杂质（%）</td>
 
             <td class="col col-bgc">杂质（%）</td>
 
@@ -49,6 +45,7 @@
 
             <td class="col">{{tableData.qualityInspectionManagement.mildewGrain}}</td>
 
             <td class="col">{{tableData.qualityInspectionManagement.mildewGrain}}</td>
 
             <td class="col col-bgc">扣杂</td>
 
             <td class="col col-bgc">扣杂</td>
 
             <td class="col">{{tableData.qualityInspectionManagement.buckleMiscellaneous}}</td>
 
             <td class="col">{{tableData.qualityInspectionManagement.buckleMiscellaneous}}</td>
 
+             <td class="col" colspan="2"></td>
 
           </tr>
 
           </tr>
 
           <tr class="row">
 
           <tr class="row">
 
             <td class="col col-bgc">毛重（公斤）</td>
 
             <td class="col col-bgc">毛重（公斤）</td>
 
@@ -82,13 +79,7 @@
 
             <div class="autograph">司机签名：</div>
 
             <div class="autograph">司机签名：</div>
 
           </div>
 
           </div>
 
           <div class="bottom-row3">扫一扫</div>
 
           <div class="bottom-row3">扫一扫</div>
 
-           <!-- <div class="bottom-row4">
 
-         <el-button type="primary">关闭</el-button>
 
-        <el-button type="primary" @click="printSmall">打印小票</el-button>
 
-        <el-button type="primary" @click="printBig">打印单据</el-button> 
-      </div> -->
 
         </div>
 
         </div>
 
-        
     </div>
 
     </div>
 
 </template>
 
 </template>
 
 <script>
 
 <script>
 
@@ -165,7 +156,7 @@ export default{
 
 
 
     .config {
 
     .config {
 
         margin-top: 20px;
 
         margin-top: 20px;
 
-      margin-right: 240px;
 
+      margin-right: 120px;
 
     }
 
     }
 
     .autograph{
 
     .autograph{
 
         margin-top: 20px;
 
         margin-top: 20px;

File diff suppressed because it is too large
+ 1415 - 1317
src/views/outboundManagement/weighingManagementNew.vue


+ 36 - 36
src/views/outboundManagement/weighingManagementrecord.vue
View File 

@@ -103,10 +103,10 @@
 
     </WinseaContentModal>
 
     </WinseaContentModal>
 
     <el-dialog
 
     <el-dialog
 
       width="70%"
 
       width="70%"
 
-      class="table-content"
 
+      class="title_css"
 
       center
 
       center
 
       :visible.sync="isShowPrint"
 
       :visible.sync="isShowPrint"
 
-      title="粮食检斤单"
 
+      title="出库检斤单"
 
       @opened="opendBtn"
 
       @opened="opendBtn"
 
       @close="closeDialog"
 
       @close="closeDialog"
 
       :close-on-click-modal="false"
 
       :close-on-click-modal="false"
 
@@ -229,42 +229,34 @@
 
         this.getList()
 
         this.getList()
 
       },
 
       },
 
       printSmall() {
 
       printSmall() {
 
-      // window.open(
 
-      //   '../../../../static/weightCheck.html?type=1&tableData=' +
 
-      //     JSON.stringify(this.inspect)
 
-      // )
 
-      localStorage.setItem('inspect',JSON.stringify(this.inspect))
 
-        window.open('../../../static/weightChecknew.html?type=1' )
 
+         localStorage.setItem('ck_bd_printData1',JSON.stringify(this.inspect))
 
+         window.open('../../../../static/outWeightPrint.html?type=1')
 
     },
 
     },
 
     printBig() {
 
     printBig() {
 
-      localStorage.setItem('inspect',JSON.stringify(this.inspect))
 
-        window.open('../../../static/weightChecknew.html?type=2' )
 
-      // window.open(
 
-      //   '../../../../static/weightCheck.html?type=2&tableData=' +
 
-      //     JSON.stringify(this.inspect)
 
-      // )
 
+         localStorage.setItem('ck_bd_printData1',JSON.stringify(this.inspect))
 
+         window.open('../../../../static/outWeightPrint.html?type=2')
 
     },
 
     },
 
     opendBtn() {
 
     opendBtn() {
 
-      html2canvas(this.$refs.saveImg.$el).then((canvas) => {
 
-        let dataURL = canvas.toDataURL('image/png')
 
-        this.imgUrl = dataURL
 
-        if (this.imgUrl !== '') {
 
-          let b = this.dataURLtoFile(this.imgUrl, 'printImage')
 
-          let formdata = new FormData()
 
-          formdata.append('file', b)
 
-          axios({
 
-            method: 'post',
 
-            url: 'https://www.zthymaoyi.com/upload/admin',
 
-            data: formdata,
 
-          }).then((response) => {
 
-            //编辑接口
 
-            this.weighingList.pictureAddress = response.data.url
 
-            tare(this.weighingList)
 
-              .toPromise()
 
-              .then((response) => {})
 
-          })
 
-        }
 
-      })
 
+      // html2canvas(this.$refs.saveImg.$el).then((canvas) => {
 
+      //   let dataURL = canvas.toDataURL('image/png')
 
+      //   this.imgUrl = dataURL
 
+      //   if (this.imgUrl !== '') {
 
+      //     let b = this.dataURLtoFile(this.imgUrl, 'printImage')
 
+      //     let formdata = new FormData()
 
+      //     formdata.append('file', b)
 
+      //     axios({
 
+      //       method: 'post',
 
+      //       url: 'https://www.zthymaoyi.com/upload/admin',
 
+      //       data: formdata,
 
+      //     }).then((response) => {
 
+      //       //编辑接口
 
+      //       this.weighingList.pictureAddress = response.data.url
 
+      //       tare(this.weighingList)
 
+      //         .toPromise()
 
+      //         .then((response) => {})
 
+      //     })
 
+      //   }
 
+      // })
 
     },
 
     },
 
     closeDialog() {
 
     closeDialog() {
 
       html2canvas(this.$refs.saveImg.$el).then((canvas) => {
 
       html2canvas(this.$refs.saveImg.$el).then((canvas) => {
 
@@ -336,8 +328,13 @@
 
                 warehouseId: response[i].id,
 
                 warehouseId: response[i].id,
 
               })
 
               })
 
             }
 
             }
 
-            this.warehouseName = this.warehouseList[0].value
 
-            this.warehouseId = this.warehouseList[0].warehouseId
 
+            if(this.$route.query.warehouseName){
 
+              this.warehouseName = this.$route.query.warehouseName
 
+            }else{
 
+                this.warehouseName = response[0].warehouseName
 
+                this.warehouseId = this.warehouseList[0].warehouseId
 
+            }
 
+            
             this.getList()
 
             this.getList()
 
           })
 
           })
 
       },
 
       },
 
@@ -447,4 +444,7 @@
 
     border-top-right-radius: 0px;
 
     border-top-right-radius: 0px;
 
     border-bottom-right-radius: 0px;
 
     border-bottom-right-radius: 0px;
 
   }
 
   }
 
+   /deep/.title_css .el-dialog__header{
 
+    text-align: center !important;
 
+  }
 
 </style>
 
 </style>

+ 8 - 9
src/views/profitable/contractOtherMoney.vue
View File 

@@ -59,9 +59,9 @@
 
           <el-table-column prop="payee" label="请款人/收款人" min-width="100"></el-table-column>
 
           <el-table-column prop="payee" label="请款人/收款人" min-width="100"></el-table-column>
 
           <el-table-column prop="paymentDate" label="支付日期"></el-table-column>
 
           <el-table-column prop="paymentDate" label="支付日期"></el-table-column>
 
           <el-table-column prop="createDate" label="录入日期" min-width="130"></el-table-column>
 
           <el-table-column prop="createDate" label="录入日期" min-width="130"></el-table-column>
 
-          <el-table-column prop="status" label="状态" min-width="81">
 
+          <el-table-column prop="status" label="状态" min-width="120">
 
             <template slot-scope="scope">
 
             <template slot-scope="scope">
 
-              <span style="margin-right:10px">{{scope.row.status}}</span><i class="el-icon-tickets icon_css"
 
+              <span style="margin-right:10px">{{scope.row.approveStatus ? scope.row.approveStatus : scope.row.status}}</span><i class="el-icon-s-claim"
 
                 v-show="scope.row.reexType == '支出'" @click="showAudit(scope.row)"></i>
 
                 v-show="scope.row.reexType == '支出'" @click="showAudit(scope.row)"></i>
 
             </template>
 
             </template>
 
           </el-table-column>
 
           </el-table-column>
 
@@ -72,7 +72,7 @@
 
               </el-button>
 
               </el-button>
 
               <el-button @click="audit(2,scope.row)" v-if="scope.row.status != '已付款'"
 
               <el-button @click="audit(2,scope.row)" v-if="scope.row.status != '已付款'"
 
                 v-hasPermission=" `contractManagement.exContract.exContractInfo.status`">付款</el-button>
 
                 v-hasPermission=" `contractManagement.exContract.exContractInfo.status`">付款</el-button>
 
-              <el-button @click="audit(5,scope.row)"
 
+              <el-button @click="audit(5,scope.row)" v-if="scope.row.status == '已驳回'"
 
                 v-hasPermission=" `contractManagement.exContract.exContractInfo.edit`">编辑</el-button>
 
                 v-hasPermission=" `contractManagement.exContract.exContractInfo.edit`">编辑</el-button>
 
               <el-button @click="delData(scope.row)" v-if="scope.row.status == '已驳回'"
 
               <el-button @click="delData(scope.row)" v-if="scope.row.status == '已驳回'"
 
                 v-hasPermission=" `contractManagement.exContract.exContractInfo.delete`">删除</el-button>
 
                 v-hasPermission=" `contractManagement.exContract.exContractInfo.delete`">删除</el-button>
 
@@ -385,6 +385,7 @@
 
                 .toPromise()
 
                 .toPromise()
 
                 .then((response) => {
 
                 .then((response) => {
 
                   if (response == 'ok') {
 
                   if (response == 'ok') {
 
+                    this.formData.addressUrl = ""
 
                     this.formData = {}
 
                     this.formData = {}
 
                     this.dialogVisible = false
 
                     this.dialogVisible = false
 
                     this.$notify({
 
                     this.$notify({
 
@@ -464,6 +465,9 @@
 
           })
 
           })
 
       },
 
       },
 
       audit(num, row) {
 
       audit(num, row) {
 
+        this.formData.addressUrl = ""
 
+        this.formData = {}
 
+        this.$forceUpdate
 
         this.btnChange = num
 
         this.btnChange = num
 
         if (num == 1) {
 
         if (num == 1) {
 
           this.title = "审核"
 
           this.title = "审核"
 
@@ -656,12 +660,7 @@
 
     overflow-y: scroll;
 
     overflow-y: scroll;
 
     height: 546px;
 
     height: 546px;
 
 
 
-    .icon_css {
 
-      font-size: 15px;
 
-
 
-      color: #5473e8;
 
-
 
-    }
 
+ 
   }
 
   }
 
 
 
   /deep/.title_css .el-dialog__header {
 
   /deep/.title_css .el-dialog__header {

+ 11 - 7
src/views/warehousenew/warehouseManagementRecord.vue
View File 

@@ -61,7 +61,7 @@
 
             src="../../../public/img/sousuo.png" alt />
 
             src="../../../public/img/sousuo.png" alt />
 
         </ws-button>
 
         </ws-button>
 
         <el-button type="primary" @click="batchPrint">批量打印</el-button>
 
         <el-button type="primary" @click="batchPrint">批量打印</el-button>
 
-        <el-table show-summary :summary-method="getSummaries" ref="tableData" :data="warehouseList.records" height="570"
 
+        <el-table show-summary ref="tableData" :data="warehouseList.records" height="570"
 
           v-show="this.warehouseType== '1'" @selection-change="handleSelectionChange">
 
           v-show="this.warehouseType== '1'" @selection-change="handleSelectionChange">
 
           <el-table-column type="selection" width="55" :selectable="selectInit"></el-table-column>
 
           <el-table-column type="selection" width="55" :selectable="selectInit"></el-table-column>
 
           <el-table-column type="expand">
 
           <el-table-column type="expand">
 
@@ -182,7 +182,7 @@
 
           </el-table-column>
 
           </el-table-column>
 
 
 
         </el-table>
 
         </el-table>
 
-        <el-table show-summary :summary-method="getSummaries" :data="warehouseList.records" height="560"
 
+        <el-table show-summary :data="warehouseList.records" height="560"
 
           v-show="this.warehouseType== '2'">
 
           v-show="this.warehouseType== '2'">
 
           <el-table-column type="expand">
 
           <el-table-column type="expand">
 
             <template #default="props">
 
             <template #default="props">
 
@@ -347,7 +347,7 @@
 
         startDate: null,
 
         startDate: null,
 
         endDate: null,
 
         endDate: null,
 
         remark: '',
 
         remark: '',
 
-        binNumber: '',
 
+        binNumber: '全部仓位',
 
         status: 1,
 
         status: 1,
 
         value2: [],
 
         value2: [],
 
         appendixIdss: '',
 
         appendixIdss: '',
 
@@ -384,11 +384,11 @@
 
       this.deptBudgetList.positionId = this.$route.query.positionId
 
       this.deptBudgetList.positionId = this.$route.query.positionId
 
       this.deptBudgetList.warehouseName = this.$route.query.warehouseName
 
       this.deptBudgetList.warehouseName = this.$route.query.warehouseName
 
       this.remark = this.$route.query.remark
 
       this.remark = this.$route.query.remark
 
-      this.binNumber = this.$route.query.binNumber
 
+      // this.binNumber = this.$route.query.binNumber
 
       this.capacity = this.$route.query.capacity
 
       this.capacity = this.$route.query.capacity
 
       this.warehouseType = this.$route.query.warehouseType
 
       this.warehouseType = this.$route.query.warehouseType
 
       this.getList()
 
       this.getList()
 
-      this.getPassYearFormatDate()
 
+      // this.getPassYearFormatDate()
 
       this.showType = this.isShow
 
       this.showType = this.isShow
 
     },
 
     },
 
     updated() {
 
     updated() {
 
@@ -435,15 +435,19 @@
 
       binNumberChange(e) {
 
       binNumberChange(e) {
 
         if (e == '全部仓位') {
 
         if (e == '全部仓位') {
 
           this.deptBudgetList.positionId = ''
 
           this.deptBudgetList.positionId = ''
 
+          this.getList()
 
         } else {
 
         } else {
 
           for (let i = 0; i < this.binnumberList.length; i++) {
 
           for (let i = 0; i < this.binnumberList.length; i++) {
 
             if (this.binnumberList[i].binNumber == e) {
 
             if (this.binnumberList[i].binNumber == e) {
 
               this.deptBudgetList.positionId = this.binnumberList[i].id
 
               this.deptBudgetList.positionId = this.binnumberList[i].id
 
             }
 
             }
 
           }
 
           }
 
+          this.getList()
 
+          // var seperator1 = "-"
 
+          // var date = new Date()
 
       
       
-          var formatDate = year + seperator1 + month + seperator1 + strDate
 
-          this.getNowFormatDate(formatDate)
 
+          // var formatDate = date.getFullYear() + seperator1 + Number(date.getMonth() + 1) + seperator1 + date.getDate()
 
+          // this.getNowFormatDate(formatDate)
 
         }
 
         }
 
       },
 
       },
 
 		/* 获取现在时间，并接受过去时间的值 */
 
 		/* 获取现在时间，并接受过去时间的值 */

Some files were not shown because too many files changed in this diff