Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

public/static/outWeightPrint.html

@@ -137,7 +137,7 @@
             <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" colspan="2">{{tableData.customer?tableData.customer:(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>

src/components/balanceAlert.vue

@@ -133,7 +133,7 @@ export default {
           if (
             this.deptBudgetList.warehouseName &&
             (this.deptBudgetList.warehouseName == '山东诸城迈饶库' ||
-            (this.deptBudgetList.warehouseName == '山东岳沟库' ||
+            this.deptBudgetList.warehouseName == '山东园丰库' ||
               this.deptBudgetList.warehouseName == '克东千红库' ||
               this.deptBudgetList.warehouseName == '鲅鱼圈祥腾库' ||
               this.deptBudgetList.warehouseName == '哈尔滨依兰库' ||
@@ -141,7 +141,7 @@ export default {
               this.deptBudgetList.warehouseName == '白城内陆港'||
               this.deptBudgetList.warehouseName == '肇东金信库'||
               this.deptBudgetList.warehouseName == '呼兰大金仓')
-          ) {
+          )) {
             for (var i = 0; i < value.length; i++) {
               var tmp = String.fromCharCode(value[i])
               if (tmp == '+') {

src/views/houseSelfCollect/paymentManagement.vue

@@ -1201,7 +1201,7 @@
         let _list2 = []
         if (this.printType == 1) {
           localStorage.setItem('cwprint', true)
-          if(localStorage.getItem('ws-pf_staffName') == '全能账号'){
+          if(localStorage.getItem('ws-pf_staffName') == '全能账号'||localStorage.getItem('ws-pf_staffName') == '单金龙'){
             // 财务批量打印数据
             for (let i = 0; i < this.selectPrintList.length; i++) {
               if (this.selectPrintList[i].warehouseName.indexOf('鑫满仓') > -1) {
@@ -1233,7 +1233,7 @@
           _list1 = JSON.stringify(this.printData)
           _list2 = JSON.stringify(this.customerList)
         }
-        if(localStorage.getItem('ws-pf_staffName') == '全能账号'){
+        if(localStorage.getItem('ws-pf_staffName') == '全能账号'||localStorage.getItem('ws-pf_staffName') == '单金龙'){
             window.open(
               '../../../../../static/payprint.html?type=2&dataList=' +
               _list1 +

src/views/outboundManagement/component/weightCheckPrint.vue

@@ -5,7 +5,8 @@
         <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" colspan="2" v-if="tableData.customer">{{tableData.customer}}</td> -->
+           <td class="col" colspan="2">{{tableData.customer?tableData.customer:( 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>

src/views/outboundManagement/weighingManagementNew.vue

@@ -116,6 +116,14 @@
                         <ws-input :disabled="recheck" v-model="weighingList.storageNumber" placeholder="选填，1-10个字符"
                           maxlength="10" size="small" />
                       </ws-form-item>
+                      <ws-form-item label="价格" span="1" prop="contractPrice">
+                        <ws-input :disabled="recheck" v-model="weighingList.contractPrice" placeholder="请输入价格(元/每吨)"
+                          maxlength="10" size="small" />
+                      </ws-form-item>
+                      <ws-form-item v-if="tpyeNo == 2" label="备注" span="1" prop="customer">
+                        <ws-input :disabled="recheck" v-model="weighingList.customer" placeholder="请输入备注"
+                          maxlength="10" size="small" />
+                      </ws-form-item>
                       <ws-form-item v-if="tpyeNo == 1" label="出库类型" span="1">
                         <ws-input v-model="weighingList.inOutType" class="right-bottom" :disabled="isSelectType"
                           placeholder="暂无" />
@@ -921,6 +929,12 @@
         //     return
         //   }
         // }
+        // for (var i = 0; i < this.outContractNo.length; i++) {
+        //   if (this.outContractNo[i].contractNo == this.weighingList.contractNo){
+        //       this.$set(this.weighingList,'customer',this.outContractNo[i].buyer)
+        //   }
+        // }debugger
+        // console.log(this.weighingList.customer)
         this.weighingList.carNumber = this.weighingList.carNo
         if (this.types == 1 || this.types == 2) {
           if (!this.weighingList.contractNo) {
@@ -944,6 +958,13 @@
             })
             return
           }
+          if (!this.weighingList.contractPrice) {
+            this.$message({
+              message: '价格不能为空',
+              type: 'warning',
+            })
+            return
+          }
           if (
             this.weighingList.storageNumber.length < 1 ||
             this.weighingList.storageNumber.length > 10
@@ -1647,6 +1668,9 @@
             } else {
               this.weighingList.type = '干粮'
             }
+            // this.weighingList.contractPrice = this.outContractNo[i].unitContractPrice
+            this.$set(this.weighingList,'contractPrice',this.outContractNo[i].unitContractPrice)
+            this.$set(this.weighingList,'customer',this.outContractNo[i].buyer)
             this.weighingList.goodsNameKey = this.outContractNo[i].goodsNameKey
             this.weighingList.grade = this.outContractNo[i].grade
             this.weighingList.inOutType = this.outContractNo[i].inOutType