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

# Conflicts:
#	public/static/weightCheck.html

public/static/outWeightPrint.html

@@ -139,6 +139,7 @@
                     <td class="col col-bgc">收货单位</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">{{kehu}}</td> -->
                     <td class="col">{{tableData.contractManagement?tableData.contractManagement.buyerPhone:""}}</td>
                     <td class="col col-bgc">车牌号</td>
                     <td class="col" colspan="2">{{tableData.carNumber}}</td>
@@ -146,10 +147,13 @@
                 <tr class="row">
                     <td class="col col-bgc">出库单位</td>
                     <td class="col" colspan="2">{{tableData.contractManagement?tableData.contractManagement.seller:tableData.compName}}</td>
+                    <!-- <td class="col" colspan="2">{{tableData.contractManagement?tableData.contractManagement.seller:tableData.compName}}</td> -->
                     <td class="col col-bgc">联系人</td>
-                    <td class="col">{{tableData.person}}</td>
+                    <!-- <td class="col">{{tableData.person}}</td> -->
+                    <td class="col">{{kehu}}</td>
                     <td class="col col-bgc">联系电话</td>
-                    <td class="col" colspan="2">{{tableData.personPhone}}</td>
+                    <td colspan="2" class="col">{{kehuphone}}</td>
+                    <!-- <td class="col" colspan="2">{{tableData.personPhone}}</td> -->
                 </tr>
                 <tr class="row">
                     <td class="col col-bgc">货名</td>
@@ -318,6 +322,8 @@
             tableData: {
                 // qualityInspectionManagement:{}
             },
+            kehu:'',
+            kehuphone:'',
             name: "",
             bigContent: false,
             smallContent: false
@@ -350,6 +356,8 @@
             printBig() { },
         },
         mounted() {
+            this.kehu=JSON.parse(localStorage.getItem('winseaview-userInfo')).content.staffName
+            this.kehuphone=JSON.parse(localStorage.getItem('winseaview-userInfo')).content.staffMobilePhone
             let _data = JSON.parse(localStorage.getItem('ck_bd_printData1'))
             let _type = this.getQueryVariable("type")
             if (_type == 2) {

public/static/warehousePrint.html

@@ -241,6 +241,7 @@
   <script src="../cdn/vue/2.6.10/vue.min.js"></script>
   <script src="../cdn/element-ui/2.13.2/index.js"></script>
   <script type="text/javascript">
+    // import  API_CONFIG from "../vue.config.js"
     new Vue({
       el: '#app',
       data: {
@@ -298,6 +299,9 @@
         printBig() {}
       },
       mounted() {
+        // console.log(API_CONFIG,1111111111)
+        // var ippath=API_CONFIG.devServer.proxy['/pb'].target
+
         this.company = localStorage.getItem("ws-pf_compName")
         this.date = new Date().toLocaleString()
         this.type = decodeURIComponent(this.getQueryVariable('type'))

public/static/weightCheck.html

@@ -575,6 +575,8 @@
 <script type="text/javascript" src="../static/html2canvas.js"></script>
 <script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>
 <script type="text/javascript">
+    
+// import  API_CONFIG from "../../../vue.config.js"
     new Vue({
         el: '#app',
         data: {

public/static/weightCheckOutNew.html

@@ -160,8 +160,10 @@
                         <tr class="row">
                             <td class="col col-bgc">发货单位</td>
                             <td class="col" colspan="2">{{item.customer}}</td>
+                            <!-- <td class="col" colspan="2">{{item.customer}}</td> -->
                             <td class="col col-bgc">联系电话</td>
-                            <td class="col">{{item.customerPhone}}</td>
+                            <td class="col">{{kehuphone}}</td>
+                            <!-- <td class="col">{{item.customerPhone}}</td> -->
                             <td class="col col-bgc">货名</td>
                             <td class="col" colspan="2">{{item.goodsName}}</td>
                         </tr>
@@ -289,7 +291,8 @@
                             <td class="col col-bgc">发货单位</td>
                             <td class="col" colspan="2">{{item.customer}}</td>
                             <td class="col col-bgc">联系电话</td>
-                            <td class="col">{{item.contractManagement ? item.contractManagement.sellerPhone : ""}}</td>
+                            <td class="col">{{kehu}}</td>
+                            <!-- <td class="col">{{item.contractManagement ? item.contractManagement.sellerPhone : ""}}</td> -->
                             <td class="col col-bgc">货名</td>
                             <td class="col" colspan="2">{{item.goodsName}}</td>
                         </tr>
@@ -414,9 +417,11 @@
                         <td class="col col-bgc">发货单位</td>
                         <td class="col" colspan="2">{{_item.compName}}</td>
                         <td class="col col-bgc">联系人</td>
-                        <td class="col">{{_item.person}}</td>
+                        <td class="col">{{kehu}}</td>
+                        <!-- <td class="col">{{_item.person}}</td> -->
                         <td class="col col-bgc">联系电话</td>
-                        <td class="col" colspan="2">{{_item.personPhone}}</td>
+                        <td class="col">{{kehuphone}}</td>
+                        <!-- <td class="col" colspan="2">{{_item.personPhone}}</td> -->
                     </tr>
                     <tr class="row">
                         <td class="col col-bgc">收货单位</td>
@@ -628,6 +633,7 @@
             tableDataEW: [],
             selectPrint: false,
             name: "",
+            kehu:'',
             bigContent: false,
             smallContent: false,
             pageType: '',
@@ -662,6 +668,8 @@
             printBig() {},
         },
         mounted() {
+            this.kehu=JSON.parse(localStorage.getItem('winseaview-userInfo')).content.staffName
+            this.kehuphone=JSON.parse(localStorage.getItem('winseaview-userInfo')).content.staffMobilePhone
             let _data = decodeURIComponent(localStorage.getItem('print_out_data'))
             let _type = this.getQueryVariable("type")
             let _ew = this.getQueryVariable("selectEW")

src/model/defalutConfig/indexRx.js

@@ -6,7 +6,6 @@ const instance = axios.create({
   withCredentials: process.env.VUE_APP_WITHCREDENTIALS,
   timeout: process.env.VUE_APP_AJAX_TIMEOUT
 })
-
 instance.interceptors.request.use(
   (config) => {
     if(config.params){

src/views/profitable/cashoutaduitNQ.vue

@@ -362,7 +362,7 @@
       },
        submit(status){
         //经营性费用不进行分配
-        if(this.deptBudgetList.expensesPurpose!=5){
+        if(this.deptBudgetList.expensesPurpose!=5&&this.mode!='暂不分配'){
           for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
             if(!this.feeDetailsDistributions[i].distributionMoney){
               this.$message({
@@ -389,9 +389,11 @@
               return
             }
           }
-        this.deptBudgetList.expenseAllocationInfoList=this.feeDetailsDistributions
-         if(this.deptBudgetList.expensesPurpose==1){
-        var data=[]
+          if(this.mode!='暂不分配'){
+            this.deptBudgetList.expenseAllocationInfoList=this.feeDetailsDistributions
+          }
+         if(this.deptBudgetList.expensesPurpose==1&&this.mode!='暂不分配'){
+          var data=[]
           for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
             if(data.length==0){
               data.push(this.feeDetailsDistributions[i])
@@ -420,7 +422,7 @@
             
           }
         }
-        if(this.deptBudgetList.expensesPurpose==3){
+        if(this.deptBudgetList.expensesPurpose==3&&this.mode!='暂不分配'){
         var data=[]
           for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
             if(data.length==0){
@@ -464,26 +466,26 @@
        
         // this.deptBudgetList.addressUrl=this.paymentScreenshot.toString()
         this.deptBudgetList.flag=3
-        if(status==1){
+          if(status==1){
           this.$confirm('确定提交分配信息', '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'
           })
           .then(() => {
-        editexenseinfo(this.deptBudgetList).toPromise()
-          .then(response => {
-            this.title='通过'
-            this.rejectshow=true
-          })
+            editexenseinfo(this.deptBudgetList).toPromise()
+              .then(response => {
+                this.title='通过'
+                this.rejectshow=true
+              })
           })
-        }else{
+          }else{
           editexenseinfo(this.deptBudgetList).toPromise()
           .then(response => {
             this.title='驳回'
             this.rejectshow=true
           })
-        }
+          }
         }else{
           if(status==1){
         editexenseinfo(this.deptBudgetList).toPromise()

src/views/warehousenew/warehouseManagementList.vue

@@ -509,11 +509,15 @@
             })
           }
         } else if (this.headerText == '打印记录') {
+          if(this.parameter.binNumber=='全部合营'){
+            this.parameter.binNumber=''
+          }
           addselectinfoList({
               compId: localStorage.getItem('ws-pf_compId'),
               printStartDate: this.parameter.printStartDate,
               printEndDate: this.parameter.printEndDate,
               warehouseName: this.parameter.warehouseName,
+              binNumber:this.parameter.binNumber,
               searchType: this.parameter.radio,
               currentPage: 1,
               pageSize: 999,