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

src/views/profitable/cashout.vue

@@ -116,24 +116,24 @@
           <ws-option v-for="item in datesList" :key="item.value" :label="item.value" :value="item.value"
             style="color: #8890b1" />
         </ws-select> -->
-         <ws-select :disabled='disabled' v-model="moneys" v-if='mode!="暂不分配"' placeholder="费用分配金额">
+         <ws-select style="margin-left: 10px" :disabled='disabled' v-model="moneys" v-if='mode!="暂不分配"' placeholder="费用分配金额">
           <ws-option v-for="item in moneysList" :key="item.value" :label="item.value" :value="item.value"
             style="color: #8890b1" />
         </ws-select>
-        <div style='width:30%;' v-if='deptBudgetList.purpose == "库点费用" && deptBudgetList.flag == "否" &&mode != "暂不分配"'>
+        <div style='width:30%;margin-left: 10px' v-if='deptBudgetList.purpose == "库点费用" && deptBudgetList.flag == "否" &&mode != "暂不分配"'>
             <el-date-picker v-model="value2" type="daterange" align="right" unlink-panels range-separator="至"
               start-placeholder="开始日期" value-format='yyyy-MM-dd' end-placeholder="结束日期" :picker-options="pickerOptions"
               @change="dateChange">
             </el-date-picker>
         </div>
-        <ws-select v-if='(deptBudgetList.purpose == "库点费用"  &&mode != "暂不分配"&& deptBudgetList.flag == "否")'  v-model="goodsSource" placeholder="全部客户" 
+        <el-button style="margin-left: 10px" type="primary" @click="queren" v-if='deptBudgetList.purpose == "库点费用" && deptBudgetList.flag == "否" &&mode != "暂不分配"'>确认</el-button>
+        <ws-select style="margin-left: 25px" v-if='(deptBudgetList.purpose == "库点费用"  &&mode != "暂不分配"&& deptBudgetList.flag == "否")'  v-model="goodsSource" placeholder="全部客户" 
             @change='sourceChange'>
             <ws-option key="全部客户" label="全部客户" value="全部客户" style="color: #8890b1" />
-            <ws-option v-for="item in customerList" :key="item.goodsSource" :label="item.goodsSource" :value="item.goodsSource"
+            <ws-option v-for="item in customerList" :key="item.orderId" :label="item.goodsSource" :value="item.orderId"
               style="color: #8890b1" />
         </ws-select>
-        <el-button @click="queren" v-if='deptBudgetList.purpose == "库点费用" && deptBudgetList.flag == "否" &&mode != "暂不分配"'>确认</el-button>
-        <span style="margin-top:5px" v-if='mode!="暂不分配"'>合计分配：{{amount}}元</span>  
+        <span style="margin-top:5px;margin-left: 10px;" v-if='mode!="暂不分配"'>合计分配：{{amount}}元</span>  
         </div>
         <el-table ref="tableref" v-if='deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"&&mode!="暂不分配"||deptBudgetList.purpose=="库点费用"&&mode!="暂不分配"&&deptBudgetList.flag!="是"' :data="feeDetailsDistributions" style="width: 90%;margin:0 auto;">
           <el-table-column  width="150" v-if='deptBudgetList.purpose=="合同费用"' prop="date" label="仓库名称" min-width="110">
@@ -313,7 +313,14 @@
       if (e == '') {
         this.goodsSource = '全部客户'
       } else {
-        this.goodsSource  = e
+        for(let i=0;i<this.customerList.length;i++){
+          if(this.customerList[i].orderId == e){
+            this.orderId = this.customerList[i].orderId
+            this.goodsSource  = this.customerList[i].goodsSource
+            break;
+          }
+        }
+        
       }
         this.selectOrderList()
     },
@@ -542,7 +549,7 @@
               this.datas.push(response.records[i])
             }
             for (let z = 0; z < this.datas.length; z++) {
-              arr.push({ receiptDocDate: this.datas[z].issuingTime, goodsSource: this.datas[z].goodsSource, id: this.datas[z].id, weight: this.datas[z].inWarehouseWeight, goodsName: this.datas[z].goodsName, goodsNameKey: this.datas[z].goodsNameKey })
+              arr.push({ receiptDocDate: this.datas[z].issuingTime, goodsSource: this.datas[z].goodsSource,orderId:this.datas[z].id, id:'', weight: this.datas[z].inWarehouseWeight, goodsName: this.datas[z].goodsName, goodsNameKey: this.datas[z].goodsNameKey })
             }
             this.feeDetailsDistributions = arr
           } else {
@@ -552,7 +559,7 @@
               }
             }
             for (let z = 0; z < this.datas.length; z++) {
-              arr.push({ receiptDocDate: this.datas[z].issuingTime, goodsSource: this.datas[z].goodsSource,orderId:this.datas[z].id, id: this.datas[z].id, weight: this.datas[z].inWarehouseWeight, goodsName: this.datas[z].goodsName, goodsNameKey: this.datas[z].goodsNameKey })
+              arr.push({ receiptDocDate: this.datas[z].issuingTime, goodsSource: this.datas[z].goodsSource,orderId:this.datas[z].id, id:'', weight: this.datas[z].inWarehouseWeight, goodsName: this.datas[z].goodsName, goodsNameKey: this.datas[z].goodsNameKey })
             }
             this.feeDetailsDistributions = arr
 

src/views/profitable/cashoutaduitNQ.vue

@@ -126,11 +126,11 @@
           <ws-option v-for="item in modeList" :key="item.value" :label="item.value" :value="item.value"
             style="color: #8890b1" />
         </ws-select>
-         <ws-select v-model="moneys" placeholder="费用分配金额" class="typeselect" >
+         <ws-select style='margin-left: 10px' v-model="moneys" placeholder="费用分配金额" class="typeselect" >
           <ws-option v-for="item in moneysList" :key="item.value" :label="item.value" :value="item.value"
             style="color: #8890b1" />
         </ws-select>
-        <div style='width:30%;' v-if='(deptBudgetList.purpose == "库点费用" &&mode != "暂不分配" && deptBudgetList.storageFeeFlag==0)'>
+        <div style='width:30%;margin-left: 10px' v-if='(deptBudgetList.purpose == "库点费用" &&mode != "暂不分配" && deptBudgetList.storageFeeFlag==0)'>
             <el-date-picker v-model="value2" type="daterange" align="right" unlink-panels range-separator="至"
               start-placeholder="开始日期" value-format='yyyy-MM-dd' end-placeholder="结束日期" :picker-options="pickerOptions"
               @change="dateChange">
@@ -138,14 +138,14 @@
         </div>
         <!-- && deptBudgetList.flag == "否" -->
         <!-- :disabled='disabled' -->
-        <el-button type="primary" @click="queren" v-if='(deptBudgetList.purpose == "库点费用" &&mode != "暂不分配" && deptBudgetList.storageFeeFlag==0)'>确认</el-button>
-        <ws-select v-if='(deptBudgetList.purpose == "库点费用"  &&mode != "暂不分配"&& deptBudgetList.storageFeeFlag==0)'  v-model="goodsSource" placeholder="全部客户" 
+        <el-button style='margin-left: 10px' type="primary" @click="queren" v-if='(deptBudgetList.purpose == "库点费用" &&mode != "暂不分配" && deptBudgetList.storageFeeFlag==0)'>确认</el-button>
+        <ws-select style='margin-left: 25px' v-if='(deptBudgetList.purpose == "库点费用"  &&mode != "暂不分配"&& deptBudgetList.storageFeeFlag==0)'  v-model="goodsSource" placeholder="全部客户" 
             @change='sourceChange'>
             <ws-option key="全部客户" label="全部客户" value="全部客户" style="color: #8890b1" />
-            <ws-option v-for="item in customerList" :key="item.goodsSource" :label="item.goodsSource" :value="item.goodsSource"
+            <ws-option v-for="item in customerList" :key="item.orderId" :label="item.goodsSource" :value="item.orderId"
               style="color: #8890b1" />
         </ws-select>
-        <span style="margin-top:5px" v-if='mode!="暂不分配"'>合计分配：{{amount}}元</span>
+        <span style="margin-top:5px;margin-left: 10px" v-if='mode!="暂不分配"'>合计分配：{{amount}}元</span>
         </div>
         </div>
  
@@ -336,7 +336,14 @@
       if (e == '') {
         this.goodsSource = '全部客户'
       } else {
-        this.goodsSource  = e
+        for(let i=0;i<this.customerList.length;i++){
+          if(this.customerList[i].orderId == e){
+            this.orderId = this.customerList[i].orderId
+            this.goodsSource  = this.customerList[i].goodsSource
+            break;
+          }
+        }
+        
       }
         this.selectOrderList()
     },
@@ -389,7 +396,7 @@
             }
             //
             for (let z = 0; z < this.datas.length; z++) {
-              arr.push({ receiptDocDate: this.datas[z].issuingTime, goodsSource: this.datas[z].goodsSource , id: '', weight: this.datas[z].inWarehouseWeight, goodsName: this.datas[z].goodsName, goodsNameKey: this.datas[z].goodsNameKey })
+              arr.push({ receiptDocDate: this.datas[z].issuingTime, goodsSource: this.datas[z].goodsSource ,orderId:this.datas[z].id, id: '', weight: this.datas[z].inWarehouseWeight, goodsName: this.datas[z].goodsName, goodsNameKey: this.datas[z].goodsNameKey })
             }
             this.feeDetailsDistributions = arr
           } else {

src/views/profitable/expenseallot.vue

@@ -73,25 +73,25 @@
           <ws-option v-for="item in modeList" :key="item.value" :label="item.value" :value="item.value"
             style="color: #8890b1" />
         </ws-select>
-         <ws-select v-model="moneys" placeholder="费用分配金额" class="typeselect" >
+         <ws-select style="margin-left: 10px" v-model="moneys" placeholder="费用分配金额" class="typeselect" >
           <ws-option v-for="item in moneysList" :key="item.value" :label="item.value" :value="item.value"
             style="color: #8890b1" />
         </ws-select>
-        <div style='width:30%;' v-if='(deptBudgetList.purpose == "库点费用" &&mode != "暂不分配" && deptBudgetList.storageFeeFlag==0)'>
+        <div style='width:30%;margin-left: 10px' v-if='(deptBudgetList.purpose == "库点费用" &&mode != "暂不分配" && deptBudgetList.storageFeeFlag==0)'>
             <el-date-picker v-model="value2" type="daterange" align="right" unlink-panels range-separator="至"
               start-placeholder="开始日期" value-format='yyyy-MM-dd' end-placeholder="结束日期" :picker-options="pickerOptions"
               @change="dateChange">
             </el-date-picker>
         </div>
         <!-- && deptBudgetList.flag == "否"  :disabled='disabled'-->
-        <el-button type="primary" @click="queren" v-if='(deptBudgetList.purpose == "库点费用" &&mode != "暂不分配" && deptBudgetList.storageFeeFlag==0)'>确认</el-button>
-        <ws-select v-if='(deptBudgetList.purpose == "库点费用"  &&mode != "暂不分配"&& deptBudgetList.storageFeeFlag==0)'  v-model="goodsSource" placeholder="全部客户" 
+        <el-button style="margin-left: 10px" type="primary" @click="queren" v-if='(deptBudgetList.purpose == "库点费用" &&mode != "暂不分配" && deptBudgetList.storageFeeFlag==0)'>确认</el-button>
+        <ws-select style="margin-left: 25px" v-if='(deptBudgetList.purpose == "库点费用"  &&mode != "暂不分配"&& deptBudgetList.storageFeeFlag==0)'  v-model="goodsSource" placeholder="全部客户" 
             @change='sourceChange'>
             <ws-option key="全部客户" label="全部客户" value="全部客户" style="color: #8890b1" />
-            <ws-option v-for="item in customerList" :key="item.goodsSource" :label="item.goodsSource" :value="item.goodsSource"
+            <ws-option v-for="item in customerList" :key="item.orderId" :label="item.goodsSource" :value="item.orderId"
               style="color: #8890b1" />
         </ws-select>
-        <span style="margin-top:5px" v-if='mode!="暂不分配"'>合计分配：{{amount}}元</span>  
+        <span style="margin-top:5px;margin-left: 10px" v-if='mode!="暂不分配"'>合计分配：{{amount}}元</span>  
         </div>
         <el-table ref="tableref" v-if='deptBudgetList.expensesPurpose==1&&deptBudgetList.type=="非粮款"&&mode!="暂不分配"||deptBudgetList.expensesPurpose==3&&mode!="暂不分配"||deptBudgetList.expensesPurpose==2&&mode!="暂不分配"' :data="feeDetailsDistributions" style="width: 90%;margin:0 auto;">
           <el-table-column width="200" v-if='deptBudgetList.expensesPurpose==1' prop="date" label="仓库名称" min-width="110">
@@ -267,7 +267,14 @@
       if (e == '') {
         this.goodsSource = '全部客户'
       } else {
-        this.goodsSource  = e
+        for(let i=0;i<this.customerList.length;i++){
+          if(this.customerList[i].orderId == e){
+            this.orderId = this.customerList[i].orderId
+            this.goodsSource  = this.customerList[i].goodsSource
+            break;
+          }
+        }
+        
       }
         this.selectOrderList()
     },
@@ -330,7 +337,7 @@
             }
             for (let z = 0; z < this.datas.length; z++) {
               // this.datas[z].id
-              arr.push({ receiptDocDate: this.datas[z].issuingTime, goodsSource: this.datas[z].goodsSource, id: '', weight: this.datas[z].inWarehouseWeight, goodsName: this.datas[z].goodsName, goodsNameKey: this.datas[z].goodsNameKey })
+              arr.push({ receiptDocDate: this.datas[z].issuingTime, goodsSource: this.datas[z].goodsSource,orderId:this.datas[z].id, id: '', weight: this.datas[z].inWarehouseWeight, goodsName: this.datas[z].goodsName, goodsNameKey: this.datas[z].goodsNameKey })
             }
             this.feeDetailsDistributions = arr
           } else {

src/views/profitable/expensemanagentedit.vue

@@ -111,25 +111,25 @@
           <ws-option v-for="item in datesList" :key="item.value" :label="item.value" :value="item.value"
             style="color: #8890b1" />
         </ws-select> -->
-         <ws-select :disabled='disabled' v-model="moneys" placeholder="费用分配金额">
+         <ws-select style='margin-left: 10px' :disabled='disabled' v-model="moneys" placeholder="费用分配金额">
           <ws-option v-for="item in moneysList" :key="item.value" :label="item.value" :value="item.value"
             style="color: #8890b1" />
         </ws-select>
-        <div style='width:30%;' v-if='(deptBudgetList.purpose == "库点费用" &&mode != "暂不分配" && deptBudgetList.storageFeeFlag==0)'>
+        <div style='width:30%;margin-left: 10px' v-if='(deptBudgetList.purpose == "库点费用" &&mode != "暂不分配" && deptBudgetList.storageFeeFlag==0)'>
             <el-date-picker v-model="value2" type="daterange" align="right" unlink-panels range-separator="至"
               start-placeholder="开始日期" value-format='yyyy-MM-dd' end-placeholder="结束日期" :picker-options="pickerOptions"
               @change="dateChange">
             </el-date-picker>
         </div>
         <!-- && deptBudgetList.flag == "否"  :disabled='disabled'-->
-        <el-button type="primary" @click="queren" v-if='(deptBudgetList.purpose == "库点费用" &&mode != "暂不分配" && deptBudgetList.storageFeeFlag==0)'>确认</el-button>
-        <ws-select v-if='(deptBudgetList.purpose == "库点费用"  &&mode != "暂不分配"&& deptBudgetList.storageFeeFlag==0)'  v-model="goodsSource" placeholder="全部客户" 
+        <el-button style='margin-left: 10px' type="primary" @click="queren" v-if='(deptBudgetList.purpose == "库点费用" &&mode != "暂不分配" && deptBudgetList.storageFeeFlag==0)'>确认</el-button>
+        <ws-select style='margin-left: 25px' v-if='(deptBudgetList.purpose == "库点费用"  &&mode != "暂不分配"&& deptBudgetList.storageFeeFlag==0)'  v-model="goodsSource" placeholder="全部客户" 
             @change='sourceChange'>
             <ws-option key="全部客户" label="全部客户" value="全部客户" style="color: #8890b1" />
-            <ws-option v-for="item in customerList" :key="item.goodsSource" :label="item.goodsSource" :value="item.goodsSource"
+            <ws-option v-for="item in customerList" :key="item.orderId" :label="item.goodsSource" :value="item.orderId"
               style="color: #8890b1" />
         </ws-select>
-        <span style="margin-top:5px" v-if='mode!="暂不分配"'>合计分配：{{amount}}元</span>  
+        <span style="margin-top:5px;margin-left: 10px" v-if='mode!="暂不分配"'>合计分配：{{amount}}元</span>  
         </div>
         <el-table ref="tableref" v-if='deptBudgetList.purpose=="合同费用"&&deptBudgetList.type=="非粮款"&&mode!="暂不分配"||deptBudgetList.purpose=="库点费用"&&mode!="暂不分配"||deptBudgetList.expensesPurpose==2&&mode!="暂不分配"' :data="feeDetailsDistributions" style="width: 90%;margin:0 auto;">
           <el-table-column width="150" v-if='deptBudgetList.purpose=="合同费用"' prop="date" label="仓库名称" min-width="110">
@@ -313,7 +313,14 @@ weight: 4000}]],
       if (e == '') {
         this.goodsSource = '全部客户'
       } else {
-        this.goodsSource  = e
+        for(let i=0;i<this.customerList.length;i++){
+          if(this.customerList[i].orderId == e){
+            this.orderId = this.customerList[i].orderId
+            this.goodsSource  = this.customerList[i].goodsSource
+            break;
+          }
+        }
+        
       }
         this.selectOrderList()
     },
@@ -372,7 +379,7 @@ weight: 4000}]],
               this.datas.push(response.records[i])
             }
             for (let z = 0; z < this.datas.length; z++) {
-              arr.push({ receiptDocDate: this.datas[z].issuingTime, goodsSource: this.datas[z].goodsSource, id: '', weight: this.datas[z].inWarehouseWeight, goodsName: this.datas[z].goodsName, goodsNameKey: this.datas[z].goodsNameKey })
+              arr.push({ receiptDocDate: this.datas[z].issuingTime, goodsSource: this.datas[z].goodsSource,orderId:this.datas[z].id, id: '', weight: this.datas[z].inWarehouseWeight, goodsName: this.datas[z].goodsName, goodsNameKey: this.datas[z].goodsNameKey })
             }
             this.feeDetailsDistributions = arr
           } else {