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

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -1640,7 +1640,23 @@ export default {
               this.options2 = []
             }
             this.fleetNameList = this.outContractNo.tranCarInfoList1
-
+            if (this.serviceManagementType == 3) {
+              if (this.deptBudgetList.goodsName && this.deptBudgetList.customerName) {
+                getquality({ goodsName: this.deptBudgetList.goodsName, compId: localStorage.getItem('ws-pf_compId'), warehouseName: this.warehouseName, customerNumberCard: this.deptBudgetList.customerNumberCard })
+                  .toPromise().then((response) => {
+                    if (response.A + response.B + response.C * 50 > response.D - 50) {
+                      this.redstatus = true
+                    } else {
+                      this.redstatus = false
+                    }
+                    var a = response.A > 0 ? '已完成' + Number(response.A).toFixed(2) + '吨，' : ''
+                    var b = response.B > 0 ? '进行中' + Number(response.B).toFixed(2) + '吨，' : ''
+                    var c = response.C > 0 ? '未称重' + Number(response.C) + '车' : ''
+                    this.deptBudgetList.volumeofbusiness = a + b + c
+                    this.$forceUpdate()
+                  })
+              }
+            }
           })
           this.$forceUpdate()
         })

src/views/outboundManagement/weighingManagementrecord.vue

@@ -348,6 +348,9 @@
         }, {
           value: '黑龙江启兴粮食贸易有限公司',
           label: '黑龙江启兴粮食贸易有限公司'
+        }, {
+          value: '黑龙江中天绿粮供应链服务有限公司',
+          label: '黑龙江中天绿粮供应链服务有限公司'
         }],
         companyNameEWOptions: [{
           value: '黑龙江中天昊元贸易有限公司',
@@ -566,7 +569,7 @@
                 this.dialogDataList.push(_datas)
                 this.printBig(1, this.radio)
               } else {
-                this.dialogData.companyName = this.companyName
+                this.dialogData.compName = this.companyName
                 if(this.dialogData&&!this.dialogData.customer&&this.dialogData.contractManagement){
                   this.dialogData.customer = this.dialogData.contractManagement.buyer
                 }

src/views/profitable/cashout.vue

@@ -44,7 +44,7 @@
             prop="contractNo" class="readonly">
             <ws-select v-model="deptBudgetList.autoAssign" class="typeselect">
               <ws-option label="不自动分配" value="不自动分配" style="color: #8890b1" />
-              <ws-option label="仓储费自动分配" value="仓储费自动分配" style="color: #8890b1" />
+              <!-- <ws-option label="仓储费自动分配" value="仓储费自动分配" style="color: #8890b1" /> -->
               <ws-option label="燃料费自动分配" value="燃料费自动分配" style="color: #8890b1" />
             </ws-select>
           </el-form-item>
@@ -114,10 +114,10 @@
           </el-form-item>
         </el-form>
         <div
-          v-if='deptBudgetList.purpose == "合同费用" && deptBudgetList.type == "利息" || deptBudgetList.purpose == "合同费用" && deptBudgetList.type == "非粮款" || deptBudgetList.purpose == "库点费用" && deptBudgetList.autoAssign == "不自动分配"'
+          v-if='deptBudgetList.purpose == "合同费用" && deptBudgetList.type == "利息" || deptBudgetList.purpose == "合同费用" && deptBudgetList.type == "非粮款"|| deptBudgetList.purpose == "库点费用" && deptBudgetList.autoAssign == 1 && mode != "暂不分配" || deptBudgetList.purpose == "库点费用" && deptBudgetList.autoAssign == "不自动分配" && mode != "暂不分配"'
           class='expensetitle'>费用分配</div>
         <div
-          v-if='deptBudgetList.purpose == "合同费用" && deptBudgetList.type == "利息" || deptBudgetList.purpose == "合同费用" && deptBudgetList.type == "非粮款" || deptBudgetList.purpose == "库点费用" && deptBudgetList.autoAssign == "不自动分配"'
+          v-if='deptBudgetList.purpose == "合同费用" && deptBudgetList.type == "利息" || deptBudgetList.purpose == "合同费用" && deptBudgetList.type == "非粮款"|| deptBudgetList.purpose == "库点费用" && deptBudgetList.autoAssign == 1 && mode != "暂不分配" || deptBudgetList.purpose == "库点费用" && deptBudgetList.autoAssign == "不自动分配" && mode != "暂不分配"'
           style='margin:0 auto 10px;width:90%;display: flex;'>
           <ws-select v-model="mode" placeholder="费用分配方式" @change="modeselect">
             <ws-option v-for="item in modeList" :key="item.value" :label="item.value" :value="item.value"
@@ -144,16 +144,16 @@
               style="color: #8890b1" />
           </ws-select>
           <div style='width:30%;margin-left: 10px'
-            v-if='deptBudgetList.purpose == "库点费用" && deptBudgetList.flag == "否" && mode != "暂不分配"'>
+            v-if='deptBudgetList.purpose == "库点费用" && mode != "暂不分配" && deptBudgetList.autoAssign == "不自动分配"'>
             <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>
           <el-button style="margin-left: 10px" type="primary" @click="queren"
-            v-if='deptBudgetList.purpose == "库点费用" && deptBudgetList.flag == "否" && mode != "暂不分配"'>确认</el-button>
+            v-if='deptBudgetList.purpose == "库点费用" && mode != "暂不分配" && deptBudgetList.autoAssign == "不自动分配" || deptBudgetList.purpose == "库点费用" && mode != "暂不分配" && deptBudgetList.autoAssign == 1'>确认</el-button>
           <ws-select style="margin-left: 25px"
-            v-if='(deptBudgetList.purpose == "库点费用" && mode != "暂不分配" && deptBudgetList.flag == "否")'
+            v-if='(deptBudgetList.purpose == "库点费用" && mode != "暂不分配"&& deptBudgetList.autoAssign == "不自动分配" || deptBudgetList.purpose == "库点费用" && mode != "暂不分配" && deptBudgetList.autoAssign == 1 )'
             v-model="goodsSource" placeholder="全部客户" @change='sourceChange'>
             <ws-option key="全部客户" label="全部客户" value="全部客户" style="color: #8890b1" />
             <ws-option v-for="item in customerList" :key="item.orderId" :label="item.goodsSource" :value="item.orderId"
@@ -162,7 +162,8 @@
           <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 == "合同费用" && deptBudgetList.type == "非粮款" && mode != "暂不分配" || deptBudgetList.purpose == "库点费用" && mode != "暂不分配" && deptBudgetList.autoAssign == "不自动分配"'
+          v-if='deptBudgetList.purpose == "合同费用" && deptBudgetList.type == "利息" && mode != "暂不分配" || deptBudgetList.purpose == "合同费用" && deptBudgetList.type == "非粮款" && mode != "暂不分配" || deptBudgetList.purpose == "库点费用" && mode != "暂不分配" && deptBudgetList.autoAssign == "不自动分配"
+          || deptBudgetList.purpose == "库点费用" && mode != "暂不分配" && deptBudgetList.autoAssign == 1'
           :data="feeDetailsDistributions" style="width: 90%;margin:0 auto;">
           <el-table-column key="1" width="150" v-if='deptBudgetList.purpose == "合同费用"' prop="date" label="仓库名称"
             min-width="110">
@@ -287,8 +288,9 @@ export default {
       disabled: false,
       warecontractList: [],
       dateRange: this.disabledDate(),
+      // flag: '否',
       feeDetailsDistributions: [{ receiptDocDate: '', inWarehouseWeight: 0, distributionMoney: 0, warehouseName: '', goodsName: '', goodsSource: '', index: 0 }],
-      deptBudgetList: { purpose: '合同费用', type: '粮款', flag: '否', payerHeader:'',noPaymentFlag:'',autoAssign: '不自动分配', payee: '', accountNumber: '',paymentIdentifi: '', bank: '', bankBranch: '', wareExpenseType: '杂费', },
+      deptBudgetList: { purpose: '合同费用', type: '粮款',  payerHeader:'',noPaymentFlag:'',autoAssign: '不自动分配', payee: '', accountNumber: '',paymentIdentifi: '', bank: '', bankBranch: '', wareExpenseType: '杂费', },
       makeWordData: {},
       warehouseList: [],
       contractList: [],
@@ -302,7 +304,7 @@ export default {
       wareList: [{ key: 1, value: '指定仓库' }, { key: 2, value: '全部仓库' }],
       datesList: [{ key: 1, value: '固定日期' }, { key: 2, value: '指定日期' }],
 
-      typeList: [{ key: 1, value: '杂费' }, { key: 2, value: '水电费' }, { key: 3, value: '伙食费' }, { key: 4, value: '人工费' }, { key: 5, value: '物质采买' }, { key: 6, value: '燃料费' }, { key: 7, value: '加油费' }],
+      typeList: [{ key: 1, value: '杂费' }, { key: 2, value: '水电费' }, { key: 3, value: '伙食费' }, { key: 4, value: '人工费' }, { key: 5, value: '物质采买' }, { key: 6, value: '燃料费' }, { key: 7, value: '加油费' },{ key: 8, value: '仓储费' }],
       moneysList: [{ key: 1, value: '按重量自动分配' }, { key: 2, value: '指定分配金额' }],
       goodsList: [{ key: 1, value: '全部货品' }, { key: 2, value: '指定货品' }],
       Num: 0,
@@ -482,6 +484,7 @@ export default {
           this.feeDetailsDistributions[index].orderId = this.goodsourcelist[index][i].id
         }
       }
+      debugger
       if (this.moneys == '按重量自动分配') {
         for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
           weight += Number(this.feeDetailsDistributions[i].inWarehouseWeight)
@@ -494,9 +497,9 @@ export default {
             }
           }
           if (i == this.feeDetailsDistributions.length - 1) {
-            this.feeDetailsDistributions[i].distributionMoney = (this.deptBudgetList.amountMoney - moneyDiff).toFixed(2)
+            this.feeDetailsDistributions[i].distributionMoney = Number(this.deptBudgetList.amountMoney - moneyDiff).toFixed(2)
           }
-          money = (this.feeDetailsDistributions[i].distributionMoney + moneyDiff).toFixed(2)
+          money = Number(this.feeDetailsDistributions[i].distributionMoney + moneyDiff).toFixed(2)
         }
       }
     },
@@ -668,7 +671,7 @@ export default {
       this.feeDetailsDistributions = [{ receiptDocDate: '', inWarehouseWeight: 0, distributionMoney: 0, warehouseName: '', goodsName: '', goodsSource: '', index: 0 }]
       this.goodsourcelist = []
       this.$router.push({
-        path: 'expensemanagementdetails'
+        path: 'expensemanagement'
       })
     },
     handlefujian(file) {
@@ -789,19 +792,19 @@ export default {
         this.deptBudgetList.costNo = 'HTF' + this.getdate() + this.Num
       } else if (this.deptBudgetList.purpose == '库点费用') {
         this.deptBudgetList.expensesPurpose = 3
+        debugger
+        for (var i = 0;i<this.typeList.length;i++) {
+          if (this.typeList[i].key == 8) {
+            this.deptBudgetList.storageFeeFlag = 1
+          }
+        }
+        debugger
 
-        if (this.deptBudgetList.flag == '是') {
-          this.deptBudgetList.storageFeeFlag = 1
-          this.deptBudgetList.expenseAllocationInfoList = []
-        } else {
-          this.deptBudgetList.storageFeeFlag = 0
-          if (this.mode == '暂不分配') {
+        if (this.mode == '暂不分配') {
             this.deptBudgetList.expenseAllocationInfoList = []
           } else {
             this.deptBudgetList.expenseAllocationInfoList = this.feeDetailsDistributions
-          }
         }
-
         this.deptBudgetList.costNo = 'KDF' + this.getdate() + this.Num
       } else if (this.deptBudgetList.purpose == '经营性费用') {
         this.deptBudgetList.expensesPurpose = 5
@@ -811,7 +814,6 @@ export default {
         this.deptBudgetList.costNo = 'BYJ' + this.getdate() + this.Num
         this.$set(this.deptBudgetList,'wareExpenseType','')
         this.$set(this.deptBudgetList,'type','')
-        this.$set(this.deptBudgetList,'flag','')
       }
        //选中状态下,备用金支付标识为1
        if(this.selected == true){
@@ -915,8 +917,8 @@ export default {
         })
         return
       }
-      if (this.deptBudgetList.autoAssign != '燃料费自动分配' && this.deptBudgetList.autoAssign != '仓储费自动分配') {//库点费用  仓储费自动分配和煤款自动分配不需要自动请款
-        if (this.deptBudgetList.expensesPurpose == 1 && this.deptBudgetList.costType == 3 && this.mode == '全部分配' || this.deptBudgetList.expensesPurpose == 3 && this.mode == '全部分配' && this.deptBudgetList.storageFeeFlag != 1) {
+      if (this.deptBudgetList.autoAssign != '燃料费自动分配') {//库点费用  仓储费自动分配和煤款自动分配不需要自动请款
+        if (this.deptBudgetList.expensesPurpose == 1 && this.deptBudgetList.costType == 3 && this.mode == '全部分配' || this.deptBudgetList.expensesPurpose == 3 && this.mode == '全部分配') {
           this.deptBudgetList.amountMoney = Number(this.deptBudgetList.amountMoney).toFixed(2)
           if (this.amount != this.deptBudgetList.amountMoney) {
             this.$message({
@@ -926,7 +928,7 @@ export default {
             return
           }
         }
-        if (this.deptBudgetList.expensesPurpose == 1 && this.deptBudgetList.costType == 3 && this.mode == '部分分配' || this.deptBudgetList.expensesPurpose == 3 && this.mode == '部分分配' && this.deptBudgetList.storageFeeFlag != 1) {
+        if (this.deptBudgetList.expensesPurpose == 1 && this.deptBudgetList.costType == 3 && this.mode == '部分分配' || this.deptBudgetList.expensesPurpose == 3 && this.mode == '部分分配') {
           if (this.amount > this.deptBudgetList.amountMoney) {
             this.$message({
               message: '分配金额不可超过请款金额!',
@@ -939,9 +941,6 @@ export default {
       if (this.deptBudgetList.purpose == '库点费用') {
         if (this.deptBudgetList.autoAssign == '不自动分配') {
           this.deptBudgetList.autoAssign = 1
-        } else if (this.deptBudgetList.autoAssign == '仓储费自动分配') {
-          this.deptBudgetList.autoAssign = 3
-          this.deptBudgetList.expenseAllocationInfoList = []
         } else if (this.deptBudgetList.autoAssign == '煤款自动分配') {
           if (!this.deptBudgetList.coalPrice) {
             this.$message({
@@ -1012,7 +1011,7 @@ export default {
                 })
               }
               this.mode = '全部分配'
-              this.deptBudgetList = { purpose: '合同费用', type: '粮款', flag: '否', payee: '', noPaymentFlag:'',accountNumber: '',payerHeader:'',paymentIdentifi: '',  bank: '', bankBranch: '', wareExpenseType: '杂费', }
+              this.deptBudgetList = { purpose: '合同费用', type: '粮款', payee: '', noPaymentFlag:'',accountNumber: '',payerHeader:'',paymentIdentifi: '',  bank: '', bankBranch: '', wareExpenseType: '杂费', }
               this.feeDetailsDistributions = [{ receiptDocDate: '', inWarehouseWeight: 0, distributionMoney: 0, warehouseName: '', goodsName: '', goodsSource: '', index: 0 }]
               this.paymentScreenshot = []
               this.$refs.upload.clearFiles()

src/views/profitable/cashoutaduitNQ.vue

@@ -37,7 +37,7 @@
           <el-form-item label-width='100px' v-if='deptBudgetList.purpose == "库点费用"' label="是否自动分配" span="1"
             prop="contractNo" class="readonly">
             <span v-if='deptBudgetList.autoAssign == 1'>不自动分配</span>
-            <span v-if='deptBudgetList.autoAssign == 3'>仓储费自动分配</span>
+            <!-- <span v-if='deptBudgetList.autoAssign == 3'>仓储费自动分配</span> -->
             <span v-if='deptBudgetList.autoAssign == 5'>燃料费自动分配</span>
           </el-form-item>
           <el-form-item label-width='100px' label="煤单价(元/吨)" span="1" prop="coalPrice"
@@ -151,7 +151,7 @@
         </div>
         <!-- 经营性费用不分配 -->
         <div
-          v-if='deptBudgetList.expensesPurpose == 1 && deptBudgetList.costType == 7 || deptBudgetList.expensesPurpose == 1 && deptBudgetList.costType == 3 || deptBudgetList.expensesPurpose == 3 && deptBudgetList.storageFeeFlag != 1 && deptBudgetList.autoAssign!=3 && deptBudgetList.autoAssign!=5'>
+          v-if='deptBudgetList.expensesPurpose == 1 && deptBudgetList.costType == 7 || deptBudgetList.expensesPurpose == 1 && deptBudgetList.costType == 3 || deptBudgetList.expensesPurpose == 3 && mode != "暂不分配" && deptBudgetList.autoAssign!=5'>
           <!-- <div v-if='deptBudgetList.expensesPurpose!=5'> -->
             <div style="display:flex">
             <div style='margin:0 50px 10px;font-weight:bold'>费用分配</div>
@@ -167,7 +167,7 @@
                 style="color: #8890b1" />
             </ws-select>
             <div style='width:30%;margin-left: 10px'
-              v-if='(deptBudgetList.purpose == "库点费用" && mode != "暂不分配" && deptBudgetList.storageFeeFlag == 0)'>
+              v-if='(deptBudgetList.purpose == "库点费用" && 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">
@@ -176,9 +176,9 @@
             <!-- && deptBudgetList.flag == "否" -->
             <!-- :disabled='disabled' -->
             <el-button style='margin-left: 10px' type="primary" @click="queren"
-              v-if='(deptBudgetList.purpose == "库点费用" && mode != "暂不分配" && deptBudgetList.storageFeeFlag == 0)'>确认</el-button>
+              v-if='(deptBudgetList.purpose == "库点费用" && mode != "暂不分配")'>确认</el-button>
             <ws-select style='margin-left: 25px'
-              v-if='(deptBudgetList.purpose == "库点费用" && mode != "暂不分配" && deptBudgetList.storageFeeFlag == 0)'
+              v-if='(deptBudgetList.purpose == "库点费用" && mode != "暂不分配")'
               v-model="goodsSource" placeholder="全部客户" @change='sourceChange'>
               <ws-option key="全部客户" label="全部客户" value="全部客户" style="color: #8890b1" />
               <ws-option v-for="item in customerList" :key="item.orderId" :label="item.goodsSource"
@@ -189,7 +189,7 @@
         </div>
 
         <el-table ref="tableref"
-          v-if='deptBudgetList.purpose == "合同费用" && deptBudgetList.type == "利息" && mode != "暂不分配" || deptBudgetList.purpose == "合同费用" && deptBudgetList.type == "非粮款" && mode != "暂不分配" || deptBudgetList.purpose == "库点费用" && mode != "暂不分配"&& deptBudgetList.storageFeeFlag != 1 && deptBudgetList.autoAssign!=3 && deptBudgetList.autoAssign!=5'
+          v-if='deptBudgetList.purpose == "合同费用" && deptBudgetList.type == "利息" && mode != "暂不分配" || deptBudgetList.purpose == "合同费用" && deptBudgetList.type == "非粮款" && mode != "暂不分配" || deptBudgetList.purpose == "库点费用" && mode != "暂不分配" && deptBudgetList.autoAssign!=5'
           :data="feeDetailsDistributions" style="width: 90%;margin:0 auto;">
           <el-table-column key="1" width="200" v-if='deptBudgetList.purpose == "合同费用"' prop="date" label="仓库名称"
             min-width="110">
@@ -650,7 +650,7 @@ export default {
       this.feeDetailsDistributions = [{ proDate: '', weight: '', money: '', warehouse: '', belonging: '', index: 0 }],
         this.goodsourcelist = []
       this.$router.push({
-        path: 'expensemanagementdetails'
+        path: 'expensemanagement'
       })
     },
     submit(status) {

src/views/profitable/expenseallot.vue

@@ -48,8 +48,8 @@
           </el-form-item>
           <el-form-item label-width='100px' label="金额" span="1" prop="contractNo" class="readonly">
             {{deptBudgetList.amountMoney}}
-            <el-checkbox v-show="this.deptBudgetList.type != '利息'" v-model="selected">备用金支付</el-checkbox>
-            <el-checkbox v-show="this.deptBudgetList.type == '利息'" v-model="lixiSelected" disabled>无需付款</el-checkbox>
+            <span v-if='deptBudgetList.paymentIdentifi==1' style="color:blue;margin-left: 10px;">备用金支付</span>
+            <span v-if='deptBudgetList.noPaymentFlag==1' style="color:blue;margin-left: 10px;">无需付款</span>
           </el-form-item>
           <el-form-item label-width='100px' label="备注" span="1" prop="settlementMethod">
             <el-input
@@ -138,15 +138,15 @@
           <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%;margin-left: 10px' v-if='(deptBudgetList.purpose == "库点费用" &&mode != "暂不分配" && deptBudgetList.storageFeeFlag==0)'>
+        <div style='width:30%;margin-left: 10px' v-if='(deptBudgetList.purpose == "库点费用" &&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>
         <!-- && deptBudgetList.flag == "否"  :disabled='disabled'-->
-        <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="全部客户" 
+        <el-button style="margin-left: 10px" type="primary" @click="queren" v-if='(deptBudgetList.purpose == "库点费用" &&mode != "暂不分配")'>确认</el-button>
+        <ws-select style="margin-left: 25px" v-if='(deptBudgetList.purpose == "库点费用"  &&mode != "暂不分配")'  v-model="goodsSource" placeholder="全部客户" 
             @change='sourceChange'>
             <ws-option key="全部客户" label="全部客户" value="全部客户" style="color: #8890b1" />
             <ws-option v-for="item in customerList" :key="item.orderId" :label="item.goodsSource" :value="item.orderId"
@@ -241,15 +241,13 @@
 </template>
 <script>
   import WsUpload from '@/components/WsUpload'
-  import {lookexenseinfo,getcontract,getwarehouse,addexenseinfo,getwarehousingorder,editexenseinfo,getwarehousingorderList,deloneallocationinfo} from '@/model/profitable/index'
+  import {lookexenseinfo,getcontract,getwarehouse,getwarehousingorder,editexenseinfo,getwarehousingorderList,deloneallocationinfo} from '@/model/profitable/index'
   export default {
     components: {
       WsUpload,
     },
     data() {
       return {
-        selected:false,
-        lixiSelected:true,
         value: [],
         customerList: [],
         goodsSource: '',

src/views/profitable/expensemanagementdetails.vue

@@ -225,8 +225,7 @@
                 (!scope.row.distributionStatus &&
                   scope.row.expensesPurpose == 3 &&
                   !scope.row.approveStatus &&
-                  scope.row.status == '已付款' &&
-                  scope.row.storageFeeFlag != 1 &&
+                  scope.row.status == '已付款'&&
                   scope.row.unallocatedAmount > 0) ||
                 (scope.row.expensesPurpose == 2 &&
                   scope.row.status == '已付款' &&

src/views/profitable/expensemanagentedit.vue

@@ -58,8 +58,8 @@
           </el-form-item>
           <el-form-item label-width='100px' label="金额" span="1" prop="contractNo" class="readonly">
             {{deptBudgetList.amountMoney}}
-            <el-checkbox v-show="deptBudgetList.costType != 7" v-model="selected">备用金支付</el-checkbox>
-            <el-checkbox v-show="deptBudgetList.costType == 7" v-model="lixiSelected" disabled>无需付款</el-checkbox>
+            <span v-if='deptBudgetList.paymentIdentifi==1' style="color:blue;margin-left: 10px;">备用金支付</span>
+            <span v-if='deptBudgetList.noPaymentFlag==1' style="color:blue;margin-left: 10px;">无需付款</span>
           </el-form-item>
           <el-form-item label-width='100px' label="备注" span="1" prop="settlementMethod">
             <el-input
@@ -152,13 +152,12 @@
             </el-table>
           </div>
         </div>
-        <div style="display:flex" v-if='(deptBudgetList.purpose=="合同费用"&&deptBudgetList.costType==7||deptBudgetList.purpose=="合同费用"&&deptBudgetList.costType==3||deptBudgetList.purpose=="库点费用"&&deptBudgetList.storageFeeFlag==0||deptBudgetList.expensesPurpose==2&&deptBudgetList.storageFeeFlag==0)' class='expensetitle'>费用分配
+        <div style="display:flex" v-if='(deptBudgetList.purpose=="合同费用"&&deptBudgetList.costType==7||deptBudgetList.purpose=="合同费用"&&deptBudgetList.costType==3||deptBudgetList.purpose=="库点费用"||deptBudgetList.expensesPurpose==2)' class='expensetitle'>费用分配
           <div style="margin-left:15px">可分配金额{{deptBudgetList.unallocatedAmount}}元</div></div>
-        <div v-if='(deptBudgetList.purpose=="合同费用"&&deptBudgetList.costType==7||deptBudgetList.purpose=="合同费用"&&deptBudgetList.costType==3||deptBudgetList.purpose=="库点费用"&&deptBudgetList.storageFeeFlag==0||deptBudgetList.expensesPurpose==2&&deptBudgetList.storageFeeFlag==0)' style='margin:0  auto 10px;width:90%;display: flex;'>
+        <div v-if='(deptBudgetList.purpose=="合同费用"&&deptBudgetList.costType==7||deptBudgetList.purpose=="合同费用"&&deptBudgetList.costType==3||deptBudgetList.purpose=="库点费用"||deptBudgetList.expensesPurpose==2)' style='margin:0  auto 10px;width:90%;display: flex;'>
           <ws-select v-model="mode" placeholder="费用分配方式" @change="modeselect">
             <ws-option v-for="item in modeList" :key="item.value" :label="item.value" :value="item.value"
             style="color: #8890b1" />
-            
         </ws-select>
          <!-- <ws-select v-if='deptBudgetList.purpose==1' v-model="ware" placeholder="费用分配仓库" class="typeselect" @change="selectwareType"
           :value="searchType">
@@ -179,15 +178,15 @@
           <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%;margin-left: 10px' v-if='(deptBudgetList.purpose == "库点费用" &&mode != "暂不分配" && deptBudgetList.storageFeeFlag==0)'>
+        <div style='width:30%;margin-left: 10px' v-if='(deptBudgetList.purpose == "库点费用" &&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>
         <!-- && deptBudgetList.flag == "否"  :disabled='disabled'-->
-        <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="全部客户" 
+        <el-button style='margin-left: 10px' type="primary" @click="queren" v-if='(deptBudgetList.purpose == "库点费用" &&mode != "暂不分配")'>确认</el-button>
+        <ws-select style='margin-left: 25px' v-if='(deptBudgetList.purpose == "库点费用"  &&mode != "暂不分配")'  v-model="goodsSource" placeholder="全部客户" 
             @change='sourceChange'>
             <ws-option key="全部客户" label="全部客户" value="全部客户" style="color: #8890b1" />
             <ws-option v-for="item in customerList" :key="item.orderId" :label="item.goodsSource" :value="item.orderId"
@@ -289,8 +288,6 @@
     },
     data() {
       return {
-        selected:false,
-        lixiSelected:true,
         customerList: [],
         goodsSource: '',
         value2: '',
@@ -683,12 +680,6 @@ weight: 4000}]],
         this.$set(this.deptBudgetList,'type','')
         this.$set(this.deptBudgetList,'flag','')
       }
-        //选中状态下,备用金支付标识为1
-       if(this.selected == true){
-          this.deptBudgetList.paymentIdentifi = 1
-        }else{
-          this.deptBudgetList.paymentIdentifi = 0
-        }
         if(this.deptBudgetList.expensesPurpose==1){
           if(this.deptBudgetList.type=='粮款'){
             this.deptBudgetList.costType=1
@@ -705,7 +696,7 @@ weight: 4000}]],
             this.deptBudgetList.expenseAllocationInfoList=this.feeDetailsDistributions
           }
         }
-        if(this.deptBudgetList.expensesPurpose==2 || this.deptBudgetList.expensesPurpose==3&&this.storageFeeFlag==0){
+        if(this.deptBudgetList.expensesPurpose==2 || this.deptBudgetList.expensesPurpose==3){
           this.deptBudgetList.expenseAllocationInfoList=this.feeDetailsDistributions
         }
          if(this.deptBudgetList.expensesPurpose==1||this.deptBudgetList.expensesPurpose==2){
@@ -1026,7 +1017,7 @@ weight: 4000}]],
         this.feeDetailsDistributions = [{receiptDocDate:'',inWarehouseWeight:0,distributionMoney:0,warehouseName:'',goodsName:'',goodsSource:'',index:0,}],
         this.goodsourcelist = []
         this.$router.push({
-          path:'expensemanagementdetails'
+          path:'expensemanagement'
         })
       },
       handlefujian(file) {

src/views/profitable/expensemanagentlook.vue

@@ -33,10 +33,9 @@
             <span v-if='(deptBudgetList.storageFeeFlag==1)'>是</span>
               <span v-if='(deptBudgetList.storageFeeFlag==0)'>否</span>
           </el-form-item> -->
-          <el-form-item label-width='100px' v-if='deptBudgetList.purpose == "库点费用"' label="是否自动分配" span="1"
+          <el-form-item label-width='100px' v-if='deptBudgetList.purpose == "库点费用"&& deptBudgetList.autoAssign' label="是否自动分配" span="1"
             prop="contractNo" class="readonly">
             <span v-if='deptBudgetList.autoAssign == 1'>不自动分配</span>
-            <span v-if='deptBudgetList.autoAssign == 3'>仓储费自动分配</span>
             <span v-if='deptBudgetList.autoAssign == 5'>燃料费自动分配</span>
           </el-form-item>
           <el-form-item label-width='100px' label="煤单价(元/吨)" span="1" prop="coalPrice"
@@ -157,9 +156,7 @@
             </el-table>
           </div>
         </div>
-        
-        
-        <div v-if='deptBudgetList.expensesPurpose==1&&deptBudgetList.costType==7 ||  deptBudgetList.expensesPurpose==1&&deptBudgetList.costType==3||deptBudgetList.expensesPurpose==3||deptBudgetList.expensesPurpose==2' style='width:90%;margin:10px auto;'>
+        <div v-if='(deptBudgetList.expensesPurpose==1&&deptBudgetList.costType==7 ||  deptBudgetList.expensesPurpose==1&&deptBudgetList.costType==3||deptBudgetList.expensesPurpose==3||deptBudgetList.expensesPurpose==2)&&deptBudgetList.expenseAllocationInfoList' style='width:90%;margin:10px auto;'>
           <div style='margin-bottom:20px;'>费用分配</div>
           <!-- <div> -->
           <el-table :data="deptBudgetList.expenseAllocationInfoList">

src/views/profitable/receipt.vue

@@ -224,7 +224,7 @@
                 type: 'warning',
               })
         }
-        if(!this.deptBudgetList.warehouse&&this.deptBudgetList.expensesPurpose==3){
+        if(!this.deptBudgetList.warehouseName&&this.deptBudgetList.expensesPurpose==3){
           this.$message({
                 message: '仓库名称不能为空!',
                 type: 'warning',

src/views/profitable/receiptaduit.vue

@@ -32,8 +32,8 @@
                 <ws-option label="保证金" value="5" style="color: #8890b1" />
             </ws-select>
           </el-form-item>
-          <el-form-item v-if='deptBudgetList.expensesPurpose==3' label-width='100px' label="仓库名称" span="1" prop="warehouse" class="readonly">
-          {{deptBudgetList.warehouse}}
+          <el-form-item v-if='deptBudgetList.expensesPurpose==3' label-width='100px' label="仓库名称" span="1" prop="warehouseName" class="readonly">
+          {{deptBudgetList.warehouseName}}
           </el-form-item>
           <el-form-item v-if='deptBudgetList.expensesPurpose==1' label-width='100px' label="合同编号" span="1" prop="contractNo" class="readonly">
           {{deptBudgetList.contractNo}}

src/views/profitable/storageCharge.vue

@@ -170,7 +170,7 @@
             searchKeyWord:this.searchKeyWord,
             currentPage: this.currentPage,
             searchTypeFee:1,
-            warehouseName:this.warehouseName,
+            warehouseName:this.warehouseName== '全部仓库' ? '':this.warehouseName,
             pageSize:this.pageSize ,
             searchType:this.searchType
           })

src/views/warehousenew/warehouseManagementList.vue

@@ -69,7 +69,11 @@
           <div class="reservesInfo_item" v-if="warehouseType == '1'"><div class="reservesInfo_GoodsName">{{item.goodsName}}</div>
           <span class="reservesInfo_Amount">{{item.stockNum == 0 ? "-":item.stockNum}}(吨)</span><br/>
           <span v-if="item.stockNum&&item.cost" class="reservesInfo_Amount">{{item.cost == 0 ? "-":item.cost}}(元/吨)</span>
-          <span v-else class="reservesInfo_Amount">{{item.conversionCost == 0 ? "-":item.conversionCost}}(元/吨)</span>
+          <span v-else class="reservesInfo_Amount">{{item.conversionCost == 0 ? "-":item.conversionCost}}(元/吨)</span><br/>
+          <div style="display:grid">
+            <span v-if="item.cargoWeight && item.cargoWeight != 0" class="reservesInfo_Amount">含转入:{{ item.cargoWeight }}(吨)</span>
+            <span v-if="item.redemptionWeight && item.redemptionWeight != 0" class="reservesInfo_Amount">待赎回:{{ item.redemptionWeight }}(吨)</span>
+          </div>
           </div>
           <div class="reservesInfo_item" v-if="warehouseType == '2'"><div class="reservesInfo_GoodsName">{{item.goodsName}}(吨)</div><span class="reservesInfo_Amount">{{item.surplus == 0 ? "-":item.surplus}}</span></div>
         </div>
@@ -1364,7 +1368,7 @@
   background: #ffffff;
   margin: 20px 10px;
   padding-bottom: 10px;
-  height: 500px;
+  height: 550px;
   /deep/.el-table .el-table__body .cell,/deep/.el-table .cell{
     text-align: center;
     
@@ -1432,7 +1436,7 @@
 .reservesInfo{
   display: inline-flex;
   .reservesInfo_item{
-    width: 120px;
+    width: 140px;
     background: #F5F7FA;
     // height: 54px;
     text-align: center;