瀏覽代碼

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

gjy 2 年之前
父節點
當前提交
284cbdb4cd

+ 4 - 0
src/api/V2/profitable/index.js

@@ -112,3 +112,7 @@ export const API_POST_EXPORTFILE = '/expenseInfo/exportPc'
 export const API_GET_CONSTNO = '/expenseInfo/costNoList'
 // 导入
 export const API_IMPORT_FIXED ='/fixedAssetsInfo/api/importFixedAssets'
+//煤款列表
+export const API_GET_COALPARAGRAPH = '/coalPaymentInfo/selectCoalInfo'
+//煤款记录
+export const API_GET_COALPARAGRAPH_RECORD = '/expenseInfo/selectRequestRecordInfo'

+ 1 - 0
src/lang/zh.js

@@ -678,6 +678,7 @@ export default {
     storageCharge:'仓储费',
     earnestmoney:'保证金',
     oilcost:'油费',
+    coalCost:'煤费',
     inventoryCheck:'库存盘点',
     sparepartMa: '物料采购',
     applDetailMa: '物料申请详情',

+ 11 - 5
src/model/profitable/index.js

@@ -56,7 +56,9 @@ import {
   API_POST_EXPORTFILE,
   API_GET_CONSTNO,
   API_IMPORT_FIXED,
-  API_POST_UPLOADIMAGE
+  API_POST_UPLOADIMAGE,
+  API_GET_COALPARAGRAPH,
+  API_GET_COALPARAGRAPH_RECORD
 } from '@/api/V2/profitable'
 //收支明细列表
 export const getInOutDetailed = appRx.get(API_GET_INOUTDETAILED, errorCatcher, errorHandle, filter)
@@ -167,7 +169,11 @@ export const batchDelFixedInfo = appRx.post(API_BATCH_DEL_FIXEDINFO, errorCatche
 export const getwarehousingorderList = appRx.get(API_GET_WAREHOUSINGORDER_LIST,errorCatcher, errorHandle, filter)
 // 导出费用明细信息
 export const exportFile = appRx.post(API_POST_EXPORTFILE)
-  //费用编号
-  export const getcostNo = appRx.get(API_GET_CONSTNO,errorCatcher, errorHandle, filter)
-	// 导入
-  export const importFixed = appRx.post(API_IMPORT_FIXED, errorCatcher, errorHandle, filter)
+//费用编号
+export const getcostNo = appRx.get(API_GET_CONSTNO,errorCatcher, errorHandle, filter)
+// 导入
+export const importFixed = appRx.post(API_IMPORT_FIXED, errorCatcher, errorHandle, filter)
+// 煤款列表
+export const coalPayment = appRx.get(API_GET_COALPARAGRAPH, errorCatcher, errorHandle, filter)
+// 煤款记录
+export const coalPaymentRecord = appRx.get(API_GET_COALPARAGRAPH_RECORD, errorCatcher, errorHandle, filter)

文件差異過大導致無法顯示
+ 676 - 611
src/views/profitable/cashout.vue


+ 13 - 3
src/views/profitable/cashoutaduit.vue

@@ -29,10 +29,21 @@
               <ws-option label="保证金" value="5" style="color: #8890b1" />
             </ws-select>
           </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 == "库点费用"' label="仓储费" span="1"
             prop="contractNo" class="readonly">
             <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"
+            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"
+            v-show="deptBudgetList.autoAssign == 5">
+            <!-- <el-input class='input50 input_css' placeholder="请输入煤单价" v-model="deptBudgetList.coalPrice"></el-input> -->
+            <span>{{deptBudgetList.coalPrice}}</span>
           </el-form-item>
           <el-form-item v-if='deptBudgetList.expensesPurpose == 3' label-width='100px' label="仓库名称" span="1"
             prop="warehouse" class="readonly">
@@ -204,10 +215,9 @@
           </div>
           <div>
             <!-- .pdf, .doc, .docx, .xls, .xlsx -->
-            <ws-upload ref="upload" accept=".jpg, .jpeg, .png," :comp-id="compId" :appendix-ids="auditList" :limit="9"
+            <ws-upload ref="upload" accept=".jpg, .jpeg, .png," :comp-id="compId" :appendix-ids="auditList" :limit="99"
               :size-limit="size" @onChange="auditUrlChange" @uploadSuccess="uploadSuccess" />
           </div>
-
           <span slot="footer" class="dialog-footer">
             <el-button @click="cancelShow">取 消</el-button>
             <el-button type="primary" @click="rejectclick">确 定</el-button>

+ 17 - 6
src/views/profitable/cashoutaduitNQ.vue

@@ -27,10 +27,21 @@
             <span v-if='deptBudgetList.costType == 3'>非粮款</span>
             <span v-if='deptBudgetList.costType == 5'>保证金</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 == "库点费用"' label="仓储费" span="1"
             prop="contractNo" class="readonly">
             <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"
+            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"
+            v-show="deptBudgetList.autoAssign == 5">
+            <!-- <el-input class='input50 input_css' placeholder="请输入煤单价" v-model="deptBudgetList.coalPrice"></el-input> -->
+            <span>{{deptBudgetList.coalPrice}}</span>
           </el-form-item>
           <el-form-item v-if='deptBudgetList.expensesPurpose == 3' label-width='100px' label="仓库名称" span="1"
             prop="warehouse" class="readonly">
@@ -136,7 +147,7 @@
         </div>
         <!-- 经营性费用不分配 -->
         <div
-          v-if='deptBudgetList.expensesPurpose == 1 && deptBudgetList.costType == 3 || deptBudgetList.expensesPurpose == 3 && deptBudgetList.storageFeeFlag != 1'>
+          v-if='deptBudgetList.expensesPurpose == 1 && deptBudgetList.costType == 3 || deptBudgetList.expensesPurpose == 3 && deptBudgetList.storageFeeFlag != 1 && deptBudgetList.autoAssign!=3 && deptBudgetList.autoAssign!=5'>
           <!-- <div v-if='deptBudgetList.expensesPurpose!=5'> -->
           <div style="display:flex">
             <div style='margin:0 50px 10px;font-weight:bold'>费用分配</div>
@@ -174,7 +185,7 @@
         </div>
 
         <el-table ref="tableref"
-          v-if='deptBudgetList.purpose == "合同费用" && deptBudgetList.type == "非粮款" && mode != "暂不分配" || deptBudgetList.purpose == "库点费用" && mode != "暂不分配"'
+          v-if='deptBudgetList.purpose == "合同费用" && deptBudgetList.type == "非粮款" && mode != "暂不分配" || deptBudgetList.purpose == "库点费用" && mode != "暂不分配"&& deptBudgetList.storageFeeFlag != 1 && deptBudgetList.autoAssign!=3 && 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">
@@ -261,7 +272,7 @@
       </div>
       <div>
         <!-- .pdf, .doc, .docx, .xls, .xlsx -->
-        <ws-upload ref="upload" accept=".jpg, .jpeg, .png," :comp-id="compId" :appendix-ids="auditList" :limit="9"
+        <ws-upload ref="upload" accept=".jpg, .jpeg, .png," :comp-id="compId" :appendix-ids="auditList" :limit="99"
           :size-limit="size" @onChange="auditUrlChange" @uploadSuccess="uploadSuccess" />
       </div>
       <span slot="footer" class="dialog-footer">
@@ -338,7 +349,7 @@ export default {
         date: 20
       }
       ], //货值
-      auditList: [],//审核附件
+      auditList: "",//审核附件
       auditUrl: ""
     }
   },
@@ -640,7 +651,7 @@ export default {
     },
     submit(status) {
       //经营性费用不进行分配
-      if (this.deptBudgetList.expensesPurpose == 1 && this.deptBudgetList.costType == 3 && this.mode != '暂不分配' || this.deptBudgetList.expensesPurpose == '3' && this.deptBudgetList.storageFeeFlag != 1 && this.mode != '暂不分配') {
+      if (this.deptBudgetList.expensesPurpose == 1 && this.deptBudgetList.costType == 3 && this.mode != '暂不分配' || this.deptBudgetList.expensesPurpose == '3' && this.deptBudgetList.storageFeeFlag != 1 && this.mode != '暂不分配'&& this.deptBudgetList.autoAssign!=3 && this.deptBudgetList.autoAssign!=5) {
         // if(this.deptBudgetList.expensesPurpose!=5&&this.mode!='暂不分配'){
         for (let i = 0; i < this.feeDetailsDistributions.length; i++) {
           if (!this.feeDetailsDistributions[i].distributionMoney) {

+ 216 - 0
src/views/profitable/coalCost.vue

@@ -0,0 +1,216 @@
+//煤款
+<template>
+    <div class="container">
+        <el-row class="row_top">
+            <el-col :span="12">
+                <h2 class="bg-left title">煤款</h2>
+            </el-col>
+            <el-col :span="12" class="bg-right">
+                <el-button class="bg-bottom" type="primary" size="small" @click="returnsales()"><img width="6"
+                        height="10" style="vertion-align: bottom; margin-right: 3px"
+                        src="../../../public/img/lujing.png" alt="" />返回
+                </el-button>
+            </el-col>
+        </el-row>
+        <div class="center">
+            <!-- <el-input placeholder="可按费用名称、流向、经办人查找" class="input_css" v-model="searchKeyWord" clearable></el-input> -->
+            <el-select v-model="searchKeyWord" filterable placeholder="按仓库筛选" clearable @change="getList"
+                class="options_css">
+                <el-option label="全部仓库" value=""></el-option>
+                <el-option v-for="item in warehousNameList" :key="item.id" :label="item.warehouseName"
+                    :value="item.warehouseName"></el-option>
+            </el-select>
+            <el-table :data="tableData" stripe class="table_css" align="center">
+                <el-table-column type="index" label="序号" align="center">
+                    <template scope="scope">
+                        <span v-if="scope.$index < 9">0{{ scope.$index + 1 }}</span>
+                        <span v-else>{{ scope.$index + 1 }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="warehouseName" label="仓库名称"></el-table-column>
+                <el-table-column prop="distributableAmount" label="可分配金额(元)"></el-table-column>
+                <el-table-column prop="currentAverageAllocatedCost" label="当前平均分配成本(元/吨)"></el-table-column>
+                <el-table-column prop="costNo" label="请款记录">
+                    <template scope="scope">
+                        <el-link @click="lookCost(scope.row)" type="primary" :underline="false">查看</el-link>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </div>
+        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
+            style="text-align: center" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper"
+            :total="deptBudgetTotal">
+        </el-pagination>
+        <el-dialog title="请款记录" :visible.sync="dialogVisible" width="550px" :before-close="handleClose">
+            <div>
+                <el-table :data="recordData" stripe class="table_css">
+                    <el-table-column prop="amountMoney" label="金额(元)" align="center"></el-table-column>
+                    <el-table-column prop="coalPrice" label="分配成本(元/吨)" align="center"></el-table-column>
+                    <el-table-column prop="paymentDate" label="付款日期" align="center"></el-table-column>
+                </el-table>
+                <el-pagination @size-change="handleSizeChange1" @current-change="handleCurrentChange1"
+                    :current-page="currentPage" style="text-align: center" :page-size="pageSize"
+                    layout="total, sizes, prev, pager, next, jumper" :total="deptBudgetTotal"></el-pagination>
+                <span slot="footer" class="dialog-footer">
+                    <el-button @click="handleClose">取 消</el-button>
+                    <!-- <el-button type="primary" @click="querenbazheng">确 定</el-button> -->
+                </span>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+<script>
+
+import { coalPayment, coalPaymentRecord } from '@/model/profitable/index'
+import { getwarehousName } from '@/model/warehouse/index'
+export default {
+    data() {
+        return {
+            tableData: [],
+            warehousNameList: [],
+            searchKeyWord: '',
+            dialogVisible: false,
+            deptBudgetTotal: 0,
+            currentPage: 1,
+            pageSize: 10,
+            recordData: [],
+            record: {
+                currentPage: 1,
+                pageSize: 10,
+            }
+        }
+    },
+    activated() {
+        this.getList()
+        this.xiala()
+    },
+    methods: {
+        getList() {
+            coalPayment({
+                searchKeyWord: this.searchKeyWord,
+                currentPage: this.currentPage,
+                pageSize: this.pageSize
+            }).toPromise().then((response) => {
+                this.tableData = response.records
+                this.deptBudgetTotal = response.total
+            })
+        },
+        lookCost(row) {
+            this.record.warehouseId = row.warehouseId
+            coalPaymentRecord(this.record).toPromise().then((response) => {
+                this.recordData = response.records
+                this.deptBudgetTotal1 = response.total
+            })
+            this.dialogVisible = true
+        },
+        handleClose() {
+            this.dialogVisible = false
+            this.recordData = []
+        },
+        xiala() {
+            //仓库筛选
+            getwarehousName({
+                compId: localStorage.getItem('ws-pf_compId'),
+            }).toPromise().then((response) => {
+                    this.warehousNameList = response
+            })
+        },
+        returnsales() {
+            this.$router.go(-1)
+        },
+        handleSizeChange(val) {
+            console.log(`每页 ${val} 条`)
+            this.pageSize = val
+            this.getList()
+        },
+        handleCurrentChange(val) {
+            this.currentPage = val
+            console.log(`当前页: ${val}`)
+            this.getList()
+        },
+        handleSizeChange1(val) {
+            console.log(`每页 ${val} 条`)
+            this.record.pageSize = val
+            this.lookCost(this.record)
+        },
+        handleCurrentChange1(val) {
+            this.record.currentPage = val
+            console.log(`当前页: ${val}`)
+            this.lookCost(this.record)
+        },
+    }
+}
+</script>
+<style lang="scss" scoped>
+.container {
+    background: #E8ECF6;
+}
+
+.center {
+    margin: 0 auto;
+    background: #ffffff;
+    // height: calc(100vh - 13vh);
+    border-radius: 4px;
+    padding: 20px 0;
+
+    /deep/.el-table td,
+    /deep/.el-table th {
+        text-align: center;
+    }
+}
+
+.options_css {
+    margin: 0 5px;
+}
+
+.row_top {
+    background: #f6f7fc;
+    border-radius: 4px;
+    margin-bottom: 10px;
+
+    .bg-left {
+        padding-left: 30px;
+    }
+
+    .bg-right {
+        padding-top: 15px;
+        padding-right: 10px;
+        text-align: right;
+    }
+
+    .title {
+        position: relative;
+    }
+
+    .title::before {
+        content: '';
+        display: inline-block;
+        width: 5px;
+        height: 30px;
+        background: #5473e8;
+        position: absolute;
+        left: 0;
+    }
+}
+
+.datascreen {
+    display: flex;
+
+    .data_css {
+        width: 40%;
+    }
+
+    .input_css {
+        width: 50%;
+        margin: 0 10px;
+    }
+
+    .find {
+        margin-right: 10px;
+    }
+}
+
+.table_css {
+    margin-top: 20px;
+}
+</style>

+ 17 - 0
src/views/profitable/component/routers/route.js

@@ -418,6 +418,23 @@ const profitableRouter = {
       },
     // 油费
     },
+    {
+      path: 'coalCost',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/profitable/coalCost'),
+      name: 'coalCost',
+      meta: {
+        title: 'coalCost',
+        shortcutEntrance: 'profitable',
+        module: 'lirunhesuan.feiyongguanli.view',
+        permissicon: [],
+        keepAlive: true,
+        _title:'煤款'
+        // module: 'procurement.sparepart.applDetail'
+      },
+      hidden:true,
+    // 煤费
+    },
     {
       path: 'oilcost',
       component: () =>

+ 4 - 0
src/views/profitable/expensemanagementdetails.vue

@@ -90,6 +90,7 @@
           <el-button @click="exportFile" type="primary">导出</el-button>
         </el-col>
         <el-col style="text-align: right" :span="6">
+          <el-button @click="coalCost()">煤款</el-button>
           <el-badge v-if="approveStatus" is-dot class="item">
             <el-button style="margin-left: 10px" @click="oilcost()">油费</el-button>
           </el-badge>
@@ -743,6 +744,9 @@ export default {
     oilcost() {
       this.$router.push({ name: 'oilcost' })
     },
+    coalCost(){
+      this.$router.push({ name: 'coalCost' })
+    },
     expenseedit(row) {
       if (
         localStorage.getItem('ws-pf_roleName') == '销售内勤' ||

+ 12 - 1
src/views/profitable/expensemanagentlook.vue

@@ -27,9 +27,20 @@
               <span v-if='deptBudgetList.costType==3'>非粮款</span>
               <span v-if='deptBudgetList.costType==5'>保证金</span>
           </el-form-item>
-          <el-form-item label-width='100px' v-if='deptBudgetList.purpose=="库点费用"' label="仓储费" span="1" prop="contractNo" class="readonly">
+          <!-- <el-form-item label-width='100px' v-if='deptBudgetList.purpose=="库点费用"' label="仓储费" span="1" prop="contractNo" class="readonly">
             <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"
+            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"
+            v-show="deptBudgetList.autoAssign == 5">
+            <!-- <el-input class='input50 input_css' placeholder="请输入煤单价" v-model="deptBudgetList.coalPrice"></el-input> -->
+            <span>{{deptBudgetList.coalPrice}}</span>
           </el-form-item>
           <el-form-item v-if='deptBudgetList.expensesPurpose==3' label-width='100px' label="仓库名称" span="1" prop="warehouseName" class="readonly">
           {{deptBudgetList.warehouseName}}

+ 8 - 7
src/views/profitable/oilcost.vue

@@ -20,7 +20,8 @@
           <div style="flex-direction: row-reverse;" class="datascreen">
              <el-button class="find" type="primary" @click="find()"><img width="16" height="16" style="left: -8px;"
                 src="../../../public/img/sousuo.png" alt="" /></el-button>
-            <el-input placeholder="可按司机名、车牌号查找" class="input_css" v-model="searchKeyWord" clearable></el-input>
+            <el-input placeholder="可按司机名、车牌号查找" v-if="strokeType == 1" class="input_css" v-model="searchKeyWord" clearable></el-input>
+            <el-input placeholder="可按仓库名查找" v-if="strokeType == 3" class="input_css" v-model="searchKeyWord" clearable></el-input>
           </div>
         </el-col>
       </el-row>
@@ -28,9 +29,9 @@
         <el-col :span="18">
           <el-button style="margin-left:10px" @click="typeChange('')" :type="searchType == ''?'primary':''">全部</el-button>
           <el-button @click="typeChange(1)" :type="searchType == 1?'primary':''">待审核</el-button>
-          <el-button @click="typeChange(1)" :type="searchType == 1?'primary':''">已通过</el-button>
-          <el-button @click="typeChange(1)" :type="searchType == 1?'primary':''">已驳回</el-button>
-          <el-button @click="typeChange(2)" :type="searchType == 2?'primary':''">已付款</el-button>
+          <el-button @click="typeChange(2)" :type="searchType == 2?'primary':''">已通过</el-button>
+          <el-button @click="typeChange(3)" :type="searchType == 3?'primary':''">已驳回</el-button>
+          <!-- <el-button @click="typeChange(2)" :type="searchType == 4?'primary':''">已付款</el-button> -->
         </el-col>
         <el-col style='text-align:right;' :span="6">
         </el-col>
@@ -75,7 +76,7 @@
           <el-table-column prop="approveStatus" width="100" label="状态">
             <template slot-scope="scope">
               <span v-if="scope.row.approveStatus">{{scope.row.approveStatus}}</span>
-              <span v-else-if="scope.row.status=='待付款'">{{scope.row.status}}</span>
+              <span v-else-if="scope.row.status=='待付款'||scope.row.status=='已通过'">{{scope.row.status}}</span>
               <span v-else>{{scope.row.travelStatus}}</span>
             </template>
           </el-table-column>
@@ -393,8 +394,8 @@
             searchKeyWord:this.searchKeyWord,
             currentPage: this.currentPage,
             pageSize:this.pageSize ,
-            strokeType:this.strokeType
-            // searchType:this.searchType
+            strokeType:this.strokeType,
+            searchType:this.searchType
           })
           .toPromise()
           .then(response => {

+ 11 - 8
src/views/warehousenew/warehousingOrder.vue

@@ -493,6 +493,10 @@
         <div>累计仓储费</div>
         <div>{{storageFee}}</div>
       </div>
+      <div style="justify-content:space-between;" class="flex">
+        <div>烘干费</div>
+        <div>{{dryingFee?dryingFee:0}}</div>
+      </div>
       <div v-for="(item, index) in costlist" :key="index" class="audit">
         <div class="audit_item">
           <div class="audit_left">
@@ -710,6 +714,7 @@ export default {
       money: 0,
       interest:'',
       storageFee:'',
+      dryingFee:"",
       multipleSelection1: {},
       aduitshow: false,
       distributionshow: false,
@@ -1239,8 +1244,6 @@ export default {
           type: 'warning'
         });
       }
-
-
     },
     marginAllocation() {
       let _this = this
@@ -1305,7 +1308,6 @@ export default {
             return
           })
       }
-
     },
     interestrate() {
       this.interestrateshow = true
@@ -1397,7 +1399,6 @@ export default {
       }
       // this.currectdata=item
       this.currectdata = arr1
-      console.log(this.currectdata)
       this.fieldrationsList.warehousingOrderList = this.currectdata
       this.fieldrationsList.baseId = this.currectdata[0].baseId
       this.fieldrationsList.beforeWeight = weight.toFixed(3)
@@ -1408,17 +1409,14 @@ export default {
             for (let i = 0; i < this.currectdata.length; i++) {
               var weightedMoisture = (this.currectdata[i].weightedMoisture - 14)
               var deductWeight = 100 - (weightedMoisture * response.deductWeight)
-              // console.log(deductWeight,111111111)
               this.currectdata[i].afterWeight = ((deductWeight / 100) * this.currectdata[i].surplusWeight)
               weight2 += ((deductWeight / 100) * this.currectdata[i].surplusWeight)
             }
-            console.log(this.currectdata)
             this.fieldrationsList.afterWeight = weight2.toFixed(3)
             this.fieldrationsshow = true
           }
         })
       // this.fieldrationsList.beforeCost=this.currectdata[0].avgCost
-
     },
     distribution() {
       let _this = this
@@ -1513,6 +1511,7 @@ export default {
     costclick(row) {
       this.interest=row.interest
       this.storageFee=row.storageFee
+      this.dryingFee = row.dryingFee
       this.costlist = row.expenseAllocationInfoList
       console.log(this.interest,this.storageFee)
       this.dialogVisible1 = true
@@ -1694,7 +1693,7 @@ export default {
         });
         return
       }
-      if (this.fieldrationsList.afterWeight >this.fieldrationsList.beforeWeight) {
+      if (Number(this.fieldrationsList.afterWeight) > Number(this.fieldrationsList.beforeWeight)) {
         this.$message({
           message: '折干后重量输入错误',
           type: 'warning'
@@ -1720,6 +1719,10 @@ export default {
               type: 'success'
             });
             this.form.distributionIng = ''
+            this.$set(this.fieldrationsList,'beforeBinNo','')
+            this.$set(this.fieldrationsList,'afterBinNo','')
+            // this.fieldrationsList.beforeBinNo = ''
+            // this.fieldrationsList.afterBinNo = ''
             this.fieldrationsshow = false
             this.getList()
           }).catch((response) => {

部分文件因文件數量過多而無法顯示