|
|
@@ -385,6 +385,7 @@
|
|
|
width="80%"
|
|
|
append-to-body
|
|
|
:show-close="Xbutton"
|
|
|
+ :before-close="handleClose"
|
|
|
>
|
|
|
<template slot="title">
|
|
|
<div class="avue-crud__dialog__header">
|
|
|
@@ -408,12 +409,11 @@
|
|
|
remote
|
|
|
:disabled="browseStatus"
|
|
|
style="width:80%"
|
|
|
- :remote-method="corpsRemoteMethod"
|
|
|
placeholder="请输入模糊查找客户名称"
|
|
|
@change="changeFeeDate"
|
|
|
>
|
|
|
<el-option
|
|
|
- v-for="(dict, index) in fMblnoOptions"
|
|
|
+ v-for="(dict, index) in NfMblnoOptions"
|
|
|
:key="index.fId"
|
|
|
:label="dict.fName"
|
|
|
:value="dict.fId"
|
|
|
@@ -574,6 +574,7 @@
|
|
|
@click="exportDetail"
|
|
|
v-show="dataList.length > 0 && form.fMblno"
|
|
|
>明细导出</el-button>
|
|
|
+ <el-button type="danger" v-show="showAgreementStatus" @click="showAgreement">查看仓储费用协议</el-button>
|
|
|
</div>
|
|
|
<div class="dialogTableTitle flex a-center jlr"
|
|
|
style="display:flex;justify-content:space-between;align-items:center;margin: 10px 0;">
|
|
|
@@ -1108,6 +1109,168 @@
|
|
|
</el-dialog>
|
|
|
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
|
|
|
<approval-comments v-if="addOrUpdateVisib" ref="ApprovalComments" @refreshDataList="returnData"></approval-comments>
|
|
|
+ <!-- 当弹出未找到计费规则是弹出仓储费对话框 -->
|
|
|
+ <el-dialog
|
|
|
+ v-dialogDrag
|
|
|
+ :fullscreen="dialogFull"
|
|
|
+ title="仓储费协议"
|
|
|
+ :visible.sync="openAgreement" width="80%"
|
|
|
+ append-to-body
|
|
|
+ >
|
|
|
+ <div style="display: flex;">
|
|
|
+ <el-table border :data="contractnoList" @selection-change="handleSelectionChange" style="width: 30%;float:left;flex: 1;">
|
|
|
+ <el-table-column
|
|
|
+ prop="fContractno"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ width="150"
|
|
|
+ label="合同编号"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-link type="primary" @click="selectShow(scope.row)">{{ scope.row.fContractno }}</el-link>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ prop="tPackages"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ width="140"
|
|
|
+ label="货物类别"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-select
|
|
|
+ v-model="scope.row.tPackages"
|
|
|
+ placeholder="请选择货物类别"
|
|
|
+ clearable
|
|
|
+ :disabled="true"
|
|
|
+ multiple
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="(dict, index) in fTypeidOptions"
|
|
|
+ :key="index.dictValue"
|
|
|
+ :label="dict.dictLabel"
|
|
|
+ :value="dict.dictValue"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="有效期至" sortable align="center" prop="fEnddate" width="120">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span>{{ parseTime(scope.row.fEnddate, '{y}-{m}-{d}') }}</span>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
+ <el-table v-loading="loading_s" border :data="agreementitemsList" @selection-change="handleSelectionChange" style="width: 70%;float:right;flex: 1.86;">
|
|
|
+ <el-table-column label="行号" align="center" type="index" fixed="left" width="100"/>
|
|
|
+
|
|
|
+ <el-table-column
|
|
|
+ prop="fFeeunitid"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ width="125"
|
|
|
+ label="计价单位"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-select
|
|
|
+ v-model="scope.row.fFeeunitid"
|
|
|
+ placeholder="请选择计价单位"
|
|
|
+ @change="changeFeeUnit(scope.row)"
|
|
|
+ clearable
|
|
|
+ :disabled="true"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="(dict, index) in jFeetunitOptions"
|
|
|
+ :key="index.dictValue"
|
|
|
+ :label="dict.dictLabel"
|
|
|
+ :value="dict.dictValue"
|
|
|
+ />
|
|
|
+ </el-select>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="开始天数" align="center" width="90">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-input
|
|
|
+ v-model="scope.row.fFromdays"
|
|
|
+ placeholder="请输入开始天数"
|
|
|
+ oninput='value = value.replace(/[^\d.]/g,"")'
|
|
|
+ clearable
|
|
|
+ size="small"
|
|
|
+ :disabled="true"
|
|
|
+ />
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="结束天数" align="center" width="90">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-input
|
|
|
+ v-model="scope.row.fEndays"
|
|
|
+ placeholder="请输入结束天数"
|
|
|
+ oninput='value = value.replace(/[^\d.]/g,"")'
|
|
|
+ clearable
|
|
|
+ size="small"
|
|
|
+ :disabled="true"
|
|
|
+ />
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+<!-- <el-table-column label="单价" align="center" width="90">
|
|
|
+ <el-input
|
|
|
+ slot-scope="scope"
|
|
|
+ v-model="scope.row.fPrice"
|
|
|
+ placeholder="请输入单价"
|
|
|
+ oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
|
|
|
+ clearable
|
|
|
+ size="small"
|
|
|
+ :disabled="true"
|
|
|
+ />
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="录入人" align="center" width="120">
|
|
|
+ <el-input
|
|
|
+ slot-scope="scope"
|
|
|
+ v-model="scope.row.createBy"
|
|
|
+ :disabled="true"
|
|
|
+ placeholder="默认录入人"
|
|
|
+ clearable
|
|
|
+ size="small"
|
|
|
+ />
|
|
|
+ </el-table-column>-->
|
|
|
+ <el-table-column label="录入时间" align="center" width="200">
|
|
|
+ <el-input
|
|
|
+ slot-scope="scope"
|
|
|
+ v-model="scope.row.createTime"
|
|
|
+ placeholder="默认录入时间"
|
|
|
+ :disabled="true"
|
|
|
+ clearable
|
|
|
+ size="small"
|
|
|
+ />
|
|
|
+ </el-table-column>
|
|
|
+
|
|
|
+ <el-table-column
|
|
|
+ prop="fFeeid"
|
|
|
+ header-align="center"
|
|
|
+ align="center"
|
|
|
+ width="160"
|
|
|
+ label="费用名称"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-select
|
|
|
+ v-model="scope.row.fFeeid"
|
|
|
+ filterable
|
|
|
+ remote
|
|
|
+ :disabled="true"
|
|
|
+ :remote-method="fWRemoteMethod"
|
|
|
+ placeholder="费用名称"
|
|
|
+ >
|
|
|
+ <el-option
|
|
|
+ v-for="(dict, index) in fWbuOptions"
|
|
|
+ :key="index.fId"
|
|
|
+ :label="dict.fName"
|
|
|
+ :value="dict.fId"
|
|
|
+ ></el-option>
|
|
|
+ </el-select>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ </el-table>
|
|
|
+ </div>
|
|
|
+ </el-dialog>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
@@ -1124,12 +1287,12 @@ import {
|
|
|
exportWarehousebillsitems,
|
|
|
delstorageFeeCalculation_s,
|
|
|
exportWarehousebills,
|
|
|
- exportDetail,
|
|
|
-} from "@/api/warehouseBusiness/storageFeeCalculation";
|
|
|
+ exportDetail, getAgreementByFCorpId
|
|
|
+} from '@/api/warehouseBusiness/storageFeeCalculation'
|
|
|
import {listUser, queryUserVal} from "@/api/system/user";
|
|
|
import {listGoods} from "@/api/basicdata/goods";
|
|
|
import {listFees} from "@/api/basicdata/fees";
|
|
|
-import { agreementListCorps, listCorps } from '@/api/basicdata/corps'
|
|
|
+import { agreementListCorps, agreementListCorpsNoParams, listCorps } from '@/api/basicdata/corps'
|
|
|
import moment from 'moment'
|
|
|
import AddOrUpdate from '@/views/viewApproval'
|
|
|
import ApprovalComments from '@/views/startApproval'
|
|
|
@@ -1144,6 +1307,7 @@ import {addSet, select} from '@/api/system/set'
|
|
|
import {
|
|
|
listWarehousesss,
|
|
|
} from "@/api/basicdata/warehouse";
|
|
|
+import { getAgreement } from '@/api/warehouseBusiness/agreement'
|
|
|
|
|
|
Vue.directive('dialogDrag', {
|
|
|
bind(el, binding, vnode, oldVnode) {
|
|
|
@@ -1337,6 +1501,12 @@ export default {
|
|
|
notChange: false,
|
|
|
// 遮罩层
|
|
|
loading: true,
|
|
|
+ loading_s: false,
|
|
|
+ contractnoList: [],
|
|
|
+ agreementitemsList: [],
|
|
|
+ jFeetunitOptions: [],
|
|
|
+ fTypeidOptions: [],
|
|
|
+ showAgreementStatus: false,
|
|
|
// 选中数组
|
|
|
ids: [],
|
|
|
userVal: {
|
|
|
@@ -1364,10 +1534,12 @@ export default {
|
|
|
title: "",
|
|
|
// 是否显示弹出层
|
|
|
open: false,
|
|
|
+ openAgreement: false,
|
|
|
// 货品名
|
|
|
goodsOptions: [],
|
|
|
// 货权方(客户数据)
|
|
|
fMblnoOptions: [],
|
|
|
+ NfMblnoOptions: [],
|
|
|
// 操作员
|
|
|
userOptions: [],
|
|
|
// 制单部门
|
|
|
@@ -1520,6 +1692,14 @@ export default {
|
|
|
listWarehousesss({fStatus: 0, delFlag: 0}).then((response) => {
|
|
|
this.warehouseOptions = response.rows;
|
|
|
});
|
|
|
+ agreementListCorpsNoParams().then((res) => {
|
|
|
+ if (res.data.corpList) {
|
|
|
+ this.NfMblnoOptions = res.data.corpList;
|
|
|
+ }
|
|
|
+ });
|
|
|
+ this.getDicts('data_goods_category').then(response => {
|
|
|
+ this.fTypeidOptions = response.data
|
|
|
+ })
|
|
|
},
|
|
|
activated() {
|
|
|
this.Jump()
|
|
|
@@ -1719,6 +1899,7 @@ export default {
|
|
|
},
|
|
|
homePage() {
|
|
|
this.open = false
|
|
|
+ this.showAgreementStatus = false
|
|
|
let view = {
|
|
|
fullPath: "/business/agreement",
|
|
|
hash: "",
|
|
|
@@ -1790,6 +1971,7 @@ export default {
|
|
|
// 取消按钮
|
|
|
cancel() {
|
|
|
this.open = false;
|
|
|
+ this.showAgreementStatus = false;
|
|
|
this.reset();
|
|
|
this.getList();
|
|
|
},
|
|
|
@@ -1882,8 +2064,53 @@ export default {
|
|
|
this.fWbuOptions = response.data.feesList
|
|
|
}
|
|
|
this.countstate = false
|
|
|
+ },(error) => {
|
|
|
+ this.showAgreementStatus = true
|
|
|
});
|
|
|
},
|
|
|
+ showAgreement() {
|
|
|
+ getAgreementByFCorpId(this.form.fCorpid).then((res) => {
|
|
|
+ this.contractnoList = res.data.contractnoList;
|
|
|
+ this.contractnoList.forEach(item => {
|
|
|
+ item.tPackages = item.tPackages.map(e => e = e.toString())
|
|
|
+ })
|
|
|
+ })
|
|
|
+ this.openAgreement = true
|
|
|
+ },
|
|
|
+ handleClose () {
|
|
|
+ this.showAgreementStatus = false;
|
|
|
+ this.open = false;
|
|
|
+ },
|
|
|
+ selectShow(row) {
|
|
|
+ getAgreement(row.fId).then(response => {
|
|
|
+ this.agreementitemsList = response.data.tWarehouseAgreementitems
|
|
|
+ for (let item in this.agreementitemsList) {
|
|
|
+ this.$set(this.agreementitemsList[item], 'fFeeunitid', this.agreementitemsList[item].fFeeunitid + '')
|
|
|
+ }
|
|
|
+ this.fWbuOptions = response.data.feesList
|
|
|
+ })
|
|
|
+ this.getDicts("data_unitfees").then(response => {
|
|
|
+ this.jFeetunitOptions = response.data;
|
|
|
+ });
|
|
|
+ },
|
|
|
+ // 变更计价单位
|
|
|
+ changeFeeUnit(row) {
|
|
|
+ if (!row.fFeeUnitid) {
|
|
|
+ return false
|
|
|
+ }
|
|
|
+ if (row.fFeeUnitid === '0') {
|
|
|
+ this.$set(row, 'fQty', this.fCntqty)
|
|
|
+ } else if (row.fFeeUnitid === '1') {
|
|
|
+ this.$set(row, 'fQty', this.fGrossweight)
|
|
|
+ }
|
|
|
+ if (row.fUnitprice) {
|
|
|
+ this.$set(
|
|
|
+ row,
|
|
|
+ 'fAmount',
|
|
|
+ parseFloat(Number(row.fUnitprice) * Number(row.fQty)).toFixed(2)
|
|
|
+ )
|
|
|
+ }
|
|
|
+ },
|
|
|
/* 远程模糊查询商品 */
|
|
|
goodsRemoteMethod(name) {
|
|
|
if (name == null || name === "") {
|
QuKatie