yunxi
/
jigangSCM2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

8.1修改

Browse Source
jg-waiwang-pro
胡川虎 3 months ago
parent 551b314da0
commit dd472c0dce
13 changed files with 1039 additions and 499 deletions
Show Stats Download Patch File Download Diff File

405
jnpf-app/pages/scm/form/cwsettlement/index.vue
Unescape View File

@ -31,8 +31,8 @@
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item v-if="judgeShow('code')" :required="requiredList.code" label="单据编号" prop="code">
<u-input v-model="dataForm.code" disabled @change="changeData('code',-1)"
placeholder="系统自动生成" :style='{"width":"100%"}' readonly>
<u-input v-model="dataForm.code" disabled @change="changeData('code',-1)" placeholder="系统自动生成"
:style='{"width":"100%"}' readonly>
</u-input>
</u-form-item>
</view>
@ -51,13 +51,10 @@
:required="requiredList['cwsettlementsubjectList-subjectId']" label="名称">
<jnpf-popup-select v-model="dataForm.cwsettlementsubjectList[i].subjectId"
:disabled="judgeWrite('cwsettlementsubjectList')||judgeWrite('cwsettlementsubjectList-subjectId')"
:rowIndex="i"
@change="subjectChangeData"
:formData="dataForm" :templateJson="interfaceRes.cwsettlementsubjectsubjectId" clearable
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField='name' :vModel="'subjectId'+i"
:columnOptions="cwsettlementsubjectsubjectIdColumnOptions"
:rowIndex="i" @change="subjectChangeData" :formData="dataForm"
:templateJson="interfaceRes.cwsettlementsubjectsubjectId" clearable propsValue="id"
popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
:vModel="'subjectId'+i" :columnOptions="cwsettlementsubjectsubjectIdColumnOptions"
interfaceId="542305697765799941" :pageSize="20" placeholder="请选择" type="popup"
:style='{"width":"100%"}'>
</jnpf-popup-select>
@ -76,8 +73,8 @@
<u-form-item v-if="judgeShow('settlementAmount')" :required="requiredList.settlementAmount"
label="应收/应付合计（含税）" prop="settlementAmount">
<u-input v-model="dataForm.settlementAmount" :disabled="judgeWrite('settlementAmount')"
@change="changeData('settlementAmount',-1)" addonAfter="元" clearable
placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('settlementAmount',-1)" addonAfter="元" clearable placeholder="请输入"
:style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -112,8 +109,8 @@
<u-form-item v-if="judgeShow('prepaidDeductionAmount')" :required="requiredList.prepaidDeductionAmount"
label="预付抵扣" prop="prepaidDeductionAmount">
<u-input v-model="dataForm.prepaidDeductionAmount" :disabled="judgeWrite('prepaidDeductionAmount')"
@change="changeData('prepaidDeductionAmount',-1)" addonAfter="元" clearable
placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('prepaidDeductionAmount',-1)" addonAfter="元" clearable placeholder="请输入"
:style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -130,8 +127,8 @@
<u-form-item v-if="judgeShow('marginAmount')" :required="requiredList.marginAmount" label="抵扣保证金金额"
prop="marginAmount">
<u-input v-model="dataForm.marginAmount" :disabled="judgeWrite('marginAmount')"
@change="changeData('marginAmount',-1)" addonAfter="元" clearable
placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('marginAmount',-1)" addonAfter="元" clearable placeholder="请输入"
:style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -139,8 +136,8 @@
<u-form-item v-if="judgeShow('underpaymentAmount')" :required="requiredList.underpaymentAmount"
label="抵扣压款金额" prop="underpaymentAmount">
<u-input v-model="dataForm.underpaymentAmount" :disabled="judgeWrite('underpaymentAmount')"
@change="changeData('underpaymentAmount',-1)" addonAfter="元" clearable
placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('underpaymentAmount',-1)" addonAfter="元" clearable placeholder="请输入"
:style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -148,8 +145,8 @@
<u-form-item v-if="judgeShow('overdueAmount')" :required="requiredList.overdueAmount" label="抵扣逾期金额"
prop="overdueAmount">
<u-input v-model="dataForm.overdueAmount" :disabled="judgeWrite('overdueAmount')"
@change="changeData('overdueAmount',-1)" addonAfter="元" clearable
placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('overdueAmount',-1)" addonAfter="元" clearable placeholder="请输入"
:style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -157,8 +154,8 @@
<u-form-item v-if="judgeShow('payableAmount')" :required="requiredList.payableAmount" label="应结金额"
prop="payableAmount">
<u-input v-model="dataForm.payableAmount" :disabled="judgeWrite('payableAmount')"
@change="changeData('payableAmount',-1)" addonAfter="元" clearable
placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('payableAmount',-1)" addonAfter="元" clearable placeholder="请输入"
:style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -194,11 +191,89 @@
<u-form-item v-if="judgeShow('settlableAmount')" :required="requiredList.settlableAmount" label="可结金额"
prop="settlableAmount">
<u-input v-model="dataForm.settlableAmount" :disabled="judgeWrite('settlableAmount')"
@change="changeData('settlableAmount',-1)" addonAfter="元" clearable
placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('settlableAmount',-1)" addonAfter="元" clearable placeholder="请输入"
:style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box" v-if="dataForm.type == 1">
<u-form-item label="发票日期">
<jnpf-date-time v-model="dataForm.invoiceDate" :disabled="true" @change="changeData('payer',-1)"
:startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')" format="yyyy-MM-dd"
clearable placeholder="请选择" type="date" :style='{"width":"100%"}'>
</jnpf-date-time>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box" v-if="dataForm.type == 1">
<u-form-item label="发票张数">
<u-input v-model="dataForm.invoiceCnt" :disabled="true" clearable placeholder="请输入"
:style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box" v-if="dataForm.type == 1">
<u-form-item label="发票编号">
<u-input v-model="dataForm.invoiceNo" :disabled="true" clearable placeholder="请输入"
:style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box" v-if="dataForm.type == 1">
<u-form-item label="发票类型">
<jnpf-select v-model="dataForm.invoiceType" :disabled="true" @change="changeData('payer',-1)"
clearable placeholder="请选择" :props="invoiceTypeProps" :options="invoiceTypeOptions"
:style='{"width":"100%"}'>
</jnpf-select>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box" v-if="dataForm.type == 1">
<u-form-item label="发票号码">
<u-input v-model="dataForm.attribute11" :disabled="true" clearable placeholder="请输入"
:style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box" v-if="dataForm.type == 1">
<u-form-item label="发票金额">
<u-input v-model="dataForm.invoiceAmount" :disabled="true" clearable placeholder="请输入"
:style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box" v-if="dataForm.type == 1">
<u-form-item label="摘要">
<u-input v-model="dataForm.description" :disabled="true" clearable placeholder="请输入"
:style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box" v-if="dataForm.type == 1">
<u-form-item label="附件张数">
<u-input v-model="dataForm.annexCnt" :disabled="true" clearable placeholder="请输入"
:style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box" v-if="dataForm.type == 2">
<u-form-item label="事务处理类型">
<u-input v-model="dataForm.unitName" :disabled="true" clearable placeholder="请输入"
:style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item label="入账时间">
<jnpf-date-time v-model="dataForm.glDate" :disabled="true" @change="changeData('payer',-1)"
:startTime="dateTime(false,1,1,'','')" :endTime="dateTime(false,1,1,'','')" format="yyyy-MM-dd"
clearable placeholder="请选择" type="date" :style='{"width":"100%"}'>
</jnpf-date-time>
</u-form-item>
</view>
<!-- <view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item v-if="judgeShow('applyAmount')" :required="requiredList.applyAmount" label="申请金额"
prop="applyAmount">
@ -211,8 +286,7 @@
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item v-if="judgeShow('remark')" :required="requiredList.remark" label="备注" prop="remark">
<u-input v-model="dataForm.remark" :disabled="judgeWrite('remark')"
@change="changeData('remark',-1)" placeholder="请输入" type="textarea"
:style='{"width":"100%"}'>
@change="changeData('remark',-1)" placeholder="请输入" type="textarea" :style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -236,14 +310,12 @@
<jnpf-popup-select v-model="dataForm.cwsettlementsummaryList[i].productId"
:disabled="judgeWrite('cwsettlementsummaryList')||judgeWrite('cwsettlementsummaryList-productId')"
:rowIndex="i"
@change="changeData('cwsettlementsummaryList-productId',i)"
:rowIndex="i" @change="changeData('cwsettlementsummaryList-productId',i)"
:formData="dataForm" :templateJson="interfaceRes.voucherproductproductId" clearable
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField='name' :vModel="'subjectId'+i"
:columnOptions="voucherproductproductIdcolumnOptions"
interfaceId="529919666429100229" :pageSize="20" placeholder="请选择" type="popup"
:style='{"width":"100%"}'>
:columnOptions="voucherproductproductIdcolumnOptions" interfaceId="529919666429100229"
:pageSize="20" placeholder="请选择" type="popup" :style='{"width":"100%"}'>
</jnpf-popup-select>
</u-form-item>
@ -253,8 +325,8 @@
:required="requiredList['cwsettlementsummaryList-spec']" label="规格">
<u-input v-model="dataForm.cwsettlementsummaryList[i].spec"
:disabled="judgeWrite('cwsettlementsummaryList')||judgeWrite('cwsettlementsummaryList-spec')"
@change="changeData('cwsettlementsummary-spec',i)" clearable
placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('cwsettlementsummary-spec',i)" clearable placeholder="请输入"
:style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -263,8 +335,8 @@
:required="requiredList['cwsettlementsummaryList-settlementUnit']" label="结算单位">
<u-input v-model="dataForm.cwsettlementsummaryList[i].settlementUnit"
:disabled="judgeWrite('cwsettlementsummaryList')||judgeWrite('cwsettlementsummaryList-settlementUnit')"
@change="changeData('cwsettlementsummary-settlementUnit',i)"
clearable placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('cwsettlementsummary-settlementUnit',i)" clearable placeholder="请输入"
:style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -273,8 +345,8 @@
:required="requiredList['cwsettlementsummaryList-settlementSum']" label="结算数量">
<u-input v-model="dataForm.cwsettlementsummaryList[i].settlementSum"
:disabled="judgeWrite('cwsettlementsummaryList')||judgeWrite('cwsettlementsummaryList-settlementSum')"
@change="changeData('cwsettlementsummary-settlementSum',i)"
clearable placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('cwsettlementsummary-settlementSum',i)" clearable placeholder="请输入"
:style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -283,8 +355,8 @@
:required="requiredList['cwsettlementsummaryList-settlementPrice']" label="结算单价（含税）">
<u-input v-model="dataForm.cwsettlementsummaryList[i].settlementPrice"
:disabled="judgeWrite('cwsettlementsummaryList')||judgeWrite('cwsettlementsummaryList-settlementPrice')"
@change="changeData('cwsettlementsummary-settlementPrice',i)"
clearable placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('cwsettlementsummary-settlementPrice',i)" clearable
placeholder="请输入" :style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -293,8 +365,8 @@
:required="requiredList['cwsettlementsummaryList-settlementSubtotal']" label="结算小计（含税）">
<u-input v-model="dataForm.cwsettlementsummaryList[i].settlementSubtotal"
:disabled="judgeWrite('cwsettlementsummaryList')||judgeWrite('cwsettlementsummaryList-settlementSubtotal')"
@change="changeData('cwsettlementsummary-settlementSubtotal',i)"
clearable placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('cwsettlementsummary-settlementSubtotal',i)" clearable
placeholder="请输入" :style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -303,8 +375,8 @@
:required="requiredList['cwsettlementsummaryList-settlementPriceNo']" label="结算单价（不含税）">
<u-input v-model="dataForm.cwsettlementsummaryList[i].settlementPriceNo"
:disabled="judgeWrite('cwsettlementsummaryList')||judgeWrite('cwsettlementsummaryList-settlementPriceNo')"
@change="changeData('cwsettlementsummary-settlementPriceNo',i)"
clearable placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('cwsettlementsummary-settlementPriceNo',i)" clearable
placeholder="请输入" :style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -313,8 +385,8 @@
:required="requiredList['cwsettlementsummaryList-settlementSubtotalNo']" label="结算小计（不含税）">
<u-input v-model="dataForm.cwsettlementsummaryList[i].settlementSubtotalNo"
:disabled="judgeWrite('cwsettlementsummaryList')||judgeWrite('cwsettlementsummaryList-settlementSubtotalNo')"
@change="changeData('cwsettlementsummary-settlementSubtotalNo',i)"
clearable placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('cwsettlementsummary-settlementSubtotalNo',i)" clearable
placeholder="请输入" :style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -343,8 +415,8 @@
:required="requiredList['cwsettlementsummaryList-settlementTotal']" label="结算合计（含税）">
<u-input v-model="dataForm.cwsettlementsummaryList[i].settlementTotal"
:disabled="judgeWrite('cwsettlementsummaryList')||judgeWrite('cwsettlementsummaryList-settlementTotal')"
@change="changeData('cwsettlementsummary-settlementTotal',i)"
clearable placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('cwsettlementsummary-settlementTotal',i)" clearable
placeholder="请输入" :style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -353,8 +425,8 @@
:required="requiredList['cwsettlementsummaryList-settlementTotalNo']" label="结算合计（不含税）">
<u-input v-model="dataForm.cwsettlementsummaryList[i].settlementTotalNo"
:disabled="judgeWrite('cwsettlementsummaryList')||judgeWrite('cwsettlementsummaryList-settlementTotalNo')"
@change="changeData('cwsettlementsummary-settlementTotalNo',i)"
clearable placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('cwsettlementsummary-settlementTotalNo',i)" clearable
placeholder="请输入" :style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -363,8 +435,8 @@
:required="requiredList['cwsettlementsummaryList-remark']" label="备注">
<u-input v-model="dataForm.cwsettlementsummaryList[i].remark"
:disabled="judgeWrite('cwsettlementsummaryList')||judgeWrite('cwsettlementsummaryList-remark')"
@change="changeData('cwsettlementsummary-remark',i)" clearable
placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('cwsettlementsummary-remark',i)" clearable placeholder="请输入"
:style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -390,13 +462,10 @@
:required="requiredList['cwsettlementsubjectList-subjectId']" label="客户/供应商名称">
<jnpf-popup-select v-model="dataForm.cwsettlementsubjectList[i].subjectId"
:disabled="judgeWrite('cwsettlementsubjectList')||judgeWrite('cwsettlementsubjectList-subjectId')"
:rowIndex="i"
@change="subjectChangeData"
:formData="dataForm" :templateJson="interfaceRes.cwsettlementsubjectsubjectId" clearable
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField='name' :vModel="'subjectId'+i"
:columnOptions="cwsettlementsubjectsubjectIdColumnOptions"
:rowIndex="i" @change="subjectChangeData" :formData="dataForm"
:templateJson="interfaceRes.cwsettlementsubjectsubjectId" clearable propsValue="id"
popupWidth="800px" popupTitle="选择数据" popupType="dialog" relationField='name'
:vModel="'subjectId'+i" :columnOptions="cwsettlementsubjectsubjectIdColumnOptions"
interfaceId="542305697765799941" :pageSize="20" placeholder="请选择" type="popup"
:style='{"width":"100%"}'>
</jnpf-popup-select>
@ -452,8 +521,8 @@
:required="requiredList['cwsettlementsubjectList-advanceRatio']" label="预付比例">
<u-input v-model="dataForm.cwsettlementsubjectList[i].advanceRatio"
:disabled="judgeWrite('cwsettlementsubjectList')||judgeWrite('cwsettlementsubjectList-advanceRatio')"
@change="changeData('cwsettlementsubject-advanceRatio',i)" clearable
placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('cwsettlementsubject-advanceRatio',i)" clearable placeholder="请输入"
:style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -462,8 +531,8 @@
:required="requiredList['cwsettlementsubjectList-accountPeriod']" label="账期">
<u-input v-model="dataForm.cwsettlementsubjectList[i].accountPeriod"
:disabled="judgeWrite('cwsettlementsubjectList')||judgeWrite('cwsettlementsubjectList-accountPeriod')"
@change="changeData('cwsettlementsubject-accountPeriod',i)"
clearable placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('cwsettlementsubject-accountPeriod',i)" clearable placeholder="请输入"
:style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -472,8 +541,8 @@
:required="requiredList['cwsettlementsubjectList-underpaymentMethod']" label="压款方式">
<u-input v-model="dataForm.cwsettlementsubjectList[i].underpaymentMethod"
:disabled="judgeWrite('cwsettlementsubjectList')||judgeWrite('cwsettlementsubjectList-underpaymentMethod')"
@change="changeData('cwsettlementsubject-underpaymentMethod',i)"
clearable placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('cwsettlementsubject-underpaymentMethod',i)" clearable
placeholder="请输入" :style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -482,8 +551,8 @@
:required="requiredList['cwsettlementsubjectList-marginMethod']" label="保证金方式">
<u-input v-model="dataForm.cwsettlementsubjectList[i].marginMethod"
:disabled="judgeWrite('cwsettlementsubjectList')||judgeWrite('cwsettlementsubjectList-marginMethod')"
@change="changeData('cwsettlementsubject-marginMethod',i)" clearable
placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('cwsettlementsubject-marginMethod',i)" clearable placeholder="请输入"
:style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -492,8 +561,8 @@
:required="requiredList['cwsettlementsubjectList-overdueInterestRate']" label="逾期利率">
<u-input v-model="dataForm.cwsettlementsubjectList[i].overdueInterestRate"
:disabled="judgeWrite('cwsettlementsubjectList')||judgeWrite('cwsettlementsubjectList-overdueInterestRate')"
@change="changeData('cwsettlementsubject-overdueInterestRate',i)"
clearable placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('cwsettlementsubject-overdueInterestRate',i)" clearable
placeholder="请输入" :style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -529,8 +598,8 @@
</jnpf-popup-select> -->
<u-input v-model="dataForm.cwsettlementcontractList[i].contractName"
:disabled="judgeWrite('cwsettlementcontractList')||judgeWrite('cwsettlementcontractList-contractName')"
@change="changeData('cwsettlementcontract-contractNamee',i)"
clearable placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('cwsettlementcontract-contractNamee',i)" clearable placeholder="请输入"
:style='{"width":"100%"}'>
</u-input>
@ -541,8 +610,8 @@
:required="requiredList['cwsettlementcontractList-contractPeriodTime']" label="合同期限开始 ">
<u-input v-model="dataForm.cwsettlementcontractList[i].contractPeriodTime"
:disabled="judgeWrite('cwsettlementcontractList')||judgeWrite('cwsettlementcontractList-contractPeriodTime')"
@change="changeData('cwsettlementcontract-contractPeriodTime',i)"
clearable placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('cwsettlementcontract-contractPeriodTime',i)" clearable
placeholder="请输入" :style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -551,8 +620,8 @@
:required="requiredList['cwsettlementcontractList-contractPeriodTimeEnd']" label="合同期限结束 ">
<u-input v-model="dataForm.cwsettlementcontractList[i].contractPeriodTimeEnd"
:disabled="judgeWrite('cwsettlementcontractList')||judgeWrite('cwsettlementcontractList-contractPeriodTimeEnd')"
@change="changeData('cwsettlementcontract-contractPeriodTimeEnd',i)"
clearable placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('cwsettlementcontract-contractPeriodTimeEnd',i)" clearable
placeholder="请输入" :style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -585,8 +654,8 @@
:required="requiredList['cwsettlementcontractList-relatedContractId']" label="关联合同">
<u-input v-model="dataForm.cwsettlementcontractList[i].relatedContractId"
:disabled="judgeWrite('cwsettlementcontractList')||judgeWrite('cwsettlementcontractList-relatedContractId')"
@change="changeData('cwsettlementcontract-relatedContractId',i)"
clearable placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('cwsettlementcontract-relatedContractId',i)" clearable
placeholder="请输入" :style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -595,8 +664,8 @@
:required="requiredList['cwsettlementcontractList-pricingModel']" label="定价模式">
<u-input v-model="dataForm.cwsettlementcontractList[i].pricingModel"
:disabled="judgeWrite('cwsettlementcontractList')||judgeWrite('cwsettlementcontractList-pricingModel')"
@change="changeData('cwsettlementcontract-pricingModel',i)"
clearable placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('cwsettlementcontract-pricingModel',i)" clearable placeholder="请输入"
:style='{"width":"100%"}'>
</u-input>
<jnpf-select v-model="dataForm.cwsettlementcontractList[i].pricingModel"
@ -621,8 +690,7 @@
<jnpf-popup-select v-model="dataForm.cwsettlementcontractList[i].subject"
:disabled="judgeWrite('cwsettlementcontractList')||judgeWrite('cwsettlementcontract-subject')"
:rowIndex="i"
@change="changeData('cwsettlementcontract-subject',i)"
:rowIndex="i" @change="changeData('cwsettlementcontract-subject',i)"
:formData="dataForm" :templateJson="interfaceRes.cwsettlementcontractsubject" clearable
propsValue="id" popupWidth="800px" popupTitle="选择数据" popupType="dialog"
relationField='name' :vModel="'subjectId'+i"
@ -639,8 +707,8 @@
:required="requiredList['cwsettlementcontractList-subject2']" label="乙方主体二级">
<u-input v-model="dataForm.cwsettlementcontractList[i].subject2"
:disabled="judgeWrite('cwsettlementcontractList')||judgeWrite('cwsettlementcontractList-subject2')"
@change="changeData('cwsettlementcontract-subject2',i)" clearable
placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('cwsettlementcontract-subject2',i)" clearable placeholder="请输入"
:style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -649,8 +717,8 @@
:required="requiredList['cwsettlementcontractList-deliveryTime']" label="交货时间开始">
<u-input v-model="dataForm.cwsettlementcontractList[i].deliveryTime"
:disabled="judgeWrite('cwsettlementcontractList')||judgeWrite('cwsettlementcontractList-deliveryTime')"
@change="changeData('cwsettlementcontract-deliveryTime',i)"
clearable placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('cwsettlementcontract-deliveryTime',i)" clearable placeholder="请输入"
:style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -659,8 +727,8 @@
:required="requiredList['cwsettlementcontractList-deliveryTimeEnd']" label="交货时间结束">
<u-input v-model="dataForm.cwsettlementcontractList[i].deliveryTimeEnd"
:disabled="judgeWrite('cwsettlementcontractList')||judgeWrite('cwsettlementcontractList-deliveryTimeEnd')"
@change="changeData('cwsettlementcontract-deliveryTimeEnd',i)"
clearable placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('cwsettlementcontract-deliveryTimeEnd',i)" clearable
placeholder="请输入" :style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -707,14 +775,15 @@
:required="requiredList['cwsettlementcontractList-costBearingMian']" label="费用承担主体">
<u-input v-model="dataForm.cwsettlementcontractList[i].costBearingMian"
:disabled="judgeWrite('cwsettlementcontractList')||judgeWrite('cwsettlementcontractList-costBearingMian')"
@change="changeData('cwsettlementcontract-costBearingMian',i)"
clearable placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('cwsettlementcontract-costBearingMian',i)" clearable
placeholder="请输入" :style='{"width":"100%"}'>
</u-input>
<jnpf-select v-model="dataForm.cwsettlementcontractList[i].modeTransport"
:disabled="judgeWrite('cwsettlementcontractList')||judgeWrite('cwsettlementcontract-costBearingMian')"
@change="changeData('cwsettlementcontract-costBearingMian',i)" clearable placeholder="请选择"
:options="costBearingMianOptions" :props="costBearingMianProps" :style='{"width":"100%"}'>
@change="changeData('cwsettlementcontract-costBearingMian',i)" clearable
placeholder="请选择" :options="costBearingMianOptions" :props="costBearingMianProps"
:style='{"width":"100%"}'>
</jnpf-select>
</u-form-item>
@ -749,8 +818,8 @@
:required="requiredList['cwsettlementaccountList-code']" label="单据编号">
<u-input v-model="dataForm.cwsettlementaccountList[i].code"
:disabled="judgeWrite('cwsettlementaccountList')||judgeWrite('cwsettlementaccountList-code')"
@change="changeData('cwsettlementaccount-code',i)" clearable
placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('cwsettlementaccount-code',i)" clearable placeholder="请输入"
:style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -759,8 +828,8 @@
:required="requiredList['cwsettlementaccountList-accountSubjectName']" label="对账主体名称">
<u-input v-model="dataForm.cwsettlementaccountList[i].accountSubjectName"
:disabled="judgeWrite('cwsettlementaccountList')||judgeWrite('cwsettlementaccountList-accountSubjectName')"
@change="changeData('cwsettlementaccount-accountSubjectName',i)"
clearable placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('cwsettlementaccount-accountSubjectName',i)" clearable
placeholder="请输入" :style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -769,8 +838,8 @@
:required="requiredList['cwsettlementaccountList-contractCode']" label="合同编码">
<u-input v-model="dataForm.cwsettlementaccountList[i].contractCode"
:disabled="judgeWrite('cwsettlementaccountList')||judgeWrite('cwsettlementaccountList-contractCode')"
@change="changeData('cwsettlementaccount-contractCode',i)" clearable
placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('cwsettlementaccount-contractCode',i)" clearable placeholder="请输入"
:style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -779,8 +848,8 @@
:required="requiredList['cwsettlementaccountList-docmentNum']" label="单据数(出入库单数量)">
<u-input v-model="dataForm.cwsettlementaccountList[i].docmentNum"
:disabled="judgeWrite('cwsettlementaccountList')||judgeWrite('cwsettlementaccountList-docmentNum')"
@change="changeData('cwsettlementaccount-docmentNum',i)" clearable
placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('cwsettlementaccount-docmentNum',i)" clearable placeholder="请输入"
:style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -800,8 +869,8 @@
:required="requiredList['cwsettlementaccountList-poundlistNum']" label="凭证数">
<u-input v-model="dataForm.cwsettlementaccountList[i].poundlistNum"
:disabled="judgeWrite('cwsettlementaccountList')||judgeWrite('cwsettlementaccountList-poundlistNum')"
@change="changeData('cwsettlementaccount-poundlistNum',i)" clearable
placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('cwsettlementaccount-poundlistNum',i)" clearable placeholder="请输入"
:style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -810,8 +879,8 @@
:required="requiredList['cwsettlementaccountList-productNum']" label="商品数">
<u-input v-model="dataForm.cwsettlementaccountList[i].productNum"
:disabled="judgeWrite('cwsettlementaccountList')||judgeWrite('cwsettlementaccountList-productNum')"
@change="changeData('cwsettlementaccount-productNum',i)" clearable
placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('cwsettlementaccount-productNum',i)" clearable placeholder="请输入"
:style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -820,8 +889,8 @@
:required="requiredList['cwsettlementaccountList-accountAmount']" label="对账合计(含税)">
<u-input v-model="dataForm.cwsettlementaccountList[i].accountAmount"
:disabled="judgeWrite('cwsettlementaccountList')||judgeWrite('cwsettlementaccountList-accountAmount')"
@change="changeData('cwsettlementaccount-accountAmount',i)"
clearable placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('cwsettlementaccount-accountAmount',i)" clearable placeholder="请输入"
:style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -845,8 +914,8 @@
:required="requiredList['cwsettlementcostList-costId']" label="费用单">
<u-input v-model="dataForm.cwsettlementcostList[i].costId"
:disabled="judgeWrite('cwsettlementcostList')||judgeWrite('cwsettlementcostList-costId')"
@change="changeData('cwsettlementcost-costId',i)" clearable
placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('cwsettlementcost-costId',i)" clearable placeholder="请输入"
:style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -855,8 +924,8 @@
:required="requiredList['cwsettlementcostList-code']" label="单据编号">
<u-input v-model="dataForm.cwsettlementcostList[i].code"
:disabled="judgeWrite('cwsettlementcostList')||judgeWrite('cwsettlementcostList-code')"
@change="changeData('cwsettlementcost-code',i)" clearable
placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('cwsettlementcost-code',i)" clearable placeholder="请输入"
:style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -865,8 +934,8 @@
:required="requiredList['cwsettlementcostList-costProject']" label="费用项目">
<u-input v-model="dataForm.cwsettlementcostList[i].costProject"
:disabled="judgeWrite('cwsettlementcostList')||judgeWrite('cwsettlementcostList-costProject')"
@change="changeData('cwsettlementcost-costProject',i)" clearable
placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('cwsettlementcost-costProject',i)" clearable placeholder="请输入"
:style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -875,8 +944,8 @@
:required="requiredList['cwsettlementcostList-institutionId']" label="费用归属">
<u-input v-model="dataForm.cwsettlementcostList[i].institutionId"
:disabled="judgeWrite('cwsettlementcostList')||judgeWrite('cwsettlementcostList-institutionId')"
@change="changeData('cwsettlementcost-institutionId',i)" clearable
placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('cwsettlementcost-institutionId',i)" clearable placeholder="请输入"
:style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -885,8 +954,8 @@
:required="requiredList['cwsettlementcostList-subjectId']" label="往来单位(一级)">
<u-input v-model="dataForm.cwsettlementcostList[i].subjectId"
:disabled="judgeWrite('cwsettlementcostList')||judgeWrite('cwsettlementcostList-subjectId')"
@change="changeData('cwsettlementcost-subjectId',i)" clearable
placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('cwsettlementcost-subjectId',i)" clearable placeholder="请输入"
:style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -895,8 +964,8 @@
:required="requiredList['cwsettlementcostList-costPrice']" label="费用金额">
<u-input v-model="dataForm.cwsettlementcostList[i].costPrice"
:disabled="judgeWrite('cwsettlementcostList')||judgeWrite('cwsettlementcostList-costPrice')"
@change="changeData('cwsettlementcost-costPrice',i)" clearable
placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('cwsettlementcost-costPrice',i)" clearable placeholder="请输入"
:style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -913,8 +982,7 @@
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item v-if="judgeShow('cwsettlementcostList-wayType')"
:required="requiredList['cwsettlementcostList-wayType']"
label="付款方式">
:required="requiredList['cwsettlementcostList-wayType']" label="付款方式">
<jnpf-select v-model="dataForm.cwsettlementcostList[i].wayType"
:disabled="judgeWrite('cwsettlementcostList')||judgeWrite('cwsettlementcostList-wayType')"
@change="changeData('cwsettlementcost-wayType',i)" clearable placeholder="请选择"
@ -966,8 +1034,8 @@
:required="requiredList['cwsettlementpaymentreceiptList-name']" label="公司名称">
<u-input v-model="dataForm.cwsettlementpaymentreceiptList[i].name"
:disabled="judgeWrite('cwsettlementpaymentreceiptList')||judgeWrite('cwsettlementpaymentreceiptList-name')"
@change="changeData('cwsettlementpaymentreceipt-name',i)" clearable
placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('cwsettlementpaymentreceipt-name',i)" clearable placeholder="请输入"
:style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -976,8 +1044,8 @@
:required="requiredList['cwsettlementpaymentreceiptList-accountName']" label="账户名称">
<u-input v-model="dataForm.cwsettlementpaymentreceiptList[i].accountName"
:disabled="judgeWrite('cwsettlementpaymentreceiptList')||judgeWrite('cwsettlementpaymentreceiptList-accountName')"
@change="changeData('cwsettlementpaymentreceipt-accountName',i)"
clearable placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('cwsettlementpaymentreceipt-accountName',i)" clearable
placeholder="请输入" :style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -986,8 +1054,8 @@
:required="requiredList['cwsettlementpaymentreceiptList-bankAccount']" label="银行账号">
<u-input v-model="dataForm.cwsettlementpaymentreceiptList[i].bankAccount"
:disabled="judgeWrite('cwsettlementpaymentreceiptList')||judgeWrite('cwsettlementpaymentreceiptList-bankAccount')"
@change="changeData('cwsettlementpaymentreceipt-bankAccount',i)"
clearable placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('cwsettlementpaymentreceipt-bankAccount',i)" clearable
placeholder="请输入" :style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -996,8 +1064,8 @@
:required="requiredList['cwsettlementpaymentreceiptList-depositBank']" label="开户银行">
<u-input v-model="dataForm.cwsettlementpaymentreceiptList[i].depositBank"
:disabled="judgeWrite('cwsettlementpaymentreceiptList')||judgeWrite('cwsettlementpaymentreceiptList-depositBank')"
@change="changeData('cwsettlementpaymentreceipt-depositBank',i)"
clearable placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('cwsettlementpaymentreceipt-depositBank',i)" clearable
placeholder="请输入" :style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -1016,8 +1084,8 @@
:required="requiredList['cwsettlementpaymentreceiptList-bankBranchName']" label="支行名称">
<u-input v-model="dataForm.cwsettlementpaymentreceiptList[i].bankBranchName"
:disabled="judgeWrite('cwsettlementpaymentreceiptList')||judgeWrite('cwsettlementpaymentreceiptList-bankBranchName')"
@change="changeData('cwsettlementpaymentreceipt-bankBranchName',i)"
clearable placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('cwsettlementpaymentreceipt-bankBranchName',i)" clearable
placeholder="请输入" :style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -1026,8 +1094,8 @@
:required="requiredList['cwsettlementpaymentreceiptList-companyTaxNumber']" label="公司税号">
<u-input v-model="dataForm.cwsettlementpaymentreceiptList[i].companyTaxNumber"
:disabled="judgeWrite('cwsettlementpaymentreceiptList')||judgeWrite('cwsettlementpaymentreceiptList-companyTaxNumber')"
@change="changeData('cwsettlementpaymentreceipt-companyTaxNumber',i)"
clearable placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('cwsettlementpaymentreceipt-companyTaxNumber',i)" clearable
placeholder="请输入" :style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -1036,8 +1104,8 @@
:required="requiredList['cwsettlementpaymentreceiptList-address']" label="详细地址">
<u-input v-model="dataForm.cwsettlementpaymentreceiptList[i].address"
:disabled="judgeWrite('cwsettlementpaymentreceiptList')||judgeWrite('cwsettlementpaymentreceiptList-address')"
@change="changeData('cwsettlementpaymentreceipt-address',i)"
clearable placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('cwsettlementpaymentreceipt-address',i)" clearable placeholder="请输入"
:style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -1046,8 +1114,8 @@
:required="requiredList['cwsettlementpaymentreceiptList-phone']" label="公司电话">
<u-input v-model="dataForm.cwsettlementpaymentreceiptList[i].phone"
:disabled="judgeWrite('cwsettlementpaymentreceiptList')||judgeWrite('cwsettlementpaymentreceiptList-phone')"
@change="changeData('cwsettlementpaymentreceipt-phone',i)" clearable
placeholder="请输入" :style='{"width":"100%"}'>
@change="changeData('cwsettlementpaymentreceipt-phone',i)" clearable placeholder="请输入"
:style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
@ -1371,7 +1439,16 @@
"value": "id"
},
voucherproductproductIdcolumnOptions: [{ "label": "商品编码", "value": "code" }, { "label": "商品名称", "value": "name" }, { "label": "规格", "value": "spec" },],
voucherproductproductIdcolumnOptions: [{
"label": "商品编码",
"value": "code"
}, {
"label": "商品名称",
"value": "name"
}, {
"label": "规格",
"value": "spec"
}, ],
cwsettlementcontractsubjectcolumnOptions: [{
@ -1417,6 +1494,19 @@
"multiple": false,
"children": ""
},
invoiceTypeOptions: [{
"fullName": "红冲发票",
"id": "1"
}, {
"fullName": "标准发票",
"id": "2"
}],
invoiceTypeProps: {
"label": "fullName",
"value": "id",
"multiple": false,
"children": ""
},
cwsettlementcostwayStatusOptions: [{
"fullName": "未收款",
"id": "1"
@ -1521,8 +1611,27 @@
// relationField: "creatorTime",
// },
// ],
cwsettlementcontractcontractId: [{"fieldName":"","field":"subjectId","defaultValue":"","jnpfKey":"subjectId","dataType":"varchar","id":"HmoSU22","relationField":"subjectId","required":"1"},
{"fieldName":"","field":"contractType","defaultValue":"","jnpfKey":"contractType","dataType":"varchar","id":"QnvSU22","relationField":"contractType","required":"1"}],
cwsettlementcontractcontractId: [{
"fieldName": "",
"field": "subjectId",
"defaultValue": "",
"jnpfKey": "subjectId",
"dataType": "varchar",
"id": "HmoSU22",
"relationField": "subjectId",
"required": "1"
},
{
"fieldName": "",
"field": "contractType",
"defaultValue": "",
"jnpfKey": "contractType",
"dataType": "varchar",
"id": "QnvSU22",
"relationField": "contractType",
"required": "1"
}
],
cwsettlementcontractcontractPeriodTime: [],
@ -1877,16 +1986,20 @@
contractChangeData(model, row) {
this.dataForm.cwsettlementcontractList[0].contractName = row.contract_name
this.dataForm.cwsettlementcontractList[0].contractPeriodTime = row.contract_period_time ? row.contract_period_time.substring(0, 10) : '';
this.dataForm.cwsettlementcontractList[0].contractPeriodTimeEnd = row.contract_period_time_end ? row.contract_period_time_end.substring(0, 10) : '';
this.dataForm.cwsettlementcontractList[0].contractPeriodTime = row.contract_period_time ? row
.contract_period_time.substring(0, 10) : '';
this.dataForm.cwsettlementcontractList[0].contractPeriodTimeEnd = row.contract_period_time_end ? row
.contract_period_time_end.substring(0, 10) : '';
//this.dataForm.cwsettlementcontractList[0].currency = row.currency;
this.dataForm.cwsettlementcontractList[0].procurementModel = row.procurement_model;
this.dataForm.cwsettlementcontractList[0].pricingModel = row.pricing_model;
this.dataForm.cwsettlementcontractList[0].relatedContractId = row.related_contract_id;
this.dataForm.cwsettlementcontractList[0].subject = row.subject;
this.dataForm.cwsettlementcontractList[0].subject2 = row.subject2;
this.dataForm.cwsettlementcontractList[0].deliveryTime = row.delivery_time ? row.delivery_time.substring(0, 10) : '';
this.dataForm.cwsettlementcontractList[0].deliveryTimeEnd = row.delivery_time_end ? row.delivery_time_end.substring(0, 10) : '';
this.dataForm.cwsettlementcontractList[0].deliveryTime = row.delivery_time ? row.delivery_time.substring(0,
10) : '';
this.dataForm.cwsettlementcontractList[0].deliveryTimeEnd = row.delivery_time_end ? row.delivery_time_end
.substring(0, 10) : '';
this.dataForm.cwsettlementcontractList[0].deliveryModel = row.delivery_model;
this.dataForm.cwsettlementcontractList[0].deliveryMethod = row.delivery_method;
this.dataForm.cwsettlementcontractList[0].modeTransport = row.mode_transport;
@ -1962,9 +2075,11 @@
if (row.underpayment_method == 0) {
this.dataForm.cwsettlementsubjectList[0].underpaymentMethod = '无';
} else if (row.underpayment_method == 1) {
this.dataForm.cwsettlementsubjectList[0].underpaymentMethod = '按金额(' + row.apply_for_underpayment_ratio + '元)';
this.dataForm.cwsettlementsubjectList[0].underpaymentMethod = '按金额(' + row
.apply_for_underpayment_ratio + '元)';
} else if (row.underpayment_method == 2) {
this.dataForm.cwsettlementsubjectList[0].underpaymentMethod = '按比例(' + row.apply_for_underpayment_ratio + '%)';
this.dataForm.cwsettlementsubjectList[0].underpaymentMethod = '按比例(' + row
.apply_for_underpayment_ratio + '%)';
}
if (row.margin_method == 0) {
this.dataForm.cwsettlementsubjectList[0].marginMethod = '无';
@ -1976,9 +2091,11 @@
if (row.overdue_interest_rate == 0) {
this.dataForm.cwsettlementsubjectList[0].overdueInterestRate = '无';
} else if (row.overdue_interest_rate == 1) {
this.dataForm.cwsettlementsubjectList[0].overdueInterestRate = '按年化(' + row.apply_for_overdue_ratio + '%)';
this.dataForm.cwsettlementsubjectList[0].overdueInterestRate = '按年化(' + row.apply_for_overdue_ratio +
'%)';
} else if (row.overdue_interest_rate == 2) {
this.dataForm.cwsettlementsubjectList[0].overdueInterestRate = '按月化(' + row.apply_for_overdue_ratio + '%)';
this.dataForm.cwsettlementsubjectList[0].overdueInterestRate = '按月化(' + row.apply_for_overdue_ratio +
'%)';
}
},

264
jnpf-app/pages/scm/form/paymentApplication/index.vue
Unescape View File

@ -47,6 +47,14 @@
</u-input>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item v-if="judgeShow('payee')" :required="requiredList.payee" label="收款方账号" prop="payee">
<u-input v-model="dataForm.payeeAccount" :disabled="judgeWrite('payee')" @change="changeData('payee',-1)"
clearable placeholder="请输入" :style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box" v-if="false">
<u-form-item v-if="judgeShow('payer')" :required="requiredList.payer" label="付款方" prop="payer">
<u-input v-model="dataForm.payer" :disabled="judgeWrite('payer')" @change="changeData('payer',-1)"
@ -61,6 +69,61 @@
</u-input>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item v-if="judgeShow('payer')" :required="requiredList.payer" label="支付日期"
prop="operationStart">
<jnpf-date-time v-model="dataForm.paymentDate" :disabled="judgeWrite('payer')"
@change="changeData('payer',-1)" :startTime="dateTime(false,1,1,'','')"
:endTime="dateTime(false,1,1,'','')" format="yyyy-MM-dd" clearable placeholder="请选择" type="date"
:style='{"width":"100%"}'>
</jnpf-date-time>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item v-if="judgeShow('payer')" :required="requiredList.payer" label="币种"
prop="payer">
<jnpf-select v-model="dataForm.currency" :disabled="judgeWrite('payer')"
@change="changeData('payer',-1)" clearable placeholder="请选择" :props="currencyProps"
:options="currencyOptions" :style='{"width":"100%"}'>
</jnpf-select>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item v-if="judgeShow('payer')" :required="requiredList.payer" label="付款方式"
prop="payer">
<jnpf-select v-model="dataForm.paymentMethod" :disabled="judgeWrite('payer')"
@change="changeData('payer',-1)" clearable placeholder="请选择" :props="paymentMethodProps"
:options="paymentMethodOptions" :style='{"width":"100%"}'>
</jnpf-select>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item v-if="judgeShow('payer')" :required="requiredList.payer" label="付款类型"
prop="payer">
<jnpf-select v-model="dataForm.paymentType" :disabled="judgeWrite('payer')"
@change="changeData('payer',-1)" clearable placeholder="请选择" :props="paymentTypeProps"
:options="paymentTypeOptions" :style='{"width":"100%"}'>
</jnpf-select>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item v-if="judgeShow('payer')" :required="requiredList.payer" label="交易类型"
prop="payer">
<jnpf-select v-model="dataForm.transactionType" :disabled="judgeWrite('payer')"
@change="changeData('payer',-1)" clearable placeholder="请选择" :props="transactionTypeProps"
:options="transactionTypeOptions" :style='{"width":"100%"}'>
</jnpf-select>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item v-if="judgeShow('applyAmount')" :required="requiredList.applyAmount" label="结算金额"
prop="applyAmount">
<jnpf-number-box v-model="dataForm.settlementAmount" :disabled="judgeWrite('applyAmount')"
@change="changeData('applyAmount',-1)" :controls="false" placeholder="数字文本"
:step="1">
</jnpf-number-box>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item v-if="judgeShow('applyAmount')" :required="requiredList.applyAmount" label="申请金额"
prop="applyAmount">
@ -71,10 +134,10 @@
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item v-if="judgeShow('applyWeight')" :required="requiredList.applyWeight" label="申请重量"
<u-form-item v-if="judgeShow('applyAmount')" :required="requiredList.applyAmount" label="申请重量"
prop="applyAmount">
<jnpf-number-box v-model="dataForm.applyWeight" :disabled="judgeWrite('applyWeight')"
@change="changeData('applyWeight',-1)" :controls="false" placeholder="数字文本"
<jnpf-number-box v-model="dataForm.applyWeight" :disabled="judgeWrite('applyAmount')"
@change="changeData('applyAmount',-1)" :controls="false" placeholder="数字文本"
:step="1">
</jnpf-number-box>
</u-form-item>
@ -96,6 +159,141 @@
</u-input>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item label="联行号">
<u-input v-model="dataForm.interbankNumber" :disabled="true"
clearable placeholder="请输入" :style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item label="开户银行名称">
<u-input v-model="dataForm.bankName" :disabled="true"
clearable placeholder="请输入" :style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item label="开户银行所在省">
<u-input v-model="dataForm.province" :disabled="true"
clearable placeholder="请输入" :style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item label="开户银行所在市">
<u-input v-model="dataForm.city" :disabled="true"
clearable placeholder="请输入" :style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item label="资金计划明细ID">
<u-input v-model="dataForm.fundingPlanDetailCode" :disabled="true"
clearable placeholder="请输入" :style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item label="资金计划ID">
<u-input v-model="dataForm.fundingPlanCode" :disabled="true"
clearable placeholder="请输入" :style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item label="计划所属单位名称">
<u-input v-model="dataForm.unitName" :disabled="true"
clearable placeholder="请输入" :style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item label="期望支付日期">
<jnpf-date-time v-model="dataForm.expectPaymentDate" :disabled="true"
@change="changeData('payer',-1)" :startTime="dateTime(false,1,1,'','')"
:endTime="dateTime(false,1,1,'','')" format="yyyy-MM-dd" clearable placeholder="请选择" type="date"
:style='{"width":"100%"}'>
</jnpf-date-time>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item label="上报金额">
<u-input v-model="dataForm.reportingAmount" :disabled="true"
clearable placeholder="请输入" :style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item label="计划科目编码">
<u-input v-model="dataForm.planSubjectCode" :disabled="true"
clearable placeholder="请输入" :style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item label="计划科目名">
<u-input v-model="dataForm.planSubjectName" :disabled="true"
clearable placeholder="请输入" :style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item label="收款人单位/人员">
<u-input v-model="dataForm.collectionUnitName" :disabled="true"
clearable placeholder="请输入" :style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item label="用途">
<u-input v-model="dataForm.purpose" :disabled="true"
clearable placeholder="请输入" :style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item label="计划可用金额">
<u-input v-model="dataForm.planAvailableAmount" :disabled="true"
clearable placeholder="请输入" :style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item label="计划已用总金额">
<u-input v-model="dataForm.processMoney" :disabled="true"
clearable placeholder="请输入" :style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item label="追加金额">
<u-input v-model="dataForm.addAmount" :disabled="true"
clearable placeholder="请输入" :style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
<view class="u-p-l-20 u-p-r-20 form-item-box">
<u-form-item label="上浮总金额">
<u-input v-model="dataForm.upwardFloatingAmount" :disabled="true"
clearable placeholder="请输入" :style='{"width":"100%"}'>
</u-input>
</u-form-item>
</view>
<view class="jnpf-table" v-if="false">
<view class="jnpf-table-item" v-for="(item,i) in dataForm.paymentapplicationsettlementList" :key="i">
<view class="jnpf-table-item-title u-flex u-row-between">
@ -199,10 +397,18 @@
payee: '',
payer: '',
payer2: '',
payeeAccount: '',
applyAmount: 0,
settlementAmount: 0,
applyWeight: 0,
caseStatus: "1",
currency: "1",
paymentType: undefined,
paymentMethod: undefined,
transactionType: undefined,
remark: '',
closeCaseRemark: '',
paymentDate: undefined,
annex: [],
paymentapplicationsettlementList: [],
},
@ -266,6 +472,58 @@
"multiple": false,
"children": ""
},
currencyOptions: [{
"fullName": "人民币",
"id": "1"
}],
currencyProps: {
"label": "fullName",
"value": "id",
"multiple": false,
"children": ""
},
paymentMethodOptions: [{
"fullName": "现金",
"id": "1"
}, {
"fullName": "承兑",
"id": "2"
}],
paymentMethodProps: {
"label": "fullName",
"value": "id",
"multiple": false,
"children": ""
},
paymentTypeOptions: [{
"fullName": "预付款",
"id": "A"
}, {
"fullName": "结算款",
"id": "B"
}, {
"fullName": "进度款",
"id": "D"
}],
transactionTypeOptions: [{
"fullName": "网银",
"id": "34"
}, {
"fullName": "票据",
"id": "50"
}],
transactionTypeProps: {
"label": "fullName",
"value": "id",
"multiple": false,
"children": ""
},
paymentTypeProps: {
"label": "fullName",
"value": "id",
"multiple": false,
"children": ""
},
labelwidth: 100 * 1.5,
menuId: '',
jurisdictionType: '',

12
jnpf-app/utils/define.js
Unescape View File

@ -1,14 +1,16 @@
/* process.env.NODE_ENV设置生产环境模式 */
/*JAVA app.java.jnpfsoft.com NET dotnet.jnpfsoft.com*/
//生产内网 jgckzhgj.natapp1.cc
//生产外网 221.214.32.166:40000
// #ifndef MP
const baseURL = process.env.NODE_ENV === "production" ?
"http://127.0.0.1:50000" : "http://127.0.0.1:50000" // 接口前缀
"http://jgckzhgj.natapp1.cc" : "http://jgckzhgj.natapp1.cc" // 接口前缀
const define = {
copyright: "Copyright @ 2024 上海长江云息数字科技有限公司版权所有",
sysVersion: "V3.5",
baseURL: baseURL,
webSocketUrl: process.env.NODE_ENV === "production" ? "wss://127.0.0.1:50000/websocket" :
"ws://127.0.0.1:50000/api/message/websocket",
webSocketUrl: process.env.NODE_ENV === "production" ? "wss://jgckzhgj.natapp1.cc/websocket" :
"ws://jgckzhgj.natapp1.cc/api/message/websocket",
comUploadUrl: baseURL + '/api/file/Uploader/',
comUploadUrlPound: baseURL + '/api/scm/Voucher/Uploader/',
timeout: process.env.NODE_ENV === 'production' ? 1000000 : 1000000,
@ -17,13 +19,13 @@ const define = {
// #endif
// #ifdef MP
const baseURL = "http://127.0.0.1:50000" // "https://app.java.jnpfsoft.com"
const baseURL = "http://jgckzhgj.natapp1.cc" // "https://app.java.jnpfsoft.com"
const define = {
copyright: "Copyright @ 2024 上海长江云息数字科技有限公司版权所有",
sysVersion: "V3.5",
baseURL: baseURL,
comUploadUrlPound: baseURL + '/api/scm/Voucher/Uploader/',
webSocketUrl: "ws://127.0.0.1:50000/api/message/websocket", //"wss://app.java.jnpfsoft.com/api/message/websocket"
webSocketUrl: "ws://jgckzhgj.natapp1.cc/api/message/websocket", //"wss://app.java.jnpfsoft.com/api/message/websocket"
comUploadUrl: baseURL + '/api/file/Uploader/',
timeout: process.env.NODE_ENV === 'production' ? 1000000 : 1000000,
report: baseURL + '/Report'

117
jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/PaymentApplicationServiceImpl.java
Unescape View File

@ -2,16 +2,23 @@ package jnpf.service.impl;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import jnpf.base.ActionResult;
import jnpf.engine.controller.FlowBeforeController;
import jnpf.engine.entity.FlowTaskEntity;
import jnpf.engine.entity.FlowTaskNodeEntity;
import jnpf.engine.model.flowbefore.FlowBeforeInfoVO;
import jnpf.engine.model.flowbefore.FlowTaskOperatorRecordModel;
import jnpf.engine.model.flowengine.FlowModel;
import jnpf.engine.service.FlowTaskNodeService;
import jnpf.engine.service.FlowTaskService;
import jnpf.entity.*;
import jnpf.exception.WorkFlowException;
import jnpf.mapper.CwpaymentreceiptMapper;
import jnpf.mapper.PaymentApplicationMapper;
import jnpf.model.cwpaymentreceipt.PaymentdocMessage;
import jnpf.model.yunguan.BFSPaymentApprovalModel;
import jnpf.model.yunguan.BFSPaymentOccupationModel;
import jnpf.permission.entity.OrganizeEntity;
import jnpf.permission.service.OrganizeService;
import jnpf.permission.service.UserService;
@ -39,6 +46,7 @@ import jnpf.model.QueryModel;
import java.util.stream.Collectors;
import jnpf.base.model.ColumnDataModel;
import jnpf.util.context.SpringContext;
import jnpf.util.wxutil.HttpUtil;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import jnpf.database.model.superQuery.SuperJsonModel;
@ -81,6 +89,11 @@ public class PaymentApplicationServiceImpl extends ServiceImpl<PaymentApplicatio
private CwsettlementService cwsettlementService;
@Autowired
private PaymentapplicationsettlementService paymentapplicationsettlementService;
@Autowired
private FlowTaskService flowTaskService;
@Autowired
private FlowTaskNodeService flowTaskNodeService;
@Override
public List<PaymentApplicationEntity> getList(PaymentApplicationPagination paymentApplicationPagination){
return getTypeList(paymentApplicationPagination,paymentApplicationPagination.getDataType());
@ -495,6 +508,110 @@ public class PaymentApplicationServiceImpl extends ServiceImpl<PaymentApplicatio
cwsettlementService.updateById(cwsettlementEntity);
}
}
if("1".equals(paymentApplicationForm.getIsSubmit())){
//提交,调用资金计划占用接口
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat simpleDateFormat2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
List<BFSPaymentOccupationModel> list = new ArrayList<>();
BFSPaymentOccupationModel bfsPaymentOccupationModel = new BFSPaymentOccupationModel();
bfsPaymentOccupationModel.setSerialNoErp(entity.getId());//流水号
bfsPaymentOccupationModel.setBillNo(entity.getCode());
bfsPaymentOccupationModel.setApplyDate(simpleDateFormat.format(entity.getCreatorTime()));
bfsPaymentOccupationModel.setAmt(String.format("%.2f", entity.getApplyAmount().doubleValue()));
bfsPaymentOccupationModel.setCur("CNY");
bfsPaymentOccupationModel.setAbs("");//摘要
bfsPaymentOccupationModel.setPayeeAccNo(entity.getPayeeAccount());
bfsPaymentOccupationModel.setPayeeAccName(entity.getPayee());//收款方户名
String[] payer = entity.getPayer().split("/");
if(payer.length == 1){
bfsPaymentOccupationModel.setPayerAccName(payer[0]);
}else if(payer.length == 2){
bfsPaymentOccupationModel.setPayerAccName(payer[1]);
}else if(payer.length == 3){
bfsPaymentOccupationModel.setPayerAccName(payer[1]);
}
bfsPaymentOccupationModel.setPayeeBank(entity.getBankName());//收款方开户行
bfsPaymentOccupationModel.setPayeeCode(entity.getInterbankNumber());
bfsPaymentOccupationModel.setPayeeProv(entity.getProvince());
bfsPaymentOccupationModel.setPayeeCity(entity.getCity());
bfsPaymentOccupationModel.setCorpName(entity.getUnitName());
if(StringUtil.isNotEmpty(entity.getUnitName())){
List<OrganizeEntity> o = organizeService.getListByFullName(entity.getUnitName());
if(o != null && o.size() > 0){
bfsPaymentOccupationModel.setCorpCode(o.get(0).getEnCode());
}
}
bfsPaymentOccupationModel.setPurpose(entity.getPurpose());
bfsPaymentOccupationModel.setWishPayDay(simpleDateFormat2.format(entity.getExpectPaymentDate()) + ".0");
bfsPaymentOccupationModel.setItemCode(entity.getPlanSubjectCode());
bfsPaymentOccupationModel.setItemName(entity.getPlanSubjectName());
bfsPaymentOccupationModel.setBudgetDetailId(entity.getFundingPlanDetailCode());
bfsPaymentOccupationModel.setUrgencyFlag("0");//加急标志
bfsPaymentOccupationModel.setVoucherType(entity.getTransactionType());//交易类型34：网银（外付网银）、50：票据（应收票据）
bfsPaymentOccupationModel.setIsforindividual("0");//对公对私字段
bfsPaymentOccupationModel.setRmk("");
bfsPaymentOccupationModel.setDataSource("CK");//数据来源
list.add(bfsPaymentOccupationModel);
String result = HttpUtil.sendHttpPost("http://172.16.173.160:8081/t2/rest/JgPaymentOccupationRestful", JsonUtil.getObjectToString(list));
if (ObjectUtil.isNotEmpty(result)){
String status = JSONArray.parseArray(result, Map.class).get(0).get("status").toString();
String message = JSONArray.parseArray(result, Map.class).get(0).get("message").toString();
//String serialNoErp = JSONArray.parseArray(code, Map.class).get(0).get("serialNoErp").toString();
if ("2".equals(status)) {
entity.setBfsFlag("2");
entity.setBfsMessage(message);
this.updateById(entity);
}else{
entity.setBfsFlag("1");
entity.setBfsMessage(message);
this.updateById(entity);
}
}else{
entity.setBfsFlag("1");
entity.setBfsMessage("资金系统接口调用失败");
this.updateById(entity);
}
}
FlowTaskEntity flowTaskEntity = flowTaskService.getById(id);
if (flowTaskEntity!=null) {
QueryWrapper<FlowTaskNodeEntity> flowTaskNodeEntityQueryWrapper = new QueryWrapper<>();
//flowTaskNodeEntityQueryWrapper.lambda().eq(FlowTaskNodeEntity::getState, flowTaskEntity.getThisStepId());
flowTaskNodeEntityQueryWrapper.lambda().eq(FlowTaskNodeEntity::getNodeCode, flowTaskEntity.getThisStepId());
flowTaskNodeEntityQueryWrapper.lambda().eq(FlowTaskNodeEntity::getTaskId, flowTaskEntity.getId());
List<FlowTaskNodeEntity> flowTaskNodeEntityList = flowTaskNodeService.list(flowTaskNodeEntityQueryWrapper);
if (flowTaskNodeEntityList != null && flowTaskNodeEntityList.size() > 0 && "end".equals(flowTaskNodeEntityList.get(0).getNodeNext())) {
//审批通过
SubjectbasicEntity subjectbasicEntity = subjectbasicService.getById(entity.getSubjectId());
if("2".equals(subjectbasicEntity.getSettlementMethod()) || "3".equals(subjectbasicEntity.getSettlementMethod())){
List<BFSPaymentApprovalModel> list2 = new ArrayList<>();
BFSPaymentApprovalModel bFSPaymentApprovalModel = new BFSPaymentApprovalModel();
bFSPaymentApprovalModel.setDataSource("CK");
bFSPaymentApprovalModel.setStatus("2");
bFSPaymentApprovalModel.setSerialNoErp(id);
list2.add(bFSPaymentApprovalModel);
//先款后货 先款后票
String result = HttpUtil.sendHttpPost("http://172.16.173.160:8081/t2/rest/JgYGPaymentApprovalResultRestful", JsonUtil.getObjectToString(list2));
if (ObjectUtil.isNotEmpty(result)){
String status = JSONArray.parseArray(result, Map.class).get(0).get("status").toString();
String message = JSONArray.parseArray(result, Map.class).get(0).get("message").toString();
//String serialNoErp = JSONArray.parseArray(code, Map.class).get(0).get("serialNoErp").toString();
if ("2".equals(status)) {
entity.setBfsFlag("4");
entity.setBfsMessage(message);
this.updateById(entity);
}else{
entity.setBfsFlag("3");
entity.setBfsMessage(message);
this.updateById(entity);
}
}else{
entity.setBfsFlag("3");
entity.setBfsMessage("资金系统审批接口调用失败");
this.updateById(entity);
}
}
}
}
}
@Override

64
jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/PaymentApplicationController.java
Unescape View File

@ -1,6 +1,7 @@
package jnpf.controller;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.swagger.v3.oas.annotations.Operation;
@ -8,6 +9,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import jnpf.base.ActionResult;
import jnpf.base.UserInfo;
import jnpf.exception.DataException;
import jnpf.model.yunguan.BFSPaymentApprovalModel;
import jnpf.model.yunguan.BFSPaymentOccupationModel;
import jnpf.permission.entity.OrganizeEntity;
import jnpf.permission.entity.UserEntity;
@ -266,53 +268,31 @@ public class PaymentApplicationController {
@GetMapping("uploadBFS/{id}")
@Transactional
public ActionResult closeCase(@PathVariable("id") String id){
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
PaymentApplicationEntity entity= paymentApplicationService.getInfo(id);
BFSPaymentOccupationModel bfsPaymentOccupationModel = new BFSPaymentOccupationModel();
bfsPaymentOccupationModel.setSerialNoErp(entity.getId());//流水号
bfsPaymentOccupationModel.setBillNo(entity.getCode());
bfsPaymentOccupationModel.setApplyDate(simpleDateFormat.format(entity.getCreatorTime()));
bfsPaymentOccupationModel.setAmt(entity.getApplyAmount().toString());
bfsPaymentOccupationModel.setCur("CYN");
bfsPaymentOccupationModel.setAbs("");//摘要
bfsPaymentOccupationModel.setPayerAccName(entity.getPayer());
bfsPaymentOccupationModel.setPayeeAccNo(entity.getPayeeAccount());
bfsPaymentOccupationModel.setPayeeAccName(entity.getPayee());//收款方户名
bfsPaymentOccupationModel.setPayeeBank(entity.getBankName());//收款方开户行
bfsPaymentOccupationModel.setPayeeCode(entity.getInterbankNumber());
bfsPaymentOccupationModel.setPayeeProv(entity.getProvince());
bfsPaymentOccupationModel.setPayeeCity(entity.getCity());
bfsPaymentOccupationModel.setCorpName(entity.getUnitName());
if(StringUtil.isNotEmpty(entity.getUnitName())){
List<OrganizeEntity> o = organizeService.getListByFullName(entity.getUnitName());
if(o != null && o.size() > 0){
bfsPaymentOccupationModel.setCorpCode(o.get(0).getEnCode());
}
}
bfsPaymentOccupationModel.setPurpose(entity.getPurpose());
bfsPaymentOccupationModel.setWishPayDay(simpleDateFormat.format(entity.getExpectPaymentDate()));
bfsPaymentOccupationModel.setItemCode(entity.getPlanSubjectCode());
bfsPaymentOccupationModel.setItemName(entity.getPlanSubjectName());
bfsPaymentOccupationModel.setBudgetDetailId(entity.getFundingPlanDetailCode());
bfsPaymentOccupationModel.setUrgencyFlag("0");//加急标志
bfsPaymentOccupationModel.setVoucherType(entity.getTransactionType());//交易类型34：网银（外付网银）、50：票据（应收票据）
bfsPaymentOccupationModel.setIsforindividual("0");//对公对私字段
bfsPaymentOccupationModel.setRmk("");
bfsPaymentOccupationModel.setDataSource("");//数据来源
JSONObject code = HttpUtil.httpRequest("http://172.16.173.160:8081/t2/rest/JgPaymentOccupationRestful", "POST", JsonUtil.getObjectToString(bfsPaymentOccupationModel));
if (ObjectUtil.isNotEmpty(code)){
if (code.get("status").equals("1")) {
entity.setBfsFlag("2");
entity.setBfsMessage(code.get("message").toString());
PaymentApplicationEntity entity = paymentApplicationService.getById(id);
List<BFSPaymentApprovalModel> list2 = new ArrayList<>();
BFSPaymentApprovalModel bFSPaymentApprovalModel = new BFSPaymentApprovalModel();
bFSPaymentApprovalModel.setDataSource("CK");
bFSPaymentApprovalModel.setStatus("2");
bFSPaymentApprovalModel.setSerialNoErp(id);
list2.add(bFSPaymentApprovalModel);
//先款后货 先款后票
String result = HttpUtil.sendHttpPost("http://172.16.173.160:8081/t2/rest/JgYGPaymentApprovalResultRestful", JsonUtil.getObjectToString(list2));
if (ObjectUtil.isNotEmpty(result)){
String status = JSONArray.parseArray(result, Map.class).get(0).get("status").toString();
String message = JSONArray.parseArray(result, Map.class).get(0).get("message").toString();
//String serialNoErp = JSONArray.parseArray(code, Map.class).get(0).get("serialNoErp").toString();
if ("2".equals(status)) {
entity.setBfsFlag("4");
entity.setBfsMessage(message);
paymentApplicationService.updateById(entity);
}else{
entity.setBfsFlag("1");
entity.setBfsMessage(code.get("message").toString());
entity.setBfsFlag("3");
entity.setBfsMessage(message);
paymentApplicationService.updateById(entity);
}
}else{
entity.setBfsFlag("1");
entity.setBfsMessage("资金系统接口调用失败");
entity.setBfsFlag("3");
entity.setBfsMessage("资金系统审批接口调用失败");
paymentApplicationService.updateById(entity);
}
return ActionResult.success("上传BFS成功");

2
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/paymentapplication/PaymentApplicationForm.java
Unescape View File

@ -98,5 +98,7 @@ public class PaymentApplicationForm {
private BigDecimal processMoney;
private String fundingPlanDetailCode;
@JsonProperty("isSubmit")
private String isSubmit;
}

18
jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/BFSPaymentApprovalModel.java
Unescape View File

@ -0,0 +1,18 @@
package jnpf.model.yunguan;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
@Data
public class BFSPaymentApprovalModel {
/** 流水号 **/
@JSONField(name = "serialNoErp")
private String serialNoErp;
/** 状态(1.不通过2.通过) **/
@JSONField(name = "status")
private String status;
/** 来源 **/
@JSONField(name = "dataSource")
private String dataSource;
}

2
jnpf-java-boot/jnpf-web/src/utils/apiUrl.js
Unescape View File

@ -7,4 +7,6 @@ module.exports = {
// APIURl: 'http://221.214.32.166:40000'
// 演示环境接口配置
// APIURl: 'http://222.71.165.188:50000'
// 生产内网环境接口配置
//APIURl: 'http://127.0.0.1:30000'
}

4
jnpf-java-boot/jnpf-web/src/views/extend/paymentapplication/index.vue
Unescape View File

@ -159,9 +159,9 @@
<el-button size="mini" type="text" @click="downPayment(scope.row.id)">下载</el-button>
<!-- <el-button type="text" @click="closeCaseHandle(scope.row)" v-has="'btn_edit'">结束
</el-button> -->
<el-button type="text" v-if="scope.row.tableField113.length > 0 && scope.row.bfsFlag == 1" @click="uploadBFSHandle(scope.row.id)" v-has="'btn_edit'">上传BFS
<el-button type="text" v-if="scope.row.flowState==2 && scope.row.tableField113.length > 0 && scope.row.bfsFlag == 2" @click="uploadBFSHandle(scope.row.id)" v-has="'btn_edit'">上传BFS
</el-button>
<el-button type="text" @click="settlementHandle(scope.row)" v-has="'btn_edit'">关联结算单
<el-button type="text" @click="settlementHandle(scope.row)" v-has="'btn_edit'" v-if="scope.row.flowState==2 && scope.row.bfsFlag == 2">关联结算单
</el-button>
</template>
</el-table-column>

14
jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/Bill.vue
Unescape View File

@ -5,7 +5,7 @@
<h1 style="text-align: center">{{bill.title}}</h1>
<p style="font-weight: bold">业务部门:{{bill.name}}</p>
<table border="1" cellspacing="0" width="100%">
<tr style="line-height: 44px">
<tr >
<td colspan="1" rowspan="2">订单日期</td>
<td colspan="5" rowspan="2">{{bill.creatorTime}}</td>
<td colspan="3" rowspan="2">对方合同编号</td>
@ -15,14 +15,14 @@
</tr>
<tr style="">
</tr>
<tr style="line-height: 44px">
<tr >
<td colspan="1" rowspan="2">供货单位</td>
<td colspan="22" rowspan="2">{{bill.supplierName}}</td>
<td colspan="15" rowspan="2" style="text-align: left;">{{bill.supplierName}}</td>
</tr>
<tr style="">
</tr>
<tr style="line-height: 22px">
<tr >
<td colspan="3">订单号</td>
<td colspan="1" style="text-align: center">行号</td>
<td colspan="5">物料名称、规格型号</td>
@ -42,7 +42,7 @@
<td colspan="3">{{item.amount}}</td>
<td colspan="1">{{item.rate}}</td>
</tr>
<tr style="line-height: 22px">
<tr >
<td colspan="3">合计</td>
<td colspan="1"></td>
<td colspan="5"></td>
@ -153,7 +153,7 @@ table {
text-align: center;
border-collapse: collapse;
td {
padding: 10px 0;
padding: 5px 0;
border: 1px solid #333;
}
}
@ -229,7 +229,7 @@ table {
border-collapse: collapse;
margin-top: 5mm; /* 添加顶部外边距，替代原先的页内边距 */
td {
padding: 10px 0;
padding: 5px 0;
border: 1px solid #333;
}
}

1
jnpf-java-boot/jnpf-workflow/jnpf-workflow-engine/jnpf-workflow-engine-biz/src/main/java/jnpf/engine/service/impl/FlowTaskNewServiceImpl.java
Unescape View File

@ -379,6 +379,7 @@ public class FlowTaskNewServiceImpl implements FlowTaskNewService {
for (String idAll : childAllData.keySet()) {
String[] idList = idAll.split("_jnpf_");
Map<String, Object> formData = childAllData.get(idAll);
formData.put("isSubmit", 1);
serviceUtil.createOrUpdate(idList[1], idList[0], formData);
}
} finally {

6
jnpf-java-boot/jnpf-workflow/jnpf-workflow-engine/jnpf-workflow-engine-controller/pom.xml
Unescape View File

@ -17,6 +17,12 @@
<artifactId>jnpf-workflow-engine-biz</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.jnpf</groupId>
<artifactId>jnpf-scm-biz</artifactId>
<version>3.5.0-RELEASE</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>

39
jnpf-java-boot/jnpf-workflow/jnpf-workflow-engine/jnpf-workflow-engine-controller/src/main/java/jnpf/engine/controller/FlowBeforeController.java
Unescape View File

@ -1,5 +1,7 @@
package jnpf.engine.controller;
import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
@ -31,11 +33,15 @@ import jnpf.engine.util.FlowJsonUtil;
import jnpf.engine.util.FlowNature;
import jnpf.engine.util.FlowTaskUtil;
import jnpf.entity.BusinessOrderEntity;
import jnpf.entity.PaymentApplicationEntity;
import jnpf.exception.WorkFlowException;
import jnpf.model.yunguan.BFSPaymentApprovalModel;
import jnpf.permission.entity.UserEntity;
import jnpf.permission.entity.UserRelationEntity;
import jnpf.service.PaymentApplicationService;
import jnpf.util.*;
import jnpf.util.visiual.JnpfKeyConsts;
import jnpf.util.wxutil.HttpUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -77,7 +83,8 @@ public class FlowBeforeController {
private FlowTaskNodeService flowTaskNodeService;
@Autowired
private FlowTaskNewService flowTaskNewService;
@Autowired
private PaymentApplicationService paymentApplicationService;
/**
* 获取待我审核列表
*
@ -254,6 +261,36 @@ public class FlowBeforeController {
}
redisUtil.insert(rejecttKey, id, 10);
flowTaskNewService.rejectAll(flowTask, operator, flowModel);
if(flowModel.getFlowId().equals("569062075217740037")){
//采购付款申请退回
PaymentApplicationEntity paymentApplicationEntity = paymentApplicationService.getById(flowModel.getId());
List<BFSPaymentApprovalModel> list2 = new ArrayList<>();
BFSPaymentApprovalModel bFSPaymentApprovalModel = new BFSPaymentApprovalModel();
bFSPaymentApprovalModel.setDataSource("CK");
bFSPaymentApprovalModel.setStatus("1");
bFSPaymentApprovalModel.setSerialNoErp(paymentApplicationEntity.getId());
list2.add(bFSPaymentApprovalModel);
//先款后货 先款后票
String result = HttpUtil.sendHttpPost("http://172.16.173.160:8081/t2/rest/JgYGPaymentApprovalResultRestful", JsonUtil.getObjectToString(list2));
if (ObjectUtil.isNotEmpty(result)){
String status = JSONArray.parseArray(result, Map.class).get(0).get("status").toString();
String message = JSONArray.parseArray(result, Map.class).get(0).get("message").toString();
//String serialNoErp = JSONArray.parseArray(code, Map.class).get(0).get("serialNoErp").toString();
if ("2".equals(status)) {
paymentApplicationEntity.setBfsFlag("2");
paymentApplicationEntity.setBfsMessage(message);
paymentApplicationService.updateById(paymentApplicationEntity);
}else{
paymentApplicationEntity.setBfsFlag("1");
paymentApplicationEntity.setBfsMessage(message);
paymentApplicationService.updateById(paymentApplicationEntity);
}
}else{
paymentApplicationEntity.setBfsFlag("1");
paymentApplicationEntity.setBfsMessage("资金系统审批接口调用失败");
paymentApplicationService.updateById(paymentApplicationEntity);
}
}
return ActionResult.success("退回成功");
} else {
return ActionResult.fail("已审核完成");

Write Preview
Loading…
Cancel
Save