mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/ZhangYunTianXia/fourcal

master
OathK1per 2022-08-17 09:35:30 +08:00
parent 3207c36b98 1d459464b9
commit 462ed1f62d
4 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/resources/static/assets/js/project_budget_income.js
View File

@ -123,6 +123,7 @@ function updateIncomeData(data,returnData) {
$("input[name='incomeTotalTaxInclude']").val(f2Fixed(deviceTaxInclude+engineerTaxInclude+serviceTaxInclude));
$("input[name='incomeTotalTaxExclude']").val(f2Fixed(deviceTaxExclude+engineerTaxExclude+serviceTaxExclude));
$("input[name='incomeTotalTax']").val(f2Fixed(deviceTax+engineerTax+serviceTax));
$("input[name='costCompanyManageTaxExclude']").val(f2Fixed(0.028*(deviceTaxInclude+engineerTaxInclude+serviceTaxInclude)));
$(".input-total-title-sale-income-budget-plan").val($("input[name='incomeTotalTaxInclude']").val());

4
src/main/resources/templates/admin/project_approve.ftl
View File

@ -2664,10 +2664,6 @@
<button type="submit" class="am-btn am-btn-primary am-btn-xs" id="saveFinal">审核</button>
</#if>
<#--预算状态 待审核状态 -->
<#if project.status==5 && project.approveStatusBudget==1 && currentTaskName != "执行董事" >
<button type="submit" class="am-btn am-btn-primary am-btn-xs" id="huiQian">会签</button>
</#if>
</div>
</form>

2
src/main/resources/templates/admin/project_estimate_edit.ftl
View File

@ -376,7 +376,7 @@
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right">计收计划</div>
<div class="am-u-sm-6 am-u-md-6">
<textarea rows="3" cols="20" id="CalculationCollection" name="CalculationCollection" maxlength="1000"
<textarea rows="3" cols="20" id="calculationCollection" name="calculationCollection" maxlength="1000"
class="am-input" data-validate-async data-validation-message="按照开票金额及时间罗列计收计划"
placeholder="按照开票金额及时间罗列计收计划"
>${project.calculationCollection!}</textarea>

13
src/main/resources/templates/admin/project_list.ftl
View File

@ -562,26 +562,27 @@
<input type="hidden" id="hqProjectId" name="hqProjectId" value=''/>
<div class="am-g am-form-group am-margin-top" style="display: flex;">
<div class="am-u-sm-4 am-u-md-4 am-text-right">
<div class="am-u-sm-3 am-u-md-3 am-text-right">
<span style="color: red;">*</span>请输入会签意见</div>
<div class="am-u-sm-6 am-u-md-6">
<textarea id="doc-vld-ta-2" minlength="10" maxlength="100"></textarea>
<textarea id="doc-vld-ta-2" minlength="1" rows="3" cols="40" maxlength="300" class="am-input"></textarea>
</div>
<div class="am-u-sm-2 am-u-md-2 input-msg"></div>
<div class="am-u-sm-3 am-u-md-3 input-msg"></div>
</div>
<div>
<div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-4 am-text-right"><span style="color: red;">*</span>请上传会签单</div>
<div class="am-u-sm-3 am-u-md-3 am-text-right"><span style="color: red;">*</span>请上传会签单</div>
<div class="am-u-sm-6 am-u-md-6">
<input type="text" id="icon" name="icon" maxlength="500"
value="" required
placeholder="格式：gif|jpg|jpeg|png|pdf"/>
style="width: 300px;"
placeholder="格式：gif、jpg、jpeg、png、pdf"/>
</div>
<div class="am-form-file am-text-xs">
<button type="button" class="am-btn am-btn-primary am-btn-sm">
<button type="button" class="am-btn am-btn-primary am-btn-sm" style="margin-left: 20px">
<i class="am-icon-cloud-upload"></i> 上传
</button>
<input id="fileupload_button_icon" type="file" name="files[]" multiple>