|
@@ -2087,13 +2087,7 @@ $(document).ready(function() {
|
|
|
|
|
|
//选择计价规则
|
|
|
$("#valuation").change(function () {
|
|
|
- curValuation = $(this).val();
|
|
|
- curValuationName = $(this).text();
|
|
|
- let engineeringList = getEngineeringList();
|
|
|
- let engineeringHtml = getEngineeringHtml(engineeringList);
|
|
|
- $("#tender-engineering").html(engineeringHtml);
|
|
|
- $('#valuation-info').hide();
|
|
|
- changeEngineering();
|
|
|
+ changeValuation($(this).val(),$(this).text())
|
|
|
});
|
|
|
|
|
|
//选择计税方式
|
|
@@ -2121,13 +2115,16 @@ $(document).ready(function() {
|
|
|
let nameList = getNameList($('#poj-name-list').children());
|
|
|
let isExist = hasListName(nameList, pojName);
|
|
|
if(!isExist){
|
|
|
- if(pojName !== ''){
|
|
|
- console.log(curValuation);
|
|
|
+ if(pojName !== ''){
|
|
|
+ if($("#valuation").val()) {
|
|
|
+ changeValuation($("#valuation").val(),$("#valuation").text()); //这时候计价规则可能变了
|
|
|
+ }
|
|
|
//新建建设项目,显示计价规则、文件类型、计税方法选项
|
|
|
$('#newProjectSet').show();
|
|
|
$('input[name="fileKind-tender"]:eq(0)').prop('checked', true);
|
|
|
$('input[name="taxType-tender"]:eq(0)').prop('checked', true);
|
|
|
curTaxType = 1;
|
|
|
+
|
|
|
getStdCalcProgramFiles();
|
|
|
replaceClass($('#poj-name-info'), 'text-danger', 'text-info');
|
|
|
setDangerInfo($('#poj-name-info'), `新建“${pojName}”`);
|
|
@@ -2787,6 +2784,16 @@ async function changeEngineering(){
|
|
|
initFeeStandardSel();
|
|
|
}
|
|
|
|
|
|
+function changeValuation(newValuation,newName) {
|
|
|
+ curValuation = newValuation;
|
|
|
+ curValuationName = newName;
|
|
|
+ let engineeringList = getEngineeringList();
|
|
|
+ let engineeringHtml = getEngineeringHtml(engineeringList);
|
|
|
+ $("#tender-engineering").html(engineeringHtml);
|
|
|
+ $('#valuation-info').hide();
|
|
|
+ changeEngineering();
|
|
|
+}
|
|
|
+
|
|
|
function changeFeeRate(engLib) {
|
|
|
if(engLib){
|
|
|
/*
|