0b658a12 by xukangle

Merge branch 'dev_20241202_xukangle' into develop

2 parents 1cf03985 52a24a57
...@@ -1383,7 +1383,7 @@ watch(showLevel4, (newVal, oldVal) => { ...@@ -1383,7 +1383,7 @@ watch(showLevel4, (newVal, oldVal) => {
1383 @btnClick="btnClick" @selectChange="selectChange" /> 1383 @btnClick="btnClick" @selectChange="selectChange" />
1384 <div class="tool_btn" v-if="step == 2"> 1384 <div class="tool_btn" v-if="step == 2">
1385 <el-button type="primary" @click="exportClick">下载文件</el-button> 1385 <el-button type="primary" @click="exportClick">下载文件</el-button>
1386 <el-button type="primary" plain @click="senMessage">入表咨询</el-button> 1386 <!-- <el-button type="primary" plain @click="senMessage">入表咨询</el-button> -->
1387 </div> 1387 </div>
1388 </div> 1388 </div>
1389 <div class="grid-box-wrap" v-show="step == 0"> 1389 <div class="grid-box-wrap" v-show="step == 0">
...@@ -1505,8 +1505,8 @@ watch(showLevel4, (newVal, oldVal) => { ...@@ -1505,8 +1505,8 @@ watch(showLevel4, (newVal, oldVal) => {
1505 <template #default="scope"> 1505 <template #default="scope">
1506 <div class="input_cell" v-if="item.type == 'input'"> 1506 <div class="input_cell" v-if="item.type == 'input'">
1507 <el-input v-model.trim="scope.row[item.field]" placeholder="请输入" :maxlength="item.maxlength ?? ''" 1507 <el-input v-model.trim="scope.row[item.field]" placeholder="请输入" :maxlength="item.maxlength ?? ''"
1508 @change="(val) => inputChange(val, scope, item.field)" @input="(val) => inputEventChange(val, scope, item.field)" 1508 @change="(val) => inputChange(val, scope, item.field)"
1509 clearable></el-input> 1509 @input="(val) => inputEventChange(val, scope, item.field)" clearable></el-input>
1510 <span>{{ scope.row[item.field] ? changeNum(scope.row[item.field], 2, true) : 1510 <span>{{ scope.row[item.field] ? changeNum(scope.row[item.field], 2, true) :
1511 Number(scope.row[item.field]) == 0 ? '0.00' : '' }}</span> 1511 Number(scope.row[item.field]) == 0 ? '0.00' : '' }}</span>
1512 </div> 1512 </div>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!