|
@@ -172,8 +172,8 @@
|
|
|
</el-descriptions>
|
|
|
<div class="buttonStyle">
|
|
|
<el-form-item>
|
|
|
- <el-checkbox ref="chkModifyReadNum" style="margin-right:20px" size="medium"
|
|
|
- @change="modifyReadNum">修改底数</el-checkbox>
|
|
|
+ <el-checkbox v-model="labelData.isModifyScds" style="margin-right:20px" size="medium"
|
|
|
+ @change="modifyReadNum" :checked="labelData.isModifyScds">修改底数</el-checkbox>
|
|
|
<el-button ref="btnSave" type="primary" icon="el-icon-edit" size="medium"
|
|
|
:disabled="labelData.isDisabledSaveBtn" @click="submitForm()">保存信息</el-button>
|
|
|
</el-form-item>
|
|
@@ -182,7 +182,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
-</template>
|
|
|
+</template>
|
|
|
<script>
|
|
|
import '@/views/mis/common/assets/styles/misStyle.scss';
|
|
|
import { MeterReading } from '@/views/mis/common/api/meterReadingApi.js';
|
|
@@ -466,30 +466,7 @@ export default {
|
|
|
cancelButtonText: '取消',
|
|
|
type: 'warning'
|
|
|
}).then(() => {
|
|
|
- let selRow = this.listInfoSelection;
|
|
|
- let rowIndex = selRow.rowIndex;
|
|
|
- selRow = this.listData[rowIndex];
|
|
|
- selRow.lastReading = data.scds;
|
|
|
- selRow.oldMeterEreading = data.jbzd;
|
|
|
- selRow.newMeterBreading = data.xbqd;
|
|
|
- selRow.thisReading = data.bcds;
|
|
|
- selRow.jjl = data.jjl;
|
|
|
- selRow.quantity = data.sjsl;
|
|
|
- selRow.meterRange = v_sblc;
|
|
|
- selRow.mrMode = this.detailForm.mrMode;
|
|
|
- selRow.mrModeName = this.$refs.cbfs.getSelectedText();
|
|
|
- selRow.mrType = this.detailForm.mrType;
|
|
|
- selRow.mrTypeName = this.$refs.cblx.getSelectedText();
|
|
|
- selRow.mrFlag = "1";
|
|
|
|
|
|
- if (selRow) {
|
|
|
- if (this.pageInfo.size != rowIndex + 1) {
|
|
|
- let nextRow = this.listData[rowIndex + 1];
|
|
|
- this.$refs.tblList.setCurrentRow(nextRow);
|
|
|
- this.onRowClick(nextRow);
|
|
|
- }
|
|
|
- this.$refs.bcds.select();
|
|
|
- }
|
|
|
this.labelData.isDisabledSaveBtn = true;
|
|
|
|
|
|
//构造数据参数
|
|
@@ -500,17 +477,42 @@ export default {
|
|
|
data.czrybm = this.$store.state.user.username;
|
|
|
data.czryxm = this.$store.state.user.realName;
|
|
|
data.sblc = v_sblc;
|
|
|
- data.xgds = this.$refs.chkModifyReadNum.checked;
|
|
|
+ data.xgds = this.labelData.isModifyScds;
|
|
|
|
|
|
let params = Object.assign({}, data);
|
|
|
- MeterReading.saveInfo(params).then((res) => {
|
|
|
+ MeterReading.saveInfo({ data: params }).then((res) => {
|
|
|
if (res.code == 1) {
|
|
|
- this.labelData.isDisabledSaveBtn = false;
|
|
|
this.$message.success(res.message);
|
|
|
- this.onSearch();
|
|
|
+
|
|
|
+ let selRow = this.listInfoSelection;
|
|
|
+ let rowIndex = selRow.rowIndex;
|
|
|
+ selRow = this.listData[rowIndex];
|
|
|
+ selRow.lastReading = data.scds;
|
|
|
+ selRow.oldMeterEreading = data.jbzd;
|
|
|
+ selRow.newMeterBreading = data.xbqd;
|
|
|
+ selRow.thisReading = data.bcds;
|
|
|
+ selRow.jjl = data.jjl;
|
|
|
+ selRow.quantity = data.sjsl;
|
|
|
+ selRow.meterRange = v_sblc;
|
|
|
+ selRow.mrMode = this.detailForm.mrMode;
|
|
|
+ selRow.mrModeName = this.$refs.cbfs.getSelectedText();
|
|
|
+ selRow.mrType = this.detailForm.mrType;
|
|
|
+ selRow.mrTypeName = this.$refs.cblx.getSelectedText();
|
|
|
+ selRow.mrFlag = "1";
|
|
|
+
|
|
|
+ if (selRow) {
|
|
|
+ if (this.pageInfo.size != rowIndex + 1) {
|
|
|
+ let nextRow = this.listData[rowIndex + 1];
|
|
|
+ this.$refs.tblList.setCurrentRow(nextRow);
|
|
|
+ this.onRowClick(nextRow);
|
|
|
+ }
|
|
|
+ this.$refs.bcds.select();
|
|
|
+ }
|
|
|
+
|
|
|
} else {
|
|
|
this.$message.error(res.message);
|
|
|
}
|
|
|
+ this.labelData.isDisabledSaveBtn = false;
|
|
|
});
|
|
|
|
|
|
}).catch(() => {
|
|
@@ -548,7 +550,7 @@ export default {
|
|
|
}
|
|
|
else if (v_cblx == "-2") { //表满度
|
|
|
var v_sblc = this.detailForm.meterRange;
|
|
|
- var sbmdValue = Math.pow(10, v_sblc);
|
|
|
+ var sbmdValue = Math.pow(10, v_sblc) - 1;
|
|
|
sjsl = Math.abs(sbmdValue - scds + bcds) + jjl;
|
|
|
}
|
|
|
else if (v_cblx == "-3") { //洗换表
|
|
@@ -593,7 +595,7 @@ export default {
|
|
|
* @param {object} row 行对象
|
|
|
*/
|
|
|
setFormInfo(row) {
|
|
|
- var isChk = this.$refs.chkModifyReadNum.checked;
|
|
|
+ var isChk = this.labelData.isModifyScds;
|
|
|
if (isChk) {
|
|
|
this.modifyReadNum(false);
|
|
|
}
|