Compare commits

..

4 Commits

Author SHA1 Message Date
9a6aa75171 merge test 2024-03-04 14:09:07 +08:00
41b79ba82c Merge pull request 'projects/mesxc-lb' (#230) from projects/mesxc-lb into projects/mesxc-test
Reviewed-on: #230
2024-03-04 14:07:08 +08:00
Melete
0a1175075d Merge branch 'projects/mesxc-test' into projects/mesxc-lb 2024-03-04 14:04:37 +08:00
Melete
50cfcc3af2 update 2024-03-04 14:01:53 +08:00
3 changed files with 3 additions and 3 deletions

View File

@ -45,7 +45,7 @@
@close="cancel" @close="cancel"
@cancel="cancel" @cancel="cancel"
@confirm="handleConfirm"> @confirm="handleConfirm">
<add ref="add" @refreshDataList="successSubmit" /> <add ref="add" v-if="open" @refreshDataList="successSubmit" />
</base-dialog> </base-dialog>
<!-- 添加巡检查看详情 --> <!-- 添加巡检查看详情 -->
<addOrUpdata <addOrUpdata

View File

@ -262,7 +262,7 @@ export default {
// checkPersonParam = `&checkPerson=${this.$store.getters.nickname}`; // checkPersonParam = `&checkPerson=${this.$store.getters.nickname}`;
//} //}
const res = this.$axios({ const res = await this.$axios({
url: `/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}`, url: `/base/equipment-check-order/confirm?confirmPerson=${this.$store.getters.nickname}`,
// +checkPersonParam, // +checkPersonParam,
// '/base/equipment-check-order/confirm?ids=' + JSON.stringify([id]).replaceAll("\"", ''), // '/base/equipment-check-order/confirm?ids=' + JSON.stringify([id]).replaceAll("\"", ''),

View File

@ -235,7 +235,7 @@ export default {
...this.dataForm, ...this.dataForm,
special: true, special: true,
status: 0, status: 0,
groupClass: this.dataForm.groupClass.join(','), groupClass: this.dataForm.groupClass?.join(','),
}, },
}); });
if (res.code == 0) { if (res.code == 0) {