admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-yjl' into 'shenzhen-dev'

Browse Source 
项目版bug修复（图片上传、标养室层级错乱）

See merge request !47
This commit is contained in:
yjlHub 2022-11-03 14:59:40 +08:00
commit fa1a3604f4
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/views/projectFront/markingRoom/sampleManage.vue
View File

@ -365,8 +365,15 @@ export default {
return; return;
} }
this.workerInfo.locationId = this.selectLocationArr[ this.workerInfo.locationId = this.selectLocationArr[
this.selectLocationArr.length - 1 0
]; ];
if(this.selectLocationArr.length>1){
this.workerInfo.secondLocationId = this.selectLocationArr[1];
}else{
this.workerInfo.secondLocationId = "";
this.workerInfo.secondLocationName =""
}
console.log("编辑选中的位置 ：", this.selectLocationArr);
this.$refs.addEditForm.validate((valid) => { this.$refs.addEditForm.validate((valid) => {
if (valid) { if (valid) {
this.workerInfo.parentId = this.workerInfo.parentId this.workerInfo.parentId = this.workerInfo.parentId

11
src/views/projectFront/quality/recordsModule/inspectionRecord.vue
View File

@ -1173,6 +1173,7 @@
showPositioning = false; showPositioning = false;
pointList = []; pointList = [];
createdCoord = false; createdCoord = false;
" "
icon="el-icon-circle-close" icon="el-icon-circle-close"
size="medium" size="medium"
@ -2005,6 +2006,8 @@ export default {
cancleEvent(){ cancleEvent(){
this.mapUrl = '' this.mapUrl = ''
this.addDialog = false this.addDialog = false
this.$refs.addForm1.resetFields()//清除所有验证
this.$refs.addForm2.resetFields()//清除所有验证
}, },
//提交 新增 //提交 新增
@ -2080,8 +2083,10 @@ export default {
addRecordApi(data).then((res) => { addRecordApi(data).then((res) => {
if (res.code == 200) { if (res.code == 200) {
this.$message.success(this.$t("message.quality.newSuccess")); this.$message.success(this.$t("message.quality.newSuccess"));
this.$refs["addForm1"].resetFields(); this.$refs.addForm1.resetFields()//清除所有验证
this.$refs["addForm2"].resetFields(); this.$refs.addForm2.resetFields()//清除所有验证
// this.$refs["addForm1"].resetFields();
// this.$refs["addForm2"].resetFields();
this.addDialog = false; this.addDialog = false;
this.fileList1 = []; this.fileList1 = [];
this.fileList2 = []; this.fileList2 = [];
@ -2115,6 +2120,8 @@ export default {
this.fileList2 = [] this.fileList2 = []
this.fileList3 = [] this.fileList3 = []
this.fileList4 = [] this.fileList4 = []
this.$refs.addForm1.resetFields()//清除所有验证
this.$refs.addForm2.resetFields()//清除所有验证
this.hideUpload = false this.hideUpload = false
}, },
submit() {}, submit() {},