diff --git a/src/pages/equipment/Spotcheck/details.vue b/src/pages/equipment/Spotcheck/details.vue index 23d5474..9fa7af7 100644 --- a/src/pages/equipment/Spotcheck/details.vue +++ b/src/pages/equipment/Spotcheck/details.vue @@ -52,6 +52,10 @@ 单位:mm +
+ 拍摄照片*: + +
@@ -67,7 +71,7 @@ - +
检查标准:{{ form.item5 }}
@@ -99,9 +103,11 @@ import model from '../Spotcheck/model'; import chooseOne from '@/components/choose-one/choose-one.vue'; import jPicker from '@/components/J-Picker/jPicker.vue'; import { session } from '@/store/modules/session'; +import LjChooseImg from "@/components/lanju/lj-choose-img/index.vue"; //import store from '@/store'; @Component({ components: { + LjChooseImg, chooseOne, jPicker, }, @@ -124,6 +130,7 @@ export default class ChangePalletNew extends BasePage { detailsinfocontent: any = {}; // 模态框 isshow = false; + isshow2 = false; inputmodal = false; isvalue = false; ischecked = false; @@ -373,17 +380,26 @@ export default class ChangePalletNew extends BasePage { }); return; } - this.detailsinfolist.detailList.forEach((item) => { + for (const item of this.detailsinfolist.detailList){ if (item.standardList.length > 0) { - item.standardList.forEach((item1) => { + for (const item1 of item.standardList){ if (item1.standardType === 'quantify') { if (item1.actualValue == null || item1.actualValue == '') { this.isvalue = true; } } - }); + //standardName + if (!item1.imgList || item1.imgList.size <= 0){ + uni.showToast({ + title:item1.standardName+"未拍照!", + icon:"none" + }) + return + } + item1.picturePath = item1.imgList.join(','); + } } - }); + } console.log('choubug222', this.isvalue); if (this.isvalue) { (this.$refs.uToast as any).show({ @@ -473,7 +489,6 @@ export default class ChangePalletNew extends BasePage { .list { margin-top: 15px; - width: 367px; border-radius: 5px; border: rgba(121, 121, 121, 1) solid 1px; background-color: #ffffff; @@ -512,7 +527,6 @@ export default class ChangePalletNew extends BasePage { } .item { margin-top: 15px; - width: 344px; border-radius: 5px; border: rgba(121, 121, 121, 1) solid 1px; background-color: #ffffff; diff --git a/src/pages/equipment/Upkeep/repairing.vue b/src/pages/equipment/Upkeep/repairing.vue index 6d1cfa0..8c25561 100644 --- a/src/pages/equipment/Upkeep/repairing.vue +++ b/src/pages/equipment/Upkeep/repairing.vue @@ -64,6 +64,10 @@ 单位:mm
+
+ 拍摄照片*: + +
@@ -172,7 +176,7 @@ --> - +
检查标准:{{ form.item5 }}
@@ -204,9 +208,11 @@ import model from './model'; import chooseOne from '@/components/choose-one/choose-one.vue'; import jPicker from '@/components/J-Picker/jPicker.vue'; import { session } from '@/store/modules/session'; +import LjChooseImg from "@/components/lanju/lj-choose-img/index.vue"; //import store from '@/store'; @Component({ components: { + LjChooseImg, chooseOne, jPicker, }, @@ -229,6 +235,7 @@ export default class ChangePalletNew extends BasePage { detailsinfocontent: any = {}; // 模态框 isshow = false; + isshow2 = false; inputmodal = false; ischecked = false; radiomodal = false; @@ -588,18 +595,25 @@ export default class ChangePalletNew extends BasePage { }); } async onSubmit() { - this.detailsinfolist.detailList.forEach((item) => { + for (const item of this.detailsinfolist.detailList){ if (item.standardList.length > 0) { - item.standardList.forEach((item1) => { + for(const item1 of item.standardList){ if (item1.standardType == 'quantify') { if (item1.actualValue == null || item1.actualValue == '') { // console.log(this.isvalue); this.isvalue = true; } } - }); + if (!item1.imgList || item1.imgList.size <= 0){ + uni.showToast({ + title:item1.standardName+"未拍照!", + icon:"none" + }) + return + } + } } - }); + } // if (this.orderNo == '' || this.orderNo.length == 0) { // this.customToast('请输入nficl'); // return; @@ -705,7 +719,6 @@ export default class ChangePalletNew extends BasePage { .list { margin-top: 15px; - width: 367px; border-radius: 5px; border: rgba(121, 121, 121, 1) solid 1px; background-color: #ffffff; @@ -836,7 +849,6 @@ export default class ChangePalletNew extends BasePage { } .item { margin-top: 15px; - width: 344px; border-radius: 5px; border: rgba(121, 121, 121, 1) solid 1px; background-color: #ffffff;