refector: opl创建编辑时图片必填

pages/workSpace/opls/clear.vue

@@ -137,11 +137,12 @@
 			<view class="form-info">
 				<view class="form-item " style="height: fit-content;">
 					<view class="form-left">
+						<text class="star">*</text>
 						<text class="form-left-text">照片</text>
 					</view>
 					<view style="flex: 3;">
 						<u-upload :action="vuex_apifile" :header="header" ref="uUpload"
-							:file-list="fileList" max-count="9" @on-success="imgUpSuccess"></u-upload>
+							:file-list="fileList" max-count="9"></u-upload>
 					</view>
 				</view>
 			</view>
@@ -419,24 +420,29 @@
 			edit(row) {},
 			saveSubmit() {
 				// debugger;
-				uni.showLoading({
-				    title: '提交中'
-				});
 				let that = this;
 				let params = null;
 				that.formData.create_imgs = [];
-				that.fileList.forEach(item=>{
+				let files = [];
-					debugger;
+				// 通过filter，筛选出上传进度为100的文件(因为某些上传失败的文件，进度值不为100，这个是可选的操作)
-					if(item.id){
+				files = this.$refs.uUpload.lists.filter(val => {
-						console.log(item.id);
+					return val.progress == 100;
-						that.formData.create_imgs.push(item.id)
-					}else{
-						console.log(item.response.id)
-						that.formData.create_imgs.push(item.response.id)
-					}
-					// let imgId = item.response.id?item.response.id:item.id;
-					// that.formData.create_imgs.push(imgId)
 				})
+				
+				files.forEach(item=>{
+					if(item.response){
+						that.formData.create_imgs.push(item.response.id)
+					}else{
+						that.formData.create_imgs.push(item.id)
+					}
+				})
+				if(that.formData.create_imgs.length === 0){
+					uni.showToast({
+						title: '请上传作业准备照片',
+						icon: 'none'
+					})
+					return
+				}
 				if (that.oplId !== null) {
 					that.$u.api.oplUpdate(that.oplId, that.formData).then(res => {
 						 uni.hideLoading();

pages/workSpace/opls/cooler.vue

@@ -136,10 +136,13 @@
 			</view>
 			<view class="form-info">
 				<view class="form-item " style="height: fit-content;">
-					<view class="title">照片</view>
+					<view class="form-left">
+						<text class="star">*</text>
+						<text class="form-left-text">照片</text>
+					</view>
 					<view style="flex: 3;">
 						<u-upload :action="vuex_apifile" :header="header" ref="uUpload"
-							:file-list="fileList" max-count="9" @on-success="imgUpSuccess"></u-upload>
+							:file-list="fileList" max-count="9"></u-upload>
 					</view>
 				</view>
 			</view>
@@ -291,10 +294,7 @@
 					res.create_imgs_.forEach(item=>{
 						that.fileList.push({
 							url: that.vuex_host+item.path,
-							progress: 0,
 							id:item.id,
-							error: false,
-							file: item
 						})
 					})
 					this.getOplcates()
@@ -424,21 +424,29 @@
 			edit(row) {},
 			saveSubmit() {
 				debugger;
-				uni.showLoading({
-				    title: '提交中'
-				});
 				let that = this;
 				let params = null;
 				that.formData.create_imgs = [];
-				that.fileList.forEach(item=>{
+				let files = [];
-					if(item.id){
+				// 通过filter，筛选出上传进度为100的文件(因为某些上传失败的文件，进度值不为100，这个是可选的操作)
-						console.log(item.id);
+				files = this.$refs.uUpload.lists.filter(val => {
-						that.formData.create_imgs.push(item.id)
+					return val.progress == 100;
-					}else{
+				})
-						console.log(item.response.id)
+				
+				files.forEach(item=>{
+					if(item.response){
 						that.formData.create_imgs.push(item.response.id)
+					}else{
+						that.formData.create_imgs.push(item.id)
 					}
 				})
+				if(that.formData.create_imgs.length === 0){
+					uni.showToast({
+						title: '请上传作业准备照片',
+						icon: 'none'
+					})
+					return
+				}
 				if (that.oplId !== null) {
 					that.$u.api.oplUpdate(that.oplId, that.formData).then(res => {
 						 uni.hideLoading();

pages/workSpace/opls/fire.vue

@@ -147,10 +147,13 @@
 			</view>
 			<view class="form-info">
 				<view class="form-item " style="height: fit-content;">
-					<view class="title">照片</view>
+					<view class="form-left">
+						<text class="star">*</text>
+						<text class="form-left-text">照片</text>
+					</view>
 					<view style="flex: 3;">
 						<u-upload :action="vuex_apifile" :header="header" ref="uUpload"
-							:file-list="fileList" max-count="9" @on-success="imgUpSuccess"></u-upload>
+							:file-list="fileList" max-count="9"></u-upload>
 					</view>
 				</view>
 			</view>
@@ -303,10 +306,8 @@
 					res.create_imgs_.forEach(item=>{
 						that.fileList.push({
 							url: that.vuex_host+item.path,
-							progress: 0,
 							id:item.id,
 							error: false,
-							file: item
 						})
 					})
 					this.getOplcates()
@@ -435,21 +436,29 @@
 			},
 			edit(row) {},
 			saveSubmit() {
-				uni.showLoading({
-				    title: '提交中'
-				});
 				let that = this;
 				let params = null;
 				that.formData.create_imgs = [];
-				that.fileList.forEach(item=>{
+				let files = [];
-					if(item.id){
+				// 通过filter，筛选出上传进度为100的文件(因为某些上传失败的文件，进度值不为100，这个是可选的操作)
-						console.log(item.id);
+				files = this.$refs.uUpload.lists.filter(val => {
-						that.formData.create_imgs.push(item.id)
+					return val.progress == 100;
-					}else{
+				})
-						console.log(item.response.id)
+				
+				files.forEach(item=>{
+					if(item.response){
 						that.formData.create_imgs.push(item.response.id)
+					}else{
+						that.formData.create_imgs.push(item.id)
 					}
 				})
+				if(that.formData.create_imgs.length === 0){
+					uni.showToast({
+						title: '请上传作业准备照片',
+						icon: 'none'
+					})
+					return
+				}
 				if (that.oplId !== null) {
 					debugger;
 					that.$u.api.oplUpdate(that.oplId, that.formData).then(res => {

pages/workSpace/opls/high.vue

@@ -146,10 +146,13 @@
 			</view>
 			<view class="form-info">
 				<view class="form-item " style="height: fit-content;">
-					<view class="title">照片</view>
+					<view class="form-left">
+						<text class="star">*</text>
+						<text class="form-left-text">照片</text>
+					</view>
 					<view style="flex: 3;">
 						<u-upload :action="vuex_apifile" :header="header" ref="uUpload"
-							:file-list="fileList" max-count="9" @on-success="imgUpSuccess"></u-upload>
+							:file-list="fileList" max-count="9"></u-upload>
 					</view>
 				</view>
 			</view>
@@ -283,9 +286,6 @@
 					Authorization: "Bearer " + this.vuex_token
 				}
 			},
-			imgUpSuccess(data,index,lists){
-				this.fileList=lists;
-			},
 			//获取工作operation
 			getOperation() {
 				let that = this;
@@ -307,10 +307,7 @@
 					res.create_imgs_.forEach(item=>{
 						that.fileList.push({
 							url: that.vuex_host+item.path,
-							progress: 0,
 							id:item.id,
-							error: false,
-							file: item
 						})
 					})
 					this.getOplcates()
@@ -454,21 +451,29 @@
 			edit(row) {},
 			saveSubmit() {
 				//
-				uni.showLoading({
-				    title: '提交中'
-				});
 				let that = this;
 				let params = null;
 				that.formData.create_imgs = [];
-				that.fileList.forEach(item=>{
+				let files = [];
-					if(item.id){
+				// 通过filter，筛选出上传进度为100的文件(因为某些上传失败的文件，进度值不为100，这个是可选的操作)
-						console.log(item.id);
+				files = this.$refs.uUpload.lists.filter(val => {
-						that.formData.create_imgs.push(item.id)
+					return val.progress == 100;
-					}else{
+				})
-						console.log(item.response.id)
+				
+				files.forEach(item=>{
+					if(item.response){
 						that.formData.create_imgs.push(item.response.id)
+					}else{
+						that.formData.create_imgs.push(item.id)
 					}
 				})
+				if(that.formData.create_imgs.length === 0){
+					uni.showToast({
+						title: '请上传作业准备照片',
+						icon: 'none'
+					})
+					return
+				}
 				if (that.oplId !== null) {
 					console.log(1, that.oplCateCode)
 					that.$u.api.oplUpdate(that.oplId, that.formData).then(res => {

pages/workSpace/opls/hoisting.vue

@@ -145,10 +145,13 @@
 			</view>
 			<view class="form-info">
 				<view class="form-item " style="height: fit-content;">
-					<view class="title">照片</view>
+					<view class="form-left">
+						<text class="star">*</text>
+						<text class="form-left-text">照片</text>
+					</view>
 					<view style="flex: 3;">
 						<u-upload :action="vuex_apifile" :header="header" ref="uUpload"
-							:file-list="fileList" max-count="9" @on-success="imgUpSuccess"></u-upload>
+							:file-list="fileList" max-count="9"></u-upload>
 					</view>
 				</view>
 			</view>
@@ -301,10 +304,7 @@
 					res.create_imgs_.forEach(item=>{
 						that.fileList.push({
 							url: that.vuex_host+item.path,
-							progress: 0,
 							id:item.id,
-							error: false,
-							file: item
 						})
 					})
 					this.getOplcates()
@@ -434,21 +434,29 @@
 			edit(row) {},
 			saveSubmit() {
 				debugger;
-				uni.showLoading({
-				    title: '提交中'
-				});
 				let that = this;
 				let params = null;
 				that.formData.create_imgs = [];
-				that.fileList.forEach(item=>{
+				let files = [];
-					if(item.id){
+				// 通过filter，筛选出上传进度为100的文件(因为某些上传失败的文件，进度值不为100，这个是可选的操作)
-						console.log(item.id);
+				files = this.$refs.uUpload.lists.filter(val => {
-						that.formData.create_imgs.push(item.id)
+					return val.progress == 100;
-					}else{
+				})
-						console.log(item.response.id)
+				
+				files.forEach(item=>{
+					if(item.response){
 						that.formData.create_imgs.push(item.response.id)
+					}else{
+						that.formData.create_imgs.push(item.id)
 					}
 				})
+				if(that.formData.create_imgs.length === 0){
+					uni.showToast({
+						title: '请上传作业准备照片',
+						icon: 'none'
+					})
+					return
+				}
 				if (that.oplId !== null) {
 					that.$u.api.oplUpdate(that.oplId, that.formData).then(res => {
 						 uni.hideLoading();

pages/workSpace/opls/normal.vue

@@ -137,11 +137,12 @@
 			<view class="form-info">
 				<view class="form-item " style="height: fit-content;">
 					<view class="form-left">
+						<text class="star">*</text>
 						<text class="form-left-text">照片</text>
 					</view>
 					<view style="flex: 3;">
 						<u-upload :action="vuex_apifile" :header="header" ref="uUpload"
-							:file-list="fileList" max-count="9" @on-success="imgUpSuccess"></u-upload>
+							:file-list="fileList" max-count="9"></u-upload>
 					</view>
 				</view>
 			</view>
@@ -284,10 +285,7 @@
 					res.create_imgs_.forEach(item=>{
 						that.fileList.push({
 							url: that.vuex_host+item.path,
-							progress: 0,
+							id:item.id
-							id:item.id,
-							error: false,
-							file: item
 						})
 					})
 					this.getOplcates()
@@ -412,22 +410,29 @@
 			edit(row) {},
 			saveSubmit() {
 				// debugger;
-				uni.showLoading({
-				    title: '提交中'
-				});
 				let that = this;
 				let params = null;
 				that.formData.create_imgs = [];
-				that.fileList.forEach(item=>{
+				let files = [];
-					debugger;
+				// 通过filter，筛选出上传进度为100的文件(因为某些上传失败的文件，进度值不为100，这个是可选的操作)
-					if(item.id){
+				files = this.$refs.uUpload.lists.filter(val => {
-						console.log(item.id);
+					return val.progress == 100;
-						that.formData.create_imgs.push(item.id)
+				})
-					}else{
+				
-						console.log(item.response.id)
+				files.forEach(item=>{
+					if(item.response){
 						that.formData.create_imgs.push(item.response.id)
+					}else{
+						that.formData.create_imgs.push(item.id)
 					}
 				})
+				if(that.formData.create_imgs.length === 0){
+					uni.showToast({
+						title: '请上传作业准备照片',
+						icon: 'none'
+					})
+					return
+				}
 				if (that.oplId !== null) {
 					that.$u.api.oplUpdate(that.oplId, that.formData).then(res => {
 						 uni.hideLoading();

pages/workSpace/opls/preheat.vue

@@ -136,10 +136,13 @@
 			</view>
 			<view class="form-info">
 				<view class="form-item " style="height: fit-content;">
-					<view class="title">照片</view>
+					<view class="form-left">
+						<text class="star">*</text>
+						<text class="form-left-text">照片</text>
+					</view>
 					<view style="flex: 3;">
 						<u-upload :action="vuex_apifile" :header="header" ref="uUpload"
-							:file-list="fileList" max-count="9" @on-success="imgUpSuccess"></u-upload>
+							:file-list="fileList" max-count="9"></u-upload>
 					</view>
 				</view>
 			</view>
@@ -291,10 +294,7 @@
 					res.create_imgs_.forEach(item=>{
 						that.fileList.push({
 							url: that.vuex_host+item.path,
-							progress: 0,
+							id:item.id
-							id:item.id,
-							error: false,
-							file: item
 						})
 					})
 					this.getOplcates()
@@ -424,21 +424,29 @@
 			edit(row) {},
 			saveSubmit() {
 				debugger;
-				uni.showLoading({
-				    title: '提交中'
-				});
 				let that = this;
 				let params = null;
 				that.formData.create_imgs = [];
-				that.fileList.forEach(item=>{
+				let files = [];
-					if(item.id){
+				// 通过filter，筛选出上传进度为100的文件(因为某些上传失败的文件，进度值不为100，这个是可选的操作)
-						console.log(item.id);
+				files = this.$refs.uUpload.lists.filter(val => {
-						that.formData.create_imgs.push(item.id)
+					return val.progress == 100;
-					}else{
+				})
-						console.log(item.response.id)
+				
+				files.forEach(item=>{
+					if(item.response){
 						that.formData.create_imgs.push(item.response.id)
+					}else{
+						that.formData.create_imgs.push(item.id)
 					}
 				})
+				if(that.formData.create_imgs.length === 0){
+					uni.showToast({
+						title: '请上传作业准备照片',
+						icon: 'none'
+					})
+					return
+				}
 				if (that.oplId !== null) {
 					that.$u.api.oplUpdate(that.oplId, that.formData).then(res => {
 						 uni.hideLoading();

pages/workSpace/opls/soil.vue

@@ -146,10 +146,13 @@
 			</view>
 			<view class="form-info">
 				<view class="form-item " style="height: fit-content;">
-					<view class="title">照片</view>
+					<view class="form-left">
+						<text class="star">*</text>
+						<text class="form-left-text">照片</text>
+					</view>
 					<view style="flex: 3;">
 						<u-upload :action="vuex_apifile" :header="header" ref="uUpload"
-							:file-list="fileList" max-count="9" @on-success="imgUpSuccess"></u-upload>
+							:file-list="fileList" max-count="9"></u-upload>
 					</view>
 				</view>
 			</view>
@@ -300,10 +303,7 @@
 					res.create_imgs_.forEach(item=>{
 						that.fileList.push({
 							url: that.vuex_host+item.path,
-							progress: 0,
+							id:item.id
-							id:item.id,
-							error: false,
-							file: item
 						})
 					})
 					this.getOplcates()
@@ -447,21 +447,29 @@
 			edit(row) {},
 			saveSubmit() {
 				debugger;
-				uni.showLoading({
-				    title: '提交中'
-				});
 				let that = this;
 				let params = null;
 				that.formData.create_imgs = [];
-				that.fileList.forEach(item=>{
+				let files = [];
-					if(item.id){
+				// 通过filter，筛选出上传进度为100的文件(因为某些上传失败的文件，进度值不为100，这个是可选的操作)
-						console.log(item.id);
+				files = this.$refs.uUpload.lists.filter(val => {
-						that.formData.create_imgs.push(item.id)
+					return val.progress == 100;
-					}else{
+				})
-						console.log(item.response.id)
+				
+				files.forEach(item=>{
+					if(item.response){
 						that.formData.create_imgs.push(item.response.id)
+					}else{
+						that.formData.create_imgs.push(item.id)
 					}
 				})
+				if(that.formData.create_imgs.length === 0){
+					uni.showToast({
+						title: '请上传作业准备照片',
+						icon: 'none'
+					})
+					return
+				}
 				if (that.oplId !== null) {
 					that.$u.api.oplUpdate(that.oplId, that.formData).then(res => {
 						 uni.hideLoading();

pages/workSpace/opls/space.vue

@@ -145,10 +145,13 @@
 			</view>
 			<view class="form-info">
 				<view class="form-item " style="height: fit-content;">
-					<view class="title">照片</view>
+					<view class="form-left">
+						<text class="star">*</text>
+						<text class="form-left-text">照片</text>
+					</view>
 					<view style="flex: 3;">
 						<u-upload :action="vuex_apifile" :header="header" ref="uUpload"
-							:file-list="fileList" max-count="9" @on-success="imgUpSuccess"></u-upload>
+							:file-list="fileList" max-count="9"></u-upload>
 					</view>
 				</view>
 			</view>
@@ -302,10 +305,7 @@
 					res.create_imgs_.forEach(item=>{
 						that.fileList.push({
 							url: that.vuex_host+item.path,
-							progress: 0,
+							id:item.id
-							id:item.id,
-							error: false,
-							file: item
 						})
 					})
 					this.getOplcates()
@@ -449,23 +449,31 @@
 			edit(row) {},
 			saveSubmit() {
 				debugger;
-				uni.showLoading({
-				    title: '提交中'
-				});
 				let that = this;
 				let params = null;
-				that.formData.start_time = that.formData.start_time+':00';
+				// that.formData.start_time = that.formData.start_time+':00';
-				that.formData.end_time = that.formData.end_time+':00';
+				// that.formData.end_time = that.formData.end_time+':00';
 				that.formData.create_imgs = [];
-				that.fileList.forEach(item=>{
+				let files = [];
-					if(item.id){
+				// 通过filter，筛选出上传进度为100的文件(因为某些上传失败的文件，进度值不为100，这个是可选的操作)
-						console.log(item.id);
+				files = this.$refs.uUpload.lists.filter(val => {
-						that.formData.create_imgs.push(item.id)
+					return val.progress == 100;
-					}else{
+				})
-						console.log(item.response.id)
+				
+				files.forEach(item=>{
+					if(item.response){
 						that.formData.create_imgs.push(item.response.id)
+					}else{
+						that.formData.create_imgs.push(item.id)
 					}
 				})
+				if(that.formData.create_imgs.length === 0){
+					uni.showToast({
+						title: '请上传作业准备照片',
+						icon: 'none'
+					})
+					return
+				}
 				if (that.oplId !== null) {
 					that.$u.api.oplUpdate(that.oplId, that.formData).then(res => {
 						 uni.hideLoading();

pages/workSpace/opls/usecl.vue

@@ -238,10 +238,13 @@
 			</view>
 			<view class="form-info">
 				<view class="form-item " style="height: fit-content;">
-					<view class="title">照片</view>
+					<view class="form-left">
+						<text class="star">*</text>
+						<text class="form-left-text">照片</text>
+					</view>
 					<view style="flex: 3;">
 						<u-upload :action="vuex_apifile" :header="header" ref="uUpload"
-							:file-list="fileList" max-count="9" @on-success="imgUpSuccess"></u-upload>
+							:file-list="fileList" max-count="9"></u-upload>
 					</view>
 				</view>
 			</view>
@@ -412,10 +415,7 @@
 					res.create_imgs_.forEach(item=>{
 						that.fileList.push({
 							url: that.vuex_host+item.path,
-							progress: 0,
+							id:item.id
-							id:item.id,
-							error: false,
-							file: item
 						})
 					})
 					this.getOplcates()
@@ -559,9 +559,6 @@
 			edit(row) {},
 			saveSubmit() {
 				debugger;
-				uni.showLoading({
-				    title: '提交中'
-				});
 				let that = this;
 				let params = null;
 				// that.formData.start_time = that.formData.start_time;
@@ -570,15 +567,26 @@
 				// that.formData.power_end_time = that.formData.power_end_time;
 				// that.formData.work_time = that.formData.work_time;
 				that.formData.create_imgs = [];
-				that.fileList.forEach(item=>{
+				let files = [];
-					if(item.id){
+				// 通过filter，筛选出上传进度为100的文件(因为某些上传失败的文件，进度值不为100，这个是可选的操作)
-						console.log(item.id);
+				files = this.$refs.uUpload.lists.filter(val => {
-						that.formData.create_imgs.push(item.id)
+					return val.progress == 100;
-					}else{
+				})
-						console.log(item.response.id)
+				
+				files.forEach(item=>{
+					if(item.response){
 						that.formData.create_imgs.push(item.response.id)
+					}else{
+						that.formData.create_imgs.push(item.id)
 					}
 				})
+				if(that.formData.create_imgs.length === 0){
+					uni.showToast({
+						title: '请上传作业准备照片',
+						icon: 'none'
+					})
+					return
+				}
 				if (that.oplId !== null) {
 					that.$u.api.oplUpdate(that.oplId, that.formData).then(res => {
 						 uni.hideLoading();