From 015b4f31cebbecf6f6da760ed2f8af3da721e802 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 18 四月 2025 16:17:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/reporting_she/reporting_she.vue | 78 +++++++++++++++++++++++----------------
1 files changed, 46 insertions(+), 32 deletions(-)
diff --git a/h5/pages/reporting_she/reporting_she.vue b/h5/pages/reporting_she/reporting_she.vue
index a842b81..09798b9 100644
--- a/h5/pages/reporting_she/reporting_she.vue
+++ b/h5/pages/reporting_she/reporting_she.vue
@@ -48,18 +48,18 @@
<u--input v-model="model.remark" border="none" placeholder="濡傞�夋嫨鍏跺畠鍖哄煙璇峰姟蹇呭～鍐欏叿浣撲綅缃�"></u--input>
</u-form-item>
<u-form-item label="鏄惁澶栭儴灏卞尰" labelWidth="120" prop="outJiuyi" borderBottom required>
- <u-radio-group v-model="model.outJiuyi" placement="row">
+ <u-radio-group v-model="model.outJiuyi" placement="row" @change="model.isYiwushi = ''; model.isHurted = ''">
<u-radio label="鍚�" name="0"></u-radio>
<u-radio label="鏄�" name="1"></u-radio>
</u-radio-group>
</u-form-item>
- <u-form-item label="鏄惁鍖诲姟瀹�" labelWidth="120" prop="isYiwushi" borderBottom required>
- <u-radio-group v-model="model.isYiwushi" placement="row">
+ <u-form-item label="鏄惁鍖诲姟瀹�" labelWidth="120" prop="isYiwushi" borderBottom required v-if="model.outJiuyi === '0'">
+ <u-radio-group v-model="model.isYiwushi" placement="row" @change="model.isHurted = ''">
<u-radio label="鍚�" name="0"></u-radio>
<u-radio label="鏄�" name="1"></u-radio>
</u-radio-group>
</u-form-item>
- <u-form-item label="鏄惁鍙椾激" labelWidth="120" prop="isHurted" borderBottom required>
+ <u-form-item label="鏄惁鍙椾激" labelWidth="120" prop="isHurted" borderBottom required v-if="model.isYiwushi === '0'">
<u-radio-group v-model="model.isHurted" placement="row">
<u-radio label="鍚�" name="0"></u-radio>
<u-radio label="鏄�" name="1"></u-radio>
@@ -85,6 +85,7 @@
@afterRead="afterRead"
@delete="deletePic"
accept="image"
+ multiple
name="1"
style="margin-top: 15rpx;"></u-upload>
</u-form-item>
@@ -317,6 +318,27 @@
}
},
next() {
+ this.model.name = ''
+ this.model.submitDate = uni.$u.timeFormat(new Date().getTime(), 'yyyy-mm-dd hh:MM')
+ this.model.companyName = ''
+ this.model.happenTime = ''
+ this.model.memberType = ''
+ this.model.memberTypeName = ''
+ this.model.memberNames = ''
+ this.model.memberQwids = ''
+ this.model.localtionId = ''
+ this.model.localtionName = ''
+ this.model.remark = ''
+ this.model.outJiuyi = ''
+ this.model.isYiwushi = ''
+ this.model.isHurted = ''
+ this.model.typeId = ''
+ this.model.typeName = ''
+ this.model.workRelated = ''
+ this.model.eventInfo = ''
+ this.model.multifileList = []
+ this.model.fileList = []
+ this.model.type = 0
this.canScroll()
this.show4 = false
},
@@ -337,45 +359,37 @@
},
// 鏂板鍥剧墖
async afterRead(event) {
- // event.file.forEach(async (item) => {
- // const filePath = item.url
- // uni.uploadFile({
- // url: this.$baseUrl + '/web/public/upload',
- // filePath,
- // name: "file",
- // formData: {
- // folder: "WORKORDER_FILE_PATH"
- // },
- // success: (res) => {
- // let obj = JSON.parse(res.data)
- // if (obj.code === 200) {
- // obj.data.fileurl = obj.data.imgaddr
- // this.model.multifileList.push(obj.data)
- // }
- // }
- // });
- // })
+ var that = this
+ uni.showLoading({ title: '涓婁紶涓�...', mask: true })
uni.uploadFile({
- url: this.$baseUrl + '/web/public/upload',
- filePath: event.file.url,
- name: "file",
+ url: this.$baseUrl + '/web/public/uploadBatch',
+ files: event.file.map(e => {
+ return { name: 'files', uri: e.url }
+ }),
formData: {
- folder: "WORKORDER_FILE_PATH"
- },
- success: (res) => {
+ folder: "WORKORDER_FILE_PATH",
+ },
+ success(res) {
+ uni.hideLoading();
let obj = JSON.parse(res.data)
if (obj.code === 200) {
- obj.data.fileurl = obj.data.imgaddr
- this.model.multifileList.push(obj.data)
+ console.log(obj.data)
+ obj.data.forEach(item => {
+ item.fileurl = item.imgaddr
+ })
+ that.model.multifileList = [...that.model.multifileList, ...obj.data]
}
}
- });
+ })
},
// 鎻愪氦
submit() {
var that = this
that.$refs.uForm.validate().then(async () => {
- let res = await that.$u.api.workOrderCreate(that.model)
+ let form = JSON.parse(JSON.stringify(that.model))
+ form.submitDate = form.submitDate + ':00'
+ form.happenTime = form.happenTime + ':00'
+ let res = await that.$u.api.workOrderCreate(form)
if (res.code === 200) {
that.id = res.data
this.stopScroll()
--
Gitblit v1.9.3