|
|
@@ -61,26 +61,23 @@
|
|
|
</van-field>
|
|
|
</van-cell-group>
|
|
|
<van-cell-group>
|
|
|
- <van-field v-model="placeActivity.sourceFunds" center clearable label="经费来源:" placeholder="请选择"
|
|
|
+ <van-field v-model="placeActivity.sourceFunds" center clearable label="经费来源:" placeholder="请填写经费来源"
|
|
|
input-align="right" />
|
|
|
</van-cell-group>
|
|
|
<van-cell-group>
|
|
|
- <van-field v-model="placeActivity.activityPerson.name" center label="活动负责人:" placeholder="请选择活动负责人"
|
|
|
- input-align="right" right-icon="arrow-down" @click="showReport = true" />
|
|
|
- <van-dialog v-model:show="showReport" title="选择活动负责人" show-cancel-button @confirm="reselected">
|
|
|
- <person-list v-if="showReport" @selected="selected" :type="0" :siteId="placeActivity.siteName.id"></person-list>
|
|
|
- </van-dialog>
|
|
|
+ <van-field v-model="placeActivity.activityPerson" center label="活动负责人:" placeholder="请填写活动负责人"
|
|
|
+ input-align="right" />
|
|
|
</van-cell-group>
|
|
|
<van-cell-group>
|
|
|
- <van-field v-model="placeActivity.phone" center readonly type="tel" label="联系方式:" placeholder="请填写联系方式"
|
|
|
+ <van-field v-model="placeActivity.phone" center type="tel" label="联系方式:" placeholder="请填写联系方式"
|
|
|
input-align="right" />
|
|
|
</van-cell-group>
|
|
|
<van-cell-group>
|
|
|
<van-field name="uploader" label="安全预案:">
|
|
|
<template #input>
|
|
|
- <van-uploader :after-read="afterRead" v-model="fileList" :max-count="5" capture="camera" accept=""
|
|
|
- :preview-full-image="false" :before-delete="deleteRead">
|
|
|
- <van-button>上传文件(可添加音、视频和文本类型等)</van-button>
|
|
|
+ <van-uploader readonly v-model="fileList" :max-count="5" accept="" :preview-full-image="false"
|
|
|
+ :before-delete="deleteRead" @click-upload="chooseImg">
|
|
|
+ <van-button>上传文件(可添加图片、音、视频和文本等)</van-button>
|
|
|
</van-uploader>
|
|
|
</template>
|
|
|
</van-field>
|
|
|
@@ -94,7 +91,7 @@
|
|
|
</van-cell-group>
|
|
|
<div class="subbtn">
|
|
|
<van-button type="primary" native-type="submit">提交</van-button>
|
|
|
- <van-button type="default" hairline @click="onClickLeft">暂存</van-button>
|
|
|
+ <van-button type="default" hairline @click="onClickLeft">取消</van-button>
|
|
|
</div>
|
|
|
</van-form>
|
|
|
</div>
|
|
|
@@ -146,10 +143,7 @@ export default {
|
|
|
placeDel: "",
|
|
|
sourceFunds: "",
|
|
|
safetyPlan: "",
|
|
|
- activityPerson: {
|
|
|
- id: "",
|
|
|
- name: "",
|
|
|
- },
|
|
|
+ activityPerson: "",
|
|
|
phone: "",
|
|
|
state: "0",
|
|
|
assessment: "0",
|
|
|
@@ -282,8 +276,6 @@ export default {
|
|
|
};
|
|
|
// 已知名单
|
|
|
let showPerson = ref(false);
|
|
|
- // 活动负责人
|
|
|
- let showReport = ref(false);
|
|
|
let list = {
|
|
|
value: [],
|
|
|
type: "",
|
|
|
@@ -302,43 +294,33 @@ export default {
|
|
|
});
|
|
|
placeActivity.value.knownList.id = ids.join(",");
|
|
|
placeActivity.value.knownList.name = names.join(",");
|
|
|
- } else {
|
|
|
- placeActivity.value.activityPerson.id = list.value.id;
|
|
|
- placeActivity.value.phone = list.value.phone;
|
|
|
- placeActivity.value.activityPerson.name = list.value.name;
|
|
|
}
|
|
|
};
|
|
|
// 文件上传
|
|
|
let fileList = ref([]);
|
|
|
let fileupList = ref([]);
|
|
|
- const afterRead = (file) => {
|
|
|
- file.status = "uploading";
|
|
|
- file.message = "上传中";
|
|
|
- // 此时可以自行将文件上传至服务器
|
|
|
- new tools()
|
|
|
- .uploadFile(file, `reporting/reportingActivities`)
|
|
|
- .then(({ data, status, statusText }) => {
|
|
|
- if (status == 200 || statusText == "OK") {
|
|
|
- file.status = "done";
|
|
|
- // xm.showToast({
|
|
|
- // message: "上传成功",
|
|
|
- // });
|
|
|
- data.name = decodeURIComponent(
|
|
|
- data.url.substring(data.url.lastIndexOf("/") + 1)
|
|
|
- );
|
|
|
- fileupList.value.push(data);
|
|
|
- }
|
|
|
- })
|
|
|
- .catch(() => {
|
|
|
- file.status = "failed";
|
|
|
- file.message = "上传失败";
|
|
|
- });
|
|
|
- };
|
|
|
+ const chooseImg = () => {
|
|
|
+ xm.chooseFile({
|
|
|
+ count: 1,
|
|
|
+ name: "file",
|
|
|
+ url: $base + `/sys/file/webupload/upload?uploadPath=reporting/reportingActivities`,
|
|
|
+ headers: { 'Content-Type': 'multipart/form-data', "token": window.localStorage.getItem('MZ_TOKEN') },
|
|
|
+ }).then(res => {
|
|
|
+ let data = res[0].data
|
|
|
+ data.name = decodeURIComponent(
|
|
|
+ data.id.substring(data.url.lastIndexOf("/") + 1)
|
|
|
+ );
|
|
|
+ data.url = $base + data.url;
|
|
|
+ fileupList.value.push(data);
|
|
|
+ fileList.value.push(data)
|
|
|
+ })
|
|
|
+ }
|
|
|
+
|
|
|
// 删除文件
|
|
|
const deleteRead = (file) => {
|
|
|
//删除文件操作
|
|
|
for (let index = 0; index < fileList.value.length; index++) {
|
|
|
- if (file.file.name == fileList.value[index].file.name) {
|
|
|
+ if (file.id == fileList.value[index].id) {
|
|
|
fileList.value.splice(index, 1);
|
|
|
if (fileupList.value[index]) {
|
|
|
let delurl = fileupList.value[index].url;
|
|
|
@@ -353,7 +335,7 @@ export default {
|
|
|
isLoading.value = true;
|
|
|
//保存前附件处理
|
|
|
placeActivity.value.safetyPlan = fileupList.value
|
|
|
- .map((option) => option.url)
|
|
|
+ .map((option) => option.id)
|
|
|
.join("|");
|
|
|
new placeActivityServer().save(placeActivity.value).then((res) => {
|
|
|
if (res.status == 200 || res.statusText == "OK") {
|
|
|
@@ -364,6 +346,7 @@ export default {
|
|
|
onClickLeft();
|
|
|
});
|
|
|
};
|
|
|
+
|
|
|
return {
|
|
|
isLoading,
|
|
|
placeActivity,
|
|
|
@@ -386,15 +369,14 @@ export default {
|
|
|
onClickLeft,
|
|
|
// 人员选择
|
|
|
showPerson,
|
|
|
- showReport,
|
|
|
selected,
|
|
|
reselected,
|
|
|
// 文件上传
|
|
|
- afterRead,
|
|
|
deleteRead,
|
|
|
fileList,
|
|
|
submit,
|
|
|
subjectContentEditor,
|
|
|
+ chooseImg
|
|
|
};
|
|
|
},
|
|
|
};
|
guoqing