Merge remote-tracking branch 'HS_MZAP/master'

src/api/differentbelievers/ReligiousPeopleReportService.js

@@ -19,4 +19,9 @@ export default class ReligiousPeopleReportService {
             params
         )
     };
+    delete(ids) {
+        return request.delete(
+            '/differentbelievers/religiousPeopleReport/delete', { ids: ids }
+        )
+    }
 }

src/views/activityMan/differentbelievers/ReligiousPeopleReportView.vue

@@ -140,20 +140,18 @@ export default {
             inputForm.value.information.split("|").forEach((item) => {
               if (item.trim().length > 0) {
                 fileupList.value.push({
-                  file: {
-                    name: decodeURIComponent(
-                      item.substring(item.lastIndexOf("/") + 1)
-                    ),
-                  },
-                  url: item,
+                  name: decodeURIComponent(
+                    item.substring(item.lastIndexOf("/") + 1)
+                  ),
+                  url: $base + item.replace("程序附件//", "程序附件/"),
+                  id: item.replace("程序附件//", "程序附件/")
                 });
                 fileList.value.push({
-                  file: {
-                    name: decodeURIComponent(
-                      item.substring(item.lastIndexOf("/") + 1)
-                    ),
-                  },
+                  name: decodeURIComponent(
+                    item.substring(item.lastIndexOf("/") + 1)
+                  ),
                   url: $base + item.replace("程序附件//", "程序附件/"),
+                  id: item.replace("程序附件//", "程序附件/")
                 });
               }
             });

src/views/activityMan/placeactivity/placeActivityView.vue

@@ -166,20 +166,18 @@ export default {
           placeActivity.value.safetyPlan.split("|").forEach((item) => {
             if (item.trim().length > 0) {
               fileupList.value.push({
-                file: {
-                  name: decodeURIComponent(
-                    item.substring(item.lastIndexOf("/") + 1)
-                  ),
-                },
-                url: item,
+                name: decodeURIComponent(
+                  item.substring(item.lastIndexOf("/") + 1)
+                ),
+                url: $base + item.replace("程序附件//", "程序附件/"),
+                id: item.replace("程序附件//", "程序附件/")
               });
               fileList.value.push({
-                file: {
-                  name: decodeURIComponent(
-                    item.substring(item.lastIndexOf("/") + 1)
-                  ),
-                },
+                name: decodeURIComponent(
+                  item.substring(item.lastIndexOf("/") + 1)
+                ),
                 url: $base + item.replace("程序附件//", "程序附件/"),
+                id: item.replace("程序附件//", "程序附件/")
               });
             }
           });

src/views/placeManage/placePerson/placePersonAdd.vue

@@ -51,16 +51,10 @@
         />
       </van-cell-group>
       <van-cell-group>
-        <van-field name="uploader" label-align="top" label="工作照片:">
+        <van-field name="uploader" label="工作照片:" >
           <template #input>
-            <van-uploader
-              v-model="fileList"
-              :after-read="afterRead1"
-              :max-count="1"
-              capture="camera"
-              accept=""
-              :before-delete="fjdelete"
-            >
+            <van-uploader readonly v-model="fileList" :max-count="1" accept="" :preview-full-image="false"
+              :before-delete="deleteRead" @click-upload="chooseImg">
             </van-uploader>
           </template>
         </van-field>
@@ -542,11 +536,12 @@
 </template>
 
 <script>
-import { onBeforeUpdate, onMounted, ref, getCurrentInstance } from "vue";
+import { onBeforeUpdate, onMounted, ref } from "vue";
 import placePerson from "@/api/placePerson/placePerson";
 import PlaceRegister from "@/api/placeRegister/placeRegister";
 import { useRouter } from "vue-router";
 import tools from "@/api/sys/tools";
+import $base from "@/utils/config";
 export default {
   setup() {
     const onClickLeft = () => {
@@ -852,28 +847,33 @@ export default {
     //图片上传
     let fileList = ref([]);
     let fileImg = ref([]);
-    let workpic = ref("");
-    const afterRead1 = (file) => {
-      new tools().uploadFile(file, `logo`).then(({ data }) => {
+    const chooseImg = () => {
+      xm.chooseFile({
+        count: 1,
+        name: "file",
+        url: $base + `/sys/file/webupload/upload?uploadPath=logo`,
+        headers: { 'Content-Type': 'multipart/form-data', "token": window.localStorage.getItem('MZ_TOKEN') },
+      }).then(res => {
+        let data = res[0].data
         data.name = decodeURIComponent(
-          data.url.substring(data.url.lastIndexOf("/") + 1)
+          data.id.substring(data.url.lastIndexOf("/") + 1)
         );
-        workpic.value += "" + data.url;
-        const json = Object.assign(inputForm.value, {
-          workPicture: workpic.value,
-        });
-        inputForm.value = json;
+        data.url = $base + data.url;
         fileImg.value.push(data);
-      });
-    };
-    const fjdelete = (file) => {
+        fileList.value.push(data)
+      })
+    }
+    // 删除文件
+    const deleteRead = (file) => {
       //删除文件操作
       for (let index = 0; index < fileList.value.length; index++) {
-        if (file.file == fileList.value[index].file) {
-          let delurl = fileImg.value[index].url;
-          new tools().uploadFiledelete("", delurl).then(({ data }) => {});
-          fileImg.value.splice(index, 1);
+        if (file.id == fileList.value[index].id) {
           fileList.value.splice(index, 1);
+          if (fileImg.value[index]) {
+            let delurl = fileImg.value[index].url;
+            new tools().uploadFiledelete("", delurl).then(({ data }) => { });
+            fileImg.value.splice(index, 1);
+          }
         }
       }
     };
@@ -1083,6 +1083,10 @@ export default {
     let router = useRouter();
     //数据提交
     const submit = () => {
+      //保存前附件处理
+      inputForm.value.workPicture = fileImg.value
+        .map((option) => option.id)
+        .join("|");
       inputForm.value.userManagenmetDetailsDTOList.forEach((item) => {
         if (item.chineseName === "教职身份") {
           const teachType = {
@@ -1216,9 +1220,8 @@ export default {
       getDate,
       //图片上传
       fileList,
-      afterRead1,
-      //图片删除
-      fjdelete,
+      chooseImg,
+      deleteRead,
       // 返回
       onClickLeft,
       // 详细地址定位

src/views/placeManage/placePerson/placePersoninfo.vue

@@ -71,12 +71,13 @@
             <van-field name="uploader" label-align="top" label="工作照片:">
               <template #input>
                 <van-uploader
+                  readonly
                   v-model="fileList"
-                  :after-read="afterRead1"
                   :max-count="1"
-                  capture="camera"
                   accept=""
-                  :before-delete="fjdelete"
+                  :preview-full-image="false"
+                  :before-delete="deleteRead"
+                  @click-upload="chooseImg"
                 >
                 </van-uploader>
               </template>
@@ -327,6 +328,7 @@
             v-model:show="hs_persontype"
             title="人员类型"
             show-cancel-button
+            @confirm="changperson"
           >
             <div class="dialog">
               <van-list>
@@ -451,21 +453,26 @@
             placeholder="请选择"
             input-align="right"
             right-icon="arrow-down"
-            @click="hs_select = true"
+            @click="hs_select[index + '_select'] = true"
           />
-          <van-popup v-model:show="hs_select" round position="bottom" >
+          <van-popup
+            v-model:show="hs_select[index + '_select']"
+            round
+            position="bottom"
+          >
             <van-picker
+              :title="item.chineseName"
               :columns="$dictUtils.getDictList(item.dataDictionary)"
               :columns-field-names="{
                 text: 'label',
                 value: 'value',
               }"
-              @cancel="hs_select = false"
-              @confirm="getselect"
+              @cancel="hs_select[index + '_select'] = false"
+              @confirm="getselect(index + '_select', $event)"
             />
           </van-popup>
         </van-cell-group>
-        <van-cell-group v-if="item.dataType === '2'">
+        <van-cell-group v-else-if="item.dataType === '2'">
           <van-field
             v-model="item.value"
             center
@@ -473,7 +480,7 @@
             input-align="right"
           />
         </van-cell-group>
-        <van-cell-group v-if="item.dataType === '3'">
+        <van-cell-group v-else-if="item.dataType === '3'">
           <van-field
             :v-model="item.value"
             center
@@ -481,7 +488,7 @@
             input-align="right"
           />
         </van-cell-group>
-        <van-cell-group v-if="item.dataType === '4'">
+        <van-cell-group v-else-if="item.dataType === '4'">
           <van-field
             name="uploader"
             label-align="top"
@@ -500,7 +507,7 @@
             </template>
           </van-field>
         </van-cell-group>
-        <van-cell-group v-if="item.dataType === '5'">
+        <van-cell-group v-else-if="item.dataType === '5'">
           <van-field
             v-model="item.value"
             center
@@ -531,19 +538,26 @@
             placeholder="请选择日期时间"
             input-align="right"
             right-icon="arrow-down"
-            @click="hs_Date = true"
+            @click="hs_Date[index + '_Date'] = true"
           />
-          <van-popup v-model:show="hs_Date" round position="bottom">
+          <van-popup
+            v-model:show="hs_Date[index + '_Date']"
+            round
+            position="bottom"
+          >
             <van-date-picker
               title="选择日期"
               :min-date="minDate"
               :max-date="maxDate"
-              @cancel="hs_Date = false"
-              @confirm="getDate"
+              @cancel="hs_Date[index + '_Date'] = false"
+              @confirm="getDate(index + '_Date', $event)"
             />
           </van-popup>
         </van-cell-group>
       </van-col>
+      <div class="subbtn">
+        <van-button type="primary" @click="submit">确认修改</van-button>
+      </div>
     </div>
   </div>
 </template>
@@ -556,7 +570,6 @@ import placePerson from "@/api/placePerson/placePerson";
 import PlaceRegister from "@/api/placeRegister/placeRegister";
 import UserManage from "@/api/user/UserManage";
 import tools from "@/api/sys/tools";
-import placeRegister from '@/api/placeRegister/placeRegister';
 export default {
   setup() {
     const data = ref({});
@@ -583,25 +596,76 @@ export default {
             "hs_personnel_education",
             data.value.nationalEducationLevel
           );
-        religiousName.value = current.appContext.config.globalProperties.$dictUtils.getDictLabel(
+        religiousName.value =
+          current.appContext.config.globalProperties.$dictUtils.getDictLabel(
             "hs_religion_type",
             data.value.religion
           );
-        let location = data.value.location
+        let location = data.value.location;
         locationName.value = location.name;
-        typeOfEmployeesName.value = current.appContext.config.globalProperties.$dictUtils.getDictLabel(
+        typeOfEmployeesName.value =
+          current.appContext.config.globalProperties.$dictUtils.getDictLabel(
             "hs_type_of_employees",
             data.value.typeOfEmployees
           );
-          let arr = data.value.personnelType.split(',')
-          personnalType.value = getValue1(arr).join(',')
-        let tissid = data.value.zjzz.id
-        if(tissid!=''){
-          new placePerson().queryId({id:tissid}).then((res)=>{
-          tissueName.value = res.organizationName
-        })
+        let arr = data.value.personnelType.split(",");
+        personnalType.value = getValue1(arr).join(",");
+        let tissid = data.value.zjzz.id;
+        if (tissid != "") {
+          new placePerson().queryId({ id: tissid }).then((res) => {
+            tissueName.value = res.organizationName;
+          });
         }
         activitytext.value = getActivity(data.value.bkcheck);
+        data.value.workPicture.split("|").forEach((item) => {
+          if (item.trim().length > 0) {
+            fileImg.value.push({
+              name: decodeURIComponent(
+                item.substring(item.lastIndexOf("/") + 1)
+              ),
+              url: $base + item.replace("程序附件//", "程序附件/"),
+              id: item.replace("程序附件//", "程序附件/"),
+            });
+            fileList.value.push({
+              name: decodeURIComponent(
+                item.substring(item.lastIndexOf("/") + 1)
+              ),
+
+              url: $base + item.replace("程序附件//", "程序附件/"),
+              id: item.replace("程序附件//", "程序附件/"),
+            });
+          }
+        });
+        data.value.userManagenmetDetailsDTOList.forEach((item) => {
+          if (item.chineseName === "教职身份") {
+            const teachType = {
+              1: "阿訇",
+              2: "牧师",
+              3: "长老",
+              4: "传道员",
+              5: "神学生",
+              6: "道士（正一）",
+              7: "比丘",
+              8: "教师（副牧师）",
+              9: "比丘尼",
+            };
+            item.value = teachType[item.value];
+          }
+          if (item.chineseName === "宗教教育程度") {
+            const Type = {
+              1: "小学",
+              2: "初中",
+              3: "中专",
+              4: "高中",
+              5: "大专",
+              6: "本科",
+              7: "硕士研究生",
+              8: "博士研究生",
+              9: "其他",
+            };
+            item.value = Type[item.value];
+          }
+        });
       });
       //籍贯接口
       new placePerson().nativePlace().then((res) => {
@@ -665,7 +729,7 @@ export default {
         4: "其他",
       };
       return type[item];
-    }
+    };
     // 性别
     const sexName = ref("");
     const sex = [
@@ -747,7 +811,9 @@ export default {
       let id = "";
       id = val.id;
       locationName.value = val.name;
-      const json = Object.assign(data.value, { location: { id: id,name:val.name} });
+      const json = Object.assign(data.value, {
+        location: { id: id, name: val.name },
+      });
       data.value = json;
       checked.value = val.id;
     };
@@ -804,30 +870,36 @@ export default {
     //图片上传
     let fileList = ref([]);
     let fileImg = ref([]);
-    let workpic = ref("");
-    const afterRead1 = (file) => {
-      new tools()
-        .uploadFile(file, `sys/file/webupload/upload`)
-        .then(({ data }) => {
-          data.name = decodeURIComponent(
-            data.url.substring(data.url.lastIndexOf("/") + 1)
-          );
-          workpic.value += "" + data.url;
-          const json = Object.assign(data.value, {
-            workPicture: workpic.value,
-          });
-          data.value = json;
-          fileImg.value.push(data);
-        });
+    const chooseImg = () => {
+      xm.chooseFile({
+        count: 1,
+        name: "file",
+        url: $base + `/sys/file/webupload/upload?uploadPath=logo`,
+        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;
+        fileImg.value.push(data);
+        fileList.value.push(data);
+      });
     };
-    const fjdelete = (file) => {
+    // 删除文件
+    const deleteRead = (file) => {
       //删除文件操作
       for (let index = 0; index < fileList.value.length; index++) {
-        if (file.file == fileList.value[index].file) {
-          let delurl = fileImg.value[index].url;
-          new tools().uploadFiledelete("", delurl).then(({ data }) => {});
-          fileImg.value.splice(index, 1);
+        if (file.id == fileList.value[index].id) {
           fileList.value.splice(index, 1);
+          if (fileImg.value[index]) {
+            let delurl = fileImg.value[index].url;
+            new tools().uploadFiledelete("", delurl).then(({ data }) => {});
+            fileImg.value.splice(index, 1);
+          }
         }
       }
     };
@@ -930,12 +1002,39 @@ export default {
     let hs_persontype = ref(false);
     const toggle = (index) => {
       checkboxRefs.value[index].toggle();
-      let str = "";
-      str = checked2.value.join();
-      const json = Object.assign({ ...data.value }, { personnelType: str });
+      personnalType.value = getValue(checked2.value).join();
+      showZW.value = checked2.value.join();
+    };
+    const changperson = () => {
+      const json = Object.assign(
+        { ...data.value },
+        { personnelType: showZW.value }
+      );
       data.value = json;
-      personnalType.value = getValue1(checked2.value).join(',');
-      showZW.value = str;
+      changePersonnelType();
+    };
+    const changePersonnelType = () => {
+      let userManagenmetDetailsDTOList = [];
+      new placePerson()
+        .userDTOqueryId(data.value.personnelType.toString())
+        .then((data) => {
+          data.forEach((item) => {
+            let userManagenmetDetail = {};
+            userManagenmetDetail = Object.assign(userManagenmetDetail, {
+              id: "",
+              chineseName: item.chineseName,
+              englishName: item.englishName,
+              dataType: item.dataType,
+              value: "",
+              orderNum: item.orderNum,
+              dataDictionary: item.dataDictionary,
+              dataDictionaryId: item.dataDictionaryId,
+            });
+            userManagenmetDetailsDTOList.push(userManagenmetDetail);
+          });
+          data.value.userManagenmetDetailsDTOList =
+            userManagenmetDetailsDTOList;
+        });
     };
     onBeforeUpdate(() => {
       checkboxRefs.value = [];
@@ -972,18 +1071,19 @@ export default {
       return Array;
     };
     // 扩展信息选择
-    const teachPosition = ref("");
-    let hs_select = ref(false);
-    const getselect = ({selectedOptions,selectedIndexes}) => {
-      hs_select.value = false;
-      teachPosition.value = selectedOptions[0].value;
+    let hs_select = ref({});
+    const getselect = (index, { selectedOptions }) => {
+      hs_select.value[index] = false;
+      let inputIndex = index.split("_")[0];
+      data.value.userManagenmetDetailsDTOList[inputIndex].value =
+        selectedOptions[0].label;
     };
     // 扩展信息的时间
-    const issueDate = ref("");
-    let hs_Date = ref(false);
-    const getDate = ({ selectedOptions }) => {
-      hs_Date.value = false;
-      issueDate.value =
+    let hs_Date = ref({});
+    const getDate = (index, { selectedOptions }) => {
+      hs_Date.value[index] = false;
+      let inputIndex = index.split("_")[0];
+      data.value.userManagenmetDetailsDTOList[inputIndex].value =
         selectedOptions[0].text +
         "-" +
         selectedOptions[1].text +
@@ -1016,6 +1116,58 @@ export default {
     const onClickLeft = () => {
       history.back();
     };
+    //数据提交
+    const submit = () => {
+      //保存前附件处理
+      data.value.workPicture = fileImg.value
+        .map((option) => option.id)
+        .join("|");
+      data.value.userManagenmetDetailsDTOList.forEach((item) => {
+        if (item.chineseName === "教职身份") {
+          const teachType = {
+            阿訇: 1,
+            牧师: 2,
+            长老: 3,
+            传道员: 4,
+            神学生: 5,
+            "道士（正一）": 6,
+            比丘: 7,
+            "教师（副牧师）": 8,
+            比丘尼: 9,
+          };
+          item.value = teachType[item.value];
+        }
+        if (item.chineseName === "宗教教育程度") {
+          const Type = {
+            小学: 1,
+            初中: 2,
+            中专: 3,
+            高中: 4,
+            大专: 5,
+            本科: 6,
+            硕士研究生: 7,
+            博士研究生: 8,
+            其他: 9,
+          };
+          item.value = Type[item.value];
+        }
+      });
+      new placePerson().save(data.value).then((res) => {
+        if (res.status == 200) {
+          xm.showToast({
+            message: "人员添加成功",
+          });
+          router.push({
+            path: "/placePerson",
+          });
+        } else {
+          xm.showToast({
+            message: "人员添加失败",
+          });
+          console.log(res);
+        }
+      });
+    };
     return {
       onClickLeft,
       data,
@@ -1086,6 +1238,7 @@ export default {
       toggle,
       checkboxRefs,
       showZW,
+      changperson,
       // 是否参加非法活动
       activity,
       hs_activity,
@@ -1098,14 +1251,17 @@ export default {
       getPlace1,
       options,
       getLocation,
-      //扩展信息选择器
-      teachPosition,
+      //扩展信息选择
       hs_select,
       getselect,
       //扩展信息时间
       hs_Date,
-      issueDate,
       getDate,
+      //图片上传
+      fileList,
+      chooseImg,
+      deleteRead,
+      submit,
     };
   },
 };
@@ -1117,4 +1273,17 @@ export default {
   height: 400px;
   overflow: auto;
 }
+.subbtn {
+  margin: 20px;
+  text-align: center;
+}
+.subbtn .van-button {
+  width: 100%;
+  margin: 5px;
+}
+.van-uploader .van-button {
+  border: none;
+  color: #36a7f3;
+  top: -4px;
+}
 </style>

src/views/placeManage/placeRegister/placeRegister.vue

@@ -21,12 +21,13 @@
             >
               <template #input>
                 <van-uploader
+                  readonly
                   v-model="fileList"
-                  :after-read="afterRead1"
-                  :max-count="6"
-                  capture="camera"
+                  :max-count="5"
                   accept=""
-                  :before-delete="fjdelete"
+                  :preview-full-image="false"
+                  :before-delete="deleteRead"
+                  @click-upload="chooseImg"
                 >
                 </van-uploader>
               </template>
@@ -265,12 +266,13 @@
             >
               <template #input>
                 <van-uploader
-                  v-model="fileList"
-                  :after-read="afterRead1"
-                  :max-count="6"
-                  capture="camera"
+                  readonly
+                  v-model="fileList2"
+                  :max-count="5"
                   accept=""
-                  :before-delete="fjdelete"
+                  :preview-full-image="false"
+                  :before-delete="deleteRead2"
+                  @click-upload="chooseImg2"
                 >
                 </van-uploader>
               </template>
@@ -398,13 +400,17 @@
             >
               <template #input>
                 <van-uploader
+                  readonly
                   v-model="fileList3"
-                  :after-read="afterRead3"
-                  :max-count="6"
-                  capture="camera"
+                  :max-count="5"
                   accept=""
-                  :before-delete="fjdelete3"
+                  :preview-full-image="false"
+                  :before-delete="deleteRead3"
+                  @click-upload="chooseImg3"
                 >
+                  <van-button
+                    >上传文件(可添加图片、音、视频和文本等)</van-button
+                  >
                 </van-uploader>
               </template>
             </van-field>
@@ -717,6 +723,7 @@ import { useRouter } from "vue-router";
 import { onMounted, ref } from "vue";
 import placeRegister from "@/api/placeRegister/placeRegister";
 import tools from "@/api/sys/tools";
+import $base from "@/utils/config";
 export default {
   components: { ManageList, ManageList2 },
   setup() {
@@ -888,73 +895,112 @@ export default {
     //图片上传
     let fileList = ref([]);
     let fileImg = ref([]);
-    const afterRead1 = (file) => {
-      new tools()
-        .uploadFile(file, `religioussites/siteinfo/religiousSitesInfo`)
-        .then(({ data }) => {
-          data.name = decodeURIComponent(
-            data.url.substring(data.url.lastIndexOf("/") + 1)
-          );
-          inputForm.value.scenesImage += "" + data.url;
-          fileImg.value.push(data);
-        });
+    const chooseImg = () => {
+      xm.chooseFile({
+        count: 1,
+        name: "file",
+        url:
+          $base +
+          `/sys/file/webupload/upload?uploadPath=religioussites/siteinfo/religiousSitesInfo`,
+        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;
+        fileImg.value.push(data);
+        fileList.value.push(data);
+      });
     };
-    const fjdelete = (file) => {
+    // 删除文件
+    const deleteRead = (file) => {
       //删除文件操作
       for (let index = 0; index < fileList.value.length; index++) {
-        if (file.file == fileList.value[index].file) {
-          let delurl = fileImg.value[index].url;
-          new tools().uploadFiledelete("", delurl).then(({ data }) => {});
-          fileImg.value.splice(index, 1);
+        if (file.id == fileList.value[index].id) {
           fileList.value.splice(index, 1);
+          if (fileImg.value[index]) {
+            let delurl = fileImg.value[index].url;
+            new tools().uploadFiledelete("", delurl).then(({ data }) => {});
+            fileImg.value.splice(index, 1);
+          }
         }
       }
     };
     let fileList2 = ref([]);
     let fileImg2 = ref([]);
-    const afterRead2 = (file) => {
-      new tools()
-        .uploadFile(file, `religioussites/siteinfo/religiousSitesInfo`)
-        .then(({ data }) => {
-          data.name = decodeURIComponent(
-            data.url.substring(data.url.lastIndexOf("/") + 1)
-          );
-          inputForm.value.etiquetteSpace += "" + data.url;
-          fileImg2.value.push(data);
-        });
+    const chooseImg2 = () => {
+      xm.chooseFile({
+        count: 1,
+        name: "file",
+        url:
+          $base +
+          `/sys/file/webupload/upload?uploadPath=religioussites/siteinfo/religiousSitesInfo`,
+        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;
+        fileImg2.value.push(data);
+        fileList2.value.push(data);
+      });
     };
-    const fjdelete2 = (file) => {
+    // 删除文件
+    const deleteRead2 = (file) => {
       //删除文件操作
       for (let index = 0; index < fileList2.value.length; index++) {
-        if (file.file == fileList2.value[index].file) {
-          let delurl = fileImg2.value[index].url;
-          new tools().uploadFiledelete("", delurl).then(({ data }) => {});
-          fileImg2.value.splice(index, 1);
+        if (file.id == fileList2.value[index].id) {
           fileList2.value.splice(index, 1);
+          if (fileImg2.value[index]) {
+            let delurl = fileImg2.value[index].url;
+            new tools().uploadFiledelete("", delurl).then(({ data }) => {});
+            fileImg2.value.splice(index, 1);
+          }
         }
       }
     };
     let fileList3 = ref([]);
     let fileImg3 = ref([]);
-    const afterRead3 = (file) => {
-      new tools()
-        .uploadFile(file, `religioussites/siteinfo/religiousSitesInfo`)
-        .then(({ data }) => {
-          data.name = decodeURIComponent(
-            data.url.substring(data.url.lastIndexOf("/") + 1)
-          );
-          inputForm.value.approvalProcedures += "" + data.url;
-          fileImg3.value.push(data);
-        });
+    const chooseImg3 = () => {
+      xm.chooseFile({
+        count: 1,
+        name: "file",
+        url:
+          $base +
+          `/sys/file/webupload/upload?uploadPath=religioussites/siteinfo/religiousSitesInfo`,
+        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;
+        fileImg3.value.push(data);
+        fileList3.value.push(data);
+      });
     };
-    const fjdelete3 = (file) => {
+    // 删除文件
+    const deleteRead3 = (file) => {
       //删除文件操作
       for (let index = 0; index < fileList3.value.length; index++) {
-        if (file.file == fileList3.value[index].file) {
-          let delurl = fileImg3.value[index].url;
-          new tools().uploadFiledelete("", delurl).then(({ data }) => {});
-          fileImg3.value.splice(index, 1);
+        if (file.id == fileList3.value[index].id) {
           fileList3.value.splice(index, 1);
+          if (fileImg3.value[index]) {
+            let delurl = fileImg3.value[index].url;
+            new tools().uploadFiledelete("", delurl).then(({ data }) => {});
+            fileImg3.value.splice(index, 1);
+          }
         }
       }
     };
@@ -995,23 +1041,29 @@ export default {
     let hs_SetupTime = ref(false);
     const getSetupTime = ({ selectedOptions }) => {
       hs_SetupTime.value = false;
-      const json = Object.assign(inputForm.value,{approvedEstablishmentTime:selectedOptions[0].text +
-        "-" +
-        selectedOptions[1].text +
-        "-" +
-        selectedOptions[2].text})
-        inputForm.value = json
+      const json = Object.assign(inputForm.value, {
+        approvedEstablishmentTime:
+          selectedOptions[0].text +
+          "-" +
+          selectedOptions[1].text +
+          "-" +
+          selectedOptions[2].text,
+      });
+      inputForm.value = json;
     };
     //批准设立时间
     let hs_SignTime = ref(false);
     const getSignTime = ({ selectedOptions }) => {
       hs_SignTime.value = false;
-      const json = Object.assign(inputForm.value,{registrationDate:selectedOptions[0].text +
-        "-" +
-        selectedOptions[1].text +
-        "-" +
-        selectedOptions[2].text})
-        inputForm.value = json
+      const json = Object.assign(inputForm.value, {
+        registrationDate:
+          selectedOptions[0].text +
+          "-" +
+          selectedOptions[1].text +
+          "-" +
+          selectedOptions[2].text,
+      });
+      inputForm.value = json;
     };
     // 互联网专区
     const internetForm = ref({
@@ -1184,6 +1236,16 @@ export default {
     };
     // 数据提交
     const submit = () => {
+      //保存前附件处理
+      inputForm.value.scenesImage = fileImg.value
+        .map((option) => option.id)
+        .join("|");
+      inputForm.value.etiquetteSpace = fileImg2.value
+        .map((option) => option.id)
+        .join("|");
+      inputForm.value.approvalProcedures = fileImg3.value
+        .map((option) => option.id)
+        .join("|");
       hlwToSubmit();
       let dynami = JSON.stringify(internetForm.value.dynamicForm);
       const json = Object.assign(inputForm.value, { dynamicFormJson: dynami });
@@ -1209,14 +1271,14 @@ export default {
       active,
       //图片上传
       fileList,
-      afterRead1,
-      fjdelete,
+      chooseImg,
+      deleteRead,
       fileList2,
-      afterRead2,
-      fjdelete2,
+      chooseImg2,
+      deleteRead2,
       fileList3,
-      afterRead3,
-      fjdelete3,
+      chooseImg3,
+      deleteRead3,
       //宗教类型
       religiousType,
       hs_religious,

src/views/placeManage/placeRegister/placeRegisterInfo.vue

@@ -25,12 +25,13 @@
               >
                 <template #input>
                   <van-uploader
+                    readonly
                     v-model="fileList"
-                    :after-read="afterRead1"
-                    :max-count="6"
-                    capture="camera"
+                    :max-count="5"
                     accept=""
-                    :before-delete="fjdelete"
+                    :preview-full-image="false"
+                    :before-delete="deleteRead"
+                    @click-upload="chooseImg"
                   >
                   </van-uploader>
                 </template>
@@ -269,12 +270,13 @@
               >
                 <template #input>
                   <van-uploader
+                    readonly
                     v-model="fileList2"
-                    :after-read="afterRead2"
-                    :max-count="6"
-                    capture="camera"
+                    :max-count="5"
                     accept=""
-                    :before-delete="fjdelete2"
+                    :preview-full-image="false"
+                    :before-delete="deleteRead2"
+                    @click-upload="chooseImg2"
                   >
                   </van-uploader>
                 </template>
@@ -400,13 +402,17 @@
               >
                 <template #input>
                   <van-uploader
+                    readonly
                     v-model="fileList3"
-                    :after-read="afterRead3"
-                    :max-count="6"
-                    capture="camera"
+                    :max-count="5"
                     accept=""
-                    :before-delete="fjdelete3"
+                    :preview-full-image="false"
+                    :before-delete="deleteRead3"
+                    @click-upload="chooseImg3"
                   >
+                    <van-button
+                      >上传文件(可添加图片、音、视频和文本等)</van-button
+                    >
                   </van-uploader>
                 </template>
               </van-field>
@@ -720,6 +726,7 @@ import { useRouter } from "vue-router";
 import { onMounted, ref } from "vue";
 import placeRegister from "@/api/placeRegister/placeRegister";
 import tools from "@/api/sys/tools";
+import $base from "@/utils/config";
 export default {
   components: { ManageList, ManageList2 },
   setup() {
@@ -746,69 +753,63 @@ export default {
         );
         placeTypeName.value = getplaceTypeN(dataitem.value.siteType);
         placeAddress.value = dataitem.value.placeSelectName;
-        if (dataitem.value.scenesImage) {
-          let array = dataitem.value.scenesImage.split("/");
-          array.forEach((item) => {
-            if (item.trim().length > 0) {
-              fileList.value.push({
-                file: {
-                  name: decodeURIComponent(
-                    item.substring(item.lastIndexOf("/") + 1)
-                  ),
-                  url: $base + item.replace("程序附件//", "程序附件/"),
-                },
-              });
-            }
+        dataitem.value.scenesImage.split("|").forEach((item) => {
+          if (item.trim().length > 0) {
             fileImg.value.push({
               name: decodeURIComponent(
                 item.substring(item.lastIndexOf("/") + 1)
               ),
               url: $base + item.replace("程序附件//", "程序附件/"),
+              id: item.replace("程序附件//", "程序附件/"),
             });
-          });
-        }
-        if (dataitem.value.etiquetteSpace) {
-          let array = dataitem.value.etiquetteSpace.split("/");
-          array.forEach((item) => {
-            if (item.trim().length > 0) {
-              fileList2.value.push({
-                file: {
-                  name: decodeURIComponent(
-                    item.substring(item.lastIndexOf("/") + 1)
-                  ),
-                  url: $base + item.replace("程序附件//", "程序附件/"),
-                },
-              });
-            }
+            fileList.value.push({
+              name: decodeURIComponent(
+                item.substring(item.lastIndexOf("/") + 1)
+              ),
+
+              url: $base + item.replace("程序附件//", "程序附件/"),
+              id: item.replace("程序附件//", "程序附件/"),
+            });
+          }
+        });
+        dataitem.value.etiquetteSpace.split("|").forEach((item) => {
+          if (item.trim().length > 0) {
             fileImg2.value.push({
               name: decodeURIComponent(
                 item.substring(item.lastIndexOf("/") + 1)
               ),
               url: $base + item.replace("程序附件//", "程序附件/"),
+              id: item.replace("程序附件//", "程序附件/"),
             });
-          });
-        }
-        if (dataitem.value.approvalProcedures) {
-          let array = dataitem.value.approvalProcedures.split("/");
-          array.forEach((item) => {
-            if (item.trim().length > 0) {
-              fileList3.value.push({
-                file: {
-                  name: decodeURIComponent(
-                    item.substring(item.lastIndexOf("/") + 1)
-                  ),
-                  url: $base + item.replace("程序附件//", "程序附件/"),
-                },
-              });
-            }
+            fileList2.value.push({
+              name: decodeURIComponent(
+                item.substring(item.lastIndexOf("/") + 1)
+              ),
+
+              url: $base + item.replace("程序附件//", "程序附件/"),
+              id: item.replace("程序附件//", "程序附件/"),
+            });
+          }
+        });
+        dataitem.value.approvalProcedures.split("|").forEach((item) => {
+          if (item.trim().length > 0) {
             fileImg3.value.push({
               name: decodeURIComponent(
                 item.substring(item.lastIndexOf("/") + 1)
               ),
               url: $base + item.replace("程序附件//", "程序附件/"),
+              id: item.replace("程序附件//", "程序附件/"),
             });
-          });
-        }
+            fileList3.value.push({
+              name: decodeURIComponent(
+                item.substring(item.lastIndexOf("/") + 1)
+              ),
+
+              url: $base + item.replace("程序附件//", "程序附件/"),
+              id: item.replace("程序附件//", "程序附件/"),
+            });
+          }
+        });
         new placeRegister()
           .queryInternetBySiteId(dataitem.value.id)
           .then(({ data }) => {
@@ -963,18 +964,32 @@ export default {
     //图片上传
     let fileList = ref([]);
     let fileImg = ref([]);
-    const afterRead1 = (file) => {
-      new tools().uploadFile(file, `logo`).then(({ data }) => {
+    const chooseImg = () => {
+      xm.chooseFile({
+        count: 1,
+        name: "file",
+        url:
+          $base +
+          `/sys/file/webupload/upload?uploadPath=religioussites/siteinfo/religiousSitesInfo`,
+        headers: {
+          "Content-Type": "multipart/form-data",
+          token: window.localStorage.getItem("MZ_TOKEN"),
+        },
+      }).then((res) => {
+        let data = res[0].data;
         data.name = decodeURIComponent(
-          data.url.substring(data.url.lastIndexOf("/") + 1)
+          data.id.substring(data.url.lastIndexOf("/") + 1)
         );
+        data.url = $base + data.url;
         fileImg.value.push(data);
+        fileList.value.push(data);
       });
     };
-    const fjdelete = (file) => {
+    // 删除文件
+    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 (fileImg.value[index]) {
             let delurl = fileImg.value[index].url;
@@ -986,18 +1001,32 @@ export default {
     };
     let fileList2 = ref([]);
     let fileImg2 = ref([]);
-    const afterRead2 = (file) => {
-      new tools().uploadFile(file, `logo`).then(({ data }) => {
+    const chooseImg2 = () => {
+      xm.chooseFile({
+        count: 1,
+        name: "file",
+        url:
+          $base +
+          `/sys/file/webupload/upload?uploadPath=religioussites/siteinfo/religiousSitesInfo`,
+        headers: {
+          "Content-Type": "multipart/form-data",
+          token: window.localStorage.getItem("MZ_TOKEN"),
+        },
+      }).then((res) => {
+        let data = res[0].data;
         data.name = decodeURIComponent(
-          data.url.substring(data.url.lastIndexOf("/") + 1)
+          data.id.substring(data.url.lastIndexOf("/") + 1)
         );
+        data.url = $base + data.url;
         fileImg2.value.push(data);
+        fileList2.value.push(data);
       });
     };
-    const fjdelete2 = (file) => {
+    // 删除文件
+    const deleteRead2 = (file) => {
       //删除文件操作
       for (let index = 0; index < fileList2.value.length; index++) {
-        if (file.file.name == fileList2.value[index].file.name) {
+        if (file.id == fileList2.value[index].id) {
           fileList2.value.splice(index, 1);
           if (fileImg2.value[index]) {
             let delurl = fileImg2.value[index].url;
@@ -1009,18 +1038,32 @@ export default {
     };
     let fileList3 = ref([]);
     let fileImg3 = ref([]);
-    const afterRead3 = (file) => {
-      new tools().uploadFile(file, `logo`).then(({ data }) => {
+    const chooseImg3 = () => {
+      xm.chooseFile({
+        count: 1,
+        name: "file",
+        url:
+          $base +
+          `/sys/file/webupload/upload?uploadPath=/religioussites/siteinfo/religiousSitesInfo`,
+        headers: {
+          "Content-Type": "multipart/form-data",
+          token: window.localStorage.getItem("MZ_TOKEN"),
+        },
+      }).then((res) => {
+        let data = res[0].data;
         data.name = decodeURIComponent(
-          data.url.substring(data.url.lastIndexOf("/") + 1)
+          data.id.substring(data.url.lastIndexOf("/") + 1)
         );
+        data.url = $base + data.url;
         fileImg3.value.push(data);
+        fileList3.value.push(data);
       });
     };
-    const fjdelete3 = (file) => {
+    // 删除文件
+    const deleteRead3 = (file) => {
       //删除文件操作
       for (let index = 0; index < fileList3.value.length; index++) {
-        if (file.file.name == fileList3.value[index].file.name) {
+        if (file.id == fileList3.value[index].id) {
           fileList3.value.splice(index, 1);
           if (fileImg3.value[index]) {
             let delurl = fileImg3.value[index].url;
@@ -1267,14 +1310,15 @@ export default {
       let dynami = JSON.stringify(internetForm.value.dynamicForm);
       const json = Object.assign(dataitem.value, { dynamicFormJson: dynami });
       dataitem.value = json;
+      //保存前附件处理
       dataitem.value.scenesImage = fileImg.value
-        .map((option) => option.url)
+        .map((option) => option.id)
         .join("|");
       dataitem.value.etiquetteSpace = fileImg2.value
-        .map((option) => option.url)
+        .map((option) => option.id)
         .join("|");
       dataitem.value.approvalProcedures = fileImg3.value
-        .map((option) => option.url)
+        .map((option) => option.id)
         .join("|");
       new placeRegister().sava(dataitem.value).then((res) => {
         if (res.status == 200) {
@@ -1295,14 +1339,14 @@ export default {
       active,
       //图片上传
       fileList,
-      afterRead1,
-      fjdelete,
+      chooseImg,
+      deleteRead,
       fileList2,
-      afterRead2,
-      fjdelete2,
+      chooseImg2,
+      deleteRead2,
       fileList3,
-      afterRead3,
-      fjdelete3,
+      chooseImg3,
+      deleteRead3,
       //宗教类型
       religiousType,
       hs_religious,

src/views/placeManage/placeTablet/placeTablet.vue

@@ -86,7 +86,28 @@ export default {
     const TabletData = ref([]);
     // 导航栏颜色
     const selectColor = ref(window.localStorage.getItem("MZ_COLOR"));
-    
+    const inputForm = ref({
+      id: "",
+      brandName: "",
+      siteName: {
+        id: "",
+      },
+      siteContact: "",
+      contactInformation: "",
+      memorialTabletHolder: "",
+      memorialTabletHolderPhone: "",
+      udCard: "",
+      nativePlace: "",
+      currentResidence: "",
+      currentResidenceDel: "",
+      relationship: "",
+      sacrificeExpenses: "",
+      position: "",
+      state: "0",
+      keepOnRecord: "0",
+      pic: "",
+      information: "",
+    });
     //搜索事件
     const show = ref(true)
     const searchName = ref("");
@@ -133,12 +154,12 @@ export default {
     const onLoad = () => {
       loading.value = true;
       finished.value = false;
-      // 异步更新数据
       //获取牌位数据
       new TabletServer()
         .list({
           current: index + 1,
           size: 11,
+          ...inputForm.value
         })
         .then(({ records, pages }) => {
           TabletData.value = TabletData.value.concat(records);

src/views/placeManage/placeTablet/placeTabletAdd.vue

@@ -109,6 +109,7 @@
       <van-field
         v-model="inputForm.nativePlace"
         readonly
+        required
         label="籍贯："
         placeholder="请选择籍贯地区"
         input-align="right"
@@ -130,6 +131,7 @@
         v-model="inputForm.currentResidence"
         center
         readonly
+        required
         label="现居地："
         placeholder="请填写现居地"
         input-align="right"
@@ -201,16 +203,10 @@
     <van-cell-group>
       <van-field name="uploader" label-align="top" label="牌位照片:">
         <template #input>
-          <van-uploader
-            v-model="fileList"
-            :after-read="afterRead1"
-            :max-count="6"
-            capture="camera"
-            accept=""
-            :before-delete="fjdelete"
-          >
-          </van-uploader>
-        </template>
+            <van-uploader readonly v-model="fileList" :max-count="5" accept="" :preview-full-image="false"
+              :before-delete="deleteRead" @click-upload="chooseImg">
+            </van-uploader>
+          </template>
       </van-field>
     </van-cell-group>
     <div class="subbtn">
@@ -226,6 +222,7 @@ import TabletServer from "@/api/tabletManage/TabletServer";
 import placePerson from "@/api/placePerson/placePerson";
 import PlaceRegister from "@/api/placeRegister/placeRegister";
 import tools from "@/api/sys/tools";
+import $base from "@/utils/config";
 export default {
   setup() {
     const onClickLeft = () => {
@@ -339,35 +336,42 @@ export default {
     //图片上传
     let fileList = ref([]);
     let fileImg = ref([]);
-    let workpic = ref("");
-    const afterRead1 = (file) => {
-      new tools()
-        .uploadFile(file, `sys/file/webupload/upload`)
-        .then(({ data }) => {
-          data.name = decodeURIComponent(
-            data.url.substring(data.url.lastIndexOf("/") + 1)
-          );
-          workpic.value += "" + data.url;
-          const json = Object.assign(inputForm.value, {
-            pic: workpic.value,
-          });
-          inputForm.value = json;
-          fileImg.value.push(data);
-        });
-    };
-    const fjdelete = (file) => {
+    const chooseImg = () => {
+      xm.chooseFile({
+        count: 1,
+        name: "file",
+        url: $base + `/sys/file/webupload/upload?uploadPath=placememorialtablets/placeMemorialTablets`,
+        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;
+        fileImg.value.push(data);
+        fileList.value.push(data)
+      })
+    }
+
+    // 删除文件
+    const deleteRead = (file) => {
       //删除文件操作
       for (let index = 0; index < fileList.value.length; index++) {
-        if (file.file == fileList.value[index].file) {
-          let delurl = fileImg.value[index].url;
-          new tools().uploadFiledelete("", delurl).then(({ data }) => {});
-          fileImg.value.splice(index, 1);
+        if (file.id == fileList.value[index].id) {
           fileList.value.splice(index, 1);
+          if (fileImg.value[index]) {
+            let delurl = fileImg.value[index].url;
+            new tools().uploadFiledelete("", delurl).then(({ data }) => { });
+            fileImg.value.splice(index, 1);
+          }
         }
       }
     };
     //数据提交
     const submit = () => {
+      inputForm.value.pic = fileImg.value
+        .map((option) => option.id)
+        .join("|");
       new TabletServer().save(inputForm.value).then((res) => {
         console.log(res);
         if (res.status == 200) {
@@ -410,9 +414,9 @@ export default {
       getPlace1,
       //图片上传
       fileList,
-      afterRead1,
+      chooseImg,
       //图片删除
-      fjdelete,
+      deleteRead,
       submit
     };
   },

src/views/placeManage/placeTablet/placeTabletInfo.vue

@@ -207,12 +207,13 @@
         <van-field name="uploader" label-align="top" label="牌位照片:">
           <template #input>
             <van-uploader
+              readonly
               v-model="fileList"
-              :after-read="afterRead1"
-              :max-count="6"
-              capture="camera"
-              accept="image"
-              :before-delete="fjdelete"
+              :max-count="5"
+              accept=""
+              :preview-full-image="false"
+              :before-delete="deleteRead"
+              @click-upload="chooseImg"
             >
             </van-uploader>
           </template>
@@ -246,38 +247,33 @@ export default {
     const router = useRouter();
     onMounted(() => {
       var id = JSON.parse(router.currentRoute.value.query.id);
-      new TabletServer().queryById(id).then((res)=>{
-        console.log(res);
-        dataitem.value = res
-        if (!dataitem.value.pic) {
-        fileList.value = [];
-      } else {
-        // 有数据处理 dataitem.value.pic
-        let pic = dataitem.value.pic;
-        let array = pic.split("|");
-        array.forEach((item) => {
+      new TabletServer().queryById(id).then((res) => {
+        dataitem.value = res;
+        dataitem.value.pic.split("|").forEach((item) => {
           if (item.trim().length > 0) {
+            fileImg.value.push({
+              name: decodeURIComponent(
+                item.substring(item.lastIndexOf("/") + 1)
+              ),
+              url: $base + item.replace("程序附件//", "程序附件/"),
+              id: item.replace("程序附件//", "程序附件/"),
+            });
             fileList.value.push({
-              file: {
-                name: decodeURIComponent(
-                  item.substring(item.lastIndexOf("/") + 1)
-                ),
-                url: $base + item.replace("程序附件//", "程序附件/")
-              },
+              name: decodeURIComponent(
+                item.substring(item.lastIndexOf("/") + 1)
+              ),
+
+              url: $base + item.replace("程序附件//", "程序附件/"),
+              id: item.replace("程序附件//", "程序附件/"),
             });
           }
-          fileImg.value.push({
-            name: decodeURIComponent(item.substring(item.lastIndexOf("/") + 1)),
-            url: $base + item.replace("程序附件//", "程序附件/"),
-          });
         });
-      }
-      let addressid = dataitem.value.siteName.id;
-      new PlaceRegister().queryById(addressid).then((res) => {
-        locationName.value = res.name;
+        let addressid = dataitem.value.siteName.id;
+        new PlaceRegister().queryById(addressid).then((res) => {
+          locationName.value = res.name;
+        });
       });
-      })
-      
+
       //籍贯接口
       new placePerson().nativePlace().then((res) => {
         nativePlace.value.push(...res);
@@ -362,24 +358,37 @@ export default {
     //图片上传
     let fileList = ref([]);
     let fileImg = ref([]);
-    const afterRead1 = (file) => {
-      new tools()
-        .uploadFile(file, `logo`)
-        .then(({ data }) => {
-          data.name = decodeURIComponent(
-            data.url.substring(data.url.lastIndexOf("/") + 1)
-          );
-          fileImg.value.push(data);
-        });
+    const chooseImg = () => {
+      xm.chooseFile({
+        count: 1,
+        name: "file",
+        url:
+          $base +
+          `/sys/file/webupload/upload?uploadPath=placememorialtablets/placeMemorialTablets`,
+        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;
+        fileImg.value.push(data);
+        fileList.value.push(data);
+      });
     };
-    const fjdelete = (file) => {
+
+    // 删除文件
+    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 (fileImg.value[index]) {
             let delurl = fileImg.value[index].url;
-            new tools().uploadFiledelete("", delurl).then(({ data }) => { });
+            new tools().uploadFiledelete("", delurl).then(({ data }) => {});
             fileImg.value.splice(index, 1);
           }
         }
@@ -391,23 +400,21 @@ export default {
     };
     //数据提交
     const submit = () => {
-      dataitem.value.pic = fileImg.value
-        .map((option) => option.url)
-        .join("|");
+      dataitem.value.pic = fileImg.value.map((option) => option.id).join("|");
       new TabletServer().save(dataitem.value).then((res) => {
-        // if (res.status == 200) {
-        //   xm.showToast({
-        //     message: "牌位信息修改成功",
-        //   });
-        //   router.push({
-        //     path: "/placeTablet",
-        //   });
-        // }else{
-        //   xm.showToast({
-        //     message: "牌位信息修改失败",
-        //   });
-        //   console.log(res);
-        // }
+        if (res.status == 200) {
+          xm.showToast({
+            message: "牌位信息修改成功",
+          });
+          // router.push({
+          //   path: "/placeTablet",
+          // });
+        }else{
+          xm.showToast({
+            message: "牌位信息修改失败",
+          });
+          console.log(res);
+        }
       });
     };
     return {
@@ -435,9 +442,9 @@ export default {
       getPlace1,
       //图片上传
       fileList,
-      afterRead1,
+      chooseImg,
       //图片删除
-      fjdelete,
+      deleteRead,
       //数据提交
       submit,
     };