소스 검색

Merge remote-tracking branch 'origin/master'

LuChongMei 2 년 전
부모
커밋
1df712868a

+ 11 - 1
src/api/placePerson/placePerson.js

@@ -14,7 +14,12 @@ export default class placePerson {
             params
         )
     };
-    //人员新增
+    queryId(id) {
+            return request.get(
+                `/zjzz/religion/queryById`, { id: id }
+            )
+        }
+        //人员新增
     save(inputForm) {
             return request.post(
                 `/user/usermanagement/userManagement/save`,
@@ -28,4 +33,9 @@ export default class placePerson {
             params
         )
     }
+    userDTOqueryId(id) {
+        return request.get(
+            `/user/usertemplate/userType/queryById`, { id: id }
+        )
+    }
 }

+ 4 - 4
src/views/placeManage/placePerson/placePerson.vue

@@ -37,7 +37,7 @@
           @load="onLoad"
         >
           <van-swipe-cell v-for="item in dataList" :key="item">
-            <div class="PersonItem" @click="goPlacePersonInfo(item)">
+            <div class="PersonItem" @click="goPlacePersonInfo(item.id)">
               <van-row>
                 <van-col span="18">
                   <p>
@@ -98,7 +98,7 @@
           @load="onLoad"
         >
           <van-swipe-cell v-for="item in PersonList" :key="item">
-            <div class="PersonItem" @click="goPlacePersonInfo(item)">
+            <div class="PersonItem" @click="goPlacePersonInfo(item.id)">
               <van-row>
                 <van-col span="18">
                   <p>
@@ -218,10 +218,10 @@ export default {
     //跳转
     let router = useRouter();
     const goPlacePersonInfo = (item) => {
-      var data = JSON.stringify(item);
+      var id = JSON.stringify(item);
       router.push({
         path: "/placePersoninfo",
-        query: { data: data },
+        query: { id: id },
       });
     };
     //进入场所录入页面

+ 165 - 434
src/views/placeManage/placePerson/placePersonAdd.vue

@@ -56,7 +56,7 @@
             <van-uploader
               v-model="fileList"
               :after-read="afterRead1"
-              :max-count="6"
+              :max-count="1"
               capture="camera"
               accept=""
               :before-delete="fjdelete"
@@ -228,7 +228,7 @@
                     @click="getsite(item)"
                   >
                     <template #right-icon>
-                      <van-radio :name="item.id" @click="getsite(item)"/>
+                      <van-radio :name="item.id" @click="getsite(item)" />
                     </template>
                   </van-cell>
                 </van-cell-group>
@@ -307,6 +307,7 @@
           v-model:show="hs_persontype"
           title="人员类型"
           show-cancel-button
+          @confirm = "changperson"
         >
           <div class="dialog">
             <van-list>
@@ -345,7 +346,7 @@
         />
         <van-dialog
           v-model:show="hs_tissue"
-          title="所属场所"
+          title="宗教组织"
           show-cancel-button
         >
           <div class="dialog">
@@ -406,261 +407,125 @@
         </van-popup>
       </van-cell-group>
       <p class="miniTitle">扩展信息</p>
-      <van-cell-group
-        v-if="
-          showZW.includes('15') &&
-          showZW.includes('17') &&
-          showZW.includes('18') &&
-          showZW.includes('19') &&
-          showZW.includes('21') &&
-          showZW.includes('22')
-        "
+      <van-col
+        span="24"
+        v-for="(item, index) in inputForm.userManagenmetDetailsDTOList"
+        :key="index"
       >
-        <van-field
-          v-model="job"
-          center
-          label="职务:"
-          placeholder="请填写职务"
-          input-align="right"
-        />
-      </van-cell-group>
-      <van-cell-group v-if="showZW.includes('3')">
-        <van-field
-          v-model="teachPosition"
-          readonly
-          label="教职身份:"
-          name="validator"
-          placeholder="请选择教职身份"
-          input-align="right"
-          right-icon="arrow-down"
-          @click="hs_teach = true"
-        />
-        <van-popup v-model:show="hs_teach" round position="bottom">
-          <van-picker
-            title="教职身份"
-            :columns="teach"
-            @cancel="hs_teach = false"
-            @confirm="getteach"
+        <van-cell-group
+          v-if="item.dataType === '1' && item.dataDictionary == ''"
+        >
+          <van-field
+            v-model="item.value"
+            center
+            placeholder="请填写内容"
+            :label="item.chineseName"
+            input-align="right"
           />
-        </van-popup>
-      </van-cell-group>
-      <van-cell-group v-if="showZW.includes('3')">
-        <van-field
-          v-model="Religiouseducation"
-          readonly
-          label-width="6.5em"
-          label="宗教教育程度:"
-          name="validator"
-          placeholder="请选择宗教教育程度"
-          input-align="right"
-          right-icon="arrow-down"
-          @click="hs_Reducation = true"
-        />
-        <van-popup v-model:show="hs_Reducation" round position="bottom">
-          <van-picker
-            title="宗教教育程度"
-            :columns="Reducation"
-            @cancel="hs_Reducation = false"
-            @confirm="getReducation"
+        </van-cell-group>
+        
+        <van-cell-group v-else-if="item.dataType && item.dataDictionary != ''">
+          vhsjhf{{item.value}}
+          <van-field
+            v-model="teachPosition"
+            center
+            :label="item.chineseName"
+            placeholder="请选择"
+            input-align="right"
+            right-icon="arrow-down"
+            @click="hs_select = true"
           />
-        </van-popup>
-      </van-cell-group>
-      <van-cell-group v-if="showZW.includes('3')">
-        <van-field
-          v-model="finishschoolName"
-          center
-          label-width="6.5em"
-          label="宗教毕业院校:"
-          placeholder="请填写宗教毕业院校"
-          input-align="right"
-        />
-      </van-cell-group>
-      <van-cell-group v-if="showZW.includes('3')">
-        <van-field
-          v-model="certificateNumber"
-          center
-          label-width="6.5em"
-          label="教职证书号:"
-          placeholder="请填写教职证书号"
-          input-align="right"
-        />
-      </van-cell-group>
-      <van-cell-group v-if="showZW.includes('3')">
-        <van-field
-          v-model="issueDate"
-          center
-          label-width="6.5em"
-          label="证书颁发时间:"
-          placeholder="请填写证书颁发时间"
-          input-align="right"
-          @click="hs_issueDate = true"
-        />
-        <van-popup v-model:show="hs_issueDate" round position="bottom">
-          <van-date-picker
-            v-model="currentDate"
-            title="选择日期"
-            :min-date="minDate"
-            :max-date="maxDate"
-            @cancel="hs_issueDate = false"
-            @confirm="getissueDate"
+          <van-popup v-model:show="hs_select" round position="bottom" >
+            <van-picker
+              :columns="$dictUtils.getDictList(item.dataDictionary)"
+              :columns-field-names="{
+                text: 'label',
+                value: 'value',
+              }"
+              @cancel="hs_select = false"
+              @confirm="getselect"
+            />
+          </van-popup>
+        </van-cell-group>
+        <van-cell-group v-else-if="item.dataType === '2'">
+          <van-field
+            v-model="item.value"
+            center
+            :label="item.chineseName"
+            input-align="right"
           />
-        </van-popup>
-      </van-cell-group>
-      <van-cell-group v-if="showZW.includes('3')">
-        <van-field
-          v-model="certificateUnit"
-          center
-          label-width="6.5em"
-          label="证书颁发单位:"
-          placeholder="请填写证书颁发单位"
-          input-align="right"
-        />
-      </van-cell-group>
-      <van-cell-group v-if="showZW.includes('3')">
-        <van-field
-          v-model="recordDate"
-          center
-          label="备案时间:"
-          placeholder="请填写备案时间"
-          input-align="right"
-          @click="hs_recordDate = true"
-        />
-        <van-popup v-model:show="hs_recordDate" round position="bottom">
-          <van-date-picker
-            v-model="currentDate"
-            title="选择日期"
-            :min-date="minDate"
-            :max-date="maxDate"
-            @cancel="hs_recordDate = false"
-            @confirm="getrecordDate"
+        </van-cell-group>
+        <van-cell-group v-else-if="item.dataType === '3'">
+          <van-field
+            :v-model="item.value"
+            center
+            :label="item.chineseName"
+            input-align="right"
           />
-        </van-popup>
-      </van-cell-group>
-      <van-cell-group v-if="showZW.includes('3')">
-        <van-field
-          v-model="authorityName"
-          center
-          label-width="6.5em"
-          label="备案机关名称:"
-          placeholder="请填写备案机关名称"
-          input-align="right"
-        />
-      </van-cell-group>
-      <van-cell-group v-if="showZW.includes('3')">
-        <van-field
-          v-model="schoolName"
-          center
-          label-width="6.5em"
-          label="宗教院校名称:"
-          placeholder="请填写宗教院校名称"
-          input-align="right"
-        />
-      </van-cell-group>
-      <van-cell-group v-if="showZW.includes('3')">
-        <van-field
-          v-model="takeoffice"
-          center
-          label-width="6.5em"
-          label="院校任职情况:"
-          placeholder="请填写院校任职情况"
-          input-align="right"
-        />
-      </van-cell-group>
-      <van-cell-group v-if="showZW.includes('16')">
-        <van-field
-          v-model="operateName"
-          center
-          label-width="6.5em"
-          label="网络运营类型:"
-          placeholder="请填写网络运营类型"
-          input-align="right"
-          @click="hs_operate = true"
-        />
-        <van-popup v-model:show="hs_operate" round position="bottom">
-          <van-picker
-            title="网络运营类型"
-            :columns="operate"
-            @cancel="hs_operate = false"
-            @confirm="getoperate"
-          />
-        </van-popup>
-      </van-cell-group>
-      <van-cell-group v-if="showZW.includes('18')">
-        <van-field
-          v-model="journalistName"
-          center
-          label-width="6.5em"
-          label="记者类型:"
-          placeholder="请填写记者类型"
-          input-align="right"
-          @click="hs_journalist = true"
-        />
-        <van-popup v-model:show="hs_journalist" round position="bottom">
-          <van-picker
-            title="记者类型"
-            :columns="journalistn"
-            @cancel="hs_journalist = false"
-            @confirm="getjournalist"
+        </van-cell-group>
+        <van-cell-group v-else-if="item.dataType === '4'">
+          <van-field
+            name="uploader"
+            label-align="top"
+            :label="item.chineseName"
+          >
+            <template #input>
+              <van-uploader
+                v-model="fileList"
+                :after-read="afterRead1"
+                :max-count="1"
+                capture="camera"
+                accept=""
+                :before-delete="fjdelete"
+              >
+              </van-uploader>
+            </template>
+          </van-field>
+        </van-cell-group>
+        <van-cell-group v-else-if="item.dataType === '5'">
+          <van-field
+            v-model="item.value"
+            center
+            required
+            readonly
+            :label="item.chineseName"
+            placeholder="请选择地点"
+            input-align="right"
+            right-icon="arrow-down"
+            @click="showPlace1 = true"
           />
-        </van-popup>
-      </van-cell-group>
-      <van-cell-group v-if="showZW.includes('6') && showZW.includes('19')">
-        <van-field
-          v-model="overseas"
-          center
-          label-width="6.5em"
-          label="境外来源地:"
-          placeholder="请填写境外来源地"
-          input-align="right"
-        />
-      </van-cell-group>
-      <van-cell-group
-        v-if="
-          showZW.includes('20') &&
-          showZW.includes('21') &&
-          showZW.includes('22')
-        "
-      >
-        <van-field
-          v-model="faction"
-          center
-          label-width="6.5em"
-          label="派别:"
-          placeholder="请填写派别"
-          input-align="right"
-        />
-      </van-cell-group>
-      <van-cell-group v-if="showZW.includes('7')">
-        <van-field
-          v-model="cityOutaddress"
-          center
-          label-width="6.5em"
-          label="市外来源地:"
-          placeholder="请填写市外来源地"
-          input-align="right"
-        />
-      </van-cell-group>
-      <!-- 教别2 -->
-      <van-cell-group v-if="showZW.includes('8')">
-        <van-field
-          v-model="religiousName2"
-          readonly
-          label="教别:"
-          name="validator"
-          placeholder="请选择教别"
-          input-align="right"
-          right-icon="arrow-down"
-          @click="hs_religious2 = true"
-        />
-        <van-popup v-model:show="hs_religious2" round position="bottom">
-          <van-picker
-            title="教别"
-            :columns="religious2"
-            @cancel="hs_religious2 = false"
-            @confirm="getreligious2"
+          <van-popup v-model:show="showPlace1" round position="bottom">
+            <van-picker
+              title="地点选择"
+              :columns="options"
+              :columns-field-names="customFieldName"
+              @cancel="showPlace1 = false"
+              @confirm="getPlace1"
+            />
+          </van-popup>
+        </van-cell-group>
+        <van-cell-group v-else-if="item.dataType === '6'">
+          <van-field
+            v-model="item.value"
+            center
+            :label="item.chineseName"
+            label-width="6.5em"
+            placeholder="请选择日期时间"
+            input-align="right"
+            right-icon="arrow-down"
+            @click="hs_Date = true"
           />
-        </van-popup>
-      </van-cell-group>
+          <van-popup v-model:show="hs_Date" round position="bottom">
+            <van-date-picker
+              title="选择日期"
+              :min-date="minDate"
+              :max-date="maxDate"
+              @cancel="hs_Date = false"
+              @confirm="getDate"
+            />
+          </van-popup>
+        </van-cell-group>
+      </van-col>
     </div>
     <div class="subbtn">
       <van-button type="primary" @click="submit">提交</van-button>
@@ -719,33 +584,6 @@ export default {
       },
       bkcheck: "",
     });
-    // 职务
-    const job = ref("");
-    //教职身份
-    const teachType = ref("");
-    //宗教教育程度
-    const religiousType = ref("");
-    // 宗教毕业院校
-    const religiousScool = ref("");
-    //教职证书号
-    const certificateNumber = ref("");
-    //证书颁发单位
-    const certificateUnit = ref("");
-    //备案机关名称
-    const authorityName = ref("");
-    // 宗教毕业院校
-    const finishschoolName = ref("");
-    //宗教院校名称
-    const schoolName = ref("");
-    //院校任职情况
-    const takeoffice = ref("");
-    //境外来源地
-    const overseas = ref("");
-    //派别
-    const faction = ref("");
-    //市外来源地
-    const cityOutaddress = ref("");
-    const locationName = ref("");
     onMounted(() => {
       //籍贯接口
       new placePerson().nativePlace().then((res) => {
@@ -830,7 +668,7 @@ export default {
       { text: "藏族", value: "55" },
       { text: "壮族", value: "56" },
       { text: "其他", value: "57" },
-    ]
+    ];
     let hs_nation = ref(false);
     const getnation = ({ selectedOptions }) => {
       hs_nation.value = false;
@@ -912,12 +750,13 @@ export default {
       religiousName2.value = selectedOptions[0].text;
     };
     // 所属场所
+    const locationName = ref('');
     const checked = ref("");
     const sitelist = ref([]);
     let hs_site = ref(false);
     const getsite = (val) => {
       console.log(val);
-      let id = '';
+      let id = "";
       id = val.id;
       locationName.value = val.name;
       const json = Object.assign(inputForm.value, { location: { id: id } });
@@ -1009,7 +848,7 @@ export default {
     let workpic = ref("");
     const afterRead1 = (file) => {
       new tools()
-        .uploadFile(file, `sys/file/webupload/upload`)
+        .uploadFile(file, `logo`)
         .then(({ data }) => {
           data.name = decodeURIComponent(
             data.url.substring(data.url.lastIndexOf("/") + 1)
@@ -1132,15 +971,37 @@ export default {
     let hs_persontype = ref(false);
     const toggle = (index) => {
       checkboxRefs.value[index].toggle();
-      let str = "";
-      str = checked2.value.join();
+      personnalType.value = getValue(checked2.value).join();
+      showZW.value = checked2.value.join();;
+    };
+    const changperson = ()=>{
       const json = Object.assign(
         { ...inputForm.value },
-        { personnelType: str }
+        { personnelType: showZW.value }
       );
       inputForm.value = json;
-      personnalType.value = getValue(checked2.value).join();
-      showZW.value = str;
+      changePersonnelType();
+    }
+    const changePersonnelType = () => {
+      let userManagenmetDetailsDTOList = [];
+      new placePerson().userDTOqueryId(inputForm.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);
+        });
+        inputForm.value.userManagenmetDetailsDTOList = userManagenmetDetailsDTOList
+        console.log(inputForm.value.userManagenmetDetailsDTOList,'================================>inputForm.value.userManagenmetDetailsDTOList');
+      });
     };
     onBeforeUpdate(() => {
       checkboxRefs.value = [];
@@ -1191,49 +1052,18 @@ export default {
       inputForm.value = json;
       activitytext.value = selectedOptions[0].text;
     };
-    // 教职身份
+    // 扩展信息选择
     const teachPosition = ref("");
-    const teach = [
-      { text: "阿訇", value: "1" },
-      { text: "牧师", value: "2" },
-      { text: "长老", value: "3" },
-      { text: "传道员", value: "4" },
-      { text: "神学生", value: "5" },
-      { text: "道士(正一)", value: "6" },
-      { text: "比丘", value: "7" },
-      { text: "教师(副牧师)", value: "8" },
-      { text: "比丘尼", value: "9" },
-    ];
-    let hs_teach = ref(false);
-    const getteach = ({ selectedOptions }) => {
-      hs_teach.value = false;
-      teachType.value = selectedOptions[0].value;
-      teachPosition.value = selectedOptions[0].text;
+    let hs_select = ref(false);
+    const getselect = ({selectedOptions,selectedIndexes}) => {
+      hs_select.value = false;
+      teachPosition.value = selectedOptions[0].value;
     };
-    // 宗教教育程度
-    const Religiouseducation = ref("");
-    const Reducation = [
-      { text: "小学", value: "1" },
-      { text: "初中", value: "2" },
-      { text: "中专", value: "3" },
-      { text: "高中", value: "4" },
-      { text: "大专", value: "5" },
-      { text: "本科", value: "6" },
-      { text: "硕士研究生", value: "7" },
-      { text: "博士研究生", value: "8" },
-      { text: "其他", value: "9" },
-    ];
-    let hs_Reducation = ref(false);
-    const getReducation = ({ selectedOptions }) => {
-      hs_Reducation.value = false;
-      religiousType.value = selectedOptions[0].value;
-      Religiouseducation.value = selectedOptions[0].text;
-    };
-    // 证书颁发时间
+    // 扩展信息的时间
     const issueDate = ref("");
-    let hs_issueDate = ref(false);
-    const getissueDate = ({ selectedOptions }) => {
-      hs_issueDate.value = false;
+    let hs_Date = ref(false);
+    const getDate = ({ selectedOptions }) => {
+      hs_Date.value = false;
       issueDate.value =
         selectedOptions[0].text +
         "-" +
@@ -1241,80 +1071,13 @@ export default {
         "-" +
         selectedOptions[2].text;
     };
-    // 备案时间
-    const recordDate = ref("");
-    let hs_recordDate = ref(false);
-    const getrecordDate = ({ selectedOptions }) => {
-      hs_recordDate.value = false;
-      recordDate.value =
-        selectedOptions[0].text +
-        "-" +
-        selectedOptions[1].text +
-        "-" +
-        selectedOptions[2].text;
-    };
-    //记者类型
-    const journalistName = ref("");
-    const journalistName2 = ref("");
-    const journalistn = [
-      { text: "境内", value: "1" },
-      { text: "境外", value: "2" },
-    ];
-    let hs_journalistn = ref(false);
-    const getjournalistn = ({ selectedOptions }) => {
-      hs_journalistn.value = false;
-      journalistName2.value = selectedOptions[0].value;
-      journalistName.value = selectedOptions[0].text;
-    };
-    //网络运营类型
-    const operateName = ref("");
-    const operateName2 = ref("");
-    const operate = [
-      { text: "网络主播", value: "1" },
-      { text: "微博", value: "2" },
-      { text: "微信", value: "3" },
-      { text: "抖音", value: "4" },
-      { text: "快手", value: "5" },
-      { text: "淘宝", value: "6" },
-      { text: "QQ", value: "7" },
-    ];
-    let hs_operate = ref(false);
-    const getoperate = ({ selectedOptions }) => {
-      hs_operate.value = false;
-      operateName2.value = selectedOptions[0].value;
-      operateName.value = selectedOptions[0].text;
-    };
     //跳转
     let router = useRouter();
+    const handleAvatarSuccess1 = (row, res, file, filelist) => {
+      row.value = res.url;
+    };
     //数据提交
     const submit = () => {
-      const list = [
-        { chineseName: "职务", value: job.value },
-        { chineseName: "教职身份", value: teachType.value },
-        { chineseName: "宗教教育程度", value: religiousType.value },
-        { chineseName: "宗教毕业院校", value: finishschoolName.value },
-        { chineseName: "教职证书号", value: certificateNumber.value },
-        { chineseName: "证书颁发时间", value: issueDate.value },
-        { chineseName: "证书颁发单位", value: certificateUnit.value },
-        { chineseName: "备案时间", value: recordDate.value },
-        { chineseName: "备案机关名称", value: authorityName.value },
-        { chineseName: "宗教院校名称", value: schoolName.value },
-        { chineseName: "院校任职情况", value: takeoffice.value },
-        { chineseName: "网络运营类型", value: operateName2.value },
-        { chineseName: "记者类型", value: journalistName2.value },
-        { chineseName: "境外来源地", value: overseas.value },
-        { chineseName: "派别", value: faction.value },
-        { chineseName: "市外来源地", value: cityOutaddress.value },
-        { chineseName: "教别", value: religioustype2.value },
-      ];
-      let newList = [];
-      newList = list.filter((item) => {
-        return item.value != "";
-      });
-      const json = Object.assign(inputForm.value, {
-        userManagenmetDetailsDTOList: newList,
-      });
-      inputForm.value = json;
       new placePerson().save(inputForm.value).then((res) => {
         console.log(res);
         if (res.status == 200) {
@@ -1324,7 +1087,7 @@ export default {
           router.push({
             path: "/placePerson",
           });
-        }else{
+        } else {
           xm.showToast({
             message: "人员添加失败",
           });
@@ -1402,6 +1165,7 @@ export default {
       persontype,
       hs_persontype,
       toggle,
+      changperson,
       checkboxRefs,
       showZW,
       // 是否参加非法活动
@@ -1411,33 +1175,12 @@ export default {
       activitytext,
       //教职身份
       teachPosition,
-      teach,
-      hs_teach,
-      getteach,
-      //宗教教育程度
-      Religiouseducation,
-      Reducation,
-      hs_Reducation,
-      getReducation,
+      hs_select,
+      getselect,
       //证书颁发时间
-      hs_issueDate,
+      hs_Date,
       issueDate,
-      getissueDate,
-      //备案时间
-      hs_recordDate,
-      recordDate,
-      getrecordDate,
-      //记者类型
-      journalistName,
-      journalistn,
-      hs_journalistn,
-      getjournalistn,
-      //网络运营类型
-      operate,
-      operateName,
-      operateName2,
-      hs_operate,
-      getoperate,
+      getDate,
       //图片上传
       fileList,
       afterRead1,
@@ -1453,18 +1196,6 @@ export default {
       showPlace1,
       getPlace1,
       options,
-      //userList数组
-      job,
-      religiousScool,
-      certificateNumber,
-      certificateUnit,
-      authorityName,
-      schoolName,
-      takeoffice,
-      overseas,
-      faction,
-      cityOutaddress,
-      finishschoolName,
       //数据提交
       submit,
       selectColor,

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 884 - 183
src/views/placeManage/placePerson/placePersoninfo.vue


+ 268 - 159
src/views/placeManage/placeRegister/placeRegisterInfo.vue

@@ -308,18 +308,18 @@
             </van-cell-group>
             <van-cell-group>
               <van-field
-              v-model="dataitem.approvedEstablishmentTime"
-              center
-              required
-              clearable
-              readonly
-              label-width="8em"
-              label="批准设立时间:"
-              input-align="right"
-              right-icon="arrow-down"
-              placeholder="请选择批准设立时间"
-              @click="hs_SetupTime = true"
-            />
+                v-model="dataitem.approvedEstablishmentTime"
+                center
+                required
+                clearable
+                readonly
+                label-width="8em"
+                label="批准设立时间:"
+                input-align="right"
+                right-icon="arrow-down"
+                placeholder="请选择批准设立时间"
+                @click="hs_SetupTime = true"
+              />
             </van-cell-group>
             <van-cell-group>
               <van-field
@@ -334,17 +334,17 @@
             </van-cell-group>
             <van-cell-group>
               <van-field
-              v-model="dataitem.registrationDate"
-              center
-              required
-              readonly
-              clearable
-              label="登记日期:"
-              right-icon="arrow-down"
-              input-align="right"
-              placeholder="请选择登记日期"
-              @click="hs_SignTime = true"
-            />
+                v-model="dataitem.registrationDate"
+                center
+                required
+                readonly
+                clearable
+                label="登记日期:"
+                right-icon="arrow-down"
+                input-align="right"
+                placeholder="请选择登记日期"
+                @click="hs_SignTime = true"
+              />
             </van-cell-group>
             <van-cell-group>
               <van-field
@@ -418,7 +418,7 @@
           <template #title> <van-icon name="desktop-o" />互联网专区 </template>
           <div style="padding: 0 10px; height: 470px; overflow: auto">
             <div style="overflow: hidden">
-              <p style="font-weight: 700;font-size: 14px;">
+              <p style="font-weight: 700; font-size: 14px">
                 直播间<van-button
                   type="primary"
                   size="mini"
@@ -427,7 +427,7 @@
                   >新增</van-button
                 >
               </p>
-              <div v-for="(item) in internetForm.zbjForm" :key="item.key">
+              <div v-for="item in internetForm.zbjForm" :key="item.key">
                 <van-cell-group>
                   <van-field
                     v-model="item.typeName"
@@ -476,7 +476,7 @@
                   />
                 </van-cell-group>
                 <van-button
-                  @click="removeForm(item,'直播间')"
+                  @click="removeForm(item, '直播间')"
                   type="danger"
                   size="mini"
                   color="#e6a23c"
@@ -485,7 +485,7 @@
               </div>
             </div>
             <div style="overflow: hidden">
-              <p style="font-weight: 700;font-size: 14px;">
+              <p style="font-weight: 700; font-size: 14px">
                 公众号<van-button
                   type="primary"
                   size="mini"
@@ -494,7 +494,7 @@
                   >新增</van-button
                 >
               </p>
-              <div v-for="(item) in internetForm.gzhForm" :key="item.key">
+              <div v-for="item in internetForm.gzhForm" :key="item.key">
                 <van-cell-group>
                   <van-field
                     v-model="item.account"
@@ -529,7 +529,7 @@
                   />
                 </van-cell-group>
                 <van-button
-                  @click="removeForm(item,'公众号')"
+                  @click="removeForm(item, '公众号')"
                   type="danger"
                   size="mini"
                   color="#e6a23c"
@@ -538,7 +538,7 @@
               </div>
             </div>
             <div style="overflow: hidden">
-              <p style="font-weight: 700;font-size: 14px;">
+              <p style="font-weight: 700; font-size: 14px">
                 微信群<van-button
                   type="primary"
                   size="mini"
@@ -547,7 +547,7 @@
                   >新增</van-button
                 >
               </p>
-              <div v-for="(item) in internetForm.wxqForm" :key="item.key">
+              <div v-for="item in internetForm.wxqForm" :key="item.key">
                 <van-cell-group>
                   <van-field
                     v-model="item.account"
@@ -582,7 +582,7 @@
                   />
                 </van-cell-group>
                 <van-button
-                  @click="removeForm(item,'微信群')"
+                  @click="removeForm(item, '微信群')"
                   type="danger"
                   size="mini"
                   color="#e6a23c"
@@ -667,10 +667,7 @@
       @confirm="reselected"
       width="100%"
     >
-      <manage-list
-        @selected="selected"
-        :type="0"
-      ></manage-list>
+      <manage-list @selected="selected" :type="0"></manage-list>
     </van-dialog>
     <!-- 公安部门人员 -->
     <van-dialog
@@ -680,9 +677,7 @@
       @confirm="reselected2"
       width="100%"
     >
-      <manage-list-2
-        @selected2="selected2"
-      ></manage-list-2>
+      <manage-list-2 @selected2="selected2"></manage-list-2>
     </van-dialog>
     <!-- 直播类型 -->
     <van-popup v-model:show="showzbj" round position="bottom">
@@ -752,12 +747,74 @@ export default {
         placeTypeName.value = getplaceTypeN(dataitem.value.siteType);
         placeAddress.value = dataitem.value.placeSelectName;
         if (dataitem.value.scenesImage) {
-          fileList.value = dataitem.value.scenesImage.split("/");
+          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("程序附件//", "程序附件/"),
+                },
+              });
+            }
+            fileImg.value.push({
+              name: decodeURIComponent(
+                item.substring(item.lastIndexOf("/") + 1)
+              ),
+              url: $base + 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("程序附件//", "程序附件/"),
+                },
+              });
+            }
+            fileImg2.value.push({
+              name: decodeURIComponent(
+                item.substring(item.lastIndexOf("/") + 1)
+              ),
+              url: $base + 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("程序附件//", "程序附件/"),
+                },
+              });
+            }
+            fileImg3.value.push({
+              name: decodeURIComponent(
+                item.substring(item.lastIndexOf("/") + 1)
+              ),
+              url: $base + item.replace("程序附件//", "程序附件/"),
+            });
+          });
         }
-        new placeRegister().queryInternetBySiteId(dataitem.value.id).then(({data})=>{
-          dynamicFormDataClear();
-          dynamicFormDataProceed(data);
-        })
+        new placeRegister()
+          .queryInternetBySiteId(dataitem.value.id)
+          .then(({ data }) => {
+            dynamicFormDataClear();
+            dynamicFormDataProceed(data);
+          });
       });
     });
     //详细地址定位
@@ -766,7 +823,7 @@ export default {
         placeActivity.placeData.place = data.POIName;
       });
     };
-    
+
     // 地区选择
     let placeAddress = ref("");
     const customFieldName = {
@@ -907,72 +964,69 @@ 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)
-          );
-          dataitem.value.scenesImage += "" + data.url;
-          fileImg.value.push(data);
-        });
+      new tools().uploadFile(file, `logo`).then(({ data }) => {
+        data.name = decodeURIComponent(
+          data.url.substring(data.url.lastIndexOf("/") + 1)
+        );
+        fileImg.value.push(data);
+      });
     };
     const fjdelete = (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.file.name == fileList.value[index].file.name) {
           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)
-          );
-          dataitem.value.etiquetteSpace += "" + data.url;
-          fileImg2.value.push(data);
-        });
+      new tools().uploadFile(file, `logo`).then(({ data }) => {
+        data.name = decodeURIComponent(
+          data.url.substring(data.url.lastIndexOf("/") + 1)
+        );
+        fileImg2.value.push(data);
+      });
     };
     const fjdelete2 = (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.file.name == fileList2.value[index].file.name) {
           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)
-          );
-          dataitem.value.approvalProcedures += "" + data.url;
-          fileImg3.value.push(data);
-        });
+      new tools().uploadFile(file, `logo`).then(({ data }) => {
+        data.name = decodeURIComponent(
+          data.url.substring(data.url.lastIndexOf("/") + 1)
+        );
+        fileImg3.value.push(data);
+      });
     };
     const fjdelete3 = (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.file.name == fileList3.value[index].file.name) {
           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);
+          }
         }
       }
     };
@@ -1013,23 +1067,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({
@@ -1038,83 +1098,123 @@ export default {
       wxqForm: [],
       dynamicForm: [],
     });
-    const addForm = (type)=>{
+    const addForm = (type) => {
       let data_add = [];
-      if (type == '直播间') { data_add = internetForm.value.zbjForm }
-      else if (type == '公众号') { data_add = internetForm.value.gzhForm }
-      else { data_add = internetForm.value.wxqForm }
-      data_add.push(
-        {key: randomString(12), siteId: dataitem.value.id, type: type, typeChild: '', account: '', manager: '', contact: ''}
-      );
-    }
-    const randomString = (len)=>{
+      if (type == "直播间") {
+        data_add = internetForm.value.zbjForm;
+      } else if (type == "公众号") {
+        data_add = internetForm.value.gzhForm;
+      } else {
+        data_add = internetForm.value.wxqForm;
+      }
+      data_add.push({
+        key: randomString(12),
+        siteId: dataitem.value.id,
+        type: type,
+        typeChild: "",
+        account: "",
+        manager: "",
+        contact: "",
+      });
+    };
+    const randomString = (len) => {
       len = len || 32;
-      var $chars = 'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678';    /****默认去掉了容易混淆的字符oOLl,9gq,Vv,Uu,I1****/
+      var $chars =
+        "ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678"; /****默认去掉了容易混淆的字符oOLl,9gq,Vv,Uu,I1****/
       var maxPos = $chars.length;
-      var pwd = '';
+      var pwd = "";
       for (let i = 0; i < len; i++) {
         pwd += $chars.charAt(Math.floor(Math.random() * maxPos));
       }
       return pwd;
-    }
-    const removeForm = (item,type)=>{
+    };
+    const removeForm = (item, type) => {
       let data_add = [];
-      if (type == '直播间') { data_add = internetForm.value.zbjForm }
-      else if (type == '公众号') { data_add = internetForm.value.gzhForm }
-      else { data_add = internetForm.value.wxqForm }
+      if (type == "直播间") {
+        data_add = internetForm.value.zbjForm;
+      } else if (type == "公众号") {
+        data_add = internetForm.value.gzhForm;
+      } else {
+        data_add = internetForm.value.wxqForm;
+      }
 
-      let index = data_add.indexOf(item)
+      let index = data_add.indexOf(item);
 
       if (index !== -1) {
-        data_add.splice(index, 1)
+        data_add.splice(index, 1);
       }
-    }
-    const hlwToSubmit = ()=>{
+    };
+    const hlwToSubmit = () => {
       internetForm.value.dynamicForm = [];
-      internetForm.value.zbjForm.forEach(ele=>{
-        if (ele.account != '' || ele.manager != '' || ele.contact != '') {
+      internetForm.value.zbjForm.forEach((ele) => {
+        if (ele.account != "" || ele.manager != "" || ele.contact != "") {
           internetForm.value.dynamicForm.push(ele);
         }
-      })
-      internetForm.value.gzhForm.forEach(ele=>{
-        if (ele.account != '' || ele.manager != '' || ele.contact != '') {
+      });
+      internetForm.value.gzhForm.forEach((ele) => {
+        if (ele.account != "" || ele.manager != "" || ele.contact != "") {
           internetForm.value.dynamicForm.push(ele);
         }
-      })
-      internetForm.value.wxqForm.forEach(ele=>{
-        if (ele.account != '' || ele.manager != '' || ele.contact != '') {
+      });
+      internetForm.value.wxqForm.forEach((ele) => {
+        if (ele.account != "" || ele.manager != "" || ele.contact != "") {
           internetForm.value.dynamicForm.push(ele);
         }
-      })
-    }
-    const dynamicFormDataProceed = (initial_form)=>{
+      });
+    };
+    const dynamicFormDataProceed = (initial_form) => {
       if (!initial_form || initial_form.length == 0) {
         initial_form = [
-          {key: randomString(12), siteId: dataitem.value.id, type: '直播间', typeChild: '', account: '', manager: '', contact: ''},
-          {key: randomString(12), siteId: dataitem.value.id, type: '公众号', typeChild: '', account: '', manager: '', contact: ''},
-          {key: randomString(12), siteId: dataitem.value.id, type: '微信群', typeChild: '', account: '', manager: '', contact: ''}
+          {
+            key: randomString(12),
+            siteId: dataitem.value.id,
+            type: "直播间",
+            typeChild: "",
+            account: "",
+            manager: "",
+            contact: "",
+          },
+          {
+            key: randomString(12),
+            siteId: dataitem.value.id,
+            type: "公众号",
+            typeChild: "",
+            account: "",
+            manager: "",
+            contact: "",
+          },
+          {
+            key: randomString(12),
+            siteId: dataitem.value.id,
+            type: "微信群",
+            typeChild: "",
+            account: "",
+            manager: "",
+            contact: "",
+          },
         ];
       }
 
-      initial_form.forEach(ele=>{
+      initial_form.forEach((ele) => {
         if (ele.id) {
           ele.key = ele.id;
         }
-        if (ele.type == '直播间') {
-          ele.typeName = getzbjType2(ele.typeChild)
-          internetForm.value.zbjForm.push(ele) 
-        }else if (ele.type == '公众号') { 
-          internetForm.value.gzhForm.push(ele) 
+        if (ele.type == "直播间") {
+          ele.typeName = getzbjType2(ele.typeChild);
+          internetForm.value.zbjForm.push(ele);
+        } else if (ele.type == "公众号") {
+          internetForm.value.gzhForm.push(ele);
+        } else {
+          internetForm.value.wxqForm.push(ele);
         }
-        else { internetForm.value.wxqForm.push(ele) }
-      })
-    }
-    const dynamicFormDataClear = ()=>{
+      });
+    };
+    const dynamicFormDataClear = () => {
       internetForm.value.zbjForm = [];
       internetForm.value.gzhForm = [];
       internetForm.value.wxqForm = [];
       internetForm.value.dynamicForm = [];
-    }
+    };
     // 直播间类型
     // const zbjTypeName = ref("");
     const zbj = [
@@ -1138,24 +1238,24 @@ export default {
         5: "快手",
         6: "YY直播",
         7: "淘宝直播",
-        8: "京东直播"
+        8: "京东直播",
       };
       return typeObject[type];
     };
-    const nowIndex = ref('');
+    const nowIndex = ref("");
     const showNew = (key) => {
       showzbj.value = true;
       nowIndex.value = key;
-    }
+    };
     let showzbj = ref(false);
     const getzbj = ({ selectedOptions }) => {
       showzbj.value = false;
-      internetForm.value.zbjForm.forEach(item=>{
-        if(item.key == nowIndex.value){
-          item.typeName = selectedOptions[0].text
-          item.typeChild = selectedOptions[0].value
+      internetForm.value.zbjForm.forEach((item) => {
+        if (item.key == nowIndex.value) {
+          item.typeName = selectedOptions[0].text;
+          item.typeChild = selectedOptions[0].value;
         }
-      })
+      });
     };
     //返回
     const onClickLeft = () => {
@@ -1165,14 +1265,23 @@ export default {
     const submit = () => {
       hlwToSubmit();
       let dynami = JSON.stringify(internetForm.value.dynamicForm);
-      const json = Object.assign(dataitem.value,{dynamicFormJson:dynami})
-      dataitem.value = json
+      const json = Object.assign(dataitem.value, { dynamicFormJson: dynami });
+      dataitem.value = json;
+      dataitem.value.scenesImage = fileImg.value
+        .map((option) => option.url)
+        .join("|");
+      dataitem.value.etiquetteSpace = fileImg2.value
+        .map((option) => option.url)
+        .join("|");
+      dataitem.value.approvalProcedures = fileImg3.value
+        .map((option) => option.url)
+        .join("|");
       new placeRegister().sava(dataitem.value).then((res) => {
         if (res.status == 200) {
           xm.showToast({
             message: "修改成功",
           });
-        }else{
+        } else {
           xm.showToast({
             message: "修改失败",
           });
@@ -1238,13 +1347,13 @@ export default {
       hs_SignTime,
       getSignTime,
       // 互联网专区
-     internetForm,
-     addForm,
-     removeForm,
-     zbj,
-     showzbj,
-     getzbj,
-     showNew,
+      internetForm,
+      addForm,
+      removeForm,
+      zbj,
+      showzbj,
+      getzbj,
+      showNew,
       //数据提交
       submit,
     };

+ 3 - 3
src/views/placeManage/placeTablet/placeTablet.vue

@@ -32,7 +32,7 @@
         @load="onLoad"
       >
         <van-swipe-cell v-for="item in TabletData" :key="item">
-          <div class="list-item" @click="goTabletInfo(item)">
+          <div class="list-item" @click="goTabletInfo(item.id)">
             <div class="item_top">
               <div class="item_top_left">
                 {{ item.brandName }}
@@ -120,10 +120,10 @@ export default {
     //页面跳转以及数据传递
     let router = useRouter();
     const goTabletInfo = (item) => {
-      var data = JSON.stringify(item);
+      var id = JSON.stringify(item);
       router.push({
         path: "/placeTabletInfo",
-        query: { data: data },
+        query: { id: id },
       });
     };
     const loading = ref(false);

+ 22 - 24
src/views/placeManage/placeTablet/placeTabletInfo.vue

@@ -211,7 +211,7 @@
               :after-read="afterRead1"
               :max-count="6"
               capture="camera"
-              accept=""
+              accept="image"
               :before-delete="fjdelete"
             >
             </van-uploader>
@@ -245,9 +245,11 @@ export default {
     //数据接收
     const router = useRouter();
     onMounted(() => {
-      var item = JSON.parse(router.currentRoute.value.query.data);
-      dataitem.value = item;
-      if (!dataitem.value.pic) {
+      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
@@ -260,20 +262,22 @@ export default {
                 name: decodeURIComponent(
                   item.substring(item.lastIndexOf("/") + 1)
                 ),
-                url: $base + item
+                url: $base + item.replace("程序附件//", "程序附件/")
               },
             });
           }
           fileImg.value.push({
             name: decodeURIComponent(item.substring(item.lastIndexOf("/") + 1)),
-            url: item,
+            url: $base + item.replace("程序附件//", "程序附件/"),
           });
         });
       }
-      let id = dataitem.value.siteName.id;
-      new PlaceRegister().queryById(id).then((res) => {
+      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);
@@ -358,33 +362,26 @@ export default {
     //图片上传
     let fileList = ref([]);
     let fileImg = ref([]);
-    let workpic = ref("");
     const afterRead1 = (file) => {
       new tools()
-        .uploadFile(file, `sys/file/webupload/upload`)
+        .uploadFile(file, `logo`)
         .then(({ data }) => {
           data.name = decodeURIComponent(
             data.url.substring(data.url.lastIndexOf("/") + 1)
           );
-          workpic.value += "|" + data.url;
-          const json = Object.assign(dataitem.value, {
-            pic: workpic.value,
-          });
-          dataitem.value = json;
           fileImg.value.push(data);
         });
     };
     const fjdelete = (file) => {
-      console.log(fileList.value,'++++++++++++++++++>fileList.value');
       //删除文件操作
       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.file.name == fileList.value[index].file.name) {
           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);
+          }
         }
       }
     };
@@ -394,9 +391,10 @@ export default {
     };
     //数据提交
     const submit = () => {
+      dataitem.value.pic = fileImg.value
+        .map((option) => option.url)
+        .join("|");
       new TabletServer().save(dataitem.value).then((res) => {
-        console.log(dataitem.value,'===========================>dataitem.value');
-        console.log(res, "===========================>res");
         // if (res.status == 200) {
         //   xm.showToast({
         //     message: "牌位信息修改成功",

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.