Browse Source

页面更新

guoqing 2 năm trước cách đây
mục cha
commit
85c911ae64

+ 0 - 42
src/views/placeManage/placePerson.vue

@@ -45,27 +45,6 @@
             </p>
           </van-col>
           <van-col span="6" style="text-align: right">
-            <!-- <div
-            v-for="(item2, index) in item.userManagenmetDetailsDTOList"
-            :key="index"
-            style="font-size: 12px"
-          >
-            <p
-              v-if="
-                item2.dataType == 1 &&
-                item2.dataDictionary == 'hs_religion_type'
-              "
-              style="color: #36a7f3"
-            >
-              <span v-if="item2.value == 1" style="color: #1eba56"
-                >伊斯兰教</span
-              >
-              <span v-if="item2.value == 2" style="color: #36a7f3">基督教</span>
-              <span v-if="item2.value == 3" style="color: #ffa500">天主教</span>
-              <span v-if="item2.value == 4" style="color: #d3c701">佛教</span>
-              <span v-if="item2.value == 5" style="color: #a0522d">道教</span>
-            </p>
-          </div> -->
             <span v-if="item.sex == 1" style="color: #36a7f3">男</span>
             <span v-if="item.sex == 2" style="color: #d3c701">女</span>
           </van-col>
@@ -120,27 +99,6 @@
             </p>
           </van-col>
           <van-col span="6" style="text-align: right">
-            <!-- <div
-            v-for="(item2, index) in item.userManagenmetDetailsDTOList"
-            :key="index"
-            style="font-size: 12px"
-          >
-            <p
-              v-if="
-                item2.dataType == 1 &&
-                item2.dataDictionary == 'hs_religion_type'
-              "
-              style="color: #36a7f3"
-            >
-              <span v-if="item2.value == 1" style="color: #1eba56"
-                >伊斯兰教</span
-              >
-              <span v-if="item2.value == 2" style="color: #36a7f3">基督教</span>
-              <span v-if="item2.value == 3" style="color: #ffa500">天主教</span>
-              <span v-if="item2.value == 4" style="color: #d3c701">佛教</span>
-              <span v-if="item2.value == 5" style="color: #a0522d">道教</span>
-            </p>
-          </div> -->
             <span v-if="item.sex == 1" style="color: #36a7f3">男</span>
             <span v-if="item.sex == 2" style="color: #d3c701">女</span>
           </van-col>

+ 1 - 1
src/views/placeManage/placePersoninfo.vue

@@ -1,7 +1,7 @@
 <template>
   <van-nav-bar
     fixed
-    title="人员档案管理"
+    title="人员档案信息"
     left-arrow
     @click-left="onClickLeft"
     :style="{ 'background-color': selectColor }"

+ 2 - 2
src/views/placeManage/placeRegister.vue

@@ -1,9 +1,9 @@
 <template>
     <van-nav-bar fixed title="场所录入" left-arrow @click-left="onClickLeft" :style="{ 'background-color': selectColor }"/>
   <div class="main">
-    <p class="title">宗教场所录入</p>
+    <!-- <p class="title">宗教场所录入</p> -->
     <div class="formArea">
-      <p class="miniTitle">基础信息</p>
+      <p class="miniTitle">场所信息</p>
       <van-cell-group>
         <van-field
           v-model="placeActivity.placeData.religiousName"

+ 9 - 7
src/views/placeManage/placeTablet.vue

@@ -8,7 +8,7 @@
       @click="goTabletInfo(item)"
     >
       <van-row>
-        <van-col span="18">
+        <van-col span="14">
           <p>
             {{ item.brandName }}(<span style="color: #36a7f3">{{
               item.udCard
@@ -16,8 +16,8 @@
             >)
           </p>
         </van-col>
-        <van-col span="6">
-          <p style="color: #36a7f3">{{ item.siteName.name }}</p>
+        <van-col span="10">
+          <p style="color: #36a7f3;">{{ item.siteName.name }}</p>
         </van-col>
       </van-row>
       <van-row>
@@ -25,7 +25,7 @@
           <p>{{ item.nativePlace }}</p>
         </van-col>
         <van-col span="6">
-          <p style="color: red">¥{{ item.sacrificeExpenses }}</p>
+          <p style="color: red" v-if="item.sacrificeExpenses">¥{{ item.sacrificeExpenses }}</p>
         </van-col>
       </van-row>
     </div>
@@ -85,6 +85,7 @@ html {
   }
   .van-badge__wrapper {
     color: #fff;
+    
   }
 }
 .search {
@@ -96,7 +97,7 @@ html {
 }
 .PersonList {
   background-color: #fff;
-  margin-top: 20px;
+  top:10px !important;
   height: 100vh;
   p {
     margin: 0;
@@ -118,6 +119,7 @@ html {
           &:nth-child(2) {
             p {
               text-align: right;
+              font-size: 14px;
             }
           }
         }
@@ -127,12 +129,12 @@ html {
           &:nth-child(1) {
             p {
               color: #d0d0d0;
+              font-size: 12px;
             }
           }
           &:nth-child(2) {
             p {
-              text-align: right;
-              color: #d0d0d0;
+              text-align: right;             
             }
           }
         }

+ 1 - 1
src/views/placeManage/placeTabletInfo.vue

@@ -1,7 +1,7 @@
 <template>
   <van-nav-bar
     fixed
-    title="牌位管理"
+    title="牌位详细信息"
     left-arrow
     @click-left="onClickLeft"
     :style="{ 'background-color': selectColor }"

+ 35 - 14
src/views/toBeDone/toBeDone_details.vue

@@ -2,7 +2,7 @@
   <div>
     <van-nav-bar
       fixed
-      title="我的待办"
+      title="待办详细信息"
       left-arrow
       @click-left="onClickLeft"
       :style="{ 'background-color': selectColor }"
@@ -62,7 +62,7 @@
         </van-cell-group>
         <van-cell-group>
           <van-field
-            v-model="PersonInfo.data.problemArea"
+            v-model="PersonInfo.data.areaSelectName"
             center
             readonly
             clearable
@@ -116,9 +116,11 @@
             center
             readonly
             clearable
+            label-align="top"
             label="问题附件:"
-            input-align="right"
-          />
+          >
+            <template #input> </template>
+          </van-field>
         </van-cell-group>
       </div>
       <div class="content-bottom">
@@ -138,7 +140,7 @@
                   v-model="PersonInfo.disposeContent"
                   name=""
                   id=""
-                  cols="50"
+                  cols="45"
                   rows="5"
                 ></textarea>
                 <textarea
@@ -146,14 +148,20 @@
                   v-model="PersonInfo.data.disposeContent"
                   name=""
                   id=""
-                  cols="50"
+                  cols="45"
                   rows="5"
                 ></textarea>
               </form>
             </template>
           </van-field>
         </van-cell-group>
-        <van-cell-group class="upload" v-if="PersonInfo.data.assignState == '1' || PersonInfo.data.assignState == '2'">
+        <van-cell-group
+          class="upload"
+          v-if="
+            PersonInfo.data.assignState == '1' ||
+            PersonInfo.data.assignState == '2'
+          "
+        >
           <van-field name="uploader" label-align="top" label="处理证据资料:">
             <template #input>
               <van-uploader
@@ -171,10 +179,16 @@
         </van-cell-group>
       </div>
     </div>
-     <van-button v-if="PersonInfo.data.assignState == '1' || PersonInfo.data.assignState == '2'" type="primary" @click="submit" class="btn-sub">确认</van-button>
+    <van-button
+      v-if="
+        PersonInfo.data.assignState == '1' || PersonInfo.data.assignState == '2'
+      "
+      type="primary"
+      @click="submit"
+      class="btn-sub"
+      >确认</van-button
+    >
   </div>
-
- 
 </template>
 
 <script>
@@ -182,6 +196,7 @@ import { useRouter } from "vue-router";
 import { onMounted, reactive, ref } from "vue";
 import ToBeDone from "@/api/toBeDone/toBeDone";
 import tools from "@/api/sys/tools";
+// import $base from "@/utils/config";
 export default {
   setup() {
     const router = useRouter();
@@ -191,6 +206,7 @@ export default {
       todoBy: {},
       disposeContent: "",
     });
+    let picList = ref([]);
     // 导航栏颜色
     const selectColor = ref(window.localStorage.getItem("MZ_COLOR"));
     //数据接收
@@ -199,6 +215,11 @@ export default {
       // let itemId = item.id
       console.log(item);
       PersonInfo.data = item;
+      // let fileName = PersonInfo.data.disposeAccessory.split('');
+      // fileName.forEach((item1) => {
+      //   // item1 = `${$base}`+item1
+      //   picList.value.push(`${$base}` + item1);
+      // });
       PersonInfo.createDepartment = PersonInfo.data.createDepartment;
       PersonInfo.todoBy = PersonInfo.data.todoBy;
     });
@@ -218,12 +239,12 @@ export default {
           data.name = decodeURIComponent(
             data.url.substring(data.url.lastIndexOf("/") + 1)
           );
-          PersonInfo.data.disposeAccessory += ''+data.url
+          PersonInfo.data.disposeAccessory += "" + data.url + ",";
           //data.url = `${$base}` + data.url;
           fileupList.value.push(data);
         });
     };
-    
+
     const fjdelete = (file) => {
       //删除文件操作
       for (let index = 0; index < fileList.value.length; index++) {
@@ -275,8 +296,8 @@ export default {
   margin-left: 5%;
   margin-bottom: 40px;
 }
-.upload{
-  .van-button{
+.upload {
+  .van-button {
     border: none;
     color: #1989fa;
   }