Merge branch 'xj' of http://192.168.0.115:3000/bill/public-fuse into xj

src/app/map/App.vue

@@ -3,7 +3,6 @@
 
   <div class="tabbar">
     <div class="nav">
-
       <el-button-group class="ml-4">
         <el-button :type="currentType(0) ? 'primary' : 'default'" @click="handleSelect(0)">地图</el-button>
         <el-button :type="currentType(1) ? 'primary' : 'default'" @click="handleSelect(1)">卡片</el-button>
@@ -18,15 +17,13 @@
 
 
     <div class="card-list">
-      <template v-for="item of 10">
+      <template v-for="item of 100">
         <el-card style="max-width: 380px">
           <template #header>Yummy hamburger</template>
           <img src="https://shadow.elemecdn.com/app/element/hamburger.9cf7b091-55e9-11e9-a976-7f4d0b07eef6.png"
             style="width: 100%" />
         </el-card>
       </template>
-
-
     </div>
 
   </div>
@@ -35,10 +32,9 @@
 <script setup lang="ts">
 import { onMounted, ref, computed } from "vue";
 import AMapLoader from "@amap/amap-jsapi-loader";
-
 import axios from 'axios';
 import { getFuseCodeLink } from "../../view/case/help";
-
+import comCompany from "@/components/company-select/index.vue";
 
 const current = ref(0);
 

src/view/case/photos/draggable.vue

@@ -113,6 +113,7 @@ defineExpose({
       display: flex;
       justify-content: space-between;
       align-items: center;
+      height: 20px;
       div{
         width: 100%;
         white-space: nowrap;

src/view/case/records/manifest.vue

@@ -95,28 +95,23 @@
         <el-button class="btn" @click="addextractUser">+新增</el-button>
       </div>
       <!-- 证人 -->
-      <template v-for="wit in data.witness">
-        <div class="witness">
-          <span class="sub-tit">证人信息：</span>
-          <div class="line">
-            <span>证人或当事人:</span>
-            <el-input class="input" v-model="wit.name" placeholder="" style="width: 180px;" />
-            <div>
-              <el-input class="input" v-model="wit.year" placeholder="" style="width: 80px;" />
-              <span>年</span>
-              <el-input class="input" v-model="wit.year" placeholder="" style="width: 80px;" />
-              <span>月</span>
-              <el-input class="input" v-model="wit.year" placeholder="" style="width: 80px;" />
-              <span>日</span>
+      <div>
+        <span>证人或当事人:</span>
+        <template v-for="wit in data.witness">
+          <div class="witness">
+            <span class="sub-tit">证人信息：</span>
+            <div class="line">
+              <span>姓名:</span>
+              <el-input class="input" v-model="wit.name" placeholder="" style="width: 180px;" />
+              <span style="margin-left:50px">身份证件号码:</span>
+              <el-input class="input" v-model="wit.id" placeholder="" style="width: 280px;" />
+              <span style="margin-left:50px">联系电话:</span>
+              <el-input class="input" v-model="wit.phone" placeholder="" style="width: 280px;" />
             </div>
-
-            <span style="margin-left:50px">身份证件号码:</span>
-            <el-input class="input" v-model="wit.id" placeholder="" style="width: 280px;" />
           </div>
-        </div>
-
-      </template>
 
+        </template>
+      </div>
       <div class="btn-container">
         <el-button class="btn" @click="addWitness">+新增</el-button>
       </div>
@@ -182,15 +177,13 @@ const data = reactive({
 
   witness: [{
     name: "",
-    year: "",
-    month: "",
-    day: "",
+    address:"",
+    phone: '',
     id: ""
   }, {
     name: "",
-    year: "",
-    month: "",
-    day: "",
+    address:"",
+    phone: '',
     id: ""
   }]
 })
@@ -203,14 +196,14 @@ watch(data, newValue => {
   data.time.year = newValue.time.year.replace(/[^0-9]/g, '');
   data.time.month = Number(sMonth) > 12 ? '12' : sMonth;
   data.time.day = Number(sDay) > 31 ? '31' : sDay;
-  newValue.witness.forEach((item, key) => {
-    const year = newValue.witness[key].year.replace(/[^0-9]/g, '');
-    const month = newValue.witness[key].month.replace(/[^0-9]/g, '');
-    const day = newValue.witness[key].day.replace(/[^0-9]/g, '');
-    data.witness[key].year = year;
-    data.witness[key].month = Number(month) > 12 ? '12' : month;
-    data.witness[key].day = Number(day) > 31 ? '31' : day;
-  })
+  // newValue.witness.forEach((item, key) => {
+  //   const year = newValue.witness[key].year.replace(/[^0-9]/g, '');
+  //   const month = newValue.witness[key].month.replace(/[^0-9]/g, '');
+  //   const day = newValue.witness[key].day.replace(/[^0-9]/g, '');
+  //   data.witness[key].year = year;
+  //   data.witness[key].month = Number(month) > 12 ? '12' : month;
+  //   data.witness[key].day = Number(day) > 31 ? '31' : day;
+  // })
 
 }, {
   immediate: true,
@@ -224,9 +217,8 @@ onMounted(() => {
 const addWitness = () => {
   data.witness.push({
     name: "",
-    year: "",
-    month: "",
-    day: "",
+    address:"",
+    phone: '',
     id: ""
   })
 }