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

src/app/map/App.vue

@@ -182,12 +182,13 @@ body {
 
 .card-container {
   width: 100%;
-
+  padding-top: 100px;
+  
 }
 
 .card-list {
   margin: 0 auto;
-  margin-top: 100px;
+
   display: flex;
   gap: 50px 25px;
   width: 80%;

src/view/case/records/manifest.vue

@@ -31,30 +31,30 @@
 
       <div class="detail">
         <span class="sub-tit">提取清单：</span>
-        <template v-for=" (list, index) in data.detail">
+        <template v-for=" (item, index) in data.detail">
           <div class="con">
             <span class="sub-tit">编号 {{ index + 1 }}: </span>
             <div class="info">
               <div class="inner">
                 <div class="sec">
                   <span>名称: </span>
-                  <el-input class="input" v-model="data.leader" placeholder="" />
+                  <el-input class="input" v-model="item.name" placeholder="" />
                 </div>
 
                 <div class="sec">
                   <span>规格: </span>
-                  <el-input class="input" v-model="data.recorder" placeholder="" />
+                  <el-input class="input" v-model="item.spec" placeholder="" />
                 </div>
 
                 <div class="sec">
                   <span>数量: </span>
-                  <el-input class="input" v-model="data.inspector" placeholder="" />
+                  <el-input class="input" v-model="item.num" placeholder="" />
                 </div>
               </div>
               <div class="inner">
                 <div class="sec">
                   <span>提取部位: </span>
-                  <el-input class="input" v-model="data.leader" placeholder="" />
+                  <el-input class="input" v-model="item.part" placeholder="" />
                 </div>
 
 
@@ -62,7 +62,7 @@
               <div class="inner">
                 <div class="sec">
                   <span>特征: </span>
-                  <el-input class="input" v-model="data.leader" placeholder="" />
+                  <el-input class="input" v-model="item.desc" placeholder="" />
                 </div>
 
               </div>
@@ -84,9 +84,9 @@
         <template v-for="extractUser in data.extractUser">
           <div class="line">
             <span>姓名:</span>
-            <el-input class="input" placeholder="" style="width: 20%" />
+            <el-input class="input" v-model="extractUser.name" placeholder="" style="width: 20%" />
             <span>工作单位:</span>
-            <el-input class="input" placeholder="" style="width: 70%" />
+            <el-input class="input" v-model="extractUser.address" placeholder="" style="width: 70%" />
           </div>
 
         </template>
@@ -99,7 +99,7 @@
         <span>证人或当事人:</span>
         <template v-for="wit in data.witness">
           <div class="witness">
-            <span class="sub-tit">证人信息：</span>
+            <!-- <span class="sub-tit">证人信息：</span> -->
             <div class="line">
               <span>姓名:</span>
               <el-input class="input" v-model="wit.name" placeholder="" style="width: 180px;" />
@@ -108,6 +108,10 @@
               <span style="margin-left:50px">联系电话:</span>
               <el-input class="input" v-model="wit.phone" placeholder="" style="width: 280px;" />
             </div>
+            <div class="line">
+              <span>单位或住址:</span>
+              <el-input class="input" v-model="wit.address" placeholder="" style="width: 100%;" />
+            </div>
           </div>
 
         </template>
@@ -129,7 +133,7 @@ import {
   saveCaseDetailInfo,
   exportCaseDetailInfo
 } from "@/store/case";
-
+import saveAs from "@/util/file-serve";
 import { ElMessage } from 'element-plus';
 
 const props = defineProps({ caseId: Number })
@@ -170,19 +174,20 @@ const data = reactive({
 
     {
       name: "",
-      workplace: "",
+      address: "",
       id: ""
     },
   ],
 
   witness: [{
     name: "",
-    address:"",
+    address: "",
     phone: '',
-    id: ""
+    id: "",
+
   }, {
     name: "",
-    address:"",
+    address: "",
     phone: '',
     id: ""
   }]
@@ -196,14 +201,7 @@ 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;
-  // })
+
 
 }, {
   immediate: true,
@@ -217,7 +215,7 @@ onMounted(() => {
 const addWitness = () => {
   data.witness.push({
     name: "",
-    address:"",
+    address: "",
     phone: '',
     id: ""
   })
@@ -234,12 +232,9 @@ const addItem = () => {
 }
 const addextractUser = () => {
   data.extractUser.push({
-    id: "1",
     name: "",
-    spec: "",
-    num: "",
-    part: "",
-    desc: "",
+    address: "",
+    id: ""
   })
 }
 const handleSave = async () => {
@@ -250,12 +245,13 @@ const handleSave = async () => {
   }
 }
 const handleExport = async () => {
-  // const res = await exportCaseInquestInfo(props.caseId);
-  // console.log('res', res)
-  // saveAs(res, `勘验笔录-${props.caseId}.docx`)
+  const res = await exportCaseDetailInfo(props.caseId);
+  console.log('res', res)
+  saveAs(res, `提取清单-${props.caseId}.docx`)
 }
 onMounted(async () => {
   const res = await getCaseDetailInfo(props.caseId);
+
   console.log('res', res)
   for (var k in data) {
     if (res.data && res.data.hasOwnProperty(k)) {