社区管理，核酸采样

src/project/pingchang/AppCheckpointRegistration/ManagementHistory.vue

@@ -2,91 +2,89 @@
   <div class="ManagementHistory">
     <div class="title">最近处置历史</div>
     <div v-for="(item, index) in info.riskDisposalHistoryList" :key="index">
-      <div class="info">
+      <div class="info" v-if="item.handleType == 2">
         <div class="item-flex">
           <div class="label">处置意见</div>
-          <div class="value">{{info.name}}</div>
+          <div class="value">{{ $dict.getLabel('EP_handleType', item.handleType) }}</div>
         </div>
         <div class="item-flex">
           <div class="label">集中隔离地</div>
-          <div class="value">{{info.idNumber}}</div>
+          <div class="value">{{ $dict.getLabel('EP_quarantineAddress', item.quarantineAddress) }}</div>
         </div>
         <div class="item-flex">
           <div class="label">隔离时间</div>
-          <div class="value">{{info.idNumber}}</div>
+          <div class="value">{{item.quarantineBeginTime}}至{{item.quarantineEndTime}}</div>
         </div>
         <div class="item-flex">
           <div class="label">隔离策略</div>
-          <div class="value">{{info.idNumber}}</div>
+          <div class="value">{{ $dict.getLabel('EP_quarantineStrategy', item.quarantineStrategy) }}</div>
         </div>
       </div>
 
-      <div class="info">
+      <div class="info" v-if="item.handleType == 3">
         <div class="item-flex">
           <div class="label">处置意见</div>
-          <div class="value">{{info.name}}</div>
+          <div class="value">{{ $dict.getLabel('EP_handleType', item.handleType) }}</div>
         </div>
         <div class="item-flex">
-          <div class="label">集中隔离地</div>
-          <div class="value">{{info.idNumber}}</div>
+          <div class="label">居家状态</div>
+          <div class="value">{{ $dict.getLabel('EP_homeStatus', item.homeStatus) }}</div>
         </div>
         <div class="item-flex">
           <div class="label">隔离时间</div>
-          <div class="value">{{info.idNumber}}</div>
+          <div class="value">{{item.quarantineBeginTime}}至{{item.quarantineEndTime}}</div>
         </div>
         <div class="item-flex">
           <div class="label">隔离策略</div>
-          <div class="value">{{info.idNumber}}</div>
+          <div class="value">{{ $dict.getLabel('EP_quarantineStrategy', item.quarantineStrategy) }}</div>
         </div>
         <div class="item-flex">
           <div class="label">管控方式</div>
-          <div class="value">{{info.idNumber}}</div>
+          <div class="value">{{ $dict.getLabel('EP_controlMethod', item.controlMethod) }}</div>
         </div>
         <div class="item-flex border-none">
-          <div style="color:#999;">附件</div>
-        </div>
-        <div class="img-list">
-          <!-- <img :src="item.url" alt="" v-for="(item, index) in info.checkPhoto" :key="index" @click="previewImage(info.checkPhoto, item.url)"> -->
+          <div style="color:#999;">备注</div>
         </div>
+        <p style="padding-bottom: 12px;">{{item.remarks}}</p>
       </div>
 
-      <div class="info">
+      <div class="info" v-if="item.handleType == 6">
         <div class="item-flex">
           <div class="label">处置意见</div>
-          <div class="value">{{info.name}}</div>
+          <div class="value">{{ $dict.getLabel('EP_handleType', item.handleType) }}</div>
         </div>
         <div class="item-flex">
           <div class="label">移交对象</div>
-          <div class="value">{{info.name}}</div>
+          <div class="value">{{ $dict.getLabel('EP_handoverObject', item.handoverObject) }}</div>
         </div>
         <div class="item-flex">
           <div class="label">移交方式</div>
-          <div class="value">{{info.name}}</div>
+          <div class="value">{{ $dict.getLabel('EP_handoverMethod', item.handoverMethod) }}</div>
         </div>
         <div class="item-flex">
           <div class="label">交接人姓名</div>
-          <div class="value">{{info.name}}</div>
+          <div class="value">{{item.handoverPersonName}}</div>
         </div>
         <div class="item-flex">
           <div class="label">手机号</div>
-          <div class="value" style="color:#4181FF;" @click="callPhone(info.phone)">
+          <div class="value" style="color:#4181FF;" @click="callPhone(item.handoverPersonPhone)">
             <img :src="$cdn + 'common/phone.png'" alt="" class="phone-icon" >
-            {{info.phone}}</div>
+            {{item.handoverPersonPhone}}</div>
         </div>
-        <div class="item-flex border-none">
+        <div class="item-flex border-none" v-if="item.fileList && item.fileList.length">
           <div style="color:#999;">交接图片</div>
         </div>
         <div class="img-list">
-          <!-- <img :src="item.url" alt="" v-for="(item, index) in info.checkPhoto" :key="index" @click="previewImage(info.checkPhoto, item.url)"> -->
+          <img :src="items.url" alt="" v-for="(items, indexs) in item.fileList" :key="indexs" @click="previewImage(item.fileList, items.url)">
         </div>
       </div>
     </div>
     <AiEmpty v-if="!info.riskDisposalHistoryList.length"></AiEmpty>
     
     <div class="btn-height"></div>
-    <div class="footer" v-if="this.form.handleType == 3">
-      <div @click="submit(1)">放行居家隔离</div>
-      <div @click="submit(0)">通知社区核实</div>
+    <div class="footer" v-if="form.handleType == 3">
+      <div @click="submit('1')">放行居家隔离</div>
+      <div @click="submit('0')">通知社区核实</div>
     </div>
     <div class="footer-btn" v-else @click="submit('')">提交</div>
   </div>
@@ -109,7 +107,7 @@ export default {
   },
   onLoad(option) {
     this.form = uni.getStorageSync('checkPointContent')
-    this.$dict.load('EP_handleType', 'EP_quarantineStrategy', 'EP_homeStatus', 'EP_controlMethod', 'EP_handoverObject', 'EP_handoverMethod').then(() => {
+    this.$dict.load('EP_handleType', 'EP_quarantineAddress', 'EP_quarantineStrategy', 'EP_homeStatus', 'EP_controlMethod', 'EP_handoverObject', 'EP_handoverMethod').then(() => {
       this.id = option.id
       this.getDetail()
     })
@@ -117,7 +115,7 @@ export default {
   methods: {
     submit(status) {
       this.form.homeQuarantineOperation = status
-      this.$http.post(`/app/appepidemicpreventionregisterinfo/riskDisposal`, this.form).then((res) => {
+      this.$http.post(`/app/appepidemicpreventionregisterinfo/riskDisposal?homeQuarantineOperation=${this.form.homeQuarantineOperation}`, this.form).then((res) => {
         if (res.code == 0) {
           this.$u.toast('提交成功')
           uni.$emit('updateDetail')
@@ -160,6 +158,7 @@ export default {
   .info{
     background-color: #fff;
     padding: 0 32px;
+    margin-bottom: 24px;
     .item-flex{
       padding: 34px 0;
       border-bottom: 1px solid #ddd;

src/project/pingchang/AppCheckpointRegistration/UserInfo.vue

@@ -118,6 +118,7 @@ export default {
     return {
       id: '',
       info: {},
+      // haveHomeQuarantineBtn: false, // 是否重新处置 true屏蔽居家两种隔离
     }
   },
   computed: { ...mapState(['user']) },
@@ -127,6 +128,7 @@ export default {
   onLoad(option) {
     this.$dict.load('yesOrNo', 'EP_registerPersonType', 'EP_travelType', 'EP_abnormalType').then(() => {
       this.id = option.id
+      // this.haveHomeQuarantineBtn = option.operation == 'reDisposal' ? true : false
       this.getDetail()
     })
     uni.$on('updateDetail', () => {
@@ -137,9 +139,6 @@ export default {
     getDetail() {
       this.$http.post(`/app/appepidemicpreventionregisterinfo/queryDetailById?id=${this.id}`).then((res) => {
         if (res.code == 0) {
-          if(res.data.checkTime) {
-            res.data.checkTime = res.data.checkTime.substring(0, 10)
-          }
           this.info = res.data
           this.info.travelTypeList = this.info.travelType.split(',')
           this.info.idNumberText = res.data.idNumber.replace(/(.{6}).*(.{4})/,"$1********$2")

src/project/pingchang/AppCommunityManagement/Add.vue

@@ -6,7 +6,7 @@
       </div>
       <div class="value">
         <AiAreaPicker v-model="form.areaId" :areaId="user.areaId" @select="areaSelect" :name.sync="form.areaName" style="color: #666" selectRoot>
-          <span style="margin-left: 4px" v-if="areaName">{{ form.areaName }}</span>
+          <span style="margin-left: 4px" v-if="form.areaName">{{ form.areaName }}</span>
           <span v-else class="color-999">请选择</span>
           <u-icon name="arrow-right" color="#999" size="16" style="margin-left: 4px" />
         </AiAreaPicker>
@@ -17,19 +17,19 @@
         <div class="label">
           <span class="tips">*</span>管控对象
         </div>
-        <div class="value">{{form.name}}</div>
+        <div class="value color-999">{{form.name}}</div>
       </div>
       <div class="item solid">
         <div class="label">
           <span class="tips">*</span>手机号
         </div>
-        <div class="value">{{form.phone}}</div>
+        <div class="value color-999">{{form.phone}}</div>
       </div>
       <div class="item solid">
         <div class="label">
           <span class="tips">*</span>身份证号
         </div>
-        <div class="value">{{form.idNumber}}</div>
+        <div class="value color-999">{{form.idNumber}}</div>
       </div>
       <div class="item solid">
         <div class="label">
@@ -66,7 +66,7 @@
           <span class="tips">*</span>管控人
         </div>
         <div class="value">
-          <u-input placeholder="请输入" input-align="right" height="32" maxlength="6" v-model="form.controllerUserName" />
+          <u-input placeholder="请输入" input-align="right" height="32" maxlength="6" v-model="form.controllerUserName" :custom-style="{'font-size': '17px'}" />
         </div>
       </div>
       <div class="item solid">
@@ -74,7 +74,7 @@
           <span class="tips">*</span>联系方式
         </div>
         <div class="value">
-          <u-input placeholder="请输入" type="number" input-align="right" height="32" maxlength="11" v-model="form.controllerUserPhone" />
+          <u-input placeholder="请输入" type="number" input-align="right" height="32" maxlength="11" v-model="form.controllerUserPhone" :custom-style="{'font-size': '17px'}" />
         </div>
       </div>
       <div class="item">
@@ -82,7 +82,9 @@
           <span class="tips"></span>管控内容
         </div>
       </div>
-      <textarea placeholder="请输入详细描述信息" v-model="form.controllerContent"></textarea>
+      <div class="item-textarea">
+        <u-input v-model="form.controllerContent" type="textarea" placeholder="请输入详细描述信息"  height="200" :custom-style="{'font-size': '17px'}" />
+      </div>
     </div>
     <div class="info" style="padding-bottom: 24px;">
       <div class="item">
@@ -97,7 +99,7 @@
     <div class="btn-height"></div>
     <div class="footer">
       <div class="cancel" @click="submit('2')">解除管理</div>
-      <div class="confirm" @click="submit('')">保存</div>
+      <div class="confirm" @click="submit(form.status)">保存</div>
     </div>
     <u-calendar v-model="showDateSelect" mode="range" min-year="2020" max-date="2050-12-31" @change="dateConfirm"></u-calendar>
     <u-select v-model="showDictSelect" :list="$dict.getDict(selectDictName)" label-name="dictName" value-name="dictValue" @confirm="dictConfirm"></u-select>
@@ -165,7 +167,7 @@ export default {
       this.form.status = status
       this.form.id = this.id
 
-      this.$http.post(`/app/appepidemicpreventionregisterinfo/riskDisposal`, this.form).then((res) => {
+      this.$http.post(`/app/appepidemicpreventioncommunitymanagement/troubleshooting`, this.form).then((res) => {
         if (res.code == 0) {
           this.$u.toast('提交成功')
           uni.$emit('updateDetail')
@@ -180,6 +182,9 @@ export default {
       this.$http.post(`/app/appepidemicpreventioncommunitymanagement/queryDetailById?id=${this.id}`).then((res) => {
         if (res.code == 0) {
           this.form = res.data
+          if(this.form.homeStatus === null) {
+            this.form.homeStatus = ''
+          }
         }
       })
     },
@@ -207,6 +212,7 @@ export default {
   background-color: #F3F6F9;
   padding-top: 16px;
   .item {
+    width: 100%;
     background-color: #fff;
     display: flex;
     padding: 40px 0 40px 32px;
@@ -234,16 +240,12 @@ export default {
       font-family: PingFangSC-Regular;
       font-size: 34px;
       color: #333;
-      .color-999 {
-        color: #999;
-        font-size: 30px;
-      }
     }
-    textarea {
-      width: 100%;
+    .color-999 {
+      color: #999;
     }
   }
-  ::v-deep uni-textarea{
+  .item-textarea {
     width: calc(100% - 32px);
   }
   .info {

src/project/pingchang/AppCommunityManagement/AppCommunityManagement.vue

@@ -32,15 +32,15 @@
               {{item.name}}
               <span class="type">{{$dict.getLabel('EP_registerInfoType', item.infoType)}}</span>
             </div>
-            <div class="status" :class="'status'+item.queryType">
+            <div class="status" :class="item.nucleicAcidSamplingCount >0 ? 'status1' : 'status0'">
               <span class="cir"></span>
-              <span v-if="item.queryType == 1">核酸采样{{item.nucleicAcidSamplingCount}}次</span>
+              <span v-if="item.nucleicAcidSamplingCount >0">核酸采样{{item.nucleicAcidSamplingCount}}次</span>
               <span v-else>核酸未采样</span>
             </div>
           </div>
           <p> {{item.idNumberText}}</p>
           <p> {{item.phone}}</p>
-          <div class="btn" v-if="item.status != 2" @click="toEdit(item.id)">排查</div>
+          <div class="btn" v-if="item.status != 2" @click.stop="toEdit(item.id)">排查</div>
           <img src="./components/img/status-img.png" alt="" class="status-img" v-else>
         </div>
         <div class="bottom">

src/project/pingchang/AppCommunityManagement/Detail.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="Detail">
     <div class="info">
-      <div class="title">基本信息</div>
+      <div class="title">基本信息<span class="title-right-text" @click="toNucleAcidDetail">点击查看核酸采样记录</span></div>
       <div class="item-flex">
         <div class="label">管理区域</div>
         <div class="value">{{info.areaName}}</div>
@@ -26,7 +26,7 @@
       </div>
       <div class="item-flex">
         <div class="label">隔离时间</div>
-        <div class="value">{{info.quarantineBeginTime}}至{{info.quarantineEndTime}}</div>
+        <div class="value">{{info.quarantineBeginTime.substring(0, 10)}} 至 {{info.quarantineEndTime.substring(0, 10)}}</div>
       </div>
       <div class="item-flex">
         <div class="label">隔离策略</div>
@@ -35,15 +35,18 @@
     </div>
     <div class="line-bg"></div>
     <div class="info">
-      <div class="item-flex">
+      <div class="item-flex border-none">
         <div class="label">管控内容</div>
       </div>
-      <p style="padding-bottom: 12px;">{{info.controllerContent}}</p>
+      <p style="padding-bottom: 24px;">{{info.controllerContent}}</p>
+      <div class="item-flex border-none">
+        <div class="label">图片</div>
+      </div>
       <div class="img-list" v-for="(item, index) in info.fileList" :key="index">
         <img :src="item.accessUrl" alt="" @click="previewImage(info.fileList, item.accessUrl)">
       </div>
     </div>
-
+    <div class="line-bg" style="padding-bottom: 56px;"></div>
     <div class="footer" v-if="info.status != 2">
       <div class="cancel" @click="toEdit()">编辑</div>
       <div class="confirm" @click="changeStatus()">解除管理</div>
@@ -104,7 +107,10 @@ export default {
     },
     toEdit() {
       uni.navigateTo({url: `./Add?id=${this.id}`})
-    }
+    },
+    toNucleAcidDetail() {
+      uni.navigateTo({url: `../AppNucleicAcidSampling/Detail?id=${this.id}`})
+    },
   },
 }
 </script>
@@ -121,6 +127,13 @@ export default {
       font-family: PingFangSC-Semibold, PingFang SC;
       font-weight: 600;
       color: #333;
+      overflow: hidden;
+      .title-right-text {
+        color: #1365DD;
+        font-size: 28px;
+        float: right;
+        font-weight: 400;
+      }
     }
     .item-flex{
       padding: 34px 0;

src/project/pingchang/AppCommunityManagement/Statistics.vue

@@ -4,30 +4,35 @@
       <img src="./components/img/header.png" alt="" />
       <div class="content-info">
         <div class="title">
-          <h2>实时数据统计</h2>
           <div>
+            <span v-if="beginDate" @click="showDateSelect=true">{{ beginDate }} 至 {{ endDate }}</span>
+            <span v-else @click="showDateSelect=true">时间选择</span>
+            <u-icon name="arrow-down" color="#666" size="28" style="margin-left: 4px"  v-if="!beginDate" @click="showDateSelect=true"/>
+            <u-icon name="close-circle" color="#666" size="34" style="margin-left: 4px"  v-else @click="clearDate" />
+          </div>
+          <div style="width:calc(100% - 200px);text-align: right;">
             <AiAreaPicker v-model="areaId" :areaId="user.areaId" @select="areaSelect" :name.sync="areaName" style="color: #666" selectRoot>
-              <span style="margin-left: 4px" v-if="areaName">{{ areaName }}</span>
+              <span v-if="areaName" class="area-name">{{ areaName }}</span>
               <span v-else>地区选择</span>
               <u-icon name="arrow-down" color="#666" size="28" style="margin-left: 4px" />
             </AiAreaPicker>
           </div>
         </div>
-        <div class="tab-content">
+        <div class="tab-content" v-if="info.numberMap && info.numberMap['累计排查']">
           <div class="tab-item">
-            <h2 class="color-5AAD6A">{{totalInfo.back1}}</h2>
+            <h2 class="color-5AAD6A">{{info.numberMap['累计排查']}}</h2>
             <p>累计排查</p>
           </div>
           <div class="tab-item">
-            <h2 class="color-4185F5">{{totalInfo.back2}}</h2>
+            <h2 class="color-4185F5">{{info.numberMap['今日排查']}}</h2>
             <p>今日排查</p>
           </div>
           <div class="tab-item">
-            <h2 class="color-CD413A">{{totalInfo.back3}}</h2>
+            <h2 class="color-CD413A">{{info.numberMap['今日核酸']}}</h2>
             <p>今日核酸</p>
           </div>
           <div class="tab-item">
-            <h2 class="color-5AAD6A">{{totalInfo.report1}}</h2>
+            <h2 class="color-5AAD6A">{{info.numberMap['我的排查']}}</h2>
             <p>我的排查</p>
           </div>
         </div>
@@ -40,9 +45,7 @@
     </div>
 
     <div class="echart-content">
-      <div class="title">返乡数据统计
-        <span class="right-search">时间选择<u-icon name="arrow-down" color="#666" size="28" style="margin-left: 4px" /></span>
-      </div>
+      <div class="title">返乡数据统计</div>
       <div class="chart-flex">
         <div class="chart-box" id="statisticCircle" style="width: 200px;height: 200px;"></div>
         <div class="type-num">
@@ -50,17 +53,18 @@
             <div class="label">
               <span class="tips"></span>返乡登记
             </div>
-            <div class="num">20</div>
+            <div class="num">{{backVal}}</div>
           </div>
           <div class="item status1">
             <div class="label">
               <span class="tips"></span>卡口登记
             </div>
-            <div class="num">20</div>
+            <div class="num">{{pointVal}}</div>
           </div>
         </div>
       </div>
     </div>
+    <u-calendar v-model="showDateSelect" mode="range" min-year="2020" @change="dateConfirm"></u-calendar>
   </div>
 </template>
 
@@ -71,13 +75,16 @@ export default {
   name: 'Statistics',
   data() {
     return {
-      toadyText: '',
-      totalInfo: {},
+      info: {},
       echartData: null,
       echartDataClrcle: null,
       areaId: '',
       areaName: '',
-
+      beginDate: '',
+      endDate: '',
+      showDateSelect: false,
+      backVal: 0,
+      pointVal: 0
     }
   },
   computed: { ...mapState(['user']) },
@@ -85,33 +92,49 @@ export default {
     document.title = '排查统计'
   },
   onLoad() {
-    var date = new Date();
-    this.toadyText = date.getFullYear() + '-' + date.getMonth()+1 + '-' + date.getDate()
-    this.getTotal()
+    this.areaId = this.user.areaId
+    this.areaName = this.user.areaName
+    this.getData()
   },
   methods: {
     areaSelect(e) {
       this.areaId = e
+      this.getData()
     },
-    getTotal() {
-      this.$http.post(`/app/appepidemicbackhomerecord/statisticForQW`).then((res) => {
+    dateConfirm(e) {
+      console.log(11)
+      this.beginDate = e.startDate
+      this.endDate = e.endDate
+      this.getData()
+    },
+    clearDate() {
+      this.beginDate = ''
+      this.endDate = ''
+      this.getData()
+    },
+    getData() {
+      this.$http.post(`/app/appepidemicpreventioncommunitymanagement/statistics?areaId=${this.areaId}&beginTime=${this.beginDate}&endTime=${this.endDate}`).then((res) => {
         if (res.code == 0) {
-          this.totalInfo = res.data.map
-          var xData = [], yDataBack = [], yDataError = []
-          for(let key  in res.data.fiveTotal){
-            xData.push(key)
-            yDataBack.push(res.data.fiveTotal[key])
-          }
-          for(let key  in res.data.fiveUnusual){
-            yDataError.push(res.data.fiveUnusual[key])
-          }
-          this.chartInit(xData, yDataBack, yDataError)
-          this.chartInitCircle()
+          this.info = res.data
+          var xData = [], yDataScreening = [], yDataNucleicAcid = []
+          res.data.trend.map((item) => {
+            xData.push(item.ymd)
+            yDataScreening.push(item['排查人数'])
+            yDataNucleicAcid.push(item['已采核酸'])
+          })
+          res.data.sourceMap.map((item) => {
+            if(item.type == 1) {
+              this.backVal = item.c
+            }else {
+              this.pointVal = item.c
+            }
+          })
+          this.chartInit(xData, yDataScreening, yDataNucleicAcid)
+          this.chartInitCircle(this.backVal, this.pointVal)
         }
       })
     },
     chartInit(xData, yDataBack, yDataError) {
-      console.log(xData)
       this.echartData = echarts.init(document.getElementById('statistic'))
       var option = {
         grid: {
@@ -161,7 +184,7 @@ export default {
       };
       this.echartData.setOption(option)
     },
-    chartInitCircle() {
+    chartInitCircle(backVal, pointVal) {
       this.echartDataCircle = echarts.init(document.getElementById('statisticCircle'))
       var option = {
         color: ['#4185F5', '#5AAD6A'],
@@ -174,14 +197,14 @@ export default {
               position: 'center'
             },
             data: [
-              { value: 1048, name: '返乡登记' },
-              { value: 735, name: '卡口登记' },
+              { value: backVal, name: '返乡登记' },
+              { value: pointVal, name: '卡口登记' },
             ],
           }
         ]
       };
       this.echartDataCircle.setOption(option)
-    }
+    },
   },
 }
 </script>
@@ -207,7 +230,7 @@ export default {
       .title {
         display: flex;
         justify-content: space-between;
-        padding: 32px 32px 32px 48px;
+        padding: 32px;
         h2 {
           font-size: 36px;
           font-family: PingFang-SC-Heavy, PingFang-SC;
@@ -256,6 +279,14 @@ export default {
       }
     }
   }
+  .area-name {
+    display: inline-block;
+    width: calc(100% - 64px);
+    vertical-align: bottom;
+    overflow:hidden;
+    text-overflow:ellipsis;
+    white-space:nowrap;
+  }
   .mar-t160 {
     margin-top: 160px;
   }

src/project/pingchang/AppNucleicAcidSampling/Add.vue

@@ -5,44 +5,44 @@
       <div class="label">
         <span class="tips">*</span>管理区域
       </div>
-      <div class="value">{{info.areaName}}</div>
+      <div class="value color-999">{{info.areaName}}</div>
     </div>
     <div class="info mar-b16">
       <div class="item solid">
         <div class="label">
           <span class="tips">*</span>管理对象
         </div>
-        <div class="value">{{info.name}}</div>
+        <div class="value color-999">{{info.name}}</div>
       </div>
       <div class="item solid">
         <div class="label">
           <span class="tips">*</span>身份证号
         </div>
-        <div class="value">{{info.idNumber}}</div>
+        <div class="value color-999">{{info.idNumber}}</div>
       </div>
       <div class="item solid">
         <div class="label">
           <span class="tips">*</span>手机号码
         </div>
-        <div class="value">{{info.phone}}</div>
+        <div class="value color-999">{{info.phone}}</div>
       </div>
       <div class="item solid">
         <div class="label">
           <span class="tips">*</span>居家状态
         </div>
-        <div class="value">{{ $dict.getLabel('EP_homeStatus2', info.homeStatus)}}</div>
+        <div class="value color-999">{{ $dict.getLabel('EP_homeStatus2', info.homeStatus)}}</div>
       </div>
       <div class="item solid">
         <div class="label">
           <span class="tips">*</span>隔离时间
         </div>
-        <div class="value">{{info.quarantineBeginTime}}至{{info.quarantineEndTime}}</div>
+        <div class="value color-999">{{info.quarantineBeginTime.substring(0, 10)}}至{{info.quarantineEndTime.substring(0, 10)}}</div>
       </div>
       <div class="item">
         <div class="label">
           <span class="tips">*</span>隔离策略
         </div>
-        <div class="value">{{ $dict.getLabel('EP_quarantineStrategy', info.quarantineStrategy)}}</div>
+        <div class="value color-999">{{ $dict.getLabel('EP_quarantineStrategy', info.quarantineStrategy)}}</div>
       </div>
     </div>
     <div class="info mar-b16">
@@ -51,7 +51,7 @@
           <span class="tips">*</span>采样人员
         </div>
         <div class="value">
-          <u-input placeholder="请输入" input-align="right" height="32" maxlength="6" v-model="form.createUserName" />
+          <u-input placeholder="请输入" input-align="right" height="32" maxlength="6" v-model="form.createUserName" :custom-style="{'font-size': '17px'}" />
         </div>
       </div>
       <div class="item solid">
@@ -59,7 +59,7 @@
           <span class="tips">*</span>联系方式
         </div>
         <div class="value">
-          <u-input placeholder="请输入" type="number" input-align="right" height="32" maxlength="11" v-model="form.createUserPhone" />
+          <u-input placeholder="请输入" type="number" input-align="right" height="32" maxlength="11" v-model="form.createUserPhone" :custom-style="{'font-size': '17px'}" />
         </div>
       </div>
       <div class="item">
@@ -107,7 +107,13 @@ export default {
       this.getDetail()
     })
     var myDate = new Date();
-    this.form.createTime = `${myDate.getFullYear()}-${myDate.getMonth()+1}-${myDate.getDate()} ${myDate.getHours()}:${myDate.getMinutes()}:${myDate.getSeconds()}`
+    var month = myDate.getMonth()+1
+    if(month < 10) {
+      month = '0'+`${month}`
+    }
+    this.form.createUserName = this.user.name
+    this.form.createUserPhone = this.user.phone
+    this.form.createTime = `${myDate.getFullYear()}-${month}-${myDate.getDate()} ${myDate.getHours()}:${myDate.getMinutes()}:${myDate.getSeconds()}`
   },
   onShow() {
     document.title = '核酸采样'
@@ -127,7 +133,7 @@ export default {
         return this.$u.toast('请输入采样时间')
       }
       this.form.cmId = this.id
-
+      this.form.registerId = this.info.registerId
       this.$http.post(`/app/appepidemicpreventioncommunitymanagement/nucleicAcidSamplin`, this.form).then((res) => {
         if (res.code == 0) {
           this.$u.toast('提交成功')
@@ -197,13 +203,13 @@ export default {
       font-family: PingFangSC-Regular;
       font-size: 34px;
       color: #333;
-      .color-999 {
-        color: #999;
-        font-size: 30px;
-      }
+      
     }
-    textarea {
-      width: 100%;
+    .color-999 {
+      color: #999;
+    }
+    .item-textarea {
+      width: calc(100% - 32px);
     }
   }
   ::v-deep uni-textarea{

src/project/pingchang/AppNucleicAcidSampling/AppNucleicAcidSampling.vue

@@ -34,7 +34,7 @@
           </div>
            <p> {{item.idNumberText}}</p>
           <p> {{item.phone}}</p>
-          <div class="btn" @click="toAdd()" v-if="item.status != 2">采样</div>
+          <div class="btn" @click.stop="toEdit(item.id)" v-if="item.status != 2">采样</div>
         </div>
       </div>
     </div>
@@ -205,7 +205,7 @@ export default {
               background-color: #FFA938;
             }
           }
-          .status0 {
+          .status1 {
             color: #1CCEB0;
             .cir  {
               background-color: #1CCEB0;

src/project/pingchang/AppNucleicAcidSampling/Detail.vue

@@ -46,7 +46,8 @@
         </div>
       </div>
     </div>
-    <div class="footer" v-if="info.status != 0" @click="toAdd">采样</div>
+    <div class="btn-height"></div>
+    <div class="footer" v-if="info.status != 2" @click="toAdd">采样</div>
   </div>
 </template>
 
@@ -189,6 +190,9 @@ export default {
     height: 24px;
     background-color: #F3F6F9;
   }
+  .btn-height{
+    height: 130px;
+  }
   .footer{
     width: 100%;
     height: 112px;