From 370f0093ffec0284f402dfc5bf5c55a3fe039dee Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 1 Dec 2022 09:41:24 +0800
Subject: [PATCH 1/4] bug

---
 .../apps/AppHomeReport/components/Detail.vue  | 22 ++++++-------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/project/pingchang/apps/AppHomeReport/components/Detail.vue b/project/pingchang/apps/AppHomeReport/components/Detail.vue
index 8614b6f5..55206b89 100644
--- a/project/pingchang/apps/AppHomeReport/components/Detail.vue
+++ b/project/pingchang/apps/AppHomeReport/components/Detail.vue
@@ -134,7 +134,7 @@
           <el-form-item label="身份证" prop="idNumber" style="width: 100%" :rules="[{required: true, message: '请输入身份证', trigger: 'blur'}]">
             <el-input size="small" placeholder="请输入身份证" v-model="form.idNumber"></el-input>
           </el-form-item>
-          <el-form-item label="出发时间" prop="startTime" style="width: 100%" :rules="[{required: true, message: '请选择出发时间', trigger: 'change'}]">
+          <el-form-item label="出发时间" prop="startTime" style="width: 100%">
             <el-date-picker
               v-model="form.startTime"
               type="datetime"
@@ -146,10 +146,10 @@
           <el-form-item label="出发地" prop="startAreaId" style="width: 100%" :rules="[{required: true, message: '请选择出发地', trigger: 'change'}]">
             <ai-area-select clearable always-show :instance="instance" v-model="form.startAreaId"></ai-area-select>
           </el-form-item>
-          <el-form-item label="出发地详址" prop="startAddress" style="width: 100%" :rules="[{required: true, message: '请输入出发地详址', trigger: 'blur'}]">
+          <el-form-item label="出发地详址" prop="startAddress" style="width: 100%">
             <el-input size="small" placeholder="请输入出发地详址" v-model="form.startAddress"></el-input>
           </el-form-item>
-          <el-form-item label="出行方式" prop="travelType" style="width: 100%" :rules="[{required: true, message: '请选择出行方式', trigger: 'change'}]">
+          <el-form-item label="出行方式" prop="travelType" style="width: 100%">
             <ai-select
               v-model="form.travelType"
               clearable
@@ -157,21 +157,13 @@
               :selectList="dict.getDict('EP_travelType')">
             </ai-select>
           </el-form-item>
-          <el-form-item label="车次/航班" prop="trainNo" style="width: 100%" :rules="[{required: true, message: '请输入车次', trigger: 'blur'}]">
+          <el-form-item label="车次/航班" prop="trainNo" style="width: 100%">
             <el-input size="small" placeholder="请输入车次/航班" v-model="form.trainNo"></el-input>
           </el-form-item>
-          <el-form-item label="行程描述" prop="description" style="width: 100%" :rules="[{required: true, message: '请输入行程描述', trigger: 'blur'}]">
+          <el-form-item label="行程描述" prop="description" style="width: 100%">
             <el-input size="small" placeholder="请输入行程描述" v-model="form.description"></el-input>
           </el-form-item>
-          <el-form-item label="抵平卡口" prop="arriveGatewayId" style="width: 100%" :rules="[{required: true, message: '请选择抵平卡口', trigger: 'change'}]">
-            <ai-select
-              v-model="form.arriveGatewayId"
-              clearable
-              placeholder="请选择抵平卡口"
-              :selectList="dictList">
-            </ai-select>
-          </el-form-item>
-          <el-form-item label="抵平时间" prop="arriveTime" style="width: 100%" :rules="[{required: true, message: '请选择抵平时间', trigger: 'change'}]">
+          <el-form-item label="抵平时间" prop="arriveTime" style="width: 100%">
             <el-date-picker
               v-model="form.arriveTime"
               type="datetime"
@@ -183,7 +175,7 @@
           <el-form-item label="目的地" prop="arriveAreaId" style="width: 100%" :rules="[{required: true, message: '请选择目的地', trigger: 'change'}]">
             <ai-area-select clearable always-show :instance="instance" v-model="form.arriveAreaId"></ai-area-select>
           </el-form-item>
-          <el-form-item label="目的地详址" prop="arriveAddress" style="width: 100%" :rules="[{required: true, message: '请输入目的地详址', trigger: 'blur'}]">
+          <el-form-item label="目的地详址" prop="arriveAddress" style="width: 100%">
             <el-input size="small" placeholder="请输入目的地详址" v-model="form.arriveAddress"></el-input>
           </el-form-item>
         </el-form>

From a9ad0a47aeb915f8c9d656e4e6343f45177eff28 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 1 Dec 2022 09:50:28 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=B9=B3=E6=98=8C=E7=96=AB=E6=83=85?=
 =?UTF-8?q?=E9=98=B2=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Detail.vue                     | 100 +++++++++++++++++-
 .../apps/AppHomeReport/components/Detail.vue  |   3 +-
 2 files changed, 100 insertions(+), 3 deletions(-)

diff --git a/project/pingchang/apps/AppBayonetRegistration/components/Detail.vue b/project/pingchang/apps/AppBayonetRegistration/components/Detail.vue
index 91b0abf9..dc7e9e85 100644
--- a/project/pingchang/apps/AppBayonetRegistration/components/Detail.vue
+++ b/project/pingchang/apps/AppBayonetRegistration/components/Detail.vue
@@ -8,6 +8,9 @@
       <AiSidebar :tabTitle="tabList" v-model="currIndex"></AiSidebar>
       <div v-show="currIndex === 0">
         <ai-card title="基本信息" v-show="currIndex === 0">
+          <template #right>
+            <el-button type="primary" @click="(form = {...info}, isShow = true)">编辑</el-button>
+          </template>
           <template #content>
             <ai-wrapper
               label-width="120px">
@@ -20,6 +23,9 @@
           </template>
         </ai-card>
         <ai-card title="行程信息">
+          <template #right>
+            <el-button type="primary" @click="(form = {...info}, isShow = true)">编辑</el-button>
+          </template>
           <template #content>
             <ai-wrapper
               label-width="120px">
@@ -146,6 +152,61 @@
           </template>
         </ai-card>
       </div>
+      <ai-dialog
+        :visible.sync="isShow"
+        width="890px"
+        title="编辑"
+        @onConfirm="onConfirm">
+        <el-form class="ai-form" ref="form" :model="form" label-width="110px" label-position="right">
+          <el-form-item label="身份证" prop="idNumber" style="width: 100%" :rules="[{required: true, message: '请输入身份证', trigger: 'blur'}]">
+            <el-input size="small" placeholder="请输入身份证" v-model="form.idNumber"></el-input>
+          </el-form-item>
+          <el-form-item label="出发时间" prop="startTime" style="width: 100%">
+            <el-date-picker
+              v-model="form.startTime"
+              type="datetime"
+              size="small"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              placeholder="请选择出发时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="出发地" prop="startAreaId" style="width: 100%" :rules="[{required: true, message: '请选择出发地', trigger: 'change'}]">
+            <ai-area-select clearable always-show :instance="instance" v-model="form.startAreaId"></ai-area-select>
+          </el-form-item>
+          <el-form-item label="出发地详址" prop="startAddress" style="width: 100%">
+            <el-input size="small" placeholder="请输入出发地详址" v-model="form.startAddress"></el-input>
+          </el-form-item>
+          <el-form-item label="出行方式" prop="travelType" style="width: 100%">
+            <ai-select
+              v-model="form.travelType"
+              clearable
+              placeholder="请选择出行方式"
+              :selectList="dict.getDict('EP_travelType')">
+            </ai-select>
+          </el-form-item>
+          <el-form-item label="车次/航班" prop="trainNo" style="width: 100%">
+            <el-input size="small" placeholder="请输入车次/航班" v-model="form.trainNo"></el-input>
+          </el-form-item>
+          <el-form-item label="行程描述" prop="description" style="width: 100%">
+            <el-input size="small" placeholder="请输入行程描述" v-model="form.description"></el-input>
+          </el-form-item>
+          <el-form-item label="抵平时间" prop="arriveTime" style="width: 100%">
+            <el-date-picker
+              v-model="form.arriveTime"
+              type="datetime"
+              size="small"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              placeholder="请选择抵平时间">
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="目的地" prop="arriveAreaId" style="width: 100%" :rules="[{required: true, message: '请选择目的地', trigger: 'change'}]">
+            <ai-area-select clearable always-show :instance="instance" v-model="form.arriveAreaId"></ai-area-select>
+          </el-form-item>
+          <el-form-item label="目的地详址" prop="arriveAddress" style="width: 100%">
+            <el-input size="small" placeholder="请输入目的地详址" v-model="form.arriveAddress"></el-input>
+          </el-form-item>
+        </el-form>
+      </ai-dialog>
     </template>
   </ai-detail>
 </template>
@@ -167,12 +228,16 @@
         currIndex: 0,
         isLoading: false,
         tableData: [],
+        form: {
+          idNumber: ''
+        },
         communityInfo: {},
         colConfigs: [
           {prop: 'name', label: '姓名', align: 'center' },
           {prop: 'phone', label: '手机号', align: 'center'}
         ],
-        tabList: ['基本信息', '风险处置']
+        tabList: ['基本信息', '风险处置'],
+        dictList: []
       }
     },
 
@@ -184,9 +249,42 @@
           this.getInfo(this.params.id)
         })
       }
+
+      this.getDictList()
     },
 
     methods: {
+      getDictList () {
+        this.instance.post(`/app/appepidemicpreventiongateway/list?size=10000&current=1`).then(res => {
+          if (res.code == 0) {
+            this.dictList = res.data.records.map(v => {
+              return {
+                dictName: v.name,
+                dictValue: v.id
+              }
+            })
+          }
+        })
+      },
+
+      onConfirm () {
+        this.$refs.form.validate((valid) => {
+          if (valid) {
+            this.instance.post(`/app/appepidemicpreventionregisterinfo/updateForAdmin`, {
+              ...this.info,
+              ...this.form,
+              id: this.params.id
+            }).then(res => {
+              if (res.code == 0) {
+                this.isShow = false
+                this.getInfo(this.params.id)
+                this.$message.success('编辑成功')
+              }
+            })
+          }
+        })
+      },
+
       getInfo (id) {
         this.instance.post(`/app/appepidemicpreventionregisterinfo/queryDetailById?id=${id}`).then(res => {
           if (res.code === 0) {
diff --git a/project/pingchang/apps/AppHomeReport/components/Detail.vue b/project/pingchang/apps/AppHomeReport/components/Detail.vue
index 55206b89..cff45a33 100644
--- a/project/pingchang/apps/AppHomeReport/components/Detail.vue
+++ b/project/pingchang/apps/AppHomeReport/components/Detail.vue
@@ -9,7 +9,7 @@
       <div v-show="currIndex === 0">
         <ai-card title="基本信息" v-show="currIndex === 0">
           <template #right>
-            <el-button type="primary" @click="(form.idNumber = info.idNumber, isShow = true)">编辑</el-button>
+            <el-button type="primary" @click="(form = {...info}, isShow = true)">编辑</el-button>
           </template>
           <template #content>
             <ai-wrapper
@@ -128,7 +128,6 @@
         :visible.sync="isShow"
         width="890px"
         title="编辑"
-        @close="form.idNumber = ''"
         @onConfirm="onConfirm">
         <el-form class="ai-form" ref="form" :model="form" label-width="110px" label-position="right">
           <el-form-item label="身份证" prop="idNumber" style="width: 100%" :rules="[{required: true, message: '请输入身份证', trigger: 'blur'}]">

From e20a06fa4f96b68bff1f17c9f0ec563a234ddcb6 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 1 Dec 2022 10:18:40 +0800
Subject: [PATCH 3/4] bug

---
 .../pingchang/apps/AppBayonetRegistration/components/Detail.vue | 2 +-
 project/pingchang/apps/AppHomeReport/components/Detail.vue      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/project/pingchang/apps/AppBayonetRegistration/components/Detail.vue b/project/pingchang/apps/AppBayonetRegistration/components/Detail.vue
index dc7e9e85..b753aa50 100644
--- a/project/pingchang/apps/AppBayonetRegistration/components/Detail.vue
+++ b/project/pingchang/apps/AppBayonetRegistration/components/Detail.vue
@@ -158,7 +158,7 @@
         title="编辑"
         @onConfirm="onConfirm">
         <el-form class="ai-form" ref="form" :model="form" label-width="110px" label-position="right">
-          <el-form-item label="身份证" prop="idNumber" style="width: 100%" :rules="[{required: true, message: '请输入身份证', trigger: 'blur'}]">
+          <el-form-item label="身份证" prop="idNumber" style="width: 100%">
             <el-input size="small" placeholder="请输入身份证" v-model="form.idNumber"></el-input>
           </el-form-item>
           <el-form-item label="出发时间" prop="startTime" style="width: 100%">
diff --git a/project/pingchang/apps/AppHomeReport/components/Detail.vue b/project/pingchang/apps/AppHomeReport/components/Detail.vue
index cff45a33..e8852caf 100644
--- a/project/pingchang/apps/AppHomeReport/components/Detail.vue
+++ b/project/pingchang/apps/AppHomeReport/components/Detail.vue
@@ -130,7 +130,7 @@
         title="编辑"
         @onConfirm="onConfirm">
         <el-form class="ai-form" ref="form" :model="form" label-width="110px" label-position="right">
-          <el-form-item label="身份证" prop="idNumber" style="width: 100%" :rules="[{required: true, message: '请输入身份证', trigger: 'blur'}]">
+          <el-form-item label="身份证" prop="idNumber" style="width: 100%">
             <el-input size="small" placeholder="请输入身份证" v-model="form.idNumber"></el-input>
           </el-form-item>
           <el-form-item label="出发时间" prop="startTime" style="width: 100%">

From 69e419d9cfcacc22ee25908ebb8cf0f531dfa990 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 1 Dec 2022 11:02:27 +0800
Subject: [PATCH 4/4] bug

---
 project/pingchang/apps/AppWorkTask/components/Add.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/project/pingchang/apps/AppWorkTask/components/Add.vue b/project/pingchang/apps/AppWorkTask/components/Add.vue
index a73dd830..71ca724b 100644
--- a/project/pingchang/apps/AppWorkTask/components/Add.vue
+++ b/project/pingchang/apps/AppWorkTask/components/Add.vue
@@ -53,20 +53,20 @@
             <div class="especial">
               <span class="icon">*</span>
               <span class="people">执行人:</span>
-              <ai-wechat-selecter slot="append" isShowUser :instance="instance" v-model="formData.userInfoList" :disable="userInfoListDisable"></ai-wechat-selecter>
+              <ai-user-selecter slot="append" isShowUser :instance="instance" v-model="formData.userInfoList" :disable="userInfoListDisable"></ai-user-selecter>
             </div>
 
             <!-- 督办人 -->
             <div class="especial">
               <span class="icon">&nbsp;</span>
               <span class="people">督办人:</span>
-              <ai-wechat-selecter slot="append" isShowUser :instance="instance" v-model="formData.checkUserList" :disable="checkUserListDisable"></ai-wechat-selecter>
+              <ai-user-selecter slot="append" isShowUser :instance="instance" v-model="formData.checkUserList" :disable="checkUserListDisable"></ai-user-selecter>
             </div>
 
             <div class="especial">
               <span class="icon">&nbsp;</span>
               <span class="people">抄送人:</span>
-              <ai-wechat-selecter slot="append" isShowUser :instance="instance" v-model="formData.sendUserList" :disable="sendUserListDisable"></ai-wechat-selecter>
+              <ai-user-selecter slot="append" isShowUser :instance="instance" v-model="formData.sendUserList" :disable="sendUserListDisable"></ai-user-selecter>
             </div>
           </el-form>
         </template>