Merge remote-tracking branch 'origin/build' into union

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%">
+            <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) {