From bcd1aaae148906978996fa0515daaee2d7eb295c Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Fri, 15 Oct 2021 16:51:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E7=9C=8B=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/custom/tripreport-look.vue | 130 +++++++------------
 src/views/modules/custom/tripreport.vue      |  14 +-
 2 files changed, 61 insertions(+), 83 deletions(-)

diff --git a/src/views/modules/custom/tripreport-look.vue b/src/views/modules/custom/tripreport-look.vue
index 2b14e32..742b9ff 100644
--- a/src/views/modules/custom/tripreport-look.vue
+++ b/src/views/modules/custom/tripreport-look.vue
@@ -1,73 +1,39 @@
 <template>
-  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+  <el-dialog :visible.sync="visible" title="查看" :close-on-click-modal="false" :close-on-press-escape="false">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
-          <el-form-item label="姓名" prop="name" label-width="120px">
-          <el-input v-model="dataForm.name" placeholder="姓名" style="width:300px"></el-input>
+          <el-form-item label="姓名：" prop="name" label-width="125px">
+              {{dataForm.name}}
       </el-form-item>
-          <el-form-item label="手机号" prop="mobile" label-width="120px">
-          <el-input v-model="dataForm.mobile" placeholder="手机号" style="width:300px"></el-input>
+          <el-form-item label="手机号：" prop="mobile" label-width="125px">
+              {{dataForm.mobile}}
       </el-form-item>
-          <el-form-item label="身份证" prop="idCard" label-width="120px">
-          <el-input v-model="dataForm.idCard" placeholder="身份证" style="width:300px"></el-input>
+          <el-form-item label="身份证：" prop="idCard" label-width="125px">
+              {{dataForm.idCard}}
       </el-form-item>
-        <el-form-item label="来到(本地)时间" prop="comeDate" label-width="120px">
-            <el-date-picker
-                    v-model="dataForm.comeDate"
-                    type="date"
-                    placeholder="来到(本地)时间"
-                    value-format="yyyy-MM-dd"
-                    format="yyyy-MM-dd"
-                    style="width:300px">
-            </el-date-picker>
+        <el-form-item label="来到(本地)时间：" prop="comeDate" label-width="125px">
+            {{dataForm.comeDate}}
         </el-form-item>
-        <el-form-item label="返回时间" prop="backDate" label-width="120px">
-            <el-date-picker
-                    v-model="dataForm.backDate"
-                    type="date"
-                    placeholder="返回时间"
-                    value-format="yyyy-MM-dd"
-                    format="yyyy-MM-dd"
-                    style="width:300px">
-            </el-date-picker>
+        <el-form-item label="返回时间：" prop="backDate" label-width="125px">
+            {{dataForm.backDate}}
         </el-form-item>
 <!--          <el-form-item label="现居住地编码" prop="nowAddressCode">-->
 <!--          <el-input v-model="dataForm.nowAddressCode" placeholder="现居住地编码"></el-input>-->
 <!--      </el-form-item>-->
-          <el-form-item label="现居住地" prop="nowAddressName" label-width="120px">
-              <el-cascader
-                      ref="nowRef"
-                      v-model="dataForm.nowAddressCode"
-                      :props="nowProps"
-                      filterable
-                      :options="nowAreaList"
-                      :placeholder="tempNowAddressName"
-                      @change="handleChange"
-                      @visible-change="updateNowHandle"
-                      style="width:500px">
-              </el-cascader>
+          <el-form-item label="现居住地：" prop="nowAddressName" label-width="125px">
+              {{dataForm.nowAddressName}}
       </el-form-item>
-          <el-form-item label="现居住详细地址" prop="nowAddressDetail" label-width="120px">
-          <el-input v-model="dataForm.nowAddressDetail" placeholder="现居住详细地址" style="width:500px"></el-input>
+          <el-form-item label="现居住详细地址：" prop="nowAddressDetail" label-width="125px">
+              {{dataForm.nowAddressDetail}}
       </el-form-item>
 <!--          <el-form-item label="来自地区编码" prop="comeAddressCode">-->
 <!--          <el-input v-model="dataForm.comeAddressCode" placeholder="来自地区编码"></el-input>-->
 <!--      </el-form-item>-->
-          <el-form-item label="来自地区" prop="comeAddressName" label-width="120px">
-              <el-cascader
-                      ref="comeRef"
-                      v-model="dataForm.comeAddressCode"
-                      :props="comeProps"
-                      filterable
-                      :options="comeAreaList"
-                      :placeholder="tempComeAddressName"
-                      style="width:500px"
-                      @change="handleChange"
-                      @visible-change="updateComeHandle">
-              </el-cascader>
+          <el-form-item label="来自地区：" prop="comeAddressName" label-width="125px">
+              {{dataForm.comeAddressName}}
       </el-form-item>
 
-          <el-form-item label="备注" prop="note" label-width="120px">
-              <el-input v-model="dataForm.note" type="textarea" style="width:500px" maxlength="200" placeholder="请输入备注，最多200字"></el-input>
+          <el-form-item label="备注：" prop="note" label-width="125px">
+              {{dataForm.note}}
       </el-form-item>
       </el-form>
     <template slot="footer">
@@ -164,35 +130,35 @@ export default {
   computed: {
     dataRule () {
       return {
-        name: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        mobile: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' },
-          { pattern: /^[1][1,2,3,4,5,6,7,8,9][0-9]{9}$/, message: '请输入正确号码格式', trigger: 'blur' }
-        ],
-        idCard: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' },
-          { pattern: /(^\d{15}$)|bai(^\d{18}$)|(^\d{17}(\d|X|x)$)/, message: '请输入正确身份证号', trigger: 'blur' }
-        ],
-        nowAddressCode: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        nowAddressName: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        nowAddressDetail: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        comeAddressCode: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        comeAddressName: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        comeDate: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
+        // name: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // mobile: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' },
+        //   { pattern: /^[1][1,2,3,4,5,6,7,8,9][0-9]{9}$/, message: '请输入正确号码格式', trigger: 'blur' }
+        // ],
+        // idCard: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' },
+        //   { pattern: /(^\d{15}$)|bai(^\d{18}$)|(^\d{17}(\d|X|x)$)/, message: '请输入正确身份证号', trigger: 'blur' }
+        // ],
+        // nowAddressCode: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // nowAddressName: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // nowAddressDetail: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // comeAddressCode: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // comeAddressName: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
+        // comeDate: [
+        //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        // ],
         // backDate: [
         //   { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         // ],
diff --git a/src/views/modules/custom/tripreport.vue b/src/views/modules/custom/tripreport.vue
index 5fda075..d616763 100644
--- a/src/views/modules/custom/tripreport.vue
+++ b/src/views/modules/custom/tripreport.vue
@@ -95,6 +95,7 @@
         <el-table-column prop="createdTime" label="上报时间" width="180px"  header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
+            <el-button type="text" size="small" @click="openLook(scope.row.id)">{{ $t('详情') }}</el-button>
             <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
             <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
@@ -111,6 +112,7 @@
       </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
       <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <tripreport-look v-if="lookVisible" ref="tripreportLook" @refreshDataList="getDataList"></tripreport-look>
     </div>
   </el-card>
 </template>
@@ -118,6 +120,7 @@
 <script>
 import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './tripreport-add-or-update'
+import TripreportLook from './tripreport-look'
 export default {
   mixins: [mixinViewModule],
   data () {
@@ -138,6 +141,7 @@ export default {
         comeCode:'',
         nowCode:''
       },
+      lookVisible:false,
       comeAllAreaIds:[],
       nowAllAreaIds:[],
       comeAreaList: [{
@@ -201,13 +205,21 @@ export default {
     }
   },
   components: {
-    AddOrUpdate
+    AddOrUpdate,
+    TripreportLook
   },
   mounted () {
     // 调用组件先获取第一层数据
     this.getProjectList(0)
   },
   methods :{
+    openLook (id) {
+      this.lookVisible = true
+      this.$nextTick(() => {
+        this.$refs.tripreportLook.dataForm.id = id
+        this.$refs.tripreportLook.init()
+      })
+    },
     handleChange (value) {
       if (value.length > 0) {
         // 获取当前选中节点