From ae61510015fe8d703bb2c5190cad4819c7b1145e Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Wed, 9 Dec 2020 17:43:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=BC=E5=9B=A2=E8=B4=AD=20=E9=A1=BA?=
 =?UTF-8?q?=E9=81=93=E6=8D=8E=20bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/custom/groupbuy-detail.vue  | 93 +++++++++++++++++
 src/views/modules/custom/groupbuyinfo.vue     | 31 ++++--
 src/views/modules/custom/sds-detail.vue       | 99 +++++++++++++++++++
 .../modules/custom/sdsinfo-add-or-update.vue  |  6 +-
 src/views/modules/custom/sdsinfo.vue          | 38 ++++---
 5 files changed, 244 insertions(+), 23 deletions(-)
 create mode 100644 src/views/modules/custom/groupbuy-detail.vue
 create mode 100644 src/views/modules/custom/sds-detail.vue

diff --git a/src/views/modules/custom/groupbuy-detail.vue b/src/views/modules/custom/groupbuy-detail.vue
new file mode 100644
index 0000000..986170a
--- /dev/null
+++ b/src/views/modules/custom/groupbuy-detail.vue
@@ -0,0 +1,93 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="$t('look')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" ref="dataForm" label-width="150px">
+          <el-form-item label="标题：" prop="groupBuyTitle">
+          <div>{{ dataForm.groupBuyTitle }}</div>
+      </el-form-item>
+        <el-form-item label="联系电话：" prop="groupBuyMobile">
+            <div>{{ dataForm.groupBuyMobile }}</div>
+        </el-form-item>
+        <el-form-item label="发布内容：" prop="groupBuyContent">
+            <div>{{ dataForm.groupBuyContent }}</div>
+        </el-form-item>
+        <el-form-item label="团购时间：" prop="groupBuyTime">
+            <div>{{ dataForm.groupBuyTime }}</div>
+        </el-form-item>
+        <el-form-item label="发布时间：" prop="createdTime">
+          <div>{{ dataForm.createdTime }}</div>
+        </el-form-item>
+      <el-form-item label="排序：" prop="sort">
+          <div>{{ dataForm.sort }}</div>
+        </el-form-item>
+        <el-form-item v-if="dataForm.shieldFlag === '1'" label="屏蔽状态：" prop="shieldFlag">
+            <div>已屏蔽</div>
+        </el-form-item>
+        <el-form-item v-if="dataForm.shieldFlag === '1'" label="屏蔽原因：" prop="shieldReason">
+            <div>{{ dataForm.shieldReason }}</div>
+        </el-form-item>
+      </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('close') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        content: '',
+        reportUser: '',
+        reportUserMobile: '',
+        anonymousFlag: '',
+        userId: '',
+        nickname: '',
+        userFace: '',
+        mobile: '',
+        deptId: '',
+        deptName: '',
+        parentDeptIds: '',
+        parentDeptNames: '',
+        allDeptIds: '',
+        allDeptNames: '',
+        delFlag: '',
+        shieldFlag: '',
+        shieldReason: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: ''
+      }
+    }
+  },
+  computed: {
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/custom/groupbuyinfo/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/custom/groupbuyinfo.vue b/src/views/modules/custom/groupbuyinfo.vue
index bfabb4b..3775879 100644
--- a/src/views/modules/custom/groupbuyinfo.vue
+++ b/src/views/modules/custom/groupbuyinfo.vue
@@ -2,7 +2,7 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-custom__groupbuyinfo}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
+        <el-form-item label="标题" prop="groupBuyTitle">
           <el-input v-model.trim="dataForm.groupBuyTitle" placeholder="标题" clearable></el-input>
         </el-form-item>
         <el-form-item label="发布时间" prop="startTime">
@@ -32,14 +32,17 @@
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column prop="groupBuyTitle" label="标题" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="groupBuyMobile" label="联系电话" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="groupBuyContent" label="发布内容" header-align="center" align="center"></el-table-column>
+        <el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
+        <el-table-column  prop="groupBuyTitle" label="标题" header-align="center" align="center" width="200px"></el-table-column>
+        <el-table-column prop="groupBuyMobile" label="联系电话" header-align="center" align="center" width="150"></el-table-column>
+        <el-table-column show-overflow-tooltip prop="groupBuyContent" label="发布内容" header-align="center" align="center" width="300px"></el-table-column>
         <el-table-column prop="groupBuyTime" label="团购时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="sort" label="排序" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdTime" label="发布时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="sort" label="排序" header-align="center" align="center" width="100px"></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="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button  type="text" size="mini" @click="groupBuyDetailHandle(scope.row.id)">查看</el-button>
+            <el-button v-if="scope.row.shieldFlag === '0'"  type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
             <el-button v-if="scope.row.shieldFlag === '0'"
                        type="text"
                        size="small"
@@ -61,6 +64,8 @@
       </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
       <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <groupbuy-detail v-if="groupbuyDetailVisible" ref="groupbuyDetail" @refreshDataList="getDataList"></groupbuy-detail>
+
     </div>
   </el-card>
 </template>
@@ -68,6 +73,7 @@
 <script>
 import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './groupbuyinfo-add-or-update'
+import GroupbuyDetail from './groupbuy-detail'
 export default {
   mixins: [mixinViewModule],
   data () {
@@ -98,11 +104,13 @@ export default {
             return time.getTime() < new Date(EndDateVal).getTime()
           }
         }
-      }
+      },
+      groupbuyDetailVisible: false
     }
   },
   components: {
-    AddOrUpdate
+    AddOrUpdate,
+    GroupbuyDetail
   },
   methods: {
     shield (val) {
@@ -130,6 +138,13 @@ export default {
         }).catch(() => { })
       }).catch(() => {
       })
+    },
+    groupBuyDetailHandle (goupBuyId) {
+      this.groupbuyDetailVisible = true
+      this.$nextTick(() => {
+        this.$refs.groupbuyDetail.dataForm.id = goupBuyId
+        this.$refs.groupbuyDetail.init()
+      })
     }
   }
 }
diff --git a/src/views/modules/custom/sds-detail.vue b/src/views/modules/custom/sds-detail.vue
new file mode 100644
index 0000000..2da1106
--- /dev/null
+++ b/src/views/modules/custom/sds-detail.vue
@@ -0,0 +1,99 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="$t('look')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" ref="dataForm" label-width="150px">
+          <el-form-item label="出发地：" prop="departure">
+          <div>{{ dataForm.departure }}</div>
+      </el-form-item>
+        <el-form-item label="目的地：" prop="destination">
+            <div>{{ dataForm.destination }}</div>
+        </el-form-item>
+        <el-form-item label="出发时间：" prop="departureTime">
+            <div>{{ dataForm.departureTime }}</div>
+        </el-form-item>
+        <el-form-item label="联系电话：" prop="mobile">
+            <div>{{ dataForm.mobile }}</div>
+        </el-form-item>
+        <el-form-item label="捎带内容：" prop="carryContent">
+            <div>{{ dataForm.carryContent }}</div>
+        </el-form-item>
+        <el-form-item label="捎带类型：" prop="carryStatus">
+            <div>{{ dataForm.carryStatus === '0' ? '需要捎':dataForm.anonymousFlag === '1' ? '可以捎':'未知' }}</div>
+        </el-form-item>
+        <el-form-item label="发布时间：" prop="createdTime">
+          <div>{{ dataForm.createdTime }}</div>
+        </el-form-item>
+      <el-form-item label="排序：" prop="sort">
+          <div>{{ dataForm.sort }}</div>
+        </el-form-item>
+        <el-form-item v-if="dataForm.shieldFlag === '1'" label="屏蔽状态：" prop="shieldFlag">
+            <div>已屏蔽</div>
+        </el-form-item>
+        <el-form-item v-if="dataForm.shieldFlag === '1'" label="屏蔽原因：" prop="shieldReason">
+            <div>{{ dataForm.shieldReason }}</div>
+        </el-form-item>
+      </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('close') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        content: '',
+        reportUser: '',
+        reportUserMobile: '',
+        anonymousFlag: '',
+        userId: '',
+        nickname: '',
+        userFace: '',
+        mobile: '',
+        deptId: '',
+        deptName: '',
+        parentDeptIds: '',
+        parentDeptNames: '',
+        allDeptIds: '',
+        allDeptNames: '',
+        delFlag: '',
+        shieldFlag: '',
+        shieldReason: '',
+        revision: '',
+        createdBy: '',
+        createdTime: '',
+        updatedBy: '',
+        updatedTime: ''
+      }
+    }
+  },
+  computed: {
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/custom/sdsinfo/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    }
+  }
+}
+</script>
diff --git a/src/views/modules/custom/sdsinfo-add-or-update.vue b/src/views/modules/custom/sdsinfo-add-or-update.vue
index 3b1875d..a276efe 100644
--- a/src/views/modules/custom/sdsinfo-add-or-update.vue
+++ b/src/views/modules/custom/sdsinfo-add-or-update.vue
@@ -17,7 +17,7 @@
           <el-input v-model="dataForm.carryContent" placeholder="捎带内容"></el-input>
       </el-form-item>
       <el-form-item label="捎带类型" prop="carryStatus">
-        <el-select style="width: 100px" v-model="dataForm.carryStatus" placeholder="请选择" clearable>
+        <el-select v-model="dataForm.carryStatus" placeholder="请选择" clearable>
           <el-option
               v-for="item in carryStatusArr"
               :key="item.optionValue"
@@ -56,11 +56,11 @@ export default {
       carryStatusArr: [
         {
           'optionValue': '0',
-          'optionName': '我需要捎'
+          'optionName': '需要捎'
         },
         {
           'optionValue': '1',
-          'optionName': '我可以捎'
+          'optionName': '可以捎'
         }
       ]
     }
diff --git a/src/views/modules/custom/sdsinfo.vue b/src/views/modules/custom/sdsinfo.vue
index 3f1143e..186a4e1 100644
--- a/src/views/modules/custom/sdsinfo.vue
+++ b/src/views/modules/custom/sdsinfo.vue
@@ -39,16 +39,19 @@
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column prop="departure" label="出发地" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="destination" label="目的地" header-align="center" align="center"></el-table-column>
+        <el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
+        <el-table-column show-overflow-tooltip prop="departure" label="出发地" header-align="center" align="center" width="200px"></el-table-column>
+        <el-table-column show-overflow-tooltip prop="destination" label="目的地" header-align="center" align="center" width="200px"></el-table-column>
         <el-table-column prop="departureTime" label="出发时间" header-align="center" align="center"></el-table-column>
         <el-table-column prop="mobile" label="联系电话" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="carryContent" label="捎带内容" header-align="center" align="center" :formatter="carryStatusFormat"></el-table-column>
-        <el-table-column prop="carryStatus" label="捎带类型" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="sort" label="排序" header-align="center" align="center"></el-table-column>
+        <el-table-column show-overflow-tooltip prop="carryContent" label="捎带内容" header-align="center" align="center" ></el-table-column>
+        <el-table-column prop="carryStatus" label="捎带类型" header-align="center" align="center" :formatter="carryStatusFormat"></el-table-column>
+        <el-table-column prop="createdTime" label="发布时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="sort" label="排序" header-align="center" align="center" width="100px"></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="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button  type="text" size="mini" @click="sdsDetailHandle(scope.row.id)">查看</el-button>
+            <el-button v-if="scope.row.shieldFlag === '0'" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
             <el-button v-if="scope.row.shieldFlag === '0'"
                        type="text"
                        size="small"
@@ -70,6 +73,7 @@
       </el-pagination>
       <!-- 弹窗, 新增 / 修改 -->
       <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <sds-detail v-if="detailVisible" ref="sdsDetail" @refreshDataList="getDataList"></sds-detail>
     </div>
   </el-card>
 </template>
@@ -77,6 +81,7 @@
 <script>
 import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './sdsinfo-add-or-update'
+import SdsDetail from './sds-detail'
 export default {
   mixins: [mixinViewModule],
   data () {
@@ -95,11 +100,11 @@ export default {
       carryStatusArr: [
         {
           'optionValue': '0',
-          'optionName': '我需要捎'
+          'optionName': '需要捎'
         },
         {
           'optionValue': '1',
-          'optionName': '我可以捎'
+          'optionName': '可以捎'
         }
       ],
       pickerBeginDateBefore: {
@@ -117,19 +122,21 @@ export default {
             return time.getTime() < new Date(EndDateVal).getTime()
           }
         }
-      }
+      },
+      detailVisible: false
     }
   },
   components: {
-    AddOrUpdate
+    AddOrUpdate,
+    SdsDetail
   },
   methods: {
     carryStatusFormat: function (row, column) {
       let carryStatus = row.carryStatus
       if (carryStatus === '0') {
-        return '我需要捎'
+        return '需要捎'
       } else if (carryStatus === '1') {
-        return '我可以捎'
+        return '可以捎'
       }
     },
     shield (val) {
@@ -157,6 +164,13 @@ export default {
         }).catch(() => { })
       }).catch(() => {
       })
+    },
+    sdsDetailHandle (sdsId) {
+      this.detailVisible = true
+      this.$nextTick(() => {
+        this.$refs.sdsDetail.dataForm.id = sdsId
+        this.$refs.sdsDetail.init()
+      })
     }
   }
 }