文案修改

src/components/pages/CanteenManagement/MenuManagement.vue

@@ -3,8 +3,13 @@
     <a-button style="margin-bottom: 20px" type="primary" @click="showModal()">添加菜品</a-button>
     <div style="display: flex">
       <div class="productionMenu">
-        <div class="menuItem" style="font-weight: bold;">菜品所有分类</div>
-        <div :class="item.productCategoryId === menuId ? 'menuItem menuItemAction' : 'menuItem'" v-for="item in dataSource" :key="item.productCategoryId" @click="changeMenuItem(item.productCategoryId)">{{item.productCategoryName}}</div>
+        <div class="menuItem" style="font-weight: bold;height: 52px;lint-height: 52px;">菜品所有分类</div>
+        <div :class="item.productCategoryId === menuId ? 'menuItem menuItemAction' : 'menuItem'" v-for="item in dataSource" :key="item.productCategoryId" @click="changeMenuItem(item.productCategoryId)">
+          {{item.productCategoryName}}
+          <div class="menuProductStatus" v-if="item.isDisplay === 'HIDDEN'">
+            <img src="../../../assets/hiddenMenu.png" alt="">
+          </div>
+        </div>
       </div>
       <div style="flex: 1;padding-left: 20px">
         <a-table :columns="columns" :dataSource="tableSource" rowKey="productId" :pagination="pagination">
@@ -428,8 +433,9 @@ export default {
 }
 .productionMenu>.menuItem{
   height: 40px;
-  padding: 0 24px;
   line-height: 40px;
+  position: relative;
+  text-align: center
 }
 .productionMenu>.menuItemAction{
   background: #ffffff;
@@ -447,4 +453,16 @@ export default {
   margin-top: 8px;
   color: #666;
 }
+.menuProductStatus{
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 40px;
+  height: 40px;
+}
+.menuProductStatus img{
+  width: 40px;
+  height: 40px;
+  display: block;
+}
 </style>

src/components/pages/PaymentManagement/AllowanceDetails.vue

@@ -2,30 +2,22 @@
   <div class="allowanceDetails">
     <a-button type="primary" @click="back()"><img style="margin-top:-4px;margin-right: 6px;width: 14px" src="../../../assets/back.png"/>返回</a-button>
     <div class="title">津贴详情</div>
-    <div class="allowanceDetailsBox">
+    <div class="allowanceDetailsBox" v-if="allowanceDetails">
       <div>
-        <label>成员</label>
-        <div>{{allowanceDetails.recipient}}</div>
-      </div>
-      <div>
-        <label>金额</label>
-        <div>{{allowanceDetails.money.toFixed(2)}}</div>
+        <label>津贴类型</label>
+        <div>{{allowanceDetails.subsidyType === 'TRAVEL' ? '交通补贴' : '餐补'}}</div>
       </div>
       <div>
         <label>截止日期</label>
         <div>{{ allowanceDetails.endTime }}</div>
       </div>
       <div>
-        <label>津贴类型</label>
-        <div>{{allowanceDetails.type === 'TRAVEL' ? '交通补贴' : '餐补'}}</div>
-      </div>
-      <div>
         <label>单号</label>
         <div>{{allowanceDetails.grantNumber}}</div>
       </div>
       <div>
         <label>经办人</label>
-        <div>{{allowanceDetails.agentId}}</div>
+        <div>{{allowanceDetails.agentName}}</div>
       </div>
       <div>
         <label>发放时间</label>
@@ -35,24 +27,56 @@
         <label>备注</label>
         <div>{{allowanceDetails.remark}}</div>
       </div>
+      <div>
+        <label>单笔金额</label>
+        <div>{{allowanceDetails.subsidyAmount.toFixed(2)}}</div>
+      </div>
+      <div>
+        <label>成员</label>
+        <div>{{allowanceDetails.recipient}}</div>
+      </div>
+    </div>
+    <div class="clickshowsearchUserMessage" @click="this.isshow = !this.isshow"><a href="javascript:;">查看具体成员</a></div>
+    <div class="searchUserMessage" v:if="isshow">
+      <div class="positionDiv"></div>
+      <div style="margin-bottom: 8px">
+        <label>请输入查询人员：</label><a-input style="width:220px" v-model="searchData" placeholder="" />
+      </div>
+      <div class="userList">
+        <span v-for="(item,index) in allowanceDetails.grantSubsidyUserName" :class="searchData === item ? 'searchData': ''" :key="index">{{item}}</span>
+      </div>
     </div>
   </div>
 </template>
 
 <script>
+import { $http } from './../../../api/axios.js'
 export default {
   name: 'allowanceDetails',
   data () {
     return {
-      allowanceDetails: ''
+      grantNumber: '',
+      allowanceDetails: '',
+      searchData: '',
+      isshow: false
     }
   },
   watch: {},
   computed: {},
   created: function () {
-    this.allowanceDetails = this.$route.params.allowanceDetails
+    this.grantNumber = this.$route.params.allowanceDetails
+    this.getStatisticalProductPage()
   },
   methods: {
+    getStatisticalProductPage () {
+      let data = this.$qs.stringify({
+        grantNumber: this.grantNumber
+      })
+      $http.get(`/mingpay/v1/isv/account/coupon_record_detail?${data}`).then((res) => {
+        console.log(res)
+        this.allowanceDetails = res.data.data
+      })
+    },
     back () {
       this.$router.go(-1)
     }
@@ -82,4 +106,38 @@ export default {
 .allowanceDetailsBox>div>div{
   flex: 1;
 }
+.searchUserMessage{
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  font-size: 14px;
+  padding: 8px 8px;
+  padding-right: 20px;
+  border: 1px solid #cccccc;
+  margin-bottom: 15px;
+  border-radius: 8px;
+  position: relative;
+}
+.positionDiv{
+  height: 12px;
+  width: 12px;
+  transform:rotate(45deg);
+  border-left: 1px solid #cccccc;
+  border-top: 1px solid #cccccc;
+  position: absolute;
+  top: -7px;
+  left: 30px;
+  background: white;
+  z-index: 99;
+}
+.searchData{
+  color: red;
+}
+.userList>span{
+  padding: 6px;
+}
+.clickshowsearchUserMessage{
+  margin-bottom: 20px;
+}
 </style>

src/components/pages/PaymentManagement/AllowancePayment.vue

@@ -178,7 +178,7 @@ export default {
       })
     },
     toAllowanceDetails (record, text, index) {
-      this.$router.push({ name: 'allowanceDetails', params: { allowanceDetails: record } })
+      this.$router.push({ name: 'allowanceDetails', params: { allowanceDetails: record.grantNumber } })
     },
     selectAgent (value) {
       this.searchSource.agentId = value