修改

.env

@@ -1,3 +1,3 @@
 VUE_APP_PROJECT=${APP_PROJECT}
-VUE_APP_PROJECT_NAME=多巴胺科技
-VUE_APP_LOGO=duobaan
+VUE_APP_PROJECT_NAME=${APP_PROJECT_NAME}
+VUE_APP_LOGO=${APP_LOGO}

package.json

@@ -10,7 +10,7 @@
   "//": "name 为项目注释",
   "scripts": {
     "start": "cross-env name=通用项目 APP_PROJECT=common APP_PROJECT_NAME=售检票系统 APP_LOGO=  npm run electron:serve",
-    "build": "cross-env APP_PROJECT=common APP_PROJECT_NAME=售检票系统 APP_LOGO=  npm run electron:build",
+    "build": "cross-env APP_PROJECT=common APP_PROJECT_NAME=售检票系统 APP_LOGO=icons  npm run electron:build",
     "dart-sass": "rm -rf node_modules/node-sass/* && cp -R docs/dart-sass/node-sass/* node_modules/node-sass/",
     "work": "npm run dart-sass && npm run start",
     "build:demo": "cross-env APP_PROJECT=demo APP_PROJECT_NAME=票管家 APP_LOGO=demo  npm run electron:build",

src/pages/checkerManage/subProjectManage.vue

@@ -48,14 +48,35 @@
           prop="adminIds"
           label="管理员">
           <template slot-scope="scope">
-            {{ getAdminName(scope.row.admins) }}
+            {{ getNameList(scope.row.admins, 'loginName') }}
           </template>
         </el-table-column>
         <el-table-column
           prop="ticketTypeIds"
           label="票种">
           <template slot-scope="scope">
-            {{ getTicketTypeNames(scope.row.ticketTypes) }}
+            {{ getNameList(scope.row.ticketTypes) }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="scenicIds"
+          label="景区">
+          <template slot-scope="scope">
+            {{ getNameList(scope.row.scenicList) }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="payChannelIds"
+          label="支付渠道">
+          <template slot-scope="scope">
+            {{ getNameList(scope.row.payChannelList) }}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="checkerIds"
+          label="检票设备">
+          <template slot-scope="scope">
+            {{ getNameList(scope.row.checkerList) }}
           </template>
         </el-table-column>
         <el-table-column
@@ -286,9 +307,9 @@ export default {
         name: item.name,
         adminIds: item.admins ? item.admins.map(adm => adm.id) || [] : [],
         ticketTypeIds: item.ticketTypes ? item.ticketTypes.map(tt => tt.id) || [] : [],
-        scenicIds: item.scenics ? item.scenics.map(sc => sc.id) || [] : [],
-        payChannelIds: item.payChannels ? item.payChannels.map(pc => pc.id) || [] : [],
-        checkerIds: item.checkers ? item.checkers.map(ch => ch.id) || [] : []
+        scenicIds: item.scenicList ? item.scenicList.map(sc => sc.id) || [] : [],
+        payChannelIds: item.payChannelList ? item.payChannelList.map(pc => pc.id) || [] : [],
+        checkerIds: item.checkerList ? item.checkerList.map(ch => ch.id) || [] : []
       }
       this.dialogVisible = true
     },
@@ -312,13 +333,9 @@ export default {
         this.getList()
       })
     },
-    getAdminName (admins) {
-      if (!admins) return ''
-      return admins.map(admin => admin.loginName).join(',')
-    },
-    getTicketTypeNames (ticketTypes) {
-      if (!ticketTypes) return ''
-      return ticketTypes.map(tt => tt.name).join(',')
+    getNameList (list, key = 'name') {
+      if (!list) return ''
+      return list.map(item => item[key]).join(',')
     }
   }
 }

src/pages/queryReport/salesQuery.vue

@@ -396,27 +396,32 @@
             </el-link>
             <el-link
               type="primary"
+              v-if="hasPermission('order-update')"
               @click="editOrder(scope.row)">
               修改
             </el-link>
             <el-link
               type="primary"
+              v-if="hasPermission('manual-print')"
               @click="printOrder(scope.row)">
               网络取票
             </el-link>
             <br>
             <el-link
               type="primary"
+              v-if="hasPermission('manual-check')"
               @click="checkOrder(scope.row)">
               核销
             </el-link>
             <el-link
               type="primary"
+              v-if="hasPermission('manual-cancel')"
               @click="refundOrder(scope.row)">
               退单
             </el-link>
             <el-link
               type="primary"
+              v-if="hasPermission('manual-second-print')"
               @click="secondPrint(scope.row)">
               补打
             </el-link>
@@ -684,7 +689,10 @@
       <div
         class="search-area"
         style="margin: 20px;display: flex;align-items: center;justify-content: space-between;">
-        <el-checkbox label="强制核销" v-model="checkOrderInfo.force"></el-checkbox>
+        <el-checkbox
+          v-if="hasPermission('manual-force-check')"
+          label="强制核销"
+          v-model="checkOrderInfo.force"></el-checkbox>
         <div class="name">
           <span style="margin-right: 10px;">票号搜索</span>
           <el-input v-model="ticketNoSearch"></el-input>
@@ -822,7 +830,10 @@
       <div
         class="search-area"
         style="margin: 20px;display: flex;align-items: center;justify-content: space-between;">
-        <el-checkbox label="强制取消" v-model="refundOrderInfo.force"></el-checkbox>
+        <el-checkbox
+          v-if="hasPermission('manual-force-cancel')"
+          label="强制退单"
+          v-model="refundOrderInfo.force"></el-checkbox>
         <div class="name">
           <span style="margin-right: 10px;">票号搜索</span>
           <el-input v-model="ticketNoSearch"></el-input>
@@ -1453,6 +1464,9 @@ export default {
     },
     scenicList () {
       return this.$store.state.app.scenicList
+    },
+    permissionList () {
+      return this.$store.state.user.menuList || []
     }
   },
   components: {
@@ -1579,8 +1593,12 @@ export default {
     this.getSaleChannelList()
     this.getOrderList()
   },
+  mounted () {},
   methods: {
     getPayStatus,
+    hasPermission (key) {
+      return !!this.permissionList.some(item => item.code === key)
+    },
     reset () {
       this.$refs.form.resetFields()
       this.getOrderList(true)

src/pages/sellManage/retail/RecentOrder.vue

@@ -6,13 +6,10 @@
       <span class="top-title">最近售票</span>
       <div class="opt-btns">
         <el-button
-          type="link"
           @click="getRecentOrders(true)">
           刷新
         </el-button>
         <el-button
-          type="link"
-          class="item"
           @click="getMoreOrders">
           查看更多
         </el-button>
@@ -125,10 +122,10 @@ export default {
       }).finally(() => {
         this.loading = false
       })
+    },
+    getMoreOrders () {
+      this.$router.push({ name: 'salesQuery' })
     }
-  },
-  getMoreOrders () {
-    this.$router.push('/queryReport/salesQuery')
   }
 }
 </script>