From 889ed5d3635e2fe14d00e901b01352f115fa2a26 Mon Sep 17 00:00:00 2001
From: luanss <shanshan.luan@le-it.com.cn>
Date: Thu, 1 Apr 2021 15:21:28 +0800
Subject: [PATCH] =?UTF-8?q?update:=E5=85=B6=E4=BB=96=E7=BC=B4=E8=B4=B9?=
 =?UTF-8?q?=E7=9A=84=E7=BC=B4=E8=B4=B9=E6=96=B9=E5=BC=8F=E6=8A=8A=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E5=AE=9D=E5=8F=8A=E5=BE=AE=E4=BF=A1=E5=8F=98=E4=B8=BA?=
 =?UTF-8?q?=E6=89=AB=E7=A0=81=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                        |   4 +-
 .env.staging                           |   4 +-
 src/layout/components/Sidebar/Logo.vue |   4 +-
 src/views/approval/pend.vue            | 410 +++++++++++++++++++------
 src/views/login/index.vue              |   4 +-
 src/views/property/otherPay.vue        | 186 ++++++-----
 src/views/questionnaire/question.vue   |   8 +-
 7 files changed, 430 insertions(+), 190 deletions(-)

diff --git a/.env.production b/.env.production
index 6216fb6..3f313f2 100644
--- a/.env.production
+++ b/.env.production
@@ -2,7 +2,7 @@
 VUE_APP_ENV = '物业'
 NODE_ENV = 'production'
 # base api
-#和瑞
-#VUE_APP_BASE_API = 'http://8.131.69.197:22000'
+#枚苑
+# VUE_APP_BASE_API = 'http://8.131.69.197:22000'
 #和瑞
 VUE_APP_BASE_API = 'http://8.131.69.197:8094'
diff --git a/.env.staging b/.env.staging
index d5aa080..af242d3 100644
--- a/.env.staging
+++ b/.env.staging
@@ -4,8 +4,8 @@ VUE_APP_ENV = '物业(测试)'
 NODE_ENV = 'production'
 
 # base api
-# 和瑞
-#VUE_APP_BASE_API = 'http://101.201.121.115:8092'
+玫苑
+# VUE_APP_BASE_API = 'http://101.201.121.115:8092'
 # 和瑞 
 VUE_APP_BASE_API = 'http://101.201.121.115:8094'
 
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index 85b0a9a..6c43dc3 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -37,8 +37,8 @@ export default {
   },
   data() {
     return {
-      // title: `和瑞物业`,
-      title: `玫苑物业`,
+      title: `和瑞物业`,
+      // title: `玫苑物业`,
       logo: '@/assets/logo/logo.png'
     }
   }
diff --git a/src/views/approval/pend.vue b/src/views/approval/pend.vue
index e4d7aee..13fec17 100644
--- a/src/views/approval/pend.vue
+++ b/src/views/approval/pend.vue
@@ -1,79 +1,193 @@
 <template>
   <div class="app-container">
-    <el-form ref="queryForm" :model="queryParams" :inline="true">
+    <el-form ref="queryForm"
+             :model="queryParams"
+             :inline="true">
       <el-form-item label="申请日期">
-        <el-date-picker
-          v-model="queryParams.requesttime"
-          type="date"
-          placeholder="选择日期"
-          value-format="yyyy-MM-dd"
-          clearable
-          size="small"
-          style="width:135px"
-        />
+        <el-date-picker v-model="queryParams.requesttime"
+                        type="date"
+                        placeholder="选择日期"
+                        value-format="yyyy-MM-dd"
+                        clearable
+                        size="small"
+                        style="width:135px" />
+      </el-form-item>
+      <el-form-item label="申请类型"
+                    v-if="roles.includes('admin') || roles.includes('pm') || roles.includes('topm')">
+        <el-select v-model="queryParams.reqtype"
+                   placeholder="请选择"
+                   @change="changeType">
+          <el-option v-for="item in typeList"
+                     :key="item.value"
+                     :label="item.name"
+                     :value="item.value" />
+        </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button type="primary"
+                   icon="el-icon-search"
+                   size="mini"
+                   @click="handleQuery">搜索</el-button>
       </el-form-item>
     </el-form>
-    <el-table v-loading="loading" :data="dataList" border>
+    <el-table v-loading="loading"
+              :data="dataList"
+              border>
       <el-table-column type="expand">
         <template v-slot="{row}">
-          <el-table v-if="(row.detail || []).length > 0" :data="row.detail" border>
-            <el-table-column label="票据" align="center" width="120">
-              <template v-slot="{row}">
-                <div style="height:40px; over-flow:hidden">
-                  <viewer :images="row.picpath.split(',')">
-                    <!-- :images一定要一个数组，否则报错 -->
-                    <img
-                      v-for="(src,index) in row.picpath.split(',')"
-                      :key="index"
-                      :src="baseUrl + '/' + src"
-                      width="40px"
-                      height="35px"
-                      style="over-flow:hidden; margin-left:5px"
-                    >
-                  </viewer>
-                </div>
-              </template>
-            </el-table-column>
-            <el-table-column :label="getColumnName('requester')" prop="requester" align="center" show-overflow-tooltip width="120" />
-            <el-table-column :label="getColumnName('agentman')" prop="agentman" align="center" show-overflow-tooltip width="120" />
-            <el-table-column :label="getColumnName('approvaltype')" prop="approvaltype" width="120" align="center" show-overflow-tooltip />
-            <el-table-column :label="getColumnName('subject')" prop="subject" width="120" align="center" show-overflow-tooltip />
-            <el-table-column :label="getColumnName('money')" prop="money" width="100" align="center" show-overflow-tooltip />
-            <el-table-column :label="getColumnName('requesttime')" align="center" width="160">
-              <template slot-scope="scope">
-                <span>{{ parseTime(scope.row['requesttime']) }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column :label="getColumnName('lastmodif')" align="center" width="154">
-              <template slot-scope="scope">
-                <span>{{ parseTime(scope.row['lastmodif']) }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column :label="getColumnName('lastuser')" prop="lastuser" width="130" align="center" />
+          <el-table v-if="(row.detail || []).length > 0"
+                    :data="row.detail"
+                    border>
+            <template v-if="queryParams.reqtype == 0">
+
+              <el-table-column label="票据"
+                               align="center"
+                               width="120">
+                <template v-slot="{row}">
+                  <div style="height:40px; over-flow:hidden">
+                    <viewer :images="row.picpath.split(',')">
+                      <!-- :images一定要一个数组，否则报错 -->
+                      <img v-for="(src,index) in row.picpath.split(',')"
+                           :key="index"
+                           :src="baseUrl + '/' + src"
+                           width="40px"
+                           height="35px"
+                           style="over-flow:hidden; margin-left:5px">
+                    </viewer>
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column :label="getColumnName('requester')"
+                               prop="requester"
+                               align="center"
+                               show-overflow-tooltip
+                               width="120" />
+              <el-table-column :label="getColumnName('agentman')"
+                               prop="agentman"
+                               align="center"
+                               show-overflow-tooltip
+                               width="120" />
+              <el-table-column :label="getColumnName('approvaltype')"
+                               prop="approvaltype"
+                               width="120"
+                               align="center"
+                               show-overflow-tooltip />
+              <el-table-column :label="getColumnName('subject')"
+                               prop="subject"
+                               width="120"
+                               align="center"
+                               show-overflow-tooltip />
+              <el-table-column :label="getColumnName('money')"
+                               prop="money"
+                               width="100"
+                               align="center"
+                               show-overflow-tooltip />
+              <el-table-column :label="getColumnName('requesttime')"
+                               align="center"
+                               width="160">
+                <template slot-scope="scope">
+                  <span>{{ parseTime(scope.row['requesttime']) }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column :label="getColumnName('lastmodif')"
+                               align="center"
+                               width="154">
+                <template slot-scope="scope">
+                  <span>{{ parseTime(scope.row['lastmodif']) }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column :label="getColumnName('lastuser')"
+                               prop="lastuser"
+                               width="130"
+                               align="center" />
+            </template>
+            <template v-if="queryParams.reqtype == 1">
+
+              <el-table-column :label="getColumnName('requester')"
+                               prop="requester"
+                               align="center"
+                               show-overflow-tooltip
+                               width="120" />
+              <el-table-column :label="getColumnName('approvaltype')"
+                               prop="approvaltype"
+                               width="120"
+                               align="center"
+                               show-overflow-tooltip />
+              <el-table-column :label="getColumnName('requestinfo')"
+                               prop="requestinfo"
+                               width="120"
+                               align="center"
+                               show-overflow-tooltip />
+              <el-table-column :label="getColumnName('qty')"
+                               prop="qty"
+                               width="120"
+                               align="center"
+                               show-overflow-tooltip />
+              <el-table-column :label="getColumnName('purpose')"
+                               prop="purpose"
+                               width="100"
+                               align="center"
+                               show-overflow-tooltip />
+              <el-table-column :label="getColumnName('requesttime')"
+                               align="center"
+                               width="160">
+                <template slot-scope="scope">
+                  <span>{{ parseTime(scope.row['requesttime']) }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column :label="getColumnName('lastmodif')"
+                               align="center"
+                               width="154">
+                <template slot-scope="scope">
+                  <span>{{ parseTime(scope.row['lastmodif']) }}</span>
+                </template>
+              </el-table-column>
+            </template>
           </el-table>
         </template>
       </el-table-column>
-      <el-table-column label="票据" align="center" width="120">
+      <el-table-column v-if="roles.includes('finance') ||  roles.includes('CFO') || roles.includes('accounting') || roles.includes('FM') || roles.includes('admin') && queryParams.reqtype == 0 || roles.includes('pm') && queryParams.reqtype == 0 || roles.includes('topm') && queryParams.reqtype == 0 "
+                       label="票据"
+                       align="center"
+                       width="120">
+        <template v-slot="{row}">
+          <div style="height:40px; over-flow:hidden">
+            <viewer :images="row.picpath.split(',')">
+              <!-- :images一定要一个数组，否则报错 -->
+              <img v-for="(src,index) in row.picpath.split(',')"
+                   :key="index"
+                   :src="baseUrl + '/' + src"
+                   width="40px"
+                   height="35px"
+                   style="over-flow:hidden; margin-left:5px">
+            </viewer>
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column v-if="roles.includes('buyer') || roles.includes('admin') && queryParams.reqtype == 1 || roles.includes('pm') && queryParams.reqtype == 1 || roles.includes('topm') && queryParams.reqtype == 1 "
+                       label="清单"
+                       align="center"
+                       width="120">
         <template v-slot="{row}">
           <div style="height:40px; over-flow:hidden">
             <viewer :images="row.picpath.split(',')">
               <!-- :images一定要一个数组，否则报错 -->
-              <img
-                v-for="(src,index) in row.picpath.split(',')"
-                :key="index"
-                :src="baseUrl + '/' + src"
-                width="40px"
-                height="35px"
-                style="over-flow:hidden; margin-left:5px"
-              >
+              <img v-for="(src,index) in row.picpath.split(',')"
+                   :key="index"
+                   :src="baseUrl + '/' + src"
+                   width="40px"
+                   height="35px"
+                   style="over-flow:hidden; margin-left:5px">
             </viewer>
           </div>
         </template>
       </el-table-column>
-      <el-table-column v-for="(item, index) in headers" :key="index" align="center" :label="getColumnName(item)" width="160px" :show-overflow-tooltip="true">
+      <el-table-column v-for="(item, index) in headers"
+                       :key="index"
+                       align="center"
+                       :label="getColumnName(item)"
+                       width="160px"
+                       :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span v-if="item === 'cid'">{{ getValue(scope.row[item]) }}</span>
           <span v-else-if="item === 'approvestatus'">{{ filterContent(scope.row['approvestatus'], 'approvestatus') }}</span>
@@ -81,33 +195,36 @@
           <span v-else>{{ scope.row[item] }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="getColumnName('Operation')" align="center" fixed="right" width="120">
+      <el-table-column :label="getColumnName('Operation')"
+                       align="center"
+                       fixed="right"
+                       width="120">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            @click="handleApproval(scope.row, 1)"
-          >通过</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            style="color: red"
-            @click="handleApproval(scope.row, 2)"
-          >拒绝</el-button>
+          <el-button size="mini"
+                     type="text"
+                     @click="handleApproval(scope.row, 1)">通过</el-button>
+          <el-button size="mini"
+                     type="text"
+                     style="color: red"
+                     @click="handleApproval(scope.row, 2)">拒绝</el-button>
         </template>
       </el-table-column>
     </el-table>
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageIndex"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-    <el-dialog title="拒绝原因" :visible.sync="open" width="600px">
-      <el-input v-model="reason" type="textarea" placeholder="请输入..." />
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submit">确 定</el-button>
+    <pagination v-show="total>0"
+                :total="total"
+                :page.sync="queryParams.pageIndex"
+                :limit.sync="queryParams.pageSize"
+                @pagination="getList" />
+    <el-dialog title="拒绝原因"
+               :visible.sync="open"
+               width="600px">
+      <el-input v-model="reason"
+                type="textarea"
+                placeholder="请输入..." />
+      <div slot="footer"
+           class="dialog-footer">
+        <el-button type="primary"
+                   @click="submit">确 定</el-button>
         <el-button @click="open = false">取 消</el-button>
       </div>
     </el-dialog>
@@ -132,6 +249,7 @@ export default {
       reason: '',
       // 查询参数
       queryParams: {
+        reqtype: 0,
         pageIndex: 1,
         pageSize: 10,
         requesttime: undefined
@@ -147,25 +265,112 @@ export default {
         { id: 2, descr: '拒绝' }
       ],
       row: {},
-      baseUrl: process.env.VUE_APP_BASE_API
+      baseUrl: process.env.VUE_APP_BASE_API,
+      roles: [],
+      typeList: [
+        {
+          name: '报销',
+          value: 0
+        },
+        {
+          name: '采购',
+          value: 1
+        }
+      ],
+      type: 0
     }
   },
   created() {
+    this.roles = this.$store.state.user.roles
+    if (
+      this.roles.includes('pm') ||
+      this.roles.includes('topm') ||
+      this.roles.includes('admin') ||
+      this.roles.includes('finance') ||
+      this.roles.includes('CFO') ||
+      this.roles.includes('FM') ||
+      this.roles.includes('accounting')
+    ) {
+      this.queryParams.reqtype = 0
+    } else {
+      this.queryParams.reqtype = 1
+    }
     this.getList()
   },
   methods: {
+    changeType(e) {
+      this.queryParams.reqtype = e
+      this.getList()
+    },
     /** 查询角色列表 */
     getList() {
       this.loading = true
-      getApprovalList(this.queryParams).then(
-        response => {
-          this.dataList = response.data.data
-          this.total = response.data.count
-          this.headers = ['cid', 'requester', 'agentman', 'requesttime', 'money', 'approvestatus', 'approvaltype', 'subject', 'status']
-          // this.headers = Object.keys(this.dataList[0] || []).filter(item => item !== 'approvalrequestid' && item !== 'approvalmodelid' && item !== 'callbackfunc')
-          this.loading = false
+      if (
+        this.roles.includes('finance') ||
+        this.roles.includes('FM') ||
+        this.roles.includes('accounting') ||
+        this.roles.includes('CFO')
+      ) {
+        this.headers = [
+          'cid',
+          'requester',
+          'agentman',
+          'requesttime',
+          'approvaltype',
+          'money',
+          'approvestatus',
+          'subject',
+          'status'
+        ]
+      } else if (
+        this.roles.includes('topm') ||
+        this.roles.includes('pm') ||
+        this.roles.includes('admin')
+      ) {
+        if (this.queryParams.reqtype == 0) {
+          this.headers = [
+            'cid',
+            'requester',
+            'agentman',
+            'requesttime',
+            'approvaltype',
+            'money',
+            'approvestatus',
+            'subject',
+            'status'
+          ]
+        } else {
+          this.headers = [
+            'cid',
+            'requester',
+            'requesttime',
+            'approvaltype',
+            'qty',
+            'requestinfo',
+            'purpose',
+            'approvestatus',
+            'status'
+          ]
         }
-      )
+      } else if (this.roles.includes('buyer')) {
+        this.headers = [
+          'cid',
+          'requester',
+          'requesttime',
+          'approvaltype',
+          'qty',
+          'requestinfo',
+          'purpose',
+          'approvestatus',
+          'status'
+        ]
+      }
+      getApprovalList(this.queryParams).then((response) => {
+        this.dataList = response.data.data
+        this.total = response.data.count
+        // this.headers = Object.keys(this.dataList[0] || []).filter(item => item !== 'approvalrequestid' && item !== 'approvalmodelid' && item !== 'callbackfunc')
+        this.loading = false
+      })
     },
     handleApproval(row, arg) {
       this.row = row
@@ -174,17 +379,20 @@ export default {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'
-        }).then(function() {
-          return commitApproval({
-            approvalrequestid: row['approvalrequestid'],
-            approvalstatus: arg,
-            approvalmodelid: row['approvalmodelid'],
-            approvallevel: row['approvallevel']
+        })
+          .then(function () {
+            return commitApproval({
+              approvalrequestid: row['approvalrequestid'],
+              approvalstatus: arg,
+              approvalmodelid: row['approvalmodelid'],
+              approvallevel: row['approvallevel']
+            })
+          })
+          .then(() => {
+            this.getList()
+            this.msgSuccess('审批成功')
           })
-        }).then(() => {
-          this.getList()
-          this.msgSuccess('审批成功')
-        }).catch(function() {})
+          .catch(function () {})
       } else {
         this.open = true
       }
@@ -211,7 +419,7 @@ export default {
       let temp
       switch (arg) {
         case 'approvalmodelid':
-          this.options.forEach(item => {
+          this.options.forEach((item) => {
             if (item.approvalmodelid === data) {
               temp = item.descr
               return temp
@@ -219,7 +427,7 @@ export default {
           })
           break
         case 'status':
-          this.statusOptions.forEach(item => {
+          this.statusOptions.forEach((item) => {
             if (item.id === data) {
               temp = item.descr
               return temp
@@ -227,7 +435,7 @@ export default {
           })
           break
         case 'approvestatus':
-          this.resultStatus.forEach(item => {
+          this.resultStatus.forEach((item) => {
             if (item.id === data) {
               temp = item.descr
               return temp
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 951b091..b02033b 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -9,8 +9,8 @@
              label-position="left">
       <div class="title-container"
            style="padding-right: 20%">
-        <!-- <h2 class="title">沈阳和瑞物业管理平台</h2> -->
-        <h2 class="title">沈阳玫苑物业管理平台</h2>
+        <h2 class="title">沈阳和瑞物业管理平台</h2>
+        <!-- <h2 class="title">沈阳玫苑物业管理平台</h2> -->
       </div>
       <el-form-item prop="cid"
                     style="width: 80%">
diff --git a/src/views/property/otherPay.vue b/src/views/property/otherPay.vue
index 784a24c..f94d46d 100644
--- a/src/views/property/otherPay.vue
+++ b/src/views/property/otherPay.vue
@@ -1,89 +1,119 @@
 <template>
   <div class="app-container">
-    <el-form ref="queryForm" :model="queryParams" :inline="true">
+    <el-form ref="queryForm"
+             :model="queryParams"
+             :inline="true">
       <el-form-item label="收费项目:">
-        <el-select v-model="queryParams.category" size="small" clearable placeholder="请选择">
-          <el-option
-            v-for="item in typeArray"
-            :key="item['stdeftab-lang']"
-            :label="item['stdeftab-lang']"
-            :value="item['stdeftab-lang']"
-          />
+        <el-select v-model="queryParams.category"
+                   size="small"
+                   clearable
+                   placeholder="请选择">
+          <el-option v-for="item in typeArray"
+                     :key="item['stdeftab-lang']"
+                     :label="item['stdeftab-lang']"
+                     :value="item['stdeftab-lang']" />
         </el-select>
       </el-form-item>
       <el-form-item label="查询条件:">
-        <el-input v-model="queryParams.remark" size="small" clearable placeholder="请输入电梯卡号/车牌号" />
+        <el-input v-model="queryParams.remark"
+                  size="small"
+                  clearable
+                  placeholder="请输入电梯卡号/车牌号" />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button type="primary"
+                   icon="el-icon-search"
+                   size="mini"
+                   @click="handleQuery">搜索</el-button>
       </el-form-item>
     </el-form>
     <div style="width:54%; float:left; margin-top:5%">
       <div style="text-align:center;">
         <span class="word-title">收费项目:</span>
-        <el-select v-model="data.category" size="small" placeholder="请选择" style="width:26%;">
-          <el-option
-            v-for="item in typeArray"
-            :key="item['stdeftab-lang']"
-            :label="item['stdeftab-lang']"
-            :value="item['stdeftab-lang']"
-          />
+        <el-select v-model="data.category"
+                   size="small"
+                   placeholder="请选择"
+                   style="width:26%;">
+          <el-option v-for="item in typeArray"
+                     :key="item['stdeftab-lang']"
+                     :label="item['stdeftab-lang']"
+                     :value="item['stdeftab-lang']" />
         </el-select>
         <span class="word-title">缴费方式:</span>
-        <el-select v-model="data.chargeway" size="small" placeholder="请选择" style="width:26%;">
-          <el-option
-            v-for="item in wayArray"
-            :key="item"
-            :label="item"
-            :value="item"
-          />
+        <el-select v-model="data.chargeway"
+                   size="small"
+                   placeholder="请选择"
+                   style="width:26%;">
+          <el-option v-for="item in wayArray"
+                     :key="item"
+                     :label="item"
+                     :value="item" />
         </el-select>
         <br>
         <br>
         <span class="word-title">开始日期:</span>
-        <el-date-picker
-          v-model="data.chargestartdate"
-          type="date"
-          placeholder="选择日期"
-          value-format="yyyy-MM-dd"
-          style="width:26%"
-          size="small"
-        />
+        <el-date-picker v-model="data.chargestartdate"
+                        type="date"
+                        placeholder="选择日期"
+                        value-format="yyyy-MM-dd"
+                        style="width:26%"
+                        size="small" />
         <span class="word-title">终止日期:</span>
-        <el-date-picker
-          v-model="data.chargeenddate"
-          type="date"
-          placeholder="选择日期"
-          value-format="yyyy-MM-dd"
-          style="width:26%"
-          size="small"
-        />
+        <el-date-picker v-model="data.chargeenddate"
+                        type="date"
+                        placeholder="选择日期"
+                        value-format="yyyy-MM-dd"
+                        style="width:26%"
+                        size="small" />
         <br>
         <br>
         <span class="word-title">缴费金额:</span>
-        <el-input v-model="data.charge_money" size="small" placeholder="请输入" style="width:26%;" />
+        <el-input v-model="data.charge_money"
+                  size="small"
+                  placeholder="请输入"
+                  style="width:26%;" />
         <span class="word-title">收款人员:</span>
-        <el-input v-model="data.chargeby" size="small" placeholder="请输入" style="width:26%;" />
+        <el-input v-model="data.chargeby"
+                  size="small"
+                  placeholder="请输入"
+                  style="width:26%;" />
         <br>
         <br>
         <span class="word-title">缴费备注:</span>
-        <el-input v-model="data.remark" size="small" placeholder="请输入电梯卡号/车牌号" style="width:26%;" />
+        <el-input v-model="data.remark"
+                  size="small"
+                  placeholder="请输入电梯卡号/车牌号"
+                  style="width:26%;" />
         <span class="word-title">联 系 人:</span>
-        <el-input v-model="data.contact" size="small" placeholder="请输入" style="width:26%;" />
+        <el-input v-model="data.contact"
+                  size="small"
+                  placeholder="请输入"
+                  style="width:26%;" />
         <br>
         <br>
         <span class="word-title">联系方式:</span>
-        <el-input v-model="data.phone" size="small" placeholder="请输入" style="width:60%;" />
+        <el-input v-model="data.phone"
+                  size="small"
+                  placeholder="请输入"
+                  style="width:60%;" />
         <br>
         <br>
-        <el-button type="primary" :disabled="!data.charge_money > 0" :loading="loading" @click="payEvent">缴费</el-button>
-        <el-button v-print="'#print'" style="margin-left:80px" type="primary"> 打印 </el-button>
+        <el-button type="primary"
+                   :disabled="!data.charge_money > 0"
+                   :loading="loading"
+                   @click="payEvent">缴费</el-button>
+        <el-button v-print="'#print'"
+                   style="margin-left:80px"
+                   type="primary"> 打印 </el-button>
       </div>
     </div>
-    <div id="print" style="display:inline-block; width:42%; margin-left:4%">
+    <div id="print"
+         style="display:inline-block; width:42%; margin-left:4%">
       <div style="width:480px;text-align:center; margin: 0 0 10px 0 ">收款凭证</div>
       <div style=" margin: 0 0 8px 0;font-size:16px ">编号: {{ serialnumber }}</div>
-      <mailTable :table-data="tableData" :table-style="{ width:'480px' }" style="margin-top: -10px"> />
+      <mailTable :table-data="tableData"
+                 :table-style="{ width:'480px' }"
+                 style="margin-top: -10px"> />
       </mailtable>
     </div>
   </div>
@@ -106,8 +136,9 @@ export default {
       },
       wayArray: [
         '现金',
-        '微信',
-        '支付宝',
+        // '微信',
+        // '支付宝',
+        '扫码',
         '银行卡',
         '其它'
       ],
@@ -129,13 +160,13 @@ export default {
     }
   },
   created() {
-    this.getStanderOne({ statid: 'FEE_TYPE' }).then(res => {
+    this.getStanderOne({ statid: 'FEE_TYPE' }).then((res) => {
       this.typeArray = res.data
     })
   },
   methods: {
     handleQuery() {
-      getCharge(this.queryParams).then(res => {
+      getCharge(this.queryParams).then((res) => {
         this.getTableData(res.data)
         this.data = res.data
       })
@@ -146,25 +177,27 @@ export default {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      }).then(() => {
-        this.loading = true
-        addCharge(this.data).then(res => {
-          this.handleQuery()
-          if (res.code === 200) {
-            this.$message({
-              message: '缴费成功',
-              type: 'success'
-            })
-          }
-          this.loading = false
+      })
+        .then(() => {
+          this.loading = true
+          addCharge(this.data).then((res) => {
+            this.handleQuery()
+            if (res.code === 200) {
+              this.$message({
+                message: '缴费成功',
+                type: 'success'
+              })
+            }
+            this.loading = false
+          })
         })
-      }).then(() => {
-      }).catch(function() {})
+        .then(() => {})
+        .catch(function () {})
     },
     getTableData(arg) {
       this.data = arg
       this.serialnumber = arg.serialnumber
-      this.tableData.forEach(item => {
+      this.tableData.forEach((item) => {
         switch (item.key) {
           case '楼盘名称':
             item.value = this.getValue(arg.cid)
@@ -199,28 +232,27 @@ export default {
       })
     }
   }
-
 }
 </script>
 
 <style lang="scss" scoped>
 .word {
-  color:black;
-  font-weight:550;
+  color: black;
+  font-weight: 550;
   width: 300px;
 }
 .word-title {
-  color:black;
-  font-weight:550;
+  color: black;
+  font-weight: 550;
   font-size: 14px;
 }
 .property {
-  margin-top:-20px;
+  margin-top: -20px;
 }
 .ul {
-    list-style: none;
-    margin: 0;
-    text-align: center;
-    margin-top: 40px;
+  list-style: none;
+  margin: 0;
+  text-align: center;
+  margin-top: 40px;
 }
 </style>
diff --git a/src/views/questionnaire/question.vue b/src/views/questionnaire/question.vue
index c33e3f6..9ed7fb4 100644
--- a/src/views/questionnaire/question.vue
+++ b/src/views/questionnaire/question.vue
@@ -4,10 +4,10 @@
          width="100%">
     <div class="title-bg">
       <div style="margin: 0 10px; color:#fff">尊敬的业主/住户：您好！</div>
-      <p style="font-size:16px; margin: 0 0 0 10px; color:#fff; text-indent:2em">感谢您一直以来对玫苑物业服务工作的理解与支持！为了能深入了解您的意见与需求，给您提供更加优质的服务，我公司现委托“赛思维物业服务评估咨询有限公司”进行2020年第四季度客户满意度调查工作。请您根据自身的实际情况，客观、详实地回答问卷中的问题，谢谢您的合作。</p>
-      <!-- <p style="font-size:16px; margin: 0 0 0 10px; color:#fff; text-indent:2em">感谢您一直以来对和瑞物业服务工作的理解与支持！为了能深入了解您的意见与需求，给您提供更加优质的服务，我公司现委托“赛思维物业服务评估咨询有限公司”进行2020年第四季度客户满意度调查工作。请您根据自身的实际情况，客观、详实地回答问卷中的问题，谢谢您的合作。</p> -->
-      <!-- <div style="text-align:right; color:#fff">沈阳和瑞物业有限公司</div> -->
-      <div style="text-align:right; color:#fff">沈阳玫苑物业有限公司</div>
+      <!-- <p style="font-size:16px; margin: 0 0 0 10px; color:#fff; text-indent:2em">感谢您一直以来对玫苑物业服务工作的理解与支持！为了能深入了解您的意见与需求，给您提供更加优质的服务，我公司现委托“赛思维物业服务评估咨询有限公司”进行2020年第四季度客户满意度调查工作。请您根据自身的实际情况，客观、详实地回答问卷中的问题，谢谢您的合作。</p> -->
+      <p style="font-size:16px; margin: 0 0 0 10px; color:#fff; text-indent:2em">感谢您一直以来对和瑞物业服务工作的理解与支持！为了能深入了解您的意见与需求，给您提供更加优质的服务，我公司现委托“赛思维物业服务评估咨询有限公司”进行2020年第四季度客户满意度调查工作。请您根据自身的实际情况，客观、详实地回答问卷中的问题，谢谢您的合作。</p>
+      <div style="text-align:right; color:#fff">沈阳和瑞物业有限公司</div>
+      <!-- <div style="text-align:right; color:#fff">沈阳玫苑物业有限公司</div> -->
       <br>
       <div class="question-area">
         <div style="padding: 2%">被访问者地址: