Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/chunafukuan/chunafukuanguanli/cashier.vue

@@ -94,6 +94,11 @@
                 <span>{{ scope.row.cost }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="付款时需备注内容" align="center" width="200">
+              <template slot-scope="scope">
+                <span>{{ scope.row.busRemarks }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="开户名称" align="center" width="150">
               <template slot-scope="scope">
                 <span>{{ scope.row.payBank }}</span>
@@ -104,7 +109,7 @@
                 <span>{{ scope.row.payBankAccount }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="付款备注" align="center" width="180">
+            <el-table-column label="本次付款说明" align="center" width="180">
               <template slot-scope="scope">
                 <span>{{ scope.row.payRemark }}</span>
               </template>
@@ -232,11 +237,11 @@
         </el-row>
         <el-row>
           <el-col :span="4">
-            <span>付款备注</span>
+            <span>本次付款说明</span>
           </el-col>
           <el-col :span="20">
             <el-form-item>
-              <el-input v-model="formobj.payRemark" placeholder="请填写备注" clearable/>
+              <el-input v-model="formobj.payRemark" placeholder="请填写本次付款说明" clearable/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -265,7 +270,7 @@ import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
 import upload from '@/components/uploadFile/upload'
-import { typeValues, selectAccountByUseOrgSid, getDetailsList, getOrgSidByPath, getBankList } from '@/api/jichuxinxi/dictcommons'
+import { typeValues, selectAccountByUseOrgSid, getDetailsList, getOrgSidByPath, getBankList, getButtonPermissions } from '@/api/jichuxinxi/dictcommons'
 import req from '@/api/anruifinmanagement/chunafukuan/cashier'
 import { getStorage } from '@/utils/auth'
 
@@ -394,7 +399,18 @@ export default {
     this.init()
   },
   mounted() {
-    this.$refs['btnbar'].setButtonList(this.btnList)
+    getButtonPermissions({ userSid: window.sessionStorage.getItem('userSid'), url: this.$route.path, type: 0 }).then((res) => {
+      if (res.success) {
+        for (var i = 0; i < res.data.length; i++) {
+          for (var k = 0; k < this.btnList.length; k++) {
+            if (res.data[i].buttonId === this.btnList[k].btnKey) {
+              this.btnList.splice(k, 1)
+            }
+          }
+        }
+        this.$refs['btnbar'].setButtonList(this.btnList)
+      }
+    })
   },
   methods: {
     // 搜索条件效果