Merge branch 'dev' of http://git.echepei.com/caojunjie/Smart_platform_ui into dev

src/views/desk/notice.vue

@@ -125,10 +125,6 @@ export default {
             valueFormat: "yyyy-MM-dd hh:mm:ss",
             searchRange: true,
             hide: true,
-            showColumn: false,
-            addDisplay: false,
-            editDisplay: false,
-            viewDisplay: false,
             rules: [{
               required: true,
               message: "请输入通知时间",

src/views/reimbursement/detail.vue

@@ -237,12 +237,12 @@ export default {
             filterable:true,
             props: {
               label: "accountName",
-              value: "accountName"
+              value: "id"
             },
             change:(data)=>{
               let list = this.findObject(this.option.column, "accountReimbursement").dicData
               for (let item of list){
-                if (data.value == item.accountName){
+                if (data.value == item.id){
                   this.form.accountReimbursement = data.value
                   this.form.reimbursementAccountNo = item.accountBank
                   this.form.bankOfDeposit = item.accountNo
@@ -302,7 +302,7 @@ export default {
             label: "支付方式",
             prop: "paymentMethodName",
             type: "select",
-            dicUrl: "/api/blade-system/dict-biz/dictionary?code=payment_term",
+            dicUrl: "/api/blade-system/dict-biz/dictionary?code=payment_method",
             props: {
               label: "dictValue",
               value: "dictKey"
@@ -408,6 +408,37 @@ export default {
       this.$set(this.form, 'postId', res.data.data.postId.split(',')[0]);
       this.$set(this.form, 'postName', res.data.data.postName.split(',')[0]);
       this.loginUser = res.data.data.realName;
+      if (this.form.status == 2){
+        if (this.roleName.indexOf('财务') !== -1){
+          this.optionTwo.column.map(e => {
+            this.$set(e, 'disabled', false)
+          })
+        }
+        this.tableOption.column.map(e => {
+          if (this.roleName.indexOf('财务') !== -1){
+            if (e.prop == 'subjectName'){
+              this.$set(e, 'disabled', false)
+            }else if(e.prop == 'accountingItemsName'){
+              this.$set(e, 'disabled', false)
+            }else {
+              this.$set(e, 'disabled', true)
+            }
+          }
+        })
+      }else {
+        this.optionTwo.column.map(e => {
+          this.$set(e, 'disabled', true)
+        })
+        this.tableOption.column.map(e => {
+          if (e.prop == 'subjectName'){
+            this.$set(e, 'disabled', true)
+          }else if(e.prop == 'accountingItemsName'){
+            this.$set(e, 'disabled', true)
+          }else {
+            this.$set(e, 'disabled', false)
+          }
+        })
+      }
     })
     getDeptTree().then(res => {
       this.dic = res.data.data
@@ -462,6 +493,7 @@ export default {
   methods: {
     returnBack(row) {
       getlistBankBy(row.id).then(res =>{
+        console.log(res.data)
         this.findObject(this.option.column, "accountReimbursement").dicData = res.data
       })
     },