lilei 2 vuotta sitten
vanhempi
commit
23aaef0f9d

+ 1 - 1
public/version.json

@@ -1,4 +1,4 @@
 {
-    "version": "2.2.2",
+    "version": "2.2.3",
     "message": "发现有新版本发布,确定更新系统?"
 }

+ 15 - 3
src/views/expenseManagement/expenseReimbursement/chooseDepartUserModal.vue

@@ -134,15 +134,27 @@ export default {
         }
       })
     },
+    getFormatUser(list){
+      const ret = []
+      list.map(item => {
+        ret.push({label: item.userName, value: item.userId})
+      })
+      return ret
+    },
     async getDefAudit(){
       if(!this.useDingDefUser){
         const data = await getDefaultCofig({code:'EXPENSE_ACCOUNT_DING_USER'}).then(res => res.data)
         const ret = JSON.parse(data.value)
-        this.form.approvers = ret.approvers
-        this.form.ccList = ret.ccList
+        this.form.approvers = this.getFormatUser(ret.approvers)
+        this.form.ccList = this.getFormatUser(ret.ccList)
       }else{
         const data = await queryLastFinishDingUser().then(res => res.data)
-        console.log(data)
+        if(data.approversTaskList){
+          this.form.approvers = this.getFormatUser(data.approversTaskList)
+        }
+        if(data.ccTaskList){
+          this.form.ccList = this.getFormatUser(data.ccTaskList)
+        }
       }
     },
     resetForm () {

+ 1 - 6
src/views/financialManagement/financialCollection/baseModal.vue

@@ -231,12 +231,7 @@ export default {
       }else{
         // 最近一次审核人
         const lastAuditInfo = await queryLastFinishDingUser().then(res => res.data)
-        if(lastAuditInfo){
-          this.form.dealerSn = lastAuditInfo ? lastAuditInfo.applyPersonSn : undefined
-          this.$nextTick(() => {
-            this.$refs.settleClientName.getDetail(this.form.dealerSn)
-          })
-        }
+        this.form.applyPersonSn = lastAuditInfo ? lastAuditInfo.applyPersonSn : undefined
       }
     }
   },