Browse Source

Merge branch 'develop_yh13' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh13

chenrui 2 years ago
parent
commit
2c7fadf992

+ 1 - 8
src/api/financeBook.js

@@ -11,14 +11,7 @@ export const financeBookQueryPage = (params) => {
     method: 'post'
   })
 }
-// 获取最近一次审核信息
-export const queryLastFinish = (params) => {
-  return axios({
-    url: `/financeBook/queryLastFinish`,
-    data: params,
-    method: 'post'
-  })
-}
+
 // 获取最新一次钉钉审核人员信息
 export const queryLastFinishDingUser = (params) => {
   return axios({

+ 7 - 4
src/libs/tools.js

@@ -483,8 +483,11 @@ export const checkIdNumberValid = (tex) => {
 }
 // 清除空格和特殊字符
 export const removeEmptyStr = function(str){
-  var strs=str.toString()
-  strs= strs.replace(/^\s+|\s+$/gm,'');
-  strs=strs.replace(/[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~!@#¥%……&*()——\-+={}|《》?:“”【】、;‘',。、]/im,'');
-  return strs;
+  if(str){
+    var strs=str.toString()
+    strs= strs.replace(/^\s+|\s+$/gm,'');
+    strs=strs.replace(/[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~!@#¥%……&*()——\-+={}|《》?:“”【】、;‘',。、]/im,'');
+    return strs;
+  }
+  return '';
 }

+ 18 - 4
src/views/expenseManagement/expenseReimbursement/chooseDepartUserModal.vue

@@ -134,13 +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 = getDefaultCofig({code:'EXPENSE_ACCOUNT_DING_USER'}).then(res => res.data)
-        console.log(data)
+        const data = await getDefaultCofig({code:'EXPENSE_ACCOUNT_DING_USER'}).then(res => res.data)
+        const ret = JSON.parse(data.value)
+        this.form.approvers = this.getFormatUser(ret.approvers)
+        this.form.ccList = this.getFormatUser(ret.ccList)
       }else{
-        const data = queryLastFinishDingUser().then(res => res.data)
-        console.log(data)
+        const data = await queryLastFinishDingUser().then(res => res.data)
+        if(data.approversTaskList){
+          this.form.approvers = this.getFormatUser(data.approversTaskList)
+        }
+        if(data.ccTaskList){
+          this.form.ccList = this.getFormatUser(data.ccTaskList)
+        }
       }
     },
     resetForm () {

+ 2 - 1
src/views/expenseManagement/expenseReimbursement/list.vue

@@ -259,12 +259,13 @@ export default {
         rows.map(item => {
           ret.push({
             id: item.id,
-            printStatus:"PASS"
+            printStatus:"PRINT"
           })
         })
         expenseAccountUpdateBatch(ret).then(res => {
           if(res.status == 200){
             this.$refs.table.refresh()
+            this.$refs.table.clearSelected()
           }
           this.spinning = false
         })

+ 2 - 0
src/views/financialManagement/collectionDetailStatic/plInvoiceModal.vue

@@ -137,6 +137,8 @@
       cancel () {
         this.opened = false
         this.$emit('cancel')
+        this.form.invoiceDate = undefined
+        this.form.remarks = ''
         this.$refs.ruleForm.resetFields()
       }
     },

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

@@ -68,7 +68,7 @@ import { commonMixin } from '@/utils/mixin'
 import { VSelect, Upload } from '@/components'
 import employee from '../../expenseManagement/expenseReimbursement/employee.js'
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
-import { financeBookSave, financeBookFindBySn, queryLastFinish } from '@/api/financeBook.js'
+import { financeBookSave, financeBookFindBySn, queryLastFinishDingUser } from '@/api/financeBook.js'
 export default {
   name: 'FcBaseModal',
   mixins: [commonMixin],
@@ -230,11 +230,8 @@ export default {
         this.getDetail()
       }else{
         // 最近一次审核人
-        const lastAuditInfo = await queryLastFinish().then(res => res.data)
-        this.form.dealerSn = lastAuditInfo ? lastAuditInfo.applyPersonSn : undefined
-        this.$nextTick(() => {
-          this.$refs.settleClientName.getDetail(this.form.dealerSn)
-        })
+        const lastAuditInfo = await queryLastFinishDingUser().then(res => res.data)
+        this.form.applyPersonSn = lastAuditInfo ? lastAuditInfo.applyPersonSn : undefined
       }
     }
   },

+ 5 - 3
src/views/financialManagement/financialCollection/fcDetailModal.vue

@@ -327,9 +327,11 @@ export default {
     },
     handleChange (v) {
       console.log(v)
-      const row = this.bankList.find(item => item.bankAccount == v)
-      this.bankNameList = row.bankName
-      this.form.bankName = undefined
+      if(v){
+        const row = this.bankList.find(item => item.bankAccount == v)
+        this.bankNameList = row.bankName
+        this.form.bankName = undefined  
+      }
     },
     getLastPayerAccount () {
       this.spinning = true