lilei 2 lat temu
rodzic
commit
61ad4acd1c

+ 7 - 2
src/views/allocationManagement/transferOut/basicInfoModal.vue

@@ -41,7 +41,7 @@
                 <a-spin v-if="fetching" slot="notFoundContent" size="small" />
                 <a-select-option v-for="item in dealerData" :key="item.dealerSn" :value="item.dealerSn">{{ item.dealerName }}</a-select-option>
               </a-select>
-              <a-input v-if="!isDealer" v-model.trim="form.targetName" placeholder="请输入调往对象名称(最多30个字符)" allowClear :maxLength="30" />
+              <department v-if="!isDealer" style="width: 100%;" placeholder="请选择部门" @change="departementChange" v-model="form.targetSn"></department>
             </a-form-model-item>
           </a-col>
           <a-col :md="12" :sm="24">
@@ -110,10 +110,11 @@ import { getLookUpData } from '@/api/data'
 import ProductBrand from '@/views/common/productBrand.js'
 import productTypeAll from '@/views/common/productTypeAll.js'
 import AllocateType from '@/views/common/allocateType.js'
+import department from '@/views/expenseManagement/expenseReimbursement/department.js'
 export default {
   name: 'TransferOutBasicInfoModal',
   mixins: [commonMixin],
-  components: { VSelect, Upload, ProductBrand, productTypeAll, AllocateType },
+  components: { VSelect, Upload, ProductBrand, productTypeAll, AllocateType, department },
   props: {
     openModal: {
       //  弹框显示状态
@@ -186,6 +187,10 @@ export default {
         item.fileType = item.extName
       })
     },
+    departementChange (v, row) {
+       console.log(v,row)
+       this.form.targetName = row.name
+    },
     // 调拨类别 change
     allocateTypeChange (val, opt) {
       console.log(val, opt, '------------')

+ 4 - 1
src/views/common/dingDepartUser.js

@@ -37,7 +37,7 @@ const DingDepartUser = {
   },
   data() {
     return {
-      defaultVal: this.value,
+      defaultVal: [],
       treeData: []
     };
   },
@@ -71,6 +71,7 @@ const DingDepartUser = {
             title: item.name,
             id:item.deptId,
             value: item.deptId,
+            key: item.deptId,
             pId: item.parentId,
             autoAddUser: item.autoAddUser,
             createDeptGroup: item.createDeptGroup,
@@ -91,6 +92,7 @@ const DingDepartUser = {
             title: item.name,
             id: item.userid,
             value: item.userid,
+            key:item.userid,
             pId: item.parentId,
             avatar: item.avatar,
             leader: item.leader,
@@ -112,6 +114,7 @@ const DingDepartUser = {
        const res2 = ret.deptUserList||[]
        this.treeData = this.treeData = this.formatData(res1.concat(res2));
        console.log(this.treeData,'----')
+       this.defaultVal = this.value
     },
     // 更新人员数据
     updateDeptUser(){

+ 10 - 2
src/views/expenseManagement/expenseReimbursement/chooseDepartUserModal.vue

@@ -76,8 +76,15 @@ export default {
         wrapperCol: { span: 16 }
       },
       form: {
-        approvers: [], // 审批人
-        ccList: [] // 抄送人
+        approvers: [
+          {label: '李丽英', value: '043107382726069026'},
+          {label: '张丽添', value: '082029252224051326'},
+          {label: '张国秋', value: '5351215624123790'}
+        ], // 审批人
+        ccList: [
+          {label: '江月龙', value: '275842136127519536'},
+          {label: '谢玉英', value: '275844532735425322'}
+        ] // 抄送人
       },
       rules: {
         approvers: [
@@ -100,6 +107,7 @@ export default {
       this.$refs.ruleForm.clearValidate()
     },
     getTreeVal (data) {
+      console.log(data)
       const ret = []
       data.map(item => {
         ret.push(item.value)

+ 2 - 1
src/views/expenseManagement/expenseReimbursement/department.js

@@ -53,8 +53,9 @@ const Department = {
     },
     handleChange(value) {
       this.defaultVal = value;
+      const row = this.list.find(item => item.departmentSn == value)
       this.$emit('input', value);
-      this.$emit('change', value);
+      this.$emit('change', value, row);
     },
     getList () {
       departmentQueryList({}).then(res => {

+ 1 - 1
src/views/financialManagement/financialCollection/edit.vue

@@ -113,7 +113,7 @@
         <a-alert type="info" style="margin-bottom:10px" v-if="detailGlData">
           <div slot="message">
             共 {{ detailGlData.total }} 条,
-            总售价:{{ detailGlData.totalAmount }}
+            总售价:{{ toThousands(detailGlData.totalAmount||0) }}
           </div>
         </a-alert>
         <!-- 列表 -->

+ 25 - 8
src/views/financialManagement/financialCollection/fcDetailModal.vue

@@ -146,7 +146,7 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="12">
-            <a-form-model-item style="margin-bottom:5px;" label="户名">
+            <a-form-model-item style="margin-bottom:5px;" label="户名" prop="bankAccount">
               <a-select placeholder="请选择户名" v-model="form.bankAccount" style="width: 100%" @change="handleChange">
                 <a-select-option v-for="item in bankList" :value="item.bankAccount">
                   {{ item.bankAccount }}
@@ -155,7 +155,7 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="12">
-            <a-form-model-item style="margin-bottom:5px;" label="汇入银行">
+            <a-form-model-item style="margin-bottom:5px;" label="汇入银行" prop="bankName">
               <a-select placeholder="请选择汇入银行" v-model="form.bankName" style="width: 100%">
                 <a-select-option v-for="item in bankNameList" :value="item">
                   {{ item }}
@@ -254,8 +254,8 @@ export default {
         detailItemPayList: [],
         balanceAmount: '',
         nextMonthAmount: '',
-        bankAccount: undefined,
-        bankName: undefined,
+        bankAccount: '东莞箭冠',
+        bankName: '东莞银行',
         fullPaymentFlag: '1',
         explainInfo: ''
       },
@@ -264,7 +264,9 @@ export default {
         payerType: [ { required: true, message: '请选择付款方类型', trigger: ['change', 'blur'] } ],
         dealerSn: [ { required: true, message: '请选择付款方', trigger: ['change', 'blur'] } ],
         payerName: [ { required: true, message: '请输入付款方名称', trigger: ['change', 'blur'] } ],
-        payerAccountType: [ { required: true, message: '请选择付款账户类型', trigger: ['change', 'blur'] } ]
+        payerAccountType: [ { required: true, message: '请选择付款账户类型', trigger: ['change', 'blur'] } ],
+        bankAccount:[{ required: true, message: '请选择户名', trigger: ['change', 'blur'] }],
+        bankName:[{ required: true, message: '请选择汇入银行', trigger: ['change', 'blur'] }]
       },
       useTotalAmount: '',
       payTotalAmount: '',
@@ -286,7 +288,7 @@ export default {
           bankName: ['九江银行']
         }
       ],
-      bankNameList: []
+      bankNameList: ['东莞银行']
     }
   },
   methods: {
@@ -297,6 +299,9 @@ export default {
       this.form.dealerCode = ''
       this.form.licenseName = ''
       this.form.payerAccountType = 'PUBLIC'
+      this.form.bankAccount = '东莞箭冠'
+      this.form.bankName = '东莞银行'
+      this.bankNameList = ['东莞银行']
       this.form.payerAccountInfo = ''
       this.form.payerName = ''
     },
@@ -310,6 +315,15 @@ export default {
         this.form.licenseName = ''
         this.form.payerAccountInfo = ''
       }
+      if(this.form.payerAccountType=='PUBLIC'){
+        this.form.bankAccount = '东莞箭冠'
+        this.form.bankName = '东莞银行'
+        this.bankNameList = ['东莞银行']
+      }else{
+        this.form.bankAccount = '张丽添'
+        this.form.bankName = '农业银行'
+        this.bankNameList = ['农业银行']
+      }
     },
     handleChange (v) {
       console.log(v)
@@ -411,6 +425,7 @@ export default {
       })
     },
     setDetail (data) {
+      this.handleChange(data.bankAccount)
       this.form = Object.assign(this.form, { payerTypeDictValue: data.payerTypeDictValue, payerType: data.payerType, dealerSn: data.dealerSn, payerName: data.payerName })
       this.$nextTick(() => {
         if(this.form.dealerSn){
@@ -428,6 +443,7 @@ export default {
       financeBookDetailQueryBySn({ bookDetailSn: this.bookDetailSn }).then(res => {
         if (res.status == 200) {
           const data = res.data
+          this.handleChange(data.bankAccount)
           this.form = Object.assign(this.form, data)
           this.form.receiptDate = moment(this.form.receiptDate).format('YYYY-MM-DD')
           this.form.payCreditFlag = this.form.payCreditFlag == 1
@@ -473,11 +489,12 @@ export default {
         detailItemPayList: [],
         balanceAmount: '',
         nextMonthAmount: '',
-        bankAccount: undefined,
-        bankName: undefined,
+        bankAccount: '东莞箭冠',
+        bankName: '东莞银行',
         fullPaymentFlag: '1',
         explainInfo: ''
       }
+      this.bankNameList = ['东莞银行']
       this.$refs.ruleForm.resetFields()
     }
   },