Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-mini-web

src/api/base.js

@@ -26,6 +26,8 @@ export const request = (url, data, method, token) => {
     if (token){
       header.Authorization = "Bearer "+token
     }
+    // 语言
+    header.i18n = localRead('local_lan')
     axios.request({
       url: url,
       data:data,

src/api/pages/fin/account.js

@@ -0,0 +1,20 @@
+/**
+ * @desc   : 账务对象
+ * @author : 付斌
+ * @date   : 2024-01-31 14:37
+ */
+export default {
+  accountService: {
+    prefix: '/mdm-server/mac/account/',
+  }
+}
+
+/**
+ * @desc   : 客户收款路由
+ * @author : 付斌
+ * @date   : 2024-02-01 16:03
+ */
+export const routeUrl = {
+  account: {
+  }
+}

src/api/pages/fin/accounting-verification.js

@@ -1,20 +0,0 @@
-/**
- * @desc   : 账务核销服务
- * @author : 常皓宁
- * @date   : 2024/2/19 9:19
- */
-export default {
-  accountingVerificationService:{
-  }
-}
-
-/**
- * @desc   : 账务核销路由
- * @author : 常皓宁
- * @date   : 2024/2/22 15:10
- */
-export const routeUrl = {
-  accountingVerification: {
-    add: {key: 'add', method: 'add'},
-  }
-}

src/components/modal/dk-modal/dk-modal.vue

@@ -209,12 +209,14 @@ export default {
   },
   watch: {
     value(n, o) {
+      console.log('u',n)
       this.showModal = n;
     },
     showModal(n, o) {
       this.$emit('input', n)
       if(n){
         this.displayFlag = true;
+        console.log('ft',this.openFlag,n)
         this.onVisibleChange(true);
         if(this.shortcutFlag){
           this.addKeyBoardEvent();
@@ -234,7 +236,8 @@ export default {
       vm: vm ? vm : self,
       displayFlag:true,
       documentKeyDownContent: Object,
-      showModal: self.value,
+      showModal: false,
+      openFlag:false,// 避免首次打开会调用两次
       styles: {
         minWidth: self.width,
         height: self.height,
@@ -310,7 +313,15 @@ export default {
      * @date   : 2022/7/23 17:35
      */
     onVisibleChange(e) {
-      this.$emit('on-visible-change', e)
+      if(!this.openFlag){
+        this.openFlag = true;
+        this.$emit('on-visible-change', e)
+        // 1s后才会置为发false
+        setTimeout(()=>{
+          this.openFlag = false;
+        },1000)
+      }
+
       if (e) {
         this.$nextTick(() => {
           this.focus();   // 聚焦到第一个组件上

src/locale/lang/zh-CN.js

@@ -431,6 +431,7 @@ export const columns = {
   biznisNo:'来源单号',
   amtRec:'收款金额',
   ownerFlag:'主业务标识',
+  receiptResidue:'客户可用余额',
 }
 
 /**

src/view/sale/cus-receipt/form.vue

@@ -41,6 +41,10 @@
             <DatePickerPop v-model="formData.accDate"
                            :short-cut-flag="true"/>
           </DkFormItem>
+          <!--客户可用余额-->
+          <DkFormItem prop="receiptResidue">
+            <InputPop ref="receiptResidue" v-model="formData.receiptResidue" :disabled="true"/>
+          </DkFormItem>
           <!--合计收款金额-->
           <DkFormItem prop="sumAmtRec">
             <InputPop ref="sumAmtRec" v-model="formData.sumAmtRec" :disabled="true"/>
@@ -54,7 +58,7 @@
                      major-field="receiptId"
                      :height="this.tableHeight"
                      :new-row-flag="true"
-                     :columns="this.type === this.$config.formMode.edit ? null : addReceiptColumns"
+                     :columns="this.type === this.$config.formMode.receipt ? receiptColumns : refundColumns"
                      controlId="macId" @on-choose="getTotals" @changeValue="getTotals"/>
         </div>
       </DkPanel>
@@ -93,11 +97,33 @@ export default {
         orgName: null,
         orgCode: null,
         sumAmtRec: null,
+        receiptResidue: null,
         makeStaff: self.$store.state.user.id,
         cpId: self.$store.state.user.cpId,
         itemList: [],
       },
-      addReceiptColumns: [
+      receiptColumns: [
+        {
+          field: 'macName',
+          controlId: 'macId',
+          type: 'tableSelect',
+          width: 200,
+          dataType: self.$config.tableSelectType.moneyAccount,
+          fieldUpdate: self.$updateColumns.receiptChooseMac,
+          searchDetailFlag: true
+        },
+        //收款金额
+        {
+          field: 'amtRec',
+          type: 'number',
+          digits: 2,
+          sum: true,
+        },
+        {
+          field: 'remarks', type: 'text', equal: true,
+        },
+      ],
+      refundColumns: [
         {
           field: 'macName',
           controlId: 'macId',
@@ -118,6 +144,7 @@ export default {
         {
           field: 'amtRec',
           type: 'number',
+          negative: true,
           digits: 2,
           sum: true,
         },
@@ -135,6 +162,7 @@ export default {
      * @date   : 2024-02-20 15:53
      */
     initData() {
+
     },
     /**
      *   @desc   : 获取客户资料并且监听每一次的客户修改
@@ -151,6 +179,15 @@ export default {
         this.formData.staffId = val[0].staffId
         this.formData.staffName = val[0].staffName
         this.formData.addressFull = val[0].addressFull
+
+        let params = {
+          'objectId': this.formData.objectId
+        }
+        this.excute(this.$service.accountService, this.$service.accountService.selectByCond, params).then(res => {
+          if (res.code === this.$config.SUCCESS_CODE && res.data.list.length > 0) {
+            this.formData.receiptResidue = res.data.list[0].receiptResidue
+          }
+        })
       }
     },
     /**

src/view/sale/order/form.vue

@@ -461,8 +461,8 @@ export default {
       // 设置默认业务员业务部门
       this.formData.staffList = []
       let staff = {}
-      staff.staffId = this.$store.state.user.id
-      staff.staffCode = this.$store.state.user.userCode
+      staff.staffId = this.$store.state.user.staffId
+      staff.staffCode = this.$store.state.user.staffCode
       staff.staffName = this.$store.state.user.staffName
       staff.allocationRatio = 100;
       staff.ownerFlag = true;
@@ -513,18 +513,16 @@ export default {
      *   @date   : 2022/5/28 10:43
      *   @author : 付斌
      */
-    orgOk(val) {
-
-      if (val && val.rows.length > 0) {
+    orgOk(rows) {
+      if (rows && rows.length > 0) {
         this.formData.orgList = []
-        for (let i of val.rows) {
+        for (let i of rows) {
           //找到主业务员
           if (i.ownerFlag) {
             this.formData.orgId = i.orgId
             this.formData.orgCode = i.orgCode
             this.formData.orgName = i.orgName
             this.formData.allocationRatio = i.allocationRatio
-
           }
           //存放从业务员id和分配比
           this.formData.orgList.push({
@@ -542,10 +540,10 @@ export default {
      *   @date   : 2022/5/28 10:43
      *   @author : 付斌
      */
-    staffOk(val) {
-      if (val && val.rows.length > 0) {
+    staffOk(rows) {
+      if (rows && rows.length > 0) {
         this.formData.staffList = []
-        for (let i of val.rows) {
+        for (let i of rows) {
           //找到主业务员
           if (i.ownerFlag) {
             this.formData.staffId = i.staffId