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

src/view/fin/money-account/index.vue

@@ -183,11 +183,7 @@ export default {
      * @date   : 2024/3/4 17:12
      */
     saveData() {
-      this.params.accDate = new Date(this.params.accDate).toDateStr();
-      // 部门
-      this.params.orgId = this.$store.state.user.orgId
-      // 员工
-      this.params.staffId = this.$store.state.user.staffId
+      this.params.accDate = this.params.accDate.format('yyyy-MM-dd');
       if (this.modalParams.button === this.$config.formMode.add) {
         return this.excute(this.$service.moneyAccountService, this.$service.moneyAccountService.insert, this.params);
       } else {

src/view/fin/other-payable/form.vue

@@ -176,7 +176,7 @@ export default {
     initData() {
       this.getDictionaryData();
 
-      this.formData.staffId = this.$store.state.user.id
+      this.formData.staffId = this.$store.state.user.staffId
       this.formData.staffName = this.$store.state.user.staffName
       this.formData.orgId = this.$store.state.user.orgId
       this.formData.orgName = this.$store.state.user.orgName

src/view/sale/order-out/form.vue

@@ -755,7 +755,7 @@ export default {
           this.formData.outStatus = this.$config.outStatus.chuKuZhong;
         }
         if (!this.formData.makeStaff) {
-          this.formData.makeStaff = this.$store.state.user.id;
+          this.formData.makeStaff = this.$store.state.user.staffId;
         }
         this.formData.limitEdit = true;
 

src/view/sale/order-out/formOrderOut.vue

@@ -473,7 +473,7 @@ export default {
           this.formData.outStatus = this.$config.outStatus.chuKuZhong;
         }
         if (!this.formData.makeStaff) {
-          this.formData.makeStaff = this.$store.state.user.id;
+          this.formData.makeStaff = this.$store.state.user.staffId;
         }
 
         let itemList = data["dataItem"];

src/view/sale/order-return/form.vue

@@ -654,7 +654,7 @@ export default {
           this.formData.intoStatus = this.$config.intoStatus.daiRuKu
         }
         if (!this.formData.makeStaff) {
-          this.formData.makeStaff = this.$store.state.user.id;
+          this.formData.makeStaff = this.$store.state.user.staffId;
         }
 
         this.goodsFootFormData.sumQuantity = this.formData.outingQty;

src/view/sale/order-return/formOutReturn.vue

@@ -391,7 +391,7 @@ export default {
           this.formData.intoStatus = this.$config.intoStatus.daiRuKu
         }
         if (!this.formData.makeStaff) {
-          this.formData.makeStaff = this.$store.state.user.id;
+          this.formData.makeStaff = this.$store.state.user.staffId;
         }
 
         this.goodsFootFormData.sumQuantity = this.formData.outingQty;