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

src/config/index.js

@@ -694,6 +694,8 @@ export default {
     add: 'add',
     //新建其它
     addTogether: 'addTogether',
+    // 新建其它
+    addOther: 'addOther',
     //编辑
     edit: 'edit',
     //复制

src/locale/lang/zh-CN.js

@@ -578,6 +578,7 @@ export const columns = {
   intoAmtSum:'已入库总金额',
   returnQtySum:'已入库退货总量',
   returnAmtSum:'已入库退货总金额',
+  sumShouldHandle:'待核销金额',
 }
 
 /**

src/view/fin/payment/form.vue

@@ -64,6 +64,11 @@
       </BaseIndexButtonGroup>
       <DkForm ref="payableFootFormData" v-model="payableFootFormData" :labelMaxWords="6" name="dk-form"
               class="form-content-class">
+        <!-- 待核销金额 -->
+        <DkFormItem prop="sumShouldHandle">
+          <InputNumberPop ref="sumShouldHandle" v-model="payableFootFormData.sumShouldHandle" :digits="2"
+                          :disabled="true"/>
+        </DkFormItem>
         <!-- 本次核销金额 -->
         <DkFormItem prop="sumAmtPayableHandle">
           <InputNumberPop ref="sumAmtPayableHandle" v-model="payableFootFormData.sumAmtPayableHandle"
@@ -123,7 +128,7 @@
 
     <!-- DkModal应付款单 -->
     <DkModal :loading="loading" v-model="payableModal" ref="modal_payable"
-             @modalOk="payableOk" :title='this.$t("应付款单")' :height="900" :width="1200">
+             @modalOk="payableOk" :title='this.$t("应付款单")' :height="900" :width="1500">
       <BaseIndexButtonGroup ref="BaseIndexButtonGroup2" id="BaseIndexButtonGroup2">
         <template #left>
           <BaseIndexButton ref="search" name="search" @click="getPayableInvoice"></BaseIndexButton>
@@ -186,6 +191,7 @@ export default {
       },
       // 应付合计信息
       payableFootFormData: {
+        sumShouldHandle: 0,
         sumAmtPayableHandle: 0,
         sumAmtWaiveHandle: 0,
         sumUsePaymentResidue: 0,
@@ -305,6 +311,7 @@ export default {
      */
     delPayableTable() {
       this.getPayableTotals();
+      this.payableFootFormData.sumShouldHandle = this.$refs['payableTable'].tableData?.sum('amtNotHandle')
     },
     /**
      * @desc   : 应付计算合计
@@ -317,9 +324,13 @@ export default {
         this.payableFootFormData.sumAmtPayableHandle = payableTable.sum('amtPayableHandle')
         this.payableFootFormData.sumAmtWaiveHandle = payableTable.sum('amtWaiveHandle')
         this.payableFootFormData2.sumAmtPayableHandle2 = this.payableFootFormData.sumAmtPayableHandle
-        // 设置预收抵扣
-        this.setPaymentResidue();
+      } else {
+        this.payableFootFormData.sumAmtPayableHandle = 0
+        this.payableFootFormData.sumAmtWaiveHandle = 0
+        this.payableFootFormData2.sumAmtPayableHandle2 = 0
       }
+      // 设置预收抵扣
+      this.setPaymentResidue();
     },
     /**
      * @desc   : 打开选择应付单据的Modal
@@ -363,6 +374,7 @@ export default {
       })
       let sumAmtPayableHandle = this.formData.payableList.sum('amtPayableHandle');
       this.payableFootFormData.sumAmtPayableHandle = sumAmtPayableHandle
+      this.payableFootFormData.sumShouldHandle = sumAmtPayableHandle
       this.payableFootFormData2.sumAmtPayableHandle2 = sumAmtPayableHandle
       this.payableModal = false
       // 设置预收抵扣

src/view/fin/payment/index.vue

@@ -44,6 +44,9 @@
           <DkTableColumn field="rpTypeName" :title="$t('paymentTypeName')"/>
           <DkTableColumn field="supName"/>
           <DkTableColumn field="sumAmtPay" :digits="2" dataType="number" sum/>
+          <DkTableColumn field="sumShouldHandle" :digits="2" dataType="number" sum/>
+          <DkTableColumn field="sumUsePaymentResidue":digits="2" dataType="number" sum/>
+          <DkTableColumn field="sumAmtPayableHandle" :digits="2" dataType="number" sum/>
           <DkTableColumn field="accDate" :title="$t('paymentDate')"/>
           <DkTableColumn field="orgName"/>
           <DkTableColumn field="staffName"/>

src/view/fin/receipt/form.vue

@@ -70,6 +70,11 @@
       </BaseIndexButtonGroup>
       <DkForm ref="receivableFootFormData" v-model="receivableFootFormData" :labelMaxWords="6" name="dk-form"
               class="form-content-class">
+        <!-- 待核销金额 -->
+        <DkFormItem prop="sumShouldHandle">
+          <InputNumberPop ref="sumShouldHandle" v-model="receivableFootFormData.sumShouldHandle" :digits="2"
+                          :disabled="true"/>
+        </DkFormItem>
         <!-- 本次核销金额 -->
         <DkFormItem prop="sumAmtReceivableHandle">
           <InputNumberPop ref="sumAmtReceivableHandle" v-model="receivableFootFormData.sumAmtReceivableHandle"
@@ -129,7 +134,7 @@
 
     <!-- DkModal应收款单 -->
     <DkModal :loading="loading" v-model="receivableModal" ref="modal_receivable"
-             @modalOk="receivableOk" :title='this.$t("应收款单")' :height="900" :width="1200">
+             @modalOk="receivableOk" :title='this.$t("应收款单")' :height="900" :width="1500">
       <BaseIndexButtonGroup ref="BaseIndexButtonGroup2" id="BaseIndexButtonGroup2">
         <template #left>
           <BaseIndexButton ref="search" name="search" @click="getReceivableInvoice"></BaseIndexButton>
@@ -192,6 +197,7 @@ export default {
       },
       // 应收合计信息
       receivableFootFormData: {
+        sumShouldHandle: 0,
         sumAmtReceivableHandle: 0,
         sumAmtWaiveHandle: 0,
         sumUseReceiptResidue: 0,
@@ -313,6 +319,7 @@ export default {
      */
     delReceivableTable() {
       this.getReceivableTotals();
+      this.receivableFootFormData.sumShouldHandle = this.$refs['receivableTable'].tableData?.sum('amtNotHandle')
     },
     /**
      * @desc   : 应收计算合计
@@ -325,9 +332,13 @@ export default {
         this.receivableFootFormData.sumAmtReceivableHandle = receivableTable.sum('amtReceivableHandle')
         this.receivableFootFormData.sumAmtWaiveHandle = receivableTable.sum('amtWaiveHandle')
         this.receivableFootFormData2.sumAmtReceivableHandle2 = this.receivableFootFormData.sumAmtReceivableHandle
-        // 设置预收抵扣
-        this.setReceiptResidue();
+      } else {
+        this.receivableFootFormData.sumAmtReceivableHandle = 0
+        this.receivableFootFormData.sumAmtWaiveHandle = 0
+        this.receivableFootFormData2.sumAmtReceivableHandle2 = 0
       }
+      // 设置预收抵扣
+      this.setReceiptResidue();
     },
     /**
      * @desc   : 打开选择应收单据的Modal
@@ -371,6 +382,7 @@ export default {
       })
       let sumAmtReceivableHandle = this.formData.receivableList.sum('amtReceivableHandle');
       this.receivableFootFormData.sumAmtReceivableHandle = sumAmtReceivableHandle
+      this.receivableFootFormData.sumShouldHandle = sumAmtReceivableHandle
       this.receivableFootFormData2.sumAmtReceivableHandle2 = sumAmtReceivableHandle
       this.receivableModal = false
       // 设置预收抵扣

src/view/fin/receipt/index.vue

@@ -46,6 +46,9 @@
           <DkTableColumn field="cusPhone"/>
           <DkTableColumn field="addressFull"/>
           <DkTableColumn field="sumAmtRec" :digits="2" dataType="number" sum/>
+          <DkTableColumn field="sumShouldHandle" :digits="2" dataType="number" sum/>
+          <DkTableColumn field="sumUseReceiptResidue" :digits="2" dataType="number" sum/>
+          <DkTableColumn field="sumAmtReceivableHandle" :digits="2" dataType="number" sum/>
           <DkTableColumn field="accDate" :title="$t('receiptDate')"/>
           <DkTableColumn field="orgName"/>
           <DkTableColumn field="staffName"/>

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

@@ -99,6 +99,16 @@
             <DatePickerPop v-model="formData.outDate"
                            :short-cut-flag="true"/>
           </DkFormItem>
+          <!--自动出库标识-->
+          <DkFormItem prop="autoOutFlag" v-show="showAutoFlag">
+            <template>
+              <i-switch v-model="formData.flgAutoHandle" @on-change="changeOutStatus"
+                        :disabled="type === $config.formMode.handle">
+                <span slot="open"></span>
+                <span slot="close"></span>
+              </i-switch>
+            </template>
+          </DkFormItem>
           <!--单据备注-->
           <DkFormItem prop="remarks">
             <InputPop ref="remarks" v-model="formData.remarks"
@@ -154,7 +164,8 @@ export default {
   data() {
     let self = this
     return {
-      allCanNoEdit: false, //是否所有的都不允许编辑
+      showAutoFlag: true, //是否显示自动办理出库标识
+      showOutDate: true, //是否显示自动办理出库标识
       currentRow: null,// 表格中的当前行
       // 画面表单数据
       formData: {
@@ -555,15 +566,30 @@ export default {
       }
     },
     /**
+     * @desc   : 自动出库标识变更
+     * @author : 付斌
+     * @date   : 2024-04-11 14:47
+     */
+    changeOutStatus() {
+      if (this.type === this.$config.formMode.addTogether) {
+        if (this.formData.flgAutoHandle) {
+          this.formData.outDate = new Date().format("yyyy-MM-dd")
+          this.showOutDate = true
+        } else {
+          this.formData.outDate = null
+          this.showOutDate = false
+        }
+      } else {
+        this.formData.outDate = new Date().format("yyyy-MM-dd")
+      }
+    },
+    /**
      * @desc   : 通过id查询
      * @author : 付斌
      * @date   : 2022/03/04 13:17
      */
     detail(id) {
-      //如果是新建用订单ID，编辑、办理用出库单ID
-      if (this.type === this.$config.formMode.add) {
-        return this.excuteNoParam(this.$service.orderService, this.$service.orderService.getOrderForOut, [id]);
-      } else if (this.type === this.$config.formMode.edit) {
+      if (this.type === this.$config.formMode.edit) {
         return this.excuteNoParam(this.$service.orderOutService, this.$service.orderOutService.getOutboundForUpdate, [id]);
       }
     },
@@ -577,9 +603,16 @@ export default {
         this.formData = data["data"];
         this.formData.itemList = data["dataItem"];
 
-        if (this.type === this.$config.formMode.add) {
+        if (this.type === this.$config.formMode.addTogether) {
           this.goodsFootFormData.sumOutingQty = this.formData.sumQuantity;
           this.goodsFootFormData.sumOutingAmt = this.formData.sumAmount;
+
+          //系统自动办理出库
+          if (this.$store.state.user.setting[this.$config.settingCode.IVT001] == 1) {
+            this.formData.flgAutoHandle = true;
+          } else {
+            this.formData.flgAutoHandle = false;
+          }
         } else if (this.type === this.$config.formMode.edit) {
           this.goodsFootFormData.sumOutingQty = this.formData.outingQty;
           this.goodsFootFormData.sumOutingAmt = this.formData.outingAmt;
@@ -624,10 +657,6 @@ export default {
      * @date   : 2023/6/25 14:31
      */
     setParams(arg) {
-      if (this.type === this.$config.formMode.add) {
-        this.formData.fromId = this.formData.orderId;
-        this.formData.fromNo = this.formData.orderNo;
-      }
       this.formData.outingQty = this.goodsFootFormData.sumOutingQty;
       this.formData.outingAmt = this.goodsFootFormData.sumOutingAmt;
       let itemTable = this.$refs['goodsTable'].getTableDataFilter();
@@ -646,7 +675,7 @@ export default {
      * @date   : 2023/6/25 14:31
      */
     saveData() {
-      if (this.type === this.$config.formMode.add || this.type === this.$config.formMode.addTogether) {
+      if (this.type === this.$config.formMode.addTogether) {
         return this.excute(this.$service.orderOutService, this.$service.orderOutService.outboundInsert, this.params);
       } else if (this.type === this.$config.formMode.edit) {
         return this.excute(this.$service.orderOutService, this.$service.orderOutService.outboundUpdate, this.params);
@@ -672,6 +701,14 @@ export default {
   created() {
     this.focusItem = 'outId';    // 给第一个组件赋值，可以在混入中自动去聚焦
     this.primaryKey = 'outId'  // 设置主键Id
+
+    //设置默认值
+    if (this.$route.params.id) {
+      // 出库办理
+      if (this.type === this.$config.formMode.handle) {
+        this.showAutoFlag = false;
+      }
+    }
   },
 }
 </script>

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

@@ -60,6 +60,16 @@
             <DatePickerPop v-model="formData.outDate"
                            :short-cut-flag="true"/>
           </DkFormItem>
+          <!--自动出库标识-->
+          <DkFormItem prop="autoOutFlag" v-show="showAutoFlag">
+            <template>
+              <i-switch v-model="formData.flgAutoHandle" @on-change="changeOutStatus"
+                        :disabled="type === $config.formMode.handle">
+                <span slot="open"></span>
+                <span slot="close"></span>
+              </i-switch>
+            </template>
+          </DkFormItem>
           <!--单据备注-->
           <DkFormItem prop="remarks">
             <InputPop ref="remarks" v-model="formData.remarks" :readonly="checkColumnIsEdit('remarks')"
@@ -115,8 +125,8 @@ export default {
   data() {
     let self = this
     return {
-      loading: false,
-      allCanNoEdit: false, //是否所有的都不允许编辑
+      showAutoFlag: true, //是否显示自动办理出库标识
+      showOutDate: true, //是否显示自动办理出库标识
       // 画面表单数据
       formData: {
         cpId: this.$store.state.user.cpId,
@@ -257,6 +267,24 @@ export default {
       }
     },
     /**
+     * @desc   : 自动出库标识变更
+     * @author : 付斌
+     * @date   : 2024-04-11 14:47
+     */
+    changeOutStatus() {
+      if (this.type === this.$config.formMode.add) {
+        if (this.formData.flgAutoHandle) {
+          this.formData.outDate = new Date().format("yyyy-MM-dd")
+          this.showOutDate = true
+        } else {
+          this.formData.outDate = null
+          this.showOutDate = false
+        }
+      } else {
+        this.formData.outDate = new Date().format("yyyy-MM-dd")
+      }
+    },
+    /**
      * @desc   : 通过id查询
      * @author : 付斌
      * @date   : 2022/03/04 13:17
@@ -303,7 +331,15 @@ export default {
 
         this.goodsFootFormData.sumQuantity = this.formData.outingQty;
         this.goodsFootFormData.sumAmount = this.formData.outingAmt;
-        this.formData.flgAutoHandle = true;
+
+        if (this.type != this.$config.formMode.edit) {
+          //系统自动办理出库
+          if (this.$store.state.user.setting[this.$config.settingCode.IVT001] == 1) {
+            this.formData.flgAutoHandle = true;
+          } else {
+            this.formData.flgAutoHandle = false;
+          }
+        }
       }
     },
     /**

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

@@ -99,6 +99,16 @@
             <DatePickerPop v-model="formData.outDate"
                            :short-cut-flag="true"/>
           </DkFormItem>
+          <!--自动出库标识-->
+          <DkFormItem prop="autoOutFlag" v-show="showAutoFlag">
+            <template>
+              <i-switch v-model="formData.flgAutoHandle" @on-change="changeOutStatus"
+                        :disabled="type === $config.formMode.handle">
+                <span slot="open"></span>
+                <span slot="close"></span>
+              </i-switch>
+            </template>
+          </DkFormItem>
           <!--单据备注-->
           <DkFormItem prop="remarks">
             <InputPop ref="remarks" v-model="formData.remarks" :readonly="checkColumnIsEdit('remarks')"
@@ -153,8 +163,8 @@ export default {
   data() {
     let self = this
     return {
-      loading: false,
-      allCanNoEdit: false, //是否所有的都不允许编辑
+      showAutoFlag: true, //是否显示自动办理出库标识
+      showOutDate: true, //是否显示自动办理出库标识
       // 画面表单数据
       formData: {
         cpId: this.$store.state.user.cpId,
@@ -535,6 +545,24 @@ export default {
       }
     },
     /**
+     * @desc   : 自动出库标识变更
+     * @author : 付斌
+     * @date   : 2024-04-11 14:47
+     */
+    changeOutStatus() {
+      if (this.type === this.$config.formMode.addTogether) {
+        if (this.formData.flgAutoHandle) {
+          this.formData.outDate = new Date().format("yyyy-MM-dd")
+          this.showOutDate = true
+        } else {
+          this.formData.outDate = null
+          this.showOutDate = false
+        }
+      } else {
+        this.formData.outDate = new Date().format("yyyy-MM-dd")
+      }
+    },
+    /**
      * @desc   : 通过id查询
      * @author : 付斌
      * @date   : 2022/03/04 13:17
@@ -561,7 +589,6 @@ export default {
      * @date   : 2024-03-03 9:33
      */
     setValuesByEdit(data) {
-      console.log("orderOutReturnService", data)
       if (data) {
         this.formData = data["data"];
         this.formData.itemList = data["dataItem"];
@@ -581,7 +608,15 @@ export default {
 
         this.goodsFootFormData.sumQuantity = this.formData.outingQty;
         this.goodsFootFormData.sumAmount = this.formData.outingAmt;
-        this.formData.flgAutoHandle = true;
+
+        if (this.type === this.$config.formMode.addOther) {
+          //系统自动办理出库
+          if (this.$store.state.user.setting[this.$config.settingCode.IVT001] == 1) {
+            this.formData.flgAutoHandle = true;
+          } else {
+            this.formData.flgAutoHandle = false;
+          }
+        }
       }
     },
     /**