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

src/api/pages/sale/cus-receipt.js

@@ -7,6 +7,7 @@ export default {
   cusReceiptService: {
     prefix: '/mdm-server/mac/recPay/',
     selectRpInfoById: 'select_rp_info_by_id',
+    getRpForUpdate: 'get_rp_for_update',
     insertReceipt: 'insert_receipt',
     insertRefund: 'insert_refund',
   }
@@ -21,5 +22,6 @@ export const routeUrl = {
   cusReceipt: {
     receipt: {key: 'receipt', routeName: 'cus-receipt-receipt'},
     refund: {key: 'refund', routeName: 'cus-receipt-refund'},
+    edit: {key: 'edit', routeName: 'cus-receipt-edit'},
   }
 }

src/view/ivt/ivt-freeze/form.vue

@@ -16,14 +16,16 @@
                              :display-text="formData.cusPhone"
                              primary-key="cusId"
                              ref="cusPhone"
+                             :disabled="checkColumnIsEdit('cusPhone')"
                              :type="this.$config.MagnifierType.customer"
+                             :multiple="false"
                              @ok="selectCustomer"
             >
             </SelectMagnifier>
           </DkFormItem>
           <!--客户名称-->
           <DkFormItem prop="cusName">
-            <InputPop ref="cusName"  v-model="formData.cusName"/>
+            <InputPop ref="cusName"  v-model="formData.cusName" :readonly="true"/>
           </DkFormItem>
           <!--业务部门-->
           <DkFormItem prop="orgId" :label="$t('orgId')" :required="true">
@@ -31,6 +33,7 @@
                              :type="this.$config.MagnifierType.org"
                              @ok="orgOk"
                              :initSearchFlag="true"
+                             :disabled="checkColumnIsEdit('orgId')"
                              :multiple="false"/>
           </DkFormItem>
           <!--业务员-->
@@ -38,12 +41,13 @@
             <SelectMagnifier v-model="formData.staffId" :display-text="formData.staffName"
                              :type="this.$config.MagnifierType.staff"
                              @ok="staffOk"
+                             :disabled="checkColumnIsEdit('staffId')"
                              :initSearchFlag="true"
                              :multiple="false"/>
           </DkFormItem>
           <!--自动解冻时间-->
           <DkFormItem prop="autoUnfreezeDate" :data-type="$config.dataType.autoUnfreezeDate">
-            <DatePickerPop v-model="formData.autoUnfreezeDate"
+            <DatePickerPop v-model="formData.autoUnfreezeDate"  :readonly="checkColumnIsEdit('autoUnfreezeDate')"
                            :short-cut-flag="true"/>
           </DkFormItem>
           <!--商品总数量-->
@@ -135,9 +139,15 @@ export default {
             {updateField: 'skuId', valueFiled: 'skuId'},
             {updateField: 'skuCode', valueFiled: 'skuCode'},
             {updateField: 'whName', valueFiled: 'whName'},
+            {updateField: 'invQty', valueFiled: 'invQty'},
           ],
           searchDetailFlag: true
         },
+        //库存数量
+        {
+          field: 'invQty',
+          type: 'disabled',
+        },
         //冻结数量
         {
           field: 'freezeQty',
@@ -313,6 +323,16 @@ export default {
       }
     },
 
+    /**
+     * @desc   : 判断列是否可以编辑
+     * @author : 宋扬
+     * @date   : 2024/3/21 16:25
+     */
+    checkColumnIsEdit(field) {
+      if (this.type === this.$config.formMode.unFreeze) {
+        return true;
+      }
+    },
   },
   /**
    * @desc   : 在实例创建完成后被立即同步调用

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

@@ -43,18 +43,18 @@
           </DkFormItem>
           <!--客户可用余额-->
           <DkFormItem prop="receiptResidue">
-            <InputPop ref="receiptResidue" v-model="formData.receiptResidue" :disabled="true"/>
+            <InputNumberPop ref="receiptResidue" v-model="formData.receiptResidue" :disabled="true"/>
           </DkFormItem>
           <!--合计收款金额-->
           <DkFormItem prop="sumAmtRec">
-            <InputPop ref="sumAmtRec" v-model="formData.sumAmtRec" :disabled="true"/>
+            <InputNumberPop ref="sumAmtRec" v-model="formData.sumAmtRec" :disabled="true"/>
           </DkFormItem>
         </DkForm>
       </DkPanel>
       <!--客户收款-->
       <DkPanel prop="customerAccount">
         <div id="search-cond-div-goods-info" ref="search-cond-div-goods-info" slot="content">
-          <EditTable ref="receiptTable" :data="receiptData" showFooter
+          <EditTable ref="receiptTable" :data="formData.itemList" showFooter
                      major-field="receiptId"
                      :height="this.tableHeight"
                      :new-row-flag="true"
@@ -81,7 +81,6 @@ export default {
       //控制客户是否可以输入
       readonlyFlag: true,
       allCanNoEdit: false, //是否所有的都不允许编辑
-      receiptData: [],
       // 画面表单数据
       formData: {
         accDate: new Date(),
@@ -101,6 +100,7 @@ export default {
         makeStaff: self.$store.state.user.id,
         cpId: self.$store.state.user.cpId,
         itemList: [],
+        deleteItemList: [],
       },
       receiptColumns: [
         {
@@ -213,7 +213,7 @@ export default {
      * @date   : 2022/03/04 13:17
      */
     detail(id) {
-      return this.excuteNoParam(this.$service.cusReceiptService, this.$service.cusReceiptService.getOrderForUpdate, [id]);
+      return this.excuteNoParam(this.$service.cusReceiptService, this.$service.cusReceiptService.getRpForUpdate, [id]);
     },
     /**
      * @desc   : 编辑页面赋值
@@ -223,6 +223,8 @@ export default {
     setValuesByEdit(data) {
       if (data) {
         this.formData = data["data"];
+        this.formData.itemList = data["dataItem"];
+
       }
     },
     /**
@@ -250,6 +252,12 @@ export default {
      * @date   : 2023/6/25 14:31
      */
     setParams(arg) {
+      if (this.type === this.$config.formMode.edit) {
+        // 删除的表数据
+        let deleteItemTable = this.$refs['receiptTable'].getDeleteData();
+        this.formData.deleteItemList = deleteItemTable
+      }
+
       if (this.type === this.$config.formMode.receipt) {
         this.formData.rpType = this.$config.rpType.shouKuan
       } else if (this.type === this.$config.formMode.refund) {
@@ -287,20 +295,23 @@ export default {
       let self = this
       this.formData = {
         accDate: new Date(),
-        rpType: null,
-        objectId: null,//客户Id
-        cusName: null,
-        cusPhone: null,
-        addressFull: null,              // 详细地址
-        staffId: null,
-        staffName: null,
-        staffCode: null,
-        orgId: null,
-        orgName: null,
-        orgCode: null,
-        makeStaff: self.$store.state.user.id,
+          rpType: null,
+          objectId: null,//客户Id
+          cusName: null,
+          cusPhone: null,
+          addressFull: null,              // 详细地址
+          staffId: null,
+          staffName: null,
+          staffCode: null,
+          orgId: null,
+          orgName: null,
+          orgCode: null,
+          sumAmtRec: null,
+          receiptResidue: null,
+          makeStaff: self.$store.state.user.id,
+          cpId: self.$store.state.user.cpId,
+          itemList: [],
       }
-      this.receiptData = [];
     },
   }
   ,

src/view/sale/order/form.vue

@@ -237,7 +237,6 @@ export default {
         remarks: null,
         itemList: [],
         deleteItemList: [],
-        receiptFormData: {},
         files: [],
         // 附件
         annexPaths: null,
@@ -838,7 +837,6 @@ export default {
         deliveryDate: new Date().addDays(1),//送货时间
         remarks: null,
         itemList: [],
-        receiptFormData: {},
         files: [],
         annexPaths: null,
       }