Merge branch 'master' into 2023年7月变更

# Conflicts:
#	src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue

src/views/projectManagement/GeneralProjectManagement.vue

@@ -176,7 +176,7 @@ export default {
           dataIndex: 'chargeCompanyTemporaryName',
           scopedSlots: { customRender: 'text' }
         }, {
-          title: '应收金额',
+          title: '待确收金额',
           align: 'center',
           width: 150,
           dataIndex: 'receivableAmount',

src/views/projectManagement/WorkingGroupMemberUnitMaintenance.vue

@@ -299,7 +299,7 @@ export default {
           dataIndex: 'contactsTemporaryNameOne',
           scopedSlots: { customRender: 'text' }
         }, {
-          title: '应收金额',
+          title: '待确收金额',
           align: 'center',
           dataIndex: 'receivableAmount',
           width: 180,

src/views/projectManagement/modules/GeneralProjectModule.vue

@@ -83,10 +83,10 @@
         </a-row>
         <a-row>
           <a-col :xl="12" :sm="24">
-            <a-form-item label="应收金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-form-item label="待确收金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-row :gutter="10">
                 <a-col :span="20">
-                  <a-input placeholder="请输入应收金额"
+                  <a-input placeholder="请输入待确收金额"
                            v-decorator="['receivableAmount',validatorRules.receivableAmount]"
                            :maxLength='50'
                            @blur="addZero"
@@ -526,7 +526,7 @@ export default {
       this.close()
     },
     /**
-     * 改变应收金额 计算税额 未税金额
+     * 改变待确收金额 计算税额 未税金额
      * */
     changeReceivableAmount(e){
       e.target.value = (e.target.value.replace(/[^0-9.]/g,'')).trim()
@@ -535,7 +535,7 @@ export default {
       })
     },
     /**
-     * 改变税率计算税额 应收金额
+     * 改变税率计算税额 待确收金额
      * */
     changeRate(){
       this.$nextTick(() => {
@@ -543,16 +543,16 @@ export default {
       })
     },
     /**
-     * 根据应收金额、税率计算税额 、未税金额
+     * 根据待确收金额、税率计算税额 、未税金额
      * */
     calcAmount(){
-      // 获取应收金额
+      // 获取待确收金额
       let ysje = Number(this.form.getFieldValue('receivableAmount'))
       // 获取税率
       let rate = this.form.getFieldValue('taxRate') * 1
-      // 计算未税金额 未税金额 = 应收金额 * (税率 + 1)
+      // 计算未税金额 未税金额 = 待确收金额 * (税率 + 1)
       let wsje = (ysje / (rate + 1)).toFixed(2)
-      // 计算税额  税额 = 应收金额 - 未税金额 保留两位小数
+      // 计算税额  税额 = 待确收金额 - 未税金额 保留两位小数
       let se = (ysje - Number(wsje)).toFixed(2)
       // 表单赋值
       this.form.setFieldsValue({
@@ -630,7 +630,7 @@ export default {
         }
         callback('请输入合法的金额数字,最多2位小数,10位整数')
       }
-      callback('请输入应收金额')
+      callback('请输入待确收金额')
     },
     /**
      * 校验税额金额格式

src/views/projectManagement/modules/WorkingGroupMemberUnitModule.vue

@@ -184,10 +184,10 @@
         <template v-if="chargeWayType === 1 || chargeWayType === 2">
           <a-row>
             <a-col :xl="12" :sm="24">
-              <a-form-item label="应收金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-form-item label="待确收金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
                 <a-row :gutter="10">
                   <a-col :span="20">
-                    <a-input placeholder="请输入应收金额"
+                    <a-input placeholder="请输入待确收金额"
                              v-decorator="['receivableAmount',validatorRules.receivableAmount]"
                              :maxLength='50'
                              @blur="addZero"
@@ -749,7 +749,7 @@ export default {
       } else {
         // 清空之前选中的收费通知号
         this.selectedChargeNotice = null
-        // 清空未税金额 应收金额 税额
+        // 清空未税金额 待确收金额 税额
         this.form.resetFields(['tax', 'noTaxAmount', 'receivableAmount'])
       }
       this.chargeWayType = e.target.value
@@ -840,7 +840,7 @@ export default {
         }
         callback('请输入合法的金额数字,最多2位小数,10位整数')
       }
-      callback('请输入应收金额')
+      callback('请输入待确收金额')
     },
     /**
      * 在新增成功后重新获取联系人列表