[update] 财务管理到账开票接口联调；金额正则修改；分期信息组件修改

src/api/incomePaymentsApi.js

@@ -29,7 +29,17 @@ const queryContactByName = (param) => getAction('/company/payContactsManagement/
 // 通过id获取支出合同信息
 const getExpenditureContractById = (param) => getAction('/contract/paySpendingContract/queryById', param)
 // 添加来款阶段
-const addPaymentPhase = (param) => postAction('/paymentRecord/payPaymentRecord/addPhase', param)
+const addPaymentPhase = (param) => postAction('/paymentRecord/payPaymentRecord/addAmountReceived', param)
+// 编辑来款阶段
+const editAmountPhase = (param) => postAction('/paymentRecord/payPaymentRecord/editAmountReceived', param)
+// 来款列表
+const amountReceivedList = (param) => postAction(`/paymentRecord/payPaymentRecord/amountReceivedList?id=${param}`)
+// 开票列表
+const payBillList = (param) => postAction(`/paymentRecord/payPaymentRecord/payBillList?id=${param}`)
+// 新增开票阶段
+const addPayBill = (projectId, projectType, param) => postAction(`/paymentRecord/payPaymentRecord/addPayBill?projectIds=${projectId}&projectTypes=${projectType}`, param)
+// 编辑开票阶段
+const editPayBill = (param) => postAction('/paymentRecord/payPaymentRecord/editPayBill', param)
 
 export {
 	getWorkingGroupById,
@@ -46,5 +56,10 @@ export {
   queryUserByDepartId,
   queryContactByName,
   getExpenditureContractById,
-  addPaymentPhase
+  addPaymentPhase,
+  editAmountPhase,
+  amountReceivedList,
+  payBillList,
+  addPayBill,
+  editPayBill
 }

src/components/form/InstallmentForm.vue

@@ -82,17 +82,17 @@ export default {
       },
       validatorRules: {
         phaseName: {
-          rules: [{ required: true, message: '请输入名称'}],
+          rules: [{ required: true, message: '请输入名称' }],
           validateTrigger: 'blur'
         },
         accountsReceivableAmount: {
-          rules: [{ required: true, message: '请输入金额'}],
+          rules: [{ required: true, message: '请输入金额' }],
           validateTrigger: 'blur'
         },
         paidAmount: {
-          rules: [{ required: false, message: '请输入金额'}],
+          rules: [{ required: false, message: '请输入金额' }],
           validateTrigger: 'blur'
-        },
+        }
       },
       index: 1,
       installmentList: [],
@@ -132,7 +132,10 @@ export default {
       this.installmentList.push(this.defaultFormData)
     },
     deleteInstallmentItem(index) {
+      let valArr = Object.values(this.form.getFieldValue(['installmentList']))[0]
       this.installmentList.splice(index, 1)
+      valArr.splice(index, 1)
+      this.form.setFieldsValue({ installmentList: valArr })
     },
     handleSave() {
       this.form.validateFields((err, values) => {

src/utils/validate.js

@@ -71,10 +71,11 @@ export function number(s) {
 }
 
 /**
- * 金额格式，小数点后两位
+ * 金额格式，小数点后两位，整数部分十位
+ * /^[1-9](\d{1,10})?(\.\d{1,2})$|^0\.([1-9](\d{0,1})|\d[1-9])$|^[1-9]\d{1,10}$|^0$/ ---- 最初的正则，能输入十一位整数
  * @param s
  * @returns {boolean}
  */
 export function money(s) {
-  return /^[1-9](\d{1,10})?(\.\d{1,2})$|^0\.([1-9](\d{0,1})|\d[1-9])$|^[1-9]\d{0,10}$|^0$/.test(s)
+  return /^[1-9](\d{1,10})?(\.\d{1,2})$|^0\.([1-9](\d{0,1})|\d[1-9])$|^[1-9]\d{1,9}$|^0$/.test(s)
 }

src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue

@@ -87,7 +87,7 @@
 
           <span slot="action" class="action-span-cell" slot-scope="text, record">
             <a @click="incomePayment(record.id)">来款</a>
-            <a @click="invoicing(record.id)">开票</a>
+            <a @click="invoicing(record)">开票</a>
           </span>
         </a-table>
       </div>
@@ -95,7 +95,13 @@
     <!--    来款阶段-->
     <arrive-stage-module ref="arriveStage" @ok="modalFormOk" :project-id="selectProjectId"></arrive-stage-module>
     <!--    开票阶段-->
-    <invoicing-stage-module ref="invoicingStage" @ok="modalFormOk"></invoicing-stage-module>
+    <invoicing-stage-module
+      ref="invoicingStage"
+      @ok="modalFormOk"
+      :project-id="selectProjectId"
+      :project-type="selectProjectType"
+      :project-name="selectProjectName"
+      :charge-company-name="selectProjectChargeCompanyName"></invoicing-stage-module>
     <project-detail-modal ref="projectDetail"></project-detail-modal>
   </div>
 </template>
@@ -113,7 +119,15 @@ import ProjectDetailModal from '../../../components/ProjectDetailModal'
 
 export default {
   name: 'ArriveAndInvoivingList',
-  components: { PageHeaderTitle, JYearDate, StatusSlot, ArriveStageModule, InvoicingStageModule, SelectPrincipal, ProjectDetailModal },
+  components: {
+    PageHeaderTitle,
+    JYearDate,
+    StatusSlot,
+    ArriveStageModule,
+    InvoicingStageModule,
+    SelectPrincipal,
+    ProjectDetailModal
+  },
   mixins: [JeroListMixin],
   data() {
     return {
@@ -213,7 +227,10 @@ export default {
         list: '/paymentRecord/payPaymentRecord/mainList',
         exportXlsUrl: ''
       },
-      selectProjectId: null
+      selectProjectId: null, // 选中项目id
+      selectProjectType: null, // 选中项目类型
+      selectProjectName: null, // 选中项目名称
+      selectProjectChargeCompanyName: null // 选中项目来款企业
     }
   },
   methods: {
@@ -229,8 +246,12 @@ export default {
      * 开票
      * @param id
      */
-    invoicing(id) {
+    invoicing(record) {
-      console.log(id)
+      console.log(record)
+      this.selectProjectId = record.id
+      this.selectProjectType = record.projectType
+      this.selectProjectName = record.chargeProject
+      this.selectProjectChargeCompanyName = record.chargeCompanyTemporaryName
       this.$refs.invoicingStage.open()
     }
   }

src/views/financialManagement/arriveAndInvoicing/modules/ArriveModule.vue

@@ -41,7 +41,7 @@
 import pick from 'lodash.pick'
 import { money } from '../../../../utils/validate'
 import JDate from '../../../../components/tools/JDate'
-import { addPaymentPhase } from '../../../../api/incomePaymentsApi'
+import { addPaymentPhase, editAmountPhase } from '../../../../api/incomePaymentsApi'
 
 export default {
   name: 'ArriveModule',
@@ -87,6 +87,7 @@ export default {
       this.edit({})
     },
     edit(record) {
+      this.form.resetFields()
       this.model = Object.assign({}, record)
       this.visible = true
       this.$nextTick(() => {
@@ -99,7 +100,13 @@ export default {
           values.projectId = this.projectId
           const formData = Object.assign(this.model, values)
           console.log('表单提交数据', formData)
-          addPaymentPhase(formData).then(res => {
+          let okHttpMethod
+          if (this.model.id) {
+            okHttpMethod = editAmountPhase
+          } else {
+            okHttpMethod = addPaymentPhase
+          }
+          okHttpMethod(formData).then(res => {
             if (res.success) {
               this.$message.success(res.message)
               this.$emit('ok')

src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue

@@ -7,9 +7,8 @@
     switchFullscreen
     @ok="handleAdd"
     @cancel="handleCancel"
-    okText="添加阶段"
+    okText="添加阶段">
-    cancelText="关闭">
+    <a-spin :spinning="confirmLoading" v-if="stageList.length > 0">
-    <a-spin :spinning="confirmLoading">
       <div v-for="(item, index) in stageList" :key="index" class="stage-box">
         <div class="title">
           <div class="title-text">第{{ item.chinaNumIndex }}阶段</div>
@@ -32,23 +31,39 @@
         <a-row>
           <a-col>
             <div class="stage">
-              <div class="stage-title stage-remark-title">备注：</div>
+              <div class="stage-title">备注：</div>
               <div class="stage-content">{{ item.remark }}</div>
             </div>
           </a-col>
         </a-row>
       </div>
     </a-spin>
-    <arrive-module ref="arriveModal" v-bind="$attrs" @ok="loadData"></arrive-module>
+
+    <a-empty v-else></a-empty>
+
+    <template slot="footer">
+      <a-button type="primary" @click="handleAdd">添加阶段</a-button>
+    </template>
+
+    <arrive-module ref="arriveModal" :project-id="projectId" @ok="addArriveOk"></arrive-module>
   </j-modal>
 </template>
 
 <script>
 import ArriveModule from './ArriveModule'
+import { amountReceivedList } from '../../../../api/incomePaymentsApi'
 
 export default {
   name: 'ArriveStageModule',
   components: { ArriveModule },
+  props: {
+    // 项目id
+    projectId: {
+      type: String,
+      required: false,
+      default: null
+    }
+  },
   data() {
     return {
       title: '来款阶段',
@@ -57,46 +72,45 @@ export default {
       confirmLoading: false,
       form: this.$form.createForm(this),
       // 阶段列表，用于循环展示阶段信息
-      stageList: [
+      stageList: []
-        {
-          amountReceived: 1000,
-          paymentDate: '2020-09-09',
-          remark: '这是备注!这是备注!这是备注!这是备注!这是备注!这是备注!这是备注!'
-        }, {
-          amountReceived: 2000,
-          paymentDate: '2020-09-08',
-          remark: '这是备注!这是备注!这是备注!这是备注!这是备注!这是备注!这是备注!'
-        }
-      ]
     }
   },
-  created() {
-    this.loadData()
-  },
   methods: {
     handleAdd() {
-      this.$refs.arriveModal.title='添加阶段'
+      this.$refs.arriveModal.title = '添加阶段'
       this.$refs.arriveModal.add()
     },
     handleEdit(record) {
-      this.$refs.arriveModal.title='编辑阶段'
+      this.$refs.arriveModal.title = '编辑阶段'
       this.$refs.arriveModal.edit(record)
     },
     handleCancel() {
       this.close()
     },
     open() {
+      this.loadData()
       this.visible = true
     },
     close() {
       this.visible = false
     },
     loadData() {
-      // 匹配每一项的汉字序号
+      this.confirmLoading = true
-      this.stageList.forEach((item, index) => {
+      amountReceivedList(this.projectId).then(res => {
-        item.chinaNumIndex = this.convertToChinaNum(index + 1)
+        this.stageList = res.result
+        // 匹配每一项的汉字序号
+        if (this.stageList.length > 0) {
+          this.stageList.forEach((item, index) => {
+            item.chinaNumIndex = this.convertToChinaNum(index + 1)
+          })
+        }
+      }).finally(() => {
+        this.confirmLoading = false
       })
     },
+    addArriveOk() {
+      this.loadData()
+    },
     //将数字（整数）转为汉字
     convertToChinaNum(num) {
       let arr1 = new Array('零', '一', '二', '三', '四', '五', '六', '七', '八', '九')
@@ -172,7 +186,6 @@ export default {
   padding-bottom: 10px;
 
   &-title {
-    width: 20%;
     flex-shrink: 0;
     text-align: right;
     font-size: 14px;
@@ -180,10 +193,6 @@ export default {
     color: #4D4D4D;
   }
 
-  &-remark-title {
-    width: 10%;
-  }
-
   &-content {
     padding-right: 20px;
     word-break: break-all;

src/views/financialManagement/arriveAndInvoicing/modules/InvoicingModule.vue

@@ -13,27 +13,27 @@
       <a-form :form="form">
         <a-form-item label="开票金额" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-input placeholder="请输入开票金额"
-                   v-decorator="['invoicingAmount',validatorRules.invoicingAmount]"
+                   v-decorator="['invoiceAmount',validatorRules.invoiceAmount]"
                    :maxLength='50'
                    @change="e => e.target.value = (e.target.value.replace(/[^0-9.]/g, '')).trim()"></a-input>
         </a-form-item>
         <a-form-item label="开票号" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-input placeholder="请输入开票号"
-                   v-decorator="['invoicingNum',validatorRules.invoicingNum]"
+                   v-decorator="['billNo',validatorRules.billNo]"
                    :maxLength='50'
                    @change="e => {e.target.value = (e.target.value + '').trim()}"></a-input>
         </a-form-item>
         <a-form-item label="开票日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <j-date placeholder="请选择开票日期"
                   style="width: 100%;"
-                  v-decorator="['invoicingDate',validatorRules.invoicingDate]"
+                  v-decorator="['billDate',validatorRules.billDate]"
                   :trigger-change="true"
                   date-format="YYYY-MM-DD"/>
         </a-form-item>
         <a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol">
           <a-textarea
             placeholder="请输入备注"
-            v-decorator="['remarks']"
+            v-decorator="['remark']"
             :auto-size="{ minRows: 3, maxRows: 6 }"
             :maxLength='200'
             @change="e => {e.target.value = (e.target.value + '').trim()}"/>
@@ -47,10 +47,37 @@
 import JDate from '../../../../components/tools/JDate'
 import pick from 'lodash.pick'
 import { money } from '../../../../utils/validate'
+import { addPayBill, addPaymentPhase, editAmountPhase, editPayBill } from '../../../../api/incomePaymentsApi'
 
 export default {
   name: 'InvoicingModule',
   components: { JDate },
+  props: {
+    // 项目id
+    projectId: {
+      type: String,
+      required: false,
+      default: null
+    },
+    // 项目类型
+    projectType: {
+      type: [Number, String],
+      required: false,
+      default: null
+    },
+    // 项目名称
+    projectName: {
+      type: String,
+      required: false,
+      default: null
+    },
+    // 企业名称
+    chargeCompanyName: {
+      type: String,
+      required: false,
+      default: null
+    }
+  },
   data() {
     return {
       title: '来款信息',
@@ -68,15 +95,15 @@ export default {
         sm: { span: 18 }
       },
       validatorRules: {
-        invoicingAmount: {
+        invoiceAmount: {
           rules: [{ required: true, validator: this.checkMoney }],
           validateTrigger: 'blur'
         },
-        invoicingNum: {
+        billNo: {
           rules: [{ required: true, message: '请输入开票号' }],
           validateTrigger: 'blur'
         },
-        invoicingDate: {
+        billDate: {
           rules: [{ required: true, message: '请选择开票日期' }],
           validateTrigger: 'change'
         }
@@ -88,14 +115,38 @@ export default {
       this.edit({})
     },
     edit(record) {
+      this.form.resetFields()
       this.model = Object.assign({}, record)
       this.visible = true
       this.$nextTick(() => {
-        this.form.setFieldsValue(pick(this.model, 'invoicingAmount', 'invoicingNum', 'invoicingDate', 'remarks'))
+        this.form.setFieldsValue(pick(this.model, 'invoiceAmount', 'billNo', 'billDate', 'remark'))
       })
     },
     handleOk() {
-
+      console.log(this.projectType, this.chargeCompanyName)
+      this.form.validateFields((err, values) => {
+        if (!err) {
+          // values.chargeCompanyName = this.chargeCompanyName
+          values.projectName = this.projectName
+          const formData = Object.assign(this.model, values)
+          console.log('表单提交数据', formData)
+          let okHttpMethod
+          if (this.model.id) {
+            okHttpMethod = editPayBill(formData)
+          } else {
+            okHttpMethod = addPayBill(this.projectId, this.projectType, formData)
+          }
+          okHttpMethod.then(res => {
+            if (res.success) {
+              this.$message.success(res.message)
+              this.$emit('ok')
+              this.close()
+            } else {
+              this.$message.warn(res.message)
+            }
+          })
+        }
+      })
     },
     handleCancel() {
       this.close()

src/views/financialManagement/arriveAndInvoicing/modules/InvoicingStageModule.vue

@@ -7,7 +7,6 @@
     switchFullscreen
     @ok="handleAdd"
     @cancel="handleCancel"
-    okText="添加阶段"
     cancelText="关闭">
     <a-spin :spinning="confirmLoading">
       <div v-for="(item, index) in stageList" :key="index" class="stage-box">
@@ -16,45 +15,71 @@
           <img src="../../../../assets/imgs/icon/icon_edit.png" @click="handleEdit(item)">
         </div>
         <a-row>
-          <a-col :span="8">
+          <a-col :span="6">
+            <div class="stage">
+              <div class="stage-title">项目名称：</div>
+              <div class="stage-content">{{ item.projectName }}</div>
+            </div>
+          </a-col>
+          <a-col :span="6">
             <div class="stage">
               <div class="stage-title">开票金额：</div>
-              <div class="stage-content stage-content-money">{{ item.invoicingAmount }}</div>
+              <div class="stage-content stage-content-money">{{ item.invoiceAmount }}</div>
             </div>
           </a-col>
-          <a-col :span="8">
+          <a-col :span="6">
             <div class="stage">
               <div class="stage-title">开票号：</div>
-              <div class="stage-content">{{ item.invoicingNum }}</div>
+              <div class="stage-content">{{ item.billNo }}</div>
             </div>
           </a-col>
-          <a-col :span="8">
+          <a-col :span="6">
             <div class="stage">
               <div class="stage-title">开票日期：</div>
-              <div class="stage-content">{{ item.invoicingDate }}</div>
+              <div class="stage-content">{{ item.billDate }}</div>
             </div>
           </a-col>
         </a-row>
         <a-row>
           <a-col>
             <div class="stage">
-              <div class="stage-title stage-remark-title">备注：</div>
+              <div class="stage-title">备注：</div>
-              <div class="stage-content">{{ item.remarks }}</div>
+              <div class="stage-content">{{ item.remark }}</div>
             </div>
           </a-col>
         </a-row>
       </div>
     </a-spin>
-    <invoicing-module ref="invoicingModal"></invoicing-module>
+
+<!--    <a-empty v-else></a-empty>-->
+
+    <template slot="footer">
+      <a-button type="primary" @click="handleAdd">添加阶段</a-button>
+    </template>
+
+    <invoicing-module
+      ref="invoicingModal"
+      :project-id="projectId"
+      v-bind="$attrs"
+      @ok="loadData"></invoicing-module>
   </j-modal>
 </template>
 
 <script>
 import InvoicingModule from './InvoicingModule'
+import { payBillList } from '../../../../api/incomePaymentsApi'
 
 export default {
   name: 'InvoicingStageModule',
   components: { InvoicingModule },
+  props: {
+    // 项目id
+    projectId: {
+      type: String,
+      required: false,
+      default: null
+    }
+  },
   data() {
     return {
       title: '开票阶段',
@@ -63,24 +88,9 @@ export default {
       confirmLoading: false,
       form: this.$form.createForm(this),
       // 阶段列表，用于循环展示阶段信息
-      stageList: [
+      stageList: []
-        {
-          invoicingAmount: 1000,
-          invoicingNum: '1234465',
-          invoicingDate: '2020-09-09',
-          remarks: '这是备注!这是备注!这是备注!这是备注!这是备注!这是备注!这是备注!'
-        }, {
-          invoicingAmount: 2000,
-          invoicingNum: '1234465',
-          invoicingDate: '2020-09-08',
-          remarks: '这是备注!这是备注!这是备注!这是备注!这是备注!这是备注!这是备注!'
-        }
-      ]
     }
   },
-  created() {
-    this.loadData()
-  },
   methods: {
     handleAdd() {
       this.$refs.invoicingModal.title = '添加阶段'
@@ -94,15 +104,23 @@ export default {
       this.close()
     },
     open() {
+      this.loadData()
       this.visible = true
     },
     close() {
       this.visible = false
     },
     loadData() {
-      // 匹配每一项的汉字序号
+      this.confirmLoading = true
-      this.stageList.forEach((item, index) => {
+      payBillList(this.projectId).then(res => {
-        item.chinaNumIndex = this.convertToChinaNum(index + 1)
+        this.stageList = res.result
+        // 匹配每一项的汉字序号
+        this.stageList.forEach((item, index) => {
+          item.chinaNumIndex = this.convertToChinaNum(index + 1)
+        })
+      }).finally(() => {
+        this.$forceUpdate()
+        this.confirmLoading = false
       })
     },
     //将数字（整数）转为汉字
@@ -180,7 +198,6 @@ export default {
   padding-bottom: 10px;
 
   &-title {
-    width: 30%;
     flex-shrink: 0;
     text-align: right;
     font-size: 14px;
@@ -188,10 +205,6 @@ export default {
     color: #4D4D4D;
   }
 
-  &-remark-title {
-    width: 10%;
-  }
-
   &-content {
     padding-right: 20px;
     word-break: break-all;