|
@@ -161,7 +161,7 @@ watch(serviceType,(newVal)=>{
|
|
|
|
|
|
watch(serviceTypePre,(newVal)=>{
|
|
|
if(newVal==1 || newVal==2){
|
|
|
- if(item.service_product_id!=newVal){
|
|
|
+ if(preDialog.preForm.service_product_id!=newVal){
|
|
|
productIdChange(preDialog.preForm)
|
|
|
}
|
|
|
preDialog.preForm.service_product_id=newVal
|
|
@@ -297,25 +297,25 @@ const dialogClosed=()=>{
|
|
|
|
|
|
// 提交
|
|
|
const submitForm=()=>{
|
|
|
- const serviceData=serivcesDataHandler(selectServicesRef.value)
|
|
|
- let params={
|
|
|
- contract_register_id:dialog.registrationPreForm.contract_register_id||0,
|
|
|
- pre_register_id:dialog.registrationPreForm.pre_register_id||0,
|
|
|
- company_name:dialog.registrationPreForm.company_name,
|
|
|
- register_type:dialog.registrationType=='开票'?3:4,
|
|
|
- start_date:dialog.registrationPreForm.start_date,
|
|
|
- end_date:dialog.registrationPreForm.end_date,
|
|
|
- list:dialog.registrationPreForm.IorPInfo,
|
|
|
- services:serviceData,
|
|
|
- }
|
|
|
- // 化''为0
|
|
|
- params.list.forEach(item =>{
|
|
|
- item.amount = parseFloat(item.amount)
|
|
|
- item.seller_id=item.seller_id||0
|
|
|
- item.service_product_id=item.service_product_id||0
|
|
|
- })
|
|
|
registrationPreForm.value.validate((valid)=>{
|
|
|
if(valid){
|
|
|
+ const serviceData=serivcesDataHandler(selectServicesRef.value)
|
|
|
+ let params={
|
|
|
+ contract_register_id:dialog.registrationPreForm.contract_register_id||0,
|
|
|
+ pre_register_id:dialog.registrationPreForm.pre_register_id||0,
|
|
|
+ company_name:dialog.registrationPreForm.company_name,
|
|
|
+ register_type:dialog.registrationType=='开票'?3:4,
|
|
|
+ start_date:dialog.registrationPreForm.start_date,
|
|
|
+ end_date:dialog.registrationPreForm.end_date,
|
|
|
+ list:dialog.registrationPreForm.IorPInfo,
|
|
|
+ services:serviceData,
|
|
|
+ }
|
|
|
+ // 化''为0
|
|
|
+ params.list.forEach(item =>{
|
|
|
+ item.amount = parseFloat(item.amount)
|
|
|
+ item.seller_id=item.seller_id||0
|
|
|
+ item.service_product_id=item.service_product_id||0
|
|
|
+ })
|
|
|
let prePlacementProp=preRegistrationAdd
|
|
|
if(params.contract_register_id){
|
|
|
// 编辑
|
|
@@ -494,7 +494,7 @@ const getCurrencyListFun=()=>{
|
|
|
// 以防currenvy_unitw为空
|
|
|
const currencyValidator=(item,callback)=>{
|
|
|
if(!parseFloat(item.amount)){
|
|
|
- callback(new Error('金额单位无效'))
|
|
|
+ callback(new Error('金额无效'))
|
|
|
}
|
|
|
if(!item.currency_unit){
|
|
|
callback(new Error('货币单位不能为空'))
|