@dongkboy пре 2 месеци
родитељ
комит
75e483113b

+ 8 - 5
src/views/receivable/documentary/documentaryRecord.vue

@@ -519,12 +519,15 @@ const getSummaries = (param) => {
   return sums
 }
 onMounted(() => {
-  form.value.partnerCompanyId = route.query.partnerCompanyId || ''
-  if(route.query.invoiceType=='2'){
-    form.value.accountsReceivable = '10'
-  }else{
-    form.value.accountsReceivable = '20'
+  if (route.query.invoiceType) {
+    form.value.partnerCompanyId = route.query.partnerCompanyId || ''
+    if (route.query.invoiceType == '2') {
+      form.value.accountsReceivable = '10'
+    } else {
+      form.value.accountsReceivable = '20'
+    }
   }
+
   initList();
   initOption();
   initCompany();

+ 4 - 4
src/views/receivable/documentary/documentaryReport.vue

@@ -108,8 +108,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item prop="invoiceType" label="应收项">
-                <el-select v-model="recordForm1.invoiceType" clearable>
+              <el-form-item prop="invoiceRiskType" label="应收项">
+                <el-select v-model="recordForm1.invoiceRiskType" clearable>
                   <el-option v-for="item in optionObj['invoice_risk_type']" :key="item.value" :value="item.value"
                     :label="item.label"></el-option>
                 </el-select>
@@ -507,7 +507,7 @@ const initData1 = () => {
     settlementStartTime: recordForm.value.settlementTime?.[0],
     settlementEndTime: recordForm.value.settlementTime?.[1],
     status: recordForm.value.status,
-    invoiceType: recordForm.value.invoiceType,
+    invoiceType: recordForm.value.invoiceRiskType,
     invoiceTypes: ['2', '4'],
     agreementType: '2'
   }).then((res: any) => {
@@ -522,7 +522,7 @@ const initData2 = () => {
     settlementId: recordForm1.value.settlementId,
     partnerCompanyId: recordForm1.value.partnerCompanyId,
     invoiceParty: recordForm1.value.invoiceParty,
-    invoiceType: recordForm1.value.invoiceType,
+    invoiceRiskType: recordForm1.value.invoiceRiskType,
     status: recordForm1.value.status,
     settlementPerson: recordForm1.value.settlementPerson,
     invoiceId: recordForm1.value.invoiceId,