@dongkboy пре 3 недеља
родитељ
комит
0ad8b176c2

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

@@ -54,6 +54,11 @@
               format="YYYY-MM-DD HH:mm:ss" />
           </el-form-item>
         </el-col>
+          <el-col :span="8">
+              <el-form-item prop="signMonth" label="月份">
+                <el-date-picker v-model="form.signMonth" style="width: 100%;" type="month" format="YYYY-MM" value-format="YYYY-MM" />
+              </el-form-item>
+            </el-col>
         <el-col :span="8">
           <el-form-item label="保险分支公司">
             <el-cascader filterable clearable placeholder="请选择" v-model="form.partnerCompanyId" :options="companyList1"

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

@@ -50,11 +50,7 @@
                   value-format="YYYY-MM" />
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item prop="signMonth" label="月份">
-                <el-date-picker v-model="recordForm.signMonth" style="width: 100%;" type="month" format="YYYY-MM" value-format="YYYY-MM" />
-              </el-form-item>
-            </el-col>
+
             <el-col :span="24" style="height: 50px; display: flex; align-items: start; justify-content: flex-end">
               <el-button type="primary" @click="handleSearch(1)">查询</el-button>
               <el-button plain type="primary" @click="handleReset(1)">重置</el-button>
@@ -150,6 +146,11 @@
               <el-form-item prop="invoiceId" label="开票记录编号">
                 <el-input v-model="recordForm1.invoiceId"></el-input>
               </el-form-item>
+            </el-col>
+              <el-col :span="8">
+              <el-form-item prop="signMonth" label="月份">
+                <el-date-picker v-model="recordForm1.signMonth" style="width: 100%;" type="month" format="YYYY-MM" value-format="YYYY-MM" />
+              </el-form-item>
             </el-col>
             <el-col :span="8" style="display: flex; justify-content: flex-end">
               <el-button type="primary" @click="handleSearch(2)">查询</el-button>
@@ -630,7 +631,6 @@ const handleReset = (type) => {
   switch (type) {
     case 1:
       recordForm.value = {
-        signMonth: '',
         companyId: '',
         time: [],
         status: ''
@@ -658,7 +658,7 @@ const handleReset = (type) => {
 const handleSettlementDetail = (row) => {
   activeName.value = '2'
   recordForm1.value.partnerCompanyId = row.partnerCompanyId
-  recordForm1.value.signMonth = row.month
+  recordForm1.value.signMonth = row.signMonth
   if (row.invoiceType == '2') {
     recordForm1.value.invoiceRiskType = '10'
   } else {
@@ -673,7 +673,7 @@ const handleInvoiceRecord = (row) => {
     query: {
       partnerCompanyId: row.partnerCompanyId,
       invoiceType: row.invoiceType,
-      signMonth: row.month,
+      signMonth: row.signMonth,
     }
   })
 }