ly 1 жил өмнө
parent
commit
2c5214e94e

+ 2 - 2
src/views/business/financial/collection/index.vue

@@ -188,12 +188,12 @@
       </el-table-column>
       </el-table-column>
       <el-table-column
       <el-table-column
         v-if="getShowStatus(14)"
         v-if="getShowStatus(14)"
-        label="确认到账时间"
+        label="到账日期"
         prop="actuallyDate"
         prop="actuallyDate"
         align="center"
         align="center"
       >
       >
         <template #default="scope">
         <template #default="scope">
-          {{ moment(scope.row.actuallyDate).format("YYYY-MM-DD") }}
+          {{ (scope.row.arriveDate) }}  {{scope.row.arriveTime}}
         </template>
         </template>
       </el-table-column>
       </el-table-column>
       <el-table-column
       <el-table-column

+ 20 - 4
src/views/business/financial/payment/form.vue

@@ -107,7 +107,7 @@
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
             <el-col :span="6">
             <el-col :span="6">
-              <el-form-item label="支出日期:" prop="formDate" required>
+              <el-form-item label="申请日期" prop="formDate" required>
                 <el-date-picker
                 <el-date-picker
                   v-if="editStatus"
                   v-if="editStatus"
                   style="width: 100%"
                   style="width: 100%"
@@ -118,7 +118,7 @@
                   value-format="YYYY-MM-DD"
                   value-format="YYYY-MM-DD"
                   align="center"
                   align="center"
                   type="date"
                   type="date"
-                  placeholder="支出日期"
+                  placeholder="申请日期"
                 />
                 />
                 <span v-else>{{ form.formDate }}</span>
                 <span v-else>{{ form.formDate }}</span>
               </el-form-item>
               </el-form-item>
@@ -197,7 +197,21 @@
                 >
                 >
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
-
+            <el-col :span="6">
+              <el-form-item label="收款账户开户银行:" label-width="120px">
+                <template v-if="editStatus">
+                  <el-input
+                    v-model.trim="form.bankNo"
+                    size="small"
+                    type="text"
+                    style="width: 100%"
+                    placeholder="收款账户开户银行"
+                    :clearable="true"
+                  />
+                </template>
+                <span v-else>{{ form.bankNo }}</span>
+              </el-form-item>
+            </el-col>
             <el-col :span="6">
             <el-col :span="6">
               <el-form-item label="客户名称:" prop="companyName" required>
               <el-form-item label="客户名称:" prop="companyName" required>
                 <el-autocomplete
                 <el-autocomplete
@@ -229,7 +243,7 @@
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
             <el-col :span="6">
             <el-col :span="6">
-              <el-form-item label="合同:" required>
+              <el-form-item label="合同编号:" required>
                 <el-input
                 <el-input
                   v-if="editStatus"
                   v-if="editStatus"
                   style="width: 100%"
                   style="width: 100%"
@@ -289,6 +303,8 @@
                 <span>{{ form.verifyComment }}</span>
                 <span>{{ form.verifyComment }}</span>
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
+                    
+        
             <el-col :span="12">
             <el-col :span="12">
               <el-form-item label="备注:">
               <el-form-item label="备注:">
                 <el-input
                 <el-input

+ 6 - 2
src/views/business/financial/payment/index.vue

@@ -45,6 +45,11 @@
           @keyup.enter="handleQuery"
           @keyup.enter="handleQuery"
         />
         />
       </el-form-item>
       </el-form-item>
+      <el-form-item prop="applierTime" label="审核时间:">
+        <el-date-picker v-model="queryParams.dateFilter" type="daterange" clearable format="YYYY - MM - DD "
+        value-format="YYYY-MM-DD" range-separator="至" start-placeholder="业务日期" end-placeholder="业务日期"
+        style="width: 100%;"></el-date-picker>
+      </el-form-item>
       <el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery"
         <el-button type="primary" icon="Search" @click="handleQuery"
           >搜索</el-button
           >搜索</el-button
@@ -87,7 +92,7 @@
       />
       />
       <el-table-column
       <el-table-column
         v-if="getShowStatus(4)"
         v-if="getShowStatus(4)"
-        label="支出日期"
+        label="申请日期"
         prop="formDate"
         prop="formDate"
         min-width="90"
         min-width="90"
         align="center"
         align="center"
@@ -129,7 +134,6 @@
         </template>
         </template>
       </el-table-column>
       </el-table-column>
       <el-table-column
       <el-table-column
-        v-if="getShowStatus(15)"
         label="审核日期"
         label="审核日期"
         prop="verifyDate"
         prop="verifyDate"
         width="150"
         width="150"