退押详情增记录列表

src/views/deposit_commerce/components/refund_list-detail.vue

@@ -318,6 +318,29 @@
         </el-col>
       </el-row>
     </div>
+
+    <h3>记录</h3>
+    <el-divider></el-divider>
+    <!-- 列表 -->
+    <div class="mymain-container">
+      <div class="table">
+        <el-table v-loading="listLoading" :data="detailList.checkRecordItems" element-loading-text="Loading" border fit highlight-current-row stripe>
+          <el-table-column align="left" label="申请人" prop="submitBy" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="申请日期" prop="submitTime" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="申请说明" prop="applyNote" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="验收人" prop="checkBy" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="验收日期" prop="checkDate" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="是否退押" prop="checkBy" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="验收说明" prop="checkNote" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="审批结果" prop="isRefundDeposit" min-width="160" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.isRefundDeposit == false?'否':'是'}}
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+
     <h3 v-if="
         detailList.examineStatus == 'WAIT' ||
         detailList.examineStatus == 'FAIL' ||

src/views/deposit_commerce/refund_list.vue

@@ -36,6 +36,56 @@
                 <el-input v-model="searchForm.refProjectName" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="审核人" prop="refProjectName">
+                <el-input v-model="searchForm.refProjectName" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="12">
+              <el-form-item label="机型" prop="refProjectName">
+                <div class="fanwei">
+                  <el-input type="number"></el-input>
+                  <span>-</span>
+                  <el-input type="number"></el-input>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="12">
+              <!-- <el-form-item label="特价编号" prop="refProjectName">
+                <el-input v-model="searchForm.refProjectName" placeholder="请输入"></el-input>
+              </el-form-item> -->
+              <el-form-item label="特价编号" prop="">
+                <div class="fanwei">
+                  <el-input type="number"></el-input>
+                  <span>-</span>
+                  <el-input type="number"></el-input>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="12">
+              <el-form-item label="厂编号" prop="refProjectName">
+                <div class="fanwei">
+                  <el-input type="number"></el-input>
+                  <span>-</span>
+                  <el-input type="number"></el-input>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="12">
+              <el-form-item label="安装日期" prop="refProjectName">
+                <div class="fanwei">
+                  <el-input type="number"></el-input>
+                  <span>-</span>
+                  <el-input type="number"></el-input>
+                </div>
+              </el-form-item>
+            </el-col>
+
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="区域" prop="refProjectName">
+                <el-input v-model="searchForm.refProjectName" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
             <!-- <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="发货申请开始日期" prop="startDeliverTime">
                 <el-date-picker
@@ -73,7 +123,7 @@
               </el-form-item>
             </el-col> -->
 
-            <el-col :xs="24" :sm="12" :lg="6">
+            <el-col :xs="24" :sm="12" :lg="18">
               <el-form-item label="" class="fr">
                 <el-button size="mini" @click="resetFn">清空</el-button>
                 <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>
@@ -173,9 +223,22 @@
                 <span>{{scope.row.customerName}}</span>
               </template>
             </el-table-column> -->
-            <el-table-column align="right" label="押金金额" prop="depositAmount" min-width="160" show-overflow-tooltip>
+            <el-table-column align="right" label="特价编号" prop="" min-width="160" show-overflow-tooltip>
+            </el-table-column>
+            <el-table-column align="right" label="厂编号" prop="refFactoryNo" min-width="160" show-overflow-tooltip>
+            </el-table-column>
+            <el-table-column align="right" label="安装日期" prop="installDate" min-width="160" show-overflow-tooltip>
+            </el-table-column>
+            <el-table-column align="left" label="审核人" prop="confirmBy" min-width="160" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.confirmBy" />
+                <span>{{scope.row.confirmBy}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="区域" prop="refRegionWork" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{ scope.row.depositAmount | numToFixed }}
+                <CopyButton :copyText="scope.row.refRegionWork" />
+                <span>{{scope.row.refRegionWork}}</span>
               </template>
             </el-table-column>
             <el-table-column fixed="right" align="center" label="操作" min-width="160" show-overflow-tooltip>
@@ -459,4 +522,10 @@ export default {
   margin-left: 10px;
   display: inline-block;
 }
+.fanwei {
+  display: flex;
+  span {
+    margin: 0 20px;
+  }
+}
 </style>

src/views/deposit_home/components/refund_list-detail.vue

@@ -318,6 +318,29 @@
         </el-col>
       </el-row>
     </div>
+
+    <h3>记录</h3>
+    <el-divider></el-divider>
+    <!-- 列表 -->
+    <div class="mymain-container">
+      <div class="table">
+        <el-table v-loading="listLoading" :data="detailList.checkRecordItems" element-loading-text="Loading" border fit highlight-current-row stripe>
+          <el-table-column align="left" label="申请人" prop="submitBy" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="申请日期" prop="submitTime" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="申请说明" prop="applyNote" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="验收人" prop="checkBy" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="验收日期" prop="checkDate" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="是否退押" prop="checkBy" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="验收说明" prop="checkNote" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="审批结果" prop="isRefundDeposit" min-width="160" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{scope.row.isRefundDeposit == false?'否':'是'}}
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+
     <h3 v-if="
         detailList.examineStatus == 'WAIT' ||
         detailList.examineStatus == 'FAIL' ||

src/views/deposit_home/refund_list.vue

@@ -36,6 +36,56 @@
                 <el-input v-model="searchForm.refProjectName" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="审核人" prop="refProjectName">
+                <el-input v-model="searchForm.refProjectName" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="12">
+              <el-form-item label="机型" prop="refProjectName">
+                <div class="fanwei">
+                  <el-input type="number"></el-input>
+                  <span>-</span>
+                  <el-input type="number"></el-input>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="12">
+              <!-- <el-form-item label="特价编号" prop="refProjectName">
+                <el-input v-model="searchForm.refProjectName" placeholder="请输入"></el-input>
+              </el-form-item> -->
+              <el-form-item label="特价编号" prop="">
+                <div class="fanwei">
+                  <el-input type="number"></el-input>
+                  <span>-</span>
+                  <el-input type="number"></el-input>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="12">
+              <el-form-item label="厂编号" prop="refProjectName">
+                <div class="fanwei">
+                  <el-input type="number"></el-input>
+                  <span>-</span>
+                  <el-input type="number"></el-input>
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="12">
+              <el-form-item label="安装日期" prop="refProjectName">
+                <div class="fanwei">
+                  <el-input type="number"></el-input>
+                  <span>-</span>
+                  <el-input type="number"></el-input>
+                </div>
+              </el-form-item>
+            </el-col>
+
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="区域" prop="refProjectName">
+                <el-input v-model="searchForm.refProjectName" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
             <!-- <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="发货申请开始日期" prop="startDeliverTime">
                 <el-date-picker
@@ -73,7 +123,7 @@
               </el-form-item>
             </el-col> -->
 
-            <el-col :xs="24" :sm="12" :lg="6">
+            <el-col :xs="24" :sm="12" :lg="18">
               <el-form-item label="" class="fr">
                 <el-button size="mini" @click="resetFn">清空</el-button>
                 <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>
@@ -178,6 +228,24 @@
                 {{ scope.row.depositAmount | numToFixed }}
               </template>
             </el-table-column>
+            <el-table-column align="right" label="特价编号" prop="" min-width="160" show-overflow-tooltip>
+            </el-table-column>
+            <el-table-column align="right" label="厂编号" prop="refFactoryNo" min-width="160" show-overflow-tooltip>
+            </el-table-column>
+            <el-table-column align="right" label="安装日期" prop="installDate" min-width="160" show-overflow-tooltip>
+            </el-table-column>
+            <el-table-column align="left" label="审核人" prop="confirmBy" min-width="160" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.confirmBy" />
+                <span>{{scope.row.confirmBy}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="区域" prop="refRegionWork" min-width="160" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.refRegionWork" />
+                <span>{{scope.row.refRegionWork}}</span>
+              </template>
+            </el-table-column>
             <el-table-column fixed="right" align="center" label="操作" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 <el-button type="text" class="textColor" v-if="
@@ -459,4 +527,10 @@ export default {
   margin-left: 10px;
   display: inline-block;
 }
+.fanwei {
+  display: flex;
+  span {
+    margin: 0 20px;
+  }
+}
 </style>