zjxpcyc 6 lat temu
rodzic
commit
404e92dce4
1 zmienionych plików z 0 dodań i 20 usunięć
  1. 0
    20
      src/pages/system/library/borrow/borrow.vue

+ 0
- 20
src/pages/system/library/borrow/borrow.vue Wyświetl plik

@@ -13,7 +13,6 @@
13 13
     <div v-else>
14 14
 
15 15
       <!-- 用户信息区 -->
16
-<<<<<<< HEAD
17 16
       <div :style="{ marginBottom: '20px', paddingBottom: '20px', borderBottom: '1px solid #eee' }">
18 17
         <el-row :gutter="20">
19 18
           <el-col :span="4">
@@ -33,25 +32,6 @@
33 32
           </el-col>
34 33
         </el-row>
35 34
       </div>
36
-=======
37
-      <el-form label-width="100px" inline>
38
-        <el-form-item label="姓名">
39
-          <span>{{ borrowHistory.CustomerName }}</span>
40
-        </el-form-item>
41
-        <el-form-item label="手机号">
42
-          <span>{{ borrowHistory.CustomerPhone }}</span>
43
-        </el-form-item>
44
-        <el-form-item label="在借数量">
45
-          <span>{{ borrowHistory.CustomerPhone }}</span>
46
-        </el-form-item>
47
-        <el-form-item label="逾期数量">
48
-          <span>{{ borrowHistory.CustomerPhone }}</span>
49
-        </el-form-item>
50
-        <el-form-item label="历史是否有逾期">
51
-          <span>{{ borrowHistory.CustomerPhone === 1 ? '是' : '否' }}</span>
52
-        </el-form-item>
53
-      </el-form>
54
->>>>>>> 2f5bd0fb8b8c339e52c3b1bb4a54c9b1ec57ac07
55 35
 
56 36
       <!-- 过滤条件 -->
57 37
       <el-form inline>