From 23d80c1b64f23ede237ab8e89ebc2ee2aaf43f26 Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期三, 19 七月 2023 19:32:10 +0800
Subject: [PATCH] 销售模块接口联调

---
 src/components/makepager/TableCommonView.vue |   48 +++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/src/components/makepager/TableCommonView.vue b/src/components/makepager/TableCommonView.vue
index c799a17..8946328 100644
--- a/src/components/makepager/TableCommonView.vue
+++ b/src/components/makepager/TableCommonView.vue
@@ -13,7 +13,8 @@
       @selection-change="handleSelectionChange"
       :header-cell-style="{ background: '#ECF4FF', color: '#666' }"
     >
-      <el-table-column type="selection" width="40"> </el-table-column>
+      <el-table-column v-if="selectBox" type="selection" width="40"> </el-table-column>
+
       <el-table-column
         v-for="(item, i) in tableList.tableColumn"
         :key="i"
@@ -22,12 +23,13 @@
         :width="item.width"
         :min-width="item.min"
         show-overflow-tooltip
-        sortable
+        :sortable="item.sortable"
       >
         <template slot-scope="scope">
           <span v-if="item.price">{{ "锟�" + number_format(scope.row[item.prop], 2, ".", ",") }}</span>
-          <span v-else-if="item.status" :class="scope.row.status">{{ scope.row[item.prop] }}</span>
-          <span v-else>{{ scope.row[item.prop] }}</span>
+          <div v-else-if="item.status" :class="scope.row.status">{{ scope.row[item.prop] }}</div>
+          <span v-else-if="item.isTime">{{ dateFormat("YYYY-mm-dd HH:MM:SS", scope.row[item.prop]) }}</span>
+          <span v-else>{{ scope.row[item.prop] ? scope.row[item.prop] : "--" }}</span>
         </template>
       </el-table-column>
       <slot name="tableButton" />
@@ -42,10 +44,16 @@
 export default {
   name: "TableCommonView",
   props: {
+    selectBox: {
+      type: Boolean,
+      default: true
+    },
+
     tableList: {
       type: Object,
       default: () => {
         return {
+          selectBox: true,
           tableInfomation: [], // 鎺ュ彛杩斿洖鏁版嵁
           tableColumn: [
             // table琛ㄥ崟
@@ -104,19 +112,19 @@
             sums[index] = "鏈〉鎬昏"
           }
           const values = data.map((item) => Number(item[column.property]))
-          // if (column.property === this.showSummary.sumProp) {
           if (this.showSummary.sumProp.includes(column.property)) {
             sums[index + 1] = values.reduce((prev, curr) => {
               const value = Number(curr)
               if (!isNaN(value)) {
-                return this.number_format(prev + curr, 2, ".", ",")
+                return prev + curr
               } else {
-                return this.number_format(prev, 2, ".", ",")
+                return prev
               }
             }, 0)
             sums[index + 1]
           }
         })
+        // console.log(sums)
         return sums
       }
     },
@@ -147,6 +155,27 @@
         s[1] = s[1].substring(0, prec) //灏忔暟鐐逛綅鏁拌秴鍑洪暱搴︽椂鎴彇鍓嶉潰鐨勪綅鏁�
       }
       return s.join(dec)
+    },
+    // 鏃堕棿鏄剧ず
+    dateFormat(fmt, date) {
+      let ret = ""
+      date = new Date(date)
+      const opt = {
+        "Y+": date.getFullYear().toString(), // 骞�
+        "m+": (date.getMonth() + 1).toString(), // 鏈�
+        "d+": date.getDate().toString(), // 鏃�
+        "H+": date.getHours().toString(), // 鏃�
+        "M+": date.getMinutes().toString(), // 鍒�
+        "S+": date.getSeconds().toString() // 绉�
+        // 鏈夊叾浠栨牸寮忓寲瀛楃闇�姹傚彲浠ョ户缁坊鍔狅紝蹇呴』杞寲鎴愬瓧绗︿覆
+      }
+      for (let k in opt) {
+        ret = new RegExp("(" + k + ")").exec(fmt)
+        if (ret) {
+          fmt = fmt.replace(ret[1], ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, "0"))
+        }
+      }
+      return fmt
     }
   }
 }
@@ -159,9 +188,10 @@
   margin-right: 10px;
   margin-bottom: 40px;
   .blue {
-    padding: 10px;
+    width: 70px;
+    text-align: center;
     color: #fff;
-    background-color: blue;
+    background-color: $color-primary;
     border-radius: 4px;
   }
 }

--
Gitblit v1.8.0