Browse Source

修改销售

luobang 2 years ago
parent
commit
5392a8b00c

+ 14 - 0
src/views/appoint/components/saleContract/saleOrderSteel.vue

@@ -533,6 +533,7 @@ export default {
         let rows = XLSX.utils.sheet_to_json(
           workbook.Sheets[workbook.SheetNames[0]]
         ) //只取第一页
+        let uuid = Math.floor(Math.random() * 60 * 24)
         Array.from(rows).forEach((e, index) => {
           let map = {}
           try {
@@ -679,6 +680,19 @@ export default {
             if (typeof map.isSelfMention === 'undefined') {
               map.isSelfMention = '否'
             }
+            if (typeof map.truckNo === 'undefined') {
+              map.truckNo = Number(
+                `${Math.floor(
+                  Math.random() *
+                    Math.random() *
+                    Math.random() *
+                    Math.random() *
+                    Math.random() *
+                    new Date().getTime() *
+                    10000000
+                )}${uuid}`
+              )
+            }
             if (map.saleRemark && map.receiveName && map.materialName) {
               that.tableData.push(map)
             }

+ 9 - 1
src/views/statisticalReport/components/salesLogisticsStatistics/saleSteelReports.vue

@@ -154,6 +154,7 @@
           label="车牌号"
           align="center"
           width="90px"
+          sortable
           show-overflow-tooltip
         >
         </el-table-column>
@@ -244,6 +245,14 @@
           show-overflow-tooltip
         >
         </el-table-column>
+        <el-table-column
+          prop="smsResultId"
+          label="短信发送"
+          width="100px"
+          align="center"
+          show-overflow-tooltip
+        >
+        </el-table-column>
         <el-table-column
           prop="arrivalAddress"
           label="抵达地址"
@@ -812,7 +821,6 @@ export default {
         '业务员',
         '送货单打印',
         '收货客户电话',
-        '金蝶分录ID',
         '是否自提',
         '订单日期'
       ],