新增达沃特政策类型

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -921,6 +921,7 @@ export default {
           const newTime = new Date().toLocaleString('chinese',{hour12:false})
           policyColumn({newTime: newTime,parentId: parentId,corps: this.form.corpId}).then(res => {
             resolve(res.data.data.map(item => {
+              console.log(item)
               return {
                 ...item,
                 leaf: !item.hasChildren

src/views/maintenance/salesPolicy/configuration/mainList.json

@@ -34,12 +34,30 @@
       "index": 2,
       "width": 100,
       "overHidden": true
+    },{
+      "label": "政策类型",
+      "prop": "type",
+      "search": true,
+      "index": 3,
+      "width": 100,
+      "type": "select",
+      "dicData": [
+        {
+          "label": "正常",
+          "value": 0
+        },
+        {
+          "label": "特价",
+          "value": 1
+        }
+      ],
+      "overHidden": true
     },
     {
       "label": "品牌",
       "prop": "brand",
       "search": true,
-      "index": 3,
+      "index": 4,
       "width": 100,
       "overHidden": true
     },
@@ -58,7 +76,7 @@
         }
       ],
       "search": true,
-      "index": 4,
+      "index": 5,
       "width": 100,
       "overHidden": true
     },
@@ -69,7 +87,7 @@
       "unlinkPanels": true,
       "searchRange": true,
       "search": true,
-      "index": 5,
+      "index": 6,
       "width": 100,
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd",
@@ -83,7 +101,7 @@
       "unlinkPanels": true,
       "searchRange": true,
       "search": true,
-      "index": 6,
+      "index": 7,
       "width": 100,
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd",
@@ -97,7 +115,7 @@
       "unlinkPanels": true,
       "searchRange": true,
       "search": false,
-      "index": 7,
+      "index": 8,
       "width": 100,
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd",
@@ -108,7 +126,7 @@
       "label": "备注",
       "prop": "remarks",
       "search": false,
-      "index": 8,
+      "index": 9,
       "width": 100,
       "overHidden": true
     }

src/views/maintenance/salesPolicy/detailsPageEdit.vue

@@ -69,8 +69,8 @@
                 <crop-select
                   v-else-if="item.prop === 'corps'"
                   v-model="form[item.prop]"
-                  :multiple="true"
                   :collapseTags="true"
+                  :multiple="true"
                   corpType="KH"
                   style="width: 100%"
                   @getCorpList="getCorpList"
@@ -449,6 +449,29 @@ export default {
                 trigger: "blur"
               }
             ]
+          },{
+            //多选
+            label: "政策类型",
+            prop: "type",
+            span: 8,
+            type: "select",
+            dicData: [
+              {
+                label: "正常",
+                value: '正常'
+              },
+              {
+                label: "特价",
+                value: '特价'
+              }
+            ],
+            rules: [
+              {
+                required: true,
+                message: " ",
+                trigger: "blur"
+              }
+            ]
           },
           {
             label: "备注",
@@ -518,7 +541,9 @@ export default {
     if (this.detailData.id) {
       this.queryData(this.detailData.id);
     } else {
-      this.form = {};
+      this.form = {
+        type:0
+      };
       this.contactsData = [];
     }
   },

src/views/wel/home/landTransportation/components/sales-trend.vue

@@ -62,11 +62,12 @@
     <el-dialog
         title="车辆轨迹"
         append-to-body
+        custom-class="dialog_two"
         :visible.sync="dialogVisible"
-        fullscreen
+        lock-scroll
         width="80%">
       <div id="container"></div>
-      <div class="input-card" v-if="this.lineArr.length>0">
+      <div class="input-card" style="right: 10.3%" v-if="this.lineArr.length>0">
         <h4>轨迹回放控制</h4>
         <div class="input-item">
           <input type="button" class="btn" value="开始动画" id="start" @click="startAnimation()"/>
@@ -77,7 +78,7 @@
           <input type="button" class="btn" value="停止动画" id="stop" @click="stopAnimation()"/>
         </div>
       </div>
-      <div class="input-card" v-else>
+      <div class="input-card" style="right: 10.3%;bottom: 10.3%" v-else>
         <span style="color: red">暂无该车辆轨迹信息</span>
       </div>
     </el-dialog>
@@ -185,13 +186,6 @@ export default {
       this.loading = true;
       active().then(res => {
         this.tableData = res.data.data
-        this.tableData = this.tableData.concat(res.data.data)
-        this.tableData = this.tableData.concat(res.data.data)
-        this.tableData = this.tableData.concat(res.data.data)
-        this.tableData = this.tableData.concat(res.data.data)
-        this.tableData = this.tableData.concat(res.data.data)
-        this.tableData = this.tableData.concat(res.data.data)
-        this.tableData = this.tableData.concat(res.data.data)
         this.loading = false;
       })
     },
@@ -205,7 +199,7 @@ export default {
 <style scoped Lang="less">
 @import url('https://a.amap.com/jsapi_demos/static/demo-center/css/demo-center.css');
 #container {
-  height: 93vh;
+  height: 80vh;
   width: 100%;
 }
 
@@ -245,7 +239,8 @@ export default {
 }
 
 ::v-deep .el-dialog {
-  margin-top: 0vh !important;
+  margin-top: 5vh !important;
+  margin-bottom: 0 !important;
 }
 
 ::v-deep .el-dialog__body {