Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2

fe/PC/public/config.js

@@ -1,12 +1,12 @@
 // dev
-window.SITE_CONFIG['base'] = 'http://dev.ccwin-in.com:59099'
-window.SITE_CONFIG['user'] = 'http://dev.ccwin-in.com:59093'
+window.SITE_CONFIG['base'] = 'http://dev.ccwin-in.com:21093'
+window.SITE_CONFIG['user'] = 'http://dev.ccwin-in.com:21293'
 window.SITE_CONFIG['print'] = 'print'
-window.SITE_CONFIG['largeScreen'] = 'http://dev.ccwin-in.com:59082'
+window.SITE_CONFIG['largeScreen'] = 'http://dev.ccwin-in.com:21093'
 window.SITE_CONFIG['warehouseCode'] = 'T8'
 window.SITE_CONFIG['company'] = 'DongYang'
 window.SITE_CONFIG['client_secret'] = '1q2w3e*'
-window.SITE_CONFIG['reportsUrl'] = 'http://10.164.0.227:59091/#/reports/'
+window.SITE_CONFIG['reportsUrl'] = 'http://10.164.0.227:21093/#/reports/'
 
 // localhost
 // window.SITE_CONFIG['base'] = 'http://dev.ccwin-in.com:59099'

fe/PC/src/components/rowDrop/index.vue

@@ -42,11 +42,11 @@
     </div>
   </el-popover>
  
-  </template>
-  <script>
-  import draggable from "vuedraggable";
-  import Sortable from "sortablejs";
-  export default {
+</template>
+<script>
+import draggable from "vuedraggable";
+import Sortable from "sortablejs";
+export default {
   components: {
     draggable,
     Sortable,
@@ -102,6 +102,25 @@
     close() {
         this.$emit('closeRowDrop')
     },
+    // save () {
+    //     this.$emit('closeRowDrop')
+    //     this.$emit('radio',this.dataList)
+    //     // 本地缓存 当前用户名 + 路由名称
+    //     localStorage.setItem(this.$store.getters.name.userName + '_' + this.$route.name, JSON.stringify(this.dataList))
+    // },
+      // 格式化表头数据
+      formatData (val) {
+        this.dataList = JSON.parse(JSON.stringify(val))
+        this.dataList.forEach(item => {
+            if (item.isture == undefined) {
+                item.isture = true
+            }
+        })
+      },
+      // 拖拽事件
+      handleEdit(index, row) {
+          console.log(index, row);
+      },
       save () {
         this.$forceUpdate()
         this.$emit('radio',this.dataList)
@@ -167,10 +186,10 @@
       }
     }
   }
-  </script>
-  <style lang="scss">
-  $paddingSize:20px;
-  .rowDropContain{
+</script>
+<style lang="scss">
+$paddingSize:20px;
+.rowDropContain{
   .el-popover{
     position: fixed;
     right: 30px;
@@ -224,5 +243,5 @@
       color: #409EFF;
     }
   }
-  }
-  </style>
+}
+</style>