Merge branch '20201014_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201014_pc_vue_new_branch

src/xt_pages/kuyiShopping/index.vue

 <template>
-    <div class="page-kuyiShopping" style="width:100%;height:100%;">
+    <div class="page_kuyishopping" style="width:100%;height:100%;">
         <iframe style="width:100%;height:100%;" src="http://market.kuyicloud.com/app/index.php?i=2&c=entry&m=ewei_shopv2&do=mobile&r=pc" frameborder="0"></iframe>
     </div>
 </template>

src/xt_pages/outpatientRegistration/index.vue

                 let a = JSON.parse(localStorage.getItem("temp"))
                 // let arr = []
                 this.form.create_time = new Date(new Date().toLocaleDateString()).getTime() / 1000
+                this.form.org_id = this.$store.getters.xt_user.org_id
                 a.push(this.form)
                 console.log(111,a)
                 localStorage.setItem("temp",JSON.stringify(a));
             }else {
                 let arr = []
                 this.form.create_time = new Date(new Date().toLocaleDateString()).getTime() / 1000
+                this.form.org_id = this.$store.getters.xt_user.org_id
                 arr.push(this.form)
                 localStorage.setItem("temp",JSON.stringify(arr));
                 Object.keys(this.form).forEach((key)=>{

src/xt_pages/outpatientRegistration/registrationHistory.vue

             ],
             search_input:'',
             value1:'',
-            tableData: [{
-            date: '2016-05-02',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1518 弄'
-            }, {
-            date: '2016-05-04',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1517 弄'
-            }, {
-            date: '2016-05-01',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1519 弄'
-            }, {
-            date: '2016-05-03',
-            name: '王小虎',
-            address: '上海市普陀区金沙江路 1516 弄'
-            }]
+            tableData: []
         }
     },
     created(){
         let a = JSON.parse(localStorage.getItem("temp"))
+        let arr = []
         a.map(item => {
-            item.create_time = moment(item.create_time * 1000).format('YYYY-MM-DD')
+            if(item.org_id == this.$store.getters.xt_user.org_id){
+                item.create_time = moment(item.create_time * 1000).format('YYYY-MM-DD')
+                arr.push(item)
+            }
+            
         })
         console.log('aaaaaaaaaaaaaa',a)
-        this.tableData = a
+        this.tableData = arr
     },
     methods:{
         searchAction(){
             let arr = this.tableData
             let a = []
             arr.map(item => {
-                if(item.name.indexOf(this.search_input) > -1){
+                if(item.name.indexOf(this.search_input) > -1 && item.org_id == this.$store.getters.xt_user.org_id){
                     a.push(item)
                 }
             })
                 // if(new Date(val[0]).getTime() / 1000){
                 //     a.push(item)
                 // }
-                if(new Date(item.create_time).getTime() / 1000 > new Date(val[0]).getTime() / 1000 && new Date(item.create_time).getTime() / 1000 < new Date(val[1]).getTime() / 1000){
+                if(new Date(item.create_time).getTime() / 1000 > new Date(val[0]).getTime() / 1000 && new Date(item.create_time).getTime() / 1000 < new Date(val[1]).getTime() / 1000 && item.org_id == this.$store.getters.xt_user.org_id){
                     a.push(item)
                 }
-                console.log()
             })
             this.tableData = a
         }