Merge branch 'master' of http://git.shengws.com/csx/Vue_New

src/store/modules/xt_permission.js

@@ -41,11 +41,8 @@ function xt_filterAsyncRouter(routers) {
 }
 
 function setupRouters(urls) {
-  console.log(urls)
-  console.log(xt_asyncRouterMap)
+  // console.log(urls)
   xt_asyncRouterMap.forEach(router => {
-    console.log(router)
-    
     if (Object.prototype.toString.call(router.children) === '[object Array]') {
       router.hidden = true
       router.children.forEach(c_router => {

src/views/layout/components/Sidebar/SidebarItem.vue

@@ -6,9 +6,9 @@
           :index="resolvePath(item.src)"
           :class="{ 'submenu-title-noDropdown': !isNest }"
         >
-          <i v-if="onlyOneChild.name == 'slow'" class="icon iconfont icon-manbing-xuanzhong" style="margin-right:4px"></i>
-          <i v-if="onlyOneChild.name == 'scrm'" class="icon iconfont icon-pengyou" style="margin-right:4px"></i>
-          <i v-if="onlyOneChild.name == 'shop'" class="icon iconfont icon-service_fill" style="margin-right:4px"></i>
+          <i v-if="item.name == 'slow'" class="icon iconfont icon-manbing-xuanzhong" style="margin-right:4px"></i>
+          <i v-if="item.name == 'scrm'" class="icon iconfont icon-pengyou" style="margin-right:4px"></i>
+          <i v-if="item.name == 'shop'" class="icon iconfont icon-service_fill" style="margin-right:4px"></i>
           <span slot="title">{{ generateTitle(item.name) }}</span>
         </el-menu-item>
       </a>
@@ -203,9 +203,7 @@ export default {
       return true;
     }
   },
-  created() {
-    console.log(1111111111,this.permission_routers)
-  }
+  created() {}
 };
 </script>
 

src/views/layout/components/Sidebar/index.vue

@@ -37,7 +37,7 @@
         :index="index"
         @a="b"
       ></sidebar-item>
- <el-menu-item v-if="this.$store.getters.xt_user.cdm_role_exist" index="100">
+    <!-- <el-menu-item v-if="this.$store.getters.xt_user.cdm_role_exist" index="100">
       <a :href="CDMWebsit()">
         <i class="icon iconfont icon-manbing-xuanzhong" style="margin-right:4px"></i>
         <span
@@ -60,7 +60,7 @@
             slot="title"
           >分销商城</span>
         </a>
-      </el-menu-item>
+      </el-menu-item> -->
     </el-menu>
 
   </el-scrollbar>

src/xt_pages/data/printTemplate.vue

@@ -143,6 +143,27 @@
               >模版六</el-radio
             >
           </el-col>
+
+          <el-col :span="6" style="text-align: center">
+            <div class="demo-image__preview">
+              <el-tooltip
+                class="item"
+                effect="dark"
+                content="点击查看大图"
+                placement="top-start"
+                :hide-after="2000"
+              >
+                <el-image
+                  style="width: 200px; height: 200px;margin-left:30px"
+                  :src="require('@/assets/home/template_ten.jpg')"
+                  :preview-src-list="imgs_ten"
+                ></el-image>
+              </el-tooltip>
+            </div>
+            <el-radio v-model="radio" label="10" @change="change"
+            >模版十</el-radio
+            >
+          </el-col>
         </el-row>
       </div>
     </div>
@@ -177,6 +198,8 @@ export default {
       imgs_seven: ["http://images.shengws.com/7.png"],
       imgs_six: ["https://images.shengws.com/5.png"],
       imgs_eight: ["https://images.shengws.com/template_six.png"],
+      imgs_ten: ["https://kuyi.shengws.com/template_ten.jpg"],
+
       delay: 500,
       radio: 0,
       tempRadio: 0,

src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue

@@ -1150,6 +1150,13 @@
               </td> -->
                   <!-- <td width="10%" v-if="(advice.children && advice.children.length > 0 || advice.parent_id > 0) && advice.isShow == 2" ></td> -->
                   <td height="32px">
+                    <img
+                      v-if="advice.id > 0"
+                      style="height:20px;"
+                      src="https://images.shengws.com/FgnRnBcx1BgULJ1dn7VKzeBPEvtm"
+                      alt=""
+                      srcset=""
+                    />
                         <span
                           v-if="setAdminUserES(advice.advice_doctor) == ''"
                         >{{ getAdminUser(advice.advice_doctor) }}</span