瀏覽代碼

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

XMLWAN 5 年之前
父節點
當前提交
860775fe68

二進制
src/assets/home/template_ten.jpg 查看文件


+ 1 - 4
src/store/modules/xt_permission.js 查看文件

41
 }
41
 }
42
 
42
 
43
 function setupRouters(urls) {
43
 function setupRouters(urls) {
44
-  console.log(urls)
45
-  console.log(xt_asyncRouterMap)
44
+  // console.log(urls)
46
   xt_asyncRouterMap.forEach(router => {
45
   xt_asyncRouterMap.forEach(router => {
47
-    console.log(router)
48
-    
49
     if (Object.prototype.toString.call(router.children) === '[object Array]') {
46
     if (Object.prototype.toString.call(router.children) === '[object Array]') {
50
       router.hidden = true
47
       router.hidden = true
51
       router.children.forEach(c_router => {
48
       router.children.forEach(c_router => {

+ 4 - 6
src/views/layout/components/Sidebar/SidebarItem.vue 查看文件

6
           :index="resolvePath(item.src)"
6
           :index="resolvePath(item.src)"
7
           :class="{ 'submenu-title-noDropdown': !isNest }"
7
           :class="{ 'submenu-title-noDropdown': !isNest }"
8
         >
8
         >
9
-          <i v-if="onlyOneChild.name == 'slow'" class="icon iconfont icon-manbing-xuanzhong" style="margin-right:4px"></i>
10
-          <i v-if="onlyOneChild.name == 'scrm'" class="icon iconfont icon-pengyou" style="margin-right:4px"></i>
11
-          <i v-if="onlyOneChild.name == 'shop'" class="icon iconfont icon-service_fill" style="margin-right:4px"></i>
9
+          <i v-if="item.name == 'slow'" class="icon iconfont icon-manbing-xuanzhong" style="margin-right:4px"></i>
10
+          <i v-if="item.name == 'scrm'" class="icon iconfont icon-pengyou" style="margin-right:4px"></i>
11
+          <i v-if="item.name == 'shop'" class="icon iconfont icon-service_fill" style="margin-right:4px"></i>
12
           <span slot="title">{{ generateTitle(item.name) }}</span>
12
           <span slot="title">{{ generateTitle(item.name) }}</span>
13
         </el-menu-item>
13
         </el-menu-item>
14
       </a>
14
       </a>
203
       return true;
203
       return true;
204
     }
204
     }
205
   },
205
   },
206
-  created() {
207
-    console.log(1111111111,this.permission_routers)
208
-  }
206
+  created() {}
209
 };
207
 };
210
 </script>
208
 </script>
211
 
209
 

+ 2 - 2
src/views/layout/components/Sidebar/index.vue 查看文件

37
         :index="index"
37
         :index="index"
38
         @a="b"
38
         @a="b"
39
       ></sidebar-item>
39
       ></sidebar-item>
40
- <el-menu-item v-if="this.$store.getters.xt_user.cdm_role_exist" index="100">
40
+    <!-- <el-menu-item v-if="this.$store.getters.xt_user.cdm_role_exist" index="100">
41
       <a :href="CDMWebsit()">
41
       <a :href="CDMWebsit()">
42
         <i class="icon iconfont icon-manbing-xuanzhong" style="margin-right:4px"></i>
42
         <i class="icon iconfont icon-manbing-xuanzhong" style="margin-right:4px"></i>
43
         <span
43
         <span
60
             slot="title"
60
             slot="title"
61
           >分销商城</span>
61
           >分销商城</span>
62
         </a>
62
         </a>
63
-      </el-menu-item>
63
+      </el-menu-item> -->
64
     </el-menu>
64
     </el-menu>
65
 
65
 
66
   </el-scrollbar>
66
   </el-scrollbar>

+ 23 - 0
src/xt_pages/data/printTemplate.vue 查看文件

143
               >模版六</el-radio
143
               >模版六</el-radio
144
             >
144
             >
145
           </el-col>
145
           </el-col>
146
+
147
+          <el-col :span="6" style="text-align: center">
148
+            <div class="demo-image__preview">
149
+              <el-tooltip
150
+                class="item"
151
+                effect="dark"
152
+                content="点击查看大图"
153
+                placement="top-start"
154
+                :hide-after="2000"
155
+              >
156
+                <el-image
157
+                  style="width: 200px; height: 200px;margin-left:30px"
158
+                  :src="require('@/assets/home/template_ten.jpg')"
159
+                  :preview-src-list="imgs_ten"
160
+                ></el-image>
161
+              </el-tooltip>
162
+            </div>
163
+            <el-radio v-model="radio" label="10" @change="change"
164
+            >模版十</el-radio
165
+            >
166
+          </el-col>
146
         </el-row>
167
         </el-row>
147
       </div>
168
       </div>
148
     </div>
169
     </div>
177
       imgs_seven: ["http://images.shengws.com/7.png"],
198
       imgs_seven: ["http://images.shengws.com/7.png"],
178
       imgs_six: ["https://images.shengws.com/5.png"],
199
       imgs_six: ["https://images.shengws.com/5.png"],
179
       imgs_eight: ["https://images.shengws.com/template_six.png"],
200
       imgs_eight: ["https://images.shengws.com/template_six.png"],
201
+      imgs_ten: ["https://kuyi.shengws.com/template_ten.jpg"],
202
+
180
       delay: 500,
203
       delay: 500,
181
       radio: 0,
204
       radio: 0,
182
       tempRadio: 0,
205
       tempRadio: 0,

+ 7 - 0
src/xt_pages/dialysis/template/DialysisPrintOrderTen.vue 查看文件

1150
               </td> -->
1150
               </td> -->
1151
                   <!-- <td width="10%" v-if="(advice.children && advice.children.length > 0 || advice.parent_id > 0) && advice.isShow == 2" ></td> -->
1151
                   <!-- <td width="10%" v-if="(advice.children && advice.children.length > 0 || advice.parent_id > 0) && advice.isShow == 2" ></td> -->
1152
                   <td height="32px">
1152
                   <td height="32px">
1153
+                    <img
1154
+                      v-if="advice.id > 0"
1155
+                      style="height:20px;"
1156
+                      src="https://images.shengws.com/FgnRnBcx1BgULJ1dn7VKzeBPEvtm"
1157
+                      alt=""
1158
+                      srcset=""
1159
+                    />
1153
                         <span
1160
                         <span
1154
                           v-if="setAdminUserES(advice.advice_doctor) == ''"
1161
                           v-if="setAdminUserES(advice.advice_doctor) == ''"
1155
                         >{{ getAdminUser(advice.advice_doctor) }}</span
1162
                         >{{ getAdminUser(advice.advice_doctor) }}</span