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

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