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

src/xt_pages/data/printTemplate/dialysisPrint.vue

@@ -69,113 +69,137 @@
         >
         </el-col>
         <el-col :span="6" style="text-align: center">
-        <div class="demo-image__preview"  @click="imgClick('https://images.shengws.com/template_five.jpg')">
-            <el-tooltip
-            class="item"
-            effect="dark"
-            content="点击查看大图"
-            placement="top-start"
-            :hide-after="2000"
-            >
-            <!--<el-image-->
-                <!--style="width: 200px; height: 200px"-->
-                <!--:src="require('@/assets/home/5.jpg')"-->
-                <!--:preview-src-list="imgs_five"-->
-            <!--&gt;</el-image>-->
+          <div class="demo-image__preview"  @click="imgClick('https://images.shengws.com/template_five.jpg')">
+              <el-tooltip
+              class="item"
+              effect="dark"
+              content="点击查看大图"
+              placement="top-start"
+              :hide-after="2000"
+              >
+              <!--<el-image-->
+                  <!--style="width: 200px; height: 200px"-->
+                  <!--:src="require('@/assets/home/5.jpg')"-->
+                  <!--:preview-src-list="imgs_five"-->
+              <!--&gt;</el-image>-->
 
-            <el-image
-                style="width: 200px; height: 200px"
-                :src="require('@/assets/home/5.jpg')"
-            ></el-image>
+              <el-image
+                  style="width: 200px; height: 200px"
+                  :src="require('@/assets/home/5.jpg')"
+              ></el-image>
 
-            </el-tooltip>
-        </div>
-        <el-radio v-model="radio" label="5" @change="change"
-            >模版三</el-radio
-        >
+              </el-tooltip>
+          </div>
+          <el-radio v-model="radio" label="5" @change="change"
+              >模版三</el-radio
+          >
         </el-col>
         <el-col :span="6" style="text-align: center">
-        <div class="demo-image__preview"  @click="imgClick('https://images.shengws.com/serven.png')">
-            <el-tooltip
-            class="item"
-            effect="dark"
-            content="点击查看大图"
-            placement="top-start"
-            :hide-after="2000"
-            >
-            <!--<el-image-->
-                <!--style="width: 200px; height: 200px"-->
-                <!--:src="require('@/assets/home/serven.png')"-->
-                <!--:preview-src-list="imgs_seven"-->
-            <!--&gt;</el-image>-->
+          <div class="demo-image__preview"  @click="imgClick('https://images.shengws.com/serven.png')">
+              <el-tooltip
+              class="item"
+              effect="dark"
+              content="点击查看大图"
+              placement="top-start"
+              :hide-after="2000"
+              >
+              <!--<el-image-->
+                  <!--style="width: 200px; height: 200px"-->
+                  <!--:src="require('@/assets/home/serven.png')"-->
+                  <!--:preview-src-list="imgs_seven"-->
+              <!--&gt;</el-image>-->
 
-            <el-image
-                style="width: 200px; height: 200px"
-                :src="require('@/assets/home/serven.png')"
-            ></el-image>
-            </el-tooltip>
-        </div>
-        <el-radio v-model="radio" label="7" @change="change"
-            >模版四</el-radio
-        >
+              <el-image
+                  style="width: 200px; height: 200px"
+                  :src="require('@/assets/home/serven.png')"
+              ></el-image>
+              </el-tooltip>
+          </div>
+          <el-radio v-model="radio" label="7" @change="change"
+              >模版四</el-radio
+          >
         </el-col>
     </el-row>
     <el-row :gutter="20" type="flex">
         <el-col :span="6" style="text-align: center">
-        <div class="demo-image__preview" @click="imgClick('https://images.shengws.com/eight.png')">
-            <el-tooltip
-            class="item"
-            effect="dark"
-            content="点击查看大图"
-            placement="top-start"
-            :hide-after="2000"
-            >
-            <!--<el-image-->
-                <!--style="width: 200px; height: 200px;margin-left:-60px"-->
-                <!--:src="require('@/assets/home/eight.png')"-->
-                <!--:preview-src-list="imgs_six"-->
-            <!--&gt;</el-image>-->
+          <div class="demo-image__preview" @click="imgClick('https://images.shengws.com/eight.png')">
+              <el-tooltip
+              class="item"
+              effect="dark"
+              content="点击查看大图"
+              placement="top-start"
+              :hide-after="2000"
+              >
+              <!--<el-image-->
+                  <!--style="width: 200px; height: 200px;margin-left:-60px"-->
+                  <!--:src="require('@/assets/home/eight.png')"-->
+                  <!--:preview-src-list="imgs_six"-->
+              <!--&gt;</el-image>-->
 
-            <el-image
-                style="width: 200px; height: 200px;margin-left:-60px"
-                :src="require('@/assets/home/eight.png')"
-            ></el-image>
-            </el-tooltip>
-        </div>
-        <el-radio
-            v-model="radio"
-            label="8"
-            @change="change"
-            style="margin-left:-60px"
-            >模版五</el-radio
-        >
+              <el-image
+                  style="width: 200px; height: 200px;margin-left:-60px"
+                  :src="require('@/assets/home/eight.png')"
+              ></el-image>
+              </el-tooltip>
+          </div>
+          <el-radio
+              v-model="radio"
+              label="8"
+              @change="change"
+              style="margin-left:-60px"
+              >模版五</el-radio
+          >
         </el-col>
         <el-col :span="6" style="text-align: center">
-        <div class="demo-image__preview" @click="imgClick('https://images.shengws.com/template_six.png')">
-            <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_six.png')"-->
-                <!--:preview-src-list="imgs_eight"-->
-            <!--&gt;</el-image>-->
+          <div class="demo-image__preview" @click="imgClick('https://images.shengws.com/template_six.png')">
+              <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_six.png')"-->
+                  <!--:preview-src-list="imgs_eight"-->
+              <!--&gt;</el-image>-->
 
-            <el-image
-                style="width: 200px; height: 200px;margin-left:30px"
-                :src="require('@/assets/home/template_six.png')"
-            ></el-image>
-            </el-tooltip>
-        </div>
-        <el-radio v-model="radio" label="6" @change="change"
-            >模版六</el-radio
-        >
+              <el-image
+                  style="width: 200px; height: 200px;margin-left:30px"
+                  :src="require('@/assets/home/template_six.png')"
+              ></el-image>
+              </el-tooltip>
+          </div>
+          <el-radio v-model="radio" label="6" @change="change"
+              >模版六</el-radio
+          >
         </el-col>
+        <el-col :span="6" style="text-align: center">
+          <div class="demo-image__preview"  @click="imgClick('https://images.shengws.com/serven.png')">
+              <el-tooltip
+              class="item"
+              effect="dark"
+              content="点击查看大图"
+              placement="top-start"
+              :hide-after="2000"
+              >
+              <!--<el-image-->
+                  <!--style="width: 200px; height: 200px"-->
+                  <!--:src="require('@/assets/home/serven.png')"-->
+                  <!--:preview-src-list="imgs_seven"-->
+              <!--&gt;</el-image>-->
 
+              <el-image
+                  style="width: 200px; height: 200px"
+                  :src="require('@/assets/home/serven.png')"
+              ></el-image>
+              </el-tooltip>
+          </div>
+          <el-radio v-model="radio" label="74" @change="change"
+              >sop</el-radio
+          >
+        </el-col>
         <!--<el-col :span="6" style="text-align: center">-->
         <!--<div class="demo-image__preview">-->
         <!--<el-tooltip-->
@@ -206,7 +230,7 @@
       ></el-image-viewer>
 
     </div>
-  </div>
+  <!-- </div> -->
 </template>
 
 <script>

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -916,6 +916,18 @@
         >
         </div>
       </template>
+      <template v-if="org_template_info.template_id == 74">
+        <div>
+          <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+        </div>
+      </template>
     </div>
     <div class="app-container" style="min-height: 0">
       <!--<div class="order-print-btn"-->
@@ -1413,7 +1425,10 @@
             v-if="org_template_info.template_id == 199"
           >
           </DialysisPrintOrderZero>
+          <DialysisPrintOrderSop v-bind:childResponse="childResponse"
+            v-if="org_template_info.template_id == 74">
 
+          </DialysisPrintOrderSop>
         </div>
       </el-container>
     </div>
@@ -1505,6 +1520,7 @@ import DialysisPrintOrderSeventy from './template/DialysisPrintOrderSeventy'
 import DialysisPrintOrderseventyone from './template/DialysisPrintOrderseventyone'
 import DialysisPrintOrderSeventyTwo from './template/DialysisPrintOrderSeventyTwo'
 import DialysisPrintOrderSeventythree from './template/DialysisPrintOrderSeventythree'
+import DialysisPrintOrderSop from './template/DialysisPrintOrderSop'
 import DialysisPrintOrderZero from './template/DialysisPrintOrderZero'
 export default {
   name: "dialysisPrintOrder",
@@ -1582,6 +1598,7 @@ export default {
     DialysisPrintOrderseventyone,
     DialysisPrintOrderSeventyTwo,
     DialysisPrintOrderSeventythree,
+    DialysisPrintOrderSop,
     DialysisPrintOrderZero,
     LabelBox,
     BreadCrumb,
@@ -2130,9 +2147,7 @@ export default {
           style: style11,
           scanStyles: false,
         });
-      } else if (
-        this.org_template_info.template_id == 51
-      ) {
+      } else if (this.org_template_info.template_id == 51) {
         printJS({
           printable: "dialysis-print-box-1",
           type: "html",
@@ -2252,6 +2267,13 @@ export default {
           scanStyles: false,
         });
         console.log('77777',this.org_template_info.template_id);
+      }else if (this.org_template_info.template_id == 74) {
+        printJS({
+          printable: "dialysis-print-box",
+          type: "html",
+          style: style4,
+          scanStyles: false,
+        });
       }
        else if (this.org_template_info.template_id == 199 ) {
         printJS({