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

src/api/his/his.js

@@ -123,38 +123,21 @@ export function getHisOrder(params) {
 }
 
 
-export function getHisPrescriptionList() {
+export function getHisPrescriptionList(params) {
   return request({
     url: "/api/hisprescription/list",
     method: "get",
-  });
-}
-
-
-export function getHisPrescriptionInfo(params) {
-  return request({
-    url: "/api/hisprescription/info",
-    method: "get",
     params:params,
   });
 }
 
 
-
-export function getConfig() {
+export function getHisPrescriptionInfo(params){
   return request({
-    url: "/api/medicalinsurance/config",
-    method: "get",
-  });
-}
-
-
-
-export function Refund() {
-  return request({
-    url: "/api/refund/post",
-    method: "post",
-  });
+    url:"",
+    method:"get",
+    params:params
+  })
 }
 
 
@@ -168,9 +151,3 @@ export function Refund() {
 
 
 
-
-
-
-
-
-

src/api/project/project.js

@@ -326,4 +326,76 @@ export function changePatient(id,params){
       method:"get",
       params:params
     })
+  }
+
+  export function postPrintHisTemplate(params){
+    
+    return request({
+      url:"/api/hispatient/postprinthistemplate",
+      method:"get",
+      params:params
+    })
+  }
+
+  export function getHisPrintTemplate(params){
+    
+    return request({
+      url:"/api/gethisprinttemplate",
+      method:"get",
+      params:params
+    })
+  } 
+
+  export function postPrescriptionPrintTemplate(params){
+    
+    return request({
+      url:"/api/hispatient/postprescriptiontemplate",
+      method:"Get",
+      params:params
+    })
+  }
+
+  export function getPrescriptionTemplate(params){
+   
+    return request({
+      url:"/api/hispatient/getprescriptiontemplate",
+      method:"Get",
+      params:params
+    })
+  }
+
+  export function postTreatPrintTemplate(params){
+   
+    return request({
+      url:"/api/hispatient/posttreatprinttemplate",
+      method:"get",
+      params:params
+    })
+  }
+
+  export function getTreatPrintTemplate(params){
+   
+    return request({
+      url:"/api/hispatient/gettreatprinttemplate",
+      method:"Get",
+      params:params
+    })
+  }
+
+  export function postChargePrintTemplate(params){
+    
+    return request({
+      url:"/api/hispatient/postchargeprinttemplate",
+      method:"get",
+      params:params
+    })
+  }
+
+  export function getChargePrintTemplate(params){
+     
+    return request({
+       url:"/api/hispatient/getchargeprinttemplate",
+       method:"get",
+       params:params
+    })
   }

src/router/modules/outpatientDoctorStation.js

@@ -46,5 +46,13 @@ export default {
         name: 'outpatientDoctorStationRecordPrint',
         meta: { title: 'outpatientDoctorStationRecordPrint', noCache: true }
     },
+    {
+      path:'/outpatientDoctorStation/template/printOne',
+      component:() => import('@/xt_pages/outpatientDoctorStation/template/printOne'),
+      hidden:true,
+      is_menu: false,
+      name: 'outpatientDoctorStationRecordPrintOne',
+      meta: { title: 'outpatientDoctorStationRecordPrintOne', noCache: true }
+    }
   ]
 }

src/xt_pages/data/printTemplate/chargePrint.vue

@@ -36,167 +36,9 @@
         <el-radio v-model="radio" label="1" @change="change"
             >模版一</el-radio
         >
-        </el-col>
-        <el-col
-        :span="6"
-        style="margin-left: 100px;margin-right: 100px;text-align: center"
-        >
-        <div
-            @click="imgClick('https://images.shengws.com/template_two.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/2.jpg')"-->
-                <!--:preview-src-list="imgs_two"-->
-            <!--&gt;</el-image>-->
-
-            <el-image
-                style="width: 200px; height: 200px"
-                :src="require('@/assets/home/2.jpg')"
-            ></el-image>
-            </el-tooltip>
-        </div>
-        <el-radio v-model="radio" label="2" @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/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-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>-->
-
-            <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>-->
-
-            <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>-->
-
-            <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">-->
-        <!--<el-tooltip-->
-        <!--class="item"-->
-        <!--effect="dark"-->
-        <!--content="点击查看大图"-->
-        <!--placement="top-start"-->
-        <!--:hide-after="2000"-->
-        <!--&gt;-->
-        <!--<el-image-->
-        <!--style="width: 200px; height: 200px;margin-left:30px"-->
-        <!--:src="require('@/assets/home/template_ten.jpg')"-->
-        <!--:preview-src-list="imgs_ten"-->
-        <!--&gt;</el-image>-->
-        <!--</el-tooltip>-->
-        <!--</div>-->
-        <!--<el-radio v-model="radio" label="10" @change="change"-->
-        <!--&gt;模版十</el-radio-->
-        <!--&gt;-->
-        <!--</el-col>-->
+        </el-col>  
     </el-row>
+ 
 
 
       <el-image-viewer
@@ -212,7 +54,8 @@
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import ElImageViewer from 'element-ui/packages/image/src/image-viewer'
-import { getPrintTemplate, postPrintTemplate } from "@/api/data";
+// import { getPrintTemplate, postPrintTemplate } from "@/api/data";
+import { postChargePrintTemplate,getChargePrintTemplate } from "@/api/project/project"
 import store from "@/store";
 
 export default {
@@ -270,16 +113,18 @@ export default {
         }
       )
         .then(() => {
+          var params = {
+            template_id:val
+          }
           this.loading = true;
-          postPrintTemplate(val).then(response => {
+          postChargePrintTemplate(params).then(response => {
             if (response.data.state == 1) {
               var template_id = response.data.data.template_id;
               this.radio = template_id.toString();
               this.tempRadio = template_id.toString();
-              // 同步
-              // console.log(response.data.data.fileds)
+           
               this.loading = false;
-              store.dispatch("updateAllFiledConfigList", response.data.data.fileds).then(() => {});
+             
               this.$message({
                 type: "success",
                 message: "切换成功"
@@ -290,19 +135,23 @@ export default {
         .catch(() => {
           this.radio = this.tempRadio;
         });
+    },
+
+    getlist(){  
+      getChargePrintTemplate().then(response=>{
+         if(response.data.state == 1){
+           var template = response.data.data.template;
+           this.radio = template.template_id.toString();
+           this.tempRadio = template.template_id.toString();
+         }
+        
+      })
     }
   },
   created() {
-    getPrintTemplate().then(response => {
-      if (response.data.state == 0) {
-        this.$message.error(response.data.msg);
-        return false;
-      } else {
-        var template = response.data.data.template;
-        this.radio = template.template_id.toString();
-        this.tempRadio = template.template_id.toString();
-      }
-    });
+
+    this.getlist()
+  
   }
 };
 </script>

src/xt_pages/data/printTemplate/prescriptionPrint.vue

@@ -6,7 +6,7 @@
       element-loading-background="rgba(0, 0, 0, 0.8)"
     >
     <p style="margin-top: 10px;margin-bottom: 30px">
-        请选择你需要打印的血液透析护理记录单样式
+        请选择你需要的处方模板记录单样式
     </p>
     <el-row :gutter="20" type="flex" justify="center">
         <el-col :span="6" style="text-align: center">
@@ -20,12 +20,6 @@
             content="点击查看大图"
             placement="top-start"
             >
-            <!--<el-image-->
-                <!--style="width: 200px; height: 200px"-->
-                <!--:src="require('@/assets/home/1.jpg')"-->
-                <!--:preview-src-list="imgs_one"-->
-            <!--&gt;</el-image>-->
-
             <el-image
                 style="width: 200px; height: 200px"
                 :src="require('@/assets/home/1.jpg')"
@@ -37,168 +31,8 @@
             >模版一</el-radio
         >
         </el-col>
-        <el-col
-        :span="6"
-        style="margin-left: 100px;margin-right: 100px;text-align: center"
-        >
-        <div
-            @click="imgClick('https://images.shengws.com/template_two.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/2.jpg')"-->
-                <!--:preview-src-list="imgs_two"-->
-            <!--&gt;</el-image>-->
-
-            <el-image
-                style="width: 200px; height: 200px"
-                :src="require('@/assets/home/2.jpg')"
-            ></el-image>
-            </el-tooltip>
-        </div>
-        <el-radio v-model="radio" label="2" @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/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-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>-->
-
-            <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>-->
-
-            <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>-->
-
-            <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">-->
-        <!--<el-tooltip-->
-        <!--class="item"-->
-        <!--effect="dark"-->
-        <!--content="点击查看大图"-->
-        <!--placement="top-start"-->
-        <!--:hide-after="2000"-->
-        <!--&gt;-->
-        <!--<el-image-->
-        <!--style="width: 200px; height: 200px;margin-left:30px"-->
-        <!--:src="require('@/assets/home/template_ten.jpg')"-->
-        <!--:preview-src-list="imgs_ten"-->
-        <!--&gt;</el-image>-->
-        <!--</el-tooltip>-->
-        <!--</div>-->
-        <!--<el-radio v-model="radio" label="10" @change="change"-->
-        <!--&gt;模版十</el-radio-->
-        <!--&gt;-->
-        <!--</el-col>-->
     </el-row>
-
-
+ 
       <el-image-viewer
         v-if="showViewer"
         :on-close="closeViewer"
@@ -212,7 +46,8 @@
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import ElImageViewer from 'element-ui/packages/image/src/image-viewer'
-import { getPrintTemplate, postPrintTemplate } from "@/api/data";
+// import { getPrintTemplate, postPrintTemplate } from "@/api/data";
+import { postPrescriptionPrintTemplate,getPrescriptionTemplate } from "@/api/project/project"
 import store from "@/store";
 
 export default {
@@ -271,15 +106,16 @@ export default {
       )
         .then(() => {
           this.loading = true;
-          postPrintTemplate(val).then(response => {
+            var params  = {
+                template_id:val
+            }
+          postPrescriptionPrintTemplate(params).then(response => {
             if (response.data.state == 1) {
               var template_id = response.data.data.template_id;
               this.radio = template_id.toString();
               this.tempRadio = template_id.toString();
-              // 同步
-              // console.log(response.data.data.fileds)
               this.loading = false;
-              store.dispatch("updateAllFiledConfigList", response.data.data.fileds).then(() => {});
+            
               this.$message({
                 type: "success",
                 message: "切换成功"
@@ -290,19 +126,19 @@ export default {
         .catch(() => {
           this.radio = this.tempRadio;
         });
+    },
+    getlist(){
+      getPrescriptionTemplate().then(response=>{
+          if(response.data.state == 1){
+               var template = response.data.data.template;
+               this.radio = template.template_id.toString();
+               this.tempRadio = template.template_id.toString();
+          }
+      })
     }
   },
   created() {
-    getPrintTemplate().then(response => {
-      if (response.data.state == 0) {
-        this.$message.error(response.data.msg);
-        return false;
-      } else {
-        var template = response.data.data.template;
-        this.radio = template.template_id.toString();
-        this.tempRadio = template.template_id.toString();
-      }
-    });
+    this.getlist()
   }
 };
 </script>

src/xt_pages/data/printTemplate/recordPrint.vue

@@ -6,7 +6,7 @@
       element-loading-background="rgba(0, 0, 0, 0.8)"
     >
     <p style="margin-top: 10px;margin-bottom: 30px">
-        请选择你需要打印的血液透析护理记录单样式
+        请选择你需要打印的电子病历模板
     </p>
     <el-row :gutter="20" type="flex" justify="center">
         <el-col :span="6" style="text-align: center">
@@ -20,12 +20,6 @@
             content="点击查看大图"
             placement="top-start"
             >
-            <!--<el-image-->
-                <!--style="width: 200px; height: 200px"-->
-                <!--:src="require('@/assets/home/1.jpg')"-->
-                <!--:preview-src-list="imgs_one"-->
-            <!--&gt;</el-image>-->
-
             <el-image
                 style="width: 200px; height: 200px"
                 :src="require('@/assets/home/1.jpg')"
@@ -37,166 +31,8 @@
             >模版一</el-radio
         >
         </el-col>
-        <el-col
-        :span="6"
-        style="margin-left: 100px;margin-right: 100px;text-align: center"
-        >
-        <div
-            @click="imgClick('https://images.shengws.com/template_two.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/2.jpg')"-->
-                <!--:preview-src-list="imgs_two"-->
-            <!--&gt;</el-image>-->
-
-            <el-image
-                style="width: 200px; height: 200px"
-                :src="require('@/assets/home/2.jpg')"
-            ></el-image>
-            </el-tooltip>
-        </div>
-        <el-radio v-model="radio" label="2" @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/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-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>-->
-
-            <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>-->
-
-            <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>-->
-
-            <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">-->
-        <!--<el-tooltip-->
-        <!--class="item"-->
-        <!--effect="dark"-->
-        <!--content="点击查看大图"-->
-        <!--placement="top-start"-->
-        <!--:hide-after="2000"-->
-        <!--&gt;-->
-        <!--<el-image-->
-        <!--style="width: 200px; height: 200px;margin-left:30px"-->
-        <!--:src="require('@/assets/home/template_ten.jpg')"-->
-        <!--:preview-src-list="imgs_ten"-->
-        <!--&gt;</el-image>-->
-        <!--</el-tooltip>-->
-        <!--</div>-->
-        <!--<el-radio v-model="radio" label="10" @change="change"-->
-        <!--&gt;模版十</el-radio-->
-        <!--&gt;-->
-        <!--</el-col>-->
     </el-row>
+   
 
 
       <el-image-viewer
@@ -212,7 +48,7 @@
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import ElImageViewer from 'element-ui/packages/image/src/image-viewer'
-import { getPrintTemplate, postPrintTemplate } from "@/api/data";
+import { postPrintHisTemplate,getHisPrintTemplate } from "@/api/project/project"
 import store from "@/store";
 
 export default {
@@ -261,7 +97,7 @@ export default {
     change: function(val) {
       console.log("val是什么", val);
       this.$confirm(
-        "切换模版后，透析记录的字段会根据打印单来显示与隐藏，是否确定切换模版",
+        "切换模版后，打印单的字段会根据打印单来显示与隐藏，是否确定切换模版",
         "提示",
         {
           confirmButtonText: "确定",
@@ -271,15 +107,16 @@ export default {
       )
         .then(() => {
           this.loading = true;
-          postPrintTemplate(val).then(response => {
+           var params ={
+             template_id : val
+           }
+          postPrintHisTemplate(params).then(response => {
             if (response.data.state == 1) {
               var template_id = response.data.data.template_id;
+              console.log("template_id",template_id)
               this.radio = template_id.toString();
               this.tempRadio = template_id.toString();
-              // 同步
-              // console.log(response.data.data.fileds)
               this.loading = false;
-              store.dispatch("updateAllFiledConfigList", response.data.data.fileds).then(() => {});
               this.$message({
                 type: "success",
                 message: "切换成功"
@@ -290,19 +127,19 @@ export default {
         .catch(() => {
           this.radio = this.tempRadio;
         });
+    },
+    getHisPrintTemplate(){
+      getHisPrintTemplate().then(response=>{
+        if(response.data.state == 1){
+          var template =  response.data.data.template
+          this.radio = template.template_id.toString()
+          this.tempRadio = template.template_id.toString()
+        }
+      })
     }
   },
   created() {
-    getPrintTemplate().then(response => {
-      if (response.data.state == 0) {
-        this.$message.error(response.data.msg);
-        return false;
-      } else {
-        var template = response.data.data.template;
-        this.radio = template.template_id.toString();
-        this.tempRadio = template.template_id.toString();
-      }
-    });
+    this.getHisPrintTemplate()
   }
 };
 </script>

src/xt_pages/data/printTemplate/treatPrint.vue

@@ -20,11 +20,6 @@
             content="点击查看大图"
             placement="top-start"
             >
-            <!--<el-image-->
-                <!--style="width: 200px; height: 200px"-->
-                <!--:src="require('@/assets/home/1.jpg')"-->
-                <!--:preview-src-list="imgs_one"-->
-            <!--&gt;</el-image>-->
 
             <el-image
                 style="width: 200px; height: 200px"
@@ -37,166 +32,11 @@
             >模版一</el-radio
         >
         </el-col>
-        <el-col
-        :span="6"
-        style="margin-left: 100px;margin-right: 100px;text-align: center"
-        >
-        <div
-            @click="imgClick('https://images.shengws.com/template_two.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/2.jpg')"-->
-                <!--:preview-src-list="imgs_two"-->
-            <!--&gt;</el-image>-->
-
-            <el-image
-                style="width: 200px; height: 200px"
-                :src="require('@/assets/home/2.jpg')"
-            ></el-image>
-            </el-tooltip>
-        </div>
-        <el-radio v-model="radio" label="2" @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/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-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>-->
 
-            <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>-->
-
-            <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>-->
 
-            <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">-->
-        <!--<el-tooltip-->
-        <!--class="item"-->
-        <!--effect="dark"-->
-        <!--content="点击查看大图"-->
-        <!--placement="top-start"-->
-        <!--:hide-after="2000"-->
-        <!--&gt;-->
-        <!--<el-image-->
-        <!--style="width: 200px; height: 200px;margin-left:30px"-->
-        <!--:src="require('@/assets/home/template_ten.jpg')"-->
-        <!--:preview-src-list="imgs_ten"-->
-        <!--&gt;</el-image>-->
-        <!--</el-tooltip>-->
-        <!--</div>-->
-        <!--<el-radio v-model="radio" label="10" @change="change"-->
-        <!--&gt;模版十</el-radio-->
-        <!--&gt;-->
-        <!--</el-col>-->
-    </el-row>
 
 
       <el-image-viewer
@@ -212,7 +52,9 @@
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import ElImageViewer from 'element-ui/packages/image/src/image-viewer'
-import { getPrintTemplate, postPrintTemplate } from "@/api/data";
+// import { getPrintTemplate, postPrintTemplate } from "@/api/data";
+import { postTreatPrintTemplate,getTreatPrintTemplate } from "@/api/project/project"
+
 import store from "@/store";
 
 export default {
@@ -268,18 +110,18 @@ export default {
           cancelButtonText: "取消",
           type: "info"
         }
-      )
-        .then(() => {
+      ).then(() => {
+           var params = {
+               template_id:val
+           }
           this.loading = true;
-          postPrintTemplate(val).then(response => {
+          postTreatPrintTemplate(params).then(response => {
             if (response.data.state == 1) {
               var template_id = response.data.data.template_id;
               this.radio = template_id.toString();
               this.tempRadio = template_id.toString();
-              // 同步
-              // console.log(response.data.data.fileds)
               this.loading = false;
-              store.dispatch("updateAllFiledConfigList", response.data.data.fileds).then(() => {});
+            
               this.$message({
                 type: "success",
                 message: "切换成功"
@@ -290,19 +132,20 @@ export default {
         .catch(() => {
           this.radio = this.tempRadio;
         });
+    },
+    getlist(){
+      getTreatPrintTemplate().then(response=>{
+         if(response.data.state == 1){
+            var template = response.data.data.template;
+            this.radio = template.template_id.toString();
+            this.tempRadio = template.template_id.toString();
+         }
+      })
     }
   },
   created() {
-    getPrintTemplate().then(response => {
-      if (response.data.state == 0) {
-        this.$message.error(response.data.msg);
-        return false;
-      } else {
-        var template = response.data.data.template;
-        this.radio = template.template_id.toString();
-        this.tempRadio = template.template_id.toString();
-      }
-    });
+     
+    this.getlist()
   }
 };
 </script>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -211,7 +211,7 @@
   import prescriptionTable from './components/prescriptionTable'
   import additionalCharges from './components/additionalCharges'
   import { getPatientInformation, getPatientList } from '@/api/project/project'
-  import { getPatientInfo, getSchedulePatientList, register, upload,Refund } from '@/api/his/his'
+  import { getPatientInfo, getSchedulePatientList, register, upload } from '@/api/his/his'
 
   const moment = require('moment')
   export default {

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

@@ -266,6 +266,8 @@
               this.$message.error("患者病历已存在")
               return false
             } else {
+              var caseHistory = response.data.data.caseHistory
+              console.log("caseHistory",caseHistory)
               this.$message.success("保存成功")
             }
           })

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -313,22 +313,12 @@
             this.$refs.prescriptions.setData(this.prescriptions,this.info)
           }
         })
-
-        // this.patientInfo = {
-        //     certno:"440221195903290027",
-        //     psn_no:"0221201972",
-        //     gend:"2",
-        //     brdy:"1960-03-29",
-        //     naty:"01",
-        //     psn_cert_type:"01",
-        //     psn_name:"杨美英",
-        //     age:60.7
-        // }
-      },open(index) {
+      },
+      open(index) {
         if (index == 1) {
           this.$refs.prescriptions.open(1)
         } else if (index == 2) {
-          this.$refs.prescriptions.open(2)
+          this.$router.push("/outpatientDoctorStation/template/printOne?record="+this.record_date)
         } else if (index == 3) {
           this.$refs.prescriptions.open(3)
         } else if (index == 4) {
@@ -344,50 +334,6 @@
             return
           }
           this.$refs.child.createCaseHistory()
-          // if(this.case_history.is_infect == true){
-          //   this.case_history.is_infect = 1
-          // }
-          // if(this.case_history.is_infect == false){
-          //    this.case_history.is_infect = 2
-          // }
-          // let params = {
-          //   "his_patient_id":this.hisPatientInfo.id,
-          //   "delivery_way":this.delivery_way?"":0,
-          //   "patient_id":this.patientInfo.id,
-          //   "temperature":this.case_history.temperature,
-          //   "blood_sugar":this.case_history.blood_sugar,
-          //   "pulse":this.case_history.pulse,
-          //   "sbp":this.case_history.sbp,
-          //   "dbp":this.case_history.dbp,
-          //   "blood_fat":this.case_history.blood_fat,
-          //   "height":this.case_history.height,
-          //   "sick_type":this.case_history.sick_type,
-          //   "symptom":this.case_history.symptom,
-          //   "sick_date":this.start_time,
-          //   "is_infect":this.case_history.is_infect,
-          //   "chief_conplaint":this.case_history.chief_conplaint,
-          //   "history_of_present_illness":this.case_history.history_of_present_illness,
-          //   "past_history":this.case_history.past_history,
-          //   "personal_history":this.case_history.personal_history,
-          //   "family_history":this.case_history.family_history,
-          //   "record_date":this.record_date,
-          //   "diagnostic":this.case_history.diagnostic,
-          //   "breathing":this.case_history.breathing,
-          //   // "doctor_advice":this.doctor_advice,
-          //   // "remark":this.remark
-          //   "doctor_advice":this.$ref.doctor_advice,
-          //   // "remark":this.remark
-          // }
-          // console.log("params",params)
-          // return
-          // createCaseHistory(params).then(response => {
-          //   if (response.data.state == 0) {
-          //     this.$message.error("患者病历已存在")
-          //     return false
-          //   } else {
-          //     this.$message.success("保存成功")
-          //   }
-          // })
         } else if (index == 2) {
           this.$router.push('/outpatientDoctorStation/recordPrint?record='+this.record_date)
         } else if (index == 3) {