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

src/xt_pages/outpatientCharges/invoicePrint.vue

@@ -46,13 +46,13 @@
       </div>
     </div>
 
-    <!-- <div class="app-container" v-if="org_id == 10567 ">
+     <div class="app-container" v-if="org_id == 10567 || org_id == 0">
       <div class='dialysisPage'>
         <printfourteen :paramsObj="invoiceParams"></printfourteen>
       </div>
-    </div> -->
+    </div>
 
-    <div class="app-container" style="padding-top:20px;" v-if="org_id == 10188 || org_id == 0 ">
+    <div class="app-container" style="padding-top:20px;" v-if="org_id == 10188">
       <div class='dialysisPage'>
         <printthirteen  :paramsObj="invoiceParams"></printthirteen>
       </div>

src/xt_pages/outpatientCharges/invoiceTemplate/printfourteen.vue

@@ -22,9 +22,9 @@
     <div style="display:flex;justify-content: space-between;">
       <div  style="position: absolute;top:120px;left:60px;" v-if="list.gender == 1">√</div>
       <div  style="position: absolute;top:120px;left:80px;" v-else-if="list.gender == 2">√</div>
-      <div  style="position: absolute;top:120px;left:200px;">0.00</div>
-      <div  style="position: absolute;top:120px;left:300px;">560.40</div>
-      <div  style="position: absolute;top:120px;left:400px;">全自费</div>
+      <div  style="position: absolute;top:120px;left:200px;">{{list.order.fund_pay_sumamt}}</div>
+      <div  style="position: absolute;top:120px;left:300px;">{{list.psn_cash_money}}</div>
+      <div  style="position: absolute;top:120px;left:400px;">{{"医保-门慢"}}</div>
     </div>
     <div style="display:flex;justify-content: space-between;">
       <div v-if="list.westernMedicineCostTotal != ''">

src/xt_pages/outpatientCharges/summary.vue

@@ -137,7 +137,7 @@
 <!--           <el-button size="small" type="primary" @click="export_detail_three">报表下载12</el-button>-->
           <!-- <el-button size="small" type="primary" @click="export_detail_four">报表下载3</el-button>-->
           <!-- <el-button size="small" type="primary" @click="export_detail_five">报表下载3</el-button>-->
-<!--           <el-button size="small" type="primary" @click="export_detail_six">报表下载9</el-button>-->
+<!--           <el-button size="small" type="primary" @click="export_detail_six">诊疗下载</el-button>-->
           <!-- <el-button size="small" type="primary" @click="export_detail_tenone">报表下载10</el-button>-->
           <!--  <el-button size="small" type="primary" @click="export_detail_seven">报表下载4</el-button>-->
 
@@ -316,6 +316,7 @@
               查询结算清单
             </el-button>
 
+
             <el-button
                 size="mini"
                 type="primary"
@@ -324,6 +325,14 @@
             >
               撤销结算清单
             </el-button>
+
+            <el-button
+              size="mini"
+              type="primary"
+              @click="cancelUploadThree(scope.row)"
+            >
+              更改结算清单状态为未提交
+            </el-button>
             <el-button
                 size="mini"
                 type="primary"
@@ -864,6 +873,41 @@ export default {
         });
 
 
+    },cancelUploadThree(row){
+      var that = this;
+      // if(this.$store.getters.xt_user.org_id == 10191){
+        axios
+          .get("http://127.0.0.1:9532/api/comfirm/upload", {
+            params: {
+              order_id: row.id,
+              admin_user_id: this.$store.getters.xt_user.user.id,
+              stas_type: 0
+            },
+          })
+          .then(function (response) {
+            if (response.data.state == 0) {
+              that.$message.error(response.data.msg);
+              return false;
+            } else {
+              if (response.data.data.failed_code == -10) {
+                that
+                  .$confirm(response.data.data.msg, "医保错误信息", {
+                    confirmButtonText: "确 定",
+                    type: "warning",
+                  })
+                  .then(() => {
+                  })
+                  .catch(() => {
+                  });
+              } else {
+                that.$message.success("确认成功");
+                row.result.id = response.data.data.result.id;
+              }
+            }
+          })
+          .catch(function (error) {
+          });
+      // }
     },
     confirmUploadInfo(row){
       var that = this;
@@ -1123,7 +1167,7 @@ export default {
                 id_card_no: order.certno,
                 level: "未定级",
                 psn_type: order.psn_type,
-                date: "2022年3月",
+                date: "202年3月",
                 start_time: order.his.in_hosptial_time,
                 end_time: order.his.out_hosptial_time,
                 total: order.info[b].det_item_fee_sumamt,
@@ -1726,7 +1770,7 @@ export default {
           var tarList = []
           for (let i = 0; i < list.length; i++) {
             let obj = {
-              "周期": "2022年第二季度",
+              "周期": "2023年第三季度",
               "类别": "门诊",
               "医保目录编码": list[i].code,
               "医保目录名称": list[i].name,