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/invoiceTemplate/printEleven.vue

@@ -9,49 +9,49 @@
     <div>
       <div style="position: absolute;top: 50px;left: 60px;">{{ paramsObj.name }}</div>
       <div style="display:flex;justify-content: space-between;">
-          <div  style="position: absolute;top:50px;left:260px;">√</div>
+          <div  style="position: absolute;top:50px;left:270px;">√</div>
           <div  style="position: absolute;top:50px;left:220px;"></div>
           <div  style="position: absolute;top:50px;left:250px;"></div>
       </div>
       <div style="display:flex;justify-content: space-between;">
-          <div  style="position: absolute;top:50px;left:570px;" v-if="list.gender == 1">√</div>
-          <div  style="position: absolute;top:50px;left:630px;" v-else-if="list.gender == 2">√</div>
+          <div  style="position: absolute;top:50px;left:580px;" v-if="list.gender == 1">√</div>
+          <div  style="position: absolute;top:50px;left:640px;" v-else-if="list.gender == 2">√</div>
       </div>
     </div>
     <div style="display:flex;justify-content: space-between;">
       <div  style="position: absolute;top:88px;left:120px;">医保</div>
-      <div  style="position: absolute;top:88px;left:340px;">{{ list.number.length <= 13 ? list.psn_cash_money.toFixed(2) : (list.psn_cash_money).toFixed(2) }}</div>
-      <div  style="position: absolute;top:88px;left:570px;">现金</div>
+      <div  style="position: absolute;top:88px;left:350px;">{{ list.number.length <= 13 ? list.psn_cash_money.toFixed(2) : (list.psn_cash_money).toFixed(2) }}</div>
+      <div  style="position: absolute;top:88px;left:580px;">现金</div>
     </div>
     <div style="display:flex;justify-content: space-between;">
       <div  style="position: absolute;top:150px;left:0px;">西药费</div>
       <div  style="position: absolute;top:150px;left:60px;">{{ list.westernMedicineCostTotal ? list.westernMedicineCostTotal.toFixed(2) : '' }}</div>
       <div  style="position: absolute;top:150px;left:120px;">化验费</div>
-      <div  style="position: absolute;top:150px;left:180px;">{{ list.laboratoryCostTotal ? list.laboratoryCostTotal.toFixed(2) : '' }}</div>
+      <div  style="position: absolute;top:150px;left:190px;">{{ list.laboratoryCostTotal ? list.laboratoryCostTotal.toFixed(2) : '' }}</div>
       <div  style="position: absolute;top:150px;left:270px;">治疗费</div>
-      <div  style="position: absolute;top:150px;left:340px;">{{ list.treatCostTotal ? list.treatCostTotal.toFixed(2) : '' }}</div>
-      <div  style="position: absolute;top:150px;left:490px;">处置费</div>
-      <div  style="position: absolute;top:150px;left:570px;">0</div>
+      <div  style="position: absolute;top:150px;left:350px;">{{ list.treatCostTotal ? list.treatCostTotal.toFixed(2) : '' }}</div>
+      <div  style="position: absolute;top:150px;left:500px;">处置费</div>
+      <div  style="position: absolute;top:150px;left:580px;">0</div>
     </div>
     <div style="display:flex;justify-content: space-between;">
       <div  style="position: absolute;top:188px;left:0px;">中成药</div>
       <div  style="position: absolute;top:188px;left:60px;">{{ list.chineseTraditionalMedicineCostTotal ? list.chineseTraditionalMedicineCostTotal.toFixed(2) : '' }}</div>
       <div  style="position: absolute;top:188px;left:120px;">诊疗费</div>
-      <div  style="position: absolute;top:188px;left:180px;">{{ list.zhenChaCostTotal ? list.zhenChaCostTotal.toFixed(2) : '' }}</div>
+      <div  style="position: absolute;top:188px;left:190px;">{{ list.zhenChaCostTotal ? list.zhenChaCostTotal.toFixed(2) : '' }}</div>
       <div  style="position: absolute;top:188px;left:270px;">材料费</div>
-      <div  style="position: absolute;top:188px;left:340px;">{{ list.materialCostTotal ? list.materialCostTotal.toFixed(2) : '' }}</div>
-      <div  style="position: absolute;top:188px;left:490px;">护理费</div>
-      <div  style="position: absolute;top:188px;left:570px;">{{list.hiliCostTotal ? list.hiliCostTotal.toFixed(2) : ''}}</div>
+      <div  style="position: absolute;top:188px;left:350px;">{{ list.materialCostTotal ? list.materialCostTotal.toFixed(2) : '' }}</div>
+      <div  style="position: absolute;top:188px;left:500px;">护理费</div>
+      <div  style="position: absolute;top:188px;left:580px;">{{list.hiliCostTotal ? list.hiliCostTotal.toFixed(2) : ''}}</div>
     </div>
     <div style="display:flex;justify-content: space-between;">
       <div  style="position: absolute;top:225px;left:0px;">注射费</div>
       <div  style="position: absolute;top:225px;left:60px;">0</div>
       <div  style="position: absolute;top:225px;left:120px;">检查费</div>
-      <div  style="position: absolute;top:225px;left:180px;">{{ list.checkCostTotal ? list.checkCostTotal.toFixed(2) : '' }}</div>
+      <div  style="position: absolute;top:225px;left:190px;">{{ list.checkCostTotal ? list.checkCostTotal.toFixed(2) : '' }}</div>
       <div  style="position: absolute;top:225px;left:270px;">输氧费</div>
-      <div  style="position: absolute;top:225px;left:340px;">0</div>
-      <div  style="position: absolute;top:225px;left:490px;">其他</div>
-      <div  style="position: absolute;top:225px;left:570px;">{{ list.otherCostTotal ? list.otherCostTotal.toFixed(2) : '' }}</div>
+      <div  style="position: absolute;top:225px;left:350px;">0</div>
+      <div  style="position: absolute;top:225px;left:500px;">其他</div>
+      <div  style="position: absolute;top:225px;left:580px;">{{ list.otherCostTotal ? list.otherCostTotal.toFixed(2) : '' }}</div>
     </div>
     <div style="display:flex;justify-content: space-between;">
       <div  style="position: absolute;top:202px;left:60px;"></div>
@@ -61,62 +61,62 @@
     </div>
     <div>
       <span>
-        <span  style="position: absolute;top:280px;left:100px">
+        <span  style="position: absolute;top:290px;left:100px">
           <span v-if="zhongwen.indexOf('万') > -1 && zhongwen.indexOf('拾') > -1 && zhongwen.indexOf('拾') == 1">
                     {{ zhongwen.substring(0,1) }}
                 </span>
                 <span v-else>零</span>
         </span>
-        <span  style="position: absolute;top:280px;left:140px">
+        <span  style="position: absolute;top:290px;left:140px">
             <span v-if="zhongwen.indexOf('万') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('万') - 1,zhongwen.indexOf('万')) }}
                 </span>
                 <span v-else>零</span>
         </span>
-        <span  style="position: absolute;top:280px;left:190px">
+        <span  style="position: absolute;top:290px;left:190px">
             <span v-if="zhongwen.indexOf('仟') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('仟') - 1,zhongwen.indexOf('仟')) }}
                 </span>
                 <span v-else>零</span>
         </span>
-        <span  style="position: absolute;top:280px;left:260px">
+        <span  style="position: absolute;top:290px;left:260px">
             <span v-if="zhongwen.indexOf('佰') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('佰') - 1,zhongwen.indexOf('佰')) }}
                 </span>
                 <span v-else>零</span>
         </span>
-        <span style="position: absolute;top:280px;left:310px">
+        <span style="position: absolute;top:290px;left:310px">
             <span v-if="zhongwen.indexOf('拾') > -1">
                     {{zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) == '佰' ||  !zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾'))? '壹' : zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) }}
                 </span>
                 <span v-else>零</span>
         </span>
-        <span  style="position: absolute;top:280px;left:380px">
+        <span  style="position: absolute;top:290px;left:380px">
            <span v-if="zhongwen.indexOf('元') > -1 && zhongwen.substring(this.zhongwen.indexOf('元') - 1).substring(0,1)!= '拾'">
                     {{ zhongwen.substring(zhongwen.indexOf('元') - 1,zhongwen.indexOf('元')) }}
                 </span>
                 <span v-else>零</span>
         </span>
-        <span  style="position: absolute;top:280px;left:450px">
+        <span  style="position: absolute;top:290px;left:450px">
              <span v-if="zhongwen.indexOf('角') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('角') - 1,zhongwen.indexOf('角')) }}
                 </span>
                 <span v-else>零</span>
         </span>
-        <span  style="position: absolute;top:280px;left:510px">
+        <span  style="position: absolute;top:290px;left:510px">
              <span v-if="zhongwen.indexOf('分') > -1">
                     {{ zhongwen.substring(zhongwen.indexOf('分') - 1,zhongwen.indexOf('分')) }}
                 </span>
                 <span v-else>零</span>
         </span>
       </span>
-      <span style="position: absolute;top:280px;left:600px">{{ totalPrice.toFixed(2) }}</span>
+      <span style="position: absolute;top:290px;left:600px">{{ totalPrice.toFixed(2) }}</span>
     </div>
 
     <div style="display:flex;justify-content: space-between;">
-      <div style="position: absolute;top:370px;left:100px;">{{ org_name}}</div>
-      <div style="position: absolute;top:370px;left:240px;"></div>
-      <div style="position: absolute;top:370px;left:460px;">{{list.admin_user_name}}</div>
+      <div style="position: absolute;top:390px;left:100px;">{{ org_name}}</div>
+      <div style="position: absolute;top:390px;left:240px;"></div>
+      <div style="position: absolute;top:390px;left:460px;">{{list.admin_user_name}}</div>
     </div>
   </div>
 </template>

src/xt_pages/outpatientCharges/summary.vue

@@ -283,10 +283,11 @@
               size="mini"
               type="primary"
               @click="confirmUploadInfo(scope.row)"
-              v-if="$store.getters.xt_user.org_id == 10265"
+              v-if="$store.getters.xt_user.org_id == 10265 || $store.getters.xt_user.org_id == 10191"
             >
               确认结算清单
             </el-button>
+
             <el-button
               size="mini"
               type="primary"
@@ -848,37 +849,72 @@ export default {
     },
     confirmUploadInfo(row){
       var that = this;
-      axios
-        .get("http://127.0.0.1:9532/api/4102", {
-          params: {
-            order_id: row.id,
-            admin_user_id: this.$store.getters.xt_user.user.id,
-            stas_type: 1
-          },
-        })
-        .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(() => {
-                });
+      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: 1
+            },
+          })
+          .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) {
+          });
+      }else{
+        axios
+          .get("http://127.0.0.1:9532/api/4102", {
+            params: {
+              order_id: row.id,
+              admin_user_id: this.$store.getters.xt_user.user.id,
+              stas_type: 1
+            },
+          })
+          .then(function (response) {
+            if (response.data.state == 0) {
+              that.$message.error(response.data.msg);
+              return false;
             } else {
-              that.$message.success("确认成功");
-              row.result.id = response.data.data.result.id;
+              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) {
-        });
+          })
+          .catch(function (error) {
+          });
+
+      }
 
 
     },
@@ -1280,7 +1316,7 @@ export default {
                 name: order.patient.name,
                 id_card_no: order.patient.id_card_no,
                 year: "2023",
-                month: "08",
+                month: "09",
                 code: data[b].code,
                 pric: data[b].total ,
                 item_name: data[b].name,