Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyfour.vue

@@ -1142,8 +1142,8 @@ export default {
           this.advices = tableAdvice;
         }
 
-        // var arr = [] 
-        // arr = this.unique(this.advices)
+        var arr = [] 
+        arr = this.unique(this.advices)
         // console.log("arriooowo",arr)
         // if(arr!=null && arr.length >0){
   

src/xt_pages/management/components/PlanForm.vue

@@ -41,7 +41,7 @@
                 default-first-option
                 placeholder="请选择时间"
                 style="width: 135px;"
-               
+
               >
                 <el-option
                   v-for="item in this.timeType"
@@ -251,7 +251,7 @@ export default {
         { id: 1, name: "床单" },
         { id: 2, name: "被套" },
         { id: 3, name: "枕套" },
-      
+
       ],
       DeviceType: [],
       planid: 0,
@@ -272,7 +272,7 @@ export default {
       });
     },
     savePlan(formName) {
-      
+
       var equimentid = this.equimentid;
       // console.log('equimentid', equimentid);
       var devicetype = this.form.device_type;
@@ -300,7 +300,7 @@ export default {
           var msg = response.data.data.msg;
           // console.log('msg', msg);
           this.$message.success("保存成功");
-          
+
           this.dialogVisible = false;
           this.$refs['form'].resetFields()
           this.$emit("getAllPlan");
@@ -308,12 +308,12 @@ export default {
           // 如果保存成功通过状态值改变父组键表格的值
           this.plandata = 1;
           this.$emit("func", this.plandata);
-          
+
         } else {
           this.$message.error("该消毒计划已存在");
         }
       });
-      
+
     },
     getAllEquitType() {
       getAllEquitType().then(response => {

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,

src/xt_pages/role/admin.vue

@@ -187,12 +187,12 @@
           @click="toSendInformaton">发送短信验证码</el-button>  -->
        
           
-        <!-- <el-button
+          <!--<el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toSavePDFInformation">生成PDF</el-button> -->
+          @click="toSavePDFInformation">生成PDF</el-button>-->
 
 
         <!-- <el-button
@@ -1071,11 +1071,11 @@ export default {
            
            var orderId = response.data.data.orderId
            
-           var base64Img = 'data:image/png;base64'+","+orderId
-           console.log("base64Img",base64Img)
-           var imgFile = this.base64ImgtoFile(base64Img)
-           this.downloadBlob(imgFile, 'test.png')
-           console.log("imgFilewoowow",imgFile)
+          //  var base64Img = 'data:image/png;base64'+","+orderId
+          //  console.log("base64Img",base64Img)
+          //  var imgFile = this.base64ImgtoFile(base64Img)
+          //  this.downloadBlob(imgFile, 'test.png')
+          //  console.log("imgFilewoowow",imgFile)
 
            const blob = this.base64ToBlob(orderId, 'application/pdf');
            this.openPdf(blob);