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

src/xt_pages/hospitalStation/summary.vue

@@ -227,7 +227,7 @@
               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 == 10210"
             >
               确认结算清单
             </el-button>
@@ -510,40 +510,73 @@ export default {
       this.selecting_schs = val
     },
     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 == 10265) {
+        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 {
-              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) {
+          });
+      }else{
+        var that = this;
+        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) {
+          });
+      }
     },
     cancelUploadTwo(row){
       if(this.$store.getters.xt_user.org_id == 10265){

src/xt_pages/medicalScheduling/medical_print.vue

@@ -29,6 +29,10 @@
                                     <td width="120">周五<br />({{ weekArr[4] }})</td>
                                     <td width="120">周六<br />({{ weekArr[5] }})</td>
                                     <td width="120">周日<br />({{ weekArr[6] }})</td>
+                                    <td width="120">调休<br /></td>
+                                    <td width="120">加班<br /></td>
+                                    <td width="120">累计时数<br /></td>
+                                    <td width="120">公休<br /></td>
                                 </tr>
                             </thead>
                             <tbody>
@@ -41,6 +45,10 @@
                                     <td>{{ getClass(item.user_name,5) }}</td>
                                     <td>{{ getClass(item.user_name,6) }}</td>
                                     <td>{{ getClass(item.user_name,0) }}</td>
+                                    <td></td>
+                                    <td></td>
+                                    <td></td>
+                                    <td></td>
                                 </tr>
                             </tbody>
                         </table>

src/xt_pages/user/inspection.vue

@@ -552,7 +552,8 @@ export default {
         patient: 0,
         project_id: 0,
         page: 1
-      }
+      },
+      org_id:0,
     }
   },
   methods: {
@@ -1311,12 +1312,15 @@ export default {
                  
                 if (typeof(inspectionsMap[parseInt(items[index].item_id)])  == "undefined") {
                   
-                  // item.value = inspectionsMap[items[index].id].inspect_value
-                  // item.item_name = inspectionsMap[items[index].id].item_name
+                 
 
-                  item.value = ""
-                  item.item_name = ""
-              
+                  if(this.org_id == 10121 || this.org_id == 0 ){
+                    item.value = inspectionsMap[items[index].id].inspect_value
+                    item.item_name = inspectionsMap[items[index].id].item_name
+                  }else{
+                    item.value = ""
+                    item.item_name = ""
+                  }
 
                 } else {
                  
@@ -1348,7 +1352,7 @@ export default {
                 this.items.push(item)
               }
             
-              // console.log("items232232332wo",this.items)
+              console.log("items232232332wo",this.items)
 
               if(item.value.indexOf("http") >= 0){
                 this.isPic = true
@@ -1365,6 +1369,7 @@ export default {
   },
   created() {
     const id = this.$route.query && this.$route.query.id
+    this.org_id = this.$store.getters.xt_user.org.id,
     this.patientID = parseInt(id)
     if (isNaN(this.patientID) || this.patientID <= 0) {
       this.$notify.error({