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

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

                                v-on:cancel="cancel"></next-or-last-prescription>
     <!--<next-or-last-prescription ref='next_or_last_prescription' v-on:save="setValue" v-on:cancel="cancel"></next-or-last-prescription>-->
     <call-prescription ref='call_prescription' v-on:call="call" v-on:call-cancel="callCancel"></call-prescription>
+
+    <el-dialog title="提醒" :visible.sync="dialogTableVisible">
+      <el-table :data="err_msg">
+        <el-table-column label="提示" width="150"></el-table-column>
+      </el-table>
+    </el-dialog>
   </div>
 </template>
 
   },
   data() {
     return {
+      dialogTableVisible:false,
       drugs: [],
+      err_msg:[],
       zuobiao_drug: [],
       zuobiao_project: [],
       start_time: moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
                   data.prescriptions[i]["diagnoses"] = data.prescriptions[i].diagnose.join(",")
                 }
               }
-              createHisPrescription(data, params).then(response => {
-                if (response.data.state == 1) {
-                  this.$emit('change', this.patientInfo.id)
-                  this.$message.success('保存成功!')
-                  this.$emit('editKeepLoad', false)
-                  this.$parent.getInitData()
-                  this.getlist()
 
-                  if(this.org_id == 10653){ //将数据同步到费森系统
-                    var that = this
-                    axios.get('http://127.0.0.1:9531/api/yb/syncadvice', {
-                      params: {patient_id: this.patientInfo.id}
-                    })
-                      .then(function(response) {
-                        if (response.data.state == 0) {
-                          that.$message.error(response.data.msg)
-                          return false
+              //针对广州从化意达对单位进行判断
+              // 在保存处方的时候，在前端判断，所开的药品里的总量单位是否是最小单位
+              // 如果不是，则弹窗提醒“******总量单位不是最小单位，是否继续保存”，
+              // 取消 则不往后台提交，继续，则提交给后台
+              console.log("this.prescriptions[i].advices[b]")
+              // console.log(this.prescriptions[i].advices[b])
+
+              if(this.org_id == 10318){
+                var err_msg = ""
+                for(let i =0; i < this.prescriptions.length; i++){
+                  for(let b= 0; b < this.prescriptions[i].advices.length;b++){
+                    console.log(this.prescriptions[i].advices[b])
+                    if(this.prescriptions[i].advices[b].prescribing_number_unit !=this.prescriptions[i].advices[b].drug.min_unit){
+                      isLoading = false
+                      if(err_msg.length == 0){
+
+                        err_msg = '<span>' + '<span style="color:red">' + this.prescriptions[i].advices[b].drug_name + '</span>' +"总量单位不是最小单位" + '</span>'
+                      }else{
+                        err_msg = err_msg + "</br>"+  '<span>' + '<span style="color:red">' + this.prescriptions[i].advices[b].drug_name + '</span>' +"总量单位不是最小单位" + '</span>'
+                      }
+                    }
+                  }
+                }
+
+                if (err_msg.length > 0){
+                  err_msg = err_msg + "</br>" + '<span style="font-size: 20px">' + "是否继续保存" + '</span>'
+                  this.$confirm(err_msg, '提示信息', {
+                    distinguishCancelAndClose: true,
+                    dangerouslyUseHTMLString: true,
+                    confirmButtonText: '保存',
+                    cancelButtonText: '取消'
+                  })
+                    .then(() => {
+                      createHisPrescription(data, params).then(response => {
+                        if (response.data.state == 1) {
+                          this.$emit('change', this.patientInfo.id)
+                          this.$message.success('保存成功!')
+                          this.$emit('editKeepLoad', false)
+                          this.$parent.getInitData()
+                          this.getlist()
+
                         } else {
-                          if(response.data.data.status == -1){
-                            that.$confirm(response.data.data.msg, '错误信息', {
-                              confirmButtonText: '确 定',
-                              type: 'warning'
-                            }).then(() => {
-                            }).catch(() => {
-                            })
-                          }else{
-                            that.$message.success('同步费森系统成功!')
-                          }
+                          this.$message.error(response.data.msg)
+                          this.$emit('editKeepLoad', false)
+
                         }
                       })
-                      .catch(function(error) {
+                    })
+                    .catch(action => {
+                      // isLoading = false
+                      this.$emit('editKeepLoad', false)
 
-                      })
-                  }
+                    });
 
+                }else{
+                  createHisPrescription(data, params).then(response => {
+                    if (response.data.state == 1) {
+                      this.$emit('change', this.patientInfo.id)
+                      this.$message.success('保存成功!')
+                      this.$emit('editKeepLoad', false)
+                      this.$parent.getInitData()
+                      this.getlist()
 
+                    } else {
+                      this.$message.error(response.data.msg)
+                      this.$emit('editKeepLoad', false)
 
+                    }
+                  })
+                }
+              }else{
+                createHisPrescription(data, params).then(response => {
+                  if (response.data.state == 1) {
+                    this.$emit('change', this.patientInfo.id)
+                    this.$message.success('保存成功!')
+                    this.$emit('editKeepLoad', false)
+                    this.$parent.getInitData()
+                    this.getlist()
+
+                    if(this.org_id == 10653){ //将数据同步到费森系统
+                      var that = this
+                      axios.get('http://127.0.0.1:9531/api/yb/syncadvice', {
+                        params: {patient_id: this.patientInfo.id}
+                      })
+                        .then(function(response) {
+                          if (response.data.state == 0) {
+                            that.$message.error(response.data.msg)
+                            return false
+                          } else {
+                            if(response.data.data.status == -1){
+                              that.$confirm(response.data.data.msg, '错误信息', {
+                                confirmButtonText: '确 定',
+                                type: 'warning'
+                              }).then(() => {
+                              }).catch(() => {
+                              })
+                            }else{
+                              that.$message.success('同步费森系统成功!')
+                            }
+                          }
+                        })
+                        .catch(function(error) {
+                        })
+                    }
+                  } else {
+                    this.$message.error(response.data.msg)
+                    this.$emit('editKeepLoad', false)
 
-                } else {
-                  this.$message.error(response.data.msg)
-                  this.$emit('editKeepLoad', false)
+                  }
+                })
 
-                }
-              })
+              }
             }
           }
 

src/xt_permission.js

 const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名单
 
 router.beforeEach((to, from, next) => {
-  // 线上注释
+  // // 线上注释
   // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
   //   store.dispatch('VerifyConfigList', []).then(() => {
   //     next()