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

src/xt_pages/eleFaPiao/settleDetail.vue

@@ -168,7 +168,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column align="center" prop="name" label="操作" v-if="$store.getters.xt_user.org_id != 10318">
+        <el-table-column align="center" prop="name" label="操作" v-if="$store.getters.xt_user.org_id != 10318 && $store.getters.xt_user.org_id != 0">
           <template slot-scope="scope">
             <el-button v-if="scope.row.result.id == 0" size="mini" type="primary"
                         @click="blue(scope.row)">
@@ -212,10 +212,10 @@
                        @click="yulan(scope.row)">
               下载
             </el-button>
-            <el-button size="mini" type="primary" v-if="scope.row.result.id > 0 && scope.row.result.fapiao_status > 0"
-                       @click="BWchaxun(scope.row)">
-              查询并同步发票号码
-            </el-button>
+<!--            <el-button size="mini" type="primary" v-if="scope.row.result.id > 0 && scope.row.result.fapiao_status > 0"-->
+<!--                       @click="BWchaxun(scope.row)">-->
+<!--              查询并同步发票号码-->
+<!--            </el-button>-->
           </template>
         </el-table-column>
 
@@ -441,7 +441,7 @@ export default {
         "admin_user_id":this.$store.getters.xt_user.user.id,
       }
       var that = this;
-      axios.get('http://127.0.0.1:9532/api/fapiao/query',{params:params}).then(function(response) {
+      axios.get('http://127.0.0.1:9532/api/bwfapiao/query',{params:params}).then(function(response) {
         if (response.data.state == 0) {
           that.$message.error(response.data.data.msg);
           return false
@@ -867,8 +867,38 @@ export default {
 
 
     }, BWchaxun(row){
+      let params = {
+        "id": row.result.id,
+        "admin_user_id":this.$store.getters.xt_user.user.id,
+      }
+      var that = this;
+      axios.get('http://127.0.0.1:9531/api/bwfapiao/query',{params:params}).then(function(response) {
+        if (response.data.state == 0) {
+          that.$message.error(response.data.data.msg);
+          return false
+        } else {
+          if(response.data.data.failed_code == -10){
+            that.settlementVisible = false
+            that.$confirm(response.data.data.msg, '错误信息', {
+              confirmButtonText: '确 定',
+              type: 'warning'
+            }).then(() => {
 
+            }).catch(() => {
+            })
+          }else{
+            that.getHisOrderList()
+            that.$confirm(response.data.data.msg, '信息', {
+              confirmButtonText: '确 定',
+              type: 'warning'
+            }).then(() => {
 
+            }).catch(() => {
+            })
+          }
+        }
+      }).catch(function(error) {
+      })
 
 
     },yulan(row){

src/xt_pages/hospitalStation/statementTemplate/printOne.vue

@@ -106,9 +106,9 @@
         <td colspan="2" v-if="info.insutype == '392'">城乡居民大病医疗保险</td>
         <td colspan="2" v-if="info.insutype == '510'">生育保险</td>
         <td>入院第一诊断</td>
-        <td colspan="3">{{info.diagnosis}}</td>
+        <td colspan="3">{{"慢性肾功能不全(血透治疗)"}}</td>
         <td>出院第一诊断</td>
-        <td colspan="4">{{info.diagnosis}}</td>
+        <td colspan="4">{{"慢性肾功能不全(血透治疗)"}}</td>
 
 
       </tr>

src/xt_pages/role/components/AdminInfoForm.vue

@@ -461,7 +461,8 @@ export default {
         { index: 2, name: '医生' },
         { index: 3, name: '护士' },
         { index: 4, name: '行政' },
-        { index: 5, name: '其他' }
+        { index: 5, name: '其他' },
+        { index: 6, name: '药师' }
       ],
       user_titles: [
         { index: 1, name: '医士' },
@@ -476,7 +477,8 @@ export default {
         { index: 10, name: '副主任护师' },
         { index: 11, name: '主任护师' },
         { index: 12, name: '运营专员' },
-        { index: 13, name: '运营主管' }
+        { index: 13, name: '运营主管' },
+        { index: 14, name: '其他' }
       ],
       roles: [], // [{id, name, intro, status}]
       loading: true,

src/xt_pages/role/components/EditAdminInfo.vue

@@ -90,6 +90,7 @@ export default {
                 { index: 11, name: '主任护师' },
                 { index: 12, name: '运营专员' },
                 { index: 13, name: '运营主管' },
+                {  index:14, name:  "其他"}
             ],
             roles: [], // [{id, name, intro, status}]
             loading: true,

src/xt_pages/stock/drugs/drugStockFlow.vue

@@ -708,21 +708,19 @@
             }
 
            
-            if(this.tableList[i].consumable_type == 2 ||this.tableList[i].consumable_type == 3 || this.tableList[i].consumable_type == 5 ||  this.tableList[i].consumable_type ==7  && (parseInt(this.tableList[i].count%this.tableList[i].BaseDrugLib.min_number) >0)){
-            
+            if((this.tableList[i].consumable_type == 2 ||this.tableList[i].consumable_type == 3 || this.tableList[i].consumable_type == 5 ||  this.tableList[i].consumable_type ==7 ) && (parseInt(this.tableList[i].count%this.tableList[i].BaseDrugLib.min_number) >0)){
+             
+              console.log("hhhhhhhhhhhhhhhhhhhhhh1111")
               this.tableList[i].coutn_unit = (parseInt(this.tableList[i].count%this.tableList[i].BaseDrugLib.min_number)).toString() +  this.tableList[i].BaseDrugLib.min_unit
               
             }
 
-            if(this.tableList[i].consumable_type == 2 ||this.tableList[i].consumable_type == 3 || this.tableList[i].consumable_type == 5 ||  this.tableList[i].consumable_type ==7  && (parseInt(this.tableList[i].count/this.tableList[i].BaseDrugLib.min_number) >0)){
-             
+            if((this.tableList[i].consumable_type == 2 ||this.tableList[i].consumable_type == 3 || this.tableList[i].consumable_type == 5 ||  this.tableList[i].consumable_type ==7)  && (parseInt(this.tableList[i].count/this.tableList[i].BaseDrugLib.min_number) >0)){
+              console.log("hhhhhhhhhhhhhhhhhhhhhh2222")
               this.tableList[i].coutn_unit = (parseInt(this.tableList[i].count/this.tableList[i].BaseDrugLib.min_number)).toString() +  this.tableList[i].BaseDrugLib.max_unit
              
             }
 
-            
-
-
 
             if(this.tableList[i].price>0){
               this.tableList[i].total_price = this.tableList[i].price