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

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -398,7 +398,6 @@ export default {
       currentIndex:0,
       is_drug_open:"2",
       textarea:"",
-      drug_code_open:0,
       patientList:[]
 
     };
@@ -419,6 +418,7 @@ export default {
       getpartitionlist(params).then((res) => {
         if (res.data.state == 1) {
           this.fen = res.data.data.list;
+          this.is_drug_open = res.data.data.config.is_open
         }
       });
     },
@@ -536,7 +536,7 @@ export default {
           this.waitmount = res.data.data.itotal;
           this.alreadmount = res.data.data.wtotal;
           this.drugList = res.data.data.drug
-          this.drug_code_open = res.data.data.config.is_open
+          this.is_drug_open = res.data.data.config.is_open
         }
       });
       // console.log("2222222")
@@ -926,61 +926,68 @@ export default {
               cancelButtonText: "取 消",
               type: "warning",
             }).then(() => {
-              var tmp = that.currentRow.PatientID;
-              var params = {
-                patient_id: that.currentRow.PatientID,
-                time: that.start_time,
-              };
-              that.$confirm("确定是否对该患者进行发药?", "患者发药", {
-                confirmButtonText: "确 定",
-                cancelButtonText: "取 消",
-                type: "warning",
-              }).then(() => {
-                dispensingmedicine(params).then((res) => {
-                  if (res.data.state == 1) {
-                    that.$message.success("操作成功");
-                    that.gettodaynumber();
-                    that.searchAction();
-                    that.tableData = null;
-                    that.fun4(tmp);
-                    that.state = 2;
-
-                    //进行追溯码上传
-                    axios.get('http://127.0.0.1:9532/api/changedrug/four', {
-                      params:params
-                    })
-                      .then(function(response) {
-                        if (response.data.state == 0) {
-                          that.$message.error(response.data.msg)
-                          return false
+
+            })
+              .catch(() => {});
+            return false
+          } else {
+            var tmp = that.currentRow.PatientID;
+            var params = {
+              patient_id: that.currentRow.PatientID,
+              time: that.start_time,
+              admin_user_id: that.$store.getters.xt_user.user.id,
+            };
+            that.$confirm("确定是否对该患者进行发药?", "患者发药", {
+              confirmButtonText: "确 定",
+              cancelButtonText: "取 消",
+              type: "warning",
+            }).then(() => {
+              dispensingmedicine(params).then((res) => {
+                if (res.data.state == 1) {
+                  that.$message.success("操作成功");
+                  that.gettodaynumber();
+                  that.searchAction();
+                  that.tableData = null;
+                  that.fun4(tmp);
+                  that.state = 2;
+                  //进行追溯码上传
+                  axios.get('http://127.0.0.1:9532/api/changedrug/four', {
+                    params:params
+                  })
+                    .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 {
-                          if (response.data.data.failed_code == -10) {
-                            that.$confirm(response.data.data.msg, '医保错误信息', {
+                          if(response.data.data.msg.length > 0){
+                            that.$confirm(response.data.data.msg, '上传信息', {
                               confirmButtonText: '确 定',
                               type: 'warning'
                             }).then(() => {
 
                             }).catch(() => {
                             })
-
-                          } else {
-
                           }
                         }
-                      })
-                      .catch(function(error) {
-                      })
-                  } else {
-                    that.$message.error(res.data.msg);
-                  }
-                });
-              })
-                .catch(() => {});
+                      }
+                    })
+                    .catch(function(error) {
+                    })
+                } else {
+                  that.$message.error(res.data.msg);
+                }
+              });
             })
               .catch(() => {});
-            return false
-          } else {
-
           }
         }).catch(function(error) {
           that.$confirm("数据异常，请检查医保程序是否有打开", "提示", {
@@ -1072,6 +1079,7 @@ export default {
             var tmp = that.currentRow.PatientID;
             var params = {
               patient_id: that.currentRow.PatientID,
+              admin_user_id: that.$store.getters.xt_user.user.id,
               time: that.start_time,
             };
             that.$confirm("确定是否对该患者进行退药?", "患者退药", {
@@ -1105,9 +1113,16 @@ export default {
 
                           }).catch(() => {
                           })
-
                         } else {
+                          if(response.data.data.msg.length > 0){
+                            that.$confirm(response.data.data.msg, '上传信息', {
+                              confirmButtonText: '确 定',
+                              type: 'warning'
+                            }).then(() => {
 
+                            }).catch(() => {
+                            })
+                          }
                         }
                       }
                     })

src/xt_pages/dialysis/details/consumable/dialysisDrug.vue

@@ -335,7 +335,7 @@
         name ="IUF"
       }
       if(val == 8){
-        name ="IUF"
+        name ="HFHD"
       }
       if(val == 9){
         name ="HFHD+HP"

src/xt_pages/dialysis/details/consumable/dialysisGood.vue

@@ -560,7 +560,7 @@
         name ="IUF"
       }
       if(val == 8){
-        name ="IUF"
+        name ="HFHD"
       }
       if(val == 9){
         name ="HFHD+HP"
@@ -643,6 +643,21 @@
       if(val == 39){
         name = "HF16"
       }
+      if(val == 40){
+        name = "HD(无肝素)"
+      }
+      if(val == 41){
+        name = "HDF17H"
+      }
+      if(val == 42){
+        name = "HD."
+      }
+      if(val == 43){
+        name = "HD(2)"
+      }
+      if(val == 44){
+        name = "导管溶栓"
+      }
       return name
       },
       exportList(){

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -815,7 +815,7 @@
                         </el-form-item>
                     </el-col>
 
-                    <el-col :span="8" v-if="isShows('透析器') && this.$store.getters.xt_user.template_info.org_id != 10164">
+                    <el-col :span="8" v-if="isShows('透析器') && this.$store.getters.xt_user.template_info.org_id != 10164 && this.$store.getters.xt_user.template_info.org_id != 10727">
                         <el-form-item label="透析器:" prop="dialysis_dialyszers" :rules="isCheckmust('透析器')">
                             <el-input v-model="dialysisPrescription.dialysis_dialyszers"
                                       @focus="showInnerDialog('7')"></el-input>
@@ -823,7 +823,7 @@
                     </el-col>
 
 
-                    <el-col :span="8" v-if="isShows('透析器') && this.$store.getters.xt_user.template_info.org_id == 10164"  >
+                    <el-col :span="8" v-if="isShows('透析器') && (this.$store.getters.xt_user.template_info.org_id == 10164 || this.$store.getters.xt_user.template_info.org_id == 10727)"  >
                         <el-form-item label="透析器:" prop="dialysis_dialyszers" :rules="isCheckmust('透析器')">
                             <el-input v-model="dialysisPrescription.dialysis_dialyszers"
                                       @focus="showInnerDialog('20')"></el-input>

src/xt_pages/drugSourceCode/drugChange.vue

@@ -48,25 +48,10 @@
             </el-option>
           </el-select>
         </div>
-        <div>
-          <span>变更状态:</span>
-          <el-select size="small" v-model="change_type" placeholder="请选择"
-                    style="width:100px;" @change="change">
-            <el-option
-              label="不限"
-              value="3">
-            </el-option>
-            <el-option
-              v-for="item,index in changes"
-              :key="index"
-              :label="item.name"
-              :value="item.id">
-            </el-option>
-          </el-select>
-        </div>
+
         <div>
           <el-button type="primary" @click="query()">查询</el-button>
-          <el-button type="primary" @click="change_stock()">销售变更</el-button>
+          <el-button type="primary" @click="change_stock()">批量销售上传</el-button>
           <el-button type="primary" @click="exportdata()">导出</el-button>
 
           <!--        <el-button type="primary" @click="change()">变更</el-button>-->
@@ -128,12 +113,6 @@
           </template>
         </el-table-column>
 
-        <el-table-column align="center" prop="total" label="变更状态">
-          <template slot-scope="scope">
-            <div>{{scope.row.is_bg?'已变更':'未变更'}}</div>
-          </template>
-        </el-table-column>
-
         <el-table-column align="center" prop="total" label="盘存日期">
           <template slot-scope="scope">
             <div>{{scope.row.pc_date}}</div>
@@ -142,8 +121,8 @@
 
         <el-table-column label="操作" width="200">
           <template slot-scope="scope">
-            <el-button v-if="!scope.row.is_sale || scope.row.is_sale == 0 || scope.row.is_bg == 0" type="primary" @click="sigle_stock(scope.row)">销售变更</el-button>
-            <el-button v-if="scope.row.is_sale == 1 || scope.row.is_bg == 1" type="warning" @click="deleteStock(scope.row)">撤销</el-button>
+            <el-button v-if="!scope.row.is_sale || scope.row.is_sale == 0" type="primary" @click="sigle_stock(scope.row)">销售上传</el-button>
+            <el-button v-if="scope.row.is_sale == 1" type="warning" @click="deleteStock(scope.row)">撤销</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -210,12 +189,6 @@
           </template>
         </el-table-column>
 
-        <el-table-column align="center" prop="total" label="变更状态">
-          <template slot-scope="scope">
-            <div>{{scope.row.is_bg?'已变更':'未变更'}}</div>
-          </template>
-        </el-table-column>
-
         <el-table-column align="center" prop="total" label="盘存日期">
           <template slot-scope="scope">
             <div>{{scope.row.pc_date}}</div>
@@ -291,7 +264,7 @@ export default {
       patientList:[],
       crumbs: [
         { path: false, name: '药品追溯' },
-        { path: false, name: '药品变更' }
+        { path: false, name: '药品销售' }
       ],
     }
   },
@@ -336,33 +309,51 @@ export default {
         ids:ids,
         admin_user_id:this.$store.getters.xt_user.user.id
       };
-      this.isloading = true
-      axios.get('http://127.0.0.1:9532/api/delete_xs_bg',{params:params}).then(function(response) {
+      axios.get('http://127.0.0.1:9532/test/net',{}).then(function(response) {
         if (response.data.state == 0) {
-          this.isloading = false
+          // that.$message.error(response.data.data.msg);
+          that.$confirm("请检查医保程序是否有打开", "提示", {
+            confirmButtonText: "确 定",
+            cancelButtonText: "取 消",
+            type: "warning",
+          }).then(() => {
+            axios.get('http://127.0.0.1:9532/api/delete_xs_bg',{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.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+                  }).catch(() => {
+                  })
+                }else{
+                  that.GetDrugStock()
+
+                }
+              }
+            }).catch(function(error) {
+            })
 
-          that.$message.error(response.data.data.msg);
+          })
+            .catch(() => {});
           return false
         } else {
-          this.isloading = false
-          if(response.data.data.failed_code == -10){
-            that.$confirm(response.data.data.msg, '医保错误信息', {
-              confirmButtonText: '确 定',
-              type: 'warning'
-            }).then(() => {
-
-            }).catch(() => {
-            })
-          }else{
-            that.GetDrugStock()
-
 
-          }
         }
       }).catch(function(error) {
+        that.$confirm("请检查医保程序是否有打开", "提示", {
+          confirmButtonText: "确 定",
+          cancelButtonText: "取 消",
+          type: "warning",
+        }).then(() => {
+        })
+          .catch(() => {});
       })
 
-
     },
     sigle_stock(row){
       var that = this;
@@ -370,24 +361,52 @@ export default {
         ids:row.id,
         admin_user_id:this.$store.getters.xt_user.user.id
       };
-      axios.get('http://127.0.0.1:9532/api/changedrug',{params:params}).then(function(response) {
+
+      axios.get('http://127.0.0.1:9532/test/net',{}).then(function(response) {
         if (response.data.state == 0) {
-          that.$message.error(response.data.data.msg);
+          // that.$message.error(response.data.data.msg);
+          that.$confirm("请检查医保程序是否有打开", "提示", {
+            confirmButtonText: "确 定",
+            cancelButtonText: "取 消",
+            type: "warning",
+          }).then(() => {
+
+
+          })
+            .catch(() => {});
           return false
         } else {
-          if(response.data.data.failed_code == -10){
-            that.$confirm(response.data.data.msg, '医保错误信息', {
-              confirmButtonText: '确 定',
-              type: 'warning'
-            }).then(() => {
-            }).catch(() => {
-            })
-          }else{
 
-          }
+          axios.get('http://127.0.0.1:9532/api/changedrug',{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.$confirm(response.data.data.msg, '医保错误信息', {
+                  confirmButtonText: '确 定',
+                  type: 'warning'
+                }).then(() => {
+                }).catch(() => {
+                })
+              }else{
+
+
+              }
+            }
+          }).catch(function(error) {
+          })
         }
       }).catch(function(error) {
+        that.$confirm("请检查医保程序是否有打开", "提示", {
+          confirmButtonText: "确 定",
+          cancelButtonText: "取 消",
+          type: "warning",
+        }).then(() => {
+        })
+          .catch(() => {});
       })
+
     },
     handleSizeChange(val) {
       this.limit = val
@@ -445,6 +464,7 @@ export default {
       return jsonData.map(v => filterVal.map(j => v[j]))
     },
     change_stock(){
+
       let ids  = ""
       for (var i = 0; i < this.selection.length; i++){
         if (ids.length == 0){
@@ -453,30 +473,64 @@ export default {
           ids = ids + "," + this.selection[i].id
         }
       }
+      if(ids.length == 0 ){
+        this.$message.error("请勾选需要上传的数据");
+        return
+      }
+
       var that = this;
       let params = {
         ids:ids,
         admin_user_id:this.$store.getters.xt_user.user.id
       };
-      axios.get('http://127.0.0.1:9532/api/changedrug',{params:params}).then(function(response) {
+
+      axios.get('http://127.0.0.1:9532/test/net',{}).then(function(response) {
         if (response.data.state == 0) {
-          that.$message.error(response.data.data.msg);
+          // that.$message.error(response.data.data.msg);
+          that.$confirm("请检查医保程序是否有打开", "提示", {
+            confirmButtonText: "确 定",
+            cancelButtonText: "取 消",
+            type: "warning",
+          }).then(() => {
+          })
+            .catch(() => {});
           return false
         } else {
-          if(response.data.data.failed_code == -10){
-            that.$confirm(response.data.data.msg, '医保错误信息', {
-              confirmButtonText: '确 定',
-              type: 'warning'
-            }).then(() => {
-            }).catch(() => {
-            })
-          }else{
-
-          }
+          axios.get('http://127.0.0.1:9532/api/changedrug',{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.$confirm(response.data.data.msg, '医保错误信息', {
+                  confirmButtonText: '确 定',
+                  type: 'warning'
+                }).then(() => {
+                }).catch(() => {
+                })
+              }else{
+
+              }
+            }
+          }).catch(function(error) {
+          })
         }
       }).catch(function(error) {
+        that.$confirm("请检查医保程序是否有打开", "提示", {
+          confirmButtonText: "确 定",
+          cancelButtonText: "取 消",
+          type: "warning",
+        }).then(() => {
+        })
+          .catch(() => {});
       })
 
+
+
+
+
+
+
     },
     query(){
       this.GetDrugStock()

src/xt_pages/drugSourceCode/drugCodeQuery.vue

@@ -30,8 +30,8 @@
             value-format="yyyy-MM-dd"
           ></el-date-picker>
         </div>
-  
-  
+
+
         <div>
           <div>上传状态:
             <el-select size="small" v-model="is_sale" placeholder="请选择" style="width:100px;" @change="changeStock">
@@ -44,7 +44,7 @@
             </el-select>
          </div>
         </div>
-  
+
         <div>
           <el-button type="primary" @click="query()">查询</el-button>
           <el-button type="primary" @click="exportdata()">导出</el-button>
@@ -74,7 +74,7 @@
         </el-table-column>
         <el-table-column align="center" prop="name" label="药品追溯码">
           <template slot-scope="scope">
-            <div @click="getDrugCode(scope.row.id,scope.row.DataSources,scope.row.drug_code,scope.$index)"><el-input style="width: 100;" v-model="scope.row.drug_code"></el-input></div> 
+            <div @click="getDrugCode(scope.row.id,scope.row.DataSources,scope.row.drug_code,scope.$index)"><el-input style="width: 100;" v-model="scope.row.drug_code"></el-input></div>
           </template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="上传状态">
@@ -94,14 +94,14 @@
         <el-table-column align="center" prop="name" label="操作" width="200">
           <template slot-scope="scope">
             <div>
-             <el-button v-if="scope.row.is_upload == 1" type="primary" @click="sigle_stock(scope.row)">未上传</el-button>   
+             <el-button v-if="scope.row.is_upload == 1" type="primary" @click="sigle_stock(scope.row)">撤销</el-button>
             <el-button type="primary" v-if="scope.row.is_upload == 0 || scope.row.is_upload == 2" @click="toUpload(scope.row)">上传</el-button>
-            <el-button v-if="faShow == true" type="primary" @click="toFaYao(scope.row)">发药</el-button>   
+            <el-button v-if="faShow == true" type="primary" @click="toFaYao(scope.row)">发药</el-button>
             </div>
           </template>
         </el-table-column>
-  
-       
+
+
       </el-table>
       <el-pagination
         @size-change="handleSizeChange"
@@ -112,10 +112,10 @@
         style="margin-top:20px;float: right"
         :total="value"
       ></el-pagination>
-  
-    
- 
-  
+
+
+
+
 
       <el-dialog
         title="药品追溯码"
@@ -137,18 +137,18 @@
       </span>
       </el-dialog>
     </div>
-  
-   
+
+
   </template>
-  
-  
+
+
   <script>
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import { getHisDrugCodeQueryList,createUploadDrugCode,getPatientDrugCode } from '../../api/new_stock/stock'
   import { getDictionaryDataConfig } from "@/utils/data";
   import { uParseTime } from '@/utils/tools'
   import { changeDrugCode } from "@/api/pharmacy";
-  
+
   import axios from 'axios'
   const moment = require('moment')
   export default {
@@ -160,7 +160,7 @@
         drugTypeList: [{ id: 0, name: "全部" }],
         start_time: new Date(new Date().getFullYear(), new Date().getMonth(), 1).toLocaleDateString('en-CA'),
         end_time: new Date(new Date().getFullYear(), new Date().getMonth() + 1, 0).toLocaleDateString('en-CA'),
-  
+
         tableData: [],
         change_type:"3",
         selection:[],
@@ -198,7 +198,7 @@
         }
        },
        getDrugCode(id,DataSources,DrugCode,index){
-            this.id = id 
+            this.id = id
             this.textarea = DrugCode
             this.currentIndex = index
             this.dialogVisibleOne = true
@@ -276,8 +276,8 @@
         this.selection = selection
       },
       delete(){
-  
-  
+
+
       },
       exportdata(){
         console.log("hahahahh",this.tableData)
@@ -301,7 +301,7 @@
              this.tableData[i].specification_name = this.getDrugSpec(this.tableData[i].drug_id)
            }
         }
-       
+
         import('@/vendor/Export2Excel').then(excel => {
           const tHeader = ['患者姓名', '处方日期', '药品名称', '规格', '开药总量', '药品追溯码','上传状态','发药状态']
           const filterVal = ['patient_name', 'advice_date_str', 'advice_name', 'specification_name', 'prescribing_numbers', 'drug_code','is_upload_name','is_medicine_name']
@@ -313,11 +313,11 @@
            filename: '药品追溯'
          })
         })
-  
+
       },formatJson(filterVal, jsonData) {
         return jsonData.map(v => filterVal.map(j => v[j]))
       },
-    
+
       query(){
         this.getlist()
       },
@@ -328,9 +328,9 @@
             name = this.drugTypeList[i].name;
           }
         }
-  
+
         return name;
-      },  
+      },
       getTime(val) {
         if(val == "" || val == undefined){
           return ""
@@ -346,7 +346,7 @@
           page:this.page,
           limit:this.limit,
           is_sale:this.is_sale,
-        
+
         }
         getHisDrugCodeQueryList(params).then(response => {
           if (response.data.state == 0) {
@@ -389,7 +389,7 @@
         })
       },
       toFaYao(row){
-        
+
         if(this.is_open == 1){
           if(row.drug_code==''){
              this.$message.error("药品追溯码不能为空!")
@@ -405,7 +405,7 @@
           if(response.data.state == 1){
              this.$message.success("发药成功!")
              this.getlist()
-          } 
+          }
         })
       }
     },
@@ -416,5 +416,4 @@
     }
   }
   </script>
-  
-  
+

src/xt_pages/drugSourceCode/drugQuery.vue

@@ -1,5 +1,9 @@
 <template>
   <div>
+    <div class="position">
+      <BreadCrumb :crumbs="crumbs"></BreadCrumb>
+    </div>
+    <div class="app-container">
     <div style="display: flex;justify-content: space-between;margin-bottom:10px;">
       <div class="cell clearfix">
         <span>入库时间:</span>
@@ -31,8 +35,7 @@
         ></el-date-picker>
       </div>
 
-
-      <div>
+      <div class="cell clearfix">
         <div>查询类型:</div>
         <el-select size="small" v-model="stock_type" placeholder="请选择"
                    style="width:100px;margin-left:10px;" @change="changeStockType">
@@ -45,7 +48,7 @@
         </el-select>
       </div>
 
-      <div>
+      <div class="cell clearfix">
         <div>药品:</div>
         <el-select size="small" v-model="drug_id" placeholder="请选择"
                    style="width:100px;margin-left:10px;" @change="change">
@@ -65,6 +68,7 @@
         <el-button type="primary" @click="query()">查询</el-button>
       </div>
     </div>
+    </div>
     <el-table v-if="stock_type == 1" :data="tableData" border :row-style="{ color: '#303133' }" ref="table"
               :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
               max-height="600"
@@ -609,7 +613,6 @@ export default {
 
     },
     query(){
-
       var that = this;
       let params = {
         id:this.drug_id,
@@ -617,162 +620,195 @@ export default {
         end_time:this.end_time,
         admin_user_id:this.$store.getters.xt_user.user.id
       };
-      this.tableData = []
-      if(this.stock_type == 1){
-
-        axios.get('http://127.0.0.1:9532/api/3508',{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.$confirm(response.data.data.msg, '医保错误信息', {
-                confirmButtonText: '确 定',
-                type: 'warning'
-              }).then(() => {
-
-              }).catch(() => {
-              })
-            }else{
-              this.tableData = this.tableData.concat(response.data.data.info)
 
-            }
-          }
-        }).catch(function(error) {
-        })
 
-      }else if(this.stock_type == 2){
-        axios.get('http://127.0.0.1:9532/api/3509',{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.$confirm(response.data.data.msg, '医保错误信息', {
-                confirmButtonText: '确 定',
-                type: 'warning'
-              }).then(() => {
-
-              }).catch(() => {
+      axios.get('http://127.0.0.1:9532/test/net',{}).then(function(response) {
+        if (response.data.state == 0) {
+          that.isloading = false
+
+          // that.$message.error(response.data.data.msg);
+          that.$confirm("请检查医保程序是否有打开", "提示", {
+            confirmButtonText: "确 定",
+            cancelButtonText: "取 消",
+            type: "warning",
+          }).then(() => {
+
+            this.tableData = []
+            if(that.stock_type == 1){
+
+              axios.get('http://127.0.0.1:9532/api/3508',{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.$confirm(response.data.data.msg, '医保错误信息', {
+                      confirmButtonText: '确 定',
+                      type: 'warning'
+                    }).then(() => {
+
+                    }).catch(() => {
+                    })
+                  }else{
+                    that.tableData = that.tableData.concat(response.data.data.info)
+
+                  }
+                }
+              }).catch(function(error) {
               })
-            }else{
-              this.tableData = this.tableData.concat(response.data.data.info)
-
-            }
-          }
-        }).catch(function(error) {
-        })
 
-      }else if(this.stock_type == 3){
-        axios.get('http://127.0.0.1:9532/api/3511',{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.$confirm(response.data.data.msg, '医保错误信息', {
-                confirmButtonText: '确 定',
-                type: 'warning'
-              }).then(() => {
-
-              }).catch(() => {
+            }else if(that.stock_type == 2){
+              axios.get('http://127.0.0.1:9532/api/3509',{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.$confirm(response.data.data.msg, '医保错误信息', {
+                      confirmButtonText: '确 定',
+                      type: 'warning'
+                    }).then(() => {
+
+                    }).catch(() => {
+                    })
+                  }else{
+                    that.tableData = that.tableData.concat(response.data.data.info)
+
+                  }
+                }
+              }).catch(function(error) {
               })
-            }else{
-              this.tableData = this.tableData.concat(response.data.data.info)
 
-            }
-          }
-        }).catch(function(error) {
-        })
+            }else if(that.stock_type == 3){
+              axios.get('http://127.0.0.1:9532/api/3511',{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.$confirm(response.data.data.msg, '医保错误信息', {
+                      confirmButtonText: '确 定',
+                      type: 'warning'
+                    }).then(() => {
+
+                    }).catch(() => {
+                    })
+                  }else{
+                    that.tableData = that.tableData.concat(response.data.data.info)
+
+                  }
+                }
+              }).catch(function(error) {
+              })
 
-      }else if(this.stock_type == 4){
-        axios.get('http://127.0.0.1:9532/api/3512',{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.$confirm(response.data.data.msg, '医保错误信息', {
-                confirmButtonText: '确 定',
-                type: 'warning'
-              }).then(() => {
-
-              }).catch(() => {
+            }else if(that.stock_type == 4){
+              axios.get('http://127.0.0.1:9532/api/3512',{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.$confirm(response.data.data.msg, '医保错误信息', {
+                      confirmButtonText: '确 定',
+                      type: 'warning'
+                    }).then(() => {
+
+                    }).catch(() => {
+                    })
+                  }else{
+                    that.tableData = that.tableData.concat(response.data.data.info)
+
+                  }
+                }
+              }).catch(function(error) {
               })
-            }else{
-              this.tableData = this.tableData.concat(response.data.data.info)
 
-            }
-          }
-        }).catch(function(error) {
-        })
+            }else if(that.stock_type == 5){
+              axios.get('http://127.0.0.1:9532/api/3513',{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.$confirm(response.data.data.msg, '医保错误信息', {
+                      confirmButtonText: '确 定',
+                      type: 'warning'
+                    }).then(() => {
+
+                    }).catch(() => {
+                    })
+                  }else{
+                    that.tableData = that.tableData.concat(response.data.data.info)
+
+                  }
+                }
+              }).catch(function(error) {
+              })
 
-      }else if(this.stock_type == 5){
-        axios.get('http://127.0.0.1:9532/api/3513',{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.$confirm(response.data.data.msg, '医保错误信息', {
-                confirmButtonText: '确 定',
-                type: 'warning'
-              }).then(() => {
-
-              }).catch(() => {
+            }else if(this.stock_type == 6){
+              axios.get('http://127.0.0.1:9532/api/35081',{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.$confirm(response.data.data.msg, '医保错误信息', {
+                      confirmButtonText: '确 定',
+                      type: 'warning'
+                    }).then(() => {
+
+                    }).catch(() => {
+                    })
+                  }else{
+                    that.tableData = that.tableData.concat(response.data.data.info)
+
+                  }
+                }
+              }).catch(function(error) {
               })
-            }else{
-              this.tableData = this.tableData.concat(response.data.data.info)
 
+            }else if(that.stock_type == 7){
+              axios.get('http://127.0.0.1:9532/api/35082',{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.$confirm(response.data.data.msg, '医保错误信息', {
+                      confirmButtonText: '确 定',
+                      type: 'warning'
+                    }).then(() => {
+
+                    }).catch(() => {
+                    })
+                  }else{
+                    that.tableData = that.tableData.concat(response.data.data.info)
+
+                  }
+                }
+              }).catch(function(error) {
+              })
             }
-          }
-        }).catch(function(error) {
-        })
 
-      }else if(this.stock_type == 6){
-        axios.get('http://127.0.0.1:9532/api/35081',{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.$confirm(response.data.data.msg, '医保错误信息', {
-                confirmButtonText: '确 定',
-                type: 'warning'
-              }).then(() => {
-
-              }).catch(() => {
-              })
-            }else{
-              this.tableData = this.tableData.concat(response.data.data.info)
 
-            }
-          }
-        }).catch(function(error) {
+          })
+            .catch(() => {});
+          return false
+        } else {
+
+        }
+      }).catch(function(error) {
+        that.$confirm("请检查医保程序是否有打开", "提示", {
+          confirmButtonText: "确 定",
+          cancelButtonText: "取 消",
+          type: "warning",
+        }).then(() => {
         })
+          .catch(() => {});
+      })
+
 
-      }else if(this.stock_type == 7){
-        axios.get('http://127.0.0.1:9532/api/35082',{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.$confirm(response.data.data.msg, '医保错误信息', {
-                confirmButtonText: '确 定',
-                type: 'warning'
-              }).then(() => {
-
-              }).catch(() => {
-              })
-            }else{
-              this.tableData = this.tableData.concat(response.data.data.info)
 
-            }
-          }
-        }).catch(function(error) {
-        })
-      }
     },
     change(){
 

src/xt_pages/drugSourceCode/drugStock.vue

@@ -33,12 +33,10 @@
             value-format="yyyy-MM-dd"
             @change="endTimeChange"
           ></el-date-picker>
-        </div>
 
-        <div>
-          <span>盘存状态:</span>
+          <span>销售状态:</span>
           <el-select size="small" v-model="stock_type" placeholder="请选择"
-                    style="width:100px;" @change="changeStock">
+                     style="width:100px;" @change="changeStock">
             <el-option
               label="不限"
               value="0">
@@ -52,32 +50,19 @@
           </el-select>
         </div>
 
-        <div>
-          <span>变更状态:</span>
-          <el-select size="small" v-model="change_type" placeholder="请选择"
-                    style="width:100px;" @change="change">
-            <el-option
-              label="不限"
-              value="0">
-            </el-option>
-            <el-option
-              v-for="item,index in changes"
-              :key="index"
-              :label="item.name"
-              :value="item.id">
-            </el-option>
-          </el-select>
-        </div>
+<!--        <el-input size="small" style="width:150px;" v-model="keywords" @input="searchAction"-->
+<!--                  @keyup.enter.native='searchAction'-->
+<!--                  placeholder="请输入药品名称"-->
+<!--                  class="filter-item"/>-->
+
         <div>
           <el-button type="primary" @click="query()" >查询</el-button>
           <el-button type="primary" v-loading="isloading" @click="stock()">盘存</el-button>
           <el-button type="primary" @click="exportdata()">导出</el-button>
-
-          <!--        <el-button type="primary" @click="change()">变更</el-button>-->
         </div>
       </div>
-      <el-table :data="tableData" border :row-style="{ color: '#303133' }" ref="table2"
-                :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
+      <el-table :data="tableData" border :row-style="{ color: '#303133', height: '40px' }" ref="table2"
+                :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266' }"
                 max-height="600"
                 @select="selectCostInfo"
                 @selection-change="changeCostInfoTableData"
@@ -96,17 +81,15 @@
           <template slot-scope="scope">{{scope.row.spec}}</template>
         </el-table-column>
 
-        <el-table-column align="center" prop="name" label="追溯码">
-          <template slot-scope="scope">{{scope.row.drug_code}}</template>
-        </el-table-column>
-
-        <el-table-column align="center" prop="name" label="批号">
+        <el-table-column  width="100px"   align="center" prop="name" label="追溯码">
           <template slot-scope="scope">{{scope.row.drug_code}}</template>
         </el-table-column>
 
         <el-table-column align="center" prop="name" label="批号">
           <template slot-scope="scope">{{scope.row.batch_number}}</template>
         </el-table-column>
+
+
         <el-table-column align="center" prop="name" label="入库数量">
           <template slot-scope="scope">
             <div>{{scope.row.count}}{{scope.row.unit}}</div>
@@ -129,11 +112,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column align="center" prop="total" label="变更状态">
-          <template slot-scope="scope">
-            <div>{{scope.row.is_bg?'已变更':'未变更'}}</div>
-          </template>
-        </el-table-column>
+
 
         <el-table-column align="center" prop="total" label="盘存日期">
           <template slot-scope="scope">
@@ -203,11 +182,6 @@
           </template>
         </el-table-column>
 
-        <el-table-column align="center" prop="total" label="变更状态">
-          <template slot-scope="scope">
-            <div>{{scope.row.is_bg?'已变更':'未变更'}}</div>
-          </template>
-        </el-table-column>
 
         <el-table-column align="center" prop="total" label="盘存日期">
           <template slot-scope="scope">
@@ -239,6 +213,7 @@ export default {
   },
   data() {
     return {
+      keywords:"",
       drugTypeList: [{ id: 0, name: "全部" }],
       start_time: new Date(new Date().getFullYear(), new Date().getMonth(), 1).toLocaleDateString('en-CA'),
       end_time: new Date(new Date().getFullYear(), new Date().getMonth() + 3, 0).toLocaleDateString('en-CA'),
@@ -263,34 +238,66 @@ export default {
     }
   },
   methods: {
+    searchAction(){
+
+
+    },
     sigle_stock(row){
       let ids  = row.id
       var that = this;
+
       let params = {
         ids:ids,
         admin_user_id:this.$store.getters.xt_user.user.id
       };
-      axios.get('http://127.0.0.1:9532/api/pc_bg',{params:params}).then(function(response) {
+
+      axios.get('http://127.0.0.1:9532/test/net',{}).then(function(response) {
         if (response.data.state == 0) {
-          that.$message.error(response.data.data.msg);
+          // that.$message.error(response.data.data.msg);
+          that.$confirm("请检查医保程序是否有打开", "提示", {
+            confirmButtonText: "确 定",
+            cancelButtonText: "取 消",
+            type: "warning",
+          }).then(() => {
+
+
+          })
+            .catch(() => {});
           return false
         } else {
-          if(response.data.data.failed_code == -10){
-            that.$confirm(response.data.data.msg, '医保错误信息', {
-              confirmButtonText: '确 定',
-              type: 'warning'
-            }).then(() => {
 
-            }).catch(() => {
-            })
-          }else{
-            that.GetDrugStock()
-
-          }
+          //有打开则调用接口
+          axios.get('http://127.0.0.1:9532/api/pc_bg',{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.$confirm(response.data.data.msg, '医保错误信息', {
+                  confirmButtonText: '确 定',
+                  type: 'warning'
+                }).then(() => {
+
+                }).catch(() => {
+                })
+              }else{
+                that.GetDrugStock()
+              }
+            }
+          }).catch(function(error) {
+          })
         }
       }).catch(function(error) {
+        that.$confirm("请检查医保程序是否有打开", "提示", {
+          confirmButtonText: "确 定",
+          cancelButtonText: "取 消",
+          type: "warning",
+        }).then(() => {
+        })
+          .catch(() => {});
       })
 
+
     },
     selectCostInfo(selection, row) {
       this.selection = selection
@@ -306,32 +313,56 @@ export default {
         ids:ids,
         admin_user_id:this.$store.getters.xt_user.user.id
       };
-      this.isloading = true
-      axios.get('http://127.0.0.1:9532/api/delete_pc_bg',{params:params}).then(function(response) {
+
+
+
+
+      axios.get('http://127.0.0.1:9532/test/net',{}).then(function(response) {
         if (response.data.state == 0) {
-          this.isloading = false
+          // that.$message.error(response.data.data.msg);
+          that.$confirm("请检查医保程序是否有打开", "提示", {
+            confirmButtonText: "确 定",
+            cancelButtonText: "取 消",
+            type: "warning",
+          }).then(() => {
 
-          that.$message.error(response.data.data.msg);
+
+          })
+            .catch(() => {});
           return false
         } else {
-          this.isloading = false
-          if(response.data.data.failed_code == -10){
-            that.$confirm(response.data.data.msg, '医保错误信息', {
-              confirmButtonText: '确 定',
-              type: 'warning'
-            }).then(() => {
+          axios.get('http://127.0.0.1:9532/api/delete_pc_bg',{params:params}).then(function(response) {
+            if (response.data.state == 0) {
 
-            }).catch(() => {
-            })
-          }else{
-            that.GetDrugStock()
+              that.$message.error(response.data.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.GetDrugStock()
 
-          }
+
+              }
+            }
+          }).catch(function(error) {
+          })
         }
       }).catch(function(error) {
+        that.$confirm("请检查医保程序是否有打开", "提示", {
+          confirmButtonText: "确 定",
+          cancelButtonText: "取 消",
+          type: "warning",
+        }).then(() => {
+        })
+          .catch(() => {});
       })
-
     },
     exportdata(){
       let list = []
@@ -381,38 +412,62 @@ export default {
       var that = this;
       let params = {
         ids:ids,
-        admin_user_id:this.$store.getters.xt_user.user.id
+        admin_user_id:that.$store.getters.xt_user.user.id
       };
-      this.isloading = true
-      axios.get('http://127.0.0.1:9532/api/pc_bg',{params:params}).then(function(response) {
+      var  that= this
+      axios.get('http://127.0.0.1:9532/test/net',{}).then(function(response) {
         if (response.data.state == 0) {
-          this.isloading = false
+          // that.$message.error(response.data.data.msg);
+          that.$confirm("请检查医保程序是否有打开", "提示", {
+            confirmButtonText: "确 定",
+            cancelButtonText: "取 消",
+            type: "warning",
+          }).then(() => {
+
 
-          that.$message.error(response.data.data.msg);
+          })
+            .catch(() => {});
           return false
         } else {
-          this.isloading = false
-          if(response.data.data.failed_code == -10){
-            that.$confirm(response.data.data.msg, '医保错误信息', {
-              confirmButtonText: '确 定',
-              type: 'warning'
-            }).then(() => {
-
-            }).catch(() => {
-            })
-          }else{
-            that.GetDrugStock()
-
+          that.isloading = true
+          //有打开则调用接口
+          axios.get('http://127.0.0.1:9532/api/pc_bg',{params:params}).then(function(response) {
+            if (response.data.state == 0) {
+              that.isloading = false
+              that.$message.error(response.data.data.msg);
+              return false
+            } else {
+              that.isloading = false
+              if(response.data.data.failed_code == -10){
+                that.$confirm(response.data.data.msg, '医保错误信息', {
+                  confirmButtonText: '确 定',
+                  type: 'warning'
+                }).then(() => {
+
+                }).catch(() => {
+                })
+              }else{
+                that.GetDrugStock()
+              }
+            }
+          }).catch(function(error) {
+          })
 
-          }
         }
       }).catch(function(error) {
+        that.$confirm("请检查医保程序是否有打开", "提示", {
+          confirmButtonText: "确 定",
+          cancelButtonText: "取 消",
+          type: "warning",
+        }).then(() => {
+        })
+          .catch(() => {});
       })
+
     },
     query(){
       this.GetDrugStock()
 
-
     },
     change(){
 
@@ -461,6 +516,7 @@ export default {
             let obj = {
               id:response.data.data.info[i].id,
               drug_name:response.data.data.info[i].drug.drug_name,
+              drug_code:response.data.data.info[i].drug_code,
               drug_type:this.getDrugType(response.data.data.info[i].drug.drug_type),
               spec: response.data.data.info[i].drug.dose + response.data.data.info[i].drug.dose_unit + "*" + response.data.data.info[i].drug.min_number + response.data.data.info[i].drug.min_unit+"/" +response.data.data.info[i].drug.max_unit,
               code:response.data.data.info[i].drug.medical_insurance_number,

src/xt_pages/outpatientCharges/components/chargeDialog.vue

@@ -78,30 +78,33 @@
         </el-radio-group>
       </el-form-item>
 
-      <el-form-item label="" style="width:100%;" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278 || this.$store.getters.xt_user.org.id == 10510 ||  this.$store.getters.xt_user.org.id == 10610  ||  this.$store.getters.xt_user.org.id == 10537 ||  this.$store.getters.xt_user.org.id == 10635">
+      <el-form-item label="" style="width:100%;" v-if="this.$store.getters.xt_user.org.id == 0  || this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278 || this.$store.getters.xt_user.org.id == 10510 ||  this.$store.getters.xt_user.org.id == 10610  ||  this.$store.getters.xt_user.org.id == 10537 ||  this.$store.getters.xt_user.org.id == 10635">
 
         <el-checkbox-group v-model="form.pay_wayss">
           <el-checkbox :label="item.value" v-for="(item,index) in payWays" :key="item.value">{{ item.label }}</el-checkbox>
         </el-checkbox-group>
       </el-form-item>
 
-      <el-form-item label="现金支付金额：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510 || this.$store.getters.xt_user.org.id == 10610 ||  this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10635">
+      <el-form-item label="现金支付金额：" v-if="this.$store.getters.xt_user.org.id == 0  || this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510 || this.$store.getters.xt_user.org.id == 10610 ||  this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10635">
         <el-input class="number_style" v-model="form.cash_pay" ></el-input>
       </el-form-item>
 
-      <el-form-item label="微信支付金额：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510  || this.$store.getters.xt_user.org.id == 10610 ||  this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10635">
+      <el-form-item label="微信支付金额：" v-if="this.$store.getters.xt_user.org.id == 0  || this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510  || this.$store.getters.xt_user.org.id == 10610 ||  this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10635">
         <el-input class="number_style" v-model="form.wechat_pay" ></el-input>
       </el-form-item>
-      <el-form-item label="银行卡支付金额：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510  || this.$store.getters.xt_user.org.id == 10610 ||  this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10635">
+      <el-form-item label="银行卡支付金额：" v-if="this.$store.getters.xt_user.org.id == 0  || this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510  || this.$store.getters.xt_user.org.id == 10610 ||  this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10635">
         <el-input class="number_style" v-model="form.band_card_pay" ></el-input>
       </el-form-item>
-      <el-form-item label="支付宝支付金额：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510 || this.$store.getters.xt_user.org.id == 10610 ||  this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10635 ">
+      <el-form-item label="支付宝支付金额：" v-if="this.$store.getters.xt_user.org.id == 0  || this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510 || this.$store.getters.xt_user.org.id == 10610 ||  this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10635 ">
         <el-input class="number_style" v-model="form.ali_pay" ></el-input>
       </el-form-item>
       <el-form-item label="积分支付：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510 || this.$store.getters.xt_user.org.id == 10610 ||  this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10635 ">
         <el-input class="number_style" v-model="form.jifen_pay" ></el-input>
       </el-form-item>
-      <el-form-item label="其他说明：" v-if="this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510 || this.$store.getters.xt_user.org.id == 10610 ||  this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10635 ">
+      <el-form-item label="储值卡说明：" v-if="this.$store.getters.xt_user.org.id == 0 || this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510 || this.$store.getters.xt_user.org.id == 10610 ||  this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10635 ">
+        <el-input class="number_style" v-model="form.card_desc" ></el-input>
+      </el-form-item>
+      <el-form-item label="其他说明：" v-if="this.$store.getters.xt_user.org.id == 0  || this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 10278  || this.$store.getters.xt_user.org.id == 10510 || this.$store.getters.xt_user.org.id == 10610 ||  this.$store.getters.xt_user.org.id == 10537 || this.$store.getters.xt_user.org.id == 10635 ">
         <el-input class="number_style" v-model="form.oth_desc" ></el-input>
       </el-form-item>
 
@@ -218,6 +221,7 @@
           wechat_pay:"",
           ali_pay:"",
           jifen_pay:"",
+          card_desc:"",
         },
         payWays: [
           {value: "1", label: '现金'},
@@ -227,6 +231,8 @@
           {value: "7", label: '积分'},
           {value: "4", label: '医保卡'},
           {value: "8", label: '其他'},
+          {value: "9", label: '储值卡'},
+
         ],
         total:"",
 

src/xt_pages/outpatientTool/components/settle.vue

@@ -214,6 +214,13 @@
           </template>
         </el-table-column>
 
+        <el-table-column align="center" prop="cash_pay" label="储值卡说明">
+          <!--          <template slot-scope="scope">{{scope.row.cash_pay}}</template>-->
+          <template slot-scope="scope" style="width: 100px">
+            <el-input v-model="scope.row.card_desc" oninput="value=value.replace(/[^0-9.]/g,'')"></el-input>
+            <el-button size="small" @click="change(scope.row.id,scope.row.card_desc,'card_desc')">修改</el-button>
+          </template>
+        </el-table-column>
         <el-table-column align="center" prop="item_name" label="其他说明">
 <!--          <template slot-scope="scope">{{scope.row.oth_desc}}</template>-->
           <template slot-scope="scope" style="width: 100px">
@@ -378,6 +385,14 @@
 <!--        </template>-->
       </el-table-column>
 
+
+      <el-table-column align="center" prop="item_name" label="其他说明">
+        <template slot-scope="scope">{{scope.row.card_desc}}</template>
+        <!--        <template slot-scope="scope" style="width: 100px">-->
+        <!--          <el-input v-model="scope.row.oth_desc"></el-input>-->
+        <!--        </template>-->
+      </el-table-column>
+
       <el-table-column align="center" prop="item_name" label="其他说明">
                   <template slot-scope="scope">{{scope.row.oth_desc}}</template>
 <!--        <template slot-scope="scope" style="width: 100px">-->

src/xt_pages/user/dialysisSolution.vue

@@ -522,18 +522,31 @@
 
 
 
-          <el-col :span="8" v-if="isShows('透析器')">
+          <el-col :span="8" v-if="isShows('透析器')&& this.$store.getters.xt_user.template_info.org_id != 10164">
             <el-form-item label="透析器:">
               <el-input v-model="dialysis_dialyszers" @focus="showInnerDialog('6')"></el-input>
             </el-form-item>
           </el-col>
 
-          <el-col :span="8" v-if="isShows('灌流器')">
+          <el-col :span="8" v-if="isShows('透析器')&& this.$store.getters.xt_user.template_info.org_id == 10164">
+              <el-form-item label="透析器:" prop="dialysis_dialyszers" >
+                  <el-input v-model="dialysis_dialyszers"
+                            @focus="showInnerDialog('20')"></el-input>
+              </el-form-item>
+         </el-col>
+
+          <el-col :span="8" v-if="isShows('灌流器')&& this.$store.getters.xt_user.template_info.org_id != 10164 && this.$store.getters.xt_user.template_info.org_id != 10727" >
             <el-form-item label="灌流器:">
               <el-input v-model="dialysis_irrigation" @focus="showInnerDialog('7')"></el-input>
             </el-form-item>
           </el-col>
 
+          <el-col :span="8" v-if="isShows('灌流器')&& (this.$store.getters.xt_user.template_info.org_id == 10164 || this.$store.getters.xt_user.template_info.org_id == 10727)" >
+            <el-form-item label="灌流器:">
+              <el-input v-model="dialysis_irrigation" @focus="showInnerDialog('21')"></el-input>
+            </el-form-item>
+          </el-col>
+
 
 
           <el-col :span="8" v-if="isShows('滤过器')">
@@ -846,6 +859,14 @@
       v-on:dialog-cancle="innerDialogCancle">
     </multi-select-box>
 
+
+    
+    <radio-select-box
+         :propsForm="InnerDialogPropsOne"
+         v-on:dialog-comfirm="innerDialogComfirmOne"
+         v-on:dialog-cancle="innerDialogCancleOne">
+   </radio-select-box>
+
     <el-dialog
       :visible.sync="startDialogVisible"
       width="1010px"
@@ -980,7 +1001,7 @@
 
   import { GetDeviceInfo } from '@/api/dialysis'
   import MultiSelectBox from '../dialysis/details/dialog/MultiSelectBox/index'
-
+  import RadioSelectBox from '../dialysis/details/dialog/RadioSelectBox/index'
   const periodWeek = [
     { value: '每周', label: '每周' },
     { value: '两周', label: '两周' },
@@ -1038,6 +1059,14 @@
           titles: '',
           type: '' // 不同弹框类型，用来匹配数据
         },
+        InnerDialogPropsOne: {
+          values: [],
+          visibility: false,
+          isShowTextArea: true,
+          customContent: '',
+          titles: '',
+          type: '' // 不同弹框类型，用来匹配数据
+        },
         deviceList: [],
         dialysisTimeShow: new Date(2018, 1, 1, 3, 0),
         isEdit: false,
@@ -1409,11 +1438,16 @@
     components: {
       MultiSelectBox,
       tableTitle,
-      PatientSidebar
+      PatientSidebar,
+      RadioSelectBox
     },
     methods: {
       showInnerDialog: function(val) {
-        this.InnerDialogProps.visibility = true
+        if(val == 20 || val == 21){
+          this.InnerDialogPropsOne.visibility = true
+        }else{
+          this.InnerDialogProps.visibility = true
+        }
         switch (val) {
           case '5': // 透析器/灌流器
             this.InnerDialogProps.values = this.dialyzerPerfusionApparatus
@@ -1493,6 +1527,29 @@
             this.InnerDialogProps.isShowTextArea = false
 
             break
+
+            case '20': // 透析器
+            
+             for (let i = 0; i < this.dialyzers.length; i++) {
+               this.dialyzers[i].name = this.dialyzers[i].specification_name
+             }
+             console.log("0000000000000000000000000000000000000000000000000")
+             this.InnerDialogPropsOne.values = this.dialyzers
+             this.InnerDialogPropsOne.titles = '透析器'
+             this.InnerDialogPropsOne.type = 'dialyzers'
+             this.InnerDialogPropsOne.selected = this.dialysis_dialyszers
+             this.InnerDialogPropsOne.isShowTextArea = false
+             break
+          case '21':
+            for (let i = 0; i < this.irrigations.length; i++) {
+              this.irrigations[i].name = this.irrigations[i].specification_name
+            }
+            this.InnerDialogPropsOne.values = this.irrigations
+            this.InnerDialogPropsOne.titles = '灌流器'
+            this.InnerDialogPropsOne.type = 'irrigations'
+            this.InnerDialogPropsOne.selected = this.dialysis_irrigation
+            this.InnerDialogPropsOne.isShowTextArea = false
+           break
         }
       },
       innerDialogComfirm: function(val) {
@@ -1530,6 +1587,47 @@
       innerDialogCancle: function() {
         this.InnerDialogProps.visibility = false
       },
+      innerDialogComfirmOne: function(val) {
+       console.log("val===============",val)
+      this.InnerDialogPropsOne.visibility = false
+       switch (val.type) {
+         case 'dialyzers':
+           var newArr = []
+           if(this.dialyzers!=null && this.dialyzers.length >0){
+             for(let i=0;i<this.dialyzers.length;i++){
+               if(this.dialyzers[i].specification_name == val.value){
+                 newArr.push(val.value)
+               }
+             }
+           }
+           if(newArr!=null && newArr.length >0){
+            this.dialysis_dialyszers = newArr.join(',')
+           }else{
+             this.dialysis_dialyszers = ""
+           }
+
+           break
+         case 'irrigations':
+           var newArr = []
+          
+           if(this.irrigations!=null && this.irrigations.length >0){
+             for(let i=0;i<this.irrigations.length;i++){
+               if(this.irrigations[i].specification_name == val.value){
+                 newArr.push(val.value)
+               }
+             }
+           }
+           if(newArr!=null && newArr.length>0){
+            this.dialysis_irrigation = newArr.join(',')
+           }else{
+             this.dialysis_irrigation = ""
+           }
+           break
+       }
+     },
+      innerDialogCancleOne: function() {
+        this.InnerDialogPropsOne.visibility = false
+      },
       changeBodyFluid: function() {},
       GetDeviceData: function() {
         const params = {}