Merge branch '20201014_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201014_pc_vue_new_branch

src/xt_pages/data/components/addDrugs.vue

               <el-input v-model="form.drug_spec" style="width:160px;" placeholder="" maxlength="30"></el-input>
             </el-form-item>
             <el-form-item label="药品类型 : " prop="drug_type">
-              <el-input v-model="form.drug_type" style="width:160px;" placeholder="" maxlength="30"></el-input>
+              <el-select v-model="form.drug_type" style="width:160px;" placeholder="请选择">
+                <el-option
+                  v-for="item,index in getDictionaryDataConfig('system','drug_type')"
+                  :key="index"
+                  :label="item.name"
+                  :value="item.id">
+                </el-option>
+              </el-select>
             </el-form-item>
             <el-form-item label="库存警戒:" prop="drug_stock_limit" >
               <el-input v-model="form.drug_stock_limit" style="width:160px;" placeholder="" maxlength="30"></el-input>
               <el-input v-model="form.drug_origin_place" style="width:160px;" placeholder="" maxlength="30"></el-input>
             </el-form-item>
             <el-form-item label="药品剂型 : " prop="drug_dosage_form" >
-              <el-input v-model="form.drug_dosage_form" style="width:160px;" placeholder="" maxlength="30"></el-input>
+              <el-select v-model="form.drug_dosage_form" style="width:160px;" placeholder="请选择">
+                <el-option
+                  v-for="item,index in getDictionaryDataConfig('system','drug_dosage_form')"
+                  :key="index"
+                  :label="item.name"
+                  :value="item.id">
+                </el-option>
+              </el-select>
             </el-form-item>
             <el-form-item label="医保等级 : " prop="medical_insurance_level" >
               <el-select v-model="form.medical_insurance_level" style="width:160px;" placeholder="请选择">

src/xt_pages/data/components/consumables.vue

       <el-table-column prop="date" label="操作" width="300" align="center">
         <template slot-scope="scope">
           <el-button @click="handleGoodInfoEdit(scope.$index, scope.row)" type="primary" size="small">编辑</el-button>
-          <el-button type="primary" size="small" @click="clickSelfPayment(scope.row.id)">自付比例</el-button>
+          <!--<el-button type="primary" size="small" @click="clickSelfPayment(scope.row.id)">自付比例</el-button>-->
           <el-button type="danger" size="small" @click="handleGoodInfoDelete(scope.$index, scope.row)">删除</el-button>
         </template>
       </el-table-column>

src/xt_pages/data/components/drugs.vue

       </el-table-column>
       <el-table-column label="状态" width="60" align="center">
         <template slot-scope="scope">
-          <div>{{scope.row.drug_status}}</div>
+          <div>{{scope.row.drug_status.indexOf('停用') == -1 ? '启用':'停用' }}</div>
         </template>
       </el-table-column>
       <el-table-column prop="date" label="操作" width="400" align="center">
         <template slot-scope="scope">
           <el-button @click="openForm(scope.row.id)" type="primary" size="small">编辑</el-button>
-          <el-button type="primary" size="small" @click="clickSelfPayment(scope.row.id)">自付比例</el-button>
+          <!--<el-button type="primary" size="small" @click="clickSelfPayment(scope.row.id)">自付比例</el-button>-->
           <!--<el-button type="primary" size="small" @click="clickMainTain">单位维护</el-button>-->
           <!--<el-button type="danger" size="small">删除</el-button>-->
         </template>

src/xt_pages/stock/drugs/query.vue

         }
         return name;
       },
-      GetAllGoodType: function() {
-        GetAllGoodType().then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg);
-            return false;
-          } else {
-            for (let i = 0; i < response.data.data.goodType.length; i++) {
-              this.goodType.push(response.data.data.goodType[i]);
-            }
-          }
-        });
-      },
-      GetAllGoodInfo: function() {
-        GetAllGoodInfo().then(response => {
-          if (response.data.state == 0) {
-            this.$message.error(response.data.msg);
-            return false;
-          } else {
-            for (let i = 0; i < response.data.data.goodInfo.length; i++) {
-              this.goodInfo.push(response.data.data.goodInfo[i]);
-            }
-          }
-        });
-      },
+
+
       handleBack: function() {
         this.$router.go(-1);
       },
       handleSizeChange(val) {
         this.limit = val;
-        this.GetAllStockQuery();
+        this.GetAllDrugStockQueryList();
       },
       handleCurrentChange(val) {
         this.page = val;
-        this.GetAllStockQuery();
+        this.GetAllDrugStockQueryList();
       },
       calculate: function(val) {
         return Math.round(parseFloat(val) * 100) / 100;
       },
       startTimeChange: function() {
-        this.GetAllStockQuery();
+        this.GetAllDrugStockQueryList();
       },
       endTimeChange: function() {
-        this.GetAllStockQuery();
+        this.GetAllDrugStockQueryList();
       },
       stockInCount: function(row) {
         let total = 0;
       showStockOutDetailDialog: function() {},
       showCancelStockDetailDialog: function() {},
       search: function() {
-        this.GetAllStockQuery();
+        this.GetAllDrugStockQueryList();
       },setting:function() {
         this.$refs.dialog.show()
       }

src/xt_pages/stock/selfPreparedMedicine/components/addMedicine.vue

         },
         handleCurrentChange(val){
            this.currentRow = val
-           this.getRullListByDrugName(val.drug_name)
+           this.getRullListByDrugName(val.id)
         },
-        getRullListByDrugName(drugname){
+        getRullListByDrugName(id){
             const params = {
-              drug_name:drugname,
+              id:id,
             }
            getRullListByDrugName(params).then(response=>{
               if(response.data.state ==  1){
         },
 
         SaveSelfMedicines(){
+          if(this.medicineData.length == 0){
+             this.$message.error("请添加药品规格")
+             return
+          }
           const params = {
              patient_id:this.patient_id,
              medicineData:this.medicineData

src/xt_pages/stock/selfPreparedMedicine/components/warehouseOut.vue

            })  
         },
 
-        //  getAllDrugNameList(){
-        //   getAllDrugNameList().then(response=>{
-        //      if(response.data.state == 1){
-        //        var rullername =  response.data.data.rullerName
-        //        for(let i=0;i<rullername.length;i++){
-        //           rullername[i].outstore_number = ""
-        //           rullername[i].remarks = ""
-        //        }
-        //        this.tableData = rullername
-        //      }
-        //   })
-        // },
+      
        
         saveOutStock(){
            var arr=[]

src/xt_pages/stock/selfPreparedMedicine/components/warehousing.vue

              }
           })   
         },
-        // getAllDrugNameList(){
-        //   getAllDrugNameList().then(response=>{
-        //      if(response.data.state == 1){
-        //        var rullername =  response.data.data.rullerName
-        //        for(let i=0;i<rullername.length;i++){
-        //           rullername[i].store_number = ""
-        //           rullername[i].remarks = ""
-        //        }
-        //        this.tableData = rullername
-        //      }
-        //   })
-        // },
+    
         saveStock(){
             var arr=[]
             for(let i=0;i<this.tableData.length;i++){

src/xt_pages/stock/selfPreparedMedicine/index.vue

                         <el-table-column align="center" prop="name" label="操作" width="180">
                             <template slot-scope="scope">
                                 <el-button size="mini" type="primary" @click="toDetail(scope.row.drug_name,scope.row.drug_spec,scope.row.patient_id)">明细</el-button>
-                                <el-button size="mini" type="danger" @click="DeleteDrugName(scope.row.drug_name,scope.row.patient_id)">删除</el-button>
+                                <el-button size="mini" type="danger" @click="DeleteDrugName(scope.row.id,scope.row.drug_name,scope.row.patient_id,scope.$index)">删除</el-button>
                             </template>
                         </el-table-column>
                     </el-table>
               }
           })  
         },
-        DeleteDrugName(name,patientid){
+        DeleteDrugName(id,name,patientid,index){
             this.$confirm('确认删除吗?', '删除', {
             confirmButtonText: '确 定',
             cancelButtonText: '取 消',
          })
           .then(() => {
               const params = {
+                id:id,
                 drugname:name,
                 patientid:patientid
               }
+           
             DeleteDrugName(params).then(response => {
               if (response.data.state == 1) {
                   var msg = response.data.data.msg

src/xt_pages/stock/selfPreparedMedicine/info.vue

                         </el-table-column>
                         <el-table-column align="center" prop="name" label="操作" width="90">
                             <template slot-scope="scope">
-                                <el-button size="mini" type="danger" @click="DeleteDrugById(scope.row.id,scope.row.drug_name)">删除</el-button>
+                                <el-button size="mini" type="danger" @click="DeleteDrugById(scope.row.id,scope.row.drug_name,scope.$index)">删除</el-button>
                             </template>
                         </el-table-column>
                     </el-table>
               drug_name_id:"",
               unit:"", 
               price:"",
-              drug_stock_limit:""
+              drug_stock_limit:"",
+              drug_id:"",
             },
             editform:{
               drug_name_id:"",
           getAllDrugName().then(response=>{
              if(response.data.state == 1){
                var drugName  = response.data.data.drugName
+              
                this.drugName = drugName
 
              }
           })  
         },
         handleCurrentChange(val){
+          this.form.drug_id = val.id
           //获取药品规格名称
           this.getRulleName(val.drug_name)
 
          this.editRuleDialogVisible = false
        },
        saveDrugName(){
-           var name = ""
+           var name = "";
            for(let i=0;i<this.drugName.length;i++){
              if(this.drugName[i].id == this.drug_name){
                 name = this.drugName[i].drug_name
            }
            const params = {
               drug_name:name,
+              id:this.drug_name,
            }
          saveDrugName(params).then(response=>{
             if(response.data.state == 1){
            for(let i=0;i<this.drugName.length;i++){
              if(this.drugName[i].id == this.drug_name){
                 name = this.drugName[i].drug_name
+                
              }
            }
            const params = {
               drug_name:name,
+               id:this.drug_name
            }
          saveDrugName(params).then(response=>{
             if(response.data.state == 1){
            const params = {
              drug_spec:drug_spec,
              drug_name_id:this.form.drug_name_id,
+             drug_id:this.form.drug_id,
              unit:this.form.unit,
              price:this.form.price,
              drug_stock_limit:this.form.drug_stock_limit, 
              drug_name:drug_name
            }
+      
          saveRulleName(params).then(response=>{
             if(response.data.state == 1){
               var standName =  response.data.data.RullerName
               this.$message.success("保存成功")
               this.getRulleName(standName.drug_name)
               this.ruleDialogVisible = false
+              this.form.drug_name_id = ""
+              this.form.unit = ""
+              this.form.price = ""            
             }
          })  
        },
              unit:this.form.unit,
              price:this.form.price,
              drug_stock_limit:this.form.drug_stock_limit, 
-             drug_name:drug_name
+             drug_name:drug_name,
+             drug_id:this.form.drug_id,
            }
          saveRulleName(params).then(response=>{
             if(response.data.state == 1){
               var RullerName =  response.data.data.RullerName
               this.getRulleName(RullerName.drug_name)
               this.$message.success("保存成功")
+              this.form.drug_name_id = ""
+              this.form.unit = ""
+              this.form.price = ""   
             }
          })    
        },
          })
        },
 
-       DeleteDrugById(id,drugname){
+       DeleteDrugById(id,drugname,index){
          this.$confirm('确认删除吗?', '删除', {
           confirmButtonText: '确 定',
           cancelButtonText: '取 消',
             DeleteDrugById(params).then(response => {
               if (response.data.state == 1) {
                   var msg = response.data.data.msg
+                  this.tableData.splice(index,1)
                   this.$message.success("删除成功",msg)
               } else {
                   this.$message.error("该药品名称下有药品规格，不能删除")

src/xt_pages/stock/selfPreparedMedicine/query.vue

                 value-format="yyyy-MM-dd"
                 @change="changeEndtime"
                 ></el-date-picker>
-                <el-select v-model="drug_name" placeholder="请选择" style="margin-right:10px;"
+                <el-select v-model="drug_name" placeholder="药品名称" style="margin-right:10px;"
                  @change="changeDrugName">
                     <el-option
                     v-for="item in drugName"
                     :value="item.id">
                     </el-option>
                 </el-select>
-                <el-select v-model="drug_spec" placeholder="请选择"
+                <el-select v-model="drug_spec" placeholder="规格名称"
                 @change="changeRullName">
                     <el-option
                     v-for="item in rulleName"
             // end_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
             start_time:"",
             end_time:"",
-            drug_name:"",
+            drug_name:"全部",
             drug_spec:"",
             drugName:[],
             rulleName:[]
       getAllDrugName(){
         getAllDrugName().then(response=>{
           if(response.data.state == 1){
-             var drugName =  response.data.data.drugName
-             this.drugName = drugName
-
+             var drugName =  response.data.data.drugName  
+             var obj = {
+               id:0,
+               drug_name:"全部"
+             }
+             var arr = []
+             arr.push(obj)
+             arr.push(...drugName)
+             console.log("arrr",arr)
+             this.drugName = arr
+     
              this.getlist()
           }
         })
         this.getlist()
       },
       getlist(){
+          if(this.drug_name == "全部"){
+            this.drug_name = ""
+          }
           const params = {
             start_time:this.start_time,
             end_time:this.end_time,
         getAllPatientStockList(params).then(response=>{
             if(response.data.state == 1){
               var stocklist = response.data.data.stocklist
+              console.log("stocklist3333",stocklist)
               for(let i=0;i<stocklist.length;i++){
                  stocklist[i].index = i+1
                  stocklist[i].Count = 0