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

src/styles/index.scss

 .el-dialog__body {
   max-height: calc(100vh - 290px) !important;
   overflow-y: scroll !important;
-  margin-right: 8px;
+  // margin-right: 8px;
   /* 针对缺省样式 (必须的) */
   &::-webkit-scrollbar {
     width: 6px;

src/xt_pages/data/components/addDrugs.vue

             <el-form-item label="代理商 : " prop="agent">
               <el-input v-model="form.agent" style="width:160px;" placeholder="" maxlength="30"></el-input>
             </el-form-item>
-            <el-form-item label=""  style="visibility: hidden;">
+            <el-form-item label=""  style="display:none;">
               <el-input style="width:160px;" placeholder="" maxlength="30"></el-input>
             </el-form-item>
             <el-form-item label="状态 : " prop="drug_status">

src/xt_pages/stock/drugs/query.vue

   <div class="main-contain">
     <div class="position">
       <bread-crumb :crumbs="crumbs"></bread-crumb>
+      <el-button
+          size="small"
+          class="filter-item"
+          type="primary"
+          icon="el-icon-search"
+          @click="setting"
+        >设置</el-button
+        >
     </div>
     <div class="app-container ">
       <div class="cell clearfix">
         >
       </div>
 
-      <div class="cell clearfix">
-        <el-button
-          size="small"
-          class="filter-item"
-          type="primary"
-          icon="el-icon-search"
-          @click="setting"
-        >设置</el-button
-        >
-      </div>
 
       <el-table
         :row-style="{ color: '#303133' }"

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

                 v-model="start_time"
                 prefix-icon="el-icon-date"
                 :editable="false"
-                style="width: 196px;margin-right:10px;"
+                style="width: 160px;margin-right:10px;"
                 type="date"
                 placeholder="选择日期时间"
                 align="right"
                     <div style="display:flex;justify-content: space-between;align-items: center;">
                         <div class="tablesTitle">自备药列表</div>
                         <div>
-                            <el-button type="primary" @click="openForm(1)">添加</el-button>
-                            <el-button type="primary" @click="openForm(2)">入库</el-button>
-                            <el-button type="primary" @click="openForm(3)">出库</el-button>
+                            <el-button type="primary" size="mini" @click="openForm(1)">添加</el-button>
+                            <el-button type="primary" size="mini" @click="openForm(2)">入库</el-button>
+                            <el-button type="primary" size="mini" @click="openForm(3)">出库</el-button>
                         </div>
                     </div>
                     <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
                 drugname:name,
                 patientid:patientid
               }
-            console.log("params ====",params)
+           
             DeleteDrugName(params).then(response => {
               if (response.data.state == 1) {
                   var msg = response.data.data.msg

src/xt_pages/stock/selfPreparedMedicine/info.vue

               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
-               console.log("drugName====",drugName)
+              
                this.drugName = drugName
 
              }
           })  
         },
         handleCurrentChange(val){
+          this.form.drug_id = val.id
           //获取药品规格名称
           this.getRulleName(val.drug_name)
 
            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 = ""   
             }
          })    
        },

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

src/xt_pages/workforce/appointment.vue

           <span slot="label"><i class="el-icon-date"></i> 下一周 ({{theWeek.nextWeek}})</span>
         </el-tab-pane>
         <el-tab-pane name="nextTwoWeek">
-          <span slot="label"><i class="el-icon-date"></i> 下两周 ({{theWeek.nextTwoWeek}})</span>
+          <span slot="label"><i class="el-icon-date"></i> 下下周 ({{theWeek.nextTwoWeek}})</span>
         </el-tab-pane>
       </el-tabs>
       <!-- </el-col>

src/xt_pages/workforce/components/setup_template_dialog.vue

  <!-- top="5vh" -->
     <el-dialog title="设置模板" width="400px" :visible.sync="visible" :before-close="_close">
         <el-form :model="form" label-width="100px">
-            <el-form-item label="模板启用数量">
+            <el-form-item label="选择排班模板">
                 <el-select v-model="form.mode" placeholder="">
                     <el-option label="不启用模板" :value="0"></el-option>
-                    <el-option label="启用一个模板" :value="1"></el-option>
-                    <el-option label="启用两个模板" :value="2"></el-option>
+                    <el-option label="启用单周模板" :value="1"></el-option>
+                    <el-option label="启用双周模板" :value="2"></el-option>
                 </el-select>
             </el-form-item>
         </el-form>