Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -117,7 +117,7 @@
                     <template slot-scope="scope">{{ scope.row.drug_name }}</template>
                   </el-table-column>
                   <el-table-column align="center" label="规格" width="60">
-                    <template slot-scope="scope">{{ scope.row.drug_spec }}</template>
+                    <template slot-scope="scope">{{ scope.row.drug_spec }}{{scope.row.min_unit}}</template>
                   </el-table-column>
                   <el-table-column align="center" label="单价" width="40">
                     <template slot-scope="scope">{{ scope.row.retail_price }}</template>
@@ -132,15 +132,6 @@
                   <el-table-column align="center" prop="name" label="名称">
                     <template slot-scope="scope">{{}}</template>
                   </el-table-column>
-                  <el-table-column align="center" label="规格" width="60">
-                    <template slot-scope="scope">33</template>
-                  </el-table-column>
-                  <el-table-column align="center" label="库存" width="60">
-                    <template slot-scope="scope">22</template>
-                  </el-table-column>
-                  <el-table-column align="center" label="单价" width="40">
-                    <template slot-scope="scope">12</template>
-                  </el-table-column>
                 </el-table>
               </el-tab-pane>
             </el-tabs>
@@ -187,7 +178,9 @@
     props: {
       patientInfo: Object,
       hisPatientInfo: Object,
-      prescriptions: Array
+      prescriptions: Array,
+      drugways:Array,
+      efs:Array,
     },
     components: {
       selectTemplate,
@@ -229,7 +222,8 @@
         customTabIndex:1,
         options:[],
         tabProject:[],
-        strids:""
+        strids:"",
+
       }
     },
     methods: {
@@ -300,7 +294,10 @@
       },
       open(index) {
         if (index == 1) {
-          localStorage.setItem('drugs', JSON.stringify(this.preDrugs))
+          console.log(this.prescriptions)
+
+
+          // localStorage.setItem('drugs', JSON.stringify(this.preDrugs))
           this.$message({ message: '保存成功', type: 'success' })
         } else if (index == 2) {
           this.$router.push('/outpatientDoctorStation/print')
@@ -390,7 +387,10 @@
           }
         }
 
+        for (let i = 0; i < this.curPrescriptions.advices.length; i++){
+          this.curPrescriptions.advices[i]['remark'] = ""
 
+        }
         // console.log(this.prescriptions)
       },
       selectChange(row){

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -11,72 +11,56 @@
 
       <el-table-column align="center" prop="name" width="50" :label="'单次\n用量'">
         <template slot-scope="scope">
-          <!--<el-input v-model="input" placeholder=""></el-input>-->
-          <!--<el-input  v-model="scope.row.single_dose"></el-input>-->
+          <el-input  v-model="scope.row.single_dose"></el-input>
+          <div> {{scope.row.min_unit}}</div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="50" label="用法">
         <template slot-scope="scope">
-          <!-- <el-select v-model="value" placeholder="">
-              <el-option
-              v-for="item in newoptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-              </el-option>
-          </el-select> -->
-          <el-input v-model="input" placeholder=""></el-input>
+          <el-select v-model="scope.row.delivery_way" placeholder="请选择">
+            <el-option
+              v-for="item,index in drugways"
+              :key="index"
+              :label="item.name"
+              :value="item.name">
+            </el-option>
+          </el-select>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="50" label="频率">
         <template slot-scope="scope">
-          <!-- <el-select v-model="value" placeholder="">
-              <el-option
-              v-for="item in newoptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value">
-              </el-option>
-          </el-select> -->
-          <el-input v-model="input" placeholder=""></el-input>
+          <el-select v-model="scope.row.execution_frequency" placeholder="请选择">
+            <el-option
+              v-for="item in efs"
+              :key="index"
+              :label="item.name"
+              :value="item.name">
+            </el-option>
+          </el-select>
         </template>
       </el-table-column>
 
       <el-table-column align="center" prop="name" width="100" label="总量">
         <template slot-scope="scope">
           <div style="display:flex;">
-            <el-input v-model="input" style="width:50%" placeholder=""></el-input>
-            <!-- <el-select v-model="value" style="width:50%" placeholder="">
-                <el-option
-                v-for="item in newoptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
-                </el-option>
-            </el-select> -->
-            <el-input v-model="input" style="width:50%" placeholder=""></el-input>
+            <el-input v-model="scope.row.prescribing_number" style="width:50%" placeholder=""></el-input>
+            <div> {{scope.row.min_unit}}</div>
           </div>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="50" label="单价">
         <template slot-scope="scope">
-          <el-input v-model="scope.row.unitPrice" placeholder=""></el-input>
+          <el-input v-model="scope.row.retail_price" placeholder=""></el-input>
         </template>
       </el-table-column>
       <el-table-column align="center" prop="name" width="50" label="备注">
         <template slot-scope="scope">
-          <!-- <el-autocomplete
-          class="inline-input"
-          v-model="state1"
-          :fetch-suggestions="querySearch"
-          placeholder=""
-          @select="handleSelect"
-          ></el-autocomplete> -->
+          <el-input v-model="scope.row.remark" style="width:50%" placeholder=""></el-input>
         </template>
       </el-table-column>
       <el-table-column align="center" width="40" prop="name" label="操作">
         <template slot-scope="scope">
-          <i class="el-icon-delete"></i>
+          <i class="el-icon-delete" @click="deleteDrug(scope.row)"></i>
         </template>
       </el-table-column>
     </el-table>
@@ -187,6 +171,8 @@
 </template>
 
 <script>
+  import { getInitData } from '@/api/his/his'
+
   export default {
     props: {
       preDrugs: Array,
@@ -198,6 +184,8 @@
             name:"",
             advices:[],
             projects:[],
+            drugways:[],
+            efs:[],
           };
         }
 
@@ -227,10 +215,30 @@
         input: 1
       }
     },methods:{
+      getInitData(){
+        getInitData().then(response => {
+          if (response.data.state == 0) {
+            this.$message.error(response.data.msg)
+            return false
+          } else {
+            this.drugways = response.data.data.drugways
+            this.efs = response.data.data.efs
+          }
+        })
+
+      },deleteDrug:function(row){
+        for (let i = 0; i < this.prescription.advices.length; i++){
+          if(this.prescription.advices[i].id == row.id){
+              this.prescription.advices.splice(i, 1)
+          }
+        }
+      },
       setNewData:function(data){
 
         // this.prescription.advices = data.advices
       }
+    },mounted(){
+      this.getInitData()
     },
   }
 </script>