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

src/xt_pages/hospitalStation/components/chargeDialog.vue

@@ -120,6 +120,8 @@
           {value: 2, label: '银行卡'},
           {value: 3, label: '微信'},
           {value: 4, label: '支付宝'},
+          {value: 5, label: '医保卡'},
+
         ],
         total:"",
 

src/xt_pages/outpatientCharges/components/chargeDialog.vue

@@ -121,6 +121,8 @@
           {value: 2, label: '银行卡'},
           {value: 3, label: '微信'},
           {value: 4, label: '支付宝'},
+          {value: 5, label: '医保卡'},
+
         ],
         total:"",
 

src/xt_pages/outpatientDoctorStation/components/prescriptionTemplateTable.vue

@@ -1,20 +1,33 @@
 <template>
+
     <div class="prescriptionTable">
-        <el-table v-if="prescription.advices && prescription.advices.length > 0" :data="prescription.advices" border style="width: 99%;" :row-style="{ color: '#303133' }"
+        <el-table v-if="prescription.advices && prescription.advices.length > 0" :data="prescription.advices" border
+                  style="width: 99%;" :row-style="{ color: '#303133' }"
                   :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
-            <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
+            <el-table-column align="center" width="70" label="序号">
+                <template slot-scope="scope">
+                    <div style="display:flex;align-items:center;">
+                        <el-input v-model="scope.row.groupno" placeholder=""></el-input>
+                    </div>
+                </template>
+            </el-table-column>
             <el-table-column align="center" prop="drug_name" label="名称">
-                <template slot-scope="scope"><span :title="scope.row.drug_name">{{ scope.row.drug_name }}</span></template>
+                <template slot-scope="scope"><span :title="scope.row.drug_name">{{ scope.row.drug_name }}</span>
+                </template>
             </el-table-column>
 
             <el-table-column align="center" prop="single_dose" width="120" label="单次用量">
                 <template slot-scope="scope">
                     <div style="display:flex;align-items:center;">
-                        <el-input v-model="scope.row.single_dose" @input="getSingleDose(scope)" style="width:50%;"></el-input>
+                        <el-input v-model="scope.row.single_dose" @input="getSingleDose(scope)"
+                                  style="width:50%;"></el-input>
                         <!-- <div>{{scope.row.single_dose_unit}}</div> -->
-                        <el-select v-model="scope.row.single_dose_unit" placeholder="请选择" style="width:50%;" @change="getAllChange(scope)">
-                          <el-option :label="scope.row.drug.min_unit" :value="scope.row.drug.min_unit"></el-option>
-                          <el-option :label="scope.row.drug.dose_unit" v-if="scope.row.drug.dose_unit != scope.row.drug.min_unit" :value="scope.row.drug.dose_unit"></el-option>
+                        <el-select v-model="scope.row.single_dose_unit" placeholder="请选择" style="width:50%;"
+                                   @change="getAllChange(scope)">
+                            <el-option :label="scope.row.drug.min_unit" :value="scope.row.drug.min_unit"></el-option>
+                            <el-option :label="scope.row.drug.dose_unit"
+                                       v-if="scope.row.drug.dose_unit != scope.row.drug.min_unit"
+                                       :value="scope.row.drug.dose_unit"></el-option>
                         </el-select>
                     </div>
                 </template>
@@ -48,7 +61,8 @@
             <el-table-column align="center" prop="day" width="70" label="天数">
                 <template slot-scope="scope">
                     <div style="display:flex;align-items:center;">
-                        <el-input v-model="scope.row.day" @input="getAllChange(scope)" placeholder=""></el-input>{{'天'}}
+                        <el-input v-model="scope.row.day" @input="getAllChange(scope)" placeholder=""></el-input>
+                        {{'天'}}
                     </div>
                 </template>
             </el-table-column>
@@ -56,11 +70,15 @@
             <el-table-column align="center" prop="prescribing_number" width="120" label="总量">
                 <template slot-scope="scope">
                     <div style="display:flex;align-items:center;">
-                        <el-input v-model="scope.row.prescribing_number" style="width:50%" @input="changePrescribingNumber(scope)" placeholder=""></el-input>
+                        <el-input v-model="scope.row.prescribing_number" style="width:50%"
+                                  @input="changePrescribingNumber(scope)" placeholder=""></el-input>
                         <!-- <div> {{scope.row.prescribing_number_unit}}</div> -->
-                        <el-select v-model="scope.row.prescribing_number_unit" placeholder="请选择" style="width:50%;" @change="getAllChange(scope)">
-                          <el-option :label="scope.row.drug.min_unit" :value="scope.row.drug.min_unit"></el-option>
-                          <el-option :label="scope.row.drug.max_unit" v-if="scope.row.drug.min_unit != scope.row.drug.max_unit" :value="scope.row.drug.max_unit"></el-option>
+                        <el-select v-model="scope.row.prescribing_number_unit" placeholder="请选择" style="width:50%;"
+                                   @change="getAllChange(scope)">
+                            <el-option :label="scope.row.drug.min_unit" :value="scope.row.drug.min_unit"></el-option>
+                            <el-option :label="scope.row.drug.max_unit"
+                                       v-if="scope.row.drug.min_unit != scope.row.drug.max_unit"
+                                       :value="scope.row.drug.max_unit"></el-option>
                         </el-select>
                     </div>
                 </template>
@@ -79,28 +97,46 @@
                     <el-input v-model="scope.row.remark" :title="scope.row.remark" placeholder=""></el-input>
                 </template>
             </el-table-column>
+
+            <el-table-column align="center" prop="remark" width="50" label="推送频率">
+                <template slot-scope="scope">
+                    <div v-if="scope.row.frequency_type == 1">{{'每次必推'}}</div>
+                    <div v-if="scope.row.frequency_type == 2">{{scope.row.day_count}}天/次</div>
+                    <div v-if="scope.row.frequency_type == 3">{{scope.row.week_day}}</div>
+
+                </template>
+            </el-table-column>
+
+
             <el-table-column align="center" width="40" prop="name" label="操作">
                 <template slot-scope="scope">
-                    <i class="el-icon-delete" @click="deleteDrug(scope.$index, scope.row)"></i>
+                    <!--<i class="el-icon-delete" @click="deleteDrug(scope.$index, scope.row)"></i>-->
+                    <el-button size="mini" type="primary" @click="handleEdit(scope.row,scope.$index)">推送</el-button>
+                    <el-button size="mini" type="danger" @click="deleteDrug(scope.row.id,scope.$index)">删除</el-button>
                 </template>
             </el-table-column>
         </el-table>
 
-        <el-table v-if="prescription.project &&prescription.project.length > 0" :data="prescription.project" border style="width: 99%;" :row-style="{ color: '#303133' }"
+        <el-table v-if="prescription.project &&prescription.project.length > 0" :data="prescription.project" border
+                  style="width: 99%;" :row-style="{ color: '#303133' }"
                   :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
             <el-table-column align="center" type="index" width="40" label="序号"></el-table-column>
             <el-table-column align="center" prop="project_name" label="名称">
-                <template slot-scope="scope"><span :title="scope.row.project_name">{{ scope.row.project_name }}</span></template>
+                <template slot-scope="scope"><span :title="scope.row.project_name">{{ scope.row.project_name }}</span>
+                </template>
             </el-table-column>
             <el-table-column align="center" prop="statistical_classification" width="100" label="组">
-                <template slot-scope="scope">{{scope.row.type == 2?getGroup(scope.row.statistical_classification):"耗材"}}</template>
+                <template slot-scope="scope">{{scope.row.type ==
+                    2?getGroup(scope.row.statistical_classification):'耗材'}}
+                </template>
             </el-table-column>
             <el-table-column align="center" prop="single_dose" width="80" label="单次用量">
                 <template slot-scope="scope">
-                  <div style="display:flex;align-items:center;">
-                    <el-input v-model="scope.row.single_dose" @input="getProjectSingleDose(scope)" placeholder=""></el-input>
-                    <div>{{scope.row.unit}}</div>
-                  </div>
+                    <div style="display:flex;align-items:center;">
+                        <el-input v-model="scope.row.single_dose" @input="getProjectSingleDose(scope)"
+                                  placeholder=""></el-input>
+                        <div>{{scope.row.unit}}</div>
+                    </div>
 
                 </template>
             </el-table-column>
@@ -123,7 +159,8 @@
             <el-table-column align="center" prop="number_days" width="70" label="天数">
                 <template slot-scope="scope">
                     <div style="display:flex;align-items:center;">
-                        <el-input v-model="scope.row.number_days" @input="getProjectDay(scope)" placeholder=""></el-input>
+                        <el-input v-model="scope.row.number_days" @input="getProjectDay(scope)"
+                                  placeholder=""></el-input>
                         <div>{{'天'}}</div>
                     </div>
                 </template>
@@ -140,8 +177,8 @@
             <el-table-column align="center" prop="name" width="70" label="单价">
                 <template slot-scope="scope">
                     <div style="display:flex;align-items:center;">
-                      <el-input v-model="scope.row.price" placeholder="" readonly></el-input>
-                      <div>{{'元'}}</div>
+                        <el-input v-model="scope.row.price" placeholder="" readonly></el-input>
+                        <div>{{'元'}}</div>
                     </div>
 
                 </template>
@@ -151,9 +188,22 @@
                     <el-input v-model="scope.row.remark" :title="scope.row.remark"></el-input>
                 </template>
             </el-table-column>
+            <el-table-column align="center" prop="remark" width="50" label="推送频率">
+                <template slot-scope="scope">
+                    <div v-if="scope.row.frequency_type == 1">{{'每次必推'}}</div>
+                    <div v-if="scope.row.frequency_type == 2">{{scope.row.day_count}}天/次</div>
+                    <div v-if="scope.row.frequency_type == 3">{{scope.row.week_day}}</div>
+
+                </template>
+            </el-table-column>
             <el-table-column align="center" width="40" prop="name" label="操作">
                 <template slot-scope="scope">
-                    <i class="el-icon-delete" @click="deleteProject(scope.row,scope.$index)"></i>
+                    <el-button size="mini" type="primary" @click="handleEdit(scope.row)">推送</el-button>
+                    <el-button size="mini" type="danger" @click="deleteProject(scope.row.id,scope.$index)">删除
+                    </el-button>
+                    <!--<i class="el-icon-delete" @click="deleteProject(scope.row,scope.$index)"></i>-->
+                    <!--<button class="el-icon-delete" @click="deleteProject(scope.row,scope.$index)">删除</>-->
+
                 </template>
             </el-table-column>
         </el-table>
@@ -170,36 +220,91 @@
         </div>
 
 
+        <div>
+            <el-dialog title="推送频率设置" :visible.sync="templateFormVisible" width="854px">
+                <el-form
+                        ref="templateForm"
+                        label-width="90px"
+                >
+                    <el-row>
+                        <el-col :span="24" v-if="frequency_type">
+                            <el-form-item label="周期提醒 :">
+                                <el-radio-group v-model="frequency_type">
+                                    <el-radio :label="1">每次必推</el-radio>
+                                    <el-radio :label="2">天数频率</el-radio>
+                                    <el-radio :label="3">星期频率</el-radio>
+                                </el-radio-group>
+                            </el-form-item>
+                        </el-col>
+
+
+                        <el-col :span="12" v-if="frequency_type == 2">
+                            <el-form-item prop="day_count">
+                                <el-input style="width: 50px" v-model="day_count"></el-input>&nbsp;
+                                天/一次
+                            </el-form-item>
+                        </el-col>
+
+                        <el-col :span="24" v-if="frequency_type == 3">
+                            <el-form-item prop="weekday">
+                                <el-checkbox-group v-model="week_days">
+                                    <el-checkbox label="周一" name="周一" key="1">周一</el-checkbox>
+                                    <el-checkbox label="周二" name="周二" key="2">周二</el-checkbox>
+                                    <el-checkbox label="周三" name="周三" key="3">周三</el-checkbox>
+                                    <el-checkbox label="周四" name="周四" key="4">周四</el-checkbox>
+                                    <el-checkbox label="周五" name="周五" key="5">周五</el-checkbox>
+                                    <el-checkbox label="周六" name="周六" key="6">周六</el-checkbox>
+                                    <el-checkbox label="周日" name="周日" key="7">周日</el-checkbox>
+                                </el-checkbox-group>
+                            </el-form-item>
+                        </el-col>
+
+                    </el-row>
+                </el-form>
+                <div slot="footer" class="dialog-footer">
+                    <el-button @click="templateFormVisible = false">取消</el-button>
+                    <el-button type="primary" @click="submitTemplate()">保 存</el-button>
+                </div>
+            </el-dialog>
+        </div>
+
 
     </div>
 </template>
 
 <script>
-  import { getDictionaryDataConfig} from "@/utils/data";
-  import { getInitData,delHisAdvice,delHisProject,delHisAddition } from '@/api/his/his'
-  import { delHisPrescriptionAdviceTemplate,delHisPrescriptionProjectTemplate } from '@/api/his/his_config'
+  import { getDictionaryDataConfig } from '@/utils/data'
+  import { delHisAddition, delHisAdvice, delHisProject, getInitData } from '@/api/his/his'
+  import { delHisPrescriptionAdviceTemplate, delHisPrescriptionProjectTemplate } from '@/api/his/his_config'
 
   export default {
     props: {
       preDrugs: Array,
       activeType: Number,
-      addtions_charge:Array,
-      prescription:{
-        type:Object,
-        default: function () {
+      addtions_charge: Array,
+      prescription: {
+        type: Object,
+        default: function() {
           return {
-            name:"",
-            advices:[],
-            project:[],
-            drugways:[],
-            efs:[],
-          };
+            name: '',
+            advices: [],
+            project: [],
+            drugways: [],
+            efs: []
+          }
         }
-      },
+      }
     },
     data() {
       return {
-        advices:[],
+        week_days: ['周一'],
+
+        current_row: null,
+        current_index: 0,
+        templateFormVisible: false,
+        frequency_type: 1,
+        day_count: 0,
+        advices: [],
         tableData: [],
         newoptions: [{
           value: '1',
@@ -218,18 +323,43 @@
           label: '5'
         }],
         value: '1',
-        input: 1,
+        input: 1
       }
     },
 
-    methods:{
+    methods: {
+      submitTemplate() {
+        if (this.prescription.advices && this.prescription.advices.length > 0 && this.prescription.project && this.prescription.project.length == 0) {
+          this.prescription.advices[this.current_index].frequency_type = this.frequency_type
+          this.prescription.advices[this.current_index].day_count = this.day_count
+          this.prescription.advices[this.current_index].week_day = this.week_day
+
+        }
+
+        if (this.prescription.advices && this.prescription.advices.length == 0 && this.prescription.project && this.prescription.project.length > 0) {
+          this.prescription.project[this.current_index].frequency_type = this.frequency_type
+          this.prescription.project[this.current_index].day_count = this.day_count
+          this.prescription.project[this.current_index].week_day = this.week_day
+        }
+        this.templateFormVisible = false
+      },
+      handleEdit(row, index) {
+        this.current_row = row
+        this.current_index = index
+        this.frequency_type = this.current_row.frequency_type
+        this.day_count = this.current_row.day_count
+        this.week_day = this.current_row.week_day
+        this.templateFormVisible = true
+
+
+      },
       createFilter(queryString) {
         return (restaurant) => {
           return (restaurant.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0)
         }
       },
       querySearch2(queryString, cb) {
-        var restaurants = this.getDictionaryDataConfig("system","project_use")
+        var restaurants = this.getDictionaryDataConfig('system', 'project_use')
         restaurants.map(item => {
           item.value = item.name
         })
@@ -237,18 +367,18 @@
         // 调用 callback 返回建议列表的数据
         cb(results)
       },
-      delAddition(index, addition){
-        this.$confirm("附加费删除后不可恢复，是否确认删除", "删除", {
-          confirmButtonText: "确 定",
-          cancelButtonText: "取 消",
-          type: "warning"
+      delAddition(index, addition) {
+        this.$confirm('附加费删除后不可恢复，是否确认删除', '删除', {
+          confirmButtonText: '确 定',
+          cancelButtonText: '取 消',
+          type: 'warning'
         }).then(() => {
-          this.$nextTick(function(){
-            if(addition.id == 0){
+          this.$nextTick(function() {
+            if (addition.id == 0) {
               this.prescription.addition.splice(index, 1)
-            }else{
+            } else {
               let params = {
-                'id': addition.id,
+                'id': addition.id
               }
               delHisAddition(params).then(response => {
                 if (response.data.state == 0) {
@@ -262,13 +392,14 @@
                 }
               })
             }
-          });
+          })
 
         })
-          .catch(() => {});
+          .catch(() => {
+          })
 
       },
-      getInitData(){
+      getInitData() {
         getInitData().then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
@@ -279,19 +410,19 @@
           }
         })
 
-      },deleteDrug:function(index, row){
+      }, deleteDrug: function(index, row) {
 
-        this.$confirm("药品删除后不可恢复，是否确认删除", "删除", {
-          confirmButtonText: "确 定",
-          cancelButtonText: "取 消",
-          type: "warning"
+        this.$confirm('药品删除后不可恢复，是否确认删除', '删除', {
+          confirmButtonText: '确 定',
+          cancelButtonText: '取 消',
+          type: 'warning'
         }).then(() => {
-          this.$nextTick(function(){
-            if(row.advice_id == 0){
+          this.$nextTick(function() {
+            if (row.advice_id == 0) {
               this.prescription.advices.splice(index, 1)
-            }else{
+            } else {
               let params = {
-                'id': row.advice_id,
+                'id': row.advice_id
               }
               delHisPrescriptionAdviceTemplate(params).then(response => {
                 if (response.data.state == 0) {
@@ -305,20 +436,15 @@
                 }
               })
 
-
             }
 
-          });
-
+          })
 
         })
-          .catch(() => {});
-
-
+          .catch(() => {
+          })
 
-
-
-      },deepClone(source) {
+      }, deepClone(source) {
         if (!source && typeof source !== 'object') {
           throw new Error('error arguments', 'shallowClone')
         }
@@ -333,7 +459,7 @@
         return targetObj
       },
 
-      setNewData:function(data){
+      setNewData: function(data) {
         this.prescription = data
 
         // this.prescription.advices = data.advices
@@ -341,41 +467,41 @@
       getDictionaryDataConfig(module, filed_name) {
         return getDictionaryDataConfig(module, filed_name)
       },
-      getGroup(id){
-        var name = ""
-        var statistics_category =  getDictionaryDataConfig('system','statistics_category')
-        console.log("2235",statistics_category)
-        for(let i=0;i<statistics_category.length;i++){
-          if(id == statistics_category[i].id){
+      getGroup(id) {
+        var name = ''
+        var statistics_category = getDictionaryDataConfig('system', 'statistics_category')
+        console.log('2235', statistics_category)
+        for (let i = 0; i < statistics_category.length; i++) {
+          if (id == statistics_category[i].id) {
             name = statistics_category[i].name
           }
         }
         return name
       },
-      deleteProject(row,i){
-        if(this.prescription.order_status == 2){
+      deleteProject(row, i) {
+        if (this.prescription.order_status == 2) {
           this.$message.error('该处方已经结算，无法删除')
           return
         }
-        this.$confirm("项目删除后不可恢复，是否确认删除", "删除", {
-          confirmButtonText: "确 定",
-          cancelButtonText: "取 消",
-          type: "warning"
+        this.$confirm('项目删除后不可恢复，是否确认删除', '删除', {
+          confirmButtonText: '确 定',
+          cancelButtonText: '取 消',
+          type: 'warning'
         }).then(() => {
-          if(row.id == 0){
+          if (row.id == 0) {
             this.prescription.project.splice(i, 1)
 
-          }else{
+          } else {
             let params = {
-              'id': row.id,
+              'id': row.id
             }
             delHisPrescriptionProjectTemplate(params).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 return false
               } else {
-                for (let i = 0; i < this.prescription.project.length; i++){
-                  if(this.prescription.project[i].id == row.id){
+                for (let i = 0; i < this.prescription.project.length; i++) {
+                  if (this.prescription.project[i].id == row.id) {
                     this.prescription.project.splice(i, 1)
                   }
                 }
@@ -384,28 +510,29 @@
             })
           }
         })
-          .catch(() => {});
+          .catch(() => {
+          })
 
       },
-      getAllChange(scope){
-        if(scope.row.drug.min_unit == scope.row.single_dose_unit){
-          if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
+      getAllChange(scope) {
+        if (scope.row.drug.min_unit == scope.row.single_dose_unit) {
+          if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
             console.log(1)
             scope.row.prescribing_number = scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day
-          }else{
+          } else {
             console.log(12)
-            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency)) * scope.row.day / scope.row.drug.min_number) 
+            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency)) * scope.row.day / scope.row.drug.min_number)
           }
-        }else{
-          if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
+        } else {
+          if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
             console.log(123)
-            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day) / scope.row.drug.dose) 
-          }else{
+            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day) / scope.row.drug.dose)
+          } else {
             console.log(1234)
             scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day) / scope.row.drug.dose / scope.row.drug.min_number)
           }
         }
-        if(scope.row.prescribing_number == 0){
+        if (scope.row.prescribing_number == 0) {
           scope.row.prescribing_number = 1
         }
         // if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
@@ -419,9 +546,9 @@
         //   }
         //   // scope.row.retail_price = scope.row.drug.retail_price * scope.row.prescribing_number
         // }
-        
+
       },
-      changePrescribingNumber(scope){
+      changePrescribingNumber(scope) {
         // if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
         //   if(parseInt(scope.row.prescribing_number) > scope.row.drug.total){
         //     this.$message.error(scope.row.drug_name + '库存不足')
@@ -432,29 +559,29 @@
         //   }
         // }
       },
-      getSingleDose(scope){
+      getSingleDose(scope) {
         this.prescription.advices[scope.$index].prescribing_number = scope.row.single_dose * scope.row.day
       },
-      getDay(scope){
+      getDay(scope) {
         this.prescription.advices[scope.$index].prescribing_number = scope.row.single_dose * scope.row.day
       },
-      getProjectSingleDose(scope){
+      getProjectSingleDose(scope) {
         this.prescription.project[scope.$index].total = scope.row.single_dose * scope.row.number_days
-        if(this.prescription.project[scope.$index].total == 0){
+        if (this.prescription.project[scope.$index].total == 0) {
           this.prescription.project[scope.$index].total = 1
         }
       },
-      getProjectDay(scope){
+      getProjectDay(scope) {
         this.prescription.project[scope.$index].total = scope.row.single_dose * scope.row.number_days
-        if(this.prescription.project[scope.$index].total == 0){
+        if (this.prescription.project[scope.$index].total == 0) {
           this.prescription.project[scope.$index].total = 1
         }
       }
-    },mounted(){
+    }, mounted() {
       this.getInitData()
 
     },
-    watch:{
+    watch: {
       // "prescription.advices":{
       //   handler(newVal,oldVal){
       //     newVal.map(item => {
@@ -463,7 +590,6 @@
       //         item.total = item.single_dose * item.number_days
       //       }
 
-
       //     })
       //   },
       //   deep:true
@@ -486,31 +612,37 @@
 
 <style lang="scss">
     .prescriptionTable {
-    .el-input__inner{
+
+    .el-input__inner {
         padding: 0 5px;
     }
-    .additionalBox{
+
+    .additionalBox {
         margin-top: 20px;
         display: flex;
         flex-wrap: wrap;
-    .additionalOne{
-        margin-right:20px;
-        margin-bottom:10px;
+
+    .additionalOne {
+        margin-right: 20px;
+        margin-bottom: 10px;
         display: flex;
         align-items: center;
-    >span{
+
+    > span {
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
-        width:80px;
+        width: 80px;
         display: inline-block;
         font-size: 14px;
     }
+
     }
-    .deleteIcon{
-        color:red;
-        margin-left:5px;
+    .deleteIcon {
+        color: red;
+        margin-left: 5px;
     }
+
     }
     .el-table th .cell, .el-table td .cell {
         padding: 0 2px;

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -1317,6 +1317,16 @@
 
             return false
           } else {
+            for(let i = 0;i < response.data.data.sch_prescriptions.length; i++){
+              if(response.data.data.sch_prescriptions[i].advices == null){
+                response.data.data.sch_prescriptions[i].advices = []
+              }
+
+              if(response.data.data.sch_prescriptions[i].project == null){
+                response.data.data.sch_prescriptions[i].project = []
+              }
+
+            }
             this.patientid = val.id
             this.isloading = false
 
@@ -1705,6 +1715,16 @@
                   this.$message.error(response.data.msg)
                   return false
                 } else {
+                  for(let i = 0;i < response.data.data.sch_prescriptions.length; i++){
+                    if(response.data.data.sch_prescriptions[i].advices == null){
+                      response.data.data.sch_prescriptions[i].advices = []
+                    }
+
+                    if(response.data.data.sch_prescriptions[i].project == null){
+                      response.data.data.sch_prescriptions[i].project = []
+                    }
+
+                  }
                   this.prescriptions = []
 
                   this.month_prescriptions = []
@@ -2189,6 +2209,16 @@
                   this.$message.error(response.data.msg)
                   return false
                 } else {
+                  for(let i = 0;i < response.data.data.sch_prescriptions.length; i++){
+                    if(response.data.data.sch_prescriptions[i].advices == null){
+                      response.data.data.sch_prescriptions[i].advices = []
+                    }
+
+                    if(response.data.data.sch_prescriptions[i].project == null){
+                      response.data.data.sch_prescriptions[i].project = []
+                    }
+
+                  }
                   this.prescriptions = []
 
                   this.month_prescriptions = []
@@ -2652,6 +2682,16 @@
                 this.$message.error(response.data.msg)
                 return false
               } else {
+                for(let i = 0;i < response.data.data.sch_prescriptions.length; i++){
+                  if(response.data.data.sch_prescriptions[i].advices == null){
+                    response.data.data.sch_prescriptions[i].advices = []
+                  }
+
+                  if(response.data.data.sch_prescriptions[i].project == null){
+                    response.data.data.sch_prescriptions[i].project = []
+                  }
+
+                }
                 this.prescriptions = []
 
                 this.month_prescriptions = []
@@ -3173,6 +3213,16 @@
                   this.$message.error(response.data.msg)
                   return false
                 } else {
+                  for(let i = 0;i < response.data.data.sch_prescriptions.length; i++){
+                    if(response.data.data.sch_prescriptions[i].advices == null){
+                      response.data.data.sch_prescriptions[i].advices = []
+                    }
+
+                    if(response.data.data.sch_prescriptions[i].project == null){
+                      response.data.data.sch_prescriptions[i].project = []
+                    }
+
+                  }
                   for (let i = 0; i < this.all_data.length; i++) {
                     if (this.all_data[i].id == val.id) {
                       this.oldCurrentRow = this.all_data[i]
@@ -3731,6 +3781,16 @@
                   this.$message.error(response.data.msg)
                   return false
                 } else {
+                  for(let i = 0;i < response.data.data.sch_prescriptions.length; i++){
+                    if(response.data.data.sch_prescriptions[i].advices == null){
+                      response.data.data.sch_prescriptions[i].advices = []
+                    }
+
+                    if(response.data.data.sch_prescriptions[i].project == null){
+                      response.data.data.sch_prescriptions[i].project = []
+                    }
+
+                  }
                   this.prescriptions = []
 
                   this.month_prescriptions = []

src/xt_pages/outpatientDoctorStation/prescriptionTemplatedetail.vue

@@ -452,6 +452,8 @@
             this.prescriptions[i].advices[b].prescribing_number = this.prescriptions[i].advices[b].prescribing_number.toString()
             this.prescriptions[i].advices[b].retail_price = this.prescriptions[i].advices[b].retail_price.toString()
             this.prescriptions[i].advices[b].day = parseInt(this.prescriptions[i].advices[b].day)
+            this.prescriptions[i].advices[b].groupno = parseInt(this.prescriptions[i].advices[b].groupno)
+
 
           }
 
@@ -1461,8 +1463,15 @@
               this.curStatus = 1
             }
 
+            let index = 0
+
+            if (this.prescriptions[i].advices.length > 0) {
+              index = this.prescriptions[i].advices.length
+            }
+
             if (temp.length > 0) {
               for (let b = 0; b < temp.length; b++) {
+                let temp_index = b + 1
                 let obj = {
                   advice_id: 0,
                   id: temp[b].id,
@@ -1477,7 +1486,11 @@
                   single_dose_unit: temp[b].dose_unit,
                   prescribing_number_unit: temp[b].prescribing_number_unit,
                   medical_insurance_number: temp[b].medical_insurance_number,
-                  drug: temp[b]
+                  drug: temp[b],
+                  groupno: index + temp_index,
+                  frequency_type:1,
+                  day_count:0,
+                  week_day:"",
                 }
 
                 if (obj.prescribing_number == 0 || obj.prescribing_number.length == 0) {
@@ -1488,16 +1501,6 @@
               this.curStatus = 1
             }
 
-            // if(this.activeName == 2){
-            //
-            //    for(let i = 0; i<temp2.length;i++){
-            //     for(let j=0;j<this.hisList.length;j++){
-            //         if(temp2[i].id == this.hisList[j].project_id){
-            //            temp2[i].total =  this.hisList[j].number
-            //         }
-            //     }
-            //    }
-            //  }
 
             if (temp2.length > 0) {
               for (let b = 0; b < temp2.length; b++) {
@@ -1516,6 +1519,9 @@
                   medical_code: temp2[b].medical_code,
                   unit: temp2[b].unit,
                   type: temp2[b].type,
+                  frequency_type:1,
+                  day_count:0,
+                  week_day:"",
                 }
                 if (temp2[b].type == 2){
                   obj['project'] = temp2[b].project
@@ -1591,7 +1597,13 @@
                     prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
                     medical_insurance_number: prescription.advices[b].med_list_codg,
                     id: prescription.advices[b].drug_id,
-                    drug: prescription.advices[b].drug
+                    drug: prescription.advices[b].drug,
+                    groupno:prescription.advices[b].groupno,
+                    frequency_type:prescription.advices[b].frequency_type,
+                    day_count:prescription.advices[b].day_count,
+                    week_day:prescription.advices[b].week_day
+
+
                   }
                   tempAdvice.push(obj)
                 }
@@ -1613,6 +1625,10 @@
                     medical_code: prescription.project[b].project.medical_code,
                     unit: prescription.project[b].project.unit,
                     type: prescription.project[b].type,
+                    frequency_type:prescription.project[b].frequency_type,
+                    day_count:prescription.project[b].day_count,
+                    week_day:prescription.project[b].week_day
+
                   }
 
                   if (prescription.project[b].type == 2) {