hah阿凡达

src/xt_pages/data/druguseTemplate.vue

@@ -301,6 +301,12 @@
                     </template>
                   </el-table-column>
 
+                  <el-table-column prop="remark" align="center" label="医嘱嘱托">
+                    <template slot-scope="scope">
+                      {{scope.row.remark}}
+                    </template>
+                  </el-table-column>
+
                 </el-table>
               </div>
               <div slot="footer" class="dialog-footer">
@@ -488,6 +494,12 @@
                     </el-form-item>
                   </el-col>
 
+                  <el-col :span="12">
+                    <el-form-item prop="day_count" label="医嘱嘱托:">
+                      <el-input style="width: 200px" v-model="templateForm.remark"></el-input>&nbsp;
+                    </el-form-item>
+                  </el-col>
+
                 </el-row>
               </el-form>
               <div slot="footer" class="dialog-footer">
@@ -1422,7 +1434,8 @@
           execution_frequency: '',
           id: 0,
           drug_id:0,
-          way:0
+          way:0,
+          remark:""
         },
         dialogConfigVisible:false,
         templateFormEdit: {
@@ -1877,7 +1890,10 @@
             templateFormTwo.parent_id = this.parent_id
             templateFormTwo.drug_id = this.templateForm.drug_id
             templateFormTwo.way   = this.templateForm.way
-
+            templateFormTwo.remark = this.templateForm.remark
+             
+            console.log("remake------------------",templateFormTwo.remark)
+           
             if (this.isAddChild) {
               CreateSubAdvice(templateFormTwo).then(response => {
                 if (response.data.state == 0) {
@@ -1933,7 +1949,7 @@
               templateFormTwo.parent_id = this.parent_id
               templateFormTwo.drug_id = this.templateForm.drug_id
               templateFormTwo.way  = this.templateForm.way
-
+              templateFormTwo.remark = this.templateForm.remark
               if (this.templateForm.frequency_type == 1) {
                 templateFormTwo.frequency_type = this.templateForm.frequency_type
                 templateFormTwo.day_count = '0'
@@ -1979,6 +1995,7 @@
                     this.adviceTableData[i].weekdays = templateFormTwo.weekdays
                     this.adviceTableData[i].drug_id =  templateFormTwo.drug_id
                     this.adviceTableData[i].way   = templateFormTwo.way
+                    this.adviceTableData[i].remark =templateFormTwo.remark
 
                   }
                 }

src/xt_pages/dialysis/doctorInspectionPrint.vue

@@ -190,6 +190,7 @@ export default {
                     this.project = resp.data.project
                     
                     resp.data.hisAdvices.map((item,index) => {
+                     item.doctor_advice = []
                     item.new_advice = item.new_advice ? item.new_advice : []
                      
                     if(this.project[index].project.length > 0){
@@ -211,7 +212,8 @@ export default {
                             groupno:0,
                             advice_type:6
                         }
-                        item.doctor_advice.push(obj)
+  
+                         item.doctor_advice.push(obj)
                         })
                     }
                     
@@ -369,12 +371,15 @@ export default {
                     } else {
                         advice_groups = []
                     }
+                    
                     maps.new_advice = advice_groups
                     }
                  }
 
-                     console.log("scheduleMap------------------",scheduleMap)
-                     this.scheduleMap = scheduleMap
+                    this.scheduleMap = scheduleMap
+
+                   
+                 
                  }
                 
               

src/xt_pages/stock/stockInOrderAdd.vue

@@ -787,7 +787,7 @@
               array[i].packing_price = array[i].packing_price.toString()
             }
 
-            if(this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10278 || this.$store.getters.xt_user.org_id == 10610 ||  this.$store.getters.xt_user.org_id == 10537 ||  this.$store.getters.xt_user.org_id == 10480 ) {
+            if(this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10278 || this.$store.getters.xt_user.org_id == 10610 ||  this.$store.getters.xt_user.org_id == 10537 ) {
               for (let i = 0; i < array.length; i++) {
                 if (array[i].good_code.length == 0) {
                   this.$message.error(array[i].good_name  + " 溯源码不能为空");