Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

src/xt_pages/stock/cancelStockOrderAdd.vue

             }, [])
 
 
+
+
+
             this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: '全部' })
             this.dealer.splice(0, 0, { id: 0, dealer_name: '全部' })
             this.form.manufacturer =0
       }, showDialog(index, row) {
         this.currentIndex = index
         this.propForm.goodType = []
+        this.propForm.goods = []
 
-
-        if (this.form.manufacturer == 0 && this.form.dealer == 0) {
+        if (this.form.manufacturer == -1 && this.form.dealer == -1) {
           for (let i = 0; i < this.warehouseOutInfoList.length; i++) {
-            this.propForm.goodType.push(this.warehouseOutInfoList[i].info.type)
+            if (this.warehouseOutInfoList[i].info.dealers.id == 0 && this.warehouseOutInfoList[i].info.manufacturers.id == 0) {
+              this.propForm.goodType.push(this.warehouseOutInfoList[i].info.type)
+              this.propForm.goodInfo.push(this.warehouseOutInfoList[i].info)
+            }
           }
-          const obj3 = {}
-          this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
-            obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
-            return cur
-          }, [])
+        }
 
-        } else {
-          if(this.form.manufacturer == 0 && this.form.dealer != 0){
-            for (let i = 0; i < this.warehouseOutInfoList.length; i++) {
-              if(this.warehouseOutInfoList[i].info.dealers.id == this.form.dealer){
-                this.propForm.goodType.push(this.warehouseOutInfoList[i].info.type)
-              }
+        if (this.form.manufacturer == -1 && this.form.dealer == 0) {
+          for (let i = 0; i < this.warehouseOutInfoList.length; i++) {
+            if (this.warehouseOutInfoList[i].info.manufacturers.id == 0) {
+              this.propForm.goodType.push(this.warehouseOutInfoList[i].info.type)
+              this.propForm.goodInfo.push(this.warehouseOutInfoList[i].info)
             }
           }
-          if(this.form.manufacturer != 0 && this.form.dealer == 0){
-            for (let i = 0; i < this.warehouseOutInfoList.length; i++) {
-              if(this.warehouseOutInfoList[i].info.manufacturers.id == this.form.manufacturer){
-                this.propForm.goodType.push(this.warehouseOutInfoList[i].info.type)
-              }
+        }
+
+        if (this.form.manufacturer == -1 && this.form.dealer != 0) {
+          for (let i = 0; i < this.warehouseInfoList.length; i++) {
+            if (this.warehouseOutInfoList[i].info.manufacturers.id == 0 && this.warehouseOutInfoList[i].info.dealers.id == this.form.dealer) {
+              this.propForm.goodType.push(this.warehouseOutInfoList[i].info.type)
+              this.propForm.goodInfo.push(this.warehouseOutInfoList[i].info)
+
             }
           }
-          if(this.form.manufacturer != 0 && this.form.dealer != 0){
-            for (let i = 0; i < this.warehouseOutInfoList.length; i++) {
-              if(this.warehouseOutInfoList[i].info.dealers.id == this.form.dealer && this.warehouseOutInfoList[i].info.manufacturers.id == this.form.manufacturer){
-                this.propForm.goodType.push(this.warehouseOutInfoList[i].info.type)
-              }
-            }
+        }
+
+        if (this.form.manufacturer == 0 && this.form.dealer == 0) {
+          for (let i = 0; i < this.warehouseOutInfoList.length; i++) {
+            this.propForm.goodType.push(this.warehouseOutInfoList[i].info.type)
+            this.propForm.goodInfo.push(this.warehouseOutInfoList[i].info)
+
           }
-          const obj3 = {}
-          this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
-            obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
-            return cur
-          }, [])
         }
 
+        if (this.form.manufacturer == 0 && this.form.dealer == -1) {
+          for (let i = 0; i < this.warehouseOutInfoList.length; i++) {
+            if (this.warehouseOutInfoList[i].info.dealers.id == 0) {
+              this.propForm.goodType.push(this.warehouseOutInfoList[i].info.type)
+              this.propForm.goodInfo.push(this.warehouseOutInfoList[i].info)
+
+            }
+          }
+        }
 
+        if (this.form.manufacturer != 0 && this.form.dealer == -1) {
+          for (let i = 0; i < this.warehouseOutInfoList.length; i++) {
+            if (this.warehouseOutInfoList[i].info.dealers.id == 0 && this.warehouseOutInfoList[i].info.manufacturers.id == this.form.manufacturer) {
+              this.propForm.goodType.push(this.warehouseOutInfoList[i].info.type)
+              this.propForm.goodInfo.push(this.warehouseOutInfoList[i].info)
 
-        this.$refs.dialog.show()
+            }
+          }
+        }
 
+        if (this.form.manufacturer != 0 && this.form.dealer != 0) {
+          for (let i = 0; i < this.warehouseOutInfoList.length; i++) {
+            if (this.warehouseOutInfoList[i].info.manufacturers.id == this.form.manufacturer && this.warehouseOutInfoList[i].info.dealers.id == this.form.dealer) {
+              this.propForm.goodType.push(this.warehouseOutInfoList[i].info.type)
+              this.propForm.goodInfo.push(this.warehouseOutInfoList[i].info)
 
-        this.currentIndex = index
-        if (this.form.manufacturer == '' || this.form.manufacturer == 0) {
+            }
+          }
+        }
 
-        } else {
-          this.$refs.dialog.show()
+        if (this.form.manufacturer == 0 && this.form.dealer != 0) {
+          for (let i = 0; i < this.warehouseOutInfoList.length; i++) {
+            if (this.warehouseOutInfoList[i].info.dealers.id == this.form.dealer) {
+              this.propForm.goodType.push(this.warehouseOutInfoList[i].info.type)
+              this.propForm.goodInfo.push(this.warehouseOutInfoList[i].info)
 
+            }
+          }
+        }
+        if (this.form.manufacturer != 0 && this.form.dealer == 0) {
           for (let i = 0; i < this.warehouseOutInfoList.length; i++) {
-            if (this.warehouseOutInfoList[i].manufacturer == this.form.manufacturer) {
-              this.propForm.goodType.push(this.warehouseOutInfoList[i].GoodInfo.GoodsType)
+            if (this.warehouseOutInfoList[i].info.manufacturers.id == this.form.manufacturer) {
+              this.propForm.goodType.push(this.warehouseOutInfoList[i].info.type)
+              this.propForm.goodInfo.push(this.warehouseOutInfoList[i].info)
+            }
+          }
+        }
+
+        // if (this.form.manufacturer == 0 && this.form.dealer == 0) {
+        //   for (let i = 0; i < this.warehouseOutInfoList.length; i++) {
+        //     this.propForm.goodType.push(this.warehouseOutInfoList[i].info.type)
+        //   }
+        //   const obj3 = {}
+        //   this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+        //     obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
+        //     return cur
+        //   }, [])
+        //
+        // } else {
+        //   if(this.form.manufacturer == 0 && this.form.dealer != 0){
+        //     for (let i = 0; i < this.warehouseOutInfoList.length; i++) {
+        //       if(this.warehouseOutInfoList[i].info.dealers.id == this.form.dealer){
+        //         this.propForm.goodType.push(this.warehouseOutInfoList[i].info.type)
+        //       }
+        //     }
+        //   }
+        //   if(this.form.manufacturer != 0 && this.form.dealer == 0){
+        //     for (let i = 0; i < this.warehouseOutInfoList.length; i++) {
+        //       if(this.warehouseOutInfoList[i].info.manufacturers.id == this.form.manufacturer){
+        //         this.propForm.goodType.push(this.warehouseOutInfoList[i].info.type)
+        //       }
+        //     }
+        //   }
+        //   if(this.form.manufacturer != 0 && this.form.dealer != 0){
+        //     for (let i = 0; i < this.warehouseOutInfoList.length; i++) {
+        //       if(this.warehouseOutInfoList[i].info.dealers.id == this.form.dealer && this.warehouseOutInfoList[i].info.manufacturers.id == this.form.manufacturer){
+        //         this.propForm.goodType.push(this.warehouseOutInfoList[i].info.type)
+        //       }
+        //     }
+        //   }
+        //   const obj3 = {}
+        //   this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+        //     obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
+        //     return cur
+        //   }, [])
+        // }
+
+        const obj3 = {}
+        this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+          obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
+          return cur
+        }, [])
+        const obj4 = {}
+        this.propForm.goodInfo = this.propForm.goodInfo.reduce((cur, next) => {
+          obj4[next.id] ? '' : obj4[next.id] = true && cur.push(next)
+          return cur
+        }, [])
+
+        for (let i = 0; i < this.propForm.goodType.length; i++) {
+          let goodInfo = []
+          let goodObj = {}
+
+          for (let a = 0; a < this.propForm.goodInfo.length; a++) {
+            var respObj = this.propForm.goodInfo[a]
+            respObj['isSelected'] = false
+            if (respObj.type.id == this.propForm.goodType[i].id && respObj.id != 0) {
+                console.log(respObj.id)
+                goodInfo.push(respObj)
             }
           }
-          const obj3 = {}
-          this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
-            obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
+          const obj = {}
+          goodInfo = goodInfo.reduce((cur, next) => {
+            obj[next.id] ? '' : obj[next.id] = true && cur.push(next)
             return cur
-          }, [])
+          }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+
+          if(goodInfo.length != 0) {
+            this.$set(goodObj, this.propForm.goodType[i].id, goodInfo)
+            this.propForm.goods.push(goodObj)
+
+          }
         }
+        console.log(this.propForm.goods)
+
+
+
+        this.$refs.dialog.show()
+      // }
+
+
+        // this.currentIndex = index
+        // if (this.form.manufacturer == '' || this.form.manufacturer == 0) {
+        //
+        // } else {
+        //   this.$refs.dialog.show()
+        //
+        //   for (let i = 0; i < this.warehouseOutInfoList.length; i++) {
+        //     if (this.warehouseOutInfoList[i].manufacturer == this.form.manufacturer) {
+        //       this.propForm.goodType.push(this.warehouseOutInfoList[i].GoodInfo.GoodsType)
+        //     }
+        //   }
+        //   const obj3 = {}
+        //   this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
+        //     obj3[next.id] ? '' : obj3[next.id] = true && cur.push(next)
+        //     return cur
+        //   }, [])
+        // }
       }, back() {
         this.$router.go(-1)
       }, submit() {

src/xt_pages/stock/stockOutOrderAdd.vue

           }, []) // 设置cur默认类型为数组，并且初始值为空的数组
 
           this.$set(goodObj, this.propForm.goodType[i].id, goodInfo)
-          console.log(goodObj)
           this.propForm.goods.push(goodObj)
-          console.log(this.propForm.goods)
-
         }
 
 

src/xt_pages/user/components/EditGroupAdvice.vue

         </el-row>
         <el-row style="margin-bottom: 20px">
           <el-col :span="2">&nbsp;</el-col>
-          <!--<el-col :span="5">-->
-            <!--<el-button-->
-              <!--:disabled="$store.getters.xt_user.subscibe.state==3?true:false"-->
-              <!--@click="openAdviceTemplate()"-->
-              <!--round-->
-              <!---->
-            <!--&gt;选择医嘱模板-->
-            <!--</el-button>-->
-          <!--</el-col>-->
+          <el-col :span="5">
+            <el-button
+              :disabled="$store.getters.xt_user.subscibe.state==3?true:false"
+              @click="openAdviceTemplate()"
+              round
+            >选择医嘱模板
+            </el-button>
+          </el-col>
 
           <el-col :span="5">
             <el-button
 
     </el-dialog>
 
+
     <el-dialog title="选择医嘱模板" :visible.sync="templateFormVisible" width="72%" :close-on-click-modal="false">
       <el-row :gutter="20">
         <el-col :span="8">
                 <span v-if="scope.row.parent_row==0">{{scope.row.execution_frequency}}</span>
               </template>
             </el-table-column>
+
+            <el-table-column
+              v-if="groupForm.advice_type == 1"
+              label="提醒频率"
+              min-width="80"
+              align="center"
+            >
+              <template slot-scope="scope">
+                <span v-if="scope.row.frequency_type == 1">每次必推</span>
+                <span v-if="scope.row.frequency_type == 2">{{scope.row.day_count}}天/1次</span>
+                <span v-if="scope.row.frequency_type == 3">每周{{scope.row.week_days}}</span>
+              </template>
+            </el-table-column>
+
           </el-table>
         </el-col>
       </el-row>
         </el-button>
       </div>
     </el-dialog>
-
     <el-dialog :title="nameFormTitle" :visible.sync="nameFormVisible" width="700px">
       <el-form ref="nameForm" :rules="nameRules" :model="nameForm" label-width="90px">
         <el-row>
     DeleteDoctorAdvice,
     DeleteGroupAdvice,
     EditDoctorAdvice,
-    getAdviceConfig,
     getDoctorAdviceList,
-    StopDoctorAdvice
+    StopDoctorAdvice,
+    getAdviceConfig
   } from "@/api/advice";
 
 
           id: 0,
           children: [],
         },
+
+        drugOptions: [],
+        deliveryWayOptions: [],
+        executionFrequencyOptions: [],
+        adviceTemplates:[],
         submitGroupForm: {
           advice_type: "",
           advice_date: "",
         selectedTemp: {'id': 0, name: '', org_id: 0, 'list': [], 'rows': []},
         selectedTemplate: [],
         allSelectedTemplate:[],
+        adviceTemplateMaps:{},
 
       }
     },
       adviceType: 0,
       adminusername: '',
       rowKey: 0,
-      adviceTemplates: {
-        type: Array,
-        default: function () {
-          return []
-        }
-      },
+
       weekList: [
         { id: 1, name: '周一' },
         { id: 2, name: '周二' },
           return []
         }
       },
-      deliveryWayOptions: {
-        type: Array,
-        default: () => []
-      },
+
       unitsOption: {
         type: Array,
         default: function () {
           return []
         }
-      },
-      executionFrequencyOptions: {
-        type: Array,
-        default: function () {
-          return []
-        }
-      },
-      adviceTemplateMaps: {
-        type: Object,
-        default: function () {
-          return {}
-        }
-      },
-      adviceTableData: {
+      }, adviceTableData: {
         type: Array,
         default: function () {
           return []
               children: [],
               parent_row: 0,
               row_key: thisRowKey,
+              day_count: this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].day_count,
+              week_days: this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].week_days,
+              frequency_type: this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].frequency_type,
+
             }
             if ('children' in this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index] && this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].children.length > 0) {
               var parentRow = thisRowKey;
               }
               this.$set(item, 'children', item.children);
             }
-
             this.selectedTemp.list.unshift(item);
 
           }
                 execution_frequency: adviceTemplate.DoctorAdviceTemplate[index].execution_frequency,
                 advice_id: adviceTemplate.DoctorAdviceTemplate[index].id,
                 selection: adviceTemplate.DoctorAdviceTemplate[index].selection,
+                day_count: adviceTemplate.DoctorAdviceTemplate[index].day_count,
+                frequency_type: adviceTemplate.DoctorAdviceTemplate[index].frequency_type,
+                week_days: adviceTemplate.DoctorAdviceTemplate[index].week_days,
+                template_id: 'T' + adviceTemplate.DoctorAdviceTemplate[index].id,
+
                 isEdit: 0,
                 id: 0,
                 children: [],
             delivery_way: this.allSelectedTemplate[index].delivery_way,
             execution_frequency: this.allSelectedTemplate[index].execution_frequency,
 
+
+            day_count: this.allSelectedTemplate[index].day_count.toString(),
+            frequency_type: this.allSelectedTemplate[index].frequency_type,
+            week_days: this.allSelectedTemplate[index].week_days,
+            template_id: this.allSelectedTemplate[index].template_id,
+
+
+
             isEdit: 0,
             id: 0,
             children: [],
                 prescribing_number_unit: groups[index].prescribing_number_unit,
                 delivery_way: groups[index].delivery_way,
                 execution_frequency: groups[index].execution_frequency,
+
+                day_count: groups[index].day_count,
+                frequency_type: groups[index].frequency_type,
+                week_day: groups[index].week_day,
+                template_id: groups[index].template_id,
+
                 isEdit: 0,
                 index: 0,
                 id: groups[index].id,
                 this.$set(item, 'children', item.children);
               }
               this.groupForm.adviceNames.unshift(item);
+              console.log(this.groupForm)
             }
             return false;
           }
         if (typeof (this.$refs.templatetable) != 'undefined') {
           this.$refs.templatetable.setCurrentRow(null);
         }
+
+
+        if (this.groupForm.advice_type == 1) {
+          this.getAdviceConfig(1)
+        } else if (this.groupForm.advice_type == 3) {
+          this.getAdviceConfig(0)
+        }
+
+
+
         this.templateFormVisible = true;
       }, selectAllTemplateAdvice(selection) {
         var adviceArray = this.adviceTemplateMaps[this.selectedTemp.id].DoctorAdviceTemplate
             adviceTemplate.DoctorAdviceTemplate[index].selection = false
           }
         }
-      }
+      },getAdviceConfig(type) {
+        getAdviceConfig(type).then(response => {
+          if (response.data.state == 1) {
+            this.deliveryWayOptions =
+              response.data.data.drugways === null
+                ? []
+                : response.data.data.drugways
+            this.executionFrequencyOptions =
+              response.data.data.efs === null ? [] : response.data.data.efs
+            this.adviceTemplates =
+              response.data.data.advice_templates === null
+                ? []
+                : response.data.data.advice_templates
+
+            var templateLen = this.adviceTemplates.length
+            for (let index = 0; index < templateLen; index++) {
+              if (!this.adviceTemplates[index].DoctorAdviceTemplate) {
+                continue
+              }
+
+              var DoctorAdviceTemplate = this.adviceTemplates[index]
+                .DoctorAdviceTemplate
+              for (let i = 0; i < DoctorAdviceTemplate.length; i++) {
+                DoctorAdviceTemplate[i].selection = false
+              }
+
+              var item = this.adviceTemplates[index]
+              item.DoctorAdviceTemplate = []
+              var datMap = {}
+              for (const key in DoctorAdviceTemplate) {
+                if (DoctorAdviceTemplate[key].parent_id == 0) {
+                  datMap[DoctorAdviceTemplate[key].id] =
+                    DoctorAdviceTemplate[key]
+                }
+              }
+
+              for (const key in DoctorAdviceTemplate) {
+                if (DoctorAdviceTemplate[key].parent_id in datMap) {
+                  if ('children' in datMap[DoctorAdviceTemplate[key].parent_id]) {
+                    datMap[DoctorAdviceTemplate[key].parent_id].children.push(
+                      DoctorAdviceTemplate[key]
+                    )
+                  } else {
+                    datMap[DoctorAdviceTemplate[key].parent_id].children = []
+                    datMap[DoctorAdviceTemplate[key].parent_id].children.push(
+                      DoctorAdviceTemplate[key]
+                    )
+                  }
+                }
+              }
+              for (const key in datMap) {
+                item.DoctorAdviceTemplate.push(datMap[key])
+              }
+
+              this.$set(
+                this.adviceTemplateMaps,
+                this.adviceTemplates[index].id,
+                item
+              )
+              console.log(this.adviceTemplates)
+            }
+          }
+        })
+      },
+
     },
     watch: {
       'rowKey': function () {

src/xt_pages/user/components/PatientDetail.vue

             } else {
               this.patientPrint.hospital_first_dialysis_date = ''
             }
+
+
+            this.checkIdCardNo()
+
+
           } else {
             console.log('patient get err state')
             this.$notify.error({
         height: 200,
         text: 'user_id:' + patientID + ',' + 'name:' + name + ',' + 'dialysis_no:' + dialysisNo + ',' + 'gender:' + gender + ',' + 'idcard_no:' + idCardNo + ',' + 'phone:' + phone + ',' + 'healthcare_no:' + healthCareNo
       })
-    }
+    }, checkIdCardNo() {
+      if (!isCardNo(this.form.idCardNo)) {
+        this.$message.error('身份证号码信息有误!')
+        this.form.birth = ''
+        return false
+      }
+      var thisLen = this.form.idCardNo.length
+      var birth = ''
+      if (thisLen == 15) {
+        birth = '19' + this.form.idCardNo.substr(6, 6)
+      } else {
+        birth = this.form.idCardNo.substr(6, 8)
+      }
+      this.form.birth =
+        birth.substr(0, 4) +
+        '-' +
+        birth.substr(4, 2) +
+        '-' +
+        birth.substr(6, 2)
+
+      this.form.age = jsGetAge(this.form.birth, '-')
+    },
+
     // qrcode(params){
     //    new QRCode('qrcode',{
     //        width:200,

src/xt_pages/user/components/PatientForm.vue

         this.submitMsg = '新增患者成功'
         this.form = Object.assign({}, defaultForm)
       }
+
+
     },
     watch:{
       "form.record_date":function(val) {
         })
       },
       checkIdCardNo() {
+        console.log(this.form.idCardNo)
         if (!isCardNo(this.form.idCardNo)) {
           this.$message.error('身份证号码信息有误!')
           this.form.birth = ''
               // if (patietInfo.registrars_id > 0) {
               //   this.form.registrars = patietInfo.registrars_id;
               // }
+              this.checkIdCardNo()
+
             } else {
               this.$notify.error({
                 title: '错误',

src/xt_pages/user/doctorAdvice.vue

             }
           }
         }
+
+        console.log(this.selectedTemp.list)
       },
       spanselecttable({ row, column, rowIndex, columnIndex }) {
         if (columnIndex == 0) {
               day_count: this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].day_count,
               week_days: this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].week_days,
               frequency_type: this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].frequency_type,
+
+
               isEdit: 0,
               id: 0,
               children: [],
                 this.$set(item, 'children', item.children)
               }
               this.allSelectedTemplate.unshift(item)
-              console.log(this.allSelectedTemplate)
               adviceTemplate.DoctorAdviceTemplate[index].selection = false
             }
           }