Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

src/lang/zh.js

@@ -225,7 +225,6 @@ export default {
     signIndex:'签到排队',
     signIn:'签到窗口',
     lineUp:'排队窗口',
-    otherManagement:'其他管理',
     calling:'排队叫号',
     bedManagement:'床位管理',
     dictionaryManagement:'字典管理',
@@ -235,7 +234,7 @@ export default {
   },
   navbar: {
     logOut: '退出登录',
-    dashboard: '首页',
+    dashboard: '透析首页',
     github: '项目地址',
     screenfull: '全屏',
     theme: '换肤'

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -19,7 +19,7 @@
         ref="dialysisPrescription"
         :model="dialysisPrescription"
         label-width="148px"
-      > 
+      >
         <el-row :gutter="24">
           <el-col :span="8" v-if="isShows('透析模式')">
             <el-form-item label="透析模式">
@@ -219,9 +219,9 @@
             </el-form-item>
           </el-col>
 
-          
 
-       
+
+
 
           <el-col :span="8" v-if="isShows('置换量') && (this.$store.getters.xt_user.template_info.template_id == 20)"
                   v-show="zhiShow">
@@ -519,265 +519,265 @@
           <!--          </el-col>-->
 
           <!--透析耗材-->
-          <el-col
-            :span="8"
-            v-if="isShows('血液透析干粉') && config.is_open == 1"
-          >
-            <el-form-item label="血液透析干粉：">
-              <el-select
-                v-model="dialysisPrescription.niprocart"
-                placeholder="请选择"
-              >
-                <el-option :key="0" label="请选择" :value="0"></el-option>
-                <el-option
-                  v-for="(option, index) in niprocart_info"
-                  :key="index + 'p'"
-                  :label="option.GoodInfo.specification_name"
-                  :value="option.GoodInfo.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <el-col
-            :span="8"
-            v-if="isShows('一次性使用动静脉穿刺针') && config.is_open == 1"
-          >
-            <el-form-item label="一次性使用动静脉穿刺针：">
-              <el-select
-                v-model="dialysisPrescription.jms"
-                placeholder="请选择"
-              >
-                <el-option :key="0" label="请选择" :value="0"></el-option>
-
-                <el-option
-                  v-for="(option, index) in jms_info"
-                  :key="index + 'a'"
-                  :label="option.GoodInfo.specification_name"
-                  :value="option.GoodInfo.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <el-col
-            :span="8"
-            v-if="isShows('内瘘管翼状针') && config.is_open == 1"
-          >
-            <el-form-item label="内瘘管翼状针：">
-              <el-select
-                v-model="dialysisPrescription.fistula_needle_set"
-                placeholder="请选择"
-              >
-                <el-option :key="0" label="请选择" :value="0"></el-option>
-
-                <el-option
-                  v-for="(option, index) in fistula_needle_set_info"
-                  :key="index + 's'"
-                  :label="option.GoodInfo.specification_name"
-                  :value="option.GoodInfo.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <el-col
-            :span="8"
-            v-if="isShows('内瘘管翼状针16G') && config.is_open == 1"
-          >
-            <el-form-item label="内瘘管翼状针16G：">
-              <el-select
-                v-model="dialysisPrescription.fistula_needle_set_16"
-                placeholder="请选择"
-              >
-                <el-option :key="0" label="请选择" :value="0"></el-option>
-
-                <el-option
-                  v-for="(option, index) in fistula_needle_set_16_info"
-                  :key="index + 'd'"
-                  :label="option.GoodInfo.specification_name"
-                  :value="option.GoodInfo.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <el-col
-            :span="8"
-            v-if="isShows('一次性使用血液灌流器') && config.is_open == 1"
-          >
-            <el-form-item label="一次性使用血液灌流器：">
-              <el-select
-                v-model="dialysisPrescription.hemoperfusion"
-                placeholder="请选择"
-              >
-                <el-option :key="0" label="请选择" :value="0"></el-option>
-
-                <el-option
-                  v-for="(option, index) in hemoperfusion_info"
-                  :key="index + 'f'"
-                  :label="option.GoodInfo.specification_name"
-                  :value="option.GoodInfo.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+          <!--<el-col-->
+            <!--:span="8"-->
+            <!--v-if="isShows('血液透析干粉') && config.is_open == 1"-->
+          <!--&gt;-->
+            <!--<el-form-item label="血液透析干粉：">-->
+              <!--<el-select-->
+                <!--v-model="dialysisPrescription.niprocart"-->
+                <!--placeholder="请选择"-->
+              <!--&gt;-->
+                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
+                <!--<el-option-->
+                  <!--v-for="(option, index) in niprocart_info"-->
+                  <!--:key="index + 'p'"-->
+                  <!--:label="option.GoodInfo.specification_name"-->
+                  <!--:value="option.GoodInfo.id"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
+
+          <!--<el-col-->
+            <!--:span="8"-->
+            <!--v-if="isShows('一次性使用动静脉穿刺针') && config.is_open == 1"-->
+          <!--&gt;-->
+            <!--<el-form-item label="一次性使用动静脉穿刺针：">-->
+              <!--<el-select-->
+                <!--v-model="dialysisPrescription.jms"-->
+                <!--placeholder="请选择"-->
+              <!--&gt;-->
+                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
 
-          <el-col
-            :span="8"
-            v-if="isShows('空心纤维血液透析器') && config.is_open == 1"
-          >
-            <el-form-item label="空心纤维血液透析器：">
-              <el-select
-                v-model="dialysisPrescription.dialyser_sterilised"
-                placeholder="请选择"
-              >
-                <el-option :key="0" label="请选择" :value="0"></el-option>
+                <!--<el-option-->
+                  <!--v-for="(option, index) in jms_info"-->
+                  <!--:key="index + 'a'"-->
+                  <!--:label="option.GoodInfo.specification_name"-->
+                  <!--:value="option.GoodInfo.id"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
+
+          <!--<el-col-->
+            <!--:span="8"-->
+            <!--v-if="isShows('内瘘管翼状针') && config.is_open == 1"-->
+          <!--&gt;-->
+            <!--<el-form-item label="内瘘管翼状针：">-->
+              <!--<el-select-->
+                <!--v-model="dialysisPrescription.fistula_needle_set"-->
+                <!--placeholder="请选择"-->
+              <!--&gt;-->
+                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
 
-                <el-option
-                  v-for="(option, index) in dialyser_sterilised_info"
-                  :key="index + 'g'"
-                  :label="option.GoodInfo.specification_name"
-                  :value="option.GoodInfo.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+                <!--<el-option-->
+                  <!--v-for="(option, index) in fistula_needle_set_info"-->
+                  <!--:key="index + 's'"-->
+                  <!--:label="option.GoodInfo.specification_name"-->
+                  <!--:value="option.GoodInfo.id"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
+
+          <!--<el-col-->
+            <!--:span="8"-->
+            <!--v-if="isShows('内瘘管翼状针16G') && config.is_open == 1"-->
+          <!--&gt;-->
+            <!--<el-form-item label="内瘘管翼状针16G：">-->
+              <!--<el-select-->
+                <!--v-model="dialysisPrescription.fistula_needle_set_16"-->
+                <!--placeholder="请选择"-->
+              <!--&gt;-->
+                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
 
-          <el-col
-            :span="8"
-            v-if="isShows('中空纤维透析器') && config.is_open == 1"
-          >
-            <el-form-item label="中空纤维透析器：">
-              <el-select
-                v-model="dialysisPrescription.filtryzer"
-                placeholder="请选择"
-              >
-                <el-option :key="0" label="请选择" :value="0"></el-option>
+                <!--<el-option-->
+                  <!--v-for="(option, index) in fistula_needle_set_16_info"-->
+                  <!--:key="index + 'd'"-->
+                  <!--:label="option.GoodInfo.specification_name"-->
+                  <!--:value="option.GoodInfo.id"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
+
+          <!--<el-col-->
+            <!--:span="8"-->
+            <!--v-if="isShows('一次性使用血液灌流器') && config.is_open == 1"-->
+          <!--&gt;-->
+            <!--<el-form-item label="一次性使用血液灌流器：">-->
+              <!--<el-select-->
+                <!--v-model="dialysisPrescription.hemoperfusion"-->
+                <!--placeholder="请选择"-->
+              <!--&gt;-->
+                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
 
-                <el-option
-                  v-for="(option, index) in filtryzer_info"
-                  :key="index + 'h'"
-                  :label="option.GoodInfo.specification_name"
-                  :value="option.GoodInfo.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+                <!--<el-option-->
+                  <!--v-for="(option, index) in hemoperfusion_info"-->
+                  <!--:key="index + 'f'"-->
+                  <!--:label="option.GoodInfo.specification_name"-->
+                  <!--:value="option.GoodInfo.id"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
+
+          <!--<el-col-->
+            <!--:span="8"-->
+            <!--v-if="isShows('空心纤维血液透析器') && config.is_open == 1"-->
+          <!--&gt;-->
+            <!--<el-form-item label="空心纤维血液透析器：">-->
+              <!--<el-select-->
+                <!--v-model="dialysisPrescription.dialyser_sterilised"-->
+                <!--placeholder="请选择"-->
+              <!--&gt;-->
+                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
 
-          <el-col :span="8" v-if="isShows('透析器') && config.is_open == 1">
-            <el-form-item label="透析器：">
-              <el-select
-                v-model="dialysisPrescription.dialyzers"
-                placeholder="请选择"
-              >
-                <el-option :key="0" label="请选择" :value="0"></el-option>
+                <!--<el-option-->
+                  <!--v-for="(option, index) in dialyser_sterilised_info"-->
+                  <!--:key="index + 'g'"-->
+                  <!--:label="option.GoodInfo.specification_name"-->
+                  <!--:value="option.GoodInfo.id"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
+
+          <!--<el-col-->
+            <!--:span="8"-->
+            <!--v-if="isShows('中空纤维透析器') && config.is_open == 1"-->
+          <!--&gt;-->
+            <!--<el-form-item label="中空纤维透析器：">-->
+              <!--<el-select-->
+                <!--v-model="dialysisPrescription.filtryzer"-->
+                <!--placeholder="请选择"-->
+              <!--&gt;-->
+                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
 
-                <el-option
-                  v-for="(option, index) in dialyzers_info"
-                  :key="index + 1"
-                  :label="option.GoodInfo.specification_name"
-                  :value="option.GoodInfo.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+                <!--<el-option-->
+                  <!--v-for="(option, index) in filtryzer_info"-->
+                  <!--:key="index + 'h'"-->
+                  <!--:label="option.GoodInfo.specification_name"-->
+                  <!--:value="option.GoodInfo.id"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
 
-          <el-col :span="8" v-if="isShows('注射器') && config.is_open == 1">
-            <el-form-item label="注射器：">
-              <el-select
-                v-model="dialysisPrescription.injector"
-                placeholder="请选择"
-              >
-                <el-option :key="0" label="请选择" :value="0"></el-option>
+          <!--<el-col :span="8" v-if="isShows('透析器') && config.is_open == 1">-->
+            <!--<el-form-item label="透析器：">-->
+              <!--<el-select-->
+                <!--v-model="dialysisPrescription.dialyzers"-->
+                <!--placeholder="请选择"-->
+              <!--&gt;-->
+                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
 
-                <el-option
-                  v-for="(option, index) in injector_info"
-                  :key="index + 'j'"
-                  :label="option.GoodInfo.specification_name"
-                  :value="option.GoodInfo.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+                <!--<el-option-->
+                  <!--v-for="(option, index) in dialyzers_info"-->
+                  <!--:key="index + 1"-->
+                  <!--:label="option.GoodInfo.specification_name"-->
+                  <!--:value="option.GoodInfo.id"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
 
-          <el-col
-            :span="8"
-            v-if="isShows('体外循环血路管') && config.is_open == 1"
-          >
-            <el-form-item label="体外循环血路管：">
-              <el-select
-                v-model="dialysisPrescription.bloodlines"
-                placeholder="请选择"
-              >
-                <el-option :key="0" label="请选择" :value="0"></el-option>
+          <!--<el-col :span="8" v-if="isShows('注射器') && config.is_open == 1">-->
+            <!--<el-form-item label="注射器：">-->
+              <!--<el-select-->
+                <!--v-model="dialysisPrescription.injector"-->
+                <!--placeholder="请选择"-->
+              <!--&gt;-->
+                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
 
-                <el-option
-                  v-for="(option, index) in bloodlines_info"
-                  :key="index + 'k'"
-                  :label="option.GoodInfo.specification_name"
-                  :value="option.GoodInfo.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+                <!--<el-option-->
+                  <!--v-for="(option, index) in injector_info"-->
+                  <!--:key="index + 'j'"-->
+                  <!--:label="option.GoodInfo.specification_name"-->
+                  <!--:value="option.GoodInfo.id"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
+
+          <!--<el-col-->
+            <!--:span="8"-->
+            <!--v-if="isShows('体外循环血路管') && config.is_open == 1"-->
+          <!--&gt;-->
+            <!--<el-form-item label="体外循环血路管：">-->
+              <!--<el-select-->
+                <!--v-model="dialysisPrescription.bloodlines"-->
+                <!--placeholder="请选择"-->
+              <!--&gt;-->
+                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
 
-          <el-col
-            :span="8"
-            v-if="isShows('血液净化补液管路(置换管)') && config.is_open == 1"
-          >
-            <el-form-item label="血液净化补液管路(置换管)：">
-              <el-select
-                v-model="dialysisPrescription.tubing_hemodialysis"
-                placeholder="请选择"
-              >
-                <el-option :key="0" label="请选择" :value="0"></el-option>
+                <!--<el-option-->
+                  <!--v-for="(option, index) in bloodlines_info"-->
+                  <!--:key="index + 'k'"-->
+                  <!--:label="option.GoodInfo.specification_name"-->
+                  <!--:value="option.GoodInfo.id"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
+
+          <!--<el-col-->
+            <!--:span="8"-->
+            <!--v-if="isShows('血液净化补液管路(置换管)') && config.is_open == 1"-->
+          <!--&gt;-->
+            <!--<el-form-item label="血液净化补液管路(置换管)：">-->
+              <!--<el-select-->
+                <!--v-model="dialysisPrescription.tubing_hemodialysis"-->
+                <!--placeholder="请选择"-->
+              <!--&gt;-->
+                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
 
-                <el-option
-                  v-for="(option, index) in tubingHemodialysis_info"
-                  :key="index + 'x'"
-                  :label="option.GoodInfo.specification_name"
-                  :value="option.GoodInfo.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+                <!--<el-option-->
+                  <!--v-for="(option, index) in tubingHemodialysis_info"-->
+                  <!--:key="index + 'x'"-->
+                  <!--:label="option.GoodInfo.specification_name"-->
+                  <!--:value="option.GoodInfo.id"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
 
-          <el-col :span="8" v-if="isShows('护理包') && config.is_open == 1">
-            <el-form-item label="护理包：">
-              <el-select
-                v-model="dialysisPrescription.package"
-                placeholder="请选择"
-              >
-                <el-option :key="0" label="请选择" :value="0"></el-option>
+          <!--<el-col :span="8" v-if="isShows('护理包') && config.is_open == 1">-->
+            <!--<el-form-item label="护理包：">-->
+              <!--<el-select-->
+                <!--v-model="dialysisPrescription.package"-->
+                <!--placeholder="请选择"-->
+              <!--&gt;-->
+                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
 
-                <el-option
-                  v-for="(option, index) in safe_package_info"
-                  :key="index + 'z'"
-                  :label="option.GoodInfo.specification_name"
-                  :value="option.GoodInfo.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+                <!--<el-option-->
+                  <!--v-for="(option, index) in safe_package_info"-->
+                  <!--:key="index + 'z'"-->
+                  <!--:label="option.GoodInfo.specification_name"-->
+                  <!--:value="option.GoodInfo.id"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
 
-          <el-col :span="8" v-if="isShows('A液') && config.is_open == 1">
-            <el-form-item label="A液：">
-              <el-select
-                v-model="dialysisPrescription.a_liquid"
-                placeholder="请选择"
-              >
-                <el-option :key="0" label="请选择" :value="0"></el-option>
+          <!--<el-col :span="8" v-if="isShows('A液') && config.is_open == 1">-->
+            <!--<el-form-item label="A液：">-->
+              <!--<el-select-->
+                <!--v-model="dialysisPrescription.a_liquid"-->
+                <!--placeholder="请选择"-->
+              <!--&gt;-->
+                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
 
-                <el-option
-                  v-for="(option, index) in aliquid_info"
-                  :key="index + 'c'"
-                  :label="option.GoodInfo.specification_name"
-                  :value="option.GoodInfo.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+                <!--<el-option-->
+                  <!--v-for="(option, index) in aliquid_info"-->
+                  <!--:key="index + 'c'"-->
+                  <!--:label="option.GoodInfo.specification_name"-->
+                  <!--:value="option.GoodInfo.id"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
 
 
 
@@ -1369,8 +1369,8 @@
         }
       },
       setLastRecord: function(schedual,lastAssessmentAfterDislysis,lastPredialysisEvaluation,lastDialysisPrescribe,lastDryWeightDislysis,system_prescribe) {
-        
-       
+
+
         this.treatment_mode = this.$store.getters.treatment_mode
         console.log("99999",this.treatment_mode)
         this.perfusion_apparatus = getDataConfig(
@@ -1462,7 +1462,7 @@
             }
           }
         } else {
-           
+
           if (schedual.mode_id == 2 ||schedual.mode_id == 5 ||schedual.mode_id == 12) {
             this.zhiShow = true
             this.huShow = true
@@ -3025,7 +3025,7 @@
                       response.data.data.system_prescription[key]
                   }
                 }
-                
+
               } else {
                 for (const key in this.dialysisPrescription) {
                   // 临时处方为空
@@ -3641,7 +3641,7 @@
           }
         }
       },
-    
+
     }
   }
 </script>

src/xt_pages/index/verify_token.vue

@@ -14,8 +14,15 @@ export default {
           // alert('token 验证成功')
           // console.log(this.$store.getters.xt_permission.addRouters)
           this.$router.addRoutes(this.$store.getters.xt_permission.addRouters) // 动态添加可访问路由表
-  //        next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
-          this.$router.replace({ path: '/dialysis/dialysisrecord' })
+  //          next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+          if(this.$store.getters.current_role_urls.includes('/dialysis/dialysisrecord')){
+            this.$router.replace({ path: '/dialysis/dialysisrecord' })
+
+          }else{
+            this.$router.replace({ path: '/home' })
+
+
+          }
 
         })
       })

src/xt_pages/role/components/AdminRoleInfoForm.vue

@@ -10,19 +10,16 @@
         <el-input v-model="form.name" placeholder="用户姓名"></el-input>
       </el-form-item>
 
-      <el-form-item label="角色 : " prop="role" label-width="60px">
+      <!--<el-form-item label="角色 : " prop="role_ids" label-width="60px">-->
 
-           <el-checkbox-group v-model="form.role">
-            <el-checkbox label="子管理员" name="type"></el-checkbox>
-            <el-checkbox label="医生" name="type"></el-checkbox>
-            <el-checkbox label="护士" name="type"></el-checkbox>
-            <el-checkbox label="技师" name="type"></el-checkbox>
-            <el-checkbox label="运营" name="type"></el-checkbox>
-            <el-checkbox label="库存" name="type"></el-checkbox>
-            <el-checkbox label="院长" name="type"></el-checkbox>
+        <el-form-item label="角色 : " prop="role_ids">
+          <el-checkbox-group v-model="form.role_ids">
+            <el-checkbox v-for="( item,index) in roles" :key="index" :label="item.id" :value="item.id">{{item.name}}
+            </el-checkbox>
           </el-checkbox-group>
         </el-form-item>
 
+
       <el-form-item label="职称 : ">
         <el-select v-model="form.user_type" placeholder="用户类型">
           <el-option

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -369,6 +369,8 @@ export default {
         manufacturer_id: this.form.manufacturer,
         dealer_id: this.form.dealer
       }
+      this.propForm.goods = []
+
       GetAllGoodInfoByID(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
@@ -384,7 +386,7 @@ export default {
             }
             this.$refs.dialog.show()
             for (let i = 0; i < response.data.data.goodInfo.length; i++) {
-              this.propForm.goodType.push(response.data.data.goodInfo[i].GoodsType)
+              this.propForm.goodType.push(response.data.data.goodInfo[i].type)
             }
             const obj = {}
             this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
@@ -400,7 +402,7 @@ export default {
             for (let a = 0; a < response.data.data.goodInfo.length; a++) {
               var respObj = response.data.data.goodInfo[a]
               respObj['isSelected'] = false
-              if (respObj.GoodsType.id == this.propForm.goodType[i].id) {
+              if (respObj.type.id == this.propForm.goodType[i].id) {
                 goodInfo.push(respObj)
               }
             }

src/xt_pages/stock/cancelStockOrderEdit.vue

@@ -326,6 +326,8 @@
           manufacturer_id: this.form.manufacturer,
           dealer_id: this.form.dealer
         }
+        this.propForm.goods = []
+
         GetAllGoodInfoByID(params).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
@@ -341,7 +343,7 @@
               }
               this.$refs.dialog.show()
               for (let i = 0; i < response.data.data.goodInfo.length; i++) {
-                this.propForm.goodType.push(response.data.data.goodInfo[i].GoodsType)
+                this.propForm.goodType.push(response.data.data.goodInfo[i].type)
               }
               const obj = {}
               this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
@@ -357,7 +359,7 @@
               for (let a = 0; a < response.data.data.goodInfo.length; a++) {
                 var respObj = response.data.data.goodInfo[a]
                 respObj['isSelected'] = false
-                if (respObj.GoodsType.id == this.propForm.goodType[i].id) {
+                if (respObj.type.id == this.propForm.goodType[i].id) {
                   goodInfo.push(respObj)
                 }
               }

src/xt_pages/stock/salesReturnEdit.vue

@@ -324,6 +324,8 @@
           manufacturer_id: this.form.manufacturer,
           dealer_id: this.form.dealer
         };
+        this.propForm.goods = []
+
         GetAllGoodInfoByID(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg);
@@ -336,7 +338,7 @@
             this.$refs.dialog.show();
             for (let i = 0; i < response.data.data.goodInfo.length; i++) {
               this.propForm.goodType.push(
-                response.data.data.goodInfo[i].GoodsType
+                response.data.data.goodInfo[i].type
               );
             }
             const obj = {};
@@ -356,7 +358,7 @@
             for (let a = 0; a < response.data.data.goodInfo.length; a++) {
               var respObj = response.data.data.goodInfo[a];
               respObj["isSelected"] = false;
-              if (respObj.GoodsType.id == this.propForm.goodType[i].id) {
+              if (respObj.type.id == this.propForm.goodType[i].id) {
                 goodInfo.push(respObj);
               }
             }

src/xt_pages/stock/salesReturnOrderAdd.vue

@@ -306,6 +306,8 @@
           manufacturer_id: this.form.manufacturer,
           dealer_id: this.form.dealer
         }
+        this.propForm.goods = []
+
         GetAllGoodInfoByID(params).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
@@ -321,7 +323,7 @@
               }
               this.$refs.dialog.show()
               for (let i = 0; i < response.data.data.goodInfo.length; i++) {
-                this.propForm.goodType.push(response.data.data.goodInfo[i].GoodsType)
+                this.propForm.goodType.push(response.data.data.goodInfo[i].type)
               }
               const obj = {}
               this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
@@ -337,7 +339,7 @@
               for (let a = 0; a < response.data.data.goodInfo.length; a++) {
                 var respObj = response.data.data.goodInfo[a]
                 respObj['isSelected'] = false
-                if (respObj.GoodsType.id == this.propForm.goodType[i].id) {
+                if (respObj.type.id == this.propForm.goodType[i].id) {
                   goodInfo.push(respObj)
                 }
               }

src/xt_pages/stock/stockInOrderAdd.vue

@@ -496,6 +496,8 @@
           manufacturer_id: this.form.manufacturer,
           dealer_id: this.form.dealer
         }
+        this.propForm.goods = []
+
         GetAllGoodInfoByID(params).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
@@ -511,7 +513,7 @@
               }
               this.$refs.dialog.show()
               for (let i = 0; i < response.data.data.goodInfo.length; i++) {
-                this.propForm.goodType.push(response.data.data.goodInfo[i].GoodsType)
+                this.propForm.goodType.push(response.data.data.goodInfo[i].type)
               }
               const obj = {}
               this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
@@ -527,7 +529,7 @@
               for (let a = 0; a < response.data.data.goodInfo.length; a++) {
                 var respObj = response.data.data.goodInfo[a]
                 respObj['isSelected'] = false
-                if (respObj.GoodsType.id == this.propForm.goodType[i].id) {
+                if (respObj.type.id == this.propForm.goodType[i].id) {
                   goodInfo.push(respObj)
                 }
               }

src/xt_pages/stock/stockInOrderEdit.vue

@@ -505,6 +505,8 @@ export default {
         manufacturer_id: this.form.manufacturer,
         dealer_id: this.form.dealer
       };
+      this.propForm.goods = []
+
       GetAllGoodInfoByID(params).then(response => {
         if (response.data.state == 0) {
           this.$message.error(response.data.msg);
@@ -517,7 +519,7 @@ export default {
           this.$refs.dialog.show();
           for (let i = 0; i < response.data.data.goodInfo.length; i++) {
             this.propForm.goodType.push(
-              response.data.data.goodInfo[i].GoodsType
+              response.data.data.goodInfo[i].type
             );
           }
           const obj = {};
@@ -537,7 +539,7 @@ export default {
           for (let a = 0; a < response.data.data.goodInfo.length; a++) {
             var respObj = response.data.data.goodInfo[a];
             respObj["isSelected"] = false;
-            if (respObj.GoodsType.id == this.propForm.goodType[i].id) {
+            if (respObj.type.id == this.propForm.goodType[i].id) {
               goodInfo.push(respObj);
             }
           }

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -485,6 +485,7 @@ export default {
         manufacturer_id: this.form.manufacturer,
         dealer_id: this.form.dealer
       }
+      this.propForm.goods = []
       GetAllGoodInfoByID(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
@@ -500,7 +501,7 @@ export default {
             }
             this.$refs.dialog.show()
             for (let i = 0; i < response.data.data.goodInfo.length; i++) {
-              this.propForm.goodType.push(response.data.data.goodInfo[i].GoodsType)
+              this.propForm.goodType.push(response.data.data.goodInfo[i].type)
             }
             const obj = {}
             this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
@@ -516,7 +517,7 @@ export default {
             for (let a = 0; a < response.data.data.goodInfo.length; a++) {
               var respObj = response.data.data.goodInfo[a]
               respObj['isSelected'] = false
-              if (respObj.GoodsType.id == this.propForm.goodType[i].id) {
+              if (respObj.type.id == this.propForm.goodType[i].id) {
                 goodInfo.push(respObj)
               }
             }

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -369,6 +369,8 @@
           manufacturer_id: this.form.manufacturer,
           dealer_id: this.form.dealer
         };
+        this.propForm.goods = []
+
         GetAllGoodInfoByID(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg);
@@ -381,7 +383,7 @@
             this.$refs.dialog.show();
             for (let i = 0; i < response.data.data.goodInfo.length; i++) {
               this.propForm.goodType.push(
-                response.data.data.goodInfo[i].GoodsType
+                response.data.data.goodInfo[i].type
               );
             }
             const obj = {};
@@ -401,7 +403,7 @@
             for (let a = 0; a < response.data.data.goodInfo.length; a++) {
               var respObj = response.data.data.goodInfo[a];
               respObj["isSelected"] = false;
-              if (respObj.GoodsType.id == this.propForm.goodType[i].id) {
+              if (respObj.type.id == this.propForm.goodType[i].id) {
                 goodInfo.push(respObj);
               }
             }

src/xt_pages/user/components/EditGroupAdvice.vue

@@ -399,7 +399,7 @@
                   :value="item.drug_name"
                 ></el-option>
               </el-select>
-              
+
             </el-form-item>
           </el-col>
           <el-col :span="14">
@@ -647,8 +647,6 @@ export default {
       },
 
       drugOptions: [],
-      deliveryWayOptions: [],
-      executionFrequencyOptions: [],
       adviceTemplates: [],
       submitGroupForm: {
         advice_type: "",
@@ -708,8 +706,17 @@ export default {
         return [];
       }
     },
-
-    unitsOption: {
+    executionFrequencyOptions: {
+      type: Array,
+      default: function() {
+        return [];
+      }
+    }, deliveryWayOptions: {
+      type: Array,
+      default: function() {
+        return [];
+      }
+    }, unitsOption: {
       type: Array,
       default: function() {
         return [];
@@ -856,7 +863,7 @@ export default {
         .catch(() => {});
     },
     submitNameForm(formName) {
-     
+
       if(this.src_type == ""){
           this.nameForm.way = 0
           this.nameForm.drug_id = 0
@@ -868,7 +875,7 @@ export default {
        }
 
       //  if(typeof(this.nameForm.advice_name) == "string"){
-         
+
       //     this.nameForm.advice_name == this.nameForm.advice_name
       // }
 
@@ -890,7 +897,7 @@ export default {
       //       var arr = name.split("(自备药)")
       //       drug_name = arr[0]
       //     }
-          
+
       //     this.nameForm.advice_name = drug_name
       //     this.nameForm.way = way
       // }
@@ -2491,9 +2498,9 @@ export default {
                 this.all_drug.push(obj)
                 console.log("中2222222222222222222",this.all_drug)
               }
-            }   
+            }
         })
-       
+
     },
     changeDrugName(name){
        this.current_drug_name = name

src/xt_pages/user/doctorAdvice.vue

@@ -1062,7 +1062,7 @@
                     >
                     </el-option>
                   </el-select>
-                
+
                 </el-col>
               </el-form-item>
             </el-col>
@@ -2288,7 +2288,7 @@ export default {
       });
     },
     submitgroupAdvice(formName) {
-     
+
       this.addLoading = true;
       this.$refs[formName].validate(valid => {
         if (valid) {
@@ -2304,7 +2304,7 @@ export default {
           console.log("22222",submitForm)
           console.log("33333",this.private_drug_config.drug_start)
           console.log("44444",this.medicals)
-         
+
           var adviceNames = [];
           for (const index in this.groupForm.adviceNames) {
             this.groupForm.adviceNames[
@@ -2317,7 +2317,7 @@ export default {
           submitForm.adviceNames = adviceNames;
 
 
-         
+
 
           let mode = "";
           if (this.groupForm.advice_type == 1) {
@@ -2327,7 +2327,7 @@ export default {
           }
         console.log("22222222",this.medicals)
         console.log("3333333",submitForm)
-      
+
         if(this.private_drug_config.drug_start == 1){
               for(let index=0;index<submitForm.adviceNames.length;index++){
                   for(let i=0;i<this.medicals.length;i++){
@@ -2339,7 +2339,7 @@ export default {
               }
           }
           console.log("模板数据",submitForm)
-        
+
           CreateNewGroupAdvice(this.patientID, 0, submitForm, mode).then(
             response => {
               if (response.data.state == 0) {
@@ -4030,7 +4030,7 @@ export default {
       });
     },
     submitNameForm(formName) {
-       
+
        if(this.src_type == ""){
           this.nameForm.way = 0
           this.nameForm.drug_id = 0
@@ -4040,7 +4040,7 @@ export default {
           var arr = this.nameForm.advice_name.split("(自备药)")
           this.nameForm.advice_name = arr[0]
        }
-      
+
       var _this = this;
       this.$refs[formName].validate(valid => {
         if (valid) {
@@ -4343,6 +4343,9 @@ export default {
               : response.data.data.drugways;
           this.executionFrequencyOptions =
             response.data.data.efs === null ? [] : response.data.data.efs;
+          console.log(this.deliveryWayOptions)
+          console.log(this.executionFrequencyOptions)
+
         }
       });
     },
@@ -4489,7 +4492,7 @@ export default {
             this.private_drug_config = response.data.data.private_drug_config
             console.log("medicals",medicalList)
             this.medicals = medicalList
-          
+
       })
     },
    changeDrugName(name){