新分支

src/xt_pages/data/components/addDrugs.vue

@@ -408,6 +408,17 @@
                             <el-input type="form.restrictions" :rows="2" placeholder="请输入内容"
                                       v-model="form.limit_remark"></el-input>
                         </el-form-item>
+
+                        <el-form-item label="是否显示: " prop="limit_remark" style="width:100%;">
+                          <el-select v-model="form.is_show" style="width:160px;" filterable placeholder="请选择">
+                                <el-option
+                                        v-for="(item,index) in showList"
+                                        :key="index"
+                                        :label="item.name"
+                                        :value="item.id">
+                                </el-option>
+                          </el-select>
+                        </el-form-item>
                     </el-form>
                 </div>
             </el-tab-pane>
@@ -643,6 +654,7 @@
           bbx01:"",
           bby01:"",
           is_project:"",
+          is_show:"",
         },
 
         rules: {
@@ -701,7 +713,8 @@
           id: "2",
           name: "否"
         }],
-        projectList:[{id:"1",name:"是"},{id:"2",name:"否"}]
+        projectList:[{id:"1",name:"是"},{id:"2",name:"否"}],
+        showList:[{id:"1",name:"是"},{id:"2",name:"否"}]
       }
     },
     props: {
@@ -974,7 +987,7 @@
         form['bbx01'] = this.form.bbx01
         form['bby01'] = this.form.bby01
         form['is_project'] = this.form.is_project
-
+        form['is_show'] = this.form.is_show
         return form
       },
       getlist() {

src/xt_pages/data/components/addProject.vue

@@ -249,6 +249,17 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
+
+                    <el-form-item label="是否显示:" prop="is_advice">
+                        <el-select v-model="form.is_show" style="width:160px;" placeholder="请选择">
+                            <el-option
+                            v-for="item in showList"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
                 </el-form>
             </el-tab-pane>
         </el-tabs>
@@ -314,6 +325,7 @@ export default {
               is_print:"",
               bbx01:"",
               bby01:"",
+              is_show:"",
             },
             rules: {
                 project_name: [{ required: true, message: '请填写项目名称', trigger: 'blur'  }],
@@ -334,7 +346,8 @@ export default {
            ],
            limit:100,
            page:1,
-           departMentList:[]
+           departMentList:[],
+           showList:[{id:"1",name:"是"},{id:"2",name:"否"}]
         }
     },
     methods:{
@@ -410,8 +423,9 @@ export default {
                     social_security_directory_code:this.form.social_security_directory_code,
                     record_date:this.form.record_date,
                     is_print:parseInt(this.form.is_print),
-                   bbx01:this.form.bbx01,
-                   bby01:this.form.bby01,
+                    bbx01:this.form.bbx01,
+                    bby01:this.form.bby01,
+                    is_show:parseInt(this.form.is_show)
                }
              console.log("params222222",params)
               saveProject(params).then(response=>{

src/xt_pages/data/components/consumables.vue

@@ -352,7 +352,8 @@
               number:"",
               is_warehouse:"1",
               bbx01:"",
-              bby01:""
+              bby01:"",
+              is_show:"",
             },
             isVisibility: false,
           }
@@ -772,6 +773,12 @@
 
             this.goodInfo.goodInfoDialog.formValue.is_warehouse = response.data.data.goodInfo.is_warehouse.toString()
 
+            //  if(response.data.data.goodInfo.is_show<=0){
+            //    this.goodInfo.goodInfoDialog.formValue.is_show = ''
+            //   }else{
+            //     this.goodInfo.goodInfoDialog.formValue.is_show =  response.data.data.goodInfo.is_show.toString()
+            //   }
+
             this.$refs.addConsumable.show(row.id, this.goodInfo.goodInfoDialog.formValue)
 
           }

src/xt_pages/data/components/drugs.vue

@@ -341,6 +341,7 @@
           is_user:"",
           bbx01:"",
           bby01:"",
+          is_show:"",
         },
         tempFormValue: {
           drug_name: '',//药品名称
@@ -741,6 +742,12 @@
                 this.formValue.is_project = this.formValue.is_project.toString()
               }
 
+              // if(this.formValue.is_show<=0){
+              //     this.formValue.is_show = ''
+              // }else{
+              //   this.formValue.is_show = this.formValue.is_show.toString()
+              // }
+
 
               this.$refs.addDrugs.show(id, this.formValue)
 

src/xt_pages/data/components/editProject.vue

@@ -251,6 +251,16 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
+                    <el-form-item label="是否显示:" prop="is_advice">
+                        <el-select v-model="form.is_show" style="width:160px;" placeholder="请选择">
+                            <el-option
+                            v-for="item in showList"
+                            :key="item.id"
+                            :label="item.name"
+                            :value="item.id">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
                 </el-form>
             </el-tab-pane>
         </el-tabs>
@@ -320,6 +330,7 @@ export default {
               is_print:"",
               bbx01:"",
               bby01:"",
+              is_show:"",
             },
             rules: {
                 project_name: [{ required: true, message: '请填写项目名称', trigger: 'blur'  }],
@@ -345,7 +356,8 @@ export default {
            departMentList:[],
            statisticsCategoryList:[],
            tubeColorList:[],
-           costClassifyList:[]
+           costClassifyList:[],
+           showList:[{id:"1",name:"是"},{id:"2",name:"否"}]
         }
     },
     methods:{
@@ -456,6 +468,12 @@ export default {
                 this.form.is_print = projecDetail.is_print
               }
 
+              // if(projecDetail.is_show == 0){
+              //   this.form.is_show = ""
+              // }else{
+              //   this.form.is_show = projecDetail.is_show.toString()
+              // }
+
             }
          })
        },
@@ -500,7 +518,8 @@ export default {
                     record_date:this.form.record_date,
                     bbx01:this.form.bbx01,
                     bby01: this.form.bby01,
-                    is_print:parseInt(this.form.is_print)
+                    is_print:parseInt(this.form.is_print),
+                    is_show:parseInt(this.form.is_show)
                }
 
               updatedProject(params).then(response=>{

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -87,7 +87,7 @@
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 4">{{ anticoagulant_zongliang != "0" ? "mg" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 5">{{ anticoagulant_zongliang != "0" ? "ml" : "" }}</span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 6">
-               <span v-if="this.$store.getters.xt_user.template_info.org_id == 9671 || this.$store.getters.xt_user.template_info.org_id == 9675">
+               <span v-if="this.$store.getters.xt_user.template_info.org_id == 9671 || this.$store.getters.xt_user.template_info.org_id == 9675  || this.$store.getters.xt_user.template_info.org_id == 10694">
                   {{ anticoagulant_zongliang != "0" ? "mg" : "" }}
               </span>
               <span v-else>
@@ -95,7 +95,7 @@
               </span>
             </span>
             <span class="unit" v-if="getValueStr('anticoagulant', 'anticoagulant') == 7">
-              <span v-if="this.$store.getters.xt_user.template_info.org_id == 9671 || this.$store.getters.xt_user.template_info.org_id == 9675">
+              <span v-if="this.$store.getters.xt_user.template_info.org_id == 9671 || this.$store.getters.xt_user.template_info.org_id == 9675 || this.$store.getters.xt_user.template_info.org_id == 10694">
                   {{ anticoagulant_zongliang != "0" ? "mg" : "" }}
               </span>
               <span v-else>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -4783,9 +4783,10 @@ export default {
           this.doctor_advices[index]["isShow"] = 2;
         }
 
+          
+        console.log("haaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",this.doctor_advices)
 
-
-        if(this.org_id ==10206 || this.org_id ==10489 || this.org_id ==10644 || this.org_id ==10633 || this.org_id == 0 || this.org_id ==10478){
+        if(this.org_id ==10206 || this.org_id ==10489 || this.org_id ==10644 || this.org_id ==10633 || this.org_id == 0 || this.org_id==10478){
           let projectsOne = [];
           response.data.data.projects.map((item) => {
               projectsOne.push(item);
@@ -4801,7 +4802,7 @@ export default {
         console.log("RESWOOWOWWOOW",response.data.data.doctorAdevieInfo)
 
         //华池
-        if(this.org_id == 0 || this.org_id == 10440){
+        if(this.org_id == 10440){
            var parint_id =0
            var newArr = []
            if(this.doctor_advices!=null&&this.doctor_advices.length>0){
@@ -4848,7 +4849,7 @@ export default {
 
 
 
-        if(this.org_id!=10510 && this.org_id!=0&&this.org_id!=10206 && this.org_id!=10478){
+        if(this.org_id!=10510 && this.org_id!=0&&this.org_id!=10206){
             if(this.projects!=null && this.projects.length >0){
              for(let i=0;i<this.projects.length;i++){
               if(this.projects[i].type== 2){

src/xt_pages/stock/Dialog/goodInfoDailog.vue

@@ -320,6 +320,17 @@
             <el-input v-model="form.good_number" style="width:160px;" placeholder="" maxlength="30"></el-input>
           </el-form-item>
 
+          <el-form-item label="是否显示: " prop="limit_remark" style="width:100%;">
+              <el-select v-model="form.is_show" style="width:160px;" filterable placeholder="请选择">
+                    <el-option
+                            v-for="(item,index) in showList"
+                            :key="index"
+                            :label="item.name"
+                            :value="item.id">
+                    </el-option>
+              </el-select>
+          </el-form-item>
+
         </el-form>
       </el-tab-pane>
     </el-tabs>
@@ -414,6 +425,7 @@
           is_warehouse:"1",
           bbx01:"",
           bby01:"",
+          is_show:"",
           
         },
 
@@ -458,7 +470,8 @@
          {id: "1",name: "是"},
          {id: "2",name: "否"}
         ],
-        org_id:0
+        org_id:0,
+        showList:[{id:"1",name:"是"},{id:"2",name:"否"}]
       }
     },
     props: {
@@ -649,6 +662,7 @@
         form["is_warehouse"] = this.form.is_warehouse
         form["bbx01"] = this.form.bbx01
         form["bby01"] = this.form.bby01
+        form["is_show"] = this.form.is_show
 
         return form
       }, changeSelected: function(val) {