新分支

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

                               : "/"
                           }}
                         </div>
-                         <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id==10460 || org_id ==10624 || org_id ==10644">ml</span>
-                         <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469  && org_id!=10471 && org_id!=10460 && org_id!=10624  && org_id!=10644">L</span>
+                         <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469|| org_id==10460 || org_id ==10624 || org_id ==10644">ml</span>
+                         <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469  && org_id!=10460 && org_id!=10624  && org_id!=10644">L</span>
                       </div>
 
                       <div class="inline_block" style="flex: 1" v-if="org_id == 10469 || org_id ==10598">
                             执行人签名
                           </td>
                           <td style="font-size: 16px" width="10%">时间</td>
-                           <td style="font-size: 16px" width="10%" v-if="org_id == 10375 || org_id == 0 || org_id ==10206 || org_id == 10571 || org_id ==10600 || org_id == 10489">核对护士</td>
+                           <td style="font-size: 16px" width="10%" v-if="org_id == 10375 || org_id == 0 || org_id ==10206 || org_id == 10571 || org_id ==10600 || org_id == 10489 || org_id ==10402">核对护士</td>
                         </tr>
                         <!-- <template v-for="group in doctor_advices" > -->
 
                                 getTime(advice[0].execution_time, " {h}:{i}")
                               }}</span>
                             </td>
-                            <td height="35px" v-if="org_id == 10375 || org_id ==0||org_id ==10206|| org_id == 10571 || org_id ==10600 || org_id ==10489">
+                            <td height="35px" v-if="org_id == 10375 || org_id ==0||org_id ==10206|| org_id == 10571 || org_id ==10600 || org_id ==10489 || org_id == 10402">
                               <span
                                 v-if="
                                   setAdminUserES(

src/xt_pages/dialysis/newDoctorAdvice.vue

           total+=parseInt(val[i].prescribing_number)
         }
         if (total < min_number) {
-        min_str = total + min_unit;
-      }
+          min_str = total + min_unit;
+        }
       if (total == 0) {
         min_str = "";
         max_str = "";

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

                             : "/"
                         }}
                       </div>
-                      <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10471 || org_id == 10460 || org_id==10644">ml</span>
-                      <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469 && org_id!=10471 && org_id!=10460 && org_id!=10644">L</span>
+                      <span v-if="org_id == 10395 || org_id == 9829 || org_id == 10440 || org_id == 10469 || org_id == 10460 || org_id==10644">ml</span>
+                      <span v-if="org_id!=10395&&org_id!=9829 && org_id!=10440 && org_id!=10469  && org_id!=10460 && org_id!=10644">L</span>
                     </div>
 
 
                         <td style="font-size: 16px" width="10%">医生签名</td>
                         <!-- <td style="font-size: 16px" width="10%">核对人签名</td> -->
                         <td style="font-size: 16px" width="10%">执行人签名</td>
-                        <td style="font-size: 16px" width="10%" v-if="org_id == 10598 || org_id == 10489 ">核对护士</td>
+                        <td style="font-size: 16px" width="10%" v-if="org_id == 10598 || org_id == 10489 || org_id == 0 || org_id == 10402">核对护士</td>
                         <td style="font-size: 16px" width="10%">时间</td>
                         <td
                           style="font-size: 16px"
                           width="10%"
                           v-if="org_id == 10223 || org_id == 9538  ||
-                                org_id ==10375 || org_id ==10571 || org_id ==10600 "
+                                org_id ==10375 || org_id ==10571 || org_id ==10600"
                         >
                           核对护士
                         </td>
                             />
                         </span>
                         </td>
-                        <td v-if="org_id == 10598 || org_id==10489 ">
+                        <td v-if="org_id == 10598 || org_id==10489 || org_id == 0 || org_id == 10402 ">
                           <span v-if="org_id!=10489">
                             <span v-if="advice!=null && advice.checker>0">
                               <span v-if="setAdminUserES(advice.checker) == ''">{{ getAdminUser(advice.checker)}}</span>

src/xt_pages/stock/drugs/components/drugQuery.vue

                   {{scope.row.dose}}{{scope.row.dose_unit}}*{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}
                 </template>
             </el-table-column>
+            <el-table-column label="零售价" align="center" v-if="org_id ==10697 || org_id == 0">
+              <template slot-scope="scope">
+                 {{scope.row.retail_price}}
+              </template>
+            </el-table-column>
             <el-table-column label="生产厂商" align="center">
               <template slot-scope="scope">
                 {{getManufacturName(scope.row.manufacturer)}}

src/xt_pages/stock/drugs/components/expiryDateDrugQuery.vue

                    {{scope.row.XtBaseDrug.dose}}{{scope.row.XtBaseDrug.dose_unit}}*{{scope.row.XtBaseDrug.min_number}}{{scope.row.XtBaseDrug.min_unit}}/{{scope.row.XtBaseDrug.max_unit}}
                 </template>
             </el-table-column>
+            <el-table-column label="国家编码" align="center">
+              <template slot-scope="scope">
+                 {{scope.row.XtBaseDrug.medical_insurance_number}}
+              </template>
+            </el-table-column>
             <el-table-column label="生产厂商" align="center">
               <template slot-scope="scope">
                  {{getManufacturName(scope.row.manufacturer)}}

src/xt_pages/stock/query/expiryDateQuery.vue

                  {{scope.row.GoodInfo.good_name}}
               </template>
             </el-table-column>
+            <el-table-column label="国家编码" align="center">
+              <template slot-scope="scope">
+                 {{scope.row.GoodInfo.social_security_directory_code}}
+              </template>
+            </el-table-column>
             <el-table-column label="规格&单位" align="center">
                 <template slot-scope="scope">
                    {{scope.row.GoodInfo.specification_name}}/{{scope.row.GoodInfo.packing_unit}}

src/xt_pages/stock/query/goodNewQuery.vue

                   {{scope.row.specification_name}}/{{scope.row.packing_unit}}
                 </template>
             </el-table-column>
+           
+            <el-table-column label="零售价" align="center" v-if="org_id == 0 || org_id ==10697">
+              <template slot-scope="scope">
+                 {{scope.row.packing_price}}
+              </template>
+            </el-table-column>
             <el-table-column label="生产厂商" align="center" v-if="org_id!=10679">
               <template slot-scope="scope">
                   {{getManufacturName(scope.row.manufacturer)}}