Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/batch_print/batch_print_order_thirtyTwo.vue

@@ -687,11 +687,11 @@
                          {{ monitor.symptom }}  {{ monitor.dispose }}  {{ monitor.result }}
                     </td>
                     <td>
-                        <span v-if="setAdminUserES(monitor.monitoring_nurse) == ''">
-                        {{ getAdminUser(monitor.monitoring_nurse) }}
+                        <span v-if="setAdminUserES(monitor,'monitoring_nurse') == ''">
+                        {{ getAdminUser(monitor,'monitoring_nurse') }}
                         </span>
                         <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
-                        <img style="height:30px;" :src="setAdminUserES(monitor.monitoring_nurse)" alt srcset />
+                        <img style="height:30px;" :src="setAdminUserES(monitor,'monitoring_nurse')" alt srcset />
                         </span>
                     </td>
                     </tr>

src/xt_pages/hospitalStation/components/prescriptionTable.vue

@@ -551,9 +551,9 @@
           { name: '透析1h一次', count: 1 },
           { name: '透析2h一次', count: 1 },
           { name: '透析3h一次', count: 1 },
-          { name: '每日一次', count: 1 },
-          { name: '每日两次', count: 2 },
-          { name: '每日三次', count: 3 },
+          { name: '每日一次', count: 12 },
+          { name: '每日两次', count: 6 },
+          { name: '每日三次', count: 4 },
           { name: '每晚一次', count: 1 },
           { name: '每晚', count: 1 },
           { name: '上机前', count: 1 },

src/xt_pages/management/components/EditMachineForm.vue

@@ -212,7 +212,9 @@ export default {
         { id: 6, name: "0.2%过氧化乙酸" },
         { id: 7, name: "10%冰醋酸" },
         { id: 8, name: "50%冰醋酸" },
-        { id: 9, name: "5%次氯酸钠" }
+        { id: 9, name: "5%次氯酸钠" },
+        { id: 10,name:"25%的柠檬酸+5%次氯酸钠"},
+        { id: 11, name: "20%柠檬酸 + 5%次氯酸钠"},
       ]
     };
   },

src/xt_pages/management/components/PlanForm.vue

@@ -244,6 +244,7 @@ export default {
         { id: 8, name: "50%冰醋酸" },
         { id: 9, name: "5%次氯酸钠" },
         { id: 10,name:"25%的柠檬酸+5%次氯酸钠"},
+        { id: 11, name: "20%柠檬酸 + 5%次氯酸钠" },
       ],
       // 床单位更换
        bedType: [

src/xt_pages/management/home.vue

@@ -3025,6 +3025,7 @@ export default {
           { id: 8, name: '50%冰醋酸' },
           { id: 9, name: '5%次氯酸钠' },
           { id: 10,name:"25%的柠檬酸+5%次氯酸钠"},
+          { id: 11, name: "20%柠檬酸 + 5%次氯酸钠"},
         ],
 
         userform: {

src/xt_pages/outpatientDoctorStation/components/prescriptionTemplateTable.vue

@@ -664,9 +664,9 @@
           { name: '透析1h一次', count: 1 },
           { name: '透析2h一次', count: 1 },
           { name: '透析3h一次', count: 1 },
-          { name: '每日一次', count: 1 },
-          { name: '每日两次', count: 2 },
-          { name: '每日三次', count: 3 },
+          { name: '每日一次', count: 12 },
+          { name: '每日两次', count: 6 },
+          { name: '每日三次', count: 4 },
           { name: '每晚一次', count: 1 },
           { name: '每晚', count: 1 },
           { name: '上机前', count: 1 },

src/xt_pages/stock/drugs/drugDamaged.vue

@@ -53,11 +53,7 @@
     </div>
     <el-table :data="tableList" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }" >
         <!-- <el-table-column type="selection" width="55" align="center"> </el-table-column> -->
-        <el-table-column  prop="date" label="报损日期" align="center">
-            <template slot-scope="scope">
-              {{getTime(scope.row.start_time)}}
-            </template>
-        </el-table-column>
+      
         <el-table-column prop="name" label="药品名称" align="center">
             <template slot-scope="scope">
               {{scope.row.drug_name}}
@@ -151,6 +147,11 @@
                   {{scope.row.warehousing_order}}
                 </template>
               </el-table-column>
+              <el-table-column  prop="date" label="报损日期" align="center">
+                <template slot-scope="scope">
+                  {{getTime(scope.row.start_time)}}
+                </template>
+              </el-table-column>
               <el-table-column prop="address" label="损耗数量" align="center">
                 <template slot-scope="scope">
                   <span v-if="scope.row.count>0">{{scope.row.count}}{{scope.row.min_unit}}</span>

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -268,24 +268,15 @@ export default {
                list[i].stockIn = list[i].GoodStartFlowInfo.over_count
                list[i].stock_in_price = "/"
                list[i].stockMoney = "/"
-              // list[i].stockIn = this.getWarehouseInfoStart(list[i].StartFlowInfo,list[i].StartOutFlowInfo,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].StartCancelFlowInfo) //期初结余
-              // list[i].stock_in_price = this.getWarehouseInfoStartPrice(list[i].StartFlowInfo,list[i].StartOutFlowInfo,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].StartCancelFlowInfo)
-              // list[i].stockMoney = this.getWarehouseInfoStartMoney(list[i].StartFlowInfo,list[i].StartOutFlowInfo,list[i].WareStartStockInventoryProfit,list[i].WareStartStockInventoryLosses,list[i].StartCancelFlowInfo)
+              
               
               list[i].stockAdd = this.getWarehouseInfoOne(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)//期间增加
-              // list[i].addStockMoney = this.getAddStockMony(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)
-              // list[i].saleStockMoney = this.getSaleStockMony(list[i].StartFlowWarehouseInfo,list[i].WareStartEndStockInventoryProfit)
               list[i].addStockMoney = "/"
               list[i].saleStockMoney = "/"
 
               list[i].outStock = this.getWarehosueOutInfo(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)//本期减少
-              // list[i].stockOutprice = this.stockOutprice(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)
-              // list[i].saleOutMoney = this.getSaleStockMony(list[i].WarehouseOutInfoStart,list[i].WareStartEndStockInventoryLosses,list[i].StartEndCancelFLowInfo)
               list[i].stockOutprice = "/"
               list[i].saleOutMoney = "/"
-              // list[i].overStock= this.getEndWarehouseInfo(list[i].EndFlowInfo,list[i].EndFlowOutInfo,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].EndCancelFLowInfo)
-              // list[i].overPrice= this.getEndOverPrice(list[i].EndFlowInfo,list[i].EndFlowOutInfo,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].EndCancelFLowInfo)
-              // list[i].overMoney = this.getEndSalePrice(list[i].EndFlowInfo,list[i].EndFlowOutInfo,list[i].WareEndStockInventoryProfit,list[i].WareEndStockInventoryLosses,list[i].EndCancelFLowInfo)
               if(this.org_id == 10265 || this.org_id == 0){
                 list[i].overStock = list[i].GoodEndFlowInfo.over_count
               }else{

src/xt_pages/stock/stockDamaged.vue

@@ -51,11 +51,11 @@
   
     <el-table :data="tableList" border :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)' }">
         <!-- <el-table-column type="selection" width="55" align="center"> </el-table-column> -->
-        <el-table-column  prop="date" label="报损日期" align="center">
+        <!-- <el-table-column  prop="date" label="报损日期" align="center">
             <template slot-scope="scope">
               {{getTime(scope.row.ctime)}}
             </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column prop="date" label="耗材名称"  align="center">
           <template  slot-scope="scope">
             {{scope.row.good_name}}
@@ -351,6 +351,11 @@
                    {{scope.row.warehousing_order}}
                 </template>
               </el-table-column>
+              <el-table-column  prop="date" label="报损日期" align="center">
+                <template slot-scope="scope">
+                  {{getTime(scope.row.ctime)}}
+                </template>
+              </el-table-column> 
               <el-table-column prop="address" label="损耗数量" align="center">
                 <template slot-scope="scope">
                   {{scope.row.count}}