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

src/api/drug/drug.js

@@ -775,11 +775,29 @@ export function getSelfDrugBatchNumber(params){
   })
 }
 
-export function postSelfDrugWarehouseOut(params, warehousing_time, dealer_id, manufacturer_id, type, storehouse_id, warehouse_out_id){
+export function postSelfDrugWarehouseOut(params, warehousing_time, dealer_id, manufacturer_id, type, patient_id, warehouse_out_id){
 
    return request({
-    url:"/api/drug/postsetfdrugwarehouseout?warehousing_out_time="+warehousing_time+ '&dealer_id=' + dealer_id + '&manufacturer_id=' + manufacturer_id + '&type=' + type + '&storehouse_id=' + storehouse_id + '&warehouse_out_id=' + warehouse_out_id,
+    url:"/api/drug/postsetfdrugwarehouseout?warehousing_out_time="+warehousing_time+ '&dealer_id=' + dealer_id + '&manufacturer_id=' + manufacturer_id + '&type=' + type + '&patient_id=' + patient_id + '&warehouse_out_id=' + warehouse_out_id,
     method:"post",
-    params:params,
+    data:params,
    })
+}
+
+export function getAllSelfDrugWarehouseOutList(params){
+ 
+  return request({
+    url:"/api/drug/getallselfdrugwarehouseoutlist",
+    method:"get",
+    params:params
+  })
+}
+
+export function deleteSelfWarehouseOut(id,params){
+
+  return request({
+    url:"/api/drug/deleteselfwarehouseout?id="+id,
+    method:"get",
+    params:params
+  })
 }

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1488,29 +1488,33 @@
                         </div>
                       </div>
 
-                      <div class="inline_block" style="margin-left: 20px">
+                    
+                      <div  class="row" style="padding: 2px 0; line-height: 23px; display: flex">
+                       <div class="inline_block">
                         上机时间：
                         <div
                           class="under_line"
                           style="width: 50px; text-align: center"
                         >
-                          {{
-                            record.dialysis_order &&
-                            record.dialysis_order.device_number &&
-                            record.dialysis_order.device_number.number.length >
-                              0
-                              ? record.dialysis_order.device_number.number
-                              : record.device_number.number
-                          }}
+                          {{getTime(record.dialysis_order.start_time, "{h}:{i}")}}
                         </div>
                       </div>
 
-                      <div  class="row" style="padding: 2px 0; line-height: 23px; display: flex" v-if="org_id == 0|| org_id ==10598">
+                      <div class="inline_block" v-if="org_id == 0|| org_id ==10598" style="margin-left: 20px">
                         在线Kt/V监测：
                         <div class="under_line" style="width: 30px; text-align: center">
                            <check-box :checked="true"></check-box>
                          </div>
                       </div>
+
+                     </div>
+
+                      <!-- <div  class="row" style="padding: 2px 0; line-height: 23px; display: flex" v-if="org_id == 0|| org_id ==10598">
+                        在线Kt/V监测：
+                        <div class="under_line" style="width: 30px; text-align: center">
+                           <check-box :checked="true"></check-box>
+                         </div>
+                      </div> -->
                       <div
                         class="row"
                         style="padding: 2px 0; line-height: 23px; display: flex"
@@ -3264,38 +3268,11 @@
                           }}
                         </div>
                       </div>
-
-
                     </div>
-                  <div
-                    class="row"
-                    style="padding: 2px 0; line-height: 23px; display: flex"
-                  >
-                    <div
-                      class="inline_block"
-                      style="flex: 1; display: inline-block"
-                    >
-                      备注：
-                      <div
-                        class="under_line"
-                        style="
-                          width: 860px;
-                          line-height: 25px;
-                          text-align: left;
-                          margin-left: 2px;
-                          display: inline-block;
-                          white-space: normal;
-                        "
-                      >
-                        {{ record.assessment_after_dislysis.remark ?record.assessment_after_dislysis.remark : "/" }}
-                      </div>
-                    </div>
-                  </div>
 
                     <div
                       class="row"
                       style="padding: 2px 0; line-height: 23px; display: flex"
-                      v-if="org_id == 0 || org_id ==10375"
                     >
                       <div
                         class="inline_block"
@@ -3323,6 +3300,33 @@
 
 
                     </div>
+                    
+                  <div
+                    class="row"
+                    style="padding: 2px 0; line-height: 23px; display: flex"
+                  >
+                    <div
+                      class="inline_block"
+                      style="flex: 1; display: inline-block"
+                    >
+                      备注：
+                      <div
+                        class="under_line"
+                        style="
+                          width: 860px;
+                          line-height: 25px;
+                          text-align: left;
+                          margin-left: 2px;
+                          display: inline-block;
+                          white-space: normal;
+                        "
+                      >
+                        {{ record.assessment_after_dislysis.remark ?record.assessment_after_dislysis.remark : "/" }}
+                      </div>
+                    </div>
+                  </div>
+
+                   
                   </td>
                 </tr>
                 <tr>

src/xt_pages/dialysis/template/DialysisPrintOrderseventyfive.vue

@@ -549,7 +549,7 @@
                 <td width="50">UFR<br/>ml/h</td>
                 <td width="50">UF<br/>ml</td>
                 <td width="65">剩余肝素<br/>ml</td>
-                <td width="65" v-if="prescription.mode == 'HDF'">置换液量<br/>L</td>
+                <td width="65" v-if="prescription.mode == 'HDF'">置换量<br/>L</td>
                 <td width="200">病情变化</td>
               </tr>
               <tr v-for="(monitor, monindex) in monitors" :key="monindex" style="padding: 5px 0;line-height: 35px;">

src/xt_pages/stock/selfPreparedMedicine/addWarehouseOut.vue

@@ -51,7 +51,7 @@
           <label class="title"><span class="name">出库</span> : </label>
           <el-date-picker
             size="small"
-            v-model="warehousing_time"
+            v-model="warehouse_out_time"
             prefix-icon="el-icon-date"
             :editable="false"
             style="width: 196px"
@@ -175,14 +175,14 @@
               <template slot-scope="scope">
                 <el-form-item
                   :prop="'recordData.' + scope.$index + '.warehousing_count'"
-                  :rules="tableRules.warehousing_count"
+                  :rules="tableRules.count"
                   style="padding-top: 10px"
                 >
                   <div style="display: flex">
                   
                     <el-input
                       placeholder="请输入入库数量"
-                      v-model="scope.row.warehousing_count"
+                      v-model="scope.row.count"
                       style="width: 120px"
                     ></el-input>
                   
@@ -377,7 +377,7 @@
           { path: false, name: "新增入库单" },
         ],
         signAndWeighBoxPatients: "sign-and-weigh-box-patients",
-        warehousing_time: "",
+        warehouse_out_time: "",
         adminUserOptions: null,
         currentIndex: 0,
         listLoading: false,
@@ -629,27 +629,33 @@
       handleEdit: function (index, row) {
         const tempObj = {};
         tempObj["id"] = 0;
-        tempObj["drug_name"] = "";
         tempObj["drug_id"] = 0;
-        tempObj["number"] = "";
-        tempObj["product_date"] = "";
-        tempObj["expiry_date"] = "";
-        tempObj["warehousing_count"] = "";
-        tempObj["retail_price"] = "";
+        tempObj["max_unit"] = "";
+        (tempObj["min_unit"] = ""), (tempObj["return_count"] = 0);
         tempObj["price"] = "";
         tempObj["remark"] = "";
-        tempObj["dealer"] = "";
         tempObj["manufacturer"] = "";
-        tempObj["min_unit"] = "";
-        tempObj["max_unit"] = "";
-        tempObj["drug_type"] = "";
         tempObj["batch_number"] = "";
+        tempObj["drug_type"] = "";
         tempObj["dose"] = "";
         tempObj["dose_unit"] = "";
+        tempObj["min_number"] = "";
         tempObj["dealer"] = "";
+        tempObj["number"] = "";
+        tempObj["warehouse_info_id"] = 0;
+        tempObj["count"] = "";
+        tempObj["admin_user_id"] = this.$store.getters.xt_user.user.user_name;
+        tempObj["retail_price"] = 0;
         tempObj["last_price"] = "";
-        tempObj["count_unit"] = "";
-        tempObj["min_number"] = "";
+        tempObj["stock_count"] = "";
+        tempObj["total_count"] = 0;
+        tempObj["max_unit_fisrt"] = 0;
+        tempObj["min_unit_fisrt"] = 0;
+        tempObj["total_price"] = 0;
+        tempObj["patient_id"] = 0
+        tempObj["product_date"] = ""
+        tempObj["expiry_date"]=""
+        tempObj["class_type"] = ""
         this.recordInfo.recordData.push(tempObj);
       },
       handleDelete: function (index, row) {
@@ -815,6 +821,7 @@
             stockOut: this.recordInfo.recordData,
           };
           console.log("param22222222",params)
+        
           const loading = this.$loading({
             lock: true,
             text: "Loading",
@@ -1173,7 +1180,7 @@
       var nowYear = nowDate.getFullYear();
       var nowMonth = nowDate.getMonth() + 1;
       var nowDay = nowDate.getDate();
-      this.warehousing_time =
+      this.warehouse_out_time =
         nowYear +
         "-" +
         (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
@@ -1207,6 +1214,7 @@
         tempObj["patient_id"] = 0
         tempObj["product_date"] = ""
         tempObj["expiry_date"]=""
+        tempObj["class_type"] = ""
         this.recordInfo.recordData.push(tempObj);
         this.propForm.goodUnit = this.$store.getters.good_unit;
   

src/xt_pages/stock/selfPreparedMedicine/warehouseInfo.vue

@@ -151,6 +151,12 @@
         <el-table-column align="center" type="selection" width="55">
         </el-table-column>
 
+        <el-table-column label="入库时间" align="center">
+          <template slot-scope="scope">
+             {{ getTime(scope.row.record_date)}}
+          </template>
+        </el-table-column>
+
         <el-table-column label="药品名称" align="center">
           <template slot-scope="scope">
              {{ scope.row.drug.drug_name }}