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

src/xt_pages/stock/selfPreparedMedicine/warehouseInfo.vue

@@ -15,7 +15,7 @@
 
     <div class="app-container">
       <div class="cell clearfix">
-        <!-- <label class="title"><span class="name">患者</span> :</label>
+        <label class="title"><span class="name">患者名称</span> :</label>
         <el-select
           size="small"
           v-model="patient_id"
@@ -31,7 +31,7 @@
             :value="option.id"
           >
           </el-option>
-        </el-select> -->
+        </el-select>
         <el-input
           size="small"
           style="width: 200px"
@@ -77,23 +77,7 @@
             @change="endTimeChange"
           ></el-date-picker>
         </div>
-        <!-- <div style="margin-left: 10px">
-          <span>审核状态:</span>
-          <el-select
-            v-model="check_id"
-            style="width: 140px; margin-right: 10px"
-            placeholder="请选择"
-            @change="changeTypeName"
-          >
-            <el-option
-              v-for="item in checkList"
-              :key="item.id"
-              :label="item.name"
-              :value="item.id"
-            >
-            </el-option>
-          </el-select>
-        </div> -->
+      
       </div>
 
       <div class="cell clearfix">
@@ -151,6 +135,113 @@
         <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.warehousing_time)}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="单据编号" align="center">
+          <template slot-scope="scope">
+           {{scope.row.warehousing_order}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="患者名称" align="center">
+          <template slot-scope="scope">
+             {{scope.row.patient_id}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="制单人" align="center">
+          <template slot-scope="scope">
+            {{scope.row.creater}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="入库方式" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.is_sys ==1">处方入库</span>
+            <span v-if="scope.row.is_sys ==0">手动入库</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="审核状态" align="center">
+          <template slot-scope="scope">
+             <span v-if="scope.row.is_check ==1">已审核</span>
+             <span v-if="scope.row.is_check ==2">未审核</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="240">
+          <template slot-scope="scope">
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="编辑"
+              placement="top"
+            >
+              <el-button
+                size="small"
+                type="primary"
+                icon="el-icon-edit-outline"
+                @click="handleEdit(scope.$index, scope.row)"
+              >
+              </el-button>
+            </el-tooltip>
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="删除"
+              placement="top"
+            >
+              <el-button
+                size="small"
+                type="danger"
+                icon="el-icon-delete"
+                @click="handleDelete(scope.$index, scope.row)"
+              >
+              </el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+
+    
+
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[5, 10, 50, 100]"
+        :page-size="5"
+        background
+        style="margin-top: 20px; text-align: right"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      >
+      </el-pagination>
+
+      <div v-if="isShow">
+
+        <el-table
+        :data="tableList"
+        :class="signAndWeighBoxPatients"
+        style="width: 100%"
+        border
+        highlight-current-row
+        v-loading="Warehouse.loading"
+        ref="multipleTable"
+        @selection-change="select"
+        :row-style="{ color: '#303133' }"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266',
+        }"
+        @current-change="handleCurrentChangeOne"
+      >
+        <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)}}
@@ -253,19 +344,8 @@
             </el-tooltip>
           </template>
         </el-table-column>
-      </el-table>
-
-      <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :page-sizes="[5, 10, 50, 100]"
-        :page-size="5"
-        background
-        style="margin-top: 20px; text-align: right"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-      >
-      </el-pagination>
+        </el-table>
+      </div>
     
     </div>
 
@@ -317,11 +397,11 @@ export default {
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
-
-    this.getAllSelfDrugWarehouse()  
     this.getallPatientList() 
+    this.getAllSelfDrugWarehouse()  
+   
 
-    this.getAllSelfDrugWarehouseInfoList()
+    
   },
   data() {
     return {
@@ -378,6 +458,7 @@ export default {
       tableList:[],
       dealerList:[],
       drugTypeList:[],
+      isShow:false,
     };
   },
 
@@ -390,9 +471,17 @@ export default {
           check_type:this.check_type,
           limit:this.limit,
           page:this.page,
+          patient_id:this.patient_id,
         }
       getAllSelfDrugWarehouse(params).then(response=>{
-
+        if(response.data.state == 1){
+          var list = response.data.data.list
+          this.tableList = list
+          console.log("list",list)
+          var total = response.data.data.total
+          this.total = total
+          console.log("total",total)
+        }
       })
     },
     getAllSelfDrugWarehouseInfoList(){
@@ -402,12 +491,12 @@ export default {
         }
         getAllSelfDrugWarehouseInfoList(params).then(response=>{
           if(response.data.state ==1){
-            var infoList  =  response.data.data.infoList
-            this.tableList = infoList
-            this.manufacturerList = response.data.data.manufacturerList
-            console.log("infolist22222222222222",this.manufacturerList)
-            this.dealerList = response.data.data.dealerList
-            this.drugTypeList = response.data.data.drugTypeList
+            // var infoList  =  response.data.data.infoList
+            // this.tableList = infoList
+            // this.manufacturerList = response.data.data.manufacturerList
+            // console.log("infolist22222222222222",this.manufacturerList)
+            // this.dealerList = response.data.data.dealerList
+            // this.drugTypeList = response.data.data.drugTypeList
 
           }
       })
@@ -832,10 +921,10 @@ export default {
       return storehouse_name;
     },
     changeStoreHouse() {
-      this.GetWarehouse();
+      this.getAllSelfDrugWarehouse();
     },
     changeCheckType() {
-      this.GetWarehouse();
+      this.getAllSelfDrugWarehouse();
     },
 
     getallPatientList(){