药房流程信息

pages/pharmacy/pharmacy.vue

@@ -44,7 +44,7 @@
             class="page_item_wrap"
             v-for="row in list"
             :key="row.id"
-            @click="getDetails(row.id)"
+            @click="getDetails(row)"
           >
             <view class="page_item">
               <view class="page_item_top">
@@ -236,9 +236,9 @@ export default {
       }
     },
     // 详情页面
-    getDetails(id) {
+    getDetails(drugBug) {
       uni.navigateTo({
-        url: `../pharmacyDetails/pharmacyDetails?id=${id}`,
+        url: `../pharmacyDetails/pharmacyDetails?id=${drugBug.id}&packid=${drugBug.packid}`,
       });
     },
     // 阻止浏览器滑动

pages/pharmacyDetails/pharmacyDetails.vue

@@ -40,16 +40,17 @@
             </view>
           </view>
         </view>
-        <view class="page_item_cont" v-show="selectedLabelSlots == 2">
+        <scroll-view scroll-y class="page_item_cont" v-show="selectedLabelSlots == 2">
           <view class="page_item_cont_C" v-for="(item,i) in queryProcessList" :key="i">
             <view class="page_item_cont_title_C">
-              <text>{{item.operationType?item.operationType.name:''}}</text>
-              <text class="text_big">
+              <text style="flex: 1;">{{item.operationTime}}</text>
+              <text style="flex: 1;">{{item.operationType?item.operationType.name:''}}</text>
+              <text class="text_big" style="width: 3em;">
                 <text>{{ item.username || '暂无' }}</text>
               </text>
             </view>
           </view>
-        </view>
+        </scroll-view>
         <view class="L"></view>
         <view class="R"></view>
       </view>
@@ -537,7 +538,12 @@
           post("/simple/data/fetchDataList/drugsBagOperationLog", postData).then((result) => {
             uni.hideLoading();
             if (result.status == 200) {
-              this.queryProcessList = res.list;
+              result.list.forEach(v => {
+                if (v.operationTime) {
+                  v.operationTime = (new Date(v.operationTime)).Format("MM-dd hh:mm");
+                }
+              });
+              this.queryProcessList = result.list;
             } else {
               uni.showToast({
                 icon: "none",
@@ -547,8 +553,8 @@
           });
         }
         // 点击列表进入详情
-        let id = options.id;
-        if (id) {
+        let packid = options.packid;
+        if (packid) {
           uni.showLoading({
             title: "加载中",
             mask: true,
@@ -564,6 +570,11 @@
           post("/simple/data/fetchDataList/drugsBagOperationLog", postData).then((res) => {
             uni.hideLoading();
             if (res.status == 200) {
+              res.list.forEach(v => {
+                if (v.operationTime) {
+                  v.operationTime = (new Date(v.operationTime)).Format("MM-dd hh:mm");
+                }
+              });
               this.queryProcessList = res.list;
             } else {
               uni.showToast({
@@ -694,9 +705,9 @@
         }
 
         .page_item_cont {
+          box-sizing: border-box;
           min-height: 180rpx;
           max-height: calc(100vh - 534rpx);
-          overflow-y: auto;
           padding: 0 16rpx;
           text-align: left;
           position: relative;