From 70daf57903a201ef90ba9c95bc1b8ffb1ddbe276 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Sat, 9 Nov 2024 15:26:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=8D=95=E6=8D=AE=E6=98=8E=E7=BB=86card?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/collect/collectOrder.js            |  17 +++
 src/views/collect/ConfirmDrugDealOrder.vue |   4 +-
 src/views/collect/PannelOrderBizCard.vue   | 149 +++------------------
 3 files changed, 39 insertions(+), 131 deletions(-)

diff --git a/src/api/collect/collectOrder.js b/src/api/collect/collectOrder.js
index 06fad9a6..aba8c13a 100644
--- a/src/api/collect/collectOrder.js
+++ b/src/api/collect/collectOrder.js
@@ -271,4 +271,21 @@ export function decideOrder(query) {
 }
 
 
+export function bizConfirm(query) {
+  return axios({
+    url: "/udiwms/basic/collect/order/bizConfirm",
+    method: "post",
+    data: query
+  });
+}
+
+export function confirmFinish(query) {
+  return axios({
+    url: "/udiwms/basic/collect/order/confirmFinish",
+    method: "post",
+    data: query
+  });
+}
+
+
 
diff --git a/src/views/collect/ConfirmDrugDealOrder.vue b/src/views/collect/ConfirmDrugDealOrder.vue
index 650253a3..36051cc6 100644
--- a/src/views/collect/ConfirmDrugDealOrder.vue
+++ b/src/views/collect/ConfirmDrugDealOrder.vue
@@ -414,7 +414,7 @@ import {
   findByBill,
   findFromCorp,
   orderDetail,
-  removeByScanCode
+  removeByScanCode,confirmFinish
 } from "@/api/collect/collectOrder";
 import PanelOrderAllDetail from "@/views/collect/PanelOrderAllDetail";
 import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
@@ -1097,7 +1097,7 @@ export default {
     },
 
     finishOrder() {
-      finishOrder(this.formData).then(res => {
+      confirmFinish(this.formData).then(res => {
         this.loading = false
         if (res.code == 20000) {
           this.reset()
diff --git a/src/views/collect/PannelOrderBizCard.vue b/src/views/collect/PannelOrderBizCard.vue
index c2943613..bd8ddca0 100644
--- a/src/views/collect/PannelOrderBizCard.vue
+++ b/src/views/collect/PannelOrderBizCard.vue
@@ -1,146 +1,24 @@
 <template>
   <div>
-    <el-table v-loading="preLoading" :data="preDetailList" style="width: 100%" border :row-style="rowStyle">
-      <template v-for="(item, index) in tableHeader1">
-        <el-table-column
-          v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
-          type="index" :label="item.columnDesc"></el-table-column>
-        <el-table-column
-          v-if="item.columnType == 'selection'"
-          type="selection"
-          :width="item.width"
-          :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
-        ></el-table-column>
-
-        <el-table-column
-          v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
-          :prop="item.columnName"
-          :label="item.columnDesc"
-          :sortable="item.sort"
-          :width="item.width"
-          :show-overflow-tooltip="item.tooltip"
-          :key="item.columnName"
-        >
-          <template slot-scope="scope">
-            <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
-          :prop="item.columnName"
-          :label="item.columnDesc"
-          :sortable="item.sort"
-          :width="item.width"
-          :show-overflow-tooltip="item.tooltip"
-          :key="item.columnName"
-        >
-          <template slot-scope="scope">
-                <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{
-                    item.lableRuleObj[scope.row[item.columnName]]
-                  }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
-          :prop="item.columnName"
-          :label="item.columnDesc"
-          :sortable="item.sort"
-          :width="item.width"
-          :show-overflow-tooltip="item.tooltip"
-          :key="item.columnName"
-        >
-          <template slot-scope="scope">
-            <el-tag
-              :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
-                  <span>{{
-                      item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName]
-                    }}</span>
-            </el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
-          :prop="item.columnName"
-          :label="item.columnDesc"
-          :width="item.width"
-          :key="item.columnName"
-          fixed="right"
-        >
-          <template slot-scope="scope">
-            <el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
-                       :type="buttonItem.type"
-                       :size="buttonItem.size"
-                       :style="buttonItem.style"
-                       :key="buttonItem"
-                       v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
-                       :disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
-                       @click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
-            >{{ buttonItem.name }}
-            </el-button>
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-if="item.columnType == 'text'  && !(item.columnName == 'productDate' || item.columnName == 'expireDate') && executeEval(row,item.expression,true)"
-          :prop="item.columnName"
-          :label="item.columnDesc"
-          :sortable="item.sort"
-          :width="item.width"
-          :show-overflow-tooltip="item.tooltip"
-          :key="item.columnName"
-        >
-          <template slot-scope="scope">
-                <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
-                    scope.row[item.columnName]
-                  }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          v-if="item.columnType == 'text' && (item.columnName == 'productDate' || item.columnName == 'expireDate') && executeEval(row,item.expression,true)"
-          :prop="item.columnName"
-          :label="item.columnDesc"
-          :sortable="item.sort"
-          :width="item.width"
-          :show-overflow-tooltip="item.tooltip"
-          :key="item.columnName"
-        >
-          <template slot-scope="scope">
-                <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
-                    convertDateFun(scope.row[item.columnName])
-                  }}</span>
-          </template>
-        </el-table-column>
-      </template>
-    </el-table>
-
-    <pagination
-      v-show="preTotal>0"
-      :total="preTotal"
-      :limit.sync="preQuery.limit"
-      :page.sync="preQuery.page"
-      @pagination="preHandleCurrentChange"
-    ></pagination>
-
-
     <el-row>
       <el-col v-for="(info, index)  in preDetailList"  :key="index" :xs="12" :sm="6" :md="6" :lg="6" >
         <el-card :body-style="{margin:'20px'}"
                  style="margin:20px 20px 20px 20px;;background-color: #e1f3fb;border-radius: 12px; position: relative;">
           <div style="display: flex; justify-content: space-between; align-items: center; height: 26px; /* 约为 200px 的 1/3 */" >
-            <p style="font-size: 20px;background-color: #e1f3fb;font-weight: bold;">{{ info.cpmctymc }}</p>
+            <p>产品名称：</p> <p style="font-size: 20px;background-color: #e1f3fb;font-weight: bold;">{{ info.cpmctymc }}</p>
           </div>
           <div style="display: flex; justify-content: space-between; align-items: center; height: 26px; /* 约为 200px 的 1/3 */" >
-            <p style="font-size: 12px;background-color: #e1f3fb;font-weight: bold;">{{ info.nameCode }}</p>
+            <p>层级标识：</p><p style="font-size: 16px;background-color: #e1f3fb;font-weight: bold;">{{ info.nameCode }}</p>
           </div>
           <div style="display: flex; justify-content: space-between; align-items: center; height: 26px; /* 约为 200px 的 1/3 */" >
-            <p style="font-size: 12px;background-color: #e1f3fb;font-weight: bold;">{{ info.ggxh }}</p>
+            <p>规格型号：</p><p style="font-size: 16px;background-color: #e1f3fb;font-weight: bold;">{{ info.ggxh }}</p>
           </div>
           <div style="display: flex; justify-content: space-between; align-items: center; height: 26px; /* 约为 200px 的 1/3 */" >
-            <p style="font-size: 12px;background-color: #e1f3fb;font-weight: bold;">{{ info.measureUnit }}</p>
+            <p>使用单位：</p><p style="font-size: 16px;background-color: #e1f3fb;font-weight: bold;">{{ info.measureUnit }}</p>
           </div>
           <div style="flex: 1; display: flex; flex-direction: column; justify-content: flex-end; padding-top: 10px;"  >
-            <p style="font-size: 14px;background-color: #e1f3fb" >{{ info.count }}</p>
-            <el-button type="primary" style="position: absolute; bottom: 20px; right: 20px;" icon="el-icon-thumb" @click="handleClick(info)">确认取药</el-button>
-
+            <span><h1 :style="{ 'font-size': '45px', 'color': info.getConfirm ? '#67C23A' : '#F56C6C' }">{{ info.count }}</h1></span>
+            <el-button type="primary" style="position: absolute; bottom: 20px; right: 20px;" icon="el-icon-thumb" @click="handleClick(info)"  :disabled="info.getConfirm">确认取药</el-button>
           </div>
 
         </el-card>
@@ -172,7 +50,7 @@
 import {convertDate} from "@/utils/date";
 import {detail} from "@/api/basic/sicker/prescribeApi";
 import {executeFuc, getHead} from "@/utils/customConfig";
-import {orderDetail, codeRemove} from "@/api/collect/collectOrder";
+import {orderDetail, codeRemove,bizConfirm} from "@/api/collect/collectOrder";
 import PanelOrderManuTagCode from "@/views/collect/PanelOrderManuTagCode";
 
 /**
@@ -227,6 +105,19 @@ export default {
     }
   },
   methods: {
+    handleClick(info){
+      bizConfirm(info).then((response) => {
+        if (response.code === 20000) {
+          this.$message.success("操作成功！");
+          this.getPrescribeDetail(this);
+        } else {
+          this.$message.error(response.message);
+        }
+        this.loading = false;
+      }).catch(() => {
+        this.loading = false;
+      })
+    },
     deleteMan(_this, row) {
       _this.$confirm("是否确定删除该条扫码?", "提示", {
         confirmButtonText: "确定",