Merge remote-tracking branch 'origin/20240912_adapter' into 20240912_adapter

src/api/collect/collectOrder.js

@@ -81,6 +81,14 @@ export function manualCodeDetail(query) {
   });
 }
 
+export function ioSplitCodeDetail(query) {
+  return axios({
+    url: "udiwms/ioSplit/collect/code/filter",
+    method: "get",
+    params: query
+  });
+}
+
 /**
  * 自动扫码明细
  * @param query

src/views/basic/collectPoint/timerSetting.vue

@@ -147,7 +147,25 @@
               </el-col>
             </el-row>
           </el-collapse-item>
+
           <el-collapse-item name="4">
+            <template slot="title">
+              <p class="form-title">取药设置</p>
+            </template>
+            <el-row :gutter="20">
+              <el-col :span="8" class="el-col">
+                <el-form-item label="是否允许取药整单确认:" prop="drugDealConfirm" style="margin-bottom: 0">
+                  <el-radio-group v-model="formData.drugDealConfirm">
+                    <el-radio :label="true">是</el-radio>
+                    <el-radio :label="false">否</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+
+            </el-row>
+          </el-collapse-item>
+
+          <el-collapse-item name="5">
             <template slot="title">
               <p class="form-title">扫码设置</p>
             </template>
@@ -197,7 +215,7 @@
             <!--  </el-col>-->
             <!--</el-row>-->
           </el-collapse-item>
-          <el-collapse-item name="4">
+          <el-collapse-item name="6">
             <template slot="title">
               <p class="form-title">高拍仪扫码设置</p>
             </template>
@@ -424,6 +442,9 @@ export default {
       if (isBlank(this.formData.outputMode)){
         this.formData.outputMode = 1
       }
+      if (isBlank(this.formData.drugDealConfirm)){
+        this.formData.drugDealConfirm = 0
+      }
       updateSet(this.formData)
         .then((response) => {
           if (response.code != 20000) {

src/views/collect/ConfirmDrugDealOrder.vue

@@ -1008,6 +1008,8 @@ export default {
     },
 
     confirmFinishOrder() {
+
+      if (this.collectSet.drugDealConfirm != null && this.collectSet.drugDealConfirm != 0) {
         this.$confirm('是否确定完成此单据?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -1016,6 +1018,9 @@ export default {
           this.finishOrder()
         }).catch(() => {
         });
+      } else {
+        this.finishOrder()
+      }
     },
 
     finishOrder() {

src/views/collect/PanelOrderTagCodeBiz.vue

@@ -0,0 +1,280 @@
+<template>
+  <div>
+    <el-table v-loading="codeLoading" :data="codeDetailList" style="width: 100%" :row-style="{height:'38px'}" border>
+      <template v-for="(item, index) in tableHeader2">
+        <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="codeTotal>0"
+      :total="codeTotal"
+      :limit.sync="codeQuery.limit"
+      :page.sync="codeQuery.page"
+      @pagination="codeHandleCurrentChange"
+    ></pagination>
+
+  </div>
+</template>
+
+<script>
+import {convertDate} from "@/utils/date";
+import {executeFuc, getHead} from "@/utils/customConfig";
+import {autoCodeDetail, autoCodeResult, ioSplitCodeDetail} from "@/api/collect/collectOrder";
+
+export default {
+
+  /**
+   * 处方赋码明细
+   */
+  name: "prescribeCodePanel",
+  props: {
+    prescribeData: {
+      type: Object,
+      default: null,
+      required: true
+    },
+    //上货方式：1:拆零上货；2:整取上货;3：手动扫码查询
+    fifoSplit: {
+      type: Object,
+      default: null,
+      required: true
+    },
+    bizId: {
+      type: String,
+      default: null,
+      required: true
+    },
+  },
+  data() {
+
+    return {
+      //界面配置相关
+      //赋码明细
+      tableHeader2: [],
+      queryList2: [],
+      tableObj2: [],
+      fromList2: [],
+      convertDateFun: convertDate,
+      //界面配置-------------end
+
+      codeLoading: false,
+      codeDetailList: [],
+      codeTotal: 0,
+      codeQuery: {
+        fifoSplit: null,
+        page: 1,
+        limit: 10,
+      },
+      splitType: true,
+    }
+  },
+  methods: {
+    //界面配置相关------------
+    executeFuc(row, type, clickFuc, value) {
+      return executeFuc(this, row, type, clickFuc, value);
+    },
+    executeEval(row, expression, defaultRet) {
+      if (expression) {
+        return eval(expression);
+      }
+      return defaultRet;
+    },
+    handleSortChange(column, prop, order) {
+      if (column.order === 'descending') {
+        this.query.sort = 'desc'
+      } else {
+        this.query.sort = 'asc'
+      }
+      this.query.orderBy = column.prop;
+      this.getList(this);
+    },
+    ///界面配置相关------------end
+
+    getList(_this) {
+      if (_this.prescribeData == null)
+        return
+      if (_this.prescribeData != null) {
+        _this.codeQuery.page = 1
+        _this.codeQuery.orderIdFk = this.prescribeData.billNo
+        _this.codeQuery.bizIdFk = this.bizId
+      }
+      _this.codeLoading = true;
+      if (_this.fifoSplit == 3) {
+        ioSplitCodeDetail(_this.codeQuery).then(res => {
+          _this.codeLoading = false
+          if (res.code != 20000) {
+            _this.$message.error(res.message)
+            return
+          }
+          _this.codeDetailList = res.data.list
+          _this.codeLoading = false
+        }).catch(() => {
+          _this.codeLoading = false
+          _this.$message.error("数据加载失败")
+        })
+      } else {
+        _this.codeQuery.fifoSplit = this.fifoSplit
+        autoCodeResult(_this.codeQuery).then(res => {
+          _this.codeLoading = false
+          if (res.code != 20000) {
+            _this.$message.error(res.message)
+            return
+          }
+          _this.codeDetailList = res.data.list
+          _this.codeLoading = false
+        }).catch(() => {
+          _this.codeLoading = false
+          _this.$message.error("数据加载失败")
+        })
+      }
+
+    },
+    codeHandleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getCodeDetail(this, null);
+    },
+    rowStyle({row, rowIndex}) {
+      let rowBackground = {};
+      if (row.count != row.scanCount) {
+        rowBackground.color = '#f60303';
+      }
+
+      rowBackground.height = "32px"
+      return rowBackground;
+    },
+  },
+
+  created() {
+    if (this.fifoSplit == 2 || this.fifoSplit == 1) {
+      this.splitType = false
+    }
+
+    if (this.tableHeader2 == null || this.tableHeader2.length == 0) {
+      getHead("PanelOrderTagCodeBiz", "1").then((re) => {
+        // 处理返回的数据
+        this.tableObj2 = re.data;
+        this.tableHeader2 = re.data.tableList;
+        this.queryList2 = re.data.queryList;
+        this.fromList2 = re.data.fromList;
+        this.getList(this);
+      });
+    } else {
+      this.getList(this);
+    }
+
+
+  }
+
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/collect/PannelOrderBizCard.vue

@@ -25,6 +25,7 @@
           </div>
           <div style="flex: 1; display: flex; flex-direction: column; justify-content: flex-end; padding-top: 10px;"  >
             <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: 130px;" icon="el-icon-document" @click="codeHandleClick(info)"  :disabled="!info.getConfirm">赋码明细</el-button>
             <el-button type="primary" style="position: absolute; bottom: 20px; right: 20px;" icon="el-icon-thumb" @click="handleClick(info)"  :disabled="info.getConfirm">确认取药</el-button>
           </div>
 
@@ -50,6 +51,23 @@
       ></PanelOrderManuTagCode>
     </el-dialog>
 
+    <el-dialog
+      title="赋码明细"
+      :visible.sync="codeDetailVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="codeDetailVisible"
+      width="45%"
+      append-to-body
+    >
+      <PanelOrderTagCodeBiz
+        :fifoSplit="3"
+        :prescribeData="prescribeData"
+        :bizId="bizId"
+        :closeScanDialog="closeScanDialog"
+      ></PanelOrderTagCodeBiz>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -59,6 +77,7 @@ import {detail} from "@/api/basic/sicker/prescribeApi";
 import {executeFuc, getHead} from "@/utils/customConfig";
 import {orderDetail, codeRemove,bizConfirm} from "@/api/collect/collectOrder";
 import PanelOrderManuTagCode from "@/views/collect/PanelOrderManuTagCode";
+import PanelOrderTagCodeBiz from "@/views/collect/PanelOrderTagCodeBiz.vue";
 
 /**
  * 原始处方明细
@@ -112,7 +131,9 @@ export default {
 
       countVisible: false,
       scanDetailVisible: false,
+      codeDetailVisible: false,
       bizId: null,
+      collectSet: {}
     }
   },
   methods: {
@@ -150,6 +171,10 @@ export default {
         this.loading = false;
       })
     },
+    codeHandleClick(info){
+      this.bizId = info.id
+      this.codeDetailVisible = true
+    },
     deleteMan(_this, row) {
       _this.$confirm("是否确定删除该条扫码?", "提示", {
         confirmButtonText: "确定",
@@ -294,7 +319,7 @@ export default {
 
 
   components: {
-    PanelOrderManuTagCode
+    PanelOrderManuTagCode,PanelOrderTagCodeBiz
   },
   created() {
     if (this.tableHeader1 == null || this.tableHeader1.length == 0) {