代码备份2222

src/api/collect/collectOrder.js

@@ -24,6 +24,13 @@ export function orderDetail(query) {
     params: query
   });
 }
+export function allDetail(query) {
+  return axios({
+    url: "/udiwms/basic/collect/order/allDetail",
+    method: "get",
+    params: query
+  });
+}
 
 
 export function deleteByOrder(query) {

src/views/collect/CollectOrderAllot.vue

@@ -8,12 +8,13 @@
         <CollectOrderAllotComponents
           style="margin: -15px"
           :tagStatus="'0'"
+          :viewType="1"
         ></CollectOrderAllotComponents>
       </el-tab-pane>
 
       <el-tab-pane label="已分配工位单据">
         <CollectOrderAllotComponents style="margin: -15px"
-                         :tagStatus="'1'"
+                                     :tagStatus="'1'"
         ></CollectOrderAllotComponents>
       </el-tab-pane>
 

src/views/collect/CollectOrderAllotComponents.vue

@@ -264,11 +264,17 @@ export default {
       type: String,
       required: true
     },
+
+    viewType: {
+      type: Number,
+      required: true
+    },
+
   },
   data() {
     return {
       isLinkDisabled: false,
-      userInfo:{
+      userInfo: {
         inv: this.$store.getters.locInvName,
         deptName: this.$store.getters.locDeptName,
         userName: this.$store.getters.name,
@@ -339,7 +345,7 @@ export default {
     addOrder, errOrder, bindWorkDialog, prescribeOriginPanel, prescribeOriginDiPanel
   },
   methods: {
-    linkPage(_this,row) {
+    linkPage(_this, row) {
 
       let url = window.location.origin + `#/tagCodeBlank?workplaceId=` + row.workPlaceCode
       window.open(url, '_blank');
@@ -375,7 +381,7 @@ export default {
       this.getList();
     },
 
-    bindWorkPlace(_this,row) {
+    bindWorkPlace(_this, row) {
       _this.prescribeListData = row
       _this.bindWorkPlaceVisible = true;
 
@@ -478,7 +484,7 @@ export default {
 
   },
   created() {
-    if (this.$route.query.workplaceId != null){
+    if (this.$route.query.workplaceId != null) {
       this.isLinkDisabled = true
     }
     getHead("prescribeAllot", "1").then((re) => {

src/views/collect/DealOrder.vue

@@ -182,22 +182,18 @@
 
       <el-tabs type="border-card" style="margin: 15px">
         <el-tab-pane label="扫码详情">
-          <PannelOrderBiz
+          <prescribeOriginPanel
             v-if="panelALive"
-            :dealStatus="2"
             :prescribeData="curRow"
-          ></PannelOrderBiz>
+          ></prescribeOriginPanel>
-
         </el-tab-pane>
-
+        <el-tab-pane label="扫码明细">
-        <el-tab-pane label="扫码详情">
           <PanelOrderManuTagCode
             v-if="panelALive"
             :fifoSplit="3"
             :prescribeData="curRow"
           ></PanelOrderManuTagCode>
         </el-tab-pane>
-
         <el-tab-pane label="拆零详情">
           <prescribeCodePanel
             v-if="panelALive"
@@ -205,7 +201,6 @@
             :fifoSplit="1"
           ></prescribeCodePanel>
         </el-tab-pane>
-
         <el-tab-pane label="整取详情">
           <prescribeCodePanel
             v-if="panelALive"
@@ -213,6 +208,12 @@
             :fifoSplit="2"
           ></prescribeCodePanel>
         </el-tab-pane>
+        <el-tab-pane label="整单详情">
+          <PanelOrderAllDetail
+            v-if="panelALive"
+            :prescribeData="curRow"
+          ></PanelOrderAllDetail>
+        </el-tab-pane>
 
       </el-tabs>
 
@@ -250,6 +251,7 @@ import {draftOrder, finishOrder, startSplit, tagCode, updateOrder} from "@/api/c
 import {selectCorpList} from "@/api/basic/basicUnitMaintain";
 import {delDrugLevel} from "@/api/basic/product/drugUdiinfos";
 import {getNextOrder} from "@/api/collect/collectOrder";
+import PanelOrderAllDetail from "@/views/collect/PanelOrderAllDetail";
 
 export default {
   /**
@@ -318,7 +320,13 @@ export default {
   },
 
   components: {
-    addOrder, errOrder, selectPrescribeDialog, prescribeCodePanel,PanelOrderManuTagCode, PannelOrderBiz
+    addOrder,
+    errOrder,
+    selectPrescribeDialog,
+    prescribeCodePanel,
+    PanelOrderManuTagCode,
+    PannelOrderBiz,
+    PanelOrderAllDetail
   },
   methods: {
     findFromInvList(val) {

src/views/collect/DealOrderBlank.vue

@@ -182,14 +182,11 @@
 
       <el-tabs type="border-card" style="margin: 15px">
         <el-tab-pane label="扫码详情">
-          <PannelOrderBiz
+          <prescribeOriginPanel
             v-if="panelALive"
-            :dealStatus="2"
             :prescribeData="curRow"
-          ></PannelOrderBiz>
+          ></prescribeOriginPanel>
-
         </el-tab-pane>
-
         <el-tab-pane label="扫码明细">
           <PanelOrderManuTagCode
             v-if="panelALive"
@@ -197,22 +194,26 @@
             :prescribeData="curRow"
           ></PanelOrderManuTagCode>
         </el-tab-pane>
-
+        <el-tab-pane label="拆零详情">
-        <el-tab-pane label="拆零明细">
           <prescribeCodePanel
             v-if="panelALive"
             :prescribeData="curRow"
             :fifoSplit="1"
           ></prescribeCodePanel>
         </el-tab-pane>
-
+        <el-tab-pane label="整取详情">
-        <el-tab-pane label="整取明细">
           <prescribeCodePanel
             v-if="panelALive"
             :prescribeData="curRow"
             :fifoSplit="2"
           ></prescribeCodePanel>
         </el-tab-pane>
+        <el-tab-pane label="整单详情">
+          <PanelOrderAllDetail
+            v-if="panelALive"
+            :prescribeData="curRow"
+          ></PanelOrderAllDetail>
+        </el-tab-pane>
 
       </el-tabs>
 
@@ -250,6 +251,8 @@ import {draftOrder, finishOrder, startSplit, tagCode, updateOrder} from "@/api/c
 import {selectCorpList} from "@/api/basic/basicUnitMaintain";
 import {delDrugLevel} from "@/api/basic/product/drugUdiinfos";
 import {getNextOrder} from "@/api/collect/collectOrder";
+import PanelOrderAllDetail from "@/views/collect/PanelOrderAllDetail";
+import prescribeOriginPanel from "@/views/collect/PannelOrderBiz";
 
 export default {
   /**
@@ -318,7 +321,13 @@ export default {
   },
 
   components: {
-    addOrder, errOrder, selectPrescribeDialog, prescribeCodePanel, PanelOrderManuTagCode, PannelOrderBiz
+    addOrder,
+    errOrder,
+    selectPrescribeDialog,
+    prescribeCodePanel,
+    PanelOrderManuTagCode,
+    PannelOrderBiz,
+    PanelOrderAllDetail,prescribeOriginPanel
   },
   methods: {
     findFromInvList(val) {

src/views/collect/PanelOrderAllDetail.vue

@@ -0,0 +1,305 @@
+<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>
+
+  </div>
+</template>
+
+<script>
+import {convertDate} from "@/utils/date";
+import {detail} from "@/api/basic/sicker/prescribeApi";
+import {executeFuc, getHead} from "@/utils/customConfig";
+import {allDetail,codeRemove} from "@/api/collect/collectOrder";
+
+/**
+ * 原始处方明细
+ */
+export default {
+  name: "PanelOrderAllDetail",
+  props: {
+    prescribeData: {
+      type: Object,
+      default: null,
+      required: true
+    },
+    //上货方式：1:拆零上货；2:整取上货;
+    fifoSplit: {
+      type: Object,
+      default: null,
+      required: true
+    },
+    dealStatus: {
+      type: Number,
+      default: 1,
+      required: true
+    },
+
+
+  },
+  data() {
+    return {
+      //界面配置相关
+      //原始处方明细
+      tableHeader1: [],
+      queryList1: [],
+      tableObj1: [],
+      fromList1: [],
+      convertDateFun: convertDate,
+
+
+      preLoading: false,
+      preDetailList: [],
+      preTotal: 0,
+      preQuery: {
+        orderIdFk: null,
+        page: 1,
+        limit: 10,
+      },
+
+      countVisible: false,
+
+    }
+  },
+  methods: {
+    deleteMan(_this, row) {
+      _this.$confirm("是否确定删除该条扫码?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        _this.loading = true;
+        _this.codeRemoveMan(row.id, 2);
+      })
+    },
+    deleteCode(_this, row) {
+      _this.$confirm("是否确定移除一个条码?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        _this.loading = true;
+        _this.codeRemoveMan(row.id, 1);
+      })
+    },
+    codeRemoveMan(codeManId,delType){
+      let post = {
+        codeManId: codeManId,
+        delType: delType
+      }
+      codeRemove(post).then((response) => {
+        if (response.code === 20000) {
+          this.$message.success("操作成功！");
+          this.getList(this)
+        } else {
+          this.$message.error(response.message);
+        }
+        this.loading = false;
+      }).catch(() => {
+        this.loading = false;
+      })
+    },
+    //界面配置-------------end
+    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();
+    },
+    ///界面配置相关------------end
+
+    preHandleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getPrescribeDetail(this, null);
+    },
+    getPrescribeDetail(_this) {
+
+      if (_this.prescribeData == null)
+        return
+      if (_this.prescribeData != null) {
+        _this.preQuery.page = 1
+        _this.preQuery.orderIdFk = this.prescribeData.billNo
+      }
+      _this.preLoading = true;
+      allDetail(_this.preQuery).then(res => {
+        _this.preLoading = false
+        if (res.code != 20000) {
+          _this.$message.error(res.message)
+          return
+        }
+        _this.preDetailList = res.data.list
+        _this.preLoading = false
+      }).catch(() => {
+        _this.preLoading = false
+        _this.$message.error("数据加载失败")
+      })
+    },
+
+    rowStyle({row, rowIndex}) {
+      let rowBackground = {};
+      if (row.count != row.scanCount) {
+        rowBackground.color = '#f60303';
+      }
+
+      rowBackground.height = "32px"
+      return rowBackground;
+    },
+
+  },
+  created() {
+    if (this.tableHeader1 == null || this.tableHeader1.length == 0) {
+      getHead("PanelOrderAllDetail", "1").then((re) => {
+        // 处理返回的数据
+        this.tableObj1 = re.data;
+        this.tableHeader1 = re.data.tableList;
+        this.queryList1 = re.data.queryList;
+        this.fromList1 = re.data.fromList;
+        this.getPrescribeDetail(this);
+      });
+    } else {
+      this.getPrescribeDetail(this);
+    }
+
+    if (this.dealStatus == 1) {
+      this.countVisible = false;
+    } else {
+      this.countVisible = true;
+    }
+  }
+
+
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/collect/PanelOrderDeal.vue

@@ -208,8 +208,13 @@
       ></pagination>
     </el-card>
     <el-tabs type="border-card" style="margin: 15px">
-
       <el-tab-pane label="扫码详情">
+        <prescribeOriginPanel
+          v-if="panelALive"
+          :prescribeData="curRow"
+        ></prescribeOriginPanel>
+      </el-tab-pane>
+      <el-tab-pane label="扫码明细">
         <PanelOrderManuTagCode
           v-if="panelALive"
           :fifoSplit="3"
@@ -231,10 +236,10 @@
         ></prescribeCodePanel>
       </el-tab-pane>
       <el-tab-pane label="整单详情">
-        <prescribeOriginPanel
+        <PanelOrderAllDetail
           v-if="panelALive"
           :prescribeData="curRow"
-        ></prescribeOriginPanel>
+        ></PanelOrderAllDetail>
       </el-tab-pane>
     </el-tabs>
 
@@ -247,6 +252,7 @@ import errOrder from "@/views/inout/IoCreateErrorOrder";
 import {executeFuc, getHead} from "@/utils/customConfig";
 import {convertDate} from "@/utils/date";
 import prescribeOriginPanel from "@/views/collect/PannelOrderBiz";
+import PanelOrderAllDetail from "@/views/collect/PanelOrderAllDetail";
 import prescribeCodePanel from "@/views/collect/PanelOrderTagCode";
 import {deleteByOrder, orderPage} from "@/api/collect/collectOrder";
 import PanelOrderManuTagCode from "./PanelOrderManuTagCode";
@@ -309,7 +315,7 @@ export default {
   },
 
   components: {
-    addOrder, errOrder, prescribeOriginPanel, prescribeCodePanel, PanelOrderManuTagCode
+    addOrder, errOrder, prescribeOriginPanel, prescribeCodePanel, PanelOrderManuTagCode,PanelOrderAllDetail
   },
   methods: {
     //启动定时器
@@ -458,8 +464,10 @@ export default {
       this.getList();
     });
     this.timerAuto()
-
+  },
-  }
+  destroyed() {
+    clearInterval(this.timer)
+  },
 
 }
 </script>

src/views/collect/PanelOrderEndSearch.vue

@@ -229,10 +229,10 @@
         ></prescribeCodePanel>
       </el-tab-pane>
       <el-tab-pane label="整单详情">
-        <prescribeOriginPanel
+        <PanelOrderAllDetail
           v-if="panelALive"
           :prescribeData="curRow"
-        ></prescribeOriginPanel>
+        ></PanelOrderAllDetail>
       </el-tab-pane>
 
 
@@ -250,6 +250,8 @@ import {convertDate} from "@/utils/date";
 import prescribeCodePanel from "./PanelOrderTagCode";
 import PanelOrderManuTagCode from "./PanelOrderManuTagCode";
 import prescribeOriginPanel from "@/views/collect/PannelOrderBiz";
+import PanelOrderAllDetail from "@/views/collect/PanelOrderAllDetail";
+
 import {orderPage} from "@/api/collect/collectOrder";
 
 export default {
@@ -307,7 +309,7 @@ export default {
   },
 
   components: {
-    addOrder, errOrder, prescribeCodePanel, prescribeOriginPanel,PanelOrderManuTagCode
+    addOrder, errOrder, prescribeCodePanel, prescribeOriginPanel,PanelOrderManuTagCode,PanelOrderAllDetail
   },
   methods: {