diff --git a/src/views/collect/CollectOrderAllot.vue b/src/views/collect/CollectOrderAllot.vue
index abd23cd7..d7225efd 100644
--- a/src/views/collect/CollectOrderAllot.vue
+++ b/src/views/collect/CollectOrderAllot.vue
@@ -1,522 +1,43 @@
 <template>
   <div>
 
-    <el-row :gutter="0"  v-if="isLinkDisabled" style="margin-top: 15px">
-      <el-col :span="24" align="right">
-        <div class="inv-hos-title">
-            <span
-              style="margin: 10px;color: #2d8cf0;font-size: 14px;"
-            >部门&nbsp:&nbsp{{ this.userInfo.deptName }}</span>
-          <span
-            style="margin-right: 18px;margin-left:8px;color: #2d8cf0;font-size: 14px;"
-          >仓库&nbsp:&nbsp{{ this.userInfo.inv }}</span>
-          <span style="font-weight: 500;color:rgb(51 48 48); font-size: 14px;">用户&nbsp:&nbsp{{
-              this.userInfo.companyName
-            }}</span>
-          <span
-            style="font-weight: 500;color:rgb(51 48 48); font-size: 14px; margin-right: 20px"
-          >({{
-              this.userInfo.userName
-            }})</span>
-        </div>
-      </el-col>
-    </el-row>
 
-
-    <el-card>
-      <el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form"
-               size="mini" label-width="100px">
-        <el-row style=" display:flex;  flex-wrap: wrap; ">
-          <template v-for="(item, index) in queryList">
-            <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
-                          class="query-form-item"
-                          :label="item.columnDesc+`:`" :key="item.id">
-              <el-input
-                v-model="filterQuery[item.columnName]"
-                :placeholder="item.columnDesc"
-                :disabled="executeEval(null,item.disabledFuc,false)"
-                @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
-                clearable
-              ></el-input>
-            </el-form-item>
-            <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"
-                          class="query-form-item"
-                          :label="item.columnDesc+`:`">
-              <el-select v-model="filterQuery[item.columnName]"
-                         :placeholder="item.columnDesc"
-                         :disabled="executeEval(null,item.disabledFuc,false)"
-                         clearable>
-                <el-option
-                  v-for="dict in item.lableRuleObj"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)"
-                          class="query-form-item"
-                          :label="item.columnDesc+`:`">
-              <el-select
-                v-model="filterQuery[item.columnName]"
-                :placeholder="item.columnDesc"
-                @change="executeFuc($event,'5',item.checkRules)"
-                :disabled="executeEval(null,item.disabledFuc,false)"
-                filterable
-                remote
-                :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
-                clearable>
-                <el-option
-                  v-for="item in options[item.clickFuc]"
-                  :key="item.code"
-                  :label="item.label"
-                  :value="item.code"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)"
-                          class="query-form-item"
-                          :label="item.columnDesc+`:`">
-              <el-date-picker
-                :picker-options="pickerOptions"
-                v-model="actDateRange"
-                type="daterange"
-                format="yyyy 年 MM 月 dd 日"
-                value-format="yyyy-MM-dd"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-              ></el-date-picker>
-            </el-form-item>
-            <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)"
-                          class="query-form-item"
-                          :label="item.columnDesc+`:`">
-              <el-date-picker
-                v-model="filterQuery[item.columnName]"
-                :style="`width:${item.width+'px'}`"
-                value-format="yyyy-MM-dd"
-                :disabled="executeEval(null,item.disabledFuc,false)"
-                type="date"
-                :placeholder="item.columnDesc"
-              ></el-date-picker>
-            </el-form-item>
-          </template>
-        </el-row>
-      </el-form>
-      <div class="top-right-btn">
-        <el-button-group>
-          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
-          <el-button
-            type="primary"
-            icon="el-icon-refresh"
-            @click="onReset"
-          >重置
-          </el-button>
-          <el-button type="primary" icon="el-icon-search" @click="onSubmit"
-          >查询
-          </el-button
-          >
-          <el-button type="primary" icon="el-icon-position" @click="bindWorkPlace"
-          >绑定工位
-          </el-button
-          >
-        </el-button-group>
-      </div>
-      <el-divider style="margin: 15px"></el-divider>
-      <el-table v-loading="loading" :data="list" style="width: 100%;" border highlight-current-row
-                @row-click="(row) => executeFuc(row,'0',tableObj.handleChangeFuc)" ref="multipleTable"
-                :default-sort="defaultSort"
-                :row-style="{ height: '32px' }"
-                @selection-change="handleSelectionChange"
-                @sort-change="handleSortChange">
-        <template v-for="(item, index) in tableHeader">
-          <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' && 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>
-        </template>
-      </el-table>
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :limit.sync="filterQuery.limit"
-        :page.sync="filterQuery.page"
-        @pagination="handleCurrentChange"
-      ></pagination>
-    </el-card>
     <el-tabs type="border-card" style="margin: 15px">
-      <el-tab-pane label="单据详情">
-        <prescribeOriginDiPanel
-          v-if="panelALive"
-          :prescribeData="curRow"
-        ></prescribeOriginDiPanel>
-      </el-tab-pane>
-      <!--      <el-tab-pane label="原始处方明细">-->
-      <!--        <prescribeOriginPanel-->
-      <!--          v-if="panelALive"-->
-      <!--          :prescribeData="curRow"-->
-      <!--        ></prescribeOriginPanel>-->
-      <!--      </el-tab-pane>-->
-    </el-tabs>
 
+      <el-tab-pane label="未分配工位单据">
+        <CollectOrderAllotComponents
+          style="margin: -15px"
+          :tagStatus="'0'"
+        ></CollectOrderAllotComponents>
+      </el-tab-pane>
 
-    <el-dialog
-      title="绑定工位"
-      :visible.sync="bindWorkPlaceVisible"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      v-if="bindWorkPlaceVisible"
-      width="65%"
-      append-to-body
-    >
-      <bindWorkDialog
-        :prescribeList="this.multiplePreSelection"
-        :closeDialog="this.closeDialog"
-      ></bindWorkDialog>
-    </el-dialog>
+      <el-tab-pane label="已分配工位单据">
+        <CollectOrderAllotComponents style="margin: -15px"
+                         :tagStatus="'1'"
+        ></CollectOrderAllotComponents>
+      </el-tab-pane>
 
+    </el-tabs>
 
   </div>
 </template>
 
 <script>
-import addOrder from "@/views/inout/DialogCreateOrder";
-import errOrder from "@/views/inout/IoCreateErrorOrder";
-import {executeFuc, getHead} from "@/utils/customConfig";
-import {convertDate} from "@/utils/date";
-import {page as prescribePage, deleteDataByCode} from "@/api/basic/sicker/prescribeApi";
-import bindWorkDialog from "@/views/collect/bindWorkDialog";
-import prescribeOriginPanel from "./PannelOrderBiz";
-import prescribeOriginDiPanel from "./PannelOrderBiz";
-import {filterWorkOptimize} from "@/api/basic/sysWorkplaceManage";
-import {deleteByOrder, orderPage} from "@/api/collect/collectOrder";
-
-export default {
-  name: "prescribePanel",
-  data() {
-    return {
-      isLinkDisabled: false,
-      userInfo:{
-        inv: this.$store.getters.locInvName,
-        deptName: this.$store.getters.locDeptName,
-        userName: this.$store.getters.name,
-        companyName: this.$store.getters.companyName,
-      },
-      //界面配置相关
-      //患者处方
-      tableHeader: [],
-      queryList: [],
-      tableObj: [],
-      fromList: [],
-      //处方明细
-      tableHeader1: [],
-      queryList1: [],
-      tableObj1: [],
-      fromList1: [],
-      //处方使用耗材明细
-      tableHeader2: [],
-      queryList2: [],
-      tableObj2: [],
-      fromList2: [],
-      convertDateFun: convertDate,
-      //界面配置-------------end
-
-      showSearch: true,
-      filterQuery: {
-        billNo: null,
-        page: 1,
-        limit: 10,
-      },
-      defaultSort: {prop: 'createTime', order: 'desc'},
-      loading: false,
-      list: [],
-      total: 0,
-      deleteData: {},
-      preLoading: false,
-      preDetailList: [],
-      preTotal: 0,
-      preQuery: {
-        prescribeCode: null,
-        page: 1,
-        limit: 10,
-      },
 
-      preDiLoading: false,
-      preDiDetailList: [],
-      preDiTotal: 0,
-      preDiQuery: {
-        prescribeCode: null,
-        page: 1,
-        limit: 10,
-      },
+import CollectOrderAllotComponents from "./CollectOrderAllotComponents.vue";
 
-      bindWorkPlaceVisible: false,
-      multiplePreSelection: [],
-      curRow: null,
-      panelALive: false,
-
-      options: {
-        findWorkPlace: [],
-      },
-    }
-  },
 
+/**
+ * 已完成处方
+ */
+export default {
+  name: "PrescribeTagCode",
   components: {
-    addOrder, errOrder, bindWorkDialog, prescribeOriginPanel, prescribeOriginDiPanel
-  },
-  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();
-    },
-    ///界面配置相关------------end
-
-
-    hideSearch() {
-      this.showSearch = !this.showSearch;
-    },
-    onReset() {
-      this.filterQuery = {};
-      this.actDateRange = [];
-      this.getList();
-    },
-
-    bindWorkPlace() {
-      if (this.multiplePreSelection.length == 0) {
-        this.$message.warning('请先选择处方!');
-        return
-      }
-      this.bindWorkPlaceVisible = true;
-
-    },
-
-    closeDialog() {
-      this.bindWorkPlaceVisible = false;
-      this.getList();
-    },
-    onSubmit() {
-      this.filterQuery.page = 1;
-      this.getList();
-    },
-
-    getList() {
-      this.loading = true;
-      orderPage(this.filterQuery).then(res => {
-        this.loading = false
-        this.list = res.data.list || []
-        this.total = res.data.total || 0
-      }).catch(() => {
-        this.loading = false
-        this.list = []
-        this.total = 0
-      })
-    },
-    handleCurrentChange(val) {
-      this.filterQuery.page = val.page;
-      this.getList();
-    },
-
-    prescribeClick(_this, row) {
-      _this.curRow = row;
-      _this.refreshCodesPanel(_this);
-    },
-    refreshCodesPanel(_this) {
-      _this.panelALive = false;
-      _this.$nextTick(() => {
-        _this.panelALive = true;
-      });
-    },
-
-    deleteDialog(_this, row) {
-      _this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          _this.deleteOrders(row.code);
-        })
-        .catch(() => {
-        });
-    },
-    deleteOrders(data) {
-      this.loading = true;
-      this.deleteData.billNo = data;
-      deleteByOrder(this.deleteData)
-        .then((response) => {
-          if (response.code == 20000) {
-            this.getList();
-            this.$message({
-              type: "success",
-              message: "删除成功！",
-            });
-          } else if (response.code == 520) {
-            this.$message.error(response.message);
-            this.getList();
-          } else {
-            this.$message.error(response.message);
-            this.getList();
-          }
-
-        })
-        .catch(() => {
-        });
-    },
-
-    handleSelectionChange(val) {
-      this.multiplePreSelection = val;
-    },
-
-    findWorkPlace(_this, val) {
-      let query = {
-        invCode: _this.$store.getters.locInvCode,
-        key: val,
-        page: 1,
-        limit: 10,
-      }
-      filterWorkOptimize(query)
-        .then((response) => {
-          _this.loading = false;
-          _this.options.findWorkPlace = response.data || [];
-        })
-        .catch(() => {
-          _this.loading = false;
-          _this.options.findWorkPlace = [];
-        });
-    },
-
-  },
-  created() {
-    if (this.$route.query.workplaceId != null){
-      this.isLinkDisabled = true
-    }
-    getHead("prescribeAllot", "1").then((re) => {
-      // 处理返回的数据
-      this.tableObj = re.data;
-      this.tableHeader = re.data.tableList;
-      this.queryList = re.data.queryList;
-      this.fromList = re.data.fromList;
-      this.getList();
-    });
-
-
+    CollectOrderAllotComponents
   }
-
 }
 </script>
+
 <style scoped>
-.query-form {
-  display: flex;
-  flex-wrap: wrap;
-  width: 100%;
-}
 
-.query-form-item {
-  margin-right: 5px;
-  margin-bottom: 6px;
-}
 </style>
diff --git a/src/views/collect/CollectOrderAllotBlank.vue b/src/views/collect/CollectOrderAllotBlank.vue
index abd23cd7..a639bf8e 100644
--- a/src/views/collect/CollectOrderAllotBlank.vue
+++ b/src/views/collect/CollectOrderAllotBlank.vue
@@ -23,500 +23,60 @@
     </el-row>
 
 
-    <el-card>
-      <el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form"
-               size="mini" label-width="100px">
-        <el-row style=" display:flex;  flex-wrap: wrap; ">
-          <template v-for="(item, index) in queryList">
-            <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
-                          class="query-form-item"
-                          :label="item.columnDesc+`:`" :key="item.id">
-              <el-input
-                v-model="filterQuery[item.columnName]"
-                :placeholder="item.columnDesc"
-                :disabled="executeEval(null,item.disabledFuc,false)"
-                @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
-                clearable
-              ></el-input>
-            </el-form-item>
-            <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"
-                          class="query-form-item"
-                          :label="item.columnDesc+`:`">
-              <el-select v-model="filterQuery[item.columnName]"
-                         :placeholder="item.columnDesc"
-                         :disabled="executeEval(null,item.disabledFuc,false)"
-                         clearable>
-                <el-option
-                  v-for="dict in item.lableRuleObj"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)"
-                          class="query-form-item"
-                          :label="item.columnDesc+`:`">
-              <el-select
-                v-model="filterQuery[item.columnName]"
-                :placeholder="item.columnDesc"
-                @change="executeFuc($event,'5',item.checkRules)"
-                :disabled="executeEval(null,item.disabledFuc,false)"
-                filterable
-                remote
-                :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
-                clearable>
-                <el-option
-                  v-for="item in options[item.clickFuc]"
-                  :key="item.code"
-                  :label="item.label"
-                  :value="item.code"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)"
-                          class="query-form-item"
-                          :label="item.columnDesc+`:`">
-              <el-date-picker
-                :picker-options="pickerOptions"
-                v-model="actDateRange"
-                type="daterange"
-                format="yyyy 年 MM 月 dd 日"
-                value-format="yyyy-MM-dd"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-              ></el-date-picker>
-            </el-form-item>
-            <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)"
-                          class="query-form-item"
-                          :label="item.columnDesc+`:`">
-              <el-date-picker
-                v-model="filterQuery[item.columnName]"
-                :style="`width:${item.width+'px'}`"
-                value-format="yyyy-MM-dd"
-                :disabled="executeEval(null,item.disabledFuc,false)"
-                type="date"
-                :placeholder="item.columnDesc"
-              ></el-date-picker>
-            </el-form-item>
-          </template>
-        </el-row>
-      </el-form>
-      <div class="top-right-btn">
-        <el-button-group>
-          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
-          <el-button
-            type="primary"
-            icon="el-icon-refresh"
-            @click="onReset"
-          >重置
-          </el-button>
-          <el-button type="primary" icon="el-icon-search" @click="onSubmit"
-          >查询
-          </el-button
-          >
-          <el-button type="primary" icon="el-icon-position" @click="bindWorkPlace"
-          >绑定工位
-          </el-button
-          >
-        </el-button-group>
-      </div>
-      <el-divider style="margin: 15px"></el-divider>
-      <el-table v-loading="loading" :data="list" style="width: 100%;" border highlight-current-row
-                @row-click="(row) => executeFuc(row,'0',tableObj.handleChangeFuc)" ref="multipleTable"
-                :default-sort="defaultSort"
-                :row-style="{ height: '32px' }"
-                @selection-change="handleSelectionChange"
-                @sort-change="handleSortChange">
-        <template v-for="(item, index) in tableHeader">
-          <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' && 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>
-        </template>
-      </el-table>
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :limit.sync="filterQuery.limit"
-        :page.sync="filterQuery.page"
-        @pagination="handleCurrentChange"
-      ></pagination>
-    </el-card>
+
     <el-tabs type="border-card" style="margin: 15px">
-      <el-tab-pane label="单据详情">
-        <prescribeOriginDiPanel
-          v-if="panelALive"
-          :prescribeData="curRow"
-        ></prescribeOriginDiPanel>
-      </el-tab-pane>
-      <!--      <el-tab-pane label="原始处方明细">-->
-      <!--        <prescribeOriginPanel-->
-      <!--          v-if="panelALive"-->
-      <!--          :prescribeData="curRow"-->
-      <!--        ></prescribeOriginPanel>-->
-      <!--      </el-tab-pane>-->
-    </el-tabs>
 
+      <el-tab-pane label="未分配工位单据">
+        <CollectOrderAllotComponents
+          style="margin: -15px"
+          :tagStatus="'0'"
+        ></CollectOrderAllotComponents>
+      </el-tab-pane>
 
-    <el-dialog
-      title="绑定工位"
-      :visible.sync="bindWorkPlaceVisible"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      v-if="bindWorkPlaceVisible"
-      width="65%"
-      append-to-body
-    >
-      <bindWorkDialog
-        :prescribeList="this.multiplePreSelection"
-        :closeDialog="this.closeDialog"
-      ></bindWorkDialog>
-    </el-dialog>
+      <el-tab-pane label="已分配工位单据">
+        <CollectOrderAllotComponents style="margin: -15px"
+                                     :tagStatus="'1'"
+        ></CollectOrderAllotComponents>
+      </el-tab-pane>
 
+    </el-tabs>
 
   </div>
 </template>
 
 <script>
-import addOrder from "@/views/inout/DialogCreateOrder";
-import errOrder from "@/views/inout/IoCreateErrorOrder";
-import {executeFuc, getHead} from "@/utils/customConfig";
-import {convertDate} from "@/utils/date";
-import {page as prescribePage, deleteDataByCode} from "@/api/basic/sicker/prescribeApi";
-import bindWorkDialog from "@/views/collect/bindWorkDialog";
-import prescribeOriginPanel from "./PannelOrderBiz";
-import prescribeOriginDiPanel from "./PannelOrderBiz";
-import {filterWorkOptimize} from "@/api/basic/sysWorkplaceManage";
-import {deleteByOrder, orderPage} from "@/api/collect/collectOrder";
 
+import CollectOrderAllotComponents from "./CollectOrderAllotComponents.vue";
+
+
+/**
+ * 已完成处方
+ */
 export default {
-  name: "prescribePanel",
+  name: "PrescribeTagCode",
+  components: {
+    CollectOrderAllotComponents
+  },
   data() {
     return {
       isLinkDisabled: false,
-      userInfo:{
+      userInfo: {
         inv: this.$store.getters.locInvName,
         deptName: this.$store.getters.locDeptName,
         userName: this.$store.getters.name,
         companyName: this.$store.getters.companyName,
       },
-      //界面配置相关
-      //患者处方
-      tableHeader: [],
-      queryList: [],
-      tableObj: [],
-      fromList: [],
-      //处方明细
-      tableHeader1: [],
-      queryList1: [],
-      tableObj1: [],
-      fromList1: [],
-      //处方使用耗材明细
-      tableHeader2: [],
-      queryList2: [],
-      tableObj2: [],
-      fromList2: [],
-      convertDateFun: convertDate,
-      //界面配置-------------end
-
-      showSearch: true,
-      filterQuery: {
-        billNo: null,
-        page: 1,
-        limit: 10,
-      },
-      defaultSort: {prop: 'createTime', order: 'desc'},
-      loading: false,
-      list: [],
-      total: 0,
-      deleteData: {},
-      preLoading: false,
-      preDetailList: [],
-      preTotal: 0,
-      preQuery: {
-        prescribeCode: null,
-        page: 1,
-        limit: 10,
-      },
-
-      preDiLoading: false,
-      preDiDetailList: [],
-      preDiTotal: 0,
-      preDiQuery: {
-        prescribeCode: null,
-        page: 1,
-        limit: 10,
-      },
-
-      bindWorkPlaceVisible: false,
-      multiplePreSelection: [],
-      curRow: null,
-      panelALive: false,
-
-      options: {
-        findWorkPlace: [],
-      },
     }
   },
-
-  components: {
-    addOrder, errOrder, bindWorkDialog, prescribeOriginPanel, prescribeOriginDiPanel
-  },
-  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();
-    },
-    ///界面配置相关------------end
-
-
-    hideSearch() {
-      this.showSearch = !this.showSearch;
-    },
-    onReset() {
-      this.filterQuery = {};
-      this.actDateRange = [];
-      this.getList();
-    },
-
-    bindWorkPlace() {
-      if (this.multiplePreSelection.length == 0) {
-        this.$message.warning('请先选择处方!');
-        return
-      }
-      this.bindWorkPlaceVisible = true;
-
-    },
-
-    closeDialog() {
-      this.bindWorkPlaceVisible = false;
-      this.getList();
-    },
-    onSubmit() {
-      this.filterQuery.page = 1;
-      this.getList();
-    },
-
-    getList() {
-      this.loading = true;
-      orderPage(this.filterQuery).then(res => {
-        this.loading = false
-        this.list = res.data.list || []
-        this.total = res.data.total || 0
-      }).catch(() => {
-        this.loading = false
-        this.list = []
-        this.total = 0
-      })
-    },
-    handleCurrentChange(val) {
-      this.filterQuery.page = val.page;
-      this.getList();
-    },
-
-    prescribeClick(_this, row) {
-      _this.curRow = row;
-      _this.refreshCodesPanel(_this);
-    },
-    refreshCodesPanel(_this) {
-      _this.panelALive = false;
-      _this.$nextTick(() => {
-        _this.panelALive = true;
-      });
-    },
-
-    deleteDialog(_this, row) {
-      _this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          _this.deleteOrders(row.code);
-        })
-        .catch(() => {
-        });
-    },
-    deleteOrders(data) {
-      this.loading = true;
-      this.deleteData.billNo = data;
-      deleteByOrder(this.deleteData)
-        .then((response) => {
-          if (response.code == 20000) {
-            this.getList();
-            this.$message({
-              type: "success",
-              message: "删除成功！",
-            });
-          } else if (response.code == 520) {
-            this.$message.error(response.message);
-            this.getList();
-          } else {
-            this.$message.error(response.message);
-            this.getList();
-          }
-
-        })
-        .catch(() => {
-        });
-    },
-
-    handleSelectionChange(val) {
-      this.multiplePreSelection = val;
-    },
-
-    findWorkPlace(_this, val) {
-      let query = {
-        invCode: _this.$store.getters.locInvCode,
-        key: val,
-        page: 1,
-        limit: 10,
-      }
-      filterWorkOptimize(query)
-        .then((response) => {
-          _this.loading = false;
-          _this.options.findWorkPlace = response.data || [];
-        })
-        .catch(() => {
-          _this.loading = false;
-          _this.options.findWorkPlace = [];
-        });
-    },
-
-  },
   created() {
     if (this.$route.query.workplaceId != null){
       this.isLinkDisabled = true
     }
-    getHead("prescribeAllot", "1").then((re) => {
-      // 处理返回的数据
-      this.tableObj = re.data;
-      this.tableHeader = re.data.tableList;
-      this.queryList = re.data.queryList;
-      this.fromList = re.data.fromList;
-      this.getList();
-    });
-
-
   }
-
 }
 </script>
+
 <style scoped>
-.query-form {
-  display: flex;
-  flex-wrap: wrap;
-  width: 100%;
-}
 
-.query-form-item {
-  margin-right: 5px;
-  margin-bottom: 6px;
-}
 </style>
diff --git a/src/views/collect/CollectOrderAllotComponents.vue b/src/views/collect/CollectOrderAllotComponents.vue
new file mode 100644
index 00000000..c53e4a3a
--- /dev/null
+++ b/src/views/collect/CollectOrderAllotComponents.vue
@@ -0,0 +1,511 @@
+<template>
+  <div>
+
+    <el-card>
+      <el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form"
+               size="mini" label-width="100px">
+        <el-row style=" display:flex;  flex-wrap: wrap; ">
+          <template v-for="(item, index) in queryList">
+            <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
+                          class="query-form-item"
+                          :label="item.columnDesc+`:`" :key="item.id">
+              <el-input
+                v-model="filterQuery[item.columnName]"
+                :placeholder="item.columnDesc"
+                :disabled="executeEval(null,item.disabledFuc,false)"
+                @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"
+                          class="query-form-item"
+                          :label="item.columnDesc+`:`">
+              <el-select v-model="filterQuery[item.columnName]"
+                         :placeholder="item.columnDesc"
+                         :disabled="executeEval(null,item.disabledFuc,false)"
+                         clearable>
+                <el-option
+                  v-for="dict in item.lableRuleObj"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)"
+                          class="query-form-item"
+                          :label="item.columnDesc+`:`">
+              <el-select
+                v-model="filterQuery[item.columnName]"
+                :placeholder="item.columnDesc"
+                @change="executeFuc($event,'5',item.checkRules)"
+                :disabled="executeEval(null,item.disabledFuc,false)"
+                filterable
+                remote
+                :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
+                clearable>
+                <el-option
+                  v-for="item in options[item.clickFuc]"
+                  :key="item.code"
+                  :label="item.label"
+                  :value="item.code"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)"
+                          class="query-form-item"
+                          :label="item.columnDesc+`:`">
+              <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="actDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              ></el-date-picker>
+            </el-form-item>
+            <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)"
+                          class="query-form-item"
+                          :label="item.columnDesc+`:`">
+              <el-date-picker
+                v-model="filterQuery[item.columnName]"
+                :style="`width:${item.width+'px'}`"
+                value-format="yyyy-MM-dd"
+                :disabled="executeEval(null,item.disabledFuc,false)"
+                type="date"
+                :placeholder="item.columnDesc"
+              ></el-date-picker>
+            </el-form-item>
+          </template>
+        </el-row>
+      </el-form>
+      <div class="top-right-btn">
+        <el-button-group>
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh"
+            @click="onReset"
+          >重置
+          </el-button>
+          <el-button type="primary" icon="el-icon-search" @click="onSubmit"
+          >查询
+          </el-button
+          >
+          <el-button type="primary" icon="el-icon-position" @click="bindWorkPlace"
+          >绑定工位
+          </el-button
+          >
+        </el-button-group>
+      </div>
+      <el-divider style="margin: 15px"></el-divider>
+      <el-table v-loading="loading" :data="list" style="width: 100%;" border highlight-current-row
+                @row-click="(row) => executeFuc(row,'0',tableObj.handleChangeFuc)" ref="multipleTable"
+                :default-sort="defaultSort"
+                :row-style="{ height: '32px' }"
+                @selection-change="handleSelectionChange"
+                @sort-change="handleSortChange">
+        <template v-for="(item, index) in tableHeader">
+          <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' && 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>
+        </template>
+      </el-table>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :limit.sync="filterQuery.limit"
+        :page.sync="filterQuery.page"
+        @pagination="handleCurrentChange"
+      ></pagination>
+    </el-card>
+    <el-tabs type="border-card" style="margin: 15px">
+      <el-tab-pane label="单据详情">
+        <prescribeOriginDiPanel
+          v-if="panelALive"
+          :prescribeData="curRow"
+        ></prescribeOriginDiPanel>
+      </el-tab-pane>
+      <!--      <el-tab-pane label="原始处方明细">-->
+      <!--        <prescribeOriginPanel-->
+      <!--          v-if="panelALive"-->
+      <!--          :prescribeData="curRow"-->
+      <!--        ></prescribeOriginPanel>-->
+      <!--      </el-tab-pane>-->
+    </el-tabs>
+
+
+    <el-dialog
+      title="绑定工位"
+      :visible.sync="bindWorkPlaceVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="bindWorkPlaceVisible"
+      width="65%"
+      append-to-body
+    >
+      <bindWorkDialog
+        :prescribeList="this.multiplePreSelection"
+        :closeDialog="this.closeDialog"
+      ></bindWorkDialog>
+    </el-dialog>
+
+
+  </div>
+</template>
+
+<script>
+import addOrder from "@/views/inout/DialogCreateOrder";
+import errOrder from "@/views/inout/IoCreateErrorOrder";
+import {executeFuc, getHead} from "@/utils/customConfig";
+import {convertDate} from "@/utils/date";
+import {page as prescribePage, deleteDataByCode} from "@/api/basic/sicker/prescribeApi";
+import bindWorkDialog from "@/views/collect/bindWorkDialog";
+import prescribeOriginPanel from "./PannelOrderBiz";
+import prescribeOriginDiPanel from "./PannelOrderBiz";
+import {filterWorkOptimize} from "@/api/basic/sysWorkplaceManage";
+import {deleteByOrder, orderPage} from "@/api/collect/collectOrder";
+
+export default {
+  name: "prescribePanel",
+  props: {
+    tagStatus: {
+      type: String,
+      required: true
+    },
+  },
+  data() {
+    return {
+      isLinkDisabled: false,
+      userInfo:{
+        inv: this.$store.getters.locInvName,
+        deptName: this.$store.getters.locDeptName,
+        userName: this.$store.getters.name,
+        companyName: this.$store.getters.companyName,
+      },
+      //界面配置相关
+      //患者处方
+      tableHeader: [],
+      queryList: [],
+      tableObj: [],
+      fromList: [],
+      //处方明细
+      tableHeader1: [],
+      queryList1: [],
+      tableObj1: [],
+      fromList1: [],
+      //处方使用耗材明细
+      tableHeader2: [],
+      queryList2: [],
+      tableObj2: [],
+      fromList2: [],
+      convertDateFun: convertDate,
+      //界面配置-------------end
+
+      showSearch: true,
+      filterQuery: {
+        billNo: null,
+        tagStatus: null,
+        page: 1,
+        limit: 10,
+      },
+      defaultSort: {prop: 'createTime', order: 'desc'},
+      loading: false,
+      list: [],
+      total: 0,
+      deleteData: {},
+      preLoading: false,
+      preDetailList: [],
+      preTotal: 0,
+      preQuery: {
+        prescribeCode: null,
+        page: 1,
+        limit: 10,
+      },
+
+      preDiLoading: false,
+      preDiDetailList: [],
+      preDiTotal: 0,
+      preDiQuery: {
+        prescribeCode: null,
+        page: 1,
+        limit: 10,
+      },
+
+      bindWorkPlaceVisible: false,
+      multiplePreSelection: [],
+      curRow: null,
+      panelALive: false,
+
+      options: {
+        findWorkPlace: [],
+      },
+    }
+  },
+
+  components: {
+    addOrder, errOrder, bindWorkDialog, prescribeOriginPanel, prescribeOriginDiPanel
+  },
+  methods: {
+    linkPage(_this,row) {
+
+      let url = window.location.origin + `#/dept/use/prescribeDir/prescribe/tagCode` + `?billNo=` + row.billNo
+      window.open(url, '_blank');
+    },
+    //界面配置相关------------
+    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
+
+
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    onReset() {
+      this.filterQuery = {};
+      this.actDateRange = [];
+      this.getList();
+    },
+
+    bindWorkPlace() {
+      if (this.multiplePreSelection.length == 0) {
+        this.$message.warning('请先选择处方!');
+        return
+      }
+      this.bindWorkPlaceVisible = true;
+
+    },
+
+    closeDialog() {
+      this.bindWorkPlaceVisible = false;
+      this.getList();
+    },
+    onSubmit() {
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+
+    getList() {
+      this.loading = true;
+      orderPage(this.filterQuery).then(res => {
+        this.loading = false
+        this.list = res.data.list || []
+        this.total = res.data.total || 0
+      }).catch(() => {
+        this.loading = false
+        this.list = []
+        this.total = 0
+      })
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getList();
+    },
+
+    prescribeClick(_this, row) {
+      _this.curRow = row;
+      _this.refreshCodesPanel(_this);
+    },
+    refreshCodesPanel(_this) {
+      _this.panelALive = false;
+      _this.$nextTick(() => {
+        _this.panelALive = true;
+      });
+    },
+
+    deleteDialog(_this, row) {
+      _this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          _this.deleteOrders(row.code);
+        })
+        .catch(() => {
+        });
+    },
+    deleteOrders(data) {
+      this.loading = true;
+      this.deleteData.billNo = data;
+      deleteByOrder(this.deleteData)
+        .then((response) => {
+          if (response.code == 20000) {
+            this.getList();
+            this.$message({
+              type: "success",
+              message: "删除成功！",
+            });
+          } else if (response.code == 520) {
+            this.$message.error(response.message);
+            this.getList();
+          } else {
+            this.$message.error(response.message);
+            this.getList();
+          }
+
+        })
+        .catch(() => {
+        });
+    },
+
+    handleSelectionChange(val) {
+      this.multiplePreSelection = val;
+    },
+
+    findWorkPlace(_this, val) {
+      let query = {
+        invCode: _this.$store.getters.locInvCode,
+        key: val,
+        page: 1,
+        limit: 10,
+      }
+      filterWorkOptimize(query)
+        .then((response) => {
+          _this.loading = false;
+          _this.options.findWorkPlace = response.data || [];
+        })
+        .catch(() => {
+          _this.loading = false;
+          _this.options.findWorkPlace = [];
+        });
+    },
+
+  },
+  created() {
+    if (this.$route.query.workplaceId != null){
+      this.isLinkDisabled = true
+    }
+    getHead("prescribeAllot", "1").then((re) => {
+      // 处理返回的数据
+      this.tableObj = re.data;
+      this.tableHeader = re.data.tableList;
+      this.queryList = re.data.queryList;
+      this.fromList = re.data.fromList;
+      this.getList();
+    });
+    this.filterQuery.tagStatus = this.tagStatus
+
+  }
+
+}
+</script>
+<style scoped>
+.query-form {
+  display: flex;
+  flex-wrap: wrap;
+  width: 100%;
+}
+
+.query-form-item {
+  margin-right: 5px;
+  margin-bottom: 6px;
+}
+</style>
diff --git a/src/views/collect/CollectOrderNew.vue b/src/views/collect/CollectOrderNew.vue
index 6cc3e82f..65d0faa3 100644
--- a/src/views/collect/CollectOrderNew.vue
+++ b/src/views/collect/CollectOrderNew.vue
@@ -248,6 +248,12 @@ import {filterWorkOptimize} from "@/api/basic/sysWorkplaceManage";
 
 export default {
   name: "prescribePanel",
+  props: {
+    tagStatus: {
+      type: Number,
+      required: true
+    },
+  },
   data() {
     return {
 
@@ -419,6 +425,7 @@ export default {
       this.fromList = re.data.fromList;
       this.getList();
     });
+    this.filterQuery.tagStatus = this.tagStatus
   }
 
 }
diff --git a/src/views/collect/CollectOrderNewParent.vue b/src/views/collect/CollectOrderNewParent.vue
new file mode 100644
index 00000000..55408085
--- /dev/null
+++ b/src/views/collect/CollectOrderNewParent.vue
@@ -0,0 +1,43 @@
+<template>
+  <div>
+
+
+    <el-tabs type="border-card" style="margin: 15px">
+
+      <el-tab-pane label="未处理单据">
+        <CollectOrderNew
+          style="margin: -15px"
+          :tagStatus="'0'"
+        ></CollectOrderNew>
+      </el-tab-pane>
+
+      <el-tab-pane label="异常单据">
+        <CollectOrderNew style="margin: -15px"
+                         :tagStatus="'4'"
+        ></CollectOrderNew>
+      </el-tab-pane>
+
+    </el-tabs>
+
+  </div>
+</template>
+
+<script>
+
+import CollectOrderNew from "./CollectOrderNew.vue";
+
+
+/**
+ * 已完成处方
+ */
+export default {
+  name: "PrescribeTagCode",
+  components: {
+    CollectOrderNew
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/collect/PanelOrderDeal.vue b/src/views/collect/PanelOrderDeal.vue
index 9e99ed8c..3ab316e7 100644
--- a/src/views/collect/PanelOrderDeal.vue
+++ b/src/views/collect/PanelOrderDeal.vue
@@ -272,6 +272,7 @@ export default {
       showSearch: true,
       filterQuery: {
         billNo: null,
+        tagStatusList: [-1,2],
         page: 1,
         limit: 10,
       },