diff --git a/src/api/collect/collectOrder.js b/src/api/collect/collectOrder.js
index e601c6b3..2f07ef47 100644
--- a/src/api/collect/collectOrder.js
+++ b/src/api/collect/collectOrder.js
@@ -190,6 +190,24 @@ export function errorHandle(query) {
   });
 }
 
+
+//已完成单
+export function orderFinish(query) {
+  return axios({
+    url: "/udiwms/basic/collect/orderFinish/filter",
+    method: "get",
+    params: query
+  });
+}
+//已完成单明细
+export function getDetail(query) {
+  return axios({
+    url: "/udiwms/basic/collect/orderFinish/detail",
+    method: "get",
+    params: query
+  });
+}
+
 export function findFromCorp(query) {
   return axios({
     url: "/udiwms/basic/collect/fromCorp",
diff --git a/src/views/basic/product/drug/chooseHouseDrug.vue b/src/views/basic/product/drug/chooseHouseDrug.vue
index 980baea7..a63484a2 100644
--- a/src/views/basic/product/drug/chooseHouseDrug.vue
+++ b/src/views/basic/product/drug/chooseHouseDrug.vue
@@ -29,6 +29,12 @@
           </el-col>
         </el-row>
         <el-row>
+          <el-col :span="6">
+            <el-form-item label="医保编码:">
+              <el-input v-model="erpQuery.ybbm" style="width: 90%" clearable="true" placeholder="请输入医保编码"
+                        ></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="6">
             <el-form-item label="生产企业:">
               <el-input v-model="erpQuery.manufactory" style="width: 90%" clearable="true" placeholder="请输入生产企业"
diff --git a/src/views/basic/workplace/workplaceManage.vue b/src/views/basic/workplace/workplaceManage.vue
index 44175011..0b637ecd 100644
--- a/src/views/basic/workplace/workplaceManage.vue
+++ b/src/views/basic/workplace/workplaceManage.vue
@@ -251,7 +251,7 @@
                     <span>{{ isPopulars[scope.row.isPopular] }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column label="顺序号" prop="number" width="100"></el-table-column>
+                <el-table-column label="业务顺号" prop="number" width="100"></el-table-column>
                 <el-table-column label="备注:" prop="remark" width="100"></el-table-column>
                 <!--                <el-table-column label="往来单位类型" prop="corpType" width="100">-->
                 <!--                  <template slot-scope="scope">-->
diff --git a/src/views/collect/CollectFinishOrderBackupDetail.vue b/src/views/collect/CollectFinishOrderBackupDetail.vue
new file mode 100644
index 00000000..aca1aff8
--- /dev/null
+++ b/src/views/collect/CollectFinishOrderBackupDetail.vue
@@ -0,0 +1,335 @@
+<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-dialog
+      title="扫码替换"
+      :visible.sync="codeReplaceVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="codeReplaceVisible"
+      width="60%"
+      append-to-body
+    >
+      <DialogReplaceCode
+        :prescribeData="bizData"
+        :closeDialog="closeScanDialog"
+      ></DialogReplaceCode>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import {convertDate} from "@/utils/date";
+import {executeFuc, getHead} from "@/utils/customConfig";
+import { allDetail, codeRemove, getDetail } from '@/api/collect/collectOrder'
+import DialogReplaceCode from "./DialogReplaceCode.vue";
+
+/**
+ * 原始处方明细
+ */
+export default {
+  name: "CollectFinishOrderBackupDetail",
+  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,
+      codeReplaceVisible: false,
+      bizData: null,
+
+    }
+  },
+  components: {DialogReplaceCode},
+
+  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;
+      getDetail(_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("数据加载失败")
+      })
+    },
+
+    codePlaceClick(_this, row) {
+      _this.bizData = row
+      _this.codeReplaceVisible = true;
+    },
+
+    closeScanDialog() {
+      this.getPrescribeDetail(this);
+      this.codeReplaceVisible = false;
+    },
+
+
+    rowStyle({row, rowIndex}) {
+      let rowBackground = {};
+      if (this.$isBlank(row.finishUdiCode)) {
+        rowBackground.color = '#f60303';
+      }
+
+      rowBackground.height = "38px"
+      return rowBackground;
+    },
+
+  },
+  created() {
+    if (this.tableHeader1 == null || this.tableHeader1.length == 0) {
+      getHead("FinishOrderDetail", "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>
diff --git a/src/views/collect/CollectOrderUpload.vue b/src/views/collect/CollectOrderUpload.vue
index 5d17d358..00574431 100644
--- a/src/views/collect/CollectOrderUpload.vue
+++ b/src/views/collect/CollectOrderUpload.vue
@@ -2,27 +2,29 @@
   <div>
 
 
-    <el-tabs type="border-card" style="margin: 15px">
-
-      <el-tab-pane label="未上传单">
+    <el-tabs type="border-card" style="margin: 15px" @tab-click="handleTabClick">
+      <el-tab-pane label="未上传单" >
         <prescribePanel
+          ref="prescribePanel1"
           style="margin: -15px"
           :tagStatus="3"
           :RowType="type"
           :workPlaceCode="workPlaceCode"
+          :buttonType="1"
+          :uploadStatus="1"
         ></prescribePanel>
       </el-tab-pane>
-      <el-tab-pane label="已上传单">
+      <el-tab-pane label="已上传单" name="second">
         <prescribePanel
+          ref="prescribePanel2"
           style="margin: -15px"
-          :tagStatus="6"
+          :tagStatus="3"
           :RowType="type"
           :workPlaceCode="workPlaceCode"
+          :buttonType="2"
+          :uploadStatus="2"
         ></prescribePanel>
       </el-tab-pane>
-
-
-
     </el-tabs>
 
 
@@ -47,11 +49,23 @@ export default {
       workPlaceCode: null,
     }
   },
+  methods: {
+    handleTabClick(tab){
+      if (tab.name === 'second') {
+        if (this.$refs.prescribePanel2) {
+          this.$refs.prescribePanel2.getList();
+        }
+      }else {
+        this.$refs.prescribePanel1.getList();
+      }
+    }
+  },
   created() {
     if (this.$route.query.workplaceId != null){
       this.workPlaceCode = Number(this.$route.query.workplaceId);
     }
   }
+
 }
 </script>
 
diff --git a/src/views/collect/PanelOrderEndSearch.vue b/src/views/collect/PanelOrderEndSearch.vue
index 48081e58..5ccb6472 100644
--- a/src/views/collect/PanelOrderEndSearch.vue
+++ b/src/views/collect/PanelOrderEndSearch.vue
@@ -240,10 +240,10 @@
         ></prescribeCodePanel>
       </el-tab-pane>
       <el-tab-pane label="整单详情">
-        <CollectFinishOrderDetail
+        <CollectFinishOrderBackupDetail
           v-if="panelALive"
           :prescribeData="curRow"
-        ></CollectFinishOrderDetail>
+        ></CollectFinishOrderBackupDetail>
       </el-tab-pane>
 
 
@@ -262,8 +262,9 @@ import prescribeCodePanel from './PanelOrderTagCode'
 import PanelOrderManuTagCode from './PanelOrderManuTagCode'
 import prescribeOriginPanel from '@/views/collect/PannelOrderBiz'
 import CollectFinishOrderDetail from '@/views/collect/CollectFinishOrderDetail'
+import CollectFinishOrderBackupDetail from "./CollectFinishOrderBackupDetail"
 
-import { orderPage } from '@/api/collect/collectOrder'
+import { orderFinish, orderPage } from '@/api/collect/collectOrder'
 import { filterWorkOptimize } from '@/api/basic/workPlace/sysWorkplaceManage'
 import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
 
@@ -340,7 +341,7 @@ export default {
   },
 
   components: {
-    addOrder, errOrder, prescribeCodePanel, prescribeOriginPanel, PanelOrderManuTagCode, CollectFinishOrderDetail
+    addOrder, errOrder, prescribeCodePanel, prescribeOriginPanel, PanelOrderManuTagCode, CollectFinishOrderDetail,CollectFinishOrderBackupDetail
   },
   methods: {
     changePlace(_this,query) {
@@ -404,7 +405,7 @@ export default {
 
     getList() {
       this.loading = true
-      orderPage(this.filterQuery).then(res => {
+      orderFinish(this.filterQuery).then(res => {
         this.loading = false
         this.list = res.data.list || []
         this.total = res.data.total || 0
diff --git a/src/views/collect/PanelOrderUpload.vue b/src/views/collect/PanelOrderUpload.vue
index c6d3f5e1..351c19f3 100644
--- a/src/views/collect/PanelOrderUpload.vue
+++ b/src/views/collect/PanelOrderUpload.vue
@@ -240,10 +240,10 @@
         ></prescribeCodePanel>
       </el-tab-pane>
       <el-tab-pane label="整单详情">
-        <PanelOrderAllDetail
+        <CollectFinishOrderBackupDetail
           v-if="panelALive"
           :prescribeData="curRow"
-        ></PanelOrderAllDetail>
+        ></CollectFinishOrderBackupDetail>
       </el-tab-pane>
 
 
@@ -262,8 +262,9 @@ import prescribeCodePanel from './PanelOrderTagCode'
 import PanelOrderManuTagCode from './PanelOrderManuTagCode'
 import prescribeOriginPanel from '@/views/collect/PannelOrderBiz'
 import PanelOrderAllDetail from '@/views/collect/PanelOrderAllDetail'
+import CollectFinishOrderBackupDetail from "./CollectFinishOrderBackupDetail"
 
-import { orderPage,orderUpload } from '@/api/collect/collectOrder'
+import { orderFinish, orderPage, orderUpload } from '@/api/collect/collectOrder'
 import { filterWorkOptimize } from '@/api/basic/workPlace/sysWorkplaceManage'
 import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
 
@@ -284,6 +285,16 @@ export default {
       type: Number,
       default: null,
       required: true
+    },
+    buttonType: {
+      type: Number,
+      default: null,
+      required: true
+    },
+    uploadStatus: {
+      type: Object,
+      default: null,
+      required: true
     }
   },
   data() {
@@ -344,7 +355,7 @@ export default {
   },
 
   components: {
-    addOrder, errOrder, prescribeCodePanel, prescribeOriginPanel, PanelOrderManuTagCode, PanelOrderAllDetail
+    addOrder, errOrder, prescribeCodePanel, prescribeOriginPanel, PanelOrderManuTagCode, PanelOrderAllDetail,CollectFinishOrderBackupDetail
   },
   methods: {
     changePlace(_this,query) {
@@ -408,10 +419,11 @@ export default {
 
     getList() {
       this.loading = true
-      orderPage(this.filterQuery).then(res => {
+      orderFinish(this.filterQuery).then(res => {
         this.loading = false
         this.list = res.data.list || []
         this.total = res.data.total || 0
+        this.panelALive = false
       }).catch(() => {
         this.loading = false
         this.list = []
@@ -481,6 +493,10 @@ export default {
   },
   created() {
     this.filterQuery.tagStatus = this.tagStatus
+    this.filterQuery.uploadStatus = this.uploadStatus.toString()
+    if (this.uploadStatus == 2){
+      this.filterQuery.uploadStatusName = '已上传'
+    }
     if (this.$route.query.workplaceId != null) {
       this.isLinkDisabled=true
       this.filterQuery.workPlaceCode = this.$route.query.workplaceId
diff --git a/src/views/system/customConfig/configDetail.vue b/src/views/system/customConfig/configDetail.vue
index d04cdba7..dd5021d4 100644
--- a/src/views/system/customConfig/configDetail.vue
+++ b/src/views/system/customConfig/configDetail.vue
@@ -248,8 +248,8 @@
         </el-row>
         <el-row :gutter="20" class="el-row" type="flex">
           <el-col :span="12" class="el-col">
-            <el-form-item label="是否展示eval表达式" prop="hasPermi" class="query-form-item">
-              <el-input v-model="subData.hasPermi" style="width: 80%" placeholder="请输入是否展示eval表达式"
+            <el-form-item label="是否展示eval表达式" prop="expression" class="query-form-item">
+              <el-input v-model="subData.expression" style="width: 80%" placeholder="请输入是否展示eval表达式"
                         auto-complete="off"></el-input>
             </el-form-item>
           </el-col>