diff --git a/src/api/inout/order.js b/src/api/inout/order.js
index d0ba8c0e..ed108983 100644
--- a/src/api/inout/order.js
+++ b/src/api/inout/order.js
@@ -116,6 +116,15 @@ export function addOrderWeb(query) {
   });
 }
 
+
+export function addDrugOrderWeb(query) {
+  return axios({
+    url: "/warehouse/inout/drug/addOrderWeb",
+    method: "post",
+    data: query
+  });
+}
+
 export function enterCodeWeb(query) {
   return axios({
     url: "/warehouse/inout/enterCode",
diff --git a/src/views/inout/PanelCreateOrderCheckDrug.vue b/src/views/inout/PanelCreateOrderCheckDrug.vue
deleted file mode 100644
index d3cbc541..00000000
--- a/src/views/inout/PanelCreateOrderCheckDrug.vue
+++ /dev/null
@@ -1,416 +0,0 @@
-<template>
-  <div>
-    <el-table v-loading="loading" :data="detailList" style="width: 100%" border
-              :row-style="rowStyle"
-              row-key="id"
-    >
-      <el-table-column label="序号" type="index"></el-table-column>
-      <el-table-column
-        label="药品通用名" width="150"
-        prop="coName"
-        show-overflow-tooltip
-      ></el-table-column>
-      <el-table-column
-        label="包装规格" width="150"
-        prop="spec"
-      ></el-table-column>
-      <el-table-column label="批次号" header-align="center">
-        <el-table-column header-align="center"
-                         label="手录" width="100"
-                         prop="bbatchNo"
-                         show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column header-align="center"
-                         label="扫码"
-                         prop="sbatchNo" width="100"
-                         show-overflow-tooltip
-        ></el-table-column>
-      </el-table-column>
-
-      <el-table-column label="生产日期" header-align="center">
-        <el-table-column header-align="center"
-                         label="手录" width="100"
-                         prop="bproductDate"
-                         show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column header-align="center"
-                         label="扫码" width="100"
-                         prop="sproductDate"
-                         show-overflow-tooltip
-        ></el-table-column>
-      </el-table-column>
-
-      <el-table-column label="失效日期" header-align="center">
-        <el-table-column header-align="center"
-                         label="手录" width="100"
-                         prop="bexpireDate"
-                         show-overflow-tooltip
-        ></el-table-column>
-        <el-table-column header-align="center"
-                         label="扫码" width="100"
-                         prop="sexpireDate"
-                         show-overflow-tooltip
-        ></el-table-column>
-      </el-table-column>
-      <el-table-column label="数量" header-align="center">
-        <el-table-column
-          header-align="center"
-          label="单据数量" width="100"
-          prop="count"
-        ></el-table-column>
-        <el-table-column
-          header-align="center"
-          label="扫码数量" width="100"
-          prop="scanCount"
-        ></el-table-column>
-      </el-table-column>
-
-      <el-table-column
-        label="价格"
-        prop="price" width="100"
-      ></el-table-column>
-      <el-table-column width="100" label="计量单位" prop="measname">
-      </el-table-column>
-      <el-table-column
-        label="生产企业"
-        prop="manufacturer" width="160"
-        show-overflow-tooltip
-      ></el-table-column>
-      <el-table-column
-        label="批准文号" width="160"
-        prop="certCode"
-        show-overflow-tooltip
-      ></el-table-column>
-    </el-table>
-  </div>
-</template>
-
-<script>
-import stockOrderNewSelectProduct from "./DialogSelectProduct";
-import dialogInvProduct from "./DialogSelectInvProduct";
-import {addBizProduct, getDetailBizs, updateBizProduct, delBizProduct} from "@/api/inout/orderDetailCode";
-import {updateBizBind} from "@/api/inout/order";
-import selectRlDialog from "@/views/inout/DialogSelectRl";
-import DialogSelectUnit from "@/views/inout/DialogSelectUnit";
-import {getCheckDetailList} from "@/api/inout/orderDetailBiz";
-
-export default {
-  name: "PanelCreateOrderCheckDrug",
-  props: {
-    idQuery: {
-      type: Object,
-      required: true,
-    },
-    refreshPanel: {
-      type: Function,
-      required: true,
-    },
-    refreshOrder: {
-      type: Function,
-      required: true,
-    },
-    viewType: {
-      type: Object,
-      required: true,
-    },
-    curBustype: {
-      type: Object,
-      required: true,
-    },
-
-  },
-  data() {
-    return {
-      bizType: 1,
-      loading: false,
-      query: {
-        orderId: null,
-        code: "",
-        corpOrderId: "",
-      },
-      detailList: [],
-      total: 0,
-      iCount: 0,
-      selectProductVisible: false,
-      selectInvProductVisible: false,
-      thisData: {},
-      selectedIndex: null,
-      invQueryData: {
-        invCode: null,
-      },
-      selectRlVisible: false,
-      dialogTableVisible: false,
-      curRow: null,
-    };
-  },
-  components: {
-    selectRlDialog, DialogSelectUnit,
-    stockOrderNewSelectProduct,
-    dialogInvProduct,
-  },
-  methods: {
-    getOrderDetails() {
-      this.loading = true;
-      this.query.orderIdFk = this.idQuery.billNo;
-      getCheckDetailList(this.query) //查找该单号下的所有条码
-        .then((response) => {
-          this.detailList = response.data || [];
-          this.total = response.data || 0;
-          this.loading = false;
-        })
-        .catch(() => {
-          this.loading = false;
-          this.detailList = [];
-          this.total = 0;
-        });
-    },
-
-    rowChange(val) {
-      this.currentRow = val;
-      if (this.currentRow.batchNo == '')
-        this.currentRow.batchNo = null;
-      this.selectedIndex = val.index;
-    },
-
-    closeDialog(rData) {
-      this.selectProductVisible = false;
-      this.selectInvProductVisible = false;
-      this.idQuery = rData;
-      this.getOrderDetails();
-    },
-
-    closeDialogC2(rData) {
-      this.idQuery = rData;
-      this.selectInvProductVisible = false;
-      this.getOrderDetails();
-    },
-
-    rowStyle({row, rowIndex}) {
-      let rowBackground = {};
-      if (!this.$isNotBlank(row.supId) || !this.$isNotBlank(row.bindRlFk)) {
-        rowBackground.color = '#f60303';
-        return rowBackground;
-      }
-
-      if (this.viewType == 1)
-        return null;
-
-      if (!row.checkSuccess) {
-        rowBackground.color = '#f60303';
-      }
-      if (row.count != row.scanCount) {
-        rowBackground.color = '#f60303';
-      }
-      return rowBackground;
-    },
-
-    tableRowClassName({row, rowIndex}) {
-      row.index = rowIndex;
-    },
-
-    selectProductFunction() {
-      this.thisData = this.idQuery;
-      if (this.$isBlank(this.idQuery.action)) {
-        this.$message.error("单据类型不能为空！")
-        return;
-      }
-      if (this.$isBlank(this.idQuery.invCode)) {
-        this.$message.error("当前仓库不能为空！");
-        return;
-      }
-
-      if (this.$isBlank(this.idQuery.fromCorp) && this.$isBlank(this.idQuery.fromInvCode)) {
-        this.$message.error("往来信息不能为空！");
-        return;
-      }
-      if (this.curBustype.corpType == 3) {//内部科室
-        this.invQueryData.invCode = this.idQuery.invCode;
-        this.selectInvProductVisible = true;
-      } else if (this.curBustype.corpType == 2) { //供应商信息
-        this.selectProductVisible = true;
-      } else if (this.curBustype.corpType === 1) {//客户信息
-        this.invQueryData.invCode = this.idQuery.invCode;
-        this.selectInvProductVisible = true;
-      }
-
-    },
-
-    saveChange(row) {
-      if (row.batchNo == '') {
-        row.batchNo = null;
-      }
-      updateBizProduct(row)
-        .then((response) => {
-          this.loading = false;
-          if (response.code === 20000) {
-            this.$message.success("保存成功！");
-            this.selectedIndex = null;
-            this.refreshPanel();
-
-          } else {
-            this.$message.error(response.message);
-          }
-        })
-        .catch(() => {
-          this.loading = false;
-          this.dataList = [];
-          this.pageTotal = 0;
-        });
-    },
-
-    copyDetail(row) {
-      let data = {
-        relId: row.bindRlFk,
-        supId: row.supId,
-        zczbhhzbapzbh: row.certCode,
-        orderEntity: this.idQuery,
-      }
-      this.loading = true;
-      addBizProduct(data)
-        .then((response) => {
-          this.loading = false;
-          if (response.code === 20000) {
-            this.getOrderDetails();
-          } else {
-            this.$message.error(response.message);
-          }
-        })
-        .catch(() => {
-          this.loading = false;
-          this.dataList = [];
-          this.pageTotal = 0;
-        });
-    },
-
-    deleteDetail(row) {
-      let data = {
-        id: row.id,
-      }
-      this.loading = true;
-      delBizProduct(data)
-        .then((response) => {
-          this.loading = false;
-          if (response.code === 20000) {
-            this.getOrderDetails();
-          } else {
-            this.$message.error(response.message);
-          }
-        })
-        .catch(() => {
-          this.loading = false;
-          this.dataList = [];
-          this.pageTotal = 0;
-        });
-    },
-    bindRl(val) {
-      this.curRow = val;
-      this.selectRlVisible = true;
-    },
-
-    handleUnitClick(row) {
-      this.curRow = row;
-      this.dialogTableVisible = true;
-    },
-
-    selectBindRl(row) {
-      let query = {
-        id: this.curRow.id,
-        bindRlFk: row.id,
-      };
-      updateBizBind(query).then((response) => {
-          if (response.code == 20000) {
-            this.$message.success("绑定成功");
-            this.getOrderDetails();
-          } else
-            this.$message.error(response.message);
-        }
-      ).catch(() => {
-
-      });
-    },
-
-    selectSupUnit(row) {
-      let query = {
-        id: this.curRow.id,
-        supId: row.erpId,
-      };
-      updateBizBind(query).then((response) => {
-        if (response.code == 20000) {
-          this.$message.success("绑定成功");
-          this.getOrderDetails();
-        } else {
-          this.$message.error(response.message);
-        }
-      }).catch(() => {
-      });
-    }
-    ,
-
-
-    closeBindDialog() {
-      this.selectRlVisible = false;
-      this.dialogTableVisible = false;
-      this.refreshPanel();
-    }
-    ,
-  }
-  ,
-  filters: {}
-  ,
-
-  watch: {
-    'idQuery.billNo':
-      {
-        handler() {
-          this.refreshOrder(this.idQuery);
-        }
-        ,
-      }
-  }
-  ,
-
-  mounted() {
-    document.body.ondrop = function (event) {
-      event.preventDefault();
-      event.stopPropagation();
-    };
-  }
-  ,
-  created() {
-    if (this.idQuery.billNo != null)
-      this.getOrderDetails();
-  }
-  ,
-}
-;
-</script>
-<style scoped>
-.el-table_fixed, el-table__fixed-right {
-  height: 80% !important;
-}
-
-.el-table__fixed-body-wrapper {
-  height: 80% !important;
-}
-
-
-.ao-text {
-  width: 100%;
-  font-size: 13px;
-  font-family: "Microsoft YaHei";
-  float: right;
-  text-align: right;
-  margin-top: 10px;
-}
-
-/**
-解决el-input输入框 type=number时，输入中文光标上移问题
- */
-.el-input__inner {
-  line-height: 1px !important;
-}
-
-</style>
-
-
-
diff --git a/src/views/inout/split/prescribeAllot.vue b/src/views/inout/split/prescribeAllot.vue
index 1a66bc19..db1e34e8 100644
--- a/src/views/inout/split/prescribeAllot.vue
+++ b/src/views/inout/split/prescribeAllot.vue
@@ -212,7 +212,128 @@
       ></pagination>
     </el-card>
     <el-tabs type="border-card" style="margin: 15px">
-      <el-tab-pane label="处方明细">
+
+      <el-tab-pane label="处方使用耗材明细">
+        <el-table v-loading="preDiLoading" :data="preDiDetailList" style="width: 100%" border>
+          <template v-for="(item, index) in tableHeader2">
+            <el-table-column
+              v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
+              type="index" :label="item.columnDesc"></el-table-column>
+            <el-table-column
+              v-if="item.columnType == 'selection'"
+              type="selection"
+              :width="item.width"
+              :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
+            ></el-table-column>
+
+            <el-table-column
+              v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :sortable="item.sort"
+              :width="item.width"
+              :show-overflow-tooltip="item.tooltip"
+              :key="item.columnName"
+            >
+              <template slot-scope="scope">
+                <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :sortable="item.sort"
+              :width="item.width"
+              :show-overflow-tooltip="item.tooltip"
+              :key="item.columnName"
+            >
+              <template slot-scope="scope">
+                <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{
+                    item.lableRuleObj[scope.row[item.columnName]]
+                  }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :sortable="item.sort"
+              :width="item.width"
+              :show-overflow-tooltip="item.tooltip"
+              :key="item.columnName"
+            >
+              <template slot-scope="scope">
+                <el-tag
+                  :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
+                  <span>{{
+                      item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName]
+                    }}</span>
+                </el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :width="item.width"
+              :key="item.columnName"
+              fixed="right"
+            >
+              <template slot-scope="scope">
+                <el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
+                           :type="buttonItem.type"
+                           :size="buttonItem.size"
+                           :style="buttonItem.style"
+                           :key="buttonItem"
+                           v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
+                           :disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
+                           @click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
+                >{{ buttonItem.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="item.columnType == 'text'  && !(item.columnName == 'productDate' || item.columnName == 'expireDate') && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :sortable="item.sort"
+              :width="item.width"
+              :show-overflow-tooltip="item.tooltip"
+              :key="item.columnName"
+            >
+              <template slot-scope="scope">
+                <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
+                    scope.row[item.columnName]
+                  }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="item.columnType == 'text' && (item.columnName == 'productDate' || item.columnName == 'expireDate') && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :sortable="item.sort"
+              :width="item.width"
+              :show-overflow-tooltip="item.tooltip"
+              :key="item.columnName"
+            >
+              <template slot-scope="scope">
+                <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
+                    convertDateFun(scope.row[item.columnName])
+                  }}</span>
+              </template>
+            </el-table-column>
+          </template>
+        </el-table>
+        <pagination
+          v-show="preDiTotal>0"
+          :total="preDiTotal"
+          :limit.sync="preDiQuery.limit"
+          :page.sync="preDiQuery.page"
+          @pagination="preDiHandleCurrentChange"
+        ></pagination>
+      </el-tab-pane>
+      <el-tab-pane label="原始处方明细">
 
         <el-table v-loading="preLoading" :data="preDetailList" style="width: 100%" border>
           <template v-for="(item, index) in tableHeader1">
@@ -378,6 +499,7 @@ import {convertDate} from "@/utils/date";
 import {detail, page as prescribePage, deleteDataByCode} from "@/api/basic/sicker/prescribeApi";
 import prescribeDownloadDialog from "@/views/inout/split/prescribeDownloadDialog";
 import bindWorkDialog from "@/views/inout/split/bindWorkDialog";
+import {skPrescribeDi} from "@/api/basic/sicker/skPersonApi";
 
 export default {
   name: "prescribePanel",
@@ -395,6 +517,11 @@ export default {
       queryList1: [],
       tableObj1: [],
       fromList1: [],
+      //处方使用耗材明细
+      tableHeader2: [],
+      queryList2: [],
+      tableObj2: [],
+      fromList2: [],
       convertDateFun: convertDate,
       //界面配置-------------end
 
@@ -419,6 +546,15 @@ export default {
         limit: 10,
       },
 
+      preDiLoading: false,
+      preDiDetailList: [],
+      preDiTotal: 0,
+      preDiQuery: {
+        prescribeCode: null,
+        page: 1,
+        limit: 10,
+      },
+
       bindWorkPlaceVisible: false,
       multiplePreSelection: [],
     }
@@ -521,6 +657,25 @@ export default {
         _this.preLoading = false
         _this.$message.error("数据加载失败")
       })
+
+
+      if (row != null) {
+        _this.preDiQuery.page = 1
+        _this.preDiQuery.prescribeCode = row.code
+      }
+      _this.preDiLoading = true;
+      skPrescribeDi(_this.preDiQuery).then(res => {
+        _this.preLoading = false
+        if (res.code != 20000) {
+          _this.$message.error(res.message)
+          return
+        }
+        _this.preDiDetailList = res.data.list
+        _this.preDiLoading = false
+      }).catch(() => {
+        _this.preDiLoading = false
+        _this.$message.error("数据加载失败")
+      })
     },
 
 
@@ -586,6 +741,14 @@ export default {
       this.tableHeader1 = re.data.tableList;
       this.queryList1 = re.data.queryList;
       this.fromList1 = re.data.fromList;
+    });
+
+    getHead("prescribeAllot-2", "1").then((re) => {
+      // 处理返回的数据
+      this.tableObj2 = re.data;
+      this.tableHeader2 = re.data.tableList;
+      this.queryList2 = re.data.queryList;
+      this.fromList2 = re.data.fromList;
       this.getList();
     });
 
diff --git a/src/views/inout/split/prescribeAllotIng.vue b/src/views/inout/split/prescribeAllotIng.vue
new file mode 100644
index 00000000..5bacfe77
--- /dev/null
+++ b/src/views/inout/split/prescribeAllotIng.vue
@@ -0,0 +1,757 @@
+<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-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="处方使用耗材明细">
+        <el-table v-loading="preDiLoading" :data="preDiDetailList" style="width: 100%" border>
+          <template v-for="(item, index) in tableHeader2">
+            <el-table-column
+              v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
+              type="index" :label="item.columnDesc"></el-table-column>
+            <el-table-column
+              v-if="item.columnType == 'selection'"
+              type="selection"
+              :width="item.width"
+              :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
+            ></el-table-column>
+
+            <el-table-column
+              v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :sortable="item.sort"
+              :width="item.width"
+              :show-overflow-tooltip="item.tooltip"
+              :key="item.columnName"
+            >
+              <template slot-scope="scope">
+                <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :sortable="item.sort"
+              :width="item.width"
+              :show-overflow-tooltip="item.tooltip"
+              :key="item.columnName"
+            >
+              <template slot-scope="scope">
+                <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{
+                    item.lableRuleObj[scope.row[item.columnName]]
+                  }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :sortable="item.sort"
+              :width="item.width"
+              :show-overflow-tooltip="item.tooltip"
+              :key="item.columnName"
+            >
+              <template slot-scope="scope">
+                <el-tag
+                  :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
+                  <span>{{
+                      item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName]
+                    }}</span>
+                </el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :width="item.width"
+              :key="item.columnName"
+              fixed="right"
+            >
+              <template slot-scope="scope">
+                <el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
+                           :type="buttonItem.type"
+                           :size="buttonItem.size"
+                           :style="buttonItem.style"
+                           :key="buttonItem"
+                           v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
+                           :disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
+                           @click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
+                >{{ buttonItem.name }}
+                </el-button>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="item.columnType == 'text'  && !(item.columnName == 'productDate' || item.columnName == 'expireDate') && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :sortable="item.sort"
+              :width="item.width"
+              :show-overflow-tooltip="item.tooltip"
+              :key="item.columnName"
+            >
+              <template slot-scope="scope">
+                <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
+                    scope.row[item.columnName]
+                  }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="item.columnType == 'text' && (item.columnName == 'productDate' || item.columnName == 'expireDate') && executeEval(row,item.expression,true)"
+              :prop="item.columnName"
+              :label="item.columnDesc"
+              :sortable="item.sort"
+              :width="item.width"
+              :show-overflow-tooltip="item.tooltip"
+              :key="item.columnName"
+            >
+              <template slot-scope="scope">
+                <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
+                    convertDateFun(scope.row[item.columnName])
+                  }}</span>
+              </template>
+            </el-table-column>
+          </template>
+        </el-table>
+        <pagination
+          v-show="preDiTotal>0"
+          :total="preDiTotal"
+          :limit.sync="preDiQuery.limit"
+          :page.sync="preDiQuery.page"
+          @pagination="preDiHandleCurrentChange"
+        ></pagination>
+      </el-tab-pane>
+      <el-tab-pane label="原始处方明细">
+
+        <el-table v-loading="preLoading" :data="preDetailList" style="width: 100%" border>
+          <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-tab-pane>
+    </el-tabs>
+
+    <el-dialog
+      title="下载处方"
+      :visible.sync="downloadPrescriptionVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="downloadPrescriptionVisible"
+      width="65%"
+      append-to-body
+    >
+      <prescribeDownloadDialog
+        :closeDialog="this.closeDialog"
+      ></prescribeDownloadDialog>
+    </el-dialog>
+
+    <el-dialog
+      title="下载处方"
+      :visible.sync="bindWorkPlaceVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="bindWorkPlaceVisible"
+      width="45%"
+      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 {detail, page as prescribePage, deleteDataByCode} from "@/api/basic/sicker/prescribeApi";
+import prescribeDownloadDialog from "@/views/inout/split/prescribeDownloadDialog";
+import bindWorkDialog from "@/views/inout/split/bindWorkDialog";
+import {skPrescribeDi} from "@/api/basic/sicker/skPersonApi";
+
+export default {
+  name: "prescribePanel",
+  data() {
+    return {
+
+      //界面配置相关
+      //患者处方
+      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,
+      downloadPrescriptionVisible: false,
+      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: [],
+    }
+  },
+
+  components: {
+    addOrder, errOrder, prescribeDownloadDialog, bindWorkDialog
+  },
+  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();
+    },
+    downloadPrescription() {
+      this.downloadPrescriptionVisible = true
+    },
+
+    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;
+      prescribePage(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.getPrescribeDetail(_this, row)
+      this.getCodeDetail(_this, row)
+    },
+
+    getPrescribeDetail(_this, row) {
+      if (row != null) {
+        _this.preQuery.page = 1
+        _this.preQuery.prescribeCode = row.code
+      }
+      _this.preLoading = true;
+      detail(_this.preQuery).then(res => {
+        _this.preLoading = false
+        if (res.code != 20000) {
+          _this.$message.error(res.message)
+          return
+        }
+        _this.preDetailList = res.data.items
+        _this.preLoading = false
+      }).catch(() => {
+        _this.preLoading = false
+        _this.$message.error("数据加载失败")
+      })
+
+
+      if (row != null) {
+        _this.preDiQuery.page = 1
+        _this.preDiQuery.prescribeCode = row.code
+      }
+      _this.preDiLoading = true;
+      skPrescribeDi(_this.preDiQuery).then(res => {
+        _this.preLoading = false
+        if (res.code != 20000) {
+          _this.$message.error(res.message)
+          return
+        }
+        _this.preDiDetailList = res.data.list
+        _this.preDiLoading = false
+      }).catch(() => {
+        _this.preDiLoading = false
+        _this.$message.error("数据加载失败")
+      })
+    },
+
+
+    preHandleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getPrescribeDetail(this, null);
+    },
+
+    deleteDialog(_this, row) {
+      _this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          _this.deleteOrders(row.code);
+        })
+        .catch(() => {
+        });
+    },
+    deleteOrders(data) {
+      this.loading = true;
+      this.deleteData.code = data;
+      deleteDataByCode(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;
+    },
+
+  },
+  created() {
+    getHead("prescribeIng", "1").then((re) => {
+      // 处理返回的数据
+      this.tableObj = re.data;
+      this.tableHeader = re.data.tableList;
+      this.queryList = re.data.queryList;
+      this.fromList = re.data.fromList;
+      this.getList();
+    });
+
+    getHead("prescribeIng-1", "1").then((re) => {
+      // 处理返回的数据
+      this.tableObj1 = re.data;
+      this.tableHeader1 = re.data.tableList;
+      this.queryList1 = re.data.queryList;
+      this.fromList1 = re.data.fromList;
+    });
+
+    getHead("prescribeIng-2", "1").then((re) => {
+      // 处理返回的数据
+      this.tableObj2 = re.data;
+      this.tableHeader2 = re.data.tableList;
+      this.queryList2 = re.data.queryList;
+      this.fromList2 = re.data.fromList;
+      this.getList();
+    });
+
+  }
+
+}
+</script>
+<style scoped>
+
+</style>
diff --git a/src/views/inout/split/prescribeDownload.vue b/src/views/inout/split/prescribeDownload.vue
index 92b47aba..8f3bb7dd 100644
--- a/src/views/inout/split/prescribeDownload.vue
+++ b/src/views/inout/split/prescribeDownload.vue
@@ -211,8 +211,10 @@
       ></pagination>
     </el-card>
     <el-tabs type="border-card" style="margin: 15px">
-      <el-tab-pane label="处方明细">
 
+
+
+      <el-tab-pane label="原始处方明细">
         <el-table v-loading="preLoading" :data="preDetailList" style="width: 100%" border>
           <template v-for="(item, index) in tableHeader1">
             <el-table-column
@@ -334,21 +336,23 @@
         ></pagination>
 
       </el-tab-pane>
+
+
     </el-tabs>
 
-      <el-dialog
-        title="下载处方"
-        :visible.sync="downloadPrescriptionVisible"
-        :close-on-click-modal="false"
-        :close-on-press-escape="false"
-        v-if="downloadPrescriptionVisible"
-        width="65%"
-        append-to-body
-      >
-        <prescribeDownloadDialog
-          :closeDialog="this.closeDialog"
-        ></prescribeDownloadDialog>
-      </el-dialog>
+    <el-dialog
+      title="下载处方"
+      :visible.sync="downloadPrescriptionVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      v-if="downloadPrescriptionVisible"
+      width="65%"
+      append-to-body
+    >
+      <prescribeDownloadDialog
+        :closeDialog="this.closeDialog"
+      ></prescribeDownloadDialog>
+    </el-dialog>
 
   </div>
 </template>
@@ -358,8 +362,9 @@ import addOrder from "@/views/inout/DialogCreateOrder";
 import errOrder from "@/views/inout/IoCreateErrorOrder";
 import {executeFuc, getHead} from "@/utils/customConfig";
 import {convertDate} from "@/utils/date";
-import {detail, page as prescribePage,deleteDataByCode} from "@/api/basic/sicker/prescribeApi";
+import {detail, page as prescribePage, deleteDataByCode} from "@/api/basic/sicker/prescribeApi";
 import prescribeDownloadDialog from "@/views/inout/split/prescribeDownloadDialog";
+import {skPrescribeDi} from "@/api/basic/sicker/skPersonApi";
 
 export default {
   name: "prescribePanel",
@@ -372,7 +377,7 @@ export default {
       queryList: [],
       tableObj: [],
       fromList: [],
-      //处方明细
+      //原始处方明细
       tableHeader1: [],
       queryList1: [],
       tableObj1: [],
@@ -390,8 +395,9 @@ export default {
       loading: false,
       list: [],
       total: 0,
-      downloadPrescriptionVisible:false,
-      deleteData:{},
+      downloadPrescriptionVisible: false,
+      deleteData: {},
+
       preLoading: false,
       preDetailList: [],
       preTotal: 0,
@@ -400,11 +406,13 @@ export default {
         page: 1,
         limit: 10,
       },
+
+
     }
   },
 
   components: {
-    addOrder, errOrder,prescribeDownloadDialog
+    addOrder, errOrder, prescribeDownloadDialog
   },
   methods: {
 
@@ -438,10 +446,10 @@ export default {
       this.actDateRange = [];
       this.getList();
     },
-    downloadPrescription(){
+    downloadPrescription() {
       this.downloadPrescriptionVisible = true
     },
-    closeDialog(){
+    closeDialog() {
       this.downloadPrescriptionVisible = false;
       this.getList();
     },
@@ -490,6 +498,9 @@ export default {
         _this.preLoading = false
         _this.$message.error("数据加载失败")
       })
+
+
+
     },
 
 
@@ -498,7 +509,12 @@ export default {
       this.getPrescribeDetail(this, null);
     },
 
-    deleteDialog(_this,row) {
+    preDiHandleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getPrescribeDetail(this, null);
+    },
+
+    deleteDialog(_this, row) {
       _this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -551,7 +567,6 @@ export default {
       this.tableHeader1 = re.data.tableList;
       this.queryList1 = re.data.queryList;
       this.fromList1 = re.data.fromList;
-      this.getList();
     });
 
   }
diff --git a/src/views/inoutDrug/DialogCreateDrugOrder.vue b/src/views/inoutDrug/DialogCreateDrugOrder.vue
index f3a6d8f6..ca6e60a6 100644
--- a/src/views/inoutDrug/DialogCreateDrugOrder.vue
+++ b/src/views/inoutDrug/DialogCreateDrugOrder.vue
@@ -143,8 +143,7 @@
                 curAction.corpType === 2 ||
                 curAction.corpType === 4 ||
                 (curAction.corpType === 1 && !curAction.genUnit)
-              "
-            >
+              ">
               <el-select
                 v-model="orderFormData.fromCorp"
                 filterable
@@ -324,31 +323,6 @@
 
         </el-row>
         <el-row v-if="preSpaceShow">
-
-          <!--          <el-col :span="11">-->
-          <!--            <el-form-item prop="checkPreInInvCode" label="预验收仓库:">-->
-          <!--              <el-select-->
-          <!--                v-model="orderFormData.checkPreInInvCode"-->
-          <!--                placeholder="预验收仓库"-->
-          <!--                style="width: 90%"-->
-          <!--                :disabled="corpOrderIdDisabled"-->
-          <!--                @change="changePreInInv"-->
-          <!--                filterable-->
-          <!--              >-->
-          <!--                <el-option-->
-          <!--                  v-for="item in curPreInInvOptions"-->
-          <!--                  :key="item.name"-->
-          <!--                  :label="item.name"-->
-          <!--                  :value="item.code"-->
-          <!--                >-->
-          <!--                  <span style="float: left">{{ item.name }}</span>-->
-          <!--                  <span style="float: right; color: #8492a6; font-size: 13px">{{-->
-          <!--                      item.code-->
-          <!--                    }}</span>-->
-          <!--                </el-option>-->
-          <!--              </el-select>-->
-          <!--            </el-form-item>-->
-          <!--          </el-col>-->
           <el-col :span="11">
             <el-form-item prop="preCurSpaceCode" label="寄售出库货位:">
               <el-select
@@ -588,33 +562,30 @@
 <script>
 import {
   submitBiz,
-  addOrderWeb,
   submitCodes,
   submitOrderWeb,
   saveOrderWeb,
-  updateCodeBindSup,
-  enterCodeWeb, submitAllocateBiz, rollbackWaitcheck, submitCodeResult, submitCheckResult, delmitBiz,
-} from "@/api/inout/order";
-import {filterSubAll, findByFrom, findInvByUser} from "@/api/system/invSubWarehouse";
-import {parseTime} from "@/utils/coTools";
-import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
-import editCodeDialog from "./DialogEditCode";
-import DialogCreateOrderSelect from "./DialogCreateOrderSelect";
-
-import checkResultPanel from "./PanelCreateOrderCheckDrug";
-import codesPanel from "./PanelCreateOrderCodesDrug";
-import codeDetailPanel from "./PanelCreateOrderCodeDetail";
-import bizDetailPanel from "./PanelCreateOrderBizDrug";
-import diSkPrescribePanel from "./PanelSkPrescribeDi";
-
-import A from "@/plugins/KeyScaner";
+  submitAllocateBiz, rollbackWaitcheck, submitCodeResult, submitCheckResult, delmitBiz, addDrugOrderWeb,
+} from "../../api/inout/order";
+import {filterSubAll, findByFrom, findInvByUser} from "../../api/system/invSubWarehouse";
+import {parseTime} from "../../utils/coTools";
+import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain";
+import editCodeDialog from "../inout/DialogEditCode";
+import DialogCreateOrderSelect from "../inout/DialogCreateOrderSelect";
+
+import checkResultPanel from "@/views/inoutDrug/PanelCreateOrderCheckDrug";
+import codesPanel from "@/views/inoutDrug/PanelCreateOrderCodesDrug";
+import codeDetailPanel from "@/views/inoutDrug/PanelCreateOrderDetailDrug";
+import bizDetailPanel from "@/views/inoutDrug/PanelCreateOrderBizDrug";
+import diSkPrescribePanel from "@/views/inout/PanelSkPrescribeDi";
+
+import A from "../../plugins/KeyScaner";
 import {findByInvUser, getBusTypeList} from "@/api/basic/busType";
 import {getInvSpaceList} from "@/api/inventory/invSpace";
-import DialogSelectUnit from "./DialogSelectUnit";
-import selectRlDialog from "./DialogSelectRl";
-import DialogSelectSpace from "./DialogSelectSpace";
+import DialogSelectUnit from "../inout/DialogSelectUnit";
+import selectRlDialog from "../inout/DialogSelectRl";
+import DialogSelectSpace from "../inout/DialogSelectSpace";
 import {isBlank} from "@/utils/strUtil";
-import {getDetailBizs} from "@/api/inout/orderDetailCode";
 import {filterNoPage, page, remoteFilter} from "@/api/basic/sicker/skPersonApi";
 import {selectSysParamByKey} from "@/api/param/systemParamConfig";
 import dialogInvProduct from "@/views/inout/DialogSelectInvProduct";
@@ -839,7 +810,6 @@ export default {
       if (this.checkPreInArray != null) {
         this.orderFormData.checkPreInOrders = this.checkPreInArray.join(",");
       }
-      // this.orderFormData.checkPreInOrders = JSON.parse(JSON.stringify(val));
     },
     //仓库改变
     changeInv(row) {
@@ -1209,14 +1179,6 @@ export default {
 
     //添加条码
     addCode(event) {
-      this.originCode = "";
-      this.sictomText = "";
-      this.orderFormData.corpOrderId = this.orderFormData.corpOrderId.trim();
-      this.codeFormData.batchNo = "";
-      this.codeFormData.produceDate = "";
-      this.codeFormData.expireDate = "";
-      this.codeFormData.serialNo = "";
-      this.actionEnable = true;
       if (event == null) {
       } else event.target.select();
       this.$refs.inputRef.select();
@@ -1264,12 +1226,9 @@ export default {
           return;
         }
       }
-
-
       if (this.checkPreInArray != null) {
         this.orderFormData.checkPreInOrders = this.checkPreInArray.join(",");
       }
-
       if (this.$isBlank(this.orderFormData.corpOrderId)) {
         let date = new Date();
         this.orderFormData.corpOrderId =
@@ -1306,7 +1265,7 @@ export default {
 
     //添加条码后提交
     addCodeSubmit(tQuery) {
-      addOrderWeb(tQuery).then((response) => {
+      addDrugOrderWeb(tQuery).then((response) => {
         if (response.code === 20000) {
           this.orderFormData.billNo = response.data.orderId;
           if (response.data.errMsg != null) {
@@ -1690,56 +1649,8 @@ export default {
       }
     },
     enterKey(event) {
-      this.checkSuccess = true;
-      let tQuery = {
-        originCode: this.originCode,
-        code: this.codeFormData.code.trim(),
-      };
-      enterCodeWeb(tQuery).then((response) => {
-        if (response.code === 20000) {
-          this.$refs.inputRef.focus();
-          this.$refs.inputRef.select();
-          this.codeFormData.code = response.data;
-          this.addCode();
-        } else {
-          if (response.code == 502) {
-            this.checkSuccess = false;
-            this.codeFormData.code = response.data;
-            this.originCode = this.codeFormData.code;
-          } else if (response.code == 501) {
-            this.checkSuccess = false;
-            this.$message.error(response.message);
-          } else if (response.code == 503) {
-            this.checkSuccess = false;
-            this.codeFormData.code = response.data;
-            this.$confirm(response.message, "提示", {
-              type: "warning",
-            })
-              .then(() => {
-                this.codeFormData.code = response.data;
-                this.addCode();
-              })
-              .catch(() => {
-                this.codeFormData.code = this.originCode;
-              });
-          } else if (response.code == 508) {
-            this.originCode = "";
-            this.codeFormData.code = "01" + response.data.nameCode;
-            this.originCode = this.codeFormData.code;
-          } else {
-            this.$alert(response.message, "提示", {
-              confirmButtonText: "确定",
-              type: "warning",
-              closeOnClickModal: true,
-              callback: (action) => {
-                this.$refs.inputRef.focus();
-                this.$refs.inputRef.select();
-              },
-            });
-          }
-        }
-        this.loading = false;
-      });
+
+      this.addCode()
     },
 
     getInputFocus(event) {
diff --git a/src/views/inoutDrug/IoCreateOrder.vue b/src/views/inoutDrug/IoCreateOrder.vue
index 73b96b8b..24d13f5d 100644
--- a/src/views/inoutDrug/IoCreateOrder.vue
+++ b/src/views/inoutDrug/IoCreateOrder.vue
@@ -1,129 +1,12 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form" size="mini" label-width="100px">
-<!--        <el-row>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item class="query-form-item" label="单号:">-->
-<!--              <el-input v-model="filterQuery.billNo" placeholder="单号"-->
-<!--                        style="width: 90%"-->
-<!--                        clearable="true"></el-input>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          &lt;!&ndash;          <el-col :span="8">&ndash;&gt;-->
-<!--          &lt;!&ndash;            <el-form-item class="query-form-item" label="采购仓库:">&ndash;&gt;-->
-<!--          &lt;!&ndash;              <el-select v-model="filterQuery.deptCode" placeholder="请选择采购仓库" clearable="true"&ndash;&gt;-->
-<!--          &lt;!&ndash;                         style="width: 90%"&ndash;&gt;-->
-<!--          &lt;!&ndash;              >&ndash;&gt;-->
-<!--          &lt;!&ndash;                <el-option&ndash;&gt;-->
-<!--          &lt;!&ndash;                  v-for="item in deptList"&ndash;&gt;-->
-<!--          &lt;!&ndash;                  :key="item.name"&ndash;&gt;-->
-<!--          &lt;!&ndash;                  :label="item.name"&ndash;&gt;-->
-<!--          &lt;!&ndash;                  :value="item.code">&ndash;&gt;-->
-<!--          &lt;!&ndash;                  <span style="float: left">{{ item.name }}</span>&ndash;&gt;-->
-<!--          &lt;!&ndash;                </el-option>&ndash;&gt;-->
-<!--          &lt;!&ndash;              </el-select>&ndash;&gt;-->
-<!--          &lt;!&ndash;            </el-form-item>&ndash;&gt;-->
-<!--          &lt;!&ndash;          </el-col>&ndash;&gt;-->
-
-
-<!--          &lt;!&ndash;          <el-col :span="8">&ndash;&gt;-->
-<!--          &lt;!&ndash;            <el-form-item class="query-form-item" label="送货单位:">&ndash;&gt;-->
-<!--          &lt;!&ndash;              <el-select&ndash;&gt;-->
-<!--          &lt;!&ndash;                v-model="filterQuery.fromCorp"&ndash;&gt;-->
-<!--          &lt;!&ndash;                filterable&ndash;&gt;-->
-<!--          &lt;!&ndash;                remote&ndash;&gt;-->
-<!--          &lt;!&ndash;                clearable="true"&ndash;&gt;-->
-<!--          &lt;!&ndash;                reserve-keyword&ndash;&gt;-->
-<!--          &lt;!&ndash;                placeholder="供应商名称"&ndash;&gt;-->
-<!--          &lt;!&ndash;                :remote-method="findMethod"&ndash;&gt;-->
-<!--          &lt;!&ndash;                size="mini"&ndash;&gt;-->
-<!--          &lt;!&ndash;                :loading="corpLoading"&ndash;&gt;-->
-<!--          &lt;!&ndash;                style="width: 90%"&ndash;&gt;-->
-<!--          &lt;!&ndash;              >&ndash;&gt;-->
-<!--          &lt;!&ndash;                <el-option&ndash;&gt;-->
-<!--          &lt;!&ndash;                  v-for="item in fromOptions"&ndash;&gt;-->
-<!--          &lt;!&ndash;                  :key="item.name"&ndash;&gt;-->
-<!--          &lt;!&ndash;                  :label="item.name"&ndash;&gt;-->
-<!--          &lt;!&ndash;                  :value="item.erpId"&ndash;&gt;-->
-<!--          &lt;!&ndash;                >&ndash;&gt;-->
-<!--          &lt;!&ndash;                  <span style="float: left">{{ item.name }}</span>&ndash;&gt;-->
-<!--          &lt;!&ndash;                </el-option>&ndash;&gt;-->
-<!--          &lt;!&ndash;              </el-select>&ndash;&gt;-->
-<!--          &lt;!&ndash;            </el-form-item>&ndash;&gt;-->
-<!--          &lt;!&ndash;          </el-col>&ndash;&gt;-->
-
-<!--          <el-col :span="8">-->
-<!--            <el-form-item class="query-form-item" label="出入库类型:">-->
-<!--              <el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">-->
-<!--                <el-option label="全部" value=""></el-option>-->
-<!--                <el-option label="入库" value="WareHouseIn"></el-option>-->
-<!--                <el-option label="出库" value="WareHouseOut"></el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item class="query-form-item" label="单据类型:">-->
-<!--              <el-select v-model="filterQuery.action" placeholder="请选择单据类型"-->
-<!--                         style="width: 90%"-->
-<!--                         clearable>-->
-<!--                <el-option-->
-<!--                  v-for="item in busTypes"-->
-<!--                  :key="item.name"-->
-<!--                  :label="item.name"-->
-<!--                  :value="item.action">-->
-<!--                  <span style="float: left">{{ item.name }}</span>-->
-<!--                </el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--        </el-row>-->
-<!--        <el-row>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item class="query-form-item" label="所属仓库:">-->
-<!--              <el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"-->
-<!--                         style="width: 90%"-->
-<!--                         @change="invChange"-->
-<!--              >-->
-<!--                <el-option-->
-<!--                  v-for="item in invList"-->
-<!--                  :key="item.name"-->
-<!--                  :label="item.name"-->
-<!--                  :value="item.code">-->
-<!--                  <span style="float: left">{{ item.name }}</span>-->
-<!--                </el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item class="query-form-item" label="往来单位:">-->
-<!--              <el-input v-model="filterQuery.keyWords" placeholder="请选择往来单位"-->
-<!--                        style="width: 90%"-->
-<!--                        clearable="true"></el-input>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item class="query-form-item" label="创建时间:">-->
-<!--              <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="结束日期"-->
-<!--                style="width: 90%"-->
-<!--              >-->
-<!--              </el-date-picker>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-
-
-<!--        </el-row>-->
+      <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)" :label="item.columnDesc+`:`" :key="item.id">
+          <template v-for="(item, index) in queryList">
+            <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`" :key="item.id">
               <el-input
                 v-model="filterQuery[item.columnName]"
                 :placeholder="item.columnDesc"
@@ -132,7 +15,8 @@
                 clearable
               ></el-input>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+            <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`">
               <el-select v-model="filterQuery[item.columnName]"
                          :placeholder="item.columnDesc"
                          :disabled="executeEval(null,item.disabledFuc,false)"
@@ -145,7 +29,8 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+            <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`">
               <el-select
                 v-model="filterQuery[item.columnName]"
                 :placeholder="item.columnDesc"
@@ -163,7 +48,8 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+            <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`">
               <el-date-picker
                 :picker-options="pickerOptions"
                 v-model="actDateRange"
@@ -175,7 +61,8 @@
                 end-placeholder="结束日期"
               ></el-date-picker>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+            <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`">
               <el-date-picker
                 v-model="filterQuery[item.columnName]"
                 :style="`width:${item.width+'px'}`"
@@ -209,67 +96,6 @@
                 border :default-sort="defaultSort"
                 @sort-change="handleSortChange"
       >
-<!--        <el-table-column label="序号" type="index"></el-table-column>-->
-<!--        <el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>-->
-<!--        <el-table-column label="单据类型" prop="billTypeName" width="150">-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip-->
-<!--                         sortable="custom"-->
-<!--                         :sort-orders="['ascending', 'descending']">-->
-<!--          <template slot-scope="scope">-->
-<!--            <i class="el-icon-time"></i>-->
-<!--            <span>{{ scope.row.createTime }}</span>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="往来单位" prop="fromName" width="220">-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="所属部门" prop="deptName" width="120" v-if="enableDept">-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="所属仓库" prop="invName" width="120">-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>-->
-<!--        <el-table-column label="来源" prop="fromType" width="120">-->
-<!--          <template slot-scope="scope">-->
-<!--            <span>{{ fromTypeMap[scope.row.fromType] }}</span>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-
-<!--        <el-table-column label="单据状态" prop="status" width="100">-->
-<!--          <template slot-scope="scope">-->
-<!--            <el-tag :type="statusFilterType(scope.row.status)">{{-->
-<!--                checkStatus[scope.row.status]-->
-<!--              }}-->
-<!--            </el-tag>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="操作" width="150" fixed="right">-->
-<!--          <template slot-scope="scope">-->
-<!--            <el-button-->
-<!--              type="text"-->
-<!--              size="small"-->
-<!--              @click.native.stop="addOrders(scope.row)"-->
-<!--            >编辑-->
-<!--            </el-button-->
-<!--            >-->
-<!--            <el-button-->
-<!--              type="text"-->
-<!--              size="small"-->
-<!--              @click.native.stop="deleteDialog(scope.row.billNo)"-->
-<!--            >删除-->
-<!--            </el-button-->
-<!--            >-->
-<!--&lt;!&ndash;            <el-button&ndash;&gt;-->
-<!--            &lt;!&ndash;              type="text"&ndash;&gt;-->
-<!--            &lt;!&ndash;              size="small"&ndash;&gt;-->
-<!--            &lt;!&ndash;              v-if="scope.row.status == 1"&ndash;&gt;-->
-<!--            &lt;!&ndash;              @click.native.stop="onUpload(scope.row.billNo)"&ndash;&gt;-->
-<!--            &lt;!&ndash;            >校验提交&ndash;&gt;-->
-<!--            &lt;!&ndash;            </el-button&ndash;&gt;-->
-<!--            &lt;!&ndash;            >&ndash;&gt;-->
-<!--          </template>-->
-<!--        </el-table-column>-->
         <template v-for="(item, index) in tableHeader">
           <el-table-column
             v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
@@ -290,7 +116,7 @@
             :show-overflow-tooltip="item.tooltip"
             :key="item.columnName"
           >
-            <template  slot-scope="scope">
+            <template slot-scope="scope">
               <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
             </template>
           </el-table-column>
@@ -303,8 +129,10 @@
             :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 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
@@ -316,9 +144,12 @@
             :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>
+            <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>
@@ -353,7 +184,9 @@
             :key="item.columnName"
           >
             <template slot-scope="scope">
-              <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
+              <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
+                  scope.row[item.columnName]
+                }}</span>
             </template>
           </el-table-column>
         </template>
@@ -406,13 +239,13 @@ import {
   getOrderList
 } from "../../api/inout/order";
 import {getBasicUnitMaintains, getCorrespondence} from "../../api/basic/basicUnitMaintain"
-import addOrder from "@/views/inout/DialogCreateOrder";
+import addOrder from "@/views/inoutDrug/DialogCreateDrugOrder";
 import {getInvListByUser, getInvListByUserOptimize} from "@/api/system/invWarehouse";
-import {getLocalJoinByUser,getLocalJoinByUserOptimize} from "@/api/basic/busType";
+import {getLocalJoinByUser, getLocalJoinByUserOptimize} from "@/api/basic/busType";
 import {selectSysParamByKey} from "@/api/param/systemParamConfig";
 import {getDeptListByUser} from "@/api/auth/authDept";
 import {
-  getHead,executeFuc
+  getHead, executeFuc
 } from "@/utils/customConfig";
 
 export default {
@@ -460,13 +293,13 @@ export default {
       codeDetailVisible: false,
       addOrderVisible: false,
       total: 0,
-      tableHeader:[],
-      queryList:[],
-      fromList:[],
+      tableHeader: [],
+      queryList: [],
+      fromList: [],
       options: {
-        getInvList:[],
-        getDeptList:[],
-        getBusType:[],
+        getInvList: [],
+        getDeptList: [],
+        getBusType: [],
       },
       loading: false,
       index: null,
@@ -634,8 +467,8 @@ export default {
         .catch(() => {
         });
     },
-    addOrders(_this,row) {
-      if(_this == null){
+    addOrders(_this, row) {
+      if (_this == null) {
         _this = this
       }
       _this.errView = 0;
@@ -644,7 +477,7 @@ export default {
         _this.errView = 1;
         _this.idQuery = row;
       }
-      if(row!=null)
+      if (row != null)
         _this.idQuery = row;
       _this.addOrderVisible = true;
     },
@@ -709,7 +542,7 @@ export default {
         .catch(() => {
         });
     },
-    deleteDialog(_this,rowId) {
+    deleteDialog(_this, rowId) {
       _this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -768,11 +601,11 @@ export default {
       };
       return statusMap[status];
     },
-    executeFuc(row,type,clickFuc,value){
-      return executeFuc(this,row,type,clickFuc,value);
+    executeFuc(row, type, clickFuc, value) {
+      return executeFuc(this, row, type, clickFuc, value);
     },
-    executeEval(row,expression,defaultRet){
-      if(expression){
+    executeEval(row, expression, defaultRet) {
+      if (expression) {
         return eval(expression);
       }
       return defaultRet;
@@ -787,7 +620,7 @@ export default {
   created() {
     this.getInvList(this);
     this.getBusType(this);
-    getHead("DrugIoCreateOrder","1").then((re) => {
+    getHead("DrugIoCreateOrder", "1").then((re) => {
       // 处理返回的数据
       this.tableObj = re.data;
       this.tableHeader = re.data.tableList;
diff --git a/src/views/inoutDrug/IoCreateScanOrder.vue b/src/views/inoutDrug/IoCreateScanOrder.vue
index 5dcb880e..edbdc0d4 100644
--- a/src/views/inoutDrug/IoCreateScanOrder.vue
+++ b/src/views/inoutDrug/IoCreateScanOrder.vue
@@ -1,130 +1,132 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form v-if="queryList && queryList.length > 0 && showSearch"  :model="filterQuery" class="query-form" size="mini" label-width="100px">
-<!--        <el-row>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item class="query-form-item" label="单号:">-->
-<!--              <el-input v-model="filterQuery.billNo" placeholder="单号"-->
-<!--                        style="width: 90%"-->
-<!--                        clearable="true"></el-input>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item class="query-form-item" label="出入库类型:">-->
-<!--              <el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">-->
-<!--                <el-option label="全部" value=""></el-option>-->
-<!--                <el-option label="入库" value="WareHouseIn"></el-option>-->
-<!--                <el-option label="出库" value="WareHouseOut"></el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
+      <el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form"
+               size="mini" label-width="100px">
+        <!--        <el-row>-->
+        <!--          <el-col :span="8">-->
+        <!--            <el-form-item class="query-form-item" label="单号:">-->
+        <!--              <el-input v-model="filterQuery.billNo" placeholder="单号"-->
+        <!--                        style="width: 90%"-->
+        <!--                        clearable="true"></el-input>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--          <el-col :span="8">-->
+        <!--            <el-form-item class="query-form-item" label="出入库类型:">-->
+        <!--              <el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">-->
+        <!--                <el-option label="全部" value=""></el-option>-->
+        <!--                <el-option label="入库" value="WareHouseIn"></el-option>-->
+        <!--                <el-option label="出库" value="WareHouseOut"></el-option>-->
+        <!--              </el-select>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
 
-<!--          <el-col :span="8">-->
-<!--            <el-form-item class="query-form-item" label="单据类型:">-->
-<!--              <el-select v-model="filterQuery.action" placeholder="请选择单据类型"-->
-<!--                         style="width: 90%"-->
-<!--                         clearable>-->
-<!--                <el-option-->
-<!--                  v-for="item in busTypes"-->
-<!--                  :key="item.name"-->
-<!--                  :label="item.name"-->
-<!--                  :value="item.action">-->
-<!--                  <span style="float: left">{{ item.name }}</span>-->
-<!--                </el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
+        <!--          <el-col :span="8">-->
+        <!--            <el-form-item class="query-form-item" label="单据类型:">-->
+        <!--              <el-select v-model="filterQuery.action" placeholder="请选择单据类型"-->
+        <!--                         style="width: 90%"-->
+        <!--                         clearable>-->
+        <!--                <el-option-->
+        <!--                  v-for="item in busTypes"-->
+        <!--                  :key="item.name"-->
+        <!--                  :label="item.name"-->
+        <!--                  :value="item.action">-->
+        <!--                  <span style="float: left">{{ item.name }}</span>-->
+        <!--                </el-option>-->
+        <!--              </el-select>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
 
-<!--          &lt;!&ndash;          <el-col :span="8">&ndash;&gt;-->
-<!--          &lt;!&ndash;            <el-form-item class="query-form-item" label="采购仓库:">&ndash;&gt;-->
-<!--          &lt;!&ndash;              <el-select v-model="filterQuery.deptCode" placeholder="请选择采购仓库" clearable="true"&ndash;&gt;-->
-<!--          &lt;!&ndash;                         style="width: 90%"&ndash;&gt;-->
-<!--          &lt;!&ndash;              >&ndash;&gt;-->
-<!--          &lt;!&ndash;                <el-option&ndash;&gt;-->
-<!--          &lt;!&ndash;                  v-for="item in deptList"&ndash;&gt;-->
-<!--          &lt;!&ndash;                  :key="item.name"&ndash;&gt;-->
-<!--          &lt;!&ndash;                  :label="item.name"&ndash;&gt;-->
-<!--          &lt;!&ndash;                  :value="item.code">&ndash;&gt;-->
-<!--          &lt;!&ndash;                  <span style="float: left">{{ item.name }}</span>&ndash;&gt;-->
-<!--          &lt;!&ndash;                </el-option>&ndash;&gt;-->
-<!--          &lt;!&ndash;              </el-select>&ndash;&gt;-->
-<!--          &lt;!&ndash;            </el-form-item>&ndash;&gt;-->
-<!--          &lt;!&ndash;          </el-col>&ndash;&gt;-->
+        <!--          &lt;!&ndash;          <el-col :span="8">&ndash;&gt;-->
+        <!--          &lt;!&ndash;            <el-form-item class="query-form-item" label="采购仓库:">&ndash;&gt;-->
+        <!--          &lt;!&ndash;              <el-select v-model="filterQuery.deptCode" placeholder="请选择采购仓库" clearable="true"&ndash;&gt;-->
+        <!--          &lt;!&ndash;                         style="width: 90%"&ndash;&gt;-->
+        <!--          &lt;!&ndash;              >&ndash;&gt;-->
+        <!--          &lt;!&ndash;                <el-option&ndash;&gt;-->
+        <!--          &lt;!&ndash;                  v-for="item in deptList"&ndash;&gt;-->
+        <!--          &lt;!&ndash;                  :key="item.name"&ndash;&gt;-->
+        <!--          &lt;!&ndash;                  :label="item.name"&ndash;&gt;-->
+        <!--          &lt;!&ndash;                  :value="item.code">&ndash;&gt;-->
+        <!--          &lt;!&ndash;                  <span style="float: left">{{ item.name }}</span>&ndash;&gt;-->
+        <!--          &lt;!&ndash;                </el-option>&ndash;&gt;-->
+        <!--          &lt;!&ndash;              </el-select>&ndash;&gt;-->
+        <!--          &lt;!&ndash;            </el-form-item>&ndash;&gt;-->
+        <!--          &lt;!&ndash;          </el-col>&ndash;&gt;-->
 
-<!--        </el-row>-->
-<!--        <el-row>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item class="query-form-item" label="收货仓库:">-->
-<!--              <el-select v-model="filterQuery.invCode" placeholder="请选择收货仓库" clearable="true"-->
-<!--                         style="width: 90%"-->
-<!--                         @change="invChange"-->
-<!--              >-->
-<!--                <el-option-->
-<!--                  v-for="item in invList"-->
-<!--                  :key="item.name"-->
-<!--                  :label="item.name"-->
-<!--                  :value="item.code">-->
-<!--                  <span style="float: left">{{ item.name }}</span>-->
-<!--                </el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
+        <!--        </el-row>-->
+        <!--        <el-row>-->
+        <!--          <el-col :span="8">-->
+        <!--            <el-form-item class="query-form-item" label="收货仓库:">-->
+        <!--              <el-select v-model="filterQuery.invCode" placeholder="请选择收货仓库" clearable="true"-->
+        <!--                         style="width: 90%"-->
+        <!--                         @change="invChange"-->
+        <!--              >-->
+        <!--                <el-option-->
+        <!--                  v-for="item in invList"-->
+        <!--                  :key="item.name"-->
+        <!--                  :label="item.name"-->
+        <!--                  :value="item.code">-->
+        <!--                  <span style="float: left">{{ item.name }}</span>-->
+        <!--                </el-option>-->
+        <!--              </el-select>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
 
 
-<!--          <el-col :span="8">-->
-<!--&lt;!&ndash;            <el-form-item label="往来单位:">&ndash;&gt;-->
-<!--&lt;!&ndash;              <el-select&ndash;&gt;-->
-<!--&lt;!&ndash;                v-model="filterQuery.keyWords"&ndash;&gt;-->
-<!--&lt;!&ndash;                style="width: 90%"&ndash;&gt;-->
-<!--&lt;!&ndash;                filterable&ndash;&gt;-->
-<!--&lt;!&ndash;                remote&ndash;&gt;-->
-<!--&lt;!&ndash;                clearable="true"&ndash;&gt;-->
-<!--&lt;!&ndash;                reserve-keyword&ndash;&gt;-->
-<!--&lt;!&ndash;                placeholder="请选择往来单位"&ndash;&gt;-->
-<!--&lt;!&ndash;                :remote-method="findMethod"&ndash;&gt;-->
-<!--&lt;!&ndash;                :loading="loading"&ndash;&gt;-->
-<!--&lt;!&ndash;              >&ndash;&gt;-->
-<!--&lt;!&ndash;                <el-option&ndash;&gt;-->
-<!--&lt;!&ndash;                  v-for="item in fromOptions"&ndash;&gt;-->
-<!--&lt;!&ndash;                  :key="item.name"&ndash;&gt;-->
-<!--&lt;!&ndash;                  :label="item.name"&ndash;&gt;-->
-<!--&lt;!&ndash;                  :value="item.erpId"&ndash;&gt;-->
-<!--&lt;!&ndash;                >&ndash;&gt;-->
-<!--&lt;!&ndash;                  <span style="float: left">{{ item.name }}</span>&ndash;&gt;-->
-<!--&lt;!&ndash;                </el-option>&ndash;&gt;-->
-<!--&lt;!&ndash;              </el-select>&ndash;&gt;-->
-<!--&lt;!&ndash;            </el-form-item>&ndash;&gt;-->
-<!--            <el-form-item class="query-form-item" label="往来单位:">-->
-<!--              <el-input v-model="filterQuery.keyWords" placeholder="请选择往来单位"-->
-<!--                        style="width: 90%"-->
-<!--                        clearable="true"></el-input>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
+        <!--          <el-col :span="8">-->
+        <!--&lt;!&ndash;            <el-form-item label="往来单位:">&ndash;&gt;-->
+        <!--&lt;!&ndash;              <el-select&ndash;&gt;-->
+        <!--&lt;!&ndash;                v-model="filterQuery.keyWords"&ndash;&gt;-->
+        <!--&lt;!&ndash;                style="width: 90%"&ndash;&gt;-->
+        <!--&lt;!&ndash;                filterable&ndash;&gt;-->
+        <!--&lt;!&ndash;                remote&ndash;&gt;-->
+        <!--&lt;!&ndash;                clearable="true"&ndash;&gt;-->
+        <!--&lt;!&ndash;                reserve-keyword&ndash;&gt;-->
+        <!--&lt;!&ndash;                placeholder="请选择往来单位"&ndash;&gt;-->
+        <!--&lt;!&ndash;                :remote-method="findMethod"&ndash;&gt;-->
+        <!--&lt;!&ndash;                :loading="loading"&ndash;&gt;-->
+        <!--&lt;!&ndash;              >&ndash;&gt;-->
+        <!--&lt;!&ndash;                <el-option&ndash;&gt;-->
+        <!--&lt;!&ndash;                  v-for="item in fromOptions"&ndash;&gt;-->
+        <!--&lt;!&ndash;                  :key="item.name"&ndash;&gt;-->
+        <!--&lt;!&ndash;                  :label="item.name"&ndash;&gt;-->
+        <!--&lt;!&ndash;                  :value="item.erpId"&ndash;&gt;-->
+        <!--&lt;!&ndash;                >&ndash;&gt;-->
+        <!--&lt;!&ndash;                  <span style="float: left">{{ item.name }}</span>&ndash;&gt;-->
+        <!--&lt;!&ndash;                </el-option>&ndash;&gt;-->
+        <!--&lt;!&ndash;              </el-select>&ndash;&gt;-->
+        <!--&lt;!&ndash;            </el-form-item>&ndash;&gt;-->
+        <!--            <el-form-item class="query-form-item" label="往来单位:">-->
+        <!--              <el-input v-model="filterQuery.keyWords" placeholder="请选择往来单位"-->
+        <!--                        style="width: 90%"-->
+        <!--                        clearable="true"></el-input>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
 
 
-<!--          <el-col :span="8">-->
-<!--            <el-form-item class="query-form-item" label="创建时间:">-->
-<!--              <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="结束日期"-->
-<!--                style="width: 90%"-->
-<!--              >-->
-<!--              </el-date-picker>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
+        <!--          <el-col :span="8">-->
+        <!--            <el-form-item class="query-form-item" label="创建时间:">-->
+        <!--              <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="结束日期"-->
+        <!--                style="width: 90%"-->
+        <!--              >-->
+        <!--              </el-date-picker>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
 
 
-<!--        </el-row>-->
+        <!--        </el-row>-->
         <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)" :label="item.columnDesc+`:`" :key="item.id">
+          <template v-for="(item, index) in queryList">
+            <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`" :key="item.id">
               <el-input
                 v-model="filterQuery[item.columnName]"
                 :placeholder="item.columnDesc"
@@ -133,7 +135,8 @@
                 clearable
               ></el-input>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+            <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`">
               <el-select v-model="filterQuery[item.columnName]"
                          :placeholder="item.columnDesc"
                          :disabled="executeEval(null,item.disabledFuc,false)"
@@ -146,7 +149,8 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+            <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`">
               <el-select
                 v-model="filterQuery[item.columnName]"
                 :placeholder="item.columnDesc"
@@ -164,7 +168,8 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+            <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`">
               <el-date-picker
                 :picker-options="pickerOptions"
                 v-model="actDateRange"
@@ -176,7 +181,8 @@
                 end-placeholder="结束日期"
               ></el-date-picker>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+            <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`">
               <el-date-picker
                 v-model="filterQuery[item.columnName]"
                 :style="`width:${item.width+'px'}`"
@@ -211,62 +217,62 @@
                 border :default-sort="defaultSort"
                 @sort-change="handleSortChange"
       >
-<!--        <el-table-column label="序号" type="index"></el-table-column>-->
-<!--        <el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="140"></el-table-column>-->
-<!--        <el-table-column label="单据类型" prop="billTypeName" width="160"></el-table-column>-->
-<!--        <el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip-->
-<!--                         sortable="custom"-->
-<!--                         :sort-orders="['ascending', 'descending']">-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="往来单位" prop="fromName" width="220">-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="所属部门" prop="deptName" width="120">-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label=所属仓库 prop="invName" width="120">-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="来源单据号" prop="corpOrderId" show-overflow-tooltip width="140"></el-table-column>-->
-<!--        <el-table-column label="来源" prop="fromType" width="140">-->
-<!--          <template slot-scope="scope">-->
-<!--            <span>{{ fromTypeMap[scope.row.fromType] }}</span>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="单据状态" prop="status" width="100">-->
-<!--          <template slot-scope="scope">-->
-<!--            <el-tag :type="statusFilterType(scope.row.status)">{{-->
-<!--                checkStatus[scope.row.status]-->
-<!--              }}-->
-<!--            </el-tag>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="操作" width="150" fixed="right">-->
+        <!--        <el-table-column label="序号" type="index"></el-table-column>-->
+        <!--        <el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="140"></el-table-column>-->
+        <!--        <el-table-column label="单据类型" prop="billTypeName" width="160"></el-table-column>-->
+        <!--        <el-table-column label="创建时间" prop="createTime" width="140" show-overflow-tooltip-->
+        <!--                         sortable="custom"-->
+        <!--                         :sort-orders="['ascending', 'descending']">-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="往来单位" prop="fromName" width="220">-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="所属部门" prop="deptName" width="120">-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label=所属仓库 prop="invName" width="120">-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="来源单据号" prop="corpOrderId" show-overflow-tooltip width="140"></el-table-column>-->
+        <!--        <el-table-column label="来源" prop="fromType" width="140">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <span>{{ fromTypeMap[scope.row.fromType] }}</span>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="单据状态" prop="status" width="100">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-tag :type="statusFilterType(scope.row.status)">{{-->
+        <!--                checkStatus[scope.row.status]-->
+        <!--              }}-->
+        <!--            </el-tag>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="操作" width="150" fixed="right">-->
 
-<!--          <template slot-scope="scope">-->
-<!--            <el-button-->
-<!--              type="text"-->
-<!--              size="small"-->
-<!--              @click.native.stop="editOrder(scope.row)"-->
-<!--            >编辑-->
-<!--            </el-button-->
-<!--            >-->
-<!--            <el-button-->
-<!--              type="text"-->
-<!--              size="small"-->
-<!--              @click.native.stop="deleteDialog(scope.row.billNo)"-->
-<!--            >删除-->
-<!--            </el-button-->
-<!--            >-->
-<!--&lt;!&ndash;            <el-button&ndash;&gt;-->
-<!--            &lt;!&ndash;              type="text"&ndash;&gt;-->
-<!--            &lt;!&ndash;              size="small"&ndash;&gt;-->
-<!--            &lt;!&ndash;              v-if="scope.row.status == 1"&ndash;&gt;-->
-<!--            &lt;!&ndash;              @click.native.stop="onUpload(scope.row.billNo)"&ndash;&gt;-->
-<!--            &lt;!&ndash;            >提交校验&ndash;&gt;-->
-<!--            &lt;!&ndash;            </el-button&ndash;&gt;-->
-<!--            &lt;!&ndash;            >&ndash;&gt;-->
-<!--          </template>-->
-<!--        </el-table-column>-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-button-->
+        <!--              type="text"-->
+        <!--              size="small"-->
+        <!--              @click.native.stop="editOrder(scope.row)"-->
+        <!--            >编辑-->
+        <!--            </el-button-->
+        <!--            >-->
+        <!--            <el-button-->
+        <!--              type="text"-->
+        <!--              size="small"-->
+        <!--              @click.native.stop="deleteDialog(scope.row.billNo)"-->
+        <!--            >删除-->
+        <!--            </el-button-->
+        <!--            >-->
+        <!--&lt;!&ndash;            <el-button&ndash;&gt;-->
+        <!--            &lt;!&ndash;              type="text"&ndash;&gt;-->
+        <!--            &lt;!&ndash;              size="small"&ndash;&gt;-->
+        <!--            &lt;!&ndash;              v-if="scope.row.status == 1"&ndash;&gt;-->
+        <!--            &lt;!&ndash;              @click.native.stop="onUpload(scope.row.billNo)"&ndash;&gt;-->
+        <!--            &lt;!&ndash;            >提交校验&ndash;&gt;-->
+        <!--            &lt;!&ndash;            </el-button&ndash;&gt;-->
+        <!--            &lt;!&ndash;            >&ndash;&gt;-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
         <template v-for="(item, index) in tableHeader">
           <el-table-column
             v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
@@ -287,7 +293,7 @@
             :show-overflow-tooltip="item.tooltip"
             :key="item.columnName"
           >
-            <template  slot-scope="scope">
+            <template slot-scope="scope">
               <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
             </template>
           </el-table-column>
@@ -300,8 +306,10 @@
             :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 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
@@ -313,9 +321,12 @@
             :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>
+            <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>
@@ -350,7 +361,9 @@
             :key="item.columnName"
           >
             <template slot-scope="scope">
-              <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
+              <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
+                  scope.row[item.columnName]
+                }}</span>
             </template>
           </el-table-column>
         </template>
@@ -400,14 +413,14 @@ import {
   deleteByOrderId,
   getOrderList, submitCodes
 } from "../../api/inout/order";
-import addOrder from "./DialogCreateDrugOrder";
+import addOrder from "@/views/inoutDrug/DialogCreateDrugOrder";
 import errOrder from "@/views/inout/IoCreateErrorOrder";
 import {getInvListByUser, getInvListByUserOptimize} from "@/api/system/invWarehouse";
-import {getLocalJoinByUser,getLocalJoinByUserOptimize} from "@/api/basic/busType";
+import {getLocalJoinByUser, getLocalJoinByUserOptimize} from "@/api/basic/busType";
 import {selectSysParamByKey} from "@/api/param/systemParamConfig";
 import {getCorrespondence} from "@/api/basic/basicUnitMaintain";
 import {
-  getHead,executeFuc
+  getHead, executeFuc
 } from "@/utils/customConfig";
 
 export default {
@@ -455,13 +468,13 @@ export default {
       addOrderVisible: false,
       errOrderVisible: false,
       total: 0,
-      tableHeader:[],
-      queryList:[],
-      fromList:[],
+      tableHeader: [],
+      queryList: [],
+      fromList: [],
       options: {
-        getInvList:[],
-        getDeptList:[],
-        getBusType:[],
+        getInvList: [],
+        getDeptList: [],
+        getBusType: [],
       },
       loading: false,
       index: null,
@@ -586,7 +599,7 @@ export default {
     },
 
     //单据编辑
-    editOrder(_this,row) {
+    editOrder(_this, row) {
       _this.idQuery = row;
       _this.title = "edit";
       _this.addOrderVisible = true;
@@ -653,7 +666,7 @@ export default {
         .catch(() => {
         });
     },
-    deleteDialog(_this,rowId) {
+    deleteDialog(_this, rowId) {
       _this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -730,11 +743,11 @@ export default {
     errOrderDialog() {
       this.errOrderVisible = true;
     },
-    executeFuc(row,type,clickFuc,value){
-      return executeFuc(this,row,type,clickFuc,value);
+    executeFuc(row, type, clickFuc, value) {
+      return executeFuc(this, row, type, clickFuc, value);
     },
-    executeEval(row,expression,defaultRet){
-      if(expression){
+    executeEval(row, expression, defaultRet) {
+      if (expression) {
         return eval(expression);
       }
       return defaultRet;
@@ -749,7 +762,7 @@ export default {
   created() {
     this.getInvList(this);
     this.getBusType(this);
-    getHead("DrugIoCreateScanOrder","1").then((re) => {
+    getHead("DrugIoCreateScanOrder", "1").then((re) => {
       // 处理返回的数据
       this.tableObj = re.data;
       this.tableHeader = re.data.tableList;
diff --git a/src/views/inoutDrug/IoDealOrder.vue b/src/views/inoutDrug/IoDealOrder.vue
index 1d128396..6672719c 100644
--- a/src/views/inoutDrug/IoDealOrder.vue
+++ b/src/views/inoutDrug/IoDealOrder.vue
@@ -1,106 +1,108 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form v-if="queryList && queryList.length > 0 && showSearch"  :model="filterQuery" class="query-form" size="mini" label-width="100px">
-<!--        <el-row>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item class="query-form-item" label="单号:">-->
-<!--              <el-input v-model="filterQuery.billNo" placeholder="单号"-->
-<!--                        style="width: 90%"-->
-<!--                        clearable="true"></el-input>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-
-<!--          <el-col :span="8">-->
-<!--            <el-form-item class="query-form-item" label="出入库类型:">-->
-<!--              <el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">-->
-<!--                <el-option label="全部" value=""></el-option>-->
-<!--                <el-option label="入库" value="WareHouseIn"></el-option>-->
-<!--                <el-option label="出库" value="WareHouseOut"></el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item class="query-form-item" label="单据类型:">-->
-<!--              <el-select v-model="filterQuery.action" placeholder="请选择单据类型"-->
-<!--                         style="width: 90%"-->
-<!--                         clearable>-->
-<!--                <el-option-->
-<!--                  v-for="item in busTypes"-->
-<!--                  :key="item.name"-->
-<!--                  :label="item.name"-->
-<!--                  :value="item.action">-->
-<!--                  <span style="float: left">{{ item.name }}</span>-->
-<!--                </el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          &lt;!&ndash;          <el-col :span="8">&ndash;&gt;-->
-<!--          &lt;!&ndash;            <el-form-item class="query-form-item" label="采购仓库:">&ndash;&gt;-->
-<!--          &lt;!&ndash;              <el-select v-model="filterQuery.deptCode" placeholder="请选择采购仓库" clearable="true"&ndash;&gt;-->
-<!--          &lt;!&ndash;                         style="width: 90%"&ndash;&gt;-->
-<!--          &lt;!&ndash;              >&ndash;&gt;-->
-<!--          &lt;!&ndash;                <el-option&ndash;&gt;-->
-<!--          &lt;!&ndash;                  v-for="item in deptList"&ndash;&gt;-->
-<!--          &lt;!&ndash;                  :key="item.name"&ndash;&gt;-->
-<!--          &lt;!&ndash;                  :label="item.name"&ndash;&gt;-->
-<!--          &lt;!&ndash;                  :value="item.code">&ndash;&gt;-->
-<!--          &lt;!&ndash;                  <span style="float: left">{{ item.name }}</span>&ndash;&gt;-->
-<!--          &lt;!&ndash;                </el-option>&ndash;&gt;-->
-<!--          &lt;!&ndash;              </el-select>&ndash;&gt;-->
-<!--          &lt;!&ndash;            </el-form-item>&ndash;&gt;-->
-<!--          &lt;!&ndash;          </el-col>&ndash;&gt;-->
-
-<!--        </el-row>-->
-<!--        <el-row>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item class="query-form-item" label="所属仓库:">-->
-<!--              <el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"-->
-<!--                         style="width: 90%"-->
-<!--                         @change="invChange"-->
-<!--              >-->
-<!--                <el-option-->
-<!--                  v-for="item in invList"-->
-<!--                  :key="item.name"-->
-<!--                  :label="item.name"-->
-<!--                  :value="item.code">-->
-<!--                  <span style="float: left">{{ item.name }}</span>-->
-<!--                </el-option>-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item class="query-form-item" label="往来单位:">-->
-<!--              <el-input v-model="filterQuery.keyWords" placeholder="请选择往来单位"-->
-<!--                        style="width: 90%"-->
-<!--                        clearable="true"></el-input>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-
-<!--          <el-col :span="8">-->
-
-
-<!--            <el-form-item class="query-form-item" label="创建时间:">-->
-<!--              <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="结束日期"-->
-<!--                style="width: 90%"-->
-<!--              >-->
-<!--              </el-date-picker>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-
-
-<!--        </el-row>-->
+      <el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form"
+               size="mini" label-width="100px">
+        <!--        <el-row>-->
+        <!--          <el-col :span="8">-->
+        <!--            <el-form-item class="query-form-item" label="单号:">-->
+        <!--              <el-input v-model="filterQuery.billNo" placeholder="单号"-->
+        <!--                        style="width: 90%"-->
+        <!--                        clearable="true"></el-input>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+
+        <!--          <el-col :span="8">-->
+        <!--            <el-form-item class="query-form-item" label="出入库类型:">-->
+        <!--              <el-select v-model="filterQuery.mainAction" placeholder="请选择出入库类型" style="width: 90%">-->
+        <!--                <el-option label="全部" value=""></el-option>-->
+        <!--                <el-option label="入库" value="WareHouseIn"></el-option>-->
+        <!--                <el-option label="出库" value="WareHouseOut"></el-option>-->
+        <!--              </el-select>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--          <el-col :span="8">-->
+        <!--            <el-form-item class="query-form-item" label="单据类型:">-->
+        <!--              <el-select v-model="filterQuery.action" placeholder="请选择单据类型"-->
+        <!--                         style="width: 90%"-->
+        <!--                         clearable>-->
+        <!--                <el-option-->
+        <!--                  v-for="item in busTypes"-->
+        <!--                  :key="item.name"-->
+        <!--                  :label="item.name"-->
+        <!--                  :value="item.action">-->
+        <!--                  <span style="float: left">{{ item.name }}</span>-->
+        <!--                </el-option>-->
+        <!--              </el-select>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--          &lt;!&ndash;          <el-col :span="8">&ndash;&gt;-->
+        <!--          &lt;!&ndash;            <el-form-item class="query-form-item" label="采购仓库:">&ndash;&gt;-->
+        <!--          &lt;!&ndash;              <el-select v-model="filterQuery.deptCode" placeholder="请选择采购仓库" clearable="true"&ndash;&gt;-->
+        <!--          &lt;!&ndash;                         style="width: 90%"&ndash;&gt;-->
+        <!--          &lt;!&ndash;              >&ndash;&gt;-->
+        <!--          &lt;!&ndash;                <el-option&ndash;&gt;-->
+        <!--          &lt;!&ndash;                  v-for="item in deptList"&ndash;&gt;-->
+        <!--          &lt;!&ndash;                  :key="item.name"&ndash;&gt;-->
+        <!--          &lt;!&ndash;                  :label="item.name"&ndash;&gt;-->
+        <!--          &lt;!&ndash;                  :value="item.code">&ndash;&gt;-->
+        <!--          &lt;!&ndash;                  <span style="float: left">{{ item.name }}</span>&ndash;&gt;-->
+        <!--          &lt;!&ndash;                </el-option>&ndash;&gt;-->
+        <!--          &lt;!&ndash;              </el-select>&ndash;&gt;-->
+        <!--          &lt;!&ndash;            </el-form-item>&ndash;&gt;-->
+        <!--          &lt;!&ndash;          </el-col>&ndash;&gt;-->
+
+        <!--        </el-row>-->
+        <!--        <el-row>-->
+        <!--          <el-col :span="8">-->
+        <!--            <el-form-item class="query-form-item" label="所属仓库:">-->
+        <!--              <el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"-->
+        <!--                         style="width: 90%"-->
+        <!--                         @change="invChange"-->
+        <!--              >-->
+        <!--                <el-option-->
+        <!--                  v-for="item in invList"-->
+        <!--                  :key="item.name"-->
+        <!--                  :label="item.name"-->
+        <!--                  :value="item.code">-->
+        <!--                  <span style="float: left">{{ item.name }}</span>-->
+        <!--                </el-option>-->
+        <!--              </el-select>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--          <el-col :span="8">-->
+        <!--            <el-form-item class="query-form-item" label="往来单位:">-->
+        <!--              <el-input v-model="filterQuery.keyWords" placeholder="请选择往来单位"-->
+        <!--                        style="width: 90%"-->
+        <!--                        clearable="true"></el-input>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+
+        <!--          <el-col :span="8">-->
+
+
+        <!--            <el-form-item class="query-form-item" label="创建时间:">-->
+        <!--              <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="结束日期"-->
+        <!--                style="width: 90%"-->
+        <!--              >-->
+        <!--              </el-date-picker>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+
+
+        <!--        </el-row>-->
         <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)" :label="item.columnDesc+`:`" :key="item.id">
+          <template v-for="(item, index) in queryList">
+            <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`" :key="item.id">
               <el-input
                 v-model="filterQuery[item.columnName]"
                 :placeholder="item.columnDesc"
@@ -109,7 +111,8 @@
                 clearable
               ></el-input>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+            <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`">
               <el-select v-model="filterQuery[item.columnName]"
                          :placeholder="item.columnDesc"
                          :disabled="executeEval(null,item.disabledFuc,false)"
@@ -122,7 +125,8 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+            <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`">
               <el-select
                 v-model="filterQuery[item.columnName]"
                 :placeholder="item.columnDesc"
@@ -140,7 +144,8 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+            <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`">
               <el-date-picker
                 :picker-options="pickerOptions"
                 v-model="actDateRange"
@@ -152,7 +157,8 @@
                 end-placeholder="结束日期"
               ></el-date-picker>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+            <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`">
               <el-date-picker
                 v-model="filterQuery[item.columnName]"
                 :style="`width:${item.width+'px'}`"
@@ -188,66 +194,66 @@
                 :default-sort="defaultSort"
                 @sort-change="handleSortChange"
       >
-<!--        <el-table-column label="序号" type="index"></el-table-column>-->
-<!--        <el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>-->
-<!--        <el-table-column label="单据类型" prop="billTypeName" width="150">-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip-->
-<!--                         sortable="custom"-->
-<!--                         :sort-orders="['ascending', 'descending']">-->
-<!--          <template slot-scope="scope">-->
-<!--            <i class="el-icon-time"></i>-->
-<!--            <span>{{ scope.row.createTime }}</span>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="往来单位" prop="fromName" width="220" show-overflow-tooltip>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="所属部门" prop="deptName" width="120">-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="所属仓库" prop="invName" width="120">-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>-->
-<!--        <el-table-column label="来源" prop="fromType" width="140">-->
-<!--          <template slot-scope="scope">-->
-<!--            <span>{{ fromTypeMap[scope.row.fromType] }}</span>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-
-<!--        <el-table-column label="单据状态" prop="status" width="100">-->
-<!--          <template slot-scope="scope">-->
-<!--            <el-tag :type="statusFilterType(scope.row.status)">{{-->
-<!--                checkStatus[scope.row.status]-->
-<!--              }}-->
-<!--            </el-tag>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="操作" width="150" fixed="right">-->
-<!--          <template slot-scope="scope">-->
-<!--            <el-button-->
-<!--              type="text"-->
-<!--              size="small"-->
-<!--              @click.native.stop="addOrders(scope.row)"-->
-<!--            >编辑-->
-<!--            </el-button-->
-<!--            >-->
-<!--            <el-button-->
-<!--              type="text"-->
-<!--              size="small"-->
-<!--              @click.native.stop="deleteDialog(scope.row.billNo)"-->
-<!--            >删除-->
-<!--            </el-button-->
-<!--            >-->
-<!--            &lt;!&ndash;            <el-button&ndash;&gt;-->
-<!--            &lt;!&ndash;              type="text"&ndash;&gt;-->
-<!--            &lt;!&ndash;              size="small"&ndash;&gt;-->
-<!--            &lt;!&ndash;              @click.native.stop="onUpload(scope.row.billNo)"&ndash;&gt;-->
-<!--            &lt;!&ndash;            >校验提交&ndash;&gt;-->
-<!--            &lt;!&ndash;            </el-button&ndash;&gt;-->
-<!--            &lt;!&ndash;            >&ndash;&gt;-->
-<!--          </template>-->
-<!--        </el-table-column>-->
+        <!--        <el-table-column label="序号" type="index"></el-table-column>-->
+        <!--        <el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>-->
+        <!--        <el-table-column label="单据类型" prop="billTypeName" width="150">-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip-->
+        <!--                         sortable="custom"-->
+        <!--                         :sort-orders="['ascending', 'descending']">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <i class="el-icon-time"></i>-->
+        <!--            <span>{{ scope.row.createTime }}</span>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="往来单位" prop="fromName" width="220" show-overflow-tooltip>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="所属部门" prop="deptName" width="120">-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="所属仓库" prop="invName" width="120">-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>-->
+        <!--        <el-table-column label="来源" prop="fromType" width="140">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <span>{{ fromTypeMap[scope.row.fromType] }}</span>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+
+        <!--        <el-table-column label="单据状态" prop="status" width="100">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-tag :type="statusFilterType(scope.row.status)">{{-->
+        <!--                checkStatus[scope.row.status]-->
+        <!--              }}-->
+        <!--            </el-tag>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="操作" width="150" fixed="right">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-button-->
+        <!--              type="text"-->
+        <!--              size="small"-->
+        <!--              @click.native.stop="addOrders(scope.row)"-->
+        <!--            >编辑-->
+        <!--            </el-button-->
+        <!--            >-->
+        <!--            <el-button-->
+        <!--              type="text"-->
+        <!--              size="small"-->
+        <!--              @click.native.stop="deleteDialog(scope.row.billNo)"-->
+        <!--            >删除-->
+        <!--            </el-button-->
+        <!--            >-->
+        <!--            &lt;!&ndash;            <el-button&ndash;&gt;-->
+        <!--            &lt;!&ndash;              type="text"&ndash;&gt;-->
+        <!--            &lt;!&ndash;              size="small"&ndash;&gt;-->
+        <!--            &lt;!&ndash;              @click.native.stop="onUpload(scope.row.billNo)"&ndash;&gt;-->
+        <!--            &lt;!&ndash;            >校验提交&ndash;&gt;-->
+        <!--            &lt;!&ndash;            </el-button&ndash;&gt;-->
+        <!--            &lt;!&ndash;            >&ndash;&gt;-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
         <template v-for="(item, index) in tableHeader">
           <el-table-column
             v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
@@ -268,7 +274,7 @@
             :show-overflow-tooltip="item.tooltip"
             :key="item.columnName"
           >
-            <template  slot-scope="scope">
+            <template slot-scope="scope">
               <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
             </template>
           </el-table-column>
@@ -281,8 +287,10 @@
             :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 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
@@ -294,9 +302,12 @@
             :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>
+            <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>
@@ -331,7 +342,9 @@
             :key="item.columnName"
           >
             <template slot-scope="scope">
-              <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
+              <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
+                  scope.row[item.columnName]
+                }}</span>
             </template>
           </el-table-column>
         </template>
@@ -501,18 +514,17 @@
 import {
   deleteByOrderId,
   submitOrderWeb,
-  updateUnit, mergeOrder,
   getOrderList
-} from "../../api/inout/order";
-import {getBasicUnitMaintains, getCorrespondence} from "../../api/basic/basicUnitMaintain"
-import addOrder from "@/views/inout/DialogCreateOrder";
-import {getInvListByUser, getInvListByUserOptimize} from "@/api/system/invWarehouse";
-import {getLocalJoinByUser,getLocalJoinByUserOptimize} from "@/api/basic/busType";
+} from "@/api/inout/order";
+import {getCorrespondence} from "@/api/basic/basicUnitMaintain"
+import addOrder from "@/views/inoutDrug/DialogCreateDrugOrder";
+import {getInvListByUserOptimize} from "@/api/system/invWarehouse";
+import {getLocalJoinByUserOptimize} from "@/api/basic/busType";
 import {selectSysParamByKey} from "@/api/param/systemParamConfig";
 import {isBlank} from "@/utils/strUtil";
-import {getBizDetailList, getCheckDetailList} from "@/api/inout/orderDetailBiz";
+import {getCheckDetailList} from "@/api/inout/orderDetailBiz";
 import {
-  getHead,executeFuc
+  getHead, executeFuc
 } from "@/utils/customConfig";
 
 export default {
@@ -557,13 +569,13 @@ export default {
       codeDetailVisible: false,
       addOrderVisible: false,
       total: 0,
-      tableHeader:[],
-      queryList:[],
-      fromList:[],
+      tableHeader: [],
+      queryList: [],
+      fromList: [],
       options: {
-        getInvList:[],
-        getDeptList:[],
-        getBusType:[],
+        getInvList: [],
+        getDeptList: [],
+        getBusType: [],
       },
       loading: false,
       index: null,
@@ -709,7 +721,7 @@ export default {
         .catch(() => {
         });
     },
-    addOrders(_this,row) {
+    addOrders(_this, row) {
       _this.currentRow = row;
       _this.idQuery = {};
       _this.idQuery = row;
@@ -779,7 +791,7 @@ export default {
         .catch(() => {
         });
     },
-    deleteDialog(_this,rowId) {
+    deleteDialog(_this, rowId) {
       _this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -883,7 +895,7 @@ export default {
       this.getBizDetailList();
     },
 
-    handleSelectionChange(_this,val) {
+    handleSelectionChange(_this, val) {
       _this.currentRow = val;
       _this.getBizDetailList();
     },
@@ -909,11 +921,11 @@ export default {
         this.bizTotal = 0;
       })
     },
-    executeFuc(row,type,clickFuc,value){
-      return executeFuc(this,row,type,clickFuc,value);
+    executeFuc(row, type, clickFuc, value) {
+      return executeFuc(this, row, type, clickFuc, value);
     },
-    executeEval(row,expression,defaultRet){
-      if(expression){
+    executeEval(row, expression, defaultRet) {
+      if (expression) {
         return eval(expression);
       }
       return defaultRet;
@@ -928,7 +940,7 @@ export default {
   created() {
     this.getInvList(this);
     this.getBusType(this);
-    getHead("DrugIoDealOrder","1").then((re) => {
+    getHead("DrugIoDealOrder", "1").then((re) => {
       // 处理返回的数据
       this.tableObj = re.data;
       this.tableHeader = re.data.tableList;
diff --git a/src/views/inout/PanelCreateOrderDetailDrug.vue b/src/views/inoutDrug/PanelCreateOrderDetailDrug.vue
similarity index 100%
rename from src/views/inout/PanelCreateOrderDetailDrug.vue
rename to src/views/inoutDrug/PanelCreateOrderDetailDrug.vue