diff --git a/src/api/inout/splitCode.js b/src/api/inout/splitCode.js
new file mode 100644
index 00000000..b373787b
--- /dev/null
+++ b/src/api/inout/splitCode.js
@@ -0,0 +1,12 @@
+
+import axios from "@/utils/request"
+
+
+export function materialPrescribePage(query) {
+  return axios({
+    url: "/udiwms/ioSplit/material/prescribe/filter",
+    method: "get",
+    params: query
+  });
+}
+
diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss
index 42c78b96..7c2d0d60 100644
--- a/src/assets/styles/ruoyi.scss
+++ b/src/assets/styles/ruoyi.scss
@@ -90,7 +90,8 @@
   .el-dialog {
     .el-dialog__header {
     }
-    .el-dialog__body{
+
+    .el-dialog__body {
       //padding: 0;
     }
 
@@ -356,12 +357,12 @@
   /*transition: all .5s;*/
 }
 
-.dialog-footer{
+.dialog-footer {
   text-align: right;
 }
 
 .el-table--mini .el-table__cell {
-  padding:0px!important;
+  padding: 0px !important;
 }
 
 .order-el-row {
@@ -382,10 +383,4 @@
 //  margin-top: -10px;
 //}
 
-.query-form-item {
-  margin-right: 5px;
-  margin-bottom: 51px;
-}
-
-
 
diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue
index ae8988f6..476a6289 100644
--- a/src/views/inout/DialogCreateOrder.vue
+++ b/src/views/inout/DialogCreateOrder.vue
@@ -36,23 +36,6 @@
             <el-button size="mini" type="primary" @click.native="revokeBill()" :loading="retractLoading"
                        v-if="viewType == 7">撤回单据
             </el-button>
-
-            <!--                     v-if="(viewType != 5 && viewType != 6)&&(curAction.checkWebNew != 2  || viewType !=1)"-->
-            <!--          <el-button size="mini" type="primary" @click.native="submit(1)"-->
-            <!--                     v-if="curAction.checkWebNew > 1  && viewType == 1"-->
-            <!--          >待配货提交-->
-            <!--          </el-button>-->
-
-            <!--          <el-button size="mini" type="primary" @click.native="submit(1)"-->
-            <!--                     v-if="viewType == 5"-->
-            <!--          >完成验收-->
-            <!--          </el-button>-->
-
-            <!--          <el-button size="mini" type="primary" @click.native="submit(1)"-->
-            <!--                     v-if=" viewType == 6"-->
-            <!--          >完成验收-->
-            <!--          </el-button>-->
-
           </el-button-group>
         </el-row>
         <el-row>
@@ -81,8 +64,6 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="11">
             <el-form-item prop="invCode" label="当前仓库:">
               <el-select
@@ -108,7 +89,31 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="11">
+          <el-col :span="11" v-if="splitBusType!=null">
+            <el-form-item prop="invCode" label="当前工位:">
+              <el-select
+                v-model="orderFormData.workPlaceCode"
+                placeholder="当前工位"
+                style="width: 90%"
+                :disabled="corpOrderIdDisabled"
+                filterable
+              >
+                <el-option
+                  v-for="item in curWorkPlaces"
+                  :key="item.workplaceId"
+                  :label="item.workplaceName"
+                  :value="item.workplaceId"
+                >
+                  <span style="float: left">{{ item.workplaceName }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 13px">{{
+                      item.workplaceId
+                    }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="11" v-if="!splitBusType">
             <el-form-item prop="action" label="单据类型:">
               <el-select
                 v-model="orderFormData.action"
@@ -129,9 +134,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="11">
+          <el-col :span="11" v-if="!splitBusType">
             <el-form-item
               prop="fromCorp"
               label="往来信息:"
@@ -233,25 +236,9 @@
               </el-select>
 
             </el-form-item>
-
-
-            <!--            <el-form-item-->
-            <!--              prop="fromCorp"-->
-            <!--              label="往来信息:"-->
-            <!--              v-if="curAction.corpType == 1 && curAction.genUnit && orderQuery.billNo != ''"-->
-            <!--            >-->
-            <!--              <el-input-->
-            <!--                v-model="orderFormData.fromCorpName"-->
-            <!--                auto-complete="off"-->
-            <!--                clearable-->
-            <!--                style="width: 90%"-->
-            <!--                :disabled="corpOrderIdDisabled"-->
-            <!--                placeholder="请输入病人住院号"-->
-            <!--              ></el-input>-->
-            <!--            </el-form-item>-->
           </el-col>
           <el-col :span="11">
-            <el-form-item prop="remark" label="备注:">
+            <el-form-item prop="remark" label="单据备注:">
               <el-input
                 v-model="orderFormData.remark"
                 auto-complete="off"
@@ -262,7 +249,9 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="documentShow">
+
+
+        <el-row v-if="curSpaceShow">
           <el-col :span="11">
             <el-form-item prop="acceptance" label="预验收单据:">
               <el-select
@@ -284,8 +273,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row v-if="curSpaceShow">
           <el-col :span="11">
             <el-form-item prop="curSpaceCode" label="当前货位:">
               <el-select
@@ -311,30 +298,6 @@
           </el-col>
         </el-row>
         <el-row v-if="preInSpaceShow">
-          <!--          <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="checkPreInSpaceCode" label="预验收出库货位:">
               <el-select
@@ -409,11 +372,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-
-
         </el-row>
-
-
         <el-row v-if="errView == 1">
           <el-col :span="20">
             <el-form-item prop="errMsg" label="异常信息:">
@@ -660,6 +619,7 @@ 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";
+import {listPage} from "@/api/basic/sysWorkplaceManage";
 
 export default {
   name: "ioCreateOrder",
@@ -693,6 +653,12 @@ export default {
       type: Object,
       required: true,
     },
+    splitBusType: {//科室拆零单据类型
+      type: Object,
+      default: null,
+      required: true,
+    },
+
   },
   data() {
     return {
@@ -716,6 +682,7 @@ export default {
         preSpaceCode: null,
         preCurSpaceCode: null,  //单据
         sickerAdNum: null,
+        workPlaceCode: null,
       },
 
       detailList: [],
@@ -744,6 +711,8 @@ export default {
       curPreSpaceOptions: [],    //寄售货位
       curSpaceOptions: [], //当前货位
 
+      curWorkPlaces: [],
+
       curAction: {
         corpType: 0,
         genUnit: false,
@@ -858,6 +827,7 @@ export default {
             //this.orderFormData.invCode = this.curInvOptions[0].code;
             this.getBusTypeByInv();
             this.findCurSpaceList(this.orderFormData.invCode);
+            this.findCurWorkPlaces();
           }
         })
         .catch(() => {
@@ -908,7 +878,9 @@ export default {
       findByInvUser(query)
         .then((response) => {
           this.busTypeOptions = response.data || [];
-          if (this.busTypeOptions.length == 1) {
+          if (this.splitBusType != null)
+            this.orderFormData.action = this.splitBusType;
+          else if (this.busTypeOptions.length == 1) {
             this.orderFormData.action = this.busTypeOptions[0].action;
             this.actionChange(this.orderFormData.action)
           }
@@ -1204,6 +1176,21 @@ export default {
       })
     },
 
+    //获取当前货位
+    findCurWorkPlaces(val) {
+      let query = {
+        key: val,
+        status: 1,
+        invCode: this.orderFormData.invCode,
+        page: 1,
+        limit: 100,
+      }
+      listPage(query).then((res) => {
+        this.curWorkPlaces = res.data.list || [];
+      })
+    },
+
+
     addInvProduct() {
       this.invQueryData.invCode = this.orderFormData.invCode;
       this.selectInvProductVisible = true;
@@ -1238,6 +1225,9 @@ export default {
         this.$message.warning("请选择单据类型！");
         return;
       }
+      if (this.splitBusType != null) {
+        this.orderFormData.fromCorp = "72198012799726";
+      }
       if (this.curAction.corpType === 0 || this.curAction.corpType === 2 || (this.curAction.corpType === 1 && !this.curAction.genUnit)) {
         if (this.$isBlank(this.orderFormData.fromCorp) && this.$isBlank(this.orderFormData.sickerAdNum)) {
           this.$message.warning("请选择往来单位！");
@@ -1246,13 +1236,13 @@ export default {
       }
       if (this.curAction.corpType == 3) {
         if (this.$isBlank(this.orderFormData.fromInvCode)) {
-          this.$message.warning("请选择往来单位！");
+          this.$message.warning("请选择往来仓库！");
           return;
         }
       }
       if (this.curAction.corpType === 1 && this.curAction.genUnit) {
         if (this.$isBlank(this.orderFormData.fromCorp) && this.$isBlank(this.orderFormData.sickerAdNum)) {
-          this.$message.warning("请选择往来单位！");
+          this.$message.warning("请输入患者信息！");
           return;
         }
       }
@@ -1556,24 +1546,24 @@ export default {
       );
       tQuery.orderId = this.orderFormData.billNo;
       console.log(tQuery.orderId);
-      if (val == 1){
+      if (val == 1) {
         //校验btn
         this.checkLoading = true
-      }else if (val == 2){
+      } else if (val == 2) {
         //扫码btn
         this.codeLoading = true
-      }else {
+      } else {
         this.submitLoading = true
       }
       if (this.viewType == 2) {   //扫码单据立即提交
         submitCodes(tQuery).then((response) => {
-          if (val == 1){
+          if (val == 1) {
             //校验btn
             this.checkLoading = false
-          }else if (val == 2){
+          } else if (val == 2) {
             //扫码btn
             this.codeLoading = false
-          }else {
+          } else {
             this.submitLoading = false
           }
 
@@ -1590,13 +1580,13 @@ export default {
         else
           tQuery.fromVailPi = 1;
         submitBiz(tQuery).then((response) => {
-          if (val == 1){
+          if (val == 1) {
             //校验btn
             this.checkLoading = false
-          }else if (val == 2){
+          } else if (val == 2) {
             //扫码btn
             this.codeLoading = false
-          }else {
+          } else {
             this.submitLoading = false
           }
           if (response.code === 20000) {
@@ -1608,13 +1598,13 @@ export default {
         });
       } else if (this.viewType == 4) {
         submitAllocateBiz(tQuery).then((response) => {
-          if (val == 1){
+          if (val == 1) {
             //校验btn
             this.checkLoading = false
-          }else if (val == 2){
+          } else if (val == 2) {
             //扫码btn
             this.codeLoading = false
-          }else {
+          } else {
             this.submitLoading = false
           }
 
@@ -1912,7 +1902,6 @@ export default {
         this.findSickMethod(this.orderFormData.sickerAdNum)
         this.orderFormData.fromCorp = this.sickerAdNum
       }
-
     }
     if (this.viewTypeKsck) {
       this.curAction.corpType = 1
diff --git a/src/views/inout/IoSplitScanCode.vue b/src/views/inout/IoSplitScanCode.vue
new file mode 100644
index 00000000..431e2455
--- /dev/null
+++ b/src/views/inout/IoSplitScanCode.vue
@@ -0,0 +1,743 @@
+<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">-->
+        <!--&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-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)"
+                          class="query-form-item"
+                          :label="item.columnDesc+`:`" :key="item.id">
+              <el-input
+                v-model="filterQuery[item.columnName]"
+                :placeholder="item.columnDesc"
+                :disabled="executeEval(null,item.disabledFuc,false)"
+                @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"   class="query-form-item"
+                          :label="item.columnDesc+`:`">
+              <el-select v-model="filterQuery[item.columnName]"
+                         :placeholder="item.columnDesc"
+                         :disabled="executeEval(null,item.disabledFuc,false)"
+                         clearable>
+                <el-option
+                  v-for="dict in item.lableRuleObj"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)"   class="query-form-item"
+                          :label="item.columnDesc+`:`">
+              <el-select
+                v-model="filterQuery[item.columnName]"
+                :placeholder="item.columnDesc"
+                @change="executeFuc($event,'5',item.checkRules)"
+                :disabled="executeEval(null,item.disabledFuc,false)"
+                filterable
+                remote
+                :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
+                clearable>
+                <el-option
+                  v-for="item in options[item.clickFuc]"
+                  :key="item.code"
+                  :label="item.label"
+                  :value="item.code"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)"   class="query-form-item"
+                          :label="item.columnDesc+`:`">
+              <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="actDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              ></el-date-picker>
+            </el-form-item>
+            <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)"   class="query-form-item"
+                          :label="item.columnDesc+`:`">
+              <el-date-picker
+                v-model="filterQuery[item.columnName]"
+                :style="`width:${item.width+'px'}`"
+                value-format="yyyy-MM-dd"
+                :disabled="executeEval(null,item.disabledFuc,false)"
+                type="date"
+                :placeholder="item.columnDesc"
+              ></el-date-picker>
+            </el-form-item>
+          </template>
+        </el-row>
+      </el-form>
+      <div class="top-right-btn">
+        <el-button-group>
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh"
+            @click="onReset"
+          >重置
+          </el-button>
+          <el-button type="primary" icon="el-icon-search" @click="onSubmit"
+          >查询
+          </el-button
+          >
+          <el-button type="primary" icon="el-icon-plus" @click="addOrders">新增单据</el-button>
+          <el-button type="danger" icon="el-icon-error" @click="errOrderDialog">异常扫码单</el-button>
+        </el-button-group>
+      </div>
+      <el-divider style="margin: 15px"></el-divider>
+      <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
+                border :default-sort="defaultSort"
+                @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>
+      <el-dialog
+        :title="titleMap[title]"
+        :visible.sync="addOrderVisible"
+        width="85%"
+        append-to-body
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="addOrderVisible"
+        @close='closeDialog'
+      >
+        <addOrder
+          :closeDialog="closeDialog"
+          :orderQuery="idQuery"
+          :splitBusType="splitBusType"
+          :viewType="viewType"
+        ></addOrder>
+      </el-dialog>
+      <el-dialog
+        title="异常扫码单"
+        :visible.sync="errOrderVisible"
+        width="85%"
+        append-to-body
+        :close-on-click-modal="false"
+        :close-on-press-escape="false"
+        v-if="errOrderVisible"
+        @close='closeDialog'
+      >
+        <err-order
+        ></err-order>
+      </el-dialog>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="filterQuery.page"
+        :limit.sync="filterQuery.limit"
+        @pagination="getList"
+      />
+    </el-card>
+  </div>
+</template>
+
+<script>
+import {
+  deleteByOrderId,
+  getOrderList, submitCodes
+} from "../../api/inout/order";
+import addOrder from "./DialogCreateOrder";
+import errOrder from "./IoCreateErrorOrder";
+import {getInvListByUser, getInvListByUserOptimize} from "@/api/system/invWarehouse";
+import {getLocalJoinByUser, getLocalJoinByUserOptimize} from "@/api/basic/busType";
+import {selectSysParamByKey} from "@/api/param/systemParamConfig";
+import {getCorrespondence} from "@/api/basic/basicUnitMaintain";
+import {
+  getHead, executeFuc
+} from "@/utils/customConfig";
+import {getDeptListByUserOptimize} from "@/api/auth/authDept";
+
+export default {
+  name: "IoCreateScanOrder",
+  data() {
+    return {
+      defaultSort: {prop: 'createTime', order: 'desc'},
+      showSearch: true,
+      titleMap: {
+        add: "新增单据",
+        edit: "编辑单据",
+      },
+      title: "add",
+
+      filterQuery: {
+        id: "",
+        billNo: null,
+        mainAction: null,
+        action: null,
+        statusType: "scan_code",
+        page: 1,
+        limit: 10,
+        startTime: null,
+        endTime: null,
+        keyWords: null,
+        invCode: this.$store.getters.locInvCode,
+      },
+      fromOptions: [],
+      checkStatus: {
+        1: "草稿",
+        2: "等待处理",
+        3: "等待校验",
+        4: "处理异常",
+        5: "校验成功",
+        6: "校验异常",
+        7: "已审核",
+        8: "审核拒绝",
+        9: "正在处理", 10: "待审核", 11: "待配货",
+      },
+      curIndex: "",
+      idQuery: {},
+      storageList: [],
+      invList: [],
+      list: [],
+      addOrderVisible: false,
+      errOrderVisible: false,
+      total: 0,
+      tableHeader: [],
+      queryList: [],
+      fromList: [],
+      options: {
+        getInvList: [],
+        getDeptList: [],
+        getBusType: [],
+      },
+      loading: false,
+      index: null,
+      formName: null,
+      errorDetail: "",
+      formMap: {
+        add: "新增",
+        edit: "编辑",
+      },
+      enableDept: false,
+      splitBusType:"SC72197936495755",
+      fromTypeMap: {
+        "1": "UDIMS平台",
+        "2": "网页新增",
+        "3": "pda即时校验",
+        "4": "pda未校验",
+        "5": "pc端扫码精灵",
+        "6": "流转自动补单",
+        "7": "UDI供应商平台",
+        "8": "平衡补录单据",
+        "10": "手动补单",
+        "11": "仓库盘点",
+        "12": "采购计划",
+        "13": "领用单据",
+        "14": "第三方系统单据",
+      },
+      deleteData: {
+        billNo: "",
+        status: 10,
+      },
+      dialogTableVisible: false,
+      formLoading: false,
+      deleteLoading: false,
+      busTypes: [],
+      actDateRange: [],
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+      viewType: 2,
+    };
+  },
+
+  components: {
+    addOrder, errOrder
+  },
+  methods: {
+    onReset() {
+      this.filterQuery = {
+        id: "",
+        billNo: null,
+        mainAction: null,
+        action: null,
+        statusType: "scan_code",
+        page: 1,
+        limit: 10,
+        startTime: null,
+        endTime: null,
+        invCode: this.$store.getters.locInvCode,
+      };
+      this.actDateRange = [];
+      this.getList();
+    },
+    onSubmit() {
+      if (this.actDateRange !== null) {
+        this.filterQuery.startTime = this.actDateRange[0];
+        this.filterQuery.endTime = this.actDateRange[1];
+      } else {
+        this.filterQuery.startTime = null;
+        this.filterQuery.endTime = null;
+      }
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    getBusType(_this) {
+      let query = {
+        code: this.filterQuery.invCode,
+        enabled: true,
+      };
+      getLocalJoinByUserOptimize(query)
+        .then((response) => {
+          _this.options.getBusType = response.data || [];
+          _this.getList();
+        })
+        .catch(() => {
+        });
+    },
+    addOrders() {
+      this.idQuery = {};
+      this.title = "add";
+      this.addOrderVisible = true;
+    },
+
+    editOrder(_this, row) {
+      _this.idQuery = row;
+      _this.title = "edit";
+      _this.addOrderVisible = true;
+    },
+
+    closeDialog() {
+      this.addOrderVisible = false;
+      this.addHosOrderVisible = false;
+      this.getList();
+    },
+
+    handleSortChange(column, prop, order) {
+      if (column.order === 'descending') {
+        this.filterQuery.sort = 'desc'
+      } else {
+        this.filterQuery.sort = 'asc'
+      }
+      this.filterQuery.orderBy = column.prop;
+      this.getList();
+    },
+
+
+    //获取订单列表
+    getList() {
+      this.loading = true;
+      getOrderList(this.filterQuery)
+        .then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.list = response.data.list || [];
+            this.total = response.data.total || 0;
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch((error) => {
+          this.$message.error(error.message)
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    deleteOrders(data) {
+      this.loading = true;
+      this.deleteData.billNo = data;
+      deleteByOrderId(this.deleteData)
+        .then((response) => {
+
+          if (response.code == 20000) {
+            this.getList();
+            this.$message({
+              type: "success",
+              message: "删除成功！",
+            });
+          } else if (response.code == 520) {
+            this.$message.error("新增扫码单据列表已不存在该扫码单据！");
+            this.getList();
+          } else {
+            this.$message.error(response.message);
+            this.getList();
+          }
+
+        })
+        .catch(() => {
+        });
+    },
+    deleteDialog(_this, rowId) {
+      _this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          _this.deleteOrders(rowId.billNo);
+        })
+        .catch(() => {
+        });
+    },
+
+
+    onUpload(data) {
+      this.loading = true;
+      var idQuery = {
+        billNo: "",
+      };
+      idQuery.billNo = data;
+      submitCodes(idQuery)
+        .then((response) => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.$message.success("提交成功");
+            this.getList();
+          } else {
+            this.$message.error(response.message);
+          }
+          this.loading = false;
+        });
+    },
+    getInvList(_this) {
+      getInvListByUserOptimize()
+        .then((response) => {
+          _this.options.getInvList = response.data || [];
+          _this.getList();
+        })
+        .catch(() => {
+        });
+    },
+    invChange(_this) {
+      _this.filterQuery.action = null;
+      _this.getBusType(_this);
+    },
+
+    findMethod(query) {
+      this.fromOptions = [];
+      let cQuery = {
+        key: query,
+        corpType: 2,
+        page: 1,
+        limit: 10,
+      };
+      getCorrespondence(cQuery)
+        .then((response) => {
+          this.loading = false;
+          this.fromOptions = response.data.list || [];
+        })
+        .catch(() => {
+          this.loading = false;
+          this.fromOptions = [];
+        });
+    },
+    statusFilterType(status) {
+      const statusMap = {
+        2: "warning",
+        1: "warning",
+        4: "danger",
+        3: "success",
+      };
+      return statusMap[status];
+    },
+
+    errOrderDialog() {
+      this.errOrderVisible = true;
+    },
+    executeFuc(row, type, clickFuc, value) {
+      return executeFuc(this, row, type, clickFuc, value);
+    },
+    executeEval(row, expression, defaultRet) {
+      if (expression) {
+        return eval(expression);
+      }
+      return defaultRet;
+    }
+  },
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.getInvList(this);
+    this.getBusType(this);
+    getHead("IoSplitCodeOrder", "1").then((re) => {
+      // 处理返回的数据
+      this.tableObj = re.data;
+      this.tableHeader = re.data.tableList;
+      this.queryList = re.data.queryList;
+      this.fromList = re.data.fromList;
+      this.getList();
+    });
+    selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => {
+      if (res.code === 20000) {
+        if (res.data.paramValue === "0") {
+          this.enableDept = true;
+        }
+      }
+    })
+
+  },
+};
+</script>
+
+<style scoped>
+.query-form {
+  display: flex;
+  flex-wrap: wrap;
+  width: 100%;
+}
+.query-form-item {
+  margin-right: 5px;
+  margin-bottom: 6px;
+}
+
+</style>
+
diff --git a/src/views/inout/split/PrescribeTagCode.vue b/src/views/inout/split/PrescribeTagCode.vue
new file mode 100644
index 00000000..3b99ba8c
--- /dev/null
+++ b/src/views/inout/split/PrescribeTagCode.vue
@@ -0,0 +1,36 @@
+<template>
+  <div>
+    <el-tabs type="border-card" style="margin: 15px">
+
+      <el-tab-pane label="按患者处方查询">
+        <prescribePanel
+        ></prescribePanel>
+      </el-tab-pane>
+
+      <el-tab-pane label="扫码查询">
+        <codePanel
+        ></codePanel>
+      </el-tab-pane>
+
+    </el-tabs>
+
+
+  </div>
+</template>
+
+<script>
+
+import prescribePanel from "./prescribePanel";
+import codePanel from "./codePanel";
+
+export default {
+  name: "PrescribeTagCode",
+  components: {
+    prescribePanel, codePanel
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/inout/split/codePanel.vue b/src/views/inout/split/codePanel.vue
new file mode 100644
index 00000000..14aeffbc
--- /dev/null
+++ b/src/views/inout/split/codePanel.vue
@@ -0,0 +1,17 @@
+<template>
+  <div>
+
+
+
+  </div>
+</template>
+
+<script>
+export default {
+  name: "codePanel"
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/inout/split/prescribePanel.vue b/src/views/inout/split/prescribePanel.vue
new file mode 100644
index 00000000..fd089512
--- /dev/null
+++ b/src/views/inout/split/prescribePanel.vue
@@ -0,0 +1,682 @@
+<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' }"
+                @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="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-tab-pane label="赋码明细">
+
+        <el-table v-loading="codeLoading" :data="codeDetailList" 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="codeTotal>0"
+          :total="codeTotal"
+          :limit.sync="codeQuery.limit"
+          :page.sync="codeQuery.page"
+          @pagination="codeHandleCurrentChange"
+        ></pagination>
+
+      </el-tab-pane>
+
+    </el-tabs>
+
+
+  </div>
+</template>
+
+<script>
+import addOrder from "@/views/inout/DialogCreateOrder";
+import errOrder from "@/views/inout/IoCreateErrorOrder";
+import {executeFuc, getHead} from "@/utils/customConfig";
+import store from "@/store";
+import {filterOrder} from "@/api/inout/order";
+import {convertDate} from "@/utils/date";
+import {detail, page as prescribePage} from "@/api/basic/sicker/prescribeApi";
+import {materialPrescribePage} from "@/api/inout/splitCode";
+
+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,
+
+
+      preLoading: false,
+      preDetailList: [],
+      preTotal: 0,
+      preQuery: {
+        prescribeCode: null,
+        page: 1,
+        limit: 10,
+      },
+      codeLoading: false,
+      codeDetailList: [],
+      codeTotal: 0,
+      codeQuery: {
+        page: 1,
+        limit: 10,
+      },
+    }
+  },
+
+  components: {
+    addOrder, errOrder
+  },
+  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();
+    },
+    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("数据加载失败")
+      })
+    },
+
+    getCodeDetail(_this, row) {
+
+      if (row != null) {
+        _this.codeQuery.page = 1
+        _this.codeQuery.prescribeNum = row.code
+      }
+      _this.codeLoading = true;
+      materialPrescribePage(_this.codeQuery).then(res => {
+        _this.codeLoading = false
+        if (res.code != 20000) {
+          _this.$message.error(res.message)
+          return
+        }
+        _this.codeDetailList = res.data.list
+        _this.codeLoading = false
+      }).catch(() => {
+        _this.codeLoading = false
+        _this.$message.error("数据加载失败")
+      })
+
+    },
+
+
+    preHandleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getPrescribeDetail(this, null);
+    },
+
+
+    codeHandleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getCodeDetail(this, null);
+    },
+
+
+  },
+  created() {
+    getHead("prescribePanel", "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("prescribePanel-1", "1").then((re) => {
+      // 处理返回的数据
+      this.tableObj1 = re.data;
+      this.tableHeader1 = re.data.tableList;
+      this.queryList1 = re.data.queryList;
+      this.fromList1 = re.data.fromList;
+      this.getList();
+    });
+
+    getHead("prescribePanel-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/system/customConfig/configDetail.vue b/src/views/system/customConfig/configDetail.vue
index 072f3322..d04cdba7 100644
--- a/src/views/system/customConfig/configDetail.vue
+++ b/src/views/system/customConfig/configDetail.vue
@@ -46,7 +46,7 @@
         <el-table-column prop="buttonRule" show-overflow-tooltip="true" label="按钮规则"></el-table-column>
         <el-table-column prop="clickFuc" label="点击事件"></el-table-column>
         <el-table-column prop="hasPermi" label="是否展示eval表达式"></el-table-column>
-        <el-table-column label="操作">
+        <el-table-column label="操作" fixed="right" width="100">
           <template slot-scope="scope">
            <el-button
              type="text"
diff --git a/src/views/system/customConfig/configFromDetail.vue b/src/views/system/customConfig/configFromDetail.vue
index 9d23b721..6db2b5ac 100644
--- a/src/views/system/customConfig/configFromDetail.vue
+++ b/src/views/system/customConfig/configFromDetail.vue
@@ -49,7 +49,7 @@
              <span>{{ isShowXxMap[scope.row.isShowXx] }}</span>
            </template>
          </el-table-column>
-        <el-table-column label="操作">
+        <el-table-column label="操作" fixed="right" width="100">
           <template slot-scope="scope">
            <el-button
              type="text"
diff --git a/src/views/system/customConfig/configQueryDetail.vue b/src/views/system/customConfig/configQueryDetail.vue
index 8483b4c6..b590ca12 100644
--- a/src/views/system/customConfig/configQueryDetail.vue
+++ b/src/views/system/customConfig/configQueryDetail.vue
@@ -3,7 +3,7 @@
   <div>
     <el-card>
       <el-form :inline="true" :model="query" class="query-form" size="mini">
-        <el-form-item class="query-form-item" label="列名:">
+        <el-form-item class="query-form-item" label="字段:">
           <el-input v-model="query.columnName" clearable placeholder="列名"></el-input>
         </el-form-item>
         <el-form-item>
@@ -17,14 +17,15 @@
       <el-table :data="list" border highlight-current-row  row-key="id"
         style="width: 100%">
         <el-table-column label="序号" type="index" ref="dataForm"></el-table-column>
-        <el-table-column prop="columnName" label="列名"> </el-table-column>
+        <el-table-column prop="columnDesc" label="标题"></el-table-column>
+        <el-table-column prop="columnName" label="字段"> </el-table-column>
         <el-table-column prop="isShow" label="是否展示">
           <template slot-scope="scope">
             <span>{{ isShowMap[scope.row.isShow] }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="columnDesc" label="列描述"></el-table-column>
-        <el-table-column prop="columnType" label="列类型">
+
+        <el-table-column prop="columnType" label="表单类型">
           <template slot-scope="scope">
             <span>{{ columnTypeMap[scope.row.columnType] }}</span>
           </template>
@@ -41,7 +42,7 @@
             <span>{{ isShowXxMap[scope.row.isShowXx] }}</span>
           </template>
         </el-table-column>sss
-        <el-table-column label="操作">
+        <el-table-column label="操作" fixed="right" width="100">
           <template slot-scope="scope">
            <el-button
              type="text"
@@ -61,12 +62,20 @@
       <el-form :model="subData" ref="dataForm" :rules="formRules" label-width="130px">
         <el-row :gutter="20" class="el-row" type="flex">
           <el-col :span="12" class="el-col">
-            <el-form-item label="列名" prop="columnName" class="query-form-item">
-              <el-input v-model="subData.columnName" style="width: 80%" placeholder="请输入业列名"
+            <el-form-item label="字段" prop="columnName" class="query-form-item">
+              <el-input v-model="subData.columnName" style="width: 80%" placeholder="请输入字段"
                 auto-complete="off"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="20" class="el-row" type="flex">
+          <el-col :span="12" class="el-col">
+            <el-form-item label="标题" prop="columnDesc" class="query-form-item">
+              <el-input v-model="subData.columnDesc" style="width: 80%" placeholder="请输入标题"
+                        auto-complete="off"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row :gutter="20" class="el-row" type="flex">
           <el-col :span="12" class="el-col">
             <el-form-item label="是否展示" prop="columnType">
@@ -77,14 +86,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-       <el-row :gutter="20" class="el-row" type="flex">
-         <el-col :span="12" class="el-col">
-           <el-form-item label="列描述" prop="columnDesc" class="query-form-item">
-             <el-input v-model="subData.columnDesc" style="width: 80%" placeholder="请输入列描述"
-               auto-complete="off"></el-input>
-           </el-form-item>
-         </el-col>
-       </el-row>
+
         <el-row :gutter="20" class="el-row" type="flex">
           <el-col :span="12" class="el-col">
             <el-form-item label="列类型" prop="columnType">
diff --git a/src/views/system/customConfig/index.vue b/src/views/system/customConfig/index.vue
index 1f0ef6b7..ab9133bd 100644
--- a/src/views/system/customConfig/index.vue
+++ b/src/views/system/customConfig/index.vue
@@ -3,16 +3,16 @@
   <div>
     <el-card>
       <el-form :inline="true" :model="query" class="query-form" size="mini">
-        <el-form-item class="query-form-item" label="业务标识:">
-          <el-input v-model="query.businessType" clearable placeholder="业务标识"></el-input>
+        <el-form-item class="query-form-item" label="页面名称:">
+          <el-input v-model="query.remark" clearable placeholder="请输入页面名称"></el-input>
         </el-form-item>
-        <el-form-item class="query-form-item" label="备注:">
-          <el-input v-model="query.remark" clearable placeholder="备注"></el-input>
+        <el-form-item class="query-form-item" label="页面标识:">
+          <el-input v-model="query.businessType" clearable placeholder="页面标识"></el-input>
         </el-form-item>
         <el-form-item label="表单类型:" prop="type">
           <el-select v-model="query.type" placeholder="请选择类型" style="width: 90%">
-            <el-option label="列表" :value="1" />
-            <el-option label="表单" :value="2" />
+            <el-option label="列表" :value="1"/>
+            <el-option label="表单" :value="2"/>
           </el-select>
         </el-form-item>
         <el-form-item>
@@ -24,27 +24,27 @@
         </el-form-item>
       </el-form>
       <el-table :data="list" border highlight-current-row
-          @current-change="handSubCurrentChange"
-       row-key="id"
-        style="width: 100%">
+                @current-change="handSubCurrentChange"
+                row-key="id"
+                style="width: 100%">
         <el-table-column label="序号" type="index" ref="dataForm"></el-table-column>
-        <el-table-column prop="businessType" label="业务标识"> </el-table-column>
-        <el-table-column prop="remark" label="备注"> </el-table-column>
+        <el-table-column prop="remark" label="菜单名称"></el-table-column>
+        <el-table-column prop="businessType" label="业务标识"></el-table-column>
         <el-table-column prop="type" label="类型">
           <template slot-scope="scope">
             <span>{{ typeMap[scope.row.type] }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="handleChangeFuc" label="列表点击方法"> </el-table-column>
+        <el-table-column prop="handleChangeFuc" label="列表点击方法"></el-table-column>
         <el-table-column label="操作" width="220">
           <template slot-scope="scope">
-           <el-button
-             type="text"
+            <el-button
+              type="text"
               @click.native="handleSubForm(scope.row, 'edit')"
-              >编辑
-              </el-button>
-              <el-button type="text" @click.native="handleDel(scope.row)">删除
-              </el-button>
+            >编辑
+            </el-button>
+            <el-button type="text" @click.native="handleDel(scope.row)">删除
+            </el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -59,13 +59,14 @@
 
     <!--仓库编辑对话框-->
     <el-dialog :title="formMap[formName]" :close-on-click-modal="false"
-      :close-on-press-escape="false" :visible.sync="formVisible" :before-close="hideForm" width="60%" top="5vh">
+               :close-on-press-escape="false" :visible.sync="formVisible" :before-close="hideForm" width="60%"
+               top="5vh">
       <el-form :model="subData" ref="dataForm" :rules="formRules" label-width="130px">
         <el-row :gutter="20" class="el-row" type="flex">
           <el-col :span="12" class="el-col">
             <el-form-item label="业务标识" prop="businessType" class="query-form-item">
               <el-input v-model="subData.businessType" style="width: 80%" placeholder="请输入业务标识"
-                auto-complete="off"></el-input>
+                        auto-complete="off"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -81,8 +82,8 @@
           <el-col :span="12" class="el-col">
             <el-form-item label="类型" prop="type">
               <el-select v-model="subData.type" placeholder="请选择类型" style="width: 80%">
-                <el-option label="列表" value="1" />
-                <el-option label="表单" value="2" />
+                <el-option label="列表" value="1"/>
+                <el-option label="表单" value="2"/>
               </el-select>
             </el-form-item>
           </el-col>
@@ -110,14 +111,14 @@
 
         <config-detail
           :info="configParms"
-          :type ="1"
+          :type="1"
         ></config-detail>
       </el-tab-pane>
       <el-tab-pane>
         <span slot="label">自定义查询框-详细配置</span>
         <config-query-detail
           :info="configParms"
-          :type ="2"
+          :type="2"
         ></config-query-detail>
       </el-tab-pane>
 
@@ -125,7 +126,7 @@
         <span slot="label">自定义表单-详细配置</span>
         <config-from-detail
           :info="configParms"
-          :type ="3">
+          :type="3">
         </config-from-detail>
       </el-tab-pane>
     </el-tabs>
@@ -133,192 +134,193 @@
 </template>
 
 <script>
-  import {
-    list,
-    saveCustomConfig,
-    devCustomConfig
-  } from "@/api/system/sysCustomConfig";
-  import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-  import configDetail from "@/views/system/customConfig/configDetail";
-  import configFromDetail from "@/views/system/customConfig/configFromDetail";
-  import configQueryDetail from "@/views/system/customConfig/configQueryDetail";
-  import {
-    isBlank
-  } from "@/utils/strUtil";
+import {
+  list,
+  saveCustomConfig,
+  devCustomConfig
+} from "@/api/system/sysCustomConfig";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import configDetail from "@/views/system/customConfig/configDetail";
+import configFromDetail from "@/views/system/customConfig/configFromDetail";
+import configQueryDetail from "@/views/system/customConfig/configQueryDetail";
+import {
+  isBlank
+} from "@/utils/strUtil";
 
-  export default {
-    data() {
-      return {
-        //---------------仓库相关-------------------
-        query: {
-          name: null,
-          remark: null,
-          type: null,
-          page: 1,
-          limit: 10,
-        },
-        loading: true,
-        list: [],
-        formName: null,
-        formMap: {
-          add: "配置界面信息-新增",
-          edit: "配置界面信息-编辑",
-        },
-        configParms: {
-          configId:null,
-        },
-        formVisible: false,
-        subData: {},
-        formRules: {
-          businessType: [{ required: true, message: "请输入业务标识", trigger: "blur" }],
-          type: [
-            { required: true, message: "请选择类型", trigger: "blur" },
-          ],
-        },
-        isExpandAll: true,
-        total: 0,
-        typeMap: {
-          1: "列表",
-          2: "表单",
-        },
-      };
-    },
-    methods: {
-      //----------------仓库相关-----------------
-      /* 重置按钮  点击事件 */
-      onReset() {
-        this.$router.push({
-          path: "",
-        });
-        this.query = {
-          name: "",
-          type: "",
-          remark: "",
-          page: 1,
-          limit: 10,
-        };
-        this.getList();
-
-        this.configParms = {
-          configId:null
-        };
+export default {
+  data() {
+    return {
+      //---------------仓库相关-------------------
+      query: {
+        name: null,
+        remark: null,
+        type: null,
+        page: 1,
+        limit: 10,
       },
-      /* 查询按钮点击事件 */
-      onSubmit() {
-        this.getList();
+      loading: true,
+      list: [],
+      formName: null,
+      formMap: {
+        add: "配置界面信息-新增",
+        edit: "配置界面信息-编辑",
       },
-
-      handSubCurrentChange(row) {
-        //加载货位信息
-        this.configDetail(row);
-
+      configParms: {
+        configId: null,
       },
-      configDetail(row) {
-        this.configParms = {
-          configId: row.id,
-          page:1
-        };
+      formVisible: false,
+      subData: {},
+      formRules: {
+        businessType: [{required: true, message: "请输入业务标识", trigger: "blur"}],
+        type: [
+          {required: true, message: "请选择类型", trigger: "blur"},
+        ],
       },
-      getList() {
-        //获取仓库信息
-        this.loading = true;
-        this.list = [];
-        list(this.query)
-          .then((response) => {
-            this.loading = false;
-            this.list = response.data.list || [];
-            this.total = response.data.total || 0;
-          })
-          .catch(() => {
-            this.loading = false;
-            this.total = 0;
-            this.list = [];
-          });
+      isExpandAll: true,
+      total: 0,
+      typeMap: {
+        1: "列表",
+        2: "表单",
       },
-      /* 新增 编辑点击事件 */
-      handleSubForm(data, formName) {
-        this.formName = formName;
-        this.subData = JSON.parse(JSON.stringify(data));
-        this.formVisible = true;
+    };
+  },
+  methods: {
+    //----------------仓库相关-----------------
+    /* 重置按钮  点击事件 */
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.query = {
+        name: "",
+        type: "",
+        remark: "",
+        page: 1,
+        limit: 10,
+      };
+      this.getList();
 
-      },
+      this.configParms = {
+        configId: null
+      };
+    },
+    /* 查询按钮点击事件 */
+    onSubmit() {
+      this.getList();
+    },
 
-      /* 删除按钮点击事件 */
-      handleDel(row) {
-        if (row.id) {
-          this.$confirm("确认删除该配置吗?", "提示", {
-              type: "warning",
-            })
-            .then(() => {
-              this.deleteLoading = true;
-              let para = {
-                id: row.id
-              };
-              devCustomConfig(para)
-                .then((response) => {
-                  this.deleteLoading = false;
-                  if (response.code !== 20000) {
-                    this.$message.error(response.message);
-                    return false;
-                  }
-                  this.getList();
-                  this.$message.success("删除成功");
-                })
-                .catch(() => {
-                  this.deleteLoading = false;
-                });
-            })
-            .catch(() => {
-              this.$message.info("取消删除");
-            });
-        }
-      },
+    handSubCurrentChange(row) {
+      //加载货位信息
+      this.configDetail(row);
 
-      hideForm() {
-        // 新增，编辑---取消
-        this.formVisible = false;
-        this.resetForm();
-        return true;
-      },
-      // 刷新表单
-      resetForm() {
-        if (this.$refs["dataForm"]) {
-          // 清空验证信息表单
-          this.$refs["dataForm"].clearValidate();
-          // 刷新表单
-          this.$refs["dataForm"].resetFields();
-          this.getList();
-        }
-      },
-      forSubmit() {
-        this.query.page = 1;
-        // 新增，编辑---提交
-        this.$refs["dataForm"].validate((valid) => {
-          if (valid) {
-            saveCustomConfig(this.subData, this.formName)
+    },
+    configDetail(row) {
+      this.configParms = {
+        configId: row.id,
+        page: 1
+      };
+    },
+    getList() {
+      //获取仓库信息
+      this.loading = true;
+      this.list = [];
+      list(this.query)
+        .then((response) => {
+          this.loading = false;
+          this.list = response.data.list || [];
+          this.total = response.data.total || 0;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.total = 0;
+          this.list = [];
+        });
+    },
+    /* 新增 编辑点击事件 */
+    handleSubForm(data, formName) {
+      this.formName = formName;
+      this.subData = JSON.parse(JSON.stringify(data));
+      this.formVisible = true;
+
+    },
+
+    /* 删除按钮点击事件 */
+    handleDel(row) {
+      if (row.id) {
+        this.$confirm("确认删除该配置吗?", "提示", {
+          type: "warning",
+        })
+          .then(() => {
+            this.deleteLoading = true;
+            let para = {
+              id: row.id
+            };
+            devCustomConfig(para)
               .then((response) => {
-                this.formVisible = false;
-                if (response.code == 20000) {
-                  this.getList();
-                } else {
+                this.deleteLoading = false;
+                if (response.code !== 20000) {
                   this.$message.error(response.message);
+                  return false;
                 }
+                this.getList();
+                this.$message.success("删除成功");
               })
               .catch(() => {
-                this.formVisible = false;
+                this.deleteLoading = false;
               });
-          }
-        });
-      },
+          })
+          .catch(() => {
+            this.$message.info("取消删除");
+          });
+      }
     },
-    mounted() {},
-    components: {
-      configDetail,
-      configFromDetail,
-      configQueryDetail,
+
+    hideForm() {
+      // 新增，编辑---取消
+      this.formVisible = false;
+      this.resetForm();
+      return true;
     },
-    created() {
-      this.getList();
+    // 刷新表单
+    resetForm() {
+      if (this.$refs["dataForm"]) {
+        // 清空验证信息表单
+        this.$refs["dataForm"].clearValidate();
+        // 刷新表单
+        this.$refs["dataForm"].resetFields();
+        this.getList();
+      }
+    },
+    forSubmit() {
+      this.query.page = 1;
+      // 新增，编辑---提交
+      this.$refs["dataForm"].validate((valid) => {
+        if (valid) {
+          saveCustomConfig(this.subData, this.formName)
+            .then((response) => {
+              this.formVisible = false;
+              if (response.code == 20000) {
+                this.getList();
+              } else {
+                this.$message.error(response.message);
+              }
+            })
+            .catch(() => {
+              this.formVisible = false;
+            });
+        }
+      });
     },
-  };
+  },
+  mounted() {
+  },
+  components: {
+    configDetail,
+    configFromDetail,
+    configQueryDetail,
+  },
+  created() {
+    this.getList();
+  },
+};
 </script>