diff --git a/src/api/collect/collectOrder.js b/src/api/collect/collectOrder.js
index ac317bb1..1a289cf6 100644
--- a/src/api/collect/collectOrder.js
+++ b/src/api/collect/collectOrder.js
@@ -317,3 +317,12 @@ export function orderMedicalDelete(query) {
     data: query
   });
 }
+
+
+export function returnOrderSubmit(query) {
+  return axios({
+    url: "/udiwms/basic/collect/origin/order/returnSubmit",
+    method: "post",
+    data: query
+  });
+}
diff --git a/src/api/collect/collectOriginOrder.js b/src/api/collect/collectOriginOrder.js
index f6e701dd..f4c10544 100644
--- a/src/api/collect/collectOriginOrder.js
+++ b/src/api/collect/collectOriginOrder.js
@@ -16,3 +16,11 @@ export function orderDetail(query) {
     params: query
   });
 }
+
+export function getOrderUpload(query) {
+  return axios({
+    url: "/udiwms/basic/collect/origin/orderUpload",
+    method: "get",
+    params: query
+  });
+}
diff --git a/src/views/collect/CollectOrderNew.vue b/src/views/collect/CollectOrderNew.vue
index e2b9906d..97f9ac4c 100644
--- a/src/views/collect/CollectOrderNew.vue
+++ b/src/views/collect/CollectOrderNew.vue
@@ -487,7 +487,7 @@ export default {
       showSearch: false,
       filterQuery: {
         // tagStatus: this.tagStatus,    //
-        tagStatusList: [0, 1, 2],    //
+        tagStatusList: [0, 1, 2,3],    //
         billNo: null,
         busType: null,
         workPlaceCode: null,
@@ -633,7 +633,7 @@ export default {
     },
     onReset() {
       this.filterQuery = {
-        tagStatusList: [0, 1, 2],
+        tagStatusList: [0, 1, 2,3],
         billNo: null,
         busType: null,
         workPlaceCode: null,
diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue
index 7e0316a0..7457adc8 100644
--- a/src/views/collect/DealOrder.vue
+++ b/src/views/collect/DealOrder.vue
@@ -4,9 +4,9 @@
       <el-card>
 
 
-
         <el-row style="margin-top: 6px;margin-bottom: -6px;"
-                v-if="this.formDataVisible != null &&  this.formDataVisible.scanType == 1">
+                v-if="this.formDataVisible != null &&  this.formDataVisible.scanType == 1"
+        >
           <!--          <el-col :span="6">-->
           <!--            <el-form-item prop="workPlaceCode" class="query-form-item" label="当前工位:">-->
           <!--              <el-select-->
@@ -66,7 +66,8 @@
                   v-for="item in invList"
                   :key="item.name"
                   :label="item.name"
-                  :value="item.code">
+                  :value="item.code"
+                >
                   <span style="float: left">{{ item.name }}</span>
                 </el-option>
               </el-select>
@@ -81,7 +82,8 @@
                          remote
                          reserve-keyword
                          @change="changeCorp"
-                         placeholder="请选择收货方" clearable style="width: 90%">
+                         placeholder="请选择收货方" clearable style="width: 90%"
+              >
                 <el-option
                   v-for="item in fromInvOptions"
                   :key="item.code"
@@ -121,40 +123,40 @@
 
             <el-col :span="8">
               <el-button-group style="display: flex; margin-left: 15px;height: 36px">
-              <el-button type="primary" @click.native="deleteCode"
-                         v-if="labelName == 1"
-                         :disabled="formData.billNo == null"
-              >扫码剔除
-              </el-button>
-              <el-button size="mini" type="primary"
-                         v-if="labelName == 2"
-                         @click.native="overdeleteCode"
-              >结束剔除
-              </el-button>
-              <el-button
-                type="primary"
-                :disabled="formData.billNo ||(this.formDataVisible != null &&  this.formDataVisible.scanType == 1)"
-                @click.native="selectPrescribe()"
-              >选单
-              </el-button>
-              <el-button
-                type="primary"
-                :disabled="!formData.billNo"
-                @click.native="saveDraftOrder()"
-              >挂起
-              </el-button>
-              <el-button
-                type="primary"
-                :disabled="!formData.billNo"
-                @click.native="cancelOrder()"
-              >放弃
-              </el-button>
-              <el-button
-                type="primary"
-                :disabled="!formData.billNo"
-                @click.native="confirmFinishOrder()"
-              >完成
-              </el-button>
+                <el-button type="primary" @click.native="deleteCode"
+                           v-if="labelName == 1"
+                           :disabled="formData.billNo == null"
+                >扫码剔除
+                </el-button>
+                <el-button size="mini" type="primary"
+                           v-if="labelName == 2"
+                           @click.native="overdeleteCode"
+                >结束剔除
+                </el-button>
+                <el-button
+                  type="primary"
+                  :disabled="formData.billNo ||(this.formDataVisible != null &&  this.formDataVisible.scanType == 1)"
+                  @click.native="selectPrescribe()"
+                >选单
+                </el-button>
+                <el-button
+                  type="primary"
+                  :disabled="!formData.billNo"
+                  @click.native="saveDraftOrder()"
+                >挂起
+                </el-button>
+                <el-button
+                  type="primary"
+                  :disabled="!formData.billNo"
+                  @click.native="cancelOrder()"
+                >放弃
+                </el-button>
+                <el-button
+                  type="primary"
+                  :disabled="!formData.billNo"
+                  @click.native="confirmFinishOrder()"
+                >完成
+                </el-button>
               </el-button-group>
             </el-col>
           </el-row>
@@ -191,23 +193,31 @@
 
         </div>
         <!--<el-descriptions title="单据信息" :column="4" border style="margin-top: 15px" class="custom-descriptions">-->
-          <el-descriptions :column="7" border style="margin-top: 5px; font-size: 16px">
-          <el-descriptions-item label="业务单号"><div style="font-size: 15px">{{ formData.billNo }}</div></el-descriptions-item>
-          <el-descriptions-item label="发货方"><div style="font-size: 15px">{{ formData.shipperName }}</div></el-descriptions-item>
-          <el-descriptions-item label="收货方"><div style="font-size: 15px">{{ formData.fromCorpName }}</div></el-descriptions-item>
-          <el-descriptions-item label="单据时间"><div style="font-size: 15px">{{ formData.billTime }}</div></el-descriptions-item>
-         </el-descriptions>
+        <el-descriptions :column="7" border style="margin-top: 5px; font-size: 16px">
+          <el-descriptions-item label="业务单号">
+            <div style="font-size: 15px">{{ formData.billNo }}</div>
+          </el-descriptions-item>
+          <el-descriptions-item label="发货方">
+            <div style="font-size: 15px">{{ formData.shipperName }}</div>
+          </el-descriptions-item>
+          <el-descriptions-item label="收货方">
+            <div style="font-size: 15px">{{ formData.fromCorpName }}</div>
+          </el-descriptions-item>
+          <el-descriptions-item label="单据时间">
+            <div style="font-size: 15px">{{ formData.billTime }}</div>
+          </el-descriptions-item>
+        </el-descriptions>
         <!--<div id="qrcode-container" ref="barcodeContainer" style="margin-right: 38px;padding-bottom: 30px"></div>-->
         <!--<svg ref="barcodeContainer"></svg>-->
       </el-card>
 
-      <el-tabs type="border-card" style="margin: 15px" v-model="editableTabsValue" >
+      <el-tabs type="border-card" style="margin: 15px" v-model="editableTabsValue">
         <!--<el-tab-pane label="扫码详情" name="prescribeOriginPanel">-->
-          <prescribeOriginPanel
-            v-if="panelALive"
-            :prescribeData="curRow"
-          ></prescribeOriginPanel>
-          <!-- 在表格下方添加说明 -->
+        <prescribeOriginPanel
+          v-if="panelALive"
+          :prescribeData="curRow"
+        ></prescribeOriginPanel>
+        <!-- 在表格下方添加说明 -->
         <!--</el-tab-pane>-->
         <!--        <el-tab-pane label="扫码明细">-->
         <!--          <PanelOrderManuTagCode-->
@@ -282,7 +292,8 @@
 
               <div
                 style="display: flex; justify-content: space-between; align-items: center; height: 46px; /* 约为 200px 的 1/3 */"
-                @click="selectBusType(info.documentTypeCode)">
+                @click="selectBusType(info.documentTypeCode)"
+              >
                 <p style="font-size: 20px;background-color: #e1f3fb;font-weight: bold;">{{ info.busName }}</p>
                 <!-- 假设你的信息对象中包含一个title属性 -->
                 <!--            <div style="width: 60px; height: 60px;  display: flex; justify-content: center; align-items: center;">-->
@@ -298,7 +309,8 @@
                 <p style="font-size: 14px;background-color: #e1f3fb" @click="selectBusType(info.documentTypeCode)">
                   {{ info.remark }}</p>
                 <el-button type="primary" style="position: absolute; bottom: 20px; right: 20px;" icon="el-icon-thumb"
-                           @click="selectBusType(info.documentTypeCode)">开始作业
+                           @click="selectBusType(info.documentTypeCode)"
+                >开始作业
                 </el-button>
 
               </div>
@@ -316,17 +328,17 @@
 </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 selectPrescribeDialog from "@/views/collect/selectCollectOrderDialog";
-import PanelOrderManuTagCode from "./PanelOrderManuTagCode";
-import prescribeOriginPanel from "./PannelOrderBiz";
-import prescribeCodePanel from "./PanelOrderTagCode";
-import PannelOrderBiz from "./PannelOrderBiz";
-import {listPage} from "@/api/basic/workPlace/sysWorkplaceManage";
-import {enterCodeWeb, batchVailCode, enterCodeBillNo, saveOrderWeb, batchUpdateCode} from "@/api/inout/order";
+import addOrder from '@/views/inout/DialogCreateOrder'
+import errOrder from '@/views/inout/IoCreateErrorOrder'
+import { executeFuc, getHead } from '@/utils/customConfig'
+import { convertDate } from '@/utils/date'
+import selectPrescribeDialog from '@/views/collect/selectCollectOrderDialog'
+import PanelOrderManuTagCode from './PanelOrderManuTagCode'
+import prescribeOriginPanel from './PannelOrderBiz'
+import prescribeCodePanel from './PanelOrderTagCode'
+import PannelOrderBiz from './PannelOrderBiz'
+import { listPage } from '@/api/basic/workPlace/sysWorkplaceManage'
+import { enterCodeWeb, batchVailCode, enterCodeBillNo, saveOrderWeb, batchUpdateCode } from '@/api/inout/order'
 import {
   cancelOrder,
   draftOrder,
@@ -335,8 +347,8 @@ import {
   tagCode,
   updateOrder,
   vailOrderFinish
-} from "@/api/collect/splitCreateOrder";
-import {selectCorpList} from "@/api/basic/basicUnitMaintain";
+} from '@/api/collect/splitCreateOrder'
+import { selectCorpList } from '@/api/basic/basicUnitMaintain'
 import {
   getCurOrder,
   getNextOrder,
@@ -344,27 +356,28 @@ import {
   findFromCorp,
   orderDetail,
   removeByScanCode
-} from "@/api/collect/collectOrder";
-import PanelOrderAllDetail from "@/views/collect/PanelOrderAllDetail";
-import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
-import {getInvListByUser} from "@/api/system/invWarehouse";
-import {orderbatchAddCode} from "@/api/inout/splitCode";
-import {isBlank} from "@/utils/strUtil";
-
-import JsBarcode from 'jsbarcode';
+} from '@/api/collect/collectOrder'
+import PanelOrderAllDetail from '@/views/collect/PanelOrderAllDetail'
+import { getWorkBindBusTypes, removeBusTypeById } from '@/api/basic/workPlace/sysWorkplaceDocuments'
+import { getInvListByUser } from '@/api/system/invWarehouse'
+import { orderbatchAddCode } from '@/api/inout/splitCode'
+import { isBlank } from '@/utils/strUtil'
+
+import JsBarcode from 'jsbarcode'
 import { getSet } from '@/api/collect/collectSet'
 
-import { MessageBox } from 'element-ui';
+import { MessageBox } from 'element-ui'
+
 export default {
   /**
    * 处理处方
    */
-  name: "prescribeTagCodeDeal",
+  name: 'prescribeTagCodeDeal',
   props: {
     resetKey: {
       type: Function,
       required: true
-    },
+    }
   },
   data() {
     return {
@@ -372,7 +385,7 @@ export default {
         'prescribeOriginPanel',
         'prescribeCodePanel1',
         'prescribeCodePanel2',
-        'PanelOrderAllDetail',
+        'PanelOrderAllDetail'
       ],
       editableTabsValue: 'prescribeOriginPanel',
       fromInvOptions: [],
@@ -391,15 +404,15 @@ export default {
       filterQuery: {
         billNo: null,
         page: 1,
-        limit: 10,
+        limit: 10
       },
       list: [],
       total: 0,
-      defaultSort: {prop: 'createTime', order: 'desc'},
+      defaultSort: { prop: 'createTime', order: 'desc' },
       formDataVisible: {
         scanType: null,
-        unitTittle: "往来单位",
-        corpType: 3,
+        unitTittle: '往来单位',
+        corpType: 3
       },
       curWorkPlaces: [],
       erpList: [],
@@ -410,7 +423,7 @@ export default {
         busType: null,
         workPlaceCode: null,
         fromCorp: null,
-        confirmFinish: false,
+        confirmFinish: false
       },
       selectPrescriptionVisible: false,
       corpOrderIdDisabled: false,
@@ -420,22 +433,22 @@ export default {
         inv: this.$store.getters.locInvName,
         deptName: this.$store.getters.locDeptName,
         userName: this.$store.getters.name,
-        companyName: this.$store.getters.companyName,
+        companyName: this.$store.getters.companyName
       },
       curRow: null,
       panelALive: false,
       autoFinishOrderFlag: true,//是否对完成的单据提示立即提交
 
       //扫码相关
-      scanCode: "",
+      scanCode: '',
       isSuccess: false,
       checked: true,
-      scanTitle: "扫码结果:",
-      result: "  \n",
-      msgTip: "信息提醒：",
-      originCode: "",
+      scanTitle: '扫码结果:',
+      result: '  \n',
+      msgTip: '信息提醒：',
+      originCode: '',
       checkSuccess: false,
-      scanResultType: "success",
+      scanResultType: 'success',
       isSelectOrder: false,
       isFinishOrder: true,
       busQuery: {
@@ -451,13 +464,13 @@ export default {
       viewType: 1,
       scanDisabled: false,
       valiCodes: [],
-      warnResult: "",
-      errResult: "",
+      warnResult: '',
+      errResult: '',
       warnVisible: false,
       errVisible: false,
       workplaceId: null,
       ws: null,
-      scanTip: "扫码录入:",
+      scanTip: '扫码录入:',
       scanSplit: false,
       //
       labels: {
@@ -466,7 +479,7 @@ export default {
       },
       labelName: 1,
       scanStatus: null, // 1:扫码剔除; null 处理单据
-      collectSet: {},
+      collectSet: {}
     }
   },
 
@@ -486,9 +499,9 @@ export default {
   },
   methods: {
     generateBarcode() {
-      const barcodeData = this.formData.billNo;
+      const barcodeData = this.formData.billNo
       // 获取条形码容器
-      const barcodeContainer = this.$refs.barcodeContainer;
+      const barcodeContainer = this.$refs.barcodeContainer
       // 使用JsBarcode生成条形码
       JsBarcode(barcodeContainer, barcodeData, {
         format: 'CODE128',
@@ -499,7 +512,7 @@ export default {
         width: 1.2, // 减小条形码宽度
         height: 15, // 减小条形码高度
         margin: 1 // 减小外边距
-      });
+      })
 
     },
     getBillNo(billNo) {
@@ -507,13 +520,13 @@ export default {
         billNo: billNo,
         workPlaceCode: this.workplaceId,
         page: 1,
-        limit: 10,
+        limit: 10
       }
       findByBill(post).then(res => {
         if (res.code == 20000) {
           if (res.data.billNo != null) {
             this.formData = res.data
-            this.scanCode = "";
+            this.scanCode = ''
             this.formData.workPlaceCode = this.workplaceId
             this.checked = false
           }
@@ -528,7 +541,7 @@ export default {
       this.formData.busType = val
       this.selectBusTypeDisabled = false
       if (this.formData.workPlaceCode != null) {
-        this.findCurOrder();
+        this.findCurOrder()
       }
     },
     getWorkBindBusTypes(workplaceId) {
@@ -539,33 +552,33 @@ export default {
           this.busTypeTotal = res.data.total
           if (this.formData.billNo != null) {
             this.getBillNo(this.formData.billNo)
-            this.startDeal();
+            this.startDeal()
           } else {
             if (this.busTypeList.length == 1 && this.$route.query.busType == null) {
               this.formDataVisible = this.busTypeList[0]
               this.formData.busType = this.busTypeList[0].documentTypeCode
               this.selectBusTypeDisabled = false
               if (this.formDataVisible.scanType == 1) {
-                this.findFromInvList("");
-                this.getInvList();
-                this.placeholder = '请点击输入框进行扫码生成业务单据';
+                this.findFromInvList('')
+                this.getInvList()
+                this.placeholder = '请点击输入框进行扫码生成业务单据'
               } else {
-                this.findCurOrder();
+                this.findCurOrder()
               }
 
             } else {
               console.log(this.$route.query.busType)
               if (this.$route.query.busType != null) {
                 this.formData.busType = this.$route.query.busType
-                this.$refs.inputRef.focus();
-                this.formDataVisible = this.busTypeList.find(item => item.documentTypeCode == this.formData.busType);
+                this.$refs.inputRef.focus()
+                this.formDataVisible = this.busTypeList.find(item => item.documentTypeCode == this.formData.busType)
 
                 if (this.formDataVisible.scanType == 1) {
-                  this.findFromInvList("");
-                  this.getInvList();
-                  this.placeholder = '请点击输入框进行扫码生成业务单据';
+                  this.findFromInvList('')
+                  this.getInvList()
+                  this.placeholder = '请点击输入框进行扫码生成业务单据'
                 } else {
-                  this.findCurOrder();
+                  this.findCurOrder()
                 }
               }
 
@@ -581,17 +594,17 @@ export default {
       let cQuery = {
         corpType: this.formDataVisible.consignee,
         invCode: this.formData.invCode
-      };
+      }
       findFromCorp(cQuery)
         .then((response) => {
           if (!isBlank(this.$route.query.busType) && this.formDataVisible.consignee == 2) {
-            this.invList = response.data || [];
+            this.invList = response.data || []
           } else {
-            this.fromInvOptions = response.data || [];
+            this.fromInvOptions = response.data || []
           }
         })
         .catch(() => {
-        });
+        })
     },
     workPlaceCodeChange(value) {
       this.getWorkBindBusTypes(value)
@@ -599,33 +612,33 @@ export default {
     },
 
     busTypeChange(value) {
-      let busType = this.busTypeList.find(item => item.documentTypeCode === value);
+      let busType = this.busTypeList.find(item => item.documentTypeCode === value)
       this.formData.busType = busType.documentTypeCode
       this.selectBusTypeDisabled = false
       this.formDataVisible = busType
       if (this.formDataVisible.scanType == 1) {
-        this.findFromInvList("");
+        this.findFromInvList('')
       }
-      this.findCurOrder();
+      this.findCurOrder()
     },
 
     handleClick(blankName) {
       // let url = window.location.origin+`#/tagCodeBlank?workplaceId=`+ this.stationList[index].workplaceId
       let url = window.location.origin + `#/` + blankName + `?workplaceId=` + this.workplaceId
       // this.$router.push( workplaceId)
-      window.open(url, '_blank');
+      window.open(url, '_blank')
     },
     handleClickOut(blankName) {
       // let url = window.location.origin+`#/tagCodeBlank?workplaceId=`+ this.stationList[index].workplaceId
       let url = window.location.origin + `#/` + blankName + `?splitType=out&workplaceId=` + this.workplaceId
       // this.$router.push( workplaceId)
-      window.open(url, '_blank');
+      window.open(url, '_blank')
     },
     handleClickReturn(blankName) {
       // let url = window.location.origin+`#/tagCodeBlank?workplaceId=`+ this.stationList[index].workplaceId
       let url = window.location.origin + `#/` + blankName + `?splitType=return&workplaceId=` + this.workplaceId
       // this.$router.push( workplaceId)
-      window.open(url, '_blank');
+      window.open(url, '_blank')
     },
     //获取当前货位
     findCurWorkPlaces(val) {
@@ -634,69 +647,69 @@ export default {
         status: 1,
         // invCode: this.formData.invCode,
         page: 1,
-        limit: 100,
+        limit: 100
       }
       listPage(query).then((res) => {
-        this.curWorkPlaces = res.data.list || [];
+        this.curWorkPlaces = res.data.list || []
         if (this.curWorkPlaces.length == 1 && this.formData.workPlaceCode == null) {
-          this.formData.workPlaceCode = this.curWorkPlaces[0].workplaceId;
-          this.workPlaceCodeChange(this.formData.workPlaceCode);
+          this.formData.workPlaceCode = this.curWorkPlaces[0].workplaceId
+          this.workPlaceCodeChange(this.formData.workPlaceCode)
         }
       })
     },
     //界面配置相关------------
     executeFuc(row, type, clickFuc, value) {
-      return executeFuc(this, row, type, clickFuc, value);
+      return executeFuc(this, row, type, clickFuc, value)
     },
     executeEval(row, expression, defaultRet) {
       if (expression) {
-        return eval(expression);
+        return eval(expression)
       }
-      return defaultRet;
+      return defaultRet
     },
     ///界面配置相关------------end
 
-
     hideSearch() {
-      this.showSearch = !this.showSearch;
+      this.showSearch = !this.showSearch
     },
 
     refreshCodesPanel(_this) {
-      _this.panelALive = false;
+      _this.panelALive = false
       _this.$nextTick(() => {
-        _this.panelALive = true;
-      });
-      _this.getBizDetailList();
-      _this.vailOrderFinish();
+        _this.panelALive = true
+      })
+      _this.getBizDetailList()
+      _this.vailOrderFinish()
     },
     refreshCodesPanelBank(_this) {
-      _this.panelALive = false;
+      _this.panelALive = false
       _this.$nextTick(() => {
-        _this.panelALive = true;
-      });
+        _this.panelALive = true
+      })
       // _this.getBizDetailList();
-      _this.vailOrderFinish();
+      _this.vailOrderFinish()
     },
     refreshCodesPanelP() {
       let _this = this
-      _this.panelALive = false;
+      _this.panelALive = false
       _this.$nextTick(() => {
-        _this.panelALive = true;
-      });
-      _this.vailOrderFinish();
+        _this.panelALive = true
+      })
+      _this.vailOrderFinish()
     },
 
     getInputFocus(event) {
-      event.currentTarget.select();
+      event.currentTarget.select()
     },
     getBizDetailList() {
       let preQuery = {}
-      if (this.formData == null)
+      if (this.formData == null) {
         return
+      }
       if (this.formData != null) {
         preQuery = {
           orderIdFk: this.formData.billNo
-        };
+        }
       }
       orderDetail(preQuery).then(res => {
         if (res.code != 20000) {
@@ -704,14 +717,14 @@ export default {
           return
         }
         this.splitBizList = res.data.list
-        let tip = "";
+        let tip = ''
         this.splitBizList.forEach((item) => {
           if (item.splitUnCheck) {
-            tip = tip + item.cpmctymc + ","
+            tip = tip + item.cpmctymc + ','
           }
-        });
+        })
         if (this.$isNotBlank(tip)) {
-          tip = "请扫码确认以下产品" + tip + "需拆零的追溯码！"
+          tip = '请扫码确认以下产品' + tip + '需拆零的追溯码！'
           // this.$alert(tip, "提示", {
           //   confirmButtonText: "确定",
           //   type: "warning",
@@ -720,47 +733,46 @@ export default {
           //   },
           // });
 
-          this.warnVisible = true;
-          this.warnResult = tip;
-          this.scanTip = "拆零确认:"
-          this.$refs.inputRef.focus();
-          this.$refs.inputRef.select();
+          this.warnVisible = true
+          this.warnResult = tip
+          this.scanTip = '拆零确认:'
+          this.$refs.inputRef.focus()
+          this.$refs.inputRef.select()
           this.scanSplit = true
-          return;
+          return
         } else {
           //没有需要确认的
           this.scanSplit = false
-          this.overdeleteCode();
+          this.overdeleteCode()
         }
 
-
       }).catch(() => {
-        this.$message.error("数据加载失败")
+        this.$message.error('数据加载失败')
       })
     },
 
     enterKey() {
 
-      if (this.scanCode.includes("DMOENTER")) {
+      if (this.scanCode.includes('DMOENTER')) {
         if (this.formData.billNo == null) {
           this.$message.error('请先选择单据')
-        }else {
+        } else {
           this.confirmFinishOrder()
         }
         this.scanCode = ''
         return
-      }else if (this.scanCode.includes("DMOCANCEL")) {
+      } else if (this.scanCode.includes('DMOCANCEL')) {
         if (this.formData.billNo == null) {
           this.$message.error('请先选择单据')
-        }else {
+        } else {
           this.cancelOrder()
         }
         this.scanCode = ''
         return
-      }else if (this.scanCode.includes("DMODEL")) {
+      } else if (this.scanCode.includes('DMODEL')) {
         if (this.formData.billNo == null) {
           this.$message.error('请先选择单据')
-        }else {
+        } else {
           this.deleteCode()
         }
         this.scanCode = ''
@@ -769,39 +781,39 @@ export default {
 
       if (this.formData.billNo == null && this.formDataVisible.scanType != 1) {
         this.enterBillNoKey()
-        return;
+        return
       }
 
-
-      this.checkSuccess = true;
-      this.filterQuery.code = this.scanCode.trim();
-      if (this.filterQuery.code.includes(";")) {
-        const codeArray = this.filterQuery.code.split(";");
+      this.checkSuccess = true
+      this.filterQuery.code = this.scanCode.trim()
+      if (this.filterQuery.code.includes(';')) {
+        const codeArray = this.filterQuery.code.split(';')
         const verify = this.verifyScanCount(codeArray)
-        if (verify){
+        if (verify) {
           let params = {
-            codeList: codeArray,
-          };
+            codeList: codeArray
+          }
           this.batchVailCode(params)
         }
-        return;
+        return
       }
-      if (this.filterQuery.code)
+      if (this.filterQuery.code) {
         if (!this.parseString(this.filterQuery.code)) {
-          this.$refs.inputRef.focus();
-          this.$refs.inputRef.select();
-          this.$message.error("无效追溯码");
-          return;
+          this.$refs.inputRef.focus()
+          this.$refs.inputRef.select()
+          this.$message.error('无效追溯码')
+          return
         }
+      }
       let tQuery = {
-        viewType: "tagCode",
+        viewType: 'tagCode',
         workPlaceCode: this.workplaceId,
         originCode: this.originCode,
         busType: this.formData.busType,
-        code: this.filterQuery.code.trim(),
-      };
+        code: this.filterQuery.code.trim()
+      }
       if (this.scanStatus == 1) {
-        const codeArray = this.filterQuery.code.split(";");
+        const codeArray = this.filterQuery.code.split(';')
         let query = {
           orderId: this.formData.billNo,
           codeList: codeArray
@@ -811,7 +823,7 @@ export default {
       } else if (this.scanSplit) {
 
         //todo   拆零扫码确认
-        const codeArray = this.filterQuery.code.split(";");
+        const codeArray = this.filterQuery.code.split(';')
         let query = {
           billNo: this.formData.billNo,
           codeList: codeArray
@@ -824,7 +836,7 @@ export default {
             this.result = ''
             this.$refs.inputRef.focus()
             this.$refs.inputRef.select()
-            this.getBizDetailList();
+            this.getBizDetailList()
           } else {
             this.$message.error(response.message)
           }
@@ -832,161 +844,160 @@ export default {
           this.saveLoading = false
         })
 
-
       } else {
         enterCodeWeb(tQuery).then((response) => {
           if (response.code === 20000) {
-            this.$refs.inputRef.focus();
-            this.$refs.inputRef.select();
-            this.isSuccess = true;
+            this.$refs.inputRef.focus()
+            this.$refs.inputRef.select()
+            this.isSuccess = true
             this.printCodeResult(response.data, response.message)
-            this.filterQuery.code = response.data.code;
-            this.scanCode = ""
-            this.originCode = ""
-            this.addCode();
+            this.filterQuery.code = response.data.code
+            this.scanCode = ''
+            this.originCode = ''
+            this.addCode()
           } else {
             if (response.code == 502) {
-              this.checkSuccess = false;
-              this.isSuccess = false;
+              this.checkSuccess = false
+              this.isSuccess = false
               this.printCodeResult(response.data, response.message)
-              this.filterQuery.code = response.data.code;
-              this.originCode = response.data.code;
+              this.filterQuery.code = response.data.code
+              this.originCode = response.data.code
             } else if (response.code == 501) {
-              this.checkSuccess = false;
-              this.$message.error(response.message);
-              this.scanCode = ""
+              this.checkSuccess = false
+              this.$message.error(response.message)
+              this.scanCode = ''
             } else if (response.code == 503) {
-              this.checkSuccess = false;
-              this.isSuccess = false;
+              this.checkSuccess = false
+              this.isSuccess = false
               this.printCodeResult(response.data, response.message)
-              this.filterQuery.code = response.data.code;
-              this.scanCode = ""
-              this.$confirm(response.message, "提示", {
-                type: "warning",
+              this.filterQuery.code = response.data.code
+              this.scanCode = ''
+              this.$confirm(response.message, '提示', {
+                type: 'warning'
               })
                 .then(() => {
-                  this.filterQuery.code = response.data.code;
-                  this.addCode();
+                  this.filterQuery.code = response.data.code
+                  this.addCode()
                 })
                 .catch(() => {
-                  this.filterQuery.code = response.data.code;
-                });
+                  this.filterQuery.code = response.data.code
+                })
             } else if (response.code == 508) {
-              this.originCode = "";
-              this.filterQuery.code = "01" + response.data.nameCode;
-              this.originCode = this.filterQuery.code;
+              this.originCode = ''
+              this.filterQuery.code = '01' + response.data.nameCode
+              this.originCode = this.filterQuery.code
             } else if (response.code == 601) {
               this.formData.billNo = response.data.billNo
-              this.placeholder = "已选入单据，请扫UDI码进行作业"
+              this.placeholder = '已选入单据，请扫UDI码进行作业'
               this.getBillNo(this.formData.billNo)
-              this.startDeal();
+              this.startDeal()
 
             } else {
-              this.scanCode = ""
-              this.$alert(response.message, "提示", {
-                confirmButtonText: "确定",
-                type: "warning",
+              this.scanCode = ''
+              this.$alert(response.message, '提示', {
+                confirmButtonText: '确定',
+                type: 'warning',
                 closeOnClickModal: true,
                 callback: (action) => {
-                  this.$refs.inputRef.focus();
-                  this.$refs.inputRef.select();
-                },
-              });
+                  this.$refs.inputRef.focus()
+                  this.$refs.inputRef.select()
+                }
+              })
             }
           }
-          this.loading = false;
-        });
+          this.loading = false
+        })
       }
 
     },
 
     enterBillNoKey(billNo) {
-      this.checkSuccess = true;
-      this.filterQuery.code = this.scanCode;
+      this.checkSuccess = true
+      this.filterQuery.code = this.scanCode
       let tQuery = {
-        viewType: "tagCode",
+        viewType: 'tagCode',
         workPlaceCode: this.workplaceId,
         originCode: this.originCode,
         busType: this.formData.busType,
-        code: this.filterQuery.code.trim(),
-      };
+        code: this.filterQuery.code.trim()
+      }
       if (billNo != null) {
         tQuery.code = billNo
       }
       enterCodeBillNo(tQuery).then((response) => {
         if (response.code === 20000) {
-          this.$refs.inputRef.focus();
-          this.$refs.inputRef.select();
-          this.isSuccess = true;
+          this.$refs.inputRef.focus()
+          this.$refs.inputRef.select()
+          this.isSuccess = true
           this.printCodeResult(response.data, response.message)
-          this.filterQuery.code = response.data.code;
-          this.scanCode = ""
-          this.originCode = ""
-          this.addCode();
+          this.filterQuery.code = response.data.code
+          this.scanCode = ''
+          this.originCode = ''
+          this.addCode()
         } else {
           if (response.code == 502) {
-            this.checkSuccess = false;
-            this.isSuccess = false;
+            this.checkSuccess = false
+            this.isSuccess = false
             this.printCodeResult(response.data, response.message)
-            this.filterQuery.code = response.data.code;
-            this.originCode = response.data.code;
-            this.scanCode = ""
+            this.filterQuery.code = response.data.code
+            this.originCode = response.data.code
+            this.scanCode = ''
           } else if (response.code == 501) {
-            this.checkSuccess = false;
-            this.$message.error(response.message);
-            this.scanCode = ""
+            this.checkSuccess = false
+            this.$message.error(response.message)
+            this.scanCode = ''
           } else if (response.code == 503) {
-            this.checkSuccess = false;
-            this.isSuccess = false;
+            this.checkSuccess = false
+            this.isSuccess = false
             this.printCodeResult(response.data, response.message)
-            this.filterQuery.code = response.data.code;
-            this.scanCode = ""
-            this.$confirm(response.message, "提示", {
-              type: "warning",
+            this.filterQuery.code = response.data.code
+            this.scanCode = ''
+            this.$confirm(response.message, '提示', {
+              type: 'warning'
             })
               .then(() => {
-                this.filterQuery.code = response.data.code;
-                this.addCode();
+                this.filterQuery.code = response.data.code
+                this.addCode()
               })
               .catch(() => {
-                this.filterQuery.code = response.data.code;
-              });
+                this.filterQuery.code = response.data.code
+              })
           } else if (response.code == 508) {
-            this.originCode = "";
-            this.filterQuery.code = "01" + response.data.nameCode;
-            this.originCode = this.filterQuery.code;
+            this.originCode = ''
+            this.filterQuery.code = '01' + response.data.nameCode
+            this.originCode = this.filterQuery.code
           } else if (response.code == 601) {
-            this.placeholder = "已选入单据，请扫UDI码进行作业"
+            this.placeholder = '已选入单据，请扫UDI码进行作业'
             this.formData.billNo = response.data.billNo
             this.getBillNo(this.formData.billNo)
-            this.startDeal();
+            this.startDeal()
 
           } else {
-            this.scanCode = ""
-            this.$alert(response.message, "提示", {
-              confirmButtonText: "确定",
-              type: "warning",
+            this.scanCode = ''
+            this.$alert(response.message, '提示', {
+              confirmButtonText: '确定',
+              type: 'warning',
               closeOnClickModal: true,
               callback: (action) => {
-                this.$refs.inputRef.focus();
-                this.$refs.inputRef.select();
-              },
-            });
+                this.$refs.inputRef.focus()
+                this.$refs.inputRef.select()
+              }
+            })
           }
         }
-        this.loading = false;
-      });
+        this.loading = false
+      })
     },
 
     addCode(code) {
       if (this.$isNotBlank(code)) {
-        this.filterQuery.code = code;
+        this.filterQuery.code = code
       }
       if (this.$isBlank(this.filterQuery.code)) {
-        this.filterQuery.code = this.scanCode.trim();
+        this.filterQuery.code = this.scanCode.trim()
       }
       if (this.$isBlank(this.filterQuery.code) && this.$isBlank(this.scanCode)) {
-        return;
+        return
       }
       let tagQuery = {
         workPlaceCode: this.formData.workPlaceCode,
@@ -997,17 +1008,17 @@ export default {
         billNo: this.formData.billNo,
         code: this.filterQuery.code.trim(),
         insert: this.formData.insert,
-        busType: this.formData.busType,
-      };
+        busType: this.formData.busType
+      }
       tagCode(tagQuery).then(res => {
         this.loading = false
         if (res.code == 20000) {
-          this.formData.tagStatus = 2;
-          this.formData.insert = false;
-          this.formData = res.data;
-          this.curRow = this.formData;
-          this.$refs.inputRef.focus();
-          this.refreshCodesPanel(this);
+          this.formData.tagStatus = 2
+          this.formData.insert = false
+          this.formData = res.data
+          this.curRow = this.formData
+          this.$refs.inputRef.focus()
+          this.refreshCodesPanel(this)
         } else {
           if (res.code == 502) {
             this.$confirm(res.message + '是否强制添加?', '提示', {
@@ -1015,12 +1026,12 @@ export default {
               cancelButtonText: '取消',
               type: 'warning'
             }).then(() => {
-              this.formData.insert = true;
-              this.addCode();
+              this.formData.insert = true
+              this.addCode()
             }).catch(() => {
-            });
+            })
           } else {
-            this.$refs.inputRef.focus();
+            this.$refs.inputRef.focus()
             this.$message.error(res.message)
           }
 
@@ -1048,7 +1059,7 @@ export default {
           this.loading = false
         })
       }).catch(() => {
-      });
+      })
     },
 
     cancelOrder() {
@@ -1060,8 +1071,8 @@ export default {
         cancelOrder(this.formData).then(res => {
           this.loading = false
           if (res.code == 20000) {
-            const audio = new Audio(require('@/assets/audioFiles/colser.mp3'));
-            audio.play();
+            const audio = new Audio(require('@/assets/audioFiles/colser.mp3'))
+            audio.play()
             this.overdeleteCode()
             this.reset()
           }
@@ -1069,7 +1080,7 @@ export default {
           this.loading = false
         })
       }).catch(() => {
-      });
+      })
     },
 
     confirmFinishOrder() {
@@ -1080,34 +1091,35 @@ export default {
       }).then(() => {
         this.finishOrder()
       }).catch(() => {
-      });
+      })
     },
 
     finishOrder() {
       finishOrder(this.formData).then(res => {
         this.loading = false
         if (res.code == 20000) {
-          const audio = new Audio(require('@/assets/audioFiles/order.mp3'));
-          audio.play();
+          const audio = new Audio(require('@/assets/audioFiles/order.mp3'))
+          audio.play()
           this.reset()
-          if (this.formDataVisible.scanType != 1)
+          if (this.formDataVisible.scanType != 1) {
             this.findCurOrder()
+          }
         } else if (res.code == 502) {
           this.$confirm(res.message, '提示', {
             confirmButtonText: '确定',
             cancelButtonText: '取消',
             type: 'warning'
           }).then(() => {
-            this.formData.confirmFinish = true;
-            this.finishOrder();
+            this.formData.confirmFinish = true
+            this.finishOrder()
           }).catch(() => {
-          });
+          })
         } else if (res.code == 503) {
           this.$alert('该单据未全部赋码无法完成,请检查后重试', '提示', {
             confirmButtonText: '确定',
             callback: action => {
             }
-          });
+          })
         } else {
           this.$message.error(res.message)
         }
@@ -1117,7 +1129,7 @@ export default {
     },
 
     updateOrder() {
-      this.formData.workPlaceCode = this.workplaceId;
+      this.formData.workPlaceCode = this.workplaceId
       updateOrder(this.formData).then(res => {
         this.loading = false
       }).catch(() => {
@@ -1132,7 +1144,7 @@ export default {
       if (this.$route.query.busType != null) {
         this.formData.busType = this.$route.query.busType
       }
-      this.selectPrescriptionVisible = true;
+      this.selectPrescriptionVisible = true
     },
 
     //获取下一单据
@@ -1143,9 +1155,9 @@ export default {
       getNextOrder(nextQuery).then(res => {
         this.loading = false
         if (res.code == 20000) {
-          this.formData = res.data;
+          this.formData = res.data
 
-          this.startDeal();
+          this.startDeal()
         } else {
           this.$message.error(res.message)
         }
@@ -1162,24 +1174,24 @@ export default {
       getCurOrder(nextQuery).then(res => {
         this.loading = false
         if (res.code == 20000) {
-          let temp = res.data;
+          let temp = res.data
           if (temp.tagStatus === -1) {
             this.$confirm('检测到当前工位存在挂起单据，是否继续上一次单据处理?', '提示', {
               confirmButtonText: '确定',
               cancelButtonText: '取消',
               type: 'warning'
             }).then(() => {
-              this.formData = temp;
+              this.formData = temp
               // this.generateBarcode()
-              this.startDeal();
+              this.startDeal()
             }).catch(() => {
-            });
+            })
           } else if (temp.tagStatus === 2 || temp.tagStatus === 1) {
 
-            this.formData = temp;
+            this.formData = temp
             // this.generateBarcode()
             this.panelALive = true
-            this.startDeal();
+            this.startDeal()
             // this.$confirm('检测到当前工位存在正在处理单据，是否继续上一次单据处理?', '提示', {
             //   confirmButtonText: '确定',
             //   cancelButtonText: '取消',
@@ -1190,10 +1202,9 @@ export default {
             // });
           }
 
-
         } else {
           // this.$message.error(res.message)
-          this.$refs.inputRef.focus();
+          this.$refs.inputRef.focus()
         }
       }).catch(() => {
         this.loading = false
@@ -1201,33 +1212,33 @@ export default {
     },
 
     closeDialog() {
-      this.selectPrescriptionVisible = false;
+      this.selectPrescriptionVisible = false
     },
 
     confirmSelect(row) {
-      this.formData = row;
-      this.formData.workPlaceCode = this.workplaceId;
-      this.startDeal();
+      this.formData = row
+      this.formData.workPlaceCode = this.workplaceId
+      this.startDeal()
       // this.generateBarcode()
     },
 
     startDeal() {
       this.autoFinishOrderFlag = true
-      this.curRow = this.formData;
+      this.curRow = this.formData
       this.dealSplitOrder()
       //处理哪个活动的明细子组件
       // this.selectTabsname(this.formData.busType);
-      this.formData.tagStatus = 2;
-      this.updateOrder();
+      this.formData.tagStatus = 2
+      this.updateOrder()
       this.selectSysParam()
       // this.refreshCodesPanel(this);
-      this.$refs.inputRef.focus();
+      this.$refs.inputRef.focus()
     },
 
     selectTabsname(value) {
       if (this.$isBlank(this.filterQuery.code) && this.busTypeList.length > 0) {
-        let busType = this.busTypeList.find(item => item.documentTypeCode === value);
-        let autoTag = busType.autoTag;
+        let busType = this.busTypeList.find(item => item.documentTypeCode === value)
+        let autoTag = busType.autoTag
         if (autoTag == 1) {
           this.editableTabsValue = this.tabsName[1]
         }
@@ -1235,72 +1246,71 @@ export default {
     },
     //开始拆零
     dealSplitOrder() {
-      this.formData.workPlaceCode = this.workplaceId;
+      this.formData.workPlaceCode = this.workplaceId
       startSplit(this.formData).then(res => {
         this.loading = false
         if (res.code == 20000) {
-          this.selectPrescriptionVisible = false;
-          this.refreshCodesPanel(this);
+          this.selectPrescriptionVisible = false
+          this.refreshCodesPanel(this)
         } else if (res.code == 501) {
 
-          this.$refs.childRef.getList();
-          this.$refs.childRef.getDraftList();
-          this.$refs.childRef.getOtherList();
+          this.$refs.childRef.getList()
+          this.$refs.childRef.getDraftList()
+          this.$refs.childRef.getOtherList()
           this.$message.warning(res.message)
-          this.refreshCodesPanel(this);
+          this.refreshCodesPanel(this)
         }
       }).catch(() => {
         this.loading = false
       })
     },
 
-
     printCodeResult(data, message) {
-      const resultParts = [];
+      const resultParts = []
       if (data.udi) {
-        resultParts.push("层级标识: " + data.udi);
+        resultParts.push('层级标识: ' + data.udi)
       }
       if (data.cpmctymc) {
-        resultParts.push(data.productType == 2 ? "药品通用名称" : "产品通用名称: " + data.cpmctymc);
+        resultParts.push(data.productType == 2 ? '药品通用名称' : '产品通用名称: ' + data.cpmctymc)
       }
       if (data.batchNo) {
-        resultParts.push("批次号: " + data.batchNo);
+        resultParts.push('批次号: ' + data.batchNo)
       }
       if (data.produceDate) {
-        resultParts.push("生产日期: " + data.produceDate);
+        resultParts.push('生产日期: ' + data.produceDate)
       }
       if (data.expireDate) {
-        resultParts.push("失效日期: " + data.expireDate);
+        resultParts.push('失效日期: ' + data.expireDate)
       }
       if (data.serialNo) {
-        resultParts.push("序列号: " + data.serialNo);
+        resultParts.push('序列号: ' + data.serialNo)
       }
       if (data.productType == 2) {
         if (data.bzgg) {
-          resultParts.push("包装规格: " + data.bzgg);
+          resultParts.push('包装规格: ' + data.bzgg)
         }
       } else {
         if (data.ggxh) {
-          resultParts.push("规格型号: " + data.ggxh);
+          resultParts.push('规格型号: ' + data.ggxh)
         }
       }
       if (data.prepnSpec) {
-        resultParts.push("制剂规格: " + data.prepnSpec);
+        resultParts.push('制剂规格: ' + data.prepnSpec)
       }
       if (data.prepnUnit) {
-        resultParts.push("剂型: " + data.prepnUnit);
+        resultParts.push('剂型: ' + data.prepnUnit)
       }
       if (data.packUnit) {
-        resultParts.push("计量单位: " + data.packUnit);
+        resultParts.push('计量单位: ' + data.packUnit)
       }
 
-      this.scanTitle = "扫码结果：" + data.code;
-      this.result = resultParts.join(" , ");
+      this.scanTitle = '扫码结果：' + data.code
+      this.result = resultParts.join(' , ')
       if (message == 'success') {
-        this.scanResultType = "success";
+        this.scanResultType = 'success'
       } else {
-        this.scanResultType = "warning";
-        this.result = this.result + "\n" + message;
+        this.scanResultType = 'warning'
+        this.result = this.result + '\n' + message
       }
     },
 
@@ -1311,33 +1321,33 @@ export default {
         type: 'warning'
       }).then(() => {
         this.formData.insert = true
-        this.addCode(data.code);
+        this.addCode(data.code)
       }).catch(() => {
-      });
+      })
     },
 
-
     vailOrderFinish() {
       if (!this.autoFinishOrderFlag) {
         return
       }
 
-      if (this.formDataVisible.scanType == 1)
-        return;
+      if (this.formDataVisible.scanType == 1) {
+        return
+      }
 
       vailOrderFinish(this.formData).then(res => {
         this.loading = false
         if (res.code == 20000) {
           if (res.data) {
-            this.$confirm("单据已赋码或可自动赋码，是否立即完成单据？", '提示', {
+            this.$confirm('单据已赋码或可自动赋码，是否立即完成单据？', '提示', {
               confirmButtonText: '立即提交',
               cancelButtonText: '手动扫码',
               type: 'warning'
             }).then(() => {
-              this.finishOrder();
+              this.finishOrder()
             }).catch(() => {
               this.autoFinishOrderFlag = false
-            });
+            })
           }
         } else {
 
@@ -1347,49 +1357,50 @@ export default {
       })
     },
 
-
     async printMutiCodeResult(vailCodeResultResponses) {
-      this.warnResult = "";
-      this.errResult = "";
-      this.result = "";
-      this.warnVisible = false;
-      this.errVisible = false;
+      this.warnResult = ''
+      this.errResult = ''
+      this.result = ''
+      this.warnVisible = false
+      this.errVisible = false
       for (let i = 0; i < vailCodeResultResponses.length; i++) {
         let data = vailCodeResultResponses[i]
-        if (data.status == 1)
-          this.result = this.result + ";" + vailCodeResultResponses[i].code;
-        else if (data.status == 2) {
-          this.warnResult = this.warnResult + "\n" + vailCodeResultResponses[i].code + ":" + vailCodeResultResponses[i].errMsg;
+        if (data.status == 1) {
+          this.result = this.result + ';' + vailCodeResultResponses[i].code
+        } else if (data.status == 2) {
+          this.warnResult = this.warnResult + '\n' + vailCodeResultResponses[i].code + ':' + vailCodeResultResponses[i].errMsg
         } else if (data.status == 3) {
-          this.result = this.result + "\n" + vailCodeResultResponses[i].code;
+          this.result = this.result + '\n' + vailCodeResultResponses[i].code
           // this.warnResult = this.warnResult + "\n" + vailCodeResultResponses[i].code + ":" + vailCodeResultResponses[i].errMsg;
           await this.popupTip(data)
         }
         // else
         //   this.errResult = this.errResult + "\n" + vailCodeResultResponses[i].code + ":" + vailCodeResultResponses[i].errMsg;
       }
-      if (!isBlank(this.warnResult))
-        this.warnVisible = true;
-      if (!isBlank(this.errResult))
-        this.errVisible = true;
+      if (!isBlank(this.warnResult)) {
+        this.warnVisible = true
+      }
+      if (!isBlank(this.errResult)) {
+        this.errVisible = true
+      }
     },
     handleCommand(command) {
       // this.$message('click on item ' + command);
     },
-    verifyScanCount(codeArray){
+    verifyScanCount(codeArray) {
       //判断扫码数量是否超出或少于设置扫码数量
       if (this.collectSet.scanMaxCount != null && this.collectSet.scanMaxCount != 0) {
         if (this.collectSet.scanMaxCount > codeArray.length) {
           this.scanCode = ''
-          this.$message.error("扫码数量少于设置扫码数量");
-          return false;
+          this.$message.error('扫码数量少于设置扫码数量')
+          return false
         } else if (this.collectSet.scanMaxCount < codeArray.length) {
           this.scanCode = ''
-          this.$message.error("扫码数量超出");
-          return false;
+          this.$message.error('扫码数量超出')
+          return false
         }
       }
-      return true;
+      return true
     },
     clearCode() {
       // this.originCode = "";
@@ -1397,7 +1408,7 @@ export default {
       // this.formData.billNo = null;
       // this.formData.shipper = null;
       // this.formData.fromCorp = null;
-      this.scanCode = "";
+      this.scanCode = ''
       // this.scanTitle = "扫码结果：";
       // this.result = "";
       // this.warnResult = ""
@@ -1414,13 +1425,13 @@ export default {
         tagStatus: -1,
         workPlaceCode: this.formData.workPlaceCode,
         busType: this.formData.busType
-      };
+      }
       this.curRow = null
-      this.formData.confirmFinish = false;
+      this.formData.confirmFinish = false
       this.refreshCodesPanel(this)
       this.clearCode()
-      this.$refs.inputRef.focus();
-      this.$refs.inputRef.select();
+      this.$refs.inputRef.focus()
+      this.$refs.inputRef.select()
     },
     reset() {
       this.formData = {
@@ -1429,15 +1440,15 @@ export default {
         workPlaceCode: this.formData.workPlaceCode,
         busType: this.formData.busType,
         shipper: null,
-        fromCorp: null,
-      };
+        fromCorp: null
+      }
       this.selectSysParam()
       this.curRow = null
-      this.formData.confirmFinish = false;
+      this.formData.confirmFinish = false
       this.refreshCodesPanelBank(this)
       this.clearCode()
-      this.$refs.inputRef.focus();
-      this.$refs.inputRef.select();
+      this.$refs.inputRef.focus()
+      this.$refs.inputRef.select()
     },
     toggleBusType() {
       //隐藏下拉框内容
@@ -1445,15 +1456,14 @@ export default {
       this.selectBusTypeDisabled = true
     },
 
-
     getInvList() {
       let query = {
-        advanceType: 1,
+        advanceType: 1
       }
       getInvListByUser(query)
         .then((response) => {
           if (!isBlank(this.$route.query.busType) && this.formDataVisible.consignee == 2) {
-            this.fromInvOptions = response.data || [];
+            this.fromInvOptions = response.data || []
           } else {
             this.invList = response.data || []
           }
@@ -1462,35 +1472,33 @@ export default {
         })
     },
     changeCorp() {
-      let corp = this.fromInvOptions.find(item => item.code === this.formData.fromCorp);
+      let corp = this.fromInvOptions.find(item => item.code === this.formData.fromCorp)
       this.formData.fromCorpName = corp.name
     },
     changeShipper() {
-      let corp = this.invList.find(item => item.code === this.formData.shipper);
+      let corp = this.invList.find(item => item.code === this.formData.shipper)
       this.formData.shipperName = corp.name
       this.formData.shipper = corp.code
     },
     //处理事件
     handleRecCodesEvent(event) {
-      console.log('接收 recCodes event:', event.detail.recCodes);
+      console.log('接收 recCodes event:', event.detail.recCodes)
 
       let params = {
-        codeList: event.detail.recCodes,
-      };
+        codeList: event.detail.recCodes
+      }
       if (this.formData.billNo == null) {
-        this.$message.error("请先选入单据！");
+        this.$message.error('请先选入单据！')
         return
       }
 
       const verify = this.verifyScanCount(event.detail.recCodes)
-      if (verify){
+      if (verify) {
         this.batchVailCode(params)
       }
 
-
     },
 
-
     batchVailCode(params) {
       if (this.scanStatus == 1) {
         //剔除
@@ -1505,15 +1513,15 @@ export default {
       } else {
         batchVailCode(params).then((res) => {
           if (res.code === 20000) {
-            this.valiCodes = [];
-            let list = res.data;
+            this.valiCodes = []
+            let list = res.data
             list.forEach(item => {
               if (item.status === 1) {
-                this.valiCodes.push(item.code);
+                this.valiCodes.push(item.code)
               }
-            });
-            this.$refs.inputRef.focus();
-            this.$refs.inputRef.select();
+            })
+            this.$refs.inputRef.focus()
+            this.$refs.inputRef.select()
             this.printMutiCodeResult(list)
             if (this.valiCodes != null && this.valiCodes.length > 0) {
               //批量添加
@@ -1525,20 +1533,20 @@ export default {
                 insert: this.formData.insert,
                 busType: this.formData.busType,
                 fromCorpName: this.formData.fromCorpName,
-                invCode: this.formData.invCode,
+                invCode: this.formData.invCode
               }
               orderbatchAddCode(params2).then((res) => {
                 if (res.code === 20000) {
-                  this.formData.tagStatus = 2;
-                  this.formData.insert = false;
-                  this.curRow = this.formData;
-                  this.$refs.inputRef.focus();
-                  this.refreshCodesPanel(this);
+                  this.formData.tagStatus = 2
+                  this.formData.insert = false
+                  this.curRow = this.formData
+                  this.$refs.inputRef.focus()
+                  this.refreshCodesPanel(this)
                   this.printMutiCodeResult(res.data.vailCodeResultResponses)
                 } else {
                   this.$message.error(res.message)
                 }
-              });
+              })
               // this.scanCode = this.valiCodes.join(";");
             }
             this.selectSysParam()
@@ -1546,7 +1554,7 @@ export default {
           } else {
             this.$message.error(res.message)
           }
-        });
+        })
       }
 
     },
@@ -1571,34 +1579,34 @@ export default {
     },
     //扫码校验
     addGs() {
-      const input = this.$refs.inputRef.$refs.input;
-      const textToInsert = "\u001D";
-      const start = input.selectionStart;
-      const end = input.selectionEnd;
-      this.scanCode = this.scanCode.slice(0, start) + textToInsert + this.scanCode.slice(end);
+      const input = this.$refs.inputRef.$refs.input
+      const textToInsert = '\u001D'
+      const start = input.selectionStart
+      const end = input.selectionEnd
+      this.scanCode = this.scanCode.slice(0, start) + textToInsert + this.scanCode.slice(end)
       this.$nextTick(() => {
-        this.focus = true;
-        input.selectionStart = input.selectionEnd = start + textToInsert.length;
-        this.$refs.inputRef.focus();
-      });
+        this.focus = true
+        input.selectionStart = input.selectionEnd = start + textToInsert.length
+        this.$refs.inputRef.focus()
+      })
     },
 
     handleScanComplete(fullScanData) {
-      console.log("Scan complete:", fullScanData.join(";"));
+      console.log('Scan complete:', fullScanData.join(';'))
       if (this.formData.billNo == null && this.formDataVisible.scanType != 1) {
         this.enterBillNoKey(fullScanData[0])
-        return;
+        return
       }
 
       let params = {
-        codeList: fullScanData,
-      };
+        codeList: fullScanData
+      }
       if (this.formData.billNo == null) {
-        this.$message.error("请先选入单据！");
+        this.$message.error('请先选入单据！')
         return
       }
-     const verify = this.verifyScanCount(fullScanData)
-      if (verify){
+      const verify = this.verifyScanCount(fullScanData)
+      if (verify) {
         this.batchVailCode(params)
       }
       // 在这里处理完整的扫码数据，如提交到后台或显示
@@ -1606,107 +1614,107 @@ export default {
 
     parseString(str) {
       // 1. 判断是否以 "MA" 开头
-      if (str.startsWith("MA")) {
-        return true;
+      if (str.startsWith('MA')) {
+        return true
       }
 
       // 2. 判断是否以 "01" 开头且长度大于等于 18
-      if (str.startsWith("01") && str.length >= 16) {
-        return true;
+      if (str.startsWith('01') && str.length >= 16) {
+        return true
       }
 
       // 3. 判断是否以 "#" 开头且 "#" 的个数大于等于 4
-      if (str.startsWith("#") && (str.match(/#/g) || []).length >= 4) {
-        return true;
+      if (str.startsWith('#') && (str.match(/#/g) || []).length >= 4) {
+        return true
       }
 
       // 4. 判断是否以 "8" 开头且长度为 20 位
-      if (str.startsWith("8") && str.length === 20) {
-        return true;
+      if (str.startsWith('8') && str.length === 20) {
+        return true
       }
 
       // 5. 判断是否以 "11", "17", "21", 或 "10" 开头
-      const prefixes = ["11", "17", "21", "10"];
+      const prefixes = ['11', '17', '21', '10']
       if (prefixes.some(prefix => str.startsWith(prefix))) {
-        return true;
+        return true
       }
       // 如果没有任何条件满足，返回 false
-      return false;
+      return false
     },
     socketListener() {
-      let lastScanTime = Date.now();
-      let scanBuffer = [];
-      let scanTimeout = null;
-      const SCAN_TIMEOUT = 1000; // 1秒间隔，表示扫码结束的判定标准
-      const self = this;
-      console.log("启用监听")
-      this.ws.onmessage = function (event) {
-        let scanData = event.data; // 获取扫码数据
-        let currentTime = Date.now();
+      let lastScanTime = Date.now()
+      let scanBuffer = []
+      let scanTimeout = null
+      const SCAN_TIMEOUT = 1000 // 1秒间隔，表示扫码结束的判定标准
+      const self = this
+      console.log('启用监听')
+      this.ws.onmessage = function(event) {
+        let scanData = event.data // 获取扫码数据
+        let currentTime = Date.now()
         console.log(scanData)
         // 如果时间间隔超过预设的阈值，表示这是一次新的扫码
         if (currentTime - lastScanTime > SCAN_TIMEOUT) {
           // 处理上一次完整的扫码数据
           if (scanBuffer.length > 0) {
-            self.handleScanComplete(scanBuffer);
+            self.handleScanComplete(scanBuffer)
           }
           // 清空缓冲区，开始新的扫码
-          scanBuffer = [];
+          scanBuffer = []
         }
         // 重置上一次扫码的时间
-        lastScanTime = currentTime;
+        lastScanTime = currentTime
         // 将数据添加到缓冲区
-        scanBuffer.push(scanData);
+        scanBuffer.push(scanData)
 
         // 如果已经有一个定时器在等待，可以清除它
         if (scanTimeout) {
-          clearTimeout(scanTimeout);
+          clearTimeout(scanTimeout)
         }
         // 设置新的定时器，等待指定的时间后执行扫码结束处理
         scanTimeout = setTimeout(() => {
           // 定时器到时，处理扫码结束
-          self.handleScanComplete(scanBuffer);
-          scanBuffer = [];
-        }, SCAN_TIMEOUT);
-      };
+          self.handleScanComplete(scanBuffer)
+          scanBuffer = []
+        }, SCAN_TIMEOUT)
+      }
     },
     handleVisibilityChange() {
       if (document.visibilityState === 'visible') {
-        console.log('用户切回到了处理页面');
+        console.log('用户切回到了处理页面')
         if (this.ws == null || this.ws.readyState === WebSocket.CLOSED) {
-          this.ws = new WebSocket("ws://127.0.0.1:9988");
-          const self = this;
-          this.ws.onopen = function (evt) {
-            console.log("处理单据WebSocket 连接中 ...");
+          this.ws = new WebSocket('ws://127.0.0.1:9988')
+          const self = this
+          this.ws.onopen = function(evt) {
+            console.log('处理单据WebSocket 连接中 ...')
             self.socketListener()
-          };
+          }
 
         }
       } else {
         if (this.ws && this.ws.readyState === WebSocket.OPEN) {
-          this.ws.close();
-          console.log("关闭处理单据websocket成功")
+          this.ws.close()
+          console.log('关闭处理单据websocket成功')
         }
       }
     },
 
     //扫码剔除操作
     deleteCode() {
-      this.scanTip = "扫码剔除:"
+      this.scanTip = '扫码剔除:'
       this.labelName = 2
-      this.placeholder = "请点击输入框进行扫码剔除"
+      this.placeholder = '请点击输入框进行扫码剔除'
       this.scanStatus = 1
       this.scanCode = ''
       if (!isBlank(this.warnResult)) {
-        this.warnResult = ""
+        this.warnResult = ''
       }
     },
     overdeleteCode() {
       this.warnVisible = false
-      this.warnResult = "";
+      this.warnResult = ''
       this.labelName = 1
       this.scanStatus = null
-      this.scanTip = "扫码录入:"
+      this.scanTip = '扫码录入:'
       this.placeholder = '请点击输入框进行选扫码'
     },
     selectSysParam() {
@@ -1717,22 +1725,22 @@ export default {
       })
     },
 
-    handleKeydown(event){
-      if (this.formData.billNo != null){
-        if (event.key === 'F9' ||  event.keyCode === 120) {
-          event.preventDefault(); // 阻止默认行为
+    handleKeydown(event) {
+      if (this.formData.billNo != null) {
+        if (event.key === 'F9' || event.keyCode === 120) {
+          event.preventDefault() // 阻止默认行为
           this.finishOrder()
-          MessageBox.close();
+          MessageBox.close()
 
         }
         if (event.key === 'F10' || event.keyCode === 121) {
-          event.preventDefault(); // 阻止默认行为（如果有的话）
+          event.preventDefault() // 阻止默认行为（如果有的话）
           // this.push();
           cancelOrder(this.formData).then(res => {
             this.loading = false
             if (res.code == 20000) {
-              const audio = new Audio(require('@/assets/audioFiles/colser.mp3'));
-              audio.play();
+              const audio = new Audio(require('@/assets/audioFiles/colser.mp3'))
+              audio.play()
               this.overdeleteCode()
               this.reset()
             }
@@ -1742,18 +1750,18 @@ export default {
         }
       }
 
-    },
+    }
   },
   mounted() {
-    this.$refs.inputRef.focus();
-    document.addEventListener('keydown', this.handleKeydown);
+    this.$refs.inputRef.focus()
+    document.addEventListener('keydown', this.handleKeydown)
     //环境判断
-    if (window.navigator.userAgent.indexOf("GLXP_PC") != -1) {
-      this.scanDisabled = true;
-      window.removeEventListener('djcl', this.handleRecCodesEvent);
-      window.addEventListener('djcl', this.handleRecCodesEvent);
+    if (window.navigator.userAgent.indexOf('GLXP_PC') != -1) {
+      this.scanDisabled = true
+      window.removeEventListener('djcl', this.handleRecCodesEvent)
+      window.addEventListener('djcl', this.handleRecCodesEvent)
     }
-    document.addEventListener('visibilitychange', this.handleVisibilityChange);
+    document.addEventListener('visibilitychange', this.handleVisibilityChange)
     // window.addEventListener('storage', (event) => {
     //   if (document.visibilityState == 'hidden') {
     //     console.log("关闭处理单据websocket")
@@ -1774,30 +1782,29 @@ export default {
 
   },
 
-
   beforeDestroy() {
-    document.removeEventListener('keydown', this.handleKeydown);
-    window.removeEventListener('djcl', this.handleRecCodesEvent);
-    document.removeEventListener('visibilitychange', this.handleVisibilityChange);
+    document.removeEventListener('keydown', this.handleKeydown)
+    window.removeEventListener('djcl', this.handleRecCodesEvent)
+    document.removeEventListener('visibilitychange', this.handleVisibilityChange)
 
-    this.ws.close();
-    this.ws.onclose = function (evt) {
-      console.log("处理单据 Connection closed.");
-    };
+    this.ws.close()
+    this.ws.onclose = function(evt) {
+      console.log('处理单据 Connection closed.')
+    }
 
   },
   created() {
-    getHead("prescribeTagCodeDeal", "1").then((re) => {
+    getHead('prescribeTagCodeDeal', '1').then((re) => {
       // 处理返回的数据
-      this.tableObj = re.data;
-      this.tableHeader = re.data.tableList;
-      this.queryList = re.data.queryList;
-      this.fromList = re.data.fromList;
-    });
-    this.findCurWorkPlaces();
-    this.selectSysParam();
-
-    this.formData.invCode = this.$store.getters.locInvCode;
+      this.tableObj = re.data
+      this.tableHeader = re.data.tableList
+      this.queryList = re.data.queryList
+      this.fromList = re.data.fromList
+    })
+    this.findCurWorkPlaces()
+    this.selectSysParam()
+
+    this.formData.invCode = this.$store.getters.locInvCode
     if (this.$route.query.billNo != null) {
       this.formData.billNo = this.$route.query.billNo
     }
@@ -1807,9 +1814,9 @@ export default {
         // this.selectBusTypeDisabled = true
       }
       this.corpOrderIdDisabled = true
-      this.workplaceId = Number(this.$route.query.workplaceId);
-      this.formData.workPlaceCode = Number(this.$route.query.workplaceId);
-      this.getWorkBindBusTypes(this.formData.workPlaceCode);
+      this.workplaceId = Number(this.$route.query.workplaceId)
+      this.formData.workPlaceCode = Number(this.$route.query.workplaceId)
+      this.getWorkBindBusTypes(this.formData.workPlaceCode)
     }
   }
 
@@ -1849,6 +1856,7 @@ export default {
   align-items: center; /* 水平居中 */
   justify-content: center; /* 垂直居中 */
 }
+
 .custom-descriptions .el-descriptions__cell svg {
   vertical-align: middle;
   margin-left: 20px;
diff --git a/src/views/collect/IoCollectOrderUpload.vue b/src/views/collect/IoCollectOrderUpload.vue
new file mode 100644
index 00000000..6b409060
--- /dev/null
+++ b/src/views/collect/IoCollectOrderUpload.vue
@@ -0,0 +1,847 @@
+<template>
+  <div>
+    <el-card>
+      <el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" class="query-form"
+               @submit.native.prevent
+               size="mini" label-width="100px">
+        <el-row style=" display:flex;  flex-wrap: wrap; ">
+          <template v-for="(item, index) in queryList">
+            <div v-if="showSearch || item.isImport">
+              <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 == '模糊查询' ? '单据号/业务名称/收货方/发货方' : 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
+                  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>
+            </div>
+          </template>
+        </el-row>
+      </el-form>
+      <!--      <div class="left-search" v-if="!showSearch">-->
+      <!--        &lt;!&ndash; 关键字搜索 按需配置 &ndash;&gt;-->
+      <!--        <el-form v-if="queryList && queryList.length > 0" :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) && item.columnName == 'keywords'"-->
+      <!--                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>-->
+      <!--            </template>-->
+      <!--          </el-row>-->
+      <!--        </el-form>-->
+      <!--      </div>-->
+      <div class="top-right-btn">
+        <el-button-group style="display:flex;">
+          <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(this)"
+          >查询
+          </el-button
+          >
+          <!--<el-upload-->
+          <!--  :action="action"-->
+          <!--  :headers ="headers"-->
+          <!--  accept=".xlsx,.xls"-->
+          <!--  :on-preview="handlePreview"-->
+          <!--  :on-remove="handleRemove"-->
+          <!--  :before-remove="beforeRemove"-->
+          <!--  :on-success="handleSuccess"-->
+          <!--  :on-progress="handleProgress"-->
+          <!--  :on-error="handleError"-->
+          <!--  :before-upload="beforeUpload"-->
+          <!--  :limit="1"-->
+          <!--  :on-exceed="handleExceed"-->
+          <!--  :file-list="fileList"-->
+          <!--  :show-file-list="false"-->
+          <!--  :data="extraData">-->
+          <!--  <el-button  icon="el-icon-upload" type="primary" >手动上传数据</el-button>-->
+          <!--</el-upload>-->
+          <!--<el-button type="primary" icon="el-icon-download" @click="downloadData"-->
+          <!--&gt;下载数据-->
+          <!--</el-button-->
+          <!--&gt;-->
+        </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="单据明细">
+        <PannelOriginOrderDetail
+          v-if="panelALive"
+          :prescribeData="curRow"
+        ></PannelOriginOrderDetail>
+      </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="75%"
+      append-to-body
+    >
+      <prescribeDownloadDialog
+        :closeDialog="this.closeDialog"
+      ></prescribeDownloadDialog>
+    </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} from "@/api/basic/sicker/prescribeApi";
+import prescribeDownloadDialog from "@/views/collect/prescribe/prescribeDownloadDialog";
+import prescribeOriginPanel from "./PannelOrderBiz";
+import PannelOriginOrderDetail from "./PannelOriginOrderDetail"
+import {
+  clearAllOrder,
+  deleteByOrder,
+  importOrder,
+  downloadOrder,
+  errorHandle, errorHandleSubmit, deleteOriginOrder
+} from "@/api/collect/collectOrder";
+import {
+  getOrderUpload,
+  orderPage
+} from '@/api/collect/collectOriginOrder'
+import {filterSubAllOptimize} from "@/api/system/invSubWarehouse";
+import {filterWorkOptimize} from "@/api/basic/workPlace/sysWorkplaceManage";
+import {getWorkBindBusTypes} from '@/api/basic/workPlace/sysWorkplaceDocuments'
+import {getAdminId, getToken} from '@/utils/auth';
+
+export default {
+  name: "IoCollectOrderUpload",
+  props: {
+    tagStatus: {
+      type: Number,
+      required: true
+    },
+    tagStatusList: {
+      type: Array,
+      required: true
+    },
+  },
+  data() {
+    return {
+      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]);
+            },
+          },
+        ],
+      },
+      //界面配置相关
+      //患者处方
+      tableHeader: [],
+      queryList: [],
+      tableObj: [],
+      fromList: [],
+      //原始处方明细
+      tableHeader1: [],
+      queryList1: [],
+      tableObj1: [],
+      fromList1: [],
+      convertDateFun: convertDate,
+      //界面配置-------------end
+
+      showSearch: false,
+      filterQuery: {
+        // tagStatus: this.tagStatus,    //
+        tagStatusList: [0, 1, 2],    //
+        billNo: null,
+        busType: null,
+        workPlaceCode: null,
+        startTime: null,
+        endTime: null,
+        page: 1,
+        limit: 10,
+      },
+
+      errQuery: {
+        tagStatusList: [4],    //
+        page: 1,
+        limit: 10,
+      },
+      DataQuery: {
+        busType: null,
+        page: 1,
+        limit: 10,
+      },
+      defaultSort: {prop: 'createTime', order: 'desc'},
+      loading: false,
+      list: [],
+      total: 0,
+
+
+      errList: [],
+      errTotal: 0,
+      downloadPrescriptionVisible: false,
+      deleteData: {
+        billNo: null,
+      },
+      options: {
+        sysWorkspace: [],
+        findWorkPlace: [],
+        getBusType: []
+      },
+
+      preLoading: false,
+      preDetailList: [],
+      preTotal: 0,
+      preQuery: {
+        prescribeCode: null,
+        page: 1,
+        limit: 10,
+      },
+      curRow: null,
+      panelALive: false,
+      busQuery: {
+        busKey: '',
+        workplaceCode: null,
+        page: 1,
+        limit: 100
+      },
+      errQueryPage: 1,
+      headers:{
+        ADMINID: getAdminId(),
+        ADMINTOKEN: getToken()
+      },
+      extraData:{"uuid": "upload-xlsx"},
+      uploadLoading: false,
+      action: process.env.VUE_APP_BASE_API + "/udiwms/collect/order/xlsxUpload",
+      fileList: []
+    }
+  },
+
+  components: {
+    addOrder, errOrder, prescribeDownloadDialog, prescribeOriginPanel, PannelOriginOrderDetail
+  },
+  methods: {
+    handleRemove(file, fileList) {
+      console.log(file, fileList);
+    },
+    handlePreview(file) {
+      console.log(file);
+    },
+    handleExceed(files, fileList) {
+      // this.$message.warning(`当前限制选择 5 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
+    },
+    beforeRemove(file, fileList) {
+      // return this.$confirm(`确定移除 ${ file.name }？`);
+    },
+    handleSuccess(res, file, fileList) {
+      fileList = fileList.filter(item => item.response.code === 20000);
+      this.fileList = fileList;
+      if (res.code === 20000) {
+        this.$message.success(res.message);
+        this.fileList = []
+      } else {
+        this.$message.error(res.message);
+      }
+      this.uploadLoading.close();
+    },
+    beforeUpload(file) {
+      const isXML = file.name.endsWith('.xls');
+      const isXML2 = file.name.endsWith('.xlsx');
+      const isLt5M = file.size / 1024 / 1024 < 100;
+      if (!isXML &&!isXML2) {
+        this.$message.error('上传文件只能是 xls 格式!');
+      }
+      if (!isLt5M) {
+        this.$message.error('上传文件大小不能超过 10MB!');
+      }
+      return (isXML || isXML2) && isLt5M;
+    },
+    handleProgress() {
+      this.uploadLoading = this.$loading({
+        lock: true,
+        text: '文件上传中…',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.5)'
+      });
+    },
+    handleError() {
+      this.uploadLoading.close();
+      this.$message.error('文件上传失败，请检查文件大小或文件格式');
+    },
+    //界面配置相关------------
+    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;
+      this.$nextTick(() => {
+        console.log('组件已刷新');
+      });
+    },
+    onReset() {
+      this.filterQuery = {
+        tagStatusList: [0, 1, 2],
+        billNo: null,
+        busType: null,
+        workPlaceCode: null,
+        page: 1,
+        limit: 10,
+      };
+      this.errQuery = {
+        tagStatusList: [4],    //
+        page: 1,
+        limit: 10,
+      },
+        this.actDateRange = [];
+      this.getList();
+      this.panelALive = false
+    },
+    downloadPrescription() {
+      this.downloadPrescriptionVisible = true
+      // this.loading = true;
+      // importOrder().then(res => {
+      //     this.loading = false
+      //     if (res.code == 20000) {
+      //       this.$message.success("下载成功！")
+      //       this.getList()
+      //     } else {
+      //       this.$message.error(res.message)
+      //     }
+      //   }
+      // ).catch(() => {
+      //   this.loading = false
+      // })
+    },
+    downloadData() {
+      this.downloadPrescriptionVisible = true
+      // if (this.filterQuery.workPlaceCode == null) {
+      //   return this.$message.error("请先选择工位")
+      // }
+
+      // 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.busType = '24'
+      // // downloadOrder(this.filterQuery).then(res => {
+      //     getThrOrderPage(this.filterQuery).then(res => {
+      //   if (res.code == 20000) {
+      //     return this.$message.success(res.data)
+      //   } else {
+      //     return this.$message.error(res.message)
+      //   }
+      // })
+    },
+    clearAllOrder() {
+      this.loading = true;
+      clearAllOrder().then(res => {
+        this.loading = false
+        if (res.code == 20000) {
+          this.$message.success("清除成功！")
+          this.getList()
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(() => {
+        this.loading = false
+      })
+    }
+    ,
+    closeDialog() {
+      this.downloadPrescriptionVisible = false;
+      this.getList();
+    }
+    ,
+    onSubmit(_this) {
+      if (_this == null)
+        _this = this
+      _this.filterQuery.page = 1;
+      _this.getList();
+    }
+    ,
+
+    getList() {
+      this.loading = true;
+      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;
+      }
+      getOrderUpload(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
+      })
+    },
+
+    getList2(_this) {
+      _this.loading = true;
+      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;
+      }
+      orderPage(_this.filterQuery).then(res => {
+        _this.loading = false
+        _this.list = res.data.list || []
+        _this.total = res.data.total || 0
+      }).catch(() => {
+        _this.loading = false
+        _this.list = []
+        _this.total = 0
+      })
+    }
+    ,
+    handleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getList();
+    },
+    handleCurrentChangeError(val) {
+      this.errQuery.page = val.page;
+      this.errQueryPage = val.page
+    }
+    ,
+
+    prescribeClick(_this, row) {
+      _this.curRow = row;
+      _this.refreshCodesPanel(_this);
+    }
+    ,
+    refreshCodesPanel(_this) {
+      _this.panelALive = false;
+      _this.$nextTick(() => {
+        _this.panelALive = true;
+      });
+    }
+    ,
+
+    deleteDialog(_this, row) {
+      _this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          _this.deleteOrders(row.billNo);
+        })
+        .catch(() => {
+        });
+    }
+    ,
+    deleteOrders(data) {
+      this.loading = true;
+      this.deleteData.billNo = data;
+      deleteOriginOrder(this.deleteData)
+        .then((response) => {
+          if (response.code == 20000) {
+            this.getList();
+            this.panelALive = false
+            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(() => {
+        });
+    }
+    ,
+    findWorkPlace(_this, val) {
+      let query = {
+        userIdFlag: true,
+        key: val,
+        page: 1,
+        limit: 10
+      }
+      filterWorkOptimize(query)
+        .then((response) => {
+          _this.loading = false
+          _this.options.findWorkPlace = response.data || []
+          if (_this.options.findWorkPlace.length == 1) {
+            _this.filterQuery.workPlaceCode = _this.options.findWorkPlace[0].code
+            _this.getWorkBindBusTypes(_this, _this.filterQuery.workPlaceCode)
+          }
+        })
+        .catch(() => {
+          _this.loading = false
+          _this.options.findWorkPlace = []
+        })
+    },
+    changePlace(_this, query) {
+      _this.getWorkBindBusTypes(_this, query)
+    },
+    getWorkBindBusTypes(_this, query) {
+      _this.busQuery.workplaceCode = query
+      getWorkBindBusTypes(this.busQuery).then(res => {
+        if (res.code == 20000) {
+          let busTypes = res.data.list || [];
+          // _this.options.getWorkPlace = res.data.list || [];
+          let getWorkPlace = busTypes.map(busType => {
+            return {
+              code: busType.documentTypeCode,
+              label: busType.busName
+            };
+          });
+          _this.options.getBusType = getWorkPlace
+          if (_this.options.getBusType.length == 1) {
+            _this.filterQuery.busType = _this.options.getBusType[0].code
+          } else {
+            _this.filterQuery.busType = null
+          }
+        }
+        return
+      })
+    },
+
+    submitDialog() {
+
+    },
+
+    errorHandle(_this, row) {
+      _this.$confirm("此操作将重新下载该订单, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.loading = true;
+          let params = {
+            billNo: row.billNo,
+            busType: row.busType,
+            workPlaceCode: row.workPlaceCode,
+            tagStatus: row.tagStatus,
+            fromTpye: row.fromTpye,
+          };
+          errorHandle(params)
+            .then((response) => {
+              if (response.code == 20000) {
+                _this.$message.success("处理成功！")
+              } else if (response.code == 520) {
+                _this.$message.error(response.message);
+              } else {
+                _this.$message.error(response.message);
+              }
+            })
+            .catch(() => {
+            });
+        })
+        .catch(() => {
+        });
+    },
+    errorHandleSubmit(_this, row) {
+      _this.$confirm("此操作将提交该订单, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.loading = true;
+          let params = {
+            billNo: row.billNo,
+            busType: row.busType,
+            workPlaceCode: row.workPlaceCode,
+            tagStatus: row.tagStatus,
+            fromTpye: row.fromTpye,
+          };
+          errorHandleSubmit(params)
+            .then((response) => {
+              if (response.code == 20000) {
+                _this.getList();
+                _this.$message.success("处理成功！")
+              } else if (response.code == 520) {
+                _this.$message.error(response.message);
+              } else {
+                _this.$message.error(response.message);
+              }
+            })
+            .catch(() => {
+            });
+        })
+        .catch(() => {
+        });
+    },
+  },
+  created() {
+    getHead("IoCollectOrderUpload-order", "1").then((re) => {
+      // 处理返回的数据
+      this.tableObj = re.data;
+      this.tableHeader = re.data.tableList;
+      this.queryList = re.data.queryList;
+      this.fromList = re.data.fromList;
+      this.getList();
+    });
+
+
+
+    // this.filterQuery.tagStatus = String(this.tagStatus)
+    // this.filterQuery.tagStatusList = this.tagStatusList
+    this.findWorkPlace(this, '')
+    this.getWorkBindBusTypes(this, '')
+  }
+
+}
+</script>
+
+<style scoped>
+.query-form {
+  display: flex;
+  flex-wrap: wrap;
+  width: 100%;
+}
+
+.query-form-item {
+  margin-right: 5px;
+  margin-bottom: 6px;
+}
+</style>
diff --git a/src/views/collect/IocllectOrderReturn.vue b/src/views/collect/IocllectOrderReturn.vue
new file mode 100644
index 00000000..bd54cb77
--- /dev/null
+++ b/src/views/collect/IocllectOrderReturn.vue
@@ -0,0 +1,851 @@
+<template>
+  <div>
+    <el-card>
+      <el-form v-if="queryList && queryList.length > 0 " :model="filterQuery" class="query-form"
+               @submit.native.prevent
+               size="mini" label-width="100px">
+        <el-row style=" display:flex;  flex-wrap: wrap; ">
+          <template v-for="(item, index) in queryList">
+            <div v-if="showSearch || item.isImport">
+              <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 == '模糊查询' ? '单据号/业务名称/收货方/发货方' : 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
+                  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>
+            </div>
+          </template>
+        </el-row>
+      </el-form>
+      <!--      <div class="left-search" v-if="!showSearch">-->
+      <!--        &lt;!&ndash; 关键字搜索 按需配置 &ndash;&gt;-->
+      <!--        <el-form v-if="queryList && queryList.length > 0" :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) && item.columnName == 'keywords'"-->
+      <!--                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>-->
+      <!--            </template>-->
+      <!--          </el-row>-->
+      <!--        </el-form>-->
+      <!--      </div>-->
+      <div class="top-right-btn">
+        <el-button-group style="display:flex;">
+          <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(this)"
+          >查询
+          </el-button
+          >
+          <!--<el-upload-->
+          <!--  :action="action"-->
+          <!--  :headers ="headers"-->
+          <!--  accept=".xlsx,.xls"-->
+          <!--  :on-preview="handlePreview"-->
+          <!--  :on-remove="handleRemove"-->
+          <!--  :before-remove="beforeRemove"-->
+          <!--  :on-success="handleSuccess"-->
+          <!--  :on-progress="handleProgress"-->
+          <!--  :on-error="handleError"-->
+          <!--  :before-upload="beforeUpload"-->
+          <!--  :limit="1"-->
+          <!--  :on-exceed="handleExceed"-->
+          <!--  :file-list="fileList"-->
+          <!--  :show-file-list="false"-->
+          <!--  :data="extraData">-->
+          <!--  <el-button  icon="el-icon-upload" type="primary" >手动上传数据</el-button>-->
+          <!--</el-upload>-->
+          <!--<el-button type="primary" icon="el-icon-download" @click="downloadData"-->
+          <!--&gt;下载数据-->
+          <!--</el-button-->
+          <!--&gt;-->
+        </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="单据明细">
+        <PannelOriginOrderDetail
+          v-if="panelALive"
+          :prescribeData="curRow"
+        ></PannelOriginOrderDetail>
+      </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="75%"
+      append-to-body
+    >
+      <prescribeDownloadDialog
+        :closeDialog="this.closeDialog"
+      ></prescribeDownloadDialog>
+    </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} from "@/api/basic/sicker/prescribeApi";
+import prescribeDownloadDialog from "@/views/collect/prescribe/prescribeDownloadDialog";
+import prescribeOriginPanel from "./PannelOrderBiz";
+import PannelOriginOrderDetail from "./PannelOriginOrderDetail"
+import {
+  clearAllOrder,
+  deleteByOrder,
+  importOrder,
+  downloadOrder,
+  errorHandle, errorHandleSubmit, deleteOriginOrder,returnOrderSubmit
+} from "@/api/collect/collectOrder";
+import {
+  getOrderUpload,
+  orderPage
+} from '@/api/collect/collectOriginOrder'
+import {filterSubAllOptimize} from "@/api/system/invSubWarehouse";
+import {filterWorkOptimize} from "@/api/basic/workPlace/sysWorkplaceManage";
+import {getWorkBindBusTypes} from '@/api/basic/workPlace/sysWorkplaceDocuments'
+import {getAdminId, getToken} from '@/utils/auth';
+
+export default {
+  name: "IocllectOrderReturn",
+  props: {
+    tagStatus: {
+      type: Number,
+      required: true
+    },
+    tagStatusList: {
+      type: Array,
+      required: true
+    },
+  },
+  data() {
+    return {
+      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]);
+            },
+          },
+        ],
+      },
+      //界面配置相关
+      //患者处方
+      tableHeader: [],
+      queryList: [],
+      tableObj: [],
+      fromList: [],
+      //原始处方明细
+      tableHeader1: [],
+      queryList1: [],
+      tableObj1: [],
+      fromList1: [],
+      convertDateFun: convertDate,
+      //界面配置-------------end
+
+      showSearch: false,
+      filterQuery: {
+        // tagStatus: this.tagStatus,    //
+        tagStatusList: [0, 1, 2,3],    //
+        billNo: null,
+        busType: null,
+        workPlaceCode: null,
+        startTime: null,
+        endTime: null,
+        documentTypeCodes: ['YPCFTF002','YPCFTF003'],
+        page: 1,
+        limit: 10,
+      },
+
+      errQuery: {
+        tagStatusList: [4],    //
+        page: 1,
+        limit: 10,
+      },
+      DataQuery: {
+        busType: null,
+        page: 1,
+        limit: 10,
+      },
+      defaultSort: {prop: 'createTime', order: 'desc'},
+      loading: false,
+      list: [],
+      total: 0,
+
+
+      errList: [],
+      errTotal: 0,
+      downloadPrescriptionVisible: false,
+      deleteData: {
+        billNo: null,
+      },
+      options: {
+        sysWorkspace: [],
+        findWorkPlace: [],
+        getBusType: []
+      },
+
+      preLoading: false,
+      preDetailList: [],
+      preTotal: 0,
+      preQuery: {
+        prescribeCode: null,
+        page: 1,
+        limit: 10,
+      },
+      curRow: null,
+      panelALive: false,
+      busQuery: {
+        busKey: '',
+        workplaceCode: null,
+        page: 1,
+        limit: 100,
+        documentTypeCodes: ['YPCFTF002','YPCFTF003'],
+      },
+      errQueryPage: 1,
+      headers:{
+        ADMINID: getAdminId(),
+        ADMINTOKEN: getToken()
+      },
+      extraData:{"uuid": "upload-xlsx"},
+      uploadLoading: false,
+      action: process.env.VUE_APP_BASE_API + "/udiwms/collect/order/xlsxUpload",
+      fileList: []
+    }
+  },
+
+  components: {
+    addOrder, errOrder, prescribeDownloadDialog, prescribeOriginPanel, PannelOriginOrderDetail
+  },
+  methods: {
+    handleRemove(file, fileList) {
+      console.log(file, fileList);
+    },
+    handlePreview(file) {
+      console.log(file);
+    },
+    handleExceed(files, fileList) {
+      // this.$message.warning(`当前限制选择 5 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
+    },
+    beforeRemove(file, fileList) {
+      // return this.$confirm(`确定移除 ${ file.name }？`);
+    },
+    handleSuccess(res, file, fileList) {
+      fileList = fileList.filter(item => item.response.code === 20000);
+      this.fileList = fileList;
+      if (res.code === 20000) {
+        this.$message.success(res.message);
+        this.fileList = []
+      } else {
+        this.$message.error(res.message);
+      }
+      this.uploadLoading.close();
+    },
+    beforeUpload(file) {
+      const isXML = file.name.endsWith('.xls');
+      const isXML2 = file.name.endsWith('.xlsx');
+      const isLt5M = file.size / 1024 / 1024 < 100;
+      if (!isXML &&!isXML2) {
+        this.$message.error('上传文件只能是 xls 格式!');
+      }
+      if (!isLt5M) {
+        this.$message.error('上传文件大小不能超过 10MB!');
+      }
+      return (isXML || isXML2) && isLt5M;
+    },
+    handleProgress() {
+      this.uploadLoading = this.$loading({
+        lock: true,
+        text: '文件上传中…',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.5)'
+      });
+    },
+    handleError() {
+      this.uploadLoading.close();
+      this.$message.error('文件上传失败，请检查文件大小或文件格式');
+    },
+    //界面配置相关------------
+    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;
+      this.$nextTick(() => {
+        console.log('组件已刷新');
+      });
+    },
+    onReset() {
+      this.filterQuery = {
+        tagStatusList: [0, 1, 2,3],
+        billNo: null,
+        busType: null,
+        workPlaceCode: null,
+        documentTypeCodes: ['YPCFTF002','YPCFTF003'],
+        page: 1,
+        limit: 10,
+      };
+      this.errQuery = {
+        tagStatusList: [4],    //
+        page: 1,
+        limit: 10,
+      },
+        this.actDateRange = [];
+      this.getList();
+      this.panelALive = false
+    },
+    downloadPrescription() {
+      this.downloadPrescriptionVisible = true
+      // this.loading = true;
+      // importOrder().then(res => {
+      //     this.loading = false
+      //     if (res.code == 20000) {
+      //       this.$message.success("下载成功！")
+      //       this.getList()
+      //     } else {
+      //       this.$message.error(res.message)
+      //     }
+      //   }
+      // ).catch(() => {
+      //   this.loading = false
+      // })
+    },
+    downloadData() {
+      this.downloadPrescriptionVisible = true
+      // if (this.filterQuery.workPlaceCode == null) {
+      //   return this.$message.error("请先选择工位")
+      // }
+
+      // 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.busType = '24'
+      // // downloadOrder(this.filterQuery).then(res => {
+      //     getThrOrderPage(this.filterQuery).then(res => {
+      //   if (res.code == 20000) {
+      //     return this.$message.success(res.data)
+      //   } else {
+      //     return this.$message.error(res.message)
+      //   }
+      // })
+    },
+    clearAllOrder() {
+      this.loading = true;
+      clearAllOrder().then(res => {
+        this.loading = false
+        if (res.code == 20000) {
+          this.$message.success("清除成功！")
+          this.getList()
+        } else {
+          this.$message.error(res.message)
+        }
+      }).catch(() => {
+        this.loading = false
+      })
+    }
+    ,
+    closeDialog() {
+      this.downloadPrescriptionVisible = false;
+      this.getList();
+    }
+    ,
+    onSubmit(_this) {
+      if (_this == null)
+        _this = this
+      _this.filterQuery.page = 1;
+      _this.getList();
+    }
+    ,
+
+    getList() {
+      this.loading = true;
+      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;
+      }
+      orderPage(this.filterQuery).then(res => {
+        this.loading = false
+        this.list = res.data.list || []
+        this.total = res.data.total || 0
+      }).catch(() => {
+        this.loading = false
+        this.list = []
+        this.total = 0
+      })
+    },
+
+    getList2(_this) {
+      _this.loading = true;
+      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;
+      }
+      orderPage(_this.filterQuery).then(res => {
+        _this.loading = false
+        _this.list = res.data.list || []
+        _this.total = res.data.total || 0
+      }).catch(() => {
+        _this.loading = false
+        _this.list = []
+        _this.total = 0
+      })
+    }
+    ,
+    handleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getList();
+    },
+    handleCurrentChangeError(val) {
+      this.errQuery.page = val.page;
+      this.errQueryPage = val.page
+    }
+    ,
+
+    prescribeClick(_this, row) {
+      _this.curRow = row;
+      _this.refreshCodesPanel(_this);
+    }
+    ,
+    refreshCodesPanel(_this) {
+      _this.panelALive = false;
+      _this.$nextTick(() => {
+        _this.panelALive = true;
+      });
+    }
+    ,
+
+    deleteDialog(_this, row) {
+      _this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          _this.deleteOrders(row.billNo);
+        })
+        .catch(() => {
+        });
+    }
+    ,
+    deleteOrders(data) {
+      this.loading = true;
+      this.deleteData.billNo = data;
+      deleteOriginOrder(this.deleteData)
+        .then((response) => {
+          if (response.code == 20000) {
+            this.getList();
+            this.panelALive = false
+            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(() => {
+        });
+    }
+    ,
+    findWorkPlace(_this, val) {
+      let query = {
+        userIdFlag: true,
+        key: val,
+        page: 1,
+        limit: 10
+      }
+      filterWorkOptimize(query)
+        .then((response) => {
+          _this.loading = false
+          _this.options.findWorkPlace = response.data || []
+          if (_this.options.findWorkPlace.length == 1) {
+            _this.filterQuery.workPlaceCode = _this.options.findWorkPlace[0].code
+            _this.getWorkBindBusTypes(_this, _this.filterQuery.workPlaceCode)
+          }
+        })
+        .catch(() => {
+          _this.loading = false
+          _this.options.findWorkPlace = []
+        })
+    },
+    changePlace(_this, query) {
+      _this.getWorkBindBusTypes(_this, query)
+    },
+    getWorkBindBusTypes(_this, query) {
+      _this.busQuery.workplaceCode = query
+      getWorkBindBusTypes(this.busQuery).then(res => {
+        if (res.code == 20000) {
+          let busTypes = res.data.list || [];
+          // _this.options.getWorkPlace = res.data.list || [];
+          let getWorkPlace = busTypes.map(busType => {
+            return {
+              code: busType.documentTypeCode,
+              label: busType.busName
+            };
+          });
+          _this.options.getBusType = getWorkPlace
+          if (_this.options.getBusType.length == 1) {
+            _this.filterQuery.busType = _this.options.getBusType[0].code
+          } else {
+            _this.filterQuery.busType = null
+          }
+        }
+        return
+      })
+    },
+
+    submitDialog() {
+
+    },
+
+    errorHandle(_this, row) {
+      _this.$confirm("此操作将重新下载该订单, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.loading = true;
+          let params = {
+            billNo: row.billNo,
+            busType: row.busType,
+            workPlaceCode: row.workPlaceCode,
+            tagStatus: row.tagStatus,
+            fromTpye: row.fromTpye,
+          };
+          errorHandle(params)
+            .then((response) => {
+              if (response.code == 20000) {
+                _this.$message.success("处理成功！")
+              } else if (response.code == 520) {
+                _this.$message.error(response.message);
+              } else {
+                _this.$message.error(response.message);
+              }
+            })
+            .catch(() => {
+            });
+        })
+        .catch(() => {
+        });
+    },
+    returnSubmit(_this, row) {
+      _this.$confirm("此操作将退货该订单, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.loading = true;
+          let params = {
+            billNo: row.billNo,
+            busType: row.busType,
+            workPlaceCode: row.workPlaceCode,
+            tagStatus: row.tagStatus,
+            fromTpye: row.fromTpye,
+            remark: '36351637'
+          };
+          returnOrderSubmit(params)
+            .then((response) => {
+              if (response.code == 20000) {
+                _this.getList();
+                _this.$message.success("处理成功！")
+              } else if (response.code == 520) {
+                _this.$message.error(response.message);
+              } else {
+                _this.$message.error(response.message);
+              }
+            })
+            .catch(() => {
+            });
+        })
+        .catch(() => {
+        });
+    },
+  },
+  created() {
+    getHead("IocllectOrderReturnOrder", "1").then((re) => {
+      // 处理返回的数据
+      this.tableObj = re.data;
+      this.tableHeader = re.data.tableList;
+      this.queryList = re.data.queryList;
+      this.fromList = re.data.fromList;
+      this.getList();
+    });
+
+
+
+    // this.filterQuery.tagStatus = String(this.tagStatus)
+    // this.filterQuery.tagStatusList = this.tagStatusList
+    this.findWorkPlace(this, '')
+    this.getWorkBindBusTypes(this, '')
+  }
+
+}
+</script>
+
+<style scoped>
+.query-form {
+  display: flex;
+  flex-wrap: wrap;
+  width: 100%;
+}
+
+.query-form-item {
+  margin-right: 5px;
+  margin-bottom: 6px;
+}
+</style>
diff --git a/src/views/collect/PannelOrderBiz.vue b/src/views/collect/PannelOrderBiz.vue
index eea0f13e..0ff14896 100644
--- a/src/views/collect/PannelOrderBiz.vue
+++ b/src/views/collect/PannelOrderBiz.vue
@@ -112,40 +112,40 @@
     <!--  </template>-->
     <!--</el-table>-->
 
-    <el-table :data="preDetailList" highlight-current-row="true" border ref="multipleTable"    size="100"
+    <el-table :data="preDetailList" highlight-current-row="true" border ref="multipleTable" size="100"
               :row-style="{ height: '60px' }"
               :cell-style="{ padding: '0' }"
     >
-      <el-table-column label="赋码状态" prop="cpmctymc" >
+      <el-table-column label="赋码状态" prop="cpmctymc">
         <template v-slot="scope">
           <div style="text-align: center;">
-          <el-tag  :type="getTagColor(scope.row)" size="26" >
-            {{ codingStatus }}
-          </el-tag>
+            <el-tag :type="getTagColor(scope.row)" size="26">
+              {{ codingStatus }}
+            </el-tag>
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="产品通用名" prop="cpmctymc" >
+      <el-table-column label="产品通用名" prop="cpmctymc">
         <template v-slot="scope">
           <div :style="{ fontSize: '16px' }">{{ scope.row.cpmctymc }}</div>
         </template>
       </el-table-column>
-      <el-table-column label="单据数量" prop="count" >
+      <el-table-column label="单据数量" prop="count">
         <template v-slot="scope">
           <div :style="{ fontSize: '26px' }">{{ scope.row.count }}</div>
         </template>
       </el-table-column>
-      <el-table-column label="应扫码数量" prop="scanActCount" >
+      <el-table-column label="应扫码数量" prop="scanActCount">
         <template v-slot="scope">
-          <div :style="getCellStyle(scope.row)">{{scope.row.scanCount}}/{{ scope.row.shouldCount }}</div>
+          <div :style="getCellStyle(scope.row)">{{ scope.row.scanCount }}/{{ scope.row.shouldCount }}</div>
         </template>
       </el-table-column>
-      <el-table-column label="制剂规格" prop="prepnSpec" >
+      <el-table-column label="制剂规格" prop="prepnSpec">
         <template v-slot="scope">
           <div :style="{ fontSize: '16px' }">{{ scope.row.prepnSpec }}</div>
         </template>
       </el-table-column>
-      <el-table-column label="包装规格" prop="spec" >
+      <el-table-column label="包装规格" prop="spec">
         <template v-slot="scope">
           <div :style="{ fontSize: '16px' }">{{ scope.row.spec }}</div>
         </template>
@@ -157,20 +157,24 @@
           <div :style="{ fontSize: '16px' }">{{ scope.row.ybbm }}</div>
         </template>
       </el-table-column>
-      <el-table-column label="批次号" prop="batchNo" >
+      <el-table-column label="批次号" prop="batchNo">
         <template v-slot="scope">
           <div :style="{ fontSize: '16px' }">{{ scope.row.batchNo }}</div>
         </template>
       </el-table-column>
 
->
+      >
       <el-table-column
         fixed="right"
         label="操作"
-        width="120">
+        width="120"
+      >
         <template slot-scope="scope">
-          <el-button type="primary"   @click="scanDetail(scope.row)" style="font-size: 14px" :disabled="scope.row.scanCount == null || scope.row.scanCount == 0 ">
-            扫码明细({{scope.row.scanCount == null ? 0 : scope.row.scanCount }})</el-button>
+          <el-button type="primary" @click="scanDetail(scope.row)" style="font-size: 14px"
+                     :disabled="scope.row.scanCount == null || scope.row.scanCount == 0 "
+          >
+            扫码明细({{ scope.row.scanCount == null ? 0 : scope.row.scanCount }})
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -205,17 +209,17 @@
 </template>
 
 <script>
-import {convertDate} from "@/utils/date";
-import {detail} from "@/api/basic/sicker/prescribeApi";
-import {executeFuc, getHead} from "@/utils/customConfig";
-import {orderDetail, codeRemove} from "@/api/collect/collectOrder";
-import PanelOrderManuTagCode from "@/views/collect/PanelOrderManuTagCode";
+import { convertDate } from '@/utils/date'
+import { detail } from '@/api/basic/sicker/prescribeApi'
+import { executeFuc, getHead } from '@/utils/customConfig'
+import { orderDetail, codeRemove } from '@/api/collect/collectOrder'
+import PanelOrderManuTagCode from '@/views/collect/PanelOrderManuTagCode'
 
 /**
  * 原始处方明细
  */
 export default {
-  name: "prescribeOriginPanel",
+  name: 'prescribeOriginPanel',
   props: {
     prescribeData: {
       type: Object,
@@ -246,41 +250,40 @@ export default {
       fromList1: [],
       convertDateFun: convertDate,
 
-
       preLoading: false,
       preDetailList: [],
       preTotal: 0,
       preQuery: {
         orderIdFk: null,
         page: 1,
-        limit: 10,
+        limit: 10
       },
 
       countVisible: false,
       scanDetailVisible: false,
       bizId: null,
-      codingStatus: '已赋码',
+      codingStatus: '已赋码'
     }
   },
   methods: {
     deleteMan(_this, row) {
-      _this.$confirm("是否确定删除该条扫码?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+      _this.$confirm('是否确定删除该条扫码?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       }).then(() => {
-        _this.loading = true;
-        _this.codeRemoveMan(row.id, 2);
+        _this.loading = true
+        _this.codeRemoveMan(row.id, 2)
       })
     },
     deleteCode(_this, row) {
-      _this.$confirm("是否确定移除一个条码?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
+      _this.$confirm('是否确定移除一个条码?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
       }).then(() => {
-        _this.loading = true;
-        _this.codeRemoveMan(row.id, 1);
+        _this.loading = true
+        _this.codeRemoveMan(row.id, 1)
       })
     },
     codeRemoveMan(codeManId, delType) {
@@ -290,25 +293,25 @@ export default {
       }
       codeRemove(post).then((response) => {
         if (response.code === 20000) {
-          this.$message.success("操作成功！");
+          this.$message.success('操作成功！')
           this.getList(this)
         } else {
-          this.$message.error(response.message);
+          this.$message.error(response.message)
         }
-        this.loading = false;
+        this.loading = false
       }).catch(() => {
-        this.loading = false;
+        this.loading = false
       })
     },
     //界面配置-------------end
     executeFuc(row, type, clickFuc, value) {
-      return executeFuc(this, row, type, clickFuc, value);
+      return executeFuc(this, row, type, clickFuc, value)
     },
     executeEval(row, expression, defaultRet) {
       if (expression) {
-        return eval(expression);
+        return eval(expression)
       }
-      return defaultRet;
+      return defaultRet
     },
     handleSortChange(column, prop, order) {
       if (column.order === 'descending') {
@@ -316,24 +319,25 @@ export default {
       } else {
         this.query.sort = 'asc'
       }
-      this.query.orderBy = column.prop;
-      this.getList();
+      this.query.orderBy = column.prop
+      this.getList()
     },
     ///界面配置相关------------end
 
     preHandleCurrentChange(val) {
-      this.filterQuery.page = val.page;
-      this.getPrescribeDetail(this, null);
+      this.filterQuery.page = val.page
+      this.getPrescribeDetail(this, null)
     },
     getPrescribeDetail(_this) {
 
-      if (_this.prescribeData == null)
+      if (_this.prescribeData == null) {
         return
+      }
       if (_this.prescribeData != null) {
         _this.preQuery.page = 1
         _this.preQuery.orderIdFk = this.prescribeData.billNo
       }
-      _this.preLoading = true;
+      _this.preLoading = true
       orderDetail(_this.preQuery).then(res => {
         _this.preLoading = false
         if (res.code != 20000) {
@@ -344,52 +348,51 @@ export default {
         _this.preLoading = false
       }).catch(() => {
         _this.preLoading = false
-        _this.$message.error("数据加载失败")
+        _this.$message.error('数据加载失败')
       })
     },
 
-
-    scanDetail( row) {
-      this.bizId = row.id;
-      this.scanDetailVisible = true;
+    scanDetail(row) {
+      this.bizId = row.id
+      this.scanDetailVisible = true
     },
 
     closeScanDialog() {
-      this.getPrescribeDetail(this);
+      this.getPrescribeDetail(this)
       this.refreshPanel(this)
     },
 
-    rowStyle({row, rowIndex}) {
-      let rowBackground = {};
-      rowBackground.fontSize = '16px';
-      rowBackground.height = "50px";
+    rowStyle({ row, rowIndex }) {
+      let rowBackground = {}
+      rowBackground.fontSize = '16px'
+      rowBackground.height = '50px'
       if (row.scanActCount < row.count) {
-        rowBackground.color = '#F56C6C';
+        rowBackground.color = '#F56C6C'
       }
       if (row.autoTagStatus == 2) {
-        rowBackground.color = '#E6A23C';
+        rowBackground.color = '#E6A23C'
       }
       if (row.scanActCount >= row.count) {
-        rowBackground.color = '#56a717';
+        rowBackground.color = '#56a717'
       }
-      return rowBackground;
+      return rowBackground
     },
 
-    getCellStyle(row){
+    getCellStyle(row) {
       let cellStyle = {
         fontSize: '32px'
-      };
-      if (row.shouldCount == 0){
+      }
+      if (row.shouldCount == 0) {
         cellStyle.fontSize = '30px'
         cellStyle.color = '#F56C6C'
-       return  cellStyle;
+        return cellStyle
       }
       if (row.scanCount < row.shouldCount) {
-        cellStyle.color = '#F56C6C';
+        cellStyle.color = '#F56C6C'
       } else if (row.scanCount === row.shouldCount) {
-        cellStyle.color = '#56a717';
+        cellStyle.color = '#56a717'
       }
-      return cellStyle;
+      return cellStyle
     },
     // cellStyle({ row, column, rowIndex, columnIndex }) {
     //     return { height: '60px' };
@@ -397,42 +400,40 @@ export default {
     getTagColor(row) {
       if (row.scanActCount < row.count) {
         this.codingStatus = '未赋码'
-        return 'danger'; // 红色
+        return 'danger' // 红色
       } else if (row.autoTagStatus == 2) {
         this.codingStatus = '预赋码'
-        return 'warning'; // 黄色
+        return 'warning' // 黄色
       } else if (row.scanActCount >= row.count) {
         this.codingStatus = '已赋码'
-        return 'success'; // 绿色
+        return 'success' // 绿色
       }
     }
 
   },
 
-
   components: {
     PanelOrderManuTagCode
   },
   created() {
     if (this.tableHeader1 == null || this.tableHeader1.length == 0) {
-      getHead("prescribeOriginPanel", "1").then((re) => {
+      getHead('prescribeOriginPanel', '1').then((re) => {
         // 处理返回的数据
-        this.tableObj1 = re.data;
-        this.tableHeader1 = re.data.tableList;
-        this.queryList1 = re.data.queryList;
-        this.fromList1 = re.data.fromList;
-        this.getPrescribeDetail(this);
-      });
+        this.tableObj1 = re.data
+        this.tableHeader1 = re.data.tableList
+        this.queryList1 = re.data.queryList
+        this.fromList1 = re.data.fromList
+        this.getPrescribeDetail(this)
+      })
     }
-    this.getPrescribeDetail(this);
+    this.getPrescribeDetail(this)
     if (this.dealStatus == 1) {
-      this.countVisible = false;
+      this.countVisible = false
     } else {
-      this.countVisible = true;
+      this.countVisible = true
     }
   }
 
-
 }
 </script>