diff --git a/package.json b/package.json
index a0493bf..e23a621 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "author": "LionLi",
   "license": "MIT",
   "scripts": {
-    "dev": "vue-cli-service serve",
+    "dev": "set NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --open",
     "build:prod": "vue-cli-service build --mode production",
     "build:test": "vue-cli-service build --mode test",
     "preview": "node build/index.js --preview",
diff --git a/src/views/basic/product/UdiInfoSelectLocalUdi.vue b/src/views/basic/product/UdiInfoSelectLocalUdi.vue
index 926c77a..489b6b9 100644
--- a/src/views/basic/product/UdiInfoSelectLocalUdi.vue
+++ b/src/views/basic/product/UdiInfoSelectLocalUdi.vue
@@ -2,10 +2,12 @@
   <div>
     <el-card class="el-card">
       <div>
-        <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" size="mini" label-width="125px" v-show="showSearch">
+        <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" size="mini" label-width="125px"
+                 v-show="showSearch">
           <el-row style=" display:flex;  flex-wrap: wrap; ">
-            <template v-for="(item, index) in queryList" >
-              <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
+            <template v-for="(item, index) in queryList">
+              <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
+                            :label="item.columnDesc+`:`" :key="item.id">
                 <el-input
                   v-model="filterQuery[item.columnName]"
                   :placeholder="item.columnDesc"
@@ -14,7 +16,8 @@
                   clearable
                 ></el-input>
               </el-form-item>
-              <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"
+                            :label="item.columnDesc+`:`">
                 <el-select v-model="filterQuery[item.columnName]"
                            :placeholder="item.columnDesc"
                            :disabled="executeEval(null,item.disabledFuc,false)"
@@ -27,7 +30,8 @@
                   />
                 </el-select>
               </el-form-item>
-              <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)"
+                            :label="item.columnDesc+`:`">
                 <el-select
                   v-model="filterQuery[item.columnName]"
                   :placeholder="item.columnDesc"
@@ -38,13 +42,14 @@
                   clearable>
                   <el-option
                     v-for="item in options[item.clickFuc]"
-                      :key="item.code"
-                      :label="item.label"
-                      :value="item.code"
+                    :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)" :label="item.columnDesc+`:`">
+              <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)"
+                            :label="item.columnDesc+`:`">
                 <el-date-picker
                   v-model="dateRange"
                   :style="`width:${item.width+'px'}`"
@@ -57,7 +62,8 @@
                   :default-time="['00:00:00', '23:59:59']"
                 ></el-date-picker>
               </el-form-item>
-              <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)"
+                            :label="item.columnDesc+`:`">
                 <el-date-picker
                   v-model="filterQuery[item.columnName]"
                   :style="`width:${item.width+'px'}`"
@@ -69,81 +75,81 @@
               </el-form-item>
             </template>
           </el-row>
-<!--          <el-row>-->
-<!--            <el-col :span="18">-->
-<!--              <el-form-item class="query-form-item" label="UDI码:">-->
-<!--                <el-input v-model="filterQuery.udiCode"-->
-<!--                          placeholder="请扫描或输入UDI码"-->
-<!--                          clearable="true"-->
-<!--                          @keyup.enter.native="keyup_submit($event)"></el-input>-->
-<!--              </el-form-item>-->
-<!--            </el-col>-->
-<!--          </el-row>-->
-<!--          <el-row>-->
-<!--            <el-col :span="6">-->
-<!--              <el-form-item label="销售单元产品标识:" class="query-form-item">-->
-<!--                <el-input-->
-<!--                  v-model="filterQuery.nameCode" clearable="true"-->
-<!--                  placeholder="请输入完整DI"-->
-<!--                  @keyup.enter.native="keyup_submit($event)"-->
-<!--                ></el-input>-->
-<!--              </el-form-item>-->
-<!--            </el-col>-->
-<!--            <el-col :span="6">-->
-<!--              <el-form-item label="医疗器械注册人:" class="query-form-item">-->
-<!--                <el-select-->
-<!--                  v-model="filterQuery.ylqxzcrbarmc"-->
-<!--                  filterable-->
-<!--                  remote-->
-<!--                  clearable="true"-->
-<!--                  style="width: 100%"-->
-<!--                  reserve-keyword-->
-<!--                  placeholder="请输入医疗器械注册人"-->
-<!--                  :remote-method="findMethod"-->
-<!--                  :loading="loading"-->
-<!--                  @clear="clear"-->
-<!--                >-->
-<!--                  <el-option-->
-<!--                    v-for="item in fromOptions"-->
-<!--                    :key="item.ylqxzcrbarmc"-->
-<!--                    :label="item.ylqxzcrbarmc"-->
-<!--                    :value="item.ylqxzcrbarmc"-->
-<!--                  >-->
-<!--                    <span style="float: left">{{ item.ylqxzcrbarmc }}</span>-->
-<!--                  </el-option>-->
-<!--                </el-select>-->
-<!--              </el-form-item>-->
-<!--            </el-col>-->
-<!--            <el-col :span="6">-->
-<!--              <el-form-item label="器械通用名称:" class="query-form-item">-->
-<!--                <el-input-->
-<!--                  :disabled="filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''"-->
-<!--                  v-model="filterQuery.cpmctymc" clearable="true"-->
-<!--                  placeholder="请输入器械通用名称"-->
-<!--                ></el-input>-->
-<!--              </el-form-item>-->
-<!--            </el-col>-->
-<!--          </el-row>-->
-<!--          <el-row>-->
-<!--            <el-col :span="6">-->
-<!--              <el-form-item label="规格型号:" class="query-form-item">-->
-<!--                <el-input-->
-<!--                  v-model="filterQuery.ggxh" clearable="true"-->
-<!--                  :disabled="(filterQuery.cpmctymc=='' && filterQuery.nameCode=='' && (filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''))"-->
-<!--                  placeholder="请输入规格型号"-->
-<!--                ></el-input>-->
-<!--              </el-form-item>-->
-<!--            </el-col>-->
-<!--            <el-col :span="6">-->
-<!--              <el-form-item label="注册证/备案号:" class="query-form-item">-->
-<!--                <el-input-->
-<!--                  v-model="filterQuery.zczbhhzbapzbh" clearable="true"-->
-<!--                  :disabled="(filterQuery.cpmctymc=='' && filterQuery.nameCode=='' && (filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''))"-->
-<!--                  placeholder="请输入注册证/备案号"-->
-<!--                ></el-input>-->
-<!--              </el-form-item>-->
-<!--            </el-col>-->
-<!--          </el-row>-->
+          <!--          <el-row>-->
+          <!--            <el-col :span="18">-->
+          <!--              <el-form-item class="query-form-item" label="UDI码:">-->
+          <!--                <el-input v-model="filterQuery.udiCode"-->
+          <!--                          placeholder="请扫描或输入UDI码"-->
+          <!--                          clearable="true"-->
+          <!--                          @keyup.enter.native="keyup_submit($event)"></el-input>-->
+          <!--              </el-form-item>-->
+          <!--            </el-col>-->
+          <!--          </el-row>-->
+          <!--          <el-row>-->
+          <!--            <el-col :span="6">-->
+          <!--              <el-form-item label="销售单元产品标识:" class="query-form-item">-->
+          <!--                <el-input-->
+          <!--                  v-model="filterQuery.nameCode" clearable="true"-->
+          <!--                  placeholder="请输入完整DI"-->
+          <!--                  @keyup.enter.native="keyup_submit($event)"-->
+          <!--                ></el-input>-->
+          <!--              </el-form-item>-->
+          <!--            </el-col>-->
+          <!--            <el-col :span="6">-->
+          <!--              <el-form-item label="医疗器械注册人:" class="query-form-item">-->
+          <!--                <el-select-->
+          <!--                  v-model="filterQuery.ylqxzcrbarmc"-->
+          <!--                  filterable-->
+          <!--                  remote-->
+          <!--                  clearable="true"-->
+          <!--                  style="width: 100%"-->
+          <!--                  reserve-keyword-->
+          <!--                  placeholder="请输入医疗器械注册人"-->
+          <!--                  :remote-method="findMethod"-->
+          <!--                  :loading="loading"-->
+          <!--                  @clear="clear"-->
+          <!--                >-->
+          <!--                  <el-option-->
+          <!--                    v-for="item in fromOptions"-->
+          <!--                    :key="item.ylqxzcrbarmc"-->
+          <!--                    :label="item.ylqxzcrbarmc"-->
+          <!--                    :value="item.ylqxzcrbarmc"-->
+          <!--                  >-->
+          <!--                    <span style="float: left">{{ item.ylqxzcrbarmc }}</span>-->
+          <!--                  </el-option>-->
+          <!--                </el-select>-->
+          <!--              </el-form-item>-->
+          <!--            </el-col>-->
+          <!--            <el-col :span="6">-->
+          <!--              <el-form-item label="器械通用名称:" class="query-form-item">-->
+          <!--                <el-input-->
+          <!--                  :disabled="filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''"-->
+          <!--                  v-model="filterQuery.cpmctymc" clearable="true"-->
+          <!--                  placeholder="请输入器械通用名称"-->
+          <!--                ></el-input>-->
+          <!--              </el-form-item>-->
+          <!--            </el-col>-->
+          <!--          </el-row>-->
+          <!--          <el-row>-->
+          <!--            <el-col :span="6">-->
+          <!--              <el-form-item label="规格型号:" class="query-form-item">-->
+          <!--                <el-input-->
+          <!--                  v-model="filterQuery.ggxh" clearable="true"-->
+          <!--                  :disabled="(filterQuery.cpmctymc=='' && filterQuery.nameCode=='' && (filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''))"-->
+          <!--                  placeholder="请输入规格型号"-->
+          <!--                ></el-input>-->
+          <!--              </el-form-item>-->
+          <!--            </el-col>-->
+          <!--            <el-col :span="6">-->
+          <!--              <el-form-item label="注册证/备案号:" class="query-form-item">-->
+          <!--                <el-input-->
+          <!--                  v-model="filterQuery.zczbhhzbapzbh" clearable="true"-->
+          <!--                  :disabled="(filterQuery.cpmctymc=='' && filterQuery.nameCode=='' && (filterQuery.ylqxzcrbarmc==null || filterQuery.ylqxzcrbarmc==''))"-->
+          <!--                  placeholder="请输入注册证/备案号"-->
+          <!--                ></el-input>-->
+          <!--              </el-form-item>-->
+          <!--            </el-col>-->
+          <!--          </el-row>-->
         </el-form>
         <div class="top-right-btn">
           <el-button-group>
@@ -193,7 +199,7 @@
               :show-overflow-tooltip="item.tooltip"
               :key="item.columnName"
             >
-              <template  slot-scope="scope">
+              <template slot-scope="scope">
                 <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
               </template>
             </el-table-column>
@@ -206,8 +212,10 @@
               :show-overflow-tooltip="item.tooltip"
               :key="item.columnName"
             >
-              <template   slot-scope="scope">
-                <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
+              <template slot-scope="scope">
+                <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{
+                    item.lableRuleObj[scope.row[item.columnName]]
+                  }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -219,9 +227,12 @@
               :show-overflow-tooltip="item.tooltip"
               :key="item.columnName"
             >
-              <template   slot-scope="scope">
-                <el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
-                  <span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
+              <template slot-scope="scope">
+                <el-tag
+                  :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
+                  <span>{{
+                      item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName]
+                    }}</span>
                 </el-tag>
               </template>
             </el-table-column>
@@ -256,55 +267,57 @@
               :key="item.columnName"
             >
               <template slot-scope="scope">
-                <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
+                <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
+                    scope.row[item.columnName]
+                  }}</span>
               </template>
             </el-table-column>
 
           </template>
-<!--          <el-table-column-->
-<!--            v-if="relId==null"-->
-<!--            type="selection"-->
-<!--            :selectable="checkSelectable"-->
-<!--            width="55"-->
-<!--          ></el-table-column>-->
-<!--          <el-table-column label="序号" type="index"></el-table-column>-->
-<!--          <el-table-column-->
-<!--            label="产品标识"-->
-<!--            prop="nameCode"-->
-<!--            show-overflow-tooltip-->
-<!--          ></el-table-column>-->
-<!--          <el-table-column-->
-<!--            label="物资名称"-->
-<!--            prop="cpmctymc"-->
-<!--            show-overflow-tooltip-->
-<!--          ></el-table-column>-->
-<!--          <el-table-column-->
-<!--            label="规格型号"-->
-<!--            prop="ggxh"-->
-<!--            show-overflow-tooltip-->
-<!--          ></el-table-column>-->
-<!--          <el-table-column-->
-<!--            label="医疗器械注册人"-->
-<!--            prop="ylqxzcrbarmc"-->
-<!--            show-overflow-tooltip-->
-<!--          ></el-table-column>-->
-<!--          <el-table-column-->
-<!--            label="注册证编号"-->
-<!--            prop="zczbhhzbapzbh"-->
-<!--            show-overflow-tooltip-->
-<!--          ></el-table-column>-->
-
-<!--          <el-table-column label="操作">-->
-<!--            <template slot-scope="scope">-->
-<!--              <el-button-->
-<!--                type="text"-->
-<!--                size="small"-->
-<!--                @click="diDetail(scope.row)"-->
-<!--              >详情-->
-<!--              </el-button-->
-<!--              >-->
-<!--            </template>-->
-<!--          </el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            v-if="relId==null"-->
+          <!--            type="selection"-->
+          <!--            :selectable="checkSelectable"-->
+          <!--            width="55"-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column label="序号" type="index"></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="产品标识"-->
+          <!--            prop="nameCode"-->
+          <!--            show-overflow-tooltip-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="物资名称"-->
+          <!--            prop="cpmctymc"-->
+          <!--            show-overflow-tooltip-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="规格型号"-->
+          <!--            prop="ggxh"-->
+          <!--            show-overflow-tooltip-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="医疗器械注册人"-->
+          <!--            prop="ylqxzcrbarmc"-->
+          <!--            show-overflow-tooltip-->
+          <!--          ></el-table-column>-->
+          <!--          <el-table-column-->
+          <!--            label="注册证编号"-->
+          <!--            prop="zczbhhzbapzbh"-->
+          <!--            show-overflow-tooltip-->
+          <!--          ></el-table-column>-->
+
+          <!--          <el-table-column label="操作">-->
+          <!--            <template slot-scope="scope">-->
+          <!--              <el-button-->
+          <!--                type="text"-->
+          <!--                size="small"-->
+          <!--                @click="diDetail(scope.row)"-->
+          <!--              >详情-->
+          <!--              </el-button-->
+          <!--              >-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
 
         </el-table>
         <pagination
@@ -495,7 +508,7 @@ import {combineUdi, combineAllUdi, checkExitUdi} from "@/api/basic/product/udiRe
 import selectDiDetail from "./SelectDIDetailDialog"
 import {isBlank} from "@/utils/strUtil";
 import {
-  getHead,executeFuc
+  getHead, executeFuc
 } from "@/utils/customConfig";
 
 export default {
@@ -555,11 +568,11 @@ export default {
       udidlList: [],
       erpList: [],
       pageTotal: 0,
-      tableHeader:[],
-      queryList:[],
-      fromList:[],
-      options:{
-        findMethod:[]
+      tableHeader: [],
+      queryList: [],
+      fromList: [],
+      options: {
+        findMethod: []
       },
       total: 0,
       currentRow: null,
@@ -670,17 +683,17 @@ export default {
       this.showSearch = !this.showSearch;
     },
 
-    keyup_submit(_this,event) {
+    keyup_submit(_this, event) {
       _this.filterQuery.page = 1;
       _this.getList();
       event.target.select();
     },
 
-    checkSelectable(_this,row) {
+    checkSelectable(_this, row) {
       return !row.check;
     },
 
-    diDetail(_this,row) {
+    diDetail(_this, row) {
       _this.diDetails = row;
       _this.selectDialog = true;
     },
@@ -693,7 +706,7 @@ export default {
       if (row.check) return "warning-row";
       return "";
     },
-    handleErpChange(_this,val) {
+    handleErpChange(_this, val) {
       _this.cpmctymc1 = val.cpmctymc;
       _this.currentRow = val;
     },
@@ -702,6 +715,7 @@ export default {
     },
 
     checkCombine() {
+      debugger
       if (isBlank(this.relId)) {
         this.checkedUdi();
       } else {
@@ -717,6 +731,7 @@ export default {
     },
 
     checkedUdi() {
+      debugger
       let selectData = this.multipleUdiSelection;
       let selected = null;
       if (this.multipleUdiSelection.length == 0) {
@@ -728,8 +743,7 @@ export default {
           if (this.currentRow.check) {
             selected = this.currentRow;
           }
-        } else
-          return;
+        }
 
       } else {
         selectData.forEach((obj) => {
@@ -815,16 +829,16 @@ export default {
           this.$emit("closeUdi", false);
         });
     },
-    showQxty(_this){
-      return _this.filterQuery.ylqxzcrbarmc==null || _this.filterQuery.ylqxzcrbarmc=='';
+    showQxty(_this) {
+      return _this.filterQuery.ylqxzcrbarmc == null || _this.filterQuery.ylqxzcrbarmc == '';
     },
-    showGgxh(_this){
-      return (_this.filterQuery.cpmctymc=='' && _this.filterQuery.nameCode=='' && (_this.filterQuery.ylqxzcrbarmc==null || _this.filterQuery.ylqxzcrbarmc==''));
+    showGgxh(_this) {
+      return (_this.filterQuery.cpmctymc == '' && _this.filterQuery.nameCode == '' && (_this.filterQuery.ylqxzcrbarmc == null || _this.filterQuery.ylqxzcrbarmc == ''));
     },
     handleSelectionUdiChange(val) {
       this.multipleUdiSelection = val;
     },
-    findMethod(_this,query) {
+    findMethod(_this, query) {
       let cQuery = {
         ylqxzcrbarmc: query,
         page: 1,
@@ -840,11 +854,11 @@ export default {
           _this.options.findMethod = []
         });
     },
-    executeFuc(row,type,clickFuc,value){
-      return executeFuc(this,row,type,clickFuc,value);
+    executeFuc(row, type, clickFuc, value) {
+      return executeFuc(this, row, type, clickFuc, value);
     },
-    executeEval(row,expression,defaultRet){
-      if(expression){
+    executeEval(row, expression, defaultRet) {
+      if (expression) {
         return eval(expression);
       }
       return defaultRet;
@@ -854,7 +868,7 @@ export default {
     selectDiDetail,
   },
   created() {
-    getHead("UdiInfoSelectLocalUdi","1").then((re) => {
+    getHead("UdiInfoSelectLocalUdi", "1").then((re) => {
       // 处理返回的数据
       this.tableObj = re.data;
       this.tableHeader = re.data.tableList;
diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue
index 0c1deb6..9acfb30 100644
--- a/src/views/basic/product/product.vue
+++ b/src/views/basic/product/product.vue
@@ -45,8 +45,9 @@
             v-show="showSearch"
           >
             <el-row style=" display:flex;  flex-wrap: wrap; ">
-              <template v-for="(item, index) in queryList" >
-                <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
+              <template v-for="(item, index) in queryList">
+                <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
+                              :label="item.columnDesc+`:`" :key="item.id">
                   <el-input
                     v-model="filterQuery[item.columnName]"
                     :placeholder="item.columnDesc"
@@ -55,7 +56,8 @@
                     clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+                <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"
+                              :label="item.columnDesc+`:`">
                   <el-select v-model="filterQuery[item.columnName]"
                              :placeholder="item.columnDesc"
                              :disabled="executeEval(null,item.disabledFuc,false)"
@@ -68,7 +70,8 @@
                     />
                   </el-select>
                 </el-form-item>
-                <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+                <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)"
+                              :label="item.columnDesc+`:`">
                   <el-select
                     v-model="filterQuery[item.columnName]"
                     :placeholder="item.columnDesc"
@@ -79,13 +82,14 @@
                     clearable>
                     <el-option
                       v-for="item in options[item.clickFuc]"
-                       :key="item.code"
-                       :label="item.label"
-                       :value="item.code"
+                      :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)" :label="item.columnDesc+`:`">
+                <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)"
+                              :label="item.columnDesc+`:`">
                   <el-date-picker
                     v-model="dateRange"
                     :style="`width:${item.width+'px'}`"
@@ -98,7 +102,8 @@
                     :default-time="['00:00:00', '23:59:59']"
                   ></el-date-picker>
                 </el-form-item>
-                <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+                <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)"
+                              :label="item.columnDesc+`:`">
                   <el-date-picker
                     v-model="filterQuery[item.columnName]"
                     :style="`width:${item.width+'px'}`"
@@ -110,142 +115,142 @@
                 </el-form-item>
               </template>
             </el-row>
-<!--            <el-row>-->
-<!--              <el-col :span="18">-->
-<!--                <el-form-item class="query-form-item" label="UDI码:">-->
-<!--                  <el-input-->
-<!--                    v-model="filterQuery.udiCode"-->
-<!--                    style="width: 97%"-->
-<!--                    placeholder="请扫描或输入UDI码"-->
-<!--                    clearable="true"-->
-<!--                    @keyup.enter.native="keyup_submit($event)"-->
-<!--                  ></el-input>-->
-<!--                </el-form-item>-->
-<!--              </el-col>-->
-<!--            </el-row>-->
-<!--            <el-row>-->
-<!--              <el-col :span="6">-->
-<!--                <el-form-item class="query-form-item" label="最小销售标识:">-->
-<!--                  <el-input-->
-<!--                    v-model="filterQuery.unionCode"-->
-<!--                    placeholder="请输入最小销售标识"-->
-<!--                    style="width: 90%"-->
-<!--                    clearable="true"-->
-<!--                  ></el-input>-->
-<!--                </el-form-item>-->
-<!--              </el-col>-->
-<!--              <el-col :span="6">-->
-<!--                <el-form-item class="query-form-item" label="物资名称:">-->
-<!--                  <el-input-->
-<!--                    v-model="filterQuery.cpmctymc"-->
-<!--                    placeholder="请输入物资名称"-->
-<!--                    clearable="true"-->
-<!--                    style="width: 90%"-->
-<!--                  ></el-input>-->
-<!--                </el-form-item>-->
-<!--              </el-col>-->
-<!--              <el-col :span="6">-->
-<!--                <el-form-item class="query-form-item" label="规格型号:">-->
-<!--                  <el-input-->
-<!--                    v-model="filterQuery.ggxh"-->
-<!--                    placeholder="请输入规格型号"-->
-<!--                    clearable="true"-->
-<!--                    style="width: 90%"-->
-<!--                  ></el-input>-->
-<!--                </el-form-item>-->
-<!--              </el-col>-->
-<!--              <el-col :span="6">-->
-<!--                <el-form-item class="query-form-item" label="对照条件:">-->
-<!--                  <el-select-->
-<!--                    v-model="filterQuery.filterType"-->
-<!--                    placeholder="请选择过滤对照条件"-->
-<!--                    style="width: 90%"-->
-<!--                  >-->
-<!--                    <el-option-->
-<!--                      v-for="item in filterList"-->
-<!--                      :key="item.filterType"-->
-<!--                      :label="item.sysName"-->
-<!--                      :value="item.filterType"-->
-<!--                    >-->
-<!--                      <span style="float: left">{{ item.sysName }}</span>-->
-<!--                    </el-option>-->
-<!--                  </el-select>-->
-<!--                </el-form-item>-->
-<!--              </el-col>-->
-<!--            </el-row>-->
-<!--            <el-row>-->
-<!--              <el-col :span="6">-->
-<!--                <el-form-item class="query-form-item" label="注册备案人:">-->
-<!--                  <el-input-->
-<!--                    v-model="filterQuery.ylqxzcrbarmc"-->
-<!--                    placeholder="请输入注册备案人"-->
-<!--                    style="width: 90%"-->
-<!--                    clearable="true"-->
-<!--                  ></el-input>-->
-<!--                </el-form-item>-->
-<!--              </el-col>-->
-<!--              <el-col :span="6">-->
-<!--                <el-form-item class="query-form-item" label="第三方编码:">-->
-<!--                  <el-input-->
-<!--                    v-model="filterQuery.thrPiId"-->
-<!--                    placeholder="请输入第三方主系统编码"-->
-<!--                    style="width: 90%"-->
-<!--                    clearable="true"-->
-<!--                  ></el-input>-->
-<!--                </el-form-item>-->
-<!--              </el-col>-->
-<!--              <el-col :span="6">-->
-<!--                <el-form-item class="query-form-item" label="集采状态:">-->
-<!--                  <el-select-->
-<!--                    v-model="filterQuery.groupBuy"-->
-<!--                    placeholder="请选择集采状态"-->
-<!--                    clearable-->
-<!--                    style="width: 90%"-->
-<!--                  >-->
-<!--                    <el-option label="全部" value=""></el-option>-->
-<!--                    <el-option label="集采" value="true"></el-option>-->
-<!--                    <el-option label="非集采" value="false"></el-option>-->
-<!--                  </el-select>-->
-<!--                </el-form-item>-->
-<!--              </el-col>-->
-<!--              <el-col :span="6">-->
-<!--                <el-form-item class="query-form-item" label="可配送状态:">-->
-<!--                  <el-select-->
-<!--                    v-model="filterQuery.dispatch"-->
-<!--                    placeholder="请选择可配送状态"-->
-<!--                    clearable-->
-<!--                    style="width: 90%"-->
-<!--                  >-->
-<!--                    <el-option label="全部" value=""></el-option>-->
-<!--                    <el-option label="可配送" value="true"></el-option>-->
-<!--                    <el-option label="不可配送" value="false"></el-option>-->
-<!--                  </el-select>-->
-<!--                </el-form-item>-->
-<!--              </el-col>-->
-<!--            </el-row>-->
-
-<!--            <el-row>-->
-<!--              <el-col :span="6">-->
-<!--                <el-form-item class="query-form-item" label="注册/备案号:">-->
-<!--                  <el-input-->
-<!--                    v-model="filterQuery.zczbhhzbapzbh"-->
-<!--                    placeholder="请输入注册/备案号"-->
-<!--                    style="width: 90%"-->
-<!--                    clearable="true"-->
-<!--                  ></el-input>-->
-<!--                </el-form-item>-->
-<!--              </el-col>-->
-<!--              <el-col :span="6">-->
-<!--                <el-form-item class="query-form-item" label="生产企业:">-->
-<!--                  <el-input-->
-<!--                    v-model="filterQuery.manufactory"-->
-<!--                    placeholder="请输入生产企业"-->
-<!--                    style="width: 90%"-->
-<!--                    clearable="true"-->
-<!--                  ></el-input>-->
-<!--                </el-form-item>-->
-<!--              </el-col>-->
-<!--            </el-row>-->
+            <!--            <el-row>-->
+            <!--              <el-col :span="18">-->
+            <!--                <el-form-item class="query-form-item" label="UDI码:">-->
+            <!--                  <el-input-->
+            <!--                    v-model="filterQuery.udiCode"-->
+            <!--                    style="width: 97%"-->
+            <!--                    placeholder="请扫描或输入UDI码"-->
+            <!--                    clearable="true"-->
+            <!--                    @keyup.enter.native="keyup_submit($event)"-->
+            <!--                  ></el-input>-->
+            <!--                </el-form-item>-->
+            <!--              </el-col>-->
+            <!--            </el-row>-->
+            <!--            <el-row>-->
+            <!--              <el-col :span="6">-->
+            <!--                <el-form-item class="query-form-item" label="最小销售标识:">-->
+            <!--                  <el-input-->
+            <!--                    v-model="filterQuery.unionCode"-->
+            <!--                    placeholder="请输入最小销售标识"-->
+            <!--                    style="width: 90%"-->
+            <!--                    clearable="true"-->
+            <!--                  ></el-input>-->
+            <!--                </el-form-item>-->
+            <!--              </el-col>-->
+            <!--              <el-col :span="6">-->
+            <!--                <el-form-item class="query-form-item" label="物资名称:">-->
+            <!--                  <el-input-->
+            <!--                    v-model="filterQuery.cpmctymc"-->
+            <!--                    placeholder="请输入物资名称"-->
+            <!--                    clearable="true"-->
+            <!--                    style="width: 90%"-->
+            <!--                  ></el-input>-->
+            <!--                </el-form-item>-->
+            <!--              </el-col>-->
+            <!--              <el-col :span="6">-->
+            <!--                <el-form-item class="query-form-item" label="规格型号:">-->
+            <!--                  <el-input-->
+            <!--                    v-model="filterQuery.ggxh"-->
+            <!--                    placeholder="请输入规格型号"-->
+            <!--                    clearable="true"-->
+            <!--                    style="width: 90%"-->
+            <!--                  ></el-input>-->
+            <!--                </el-form-item>-->
+            <!--              </el-col>-->
+            <!--              <el-col :span="6">-->
+            <!--                <el-form-item class="query-form-item" label="对照条件:">-->
+            <!--                  <el-select-->
+            <!--                    v-model="filterQuery.filterType"-->
+            <!--                    placeholder="请选择过滤对照条件"-->
+            <!--                    style="width: 90%"-->
+            <!--                  >-->
+            <!--                    <el-option-->
+            <!--                      v-for="item in filterList"-->
+            <!--                      :key="item.filterType"-->
+            <!--                      :label="item.sysName"-->
+            <!--                      :value="item.filterType"-->
+            <!--                    >-->
+            <!--                      <span style="float: left">{{ item.sysName }}</span>-->
+            <!--                    </el-option>-->
+            <!--                  </el-select>-->
+            <!--                </el-form-item>-->
+            <!--              </el-col>-->
+            <!--            </el-row>-->
+            <!--            <el-row>-->
+            <!--              <el-col :span="6">-->
+            <!--                <el-form-item class="query-form-item" label="注册备案人:">-->
+            <!--                  <el-input-->
+            <!--                    v-model="filterQuery.ylqxzcrbarmc"-->
+            <!--                    placeholder="请输入注册备案人"-->
+            <!--                    style="width: 90%"-->
+            <!--                    clearable="true"-->
+            <!--                  ></el-input>-->
+            <!--                </el-form-item>-->
+            <!--              </el-col>-->
+            <!--              <el-col :span="6">-->
+            <!--                <el-form-item class="query-form-item" label="第三方编码:">-->
+            <!--                  <el-input-->
+            <!--                    v-model="filterQuery.thrPiId"-->
+            <!--                    placeholder="请输入第三方主系统编码"-->
+            <!--                    style="width: 90%"-->
+            <!--                    clearable="true"-->
+            <!--                  ></el-input>-->
+            <!--                </el-form-item>-->
+            <!--              </el-col>-->
+            <!--              <el-col :span="6">-->
+            <!--                <el-form-item class="query-form-item" label="集采状态:">-->
+            <!--                  <el-select-->
+            <!--                    v-model="filterQuery.groupBuy"-->
+            <!--                    placeholder="请选择集采状态"-->
+            <!--                    clearable-->
+            <!--                    style="width: 90%"-->
+            <!--                  >-->
+            <!--                    <el-option label="全部" value=""></el-option>-->
+            <!--                    <el-option label="集采" value="true"></el-option>-->
+            <!--                    <el-option label="非集采" value="false"></el-option>-->
+            <!--                  </el-select>-->
+            <!--                </el-form-item>-->
+            <!--              </el-col>-->
+            <!--              <el-col :span="6">-->
+            <!--                <el-form-item class="query-form-item" label="可配送状态:">-->
+            <!--                  <el-select-->
+            <!--                    v-model="filterQuery.dispatch"-->
+            <!--                    placeholder="请选择可配送状态"-->
+            <!--                    clearable-->
+            <!--                    style="width: 90%"-->
+            <!--                  >-->
+            <!--                    <el-option label="全部" value=""></el-option>-->
+            <!--                    <el-option label="可配送" value="true"></el-option>-->
+            <!--                    <el-option label="不可配送" value="false"></el-option>-->
+            <!--                  </el-select>-->
+            <!--                </el-form-item>-->
+            <!--              </el-col>-->
+            <!--            </el-row>-->
+
+            <!--            <el-row>-->
+            <!--              <el-col :span="6">-->
+            <!--                <el-form-item class="query-form-item" label="注册/备案号:">-->
+            <!--                  <el-input-->
+            <!--                    v-model="filterQuery.zczbhhzbapzbh"-->
+            <!--                    placeholder="请输入注册/备案号"-->
+            <!--                    style="width: 90%"-->
+            <!--                    clearable="true"-->
+            <!--                  ></el-input>-->
+            <!--                </el-form-item>-->
+            <!--              </el-col>-->
+            <!--              <el-col :span="6">-->
+            <!--                <el-form-item class="query-form-item" label="生产企业:">-->
+            <!--                  <el-input-->
+            <!--                    v-model="filterQuery.manufactory"-->
+            <!--                    placeholder="请输入生产企业"-->
+            <!--                    style="width: 90%"-->
+            <!--                    clearable="true"-->
+            <!--                  ></el-input>-->
+            <!--                </el-form-item>-->
+            <!--              </el-col>-->
+            <!--            </el-row>-->
           </el-form>
           <div class="top-right-btn">
             <el-button-group>
@@ -307,7 +312,7 @@
                 :show-overflow-tooltip="item.tooltip"
                 :key="item.columnName"
               >
-                <template  slot-scope="scope">
+                <template slot-scope="scope">
                   <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
                 </template>
               </el-table-column>
@@ -320,8 +325,10 @@
                 :show-overflow-tooltip="item.tooltip"
                 :key="item.columnName"
               >
-                <template   slot-scope="scope">
-                  <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
+                <template slot-scope="scope">
+                  <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{
+                      item.lableRuleObj[scope.row[item.columnName]]
+                    }}</span>
                 </template>
               </el-table-column>
               <el-table-column
@@ -333,9 +340,12 @@
                 :show-overflow-tooltip="item.tooltip"
                 :key="item.columnName"
               >
-                <template   slot-scope="scope">
-                  <el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
-                    <span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
+                <template slot-scope="scope">
+                  <el-tag
+                    :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
+                    <span>{{
+                        item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName]
+                      }}</span>
                   </el-tag>
                 </template>
               </el-table-column>
@@ -370,192 +380,194 @@
                 :key="item.columnName"
               >
                 <template slot-scope="scope">
-                  <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
+                  <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
+                      scope.row[item.columnName]
+                    }}</span>
                 </template>
               </el-table-column>
 
             </template>
-<!--            <el-table-column label="序号" type="index"></el-table-column>-->
-<!--            <el-table-column-->
-<!--              label="最小销售产品标识"-->
-<!--              prop="nameCode"-->
-<!--              width="140"-->
-<!--              show-overflow-tooltip-->
-<!--            ></el-table-column>-->
-<!--            <el-table-column-->
-<!--              label="主系统编码"-->
-<!--              prop="mainId"-->
-<!--              width="120"-->
-<!--              show-overflow-tooltip-->
-<!--            ></el-table-column>-->
-<!--            <el-table-column-->
-<!--              label="物资名称"-->
-<!--              prop="cpmctymc"-->
-<!--              width="160"-->
-<!--              show-overflow-tooltip-->
-<!--            ></el-table-column>-->
-<!--            <el-table-column-->
-<!--              label="规格型号"-->
-<!--              prop="ggxh"-->
-<!--              width="160"-->
-<!--              show-overflow-tooltip-->
-<!--            ></el-table-column>-->
-<!--            <el-table-column-->
-<!--              label="商品名称"-->
-<!--              prop="spmc"-->
-<!--              width="160"-->
-<!--              show-overflow-tooltip-->
-<!--              v-if="$auth.hasPermi('basic:spmc')"-->
-<!--            ></el-table-column>-->
-
-<!--            <el-table-column-->
-<!--              label="商品条码"-->
-<!--              prop="sptm"-->
-<!--              width="160"-->
-<!--              show-overflow-tooltip-->
-<!--              v-if="$auth.hasPermi('basic:sptm')"-->
-<!--            ></el-table-column>-->
-<!--            <el-table-column-->
-<!--              label="医保编码"-->
-<!--              prop="ybbm"-->
-<!--              width="160"-->
-<!--              show-overflow-tooltip-->
-<!--              v-if="$auth.hasPermi('basic:ybbm')"-->
-<!--            ></el-table-column>-->
-<!--            <el-table-column-->
-<!--              label="计量单位"-->
-<!--              prop="measname"-->
-<!--              width="160"-->
-<!--              show-overflow-tooltip-->
-<!--              v-if="$auth.hasPermi('basic:measname')"-->
-<!--            ></el-table-column>-->
-
-<!--            <el-table-column-->
-<!--              label="注册/备案号"-->
-<!--              prop="zczbhhzbapzbh"-->
-<!--              width="160"-->
-<!--              show-overflow-tooltip-->
-<!--            ></el-table-column>-->
-<!--            <el-table-column-->
-<!--              label="注册/备案人"-->
-<!--              prop="ylqxzcrbarmc"-->
-<!--              width="180"-->
-<!--              show-overflow-tooltip-->
-<!--            ></el-table-column>-->
-<!--            <el-table-column-->
-<!--              :label="productRemarkSet.remarkTitle1"-->
-<!--              prop="basicPrductRemak1"-->
-<!--              width="180"-->
-<!--              show-overflow-tooltip-->
-<!--              v-if="$auth.hasPermi('basic:basicPrductRemak1')"-->
-<!--            ></el-table-column>-->
-<!--            <el-table-column-->
-<!--              :label="productRemarkSet.remarkTitle2"-->
-<!--              prop="basicPrductRemak2"-->
-<!--              width="180"-->
-<!--              show-overflow-tooltip-->
-<!--              v-if="$auth.hasPermi('basic:basicPrductRemak2')"-->
-<!--            ></el-table-column>-->
-<!--            <el-table-column-->
-<!--              :label="productRemarkSet.remarkTitle3"-->
-<!--              prop="basicPrductRemak3"-->
-<!--              width="180"-->
-<!--              show-overflow-tooltip-->
-<!--              v-if="$auth.hasPermi('basic:basicPrductRemak3')"-->
-<!--            ></el-table-column>-->
-<!--            <el-table-column-->
-<!--              :label="productRemarkSet.remarkTitle4"-->
-<!--              prop="basicPrductRemak4"-->
-<!--              width="180"-->
-<!--              show-overflow-tooltip-->
-<!--              v-if="$auth.hasPermi('basic:basicPrductRemak4')"-->
-<!--            ></el-table-column>-->
-<!--            <el-table-column-->
-<!--              :label="productRemarkSet.remarkTitle5"-->
-<!--              prop="basicPrductRemak5"-->
-<!--              width="180"-->
-<!--              show-overflow-tooltip-->
-<!--              v-if="$auth.hasPermi('basic:basicPrductRemak5')"-->
-<!--            ></el-table-column>-->
-<!--            <el-table-column-->
-<!--              :label="productRemarkSet.remarkTitle6"-->
-<!--              prop="basicPrductRemak6"-->
-<!--              width="180"-->
-<!--              show-overflow-tooltip-->
-<!--              v-if="$auth.hasPermi('basic:basicPrductRemak6')"-->
-<!--            ></el-table-column>-->
-<!--            <el-table-column-->
-<!--              :label="productRemarkSet.remarkTitle7"-->
-<!--              prop="basicPrductRemak7"-->
-<!--              width="180"-->
-<!--              show-overflow-tooltip-->
-<!--              v-if="$auth.hasPermi('basic:basicPrductRemak7')"-->
-<!--            ></el-table-column>-->
-<!--            <el-table-column-->
-<!--              :label="productRemarkSet.remarkTitle8"-->
-<!--              prop="basicPrductRemak8"-->
-<!--              width="180"-->
-<!--              show-overflow-tooltip-->
-<!--              v-if="$auth.hasPermi('basic:basicPrductRemak8')"-->
-<!--            ></el-table-column>-->
-
-<!--            <el-table-column-->
-<!--              label="集采状态"-->
-<!--              prop="groupBuy"-->
-<!--              width="120"-->
-<!--              show-overflow-tooltip-->
-<!--              v-if="$auth.hasPermi('basic:groupBuy')"-->
-<!--            >-->
-<!--              <template slot-scope="scope">-->
-<!--                <el-tag :type="scope.row.groupBuy | statusFilterType">-->
-<!--                  {{ groupBuyMap[scope.row.groupBuy] }}-->
-<!--                </el-tag>-->
-<!--              </template>-->
-<!--            </el-table-column>-->
-<!--            <el-table-column-->
-<!--              label="可配送状态"-->
-<!--              prop="dispatch"-->
-<!--              width="120"-->
-<!--              show-overflow-tooltip-->
-<!--              v-if="$auth.hasPermi('basic:dispatch')"-->
-<!--            >-->
-<!--              <template slot-scope="scope">-->
-<!--                <el-tag :type="scope.row.dispatch | statusFilterType">-->
-<!--                  {{ dispatchMap[scope.row.dispatch] }}-->
-<!--                </el-tag>-->
-<!--              </template>-->
-<!--            </el-table-column>-->
-<!--            <el-table-column width="180" label="操作" fixed="right">-->
-<!--              <template slot-scope="scope">-->
-<!--                <el-button-->
-<!--                  type="text"-->
-<!--                  size="small"-->
-<!--                  :disabled="scope.row.originUuid != null"-->
-<!--                  @click.native.stop="intentSelectUdi(scope.row)"-->
-<!--                >关联DI-->
-<!--                </el-button>-->
-<!--                <el-button-->
-<!--                  type="text"-->
-<!--                  size="small"-->
-<!--                  @click.native.stop="handleModifyClick(scope.row)"-->
-<!--                >详情-->
-<!--                </el-button>-->
-
-<!--                <el-button-->
-<!--                  type="text"-->
-<!--                  size="small"-->
-<!--                  @click.native.stop="diEdit(scope.row)"-->
-<!--                >编辑-->
-<!--                </el-button>-->
-
-<!--                <el-button-->
-<!--                  type="text"-->
-<!--                  size="small"-->
-<!--                  @click.native.stop="deleteDialog(scope.row)"-->
-<!--                >删除-->
-<!--                </el-button>-->
-<!--              </template>-->
-<!--            </el-table-column>-->
+            <!--            <el-table-column label="序号" type="index"></el-table-column>-->
+            <!--            <el-table-column-->
+            <!--              label="最小销售产品标识"-->
+            <!--              prop="nameCode"-->
+            <!--              width="140"-->
+            <!--              show-overflow-tooltip-->
+            <!--            ></el-table-column>-->
+            <!--            <el-table-column-->
+            <!--              label="主系统编码"-->
+            <!--              prop="mainId"-->
+            <!--              width="120"-->
+            <!--              show-overflow-tooltip-->
+            <!--            ></el-table-column>-->
+            <!--            <el-table-column-->
+            <!--              label="物资名称"-->
+            <!--              prop="cpmctymc"-->
+            <!--              width="160"-->
+            <!--              show-overflow-tooltip-->
+            <!--            ></el-table-column>-->
+            <!--            <el-table-column-->
+            <!--              label="规格型号"-->
+            <!--              prop="ggxh"-->
+            <!--              width="160"-->
+            <!--              show-overflow-tooltip-->
+            <!--            ></el-table-column>-->
+            <!--            <el-table-column-->
+            <!--              label="商品名称"-->
+            <!--              prop="spmc"-->
+            <!--              width="160"-->
+            <!--              show-overflow-tooltip-->
+            <!--              v-if="$auth.hasPermi('basic:spmc')"-->
+            <!--            ></el-table-column>-->
+
+            <!--            <el-table-column-->
+            <!--              label="商品条码"-->
+            <!--              prop="sptm"-->
+            <!--              width="160"-->
+            <!--              show-overflow-tooltip-->
+            <!--              v-if="$auth.hasPermi('basic:sptm')"-->
+            <!--            ></el-table-column>-->
+            <!--            <el-table-column-->
+            <!--              label="医保编码"-->
+            <!--              prop="ybbm"-->
+            <!--              width="160"-->
+            <!--              show-overflow-tooltip-->
+            <!--              v-if="$auth.hasPermi('basic:ybbm')"-->
+            <!--            ></el-table-column>-->
+            <!--            <el-table-column-->
+            <!--              label="计量单位"-->
+            <!--              prop="measname"-->
+            <!--              width="160"-->
+            <!--              show-overflow-tooltip-->
+            <!--              v-if="$auth.hasPermi('basic:measname')"-->
+            <!--            ></el-table-column>-->
+
+            <!--            <el-table-column-->
+            <!--              label="注册/备案号"-->
+            <!--              prop="zczbhhzbapzbh"-->
+            <!--              width="160"-->
+            <!--              show-overflow-tooltip-->
+            <!--            ></el-table-column>-->
+            <!--            <el-table-column-->
+            <!--              label="注册/备案人"-->
+            <!--              prop="ylqxzcrbarmc"-->
+            <!--              width="180"-->
+            <!--              show-overflow-tooltip-->
+            <!--            ></el-table-column>-->
+            <!--            <el-table-column-->
+            <!--              :label="productRemarkSet.remarkTitle1"-->
+            <!--              prop="basicPrductRemak1"-->
+            <!--              width="180"-->
+            <!--              show-overflow-tooltip-->
+            <!--              v-if="$auth.hasPermi('basic:basicPrductRemak1')"-->
+            <!--            ></el-table-column>-->
+            <!--            <el-table-column-->
+            <!--              :label="productRemarkSet.remarkTitle2"-->
+            <!--              prop="basicPrductRemak2"-->
+            <!--              width="180"-->
+            <!--              show-overflow-tooltip-->
+            <!--              v-if="$auth.hasPermi('basic:basicPrductRemak2')"-->
+            <!--            ></el-table-column>-->
+            <!--            <el-table-column-->
+            <!--              :label="productRemarkSet.remarkTitle3"-->
+            <!--              prop="basicPrductRemak3"-->
+            <!--              width="180"-->
+            <!--              show-overflow-tooltip-->
+            <!--              v-if="$auth.hasPermi('basic:basicPrductRemak3')"-->
+            <!--            ></el-table-column>-->
+            <!--            <el-table-column-->
+            <!--              :label="productRemarkSet.remarkTitle4"-->
+            <!--              prop="basicPrductRemak4"-->
+            <!--              width="180"-->
+            <!--              show-overflow-tooltip-->
+            <!--              v-if="$auth.hasPermi('basic:basicPrductRemak4')"-->
+            <!--            ></el-table-column>-->
+            <!--            <el-table-column-->
+            <!--              :label="productRemarkSet.remarkTitle5"-->
+            <!--              prop="basicPrductRemak5"-->
+            <!--              width="180"-->
+            <!--              show-overflow-tooltip-->
+            <!--              v-if="$auth.hasPermi('basic:basicPrductRemak5')"-->
+            <!--            ></el-table-column>-->
+            <!--            <el-table-column-->
+            <!--              :label="productRemarkSet.remarkTitle6"-->
+            <!--              prop="basicPrductRemak6"-->
+            <!--              width="180"-->
+            <!--              show-overflow-tooltip-->
+            <!--              v-if="$auth.hasPermi('basic:basicPrductRemak6')"-->
+            <!--            ></el-table-column>-->
+            <!--            <el-table-column-->
+            <!--              :label="productRemarkSet.remarkTitle7"-->
+            <!--              prop="basicPrductRemak7"-->
+            <!--              width="180"-->
+            <!--              show-overflow-tooltip-->
+            <!--              v-if="$auth.hasPermi('basic:basicPrductRemak7')"-->
+            <!--            ></el-table-column>-->
+            <!--            <el-table-column-->
+            <!--              :label="productRemarkSet.remarkTitle8"-->
+            <!--              prop="basicPrductRemak8"-->
+            <!--              width="180"-->
+            <!--              show-overflow-tooltip-->
+            <!--              v-if="$auth.hasPermi('basic:basicPrductRemak8')"-->
+            <!--            ></el-table-column>-->
+
+            <!--            <el-table-column-->
+            <!--              label="集采状态"-->
+            <!--              prop="groupBuy"-->
+            <!--              width="120"-->
+            <!--              show-overflow-tooltip-->
+            <!--              v-if="$auth.hasPermi('basic:groupBuy')"-->
+            <!--            >-->
+            <!--              <template slot-scope="scope">-->
+            <!--                <el-tag :type="scope.row.groupBuy | statusFilterType">-->
+            <!--                  {{ groupBuyMap[scope.row.groupBuy] }}-->
+            <!--                </el-tag>-->
+            <!--              </template>-->
+            <!--            </el-table-column>-->
+            <!--            <el-table-column-->
+            <!--              label="可配送状态"-->
+            <!--              prop="dispatch"-->
+            <!--              width="120"-->
+            <!--              show-overflow-tooltip-->
+            <!--              v-if="$auth.hasPermi('basic:dispatch')"-->
+            <!--            >-->
+            <!--              <template slot-scope="scope">-->
+            <!--                <el-tag :type="scope.row.dispatch | statusFilterType">-->
+            <!--                  {{ dispatchMap[scope.row.dispatch] }}-->
+            <!--                </el-tag>-->
+            <!--              </template>-->
+            <!--            </el-table-column>-->
+            <!--            <el-table-column width="180" label="操作" fixed="right">-->
+            <!--              <template slot-scope="scope">-->
+            <!--                <el-button-->
+            <!--                  type="text"-->
+            <!--                  size="small"-->
+            <!--                  :disabled="scope.row.originUuid != null"-->
+            <!--                  @click.native.stop="intentSelectUdi(scope.row)"-->
+            <!--                >关联DI-->
+            <!--                </el-button>-->
+            <!--                <el-button-->
+            <!--                  type="text"-->
+            <!--                  size="small"-->
+            <!--                  @click.native.stop="handleModifyClick(scope.row)"-->
+            <!--                >详情-->
+            <!--                </el-button>-->
+
+            <!--                <el-button-->
+            <!--                  type="text"-->
+            <!--                  size="small"-->
+            <!--                  @click.native.stop="diEdit(scope.row)"-->
+            <!--                >编辑-->
+            <!--                </el-button>-->
+
+            <!--                <el-button-->
+            <!--                  type="text"-->
+            <!--                  size="small"-->
+            <!--                  @click.native.stop="deleteDialog(scope.row)"-->
+            <!--                >删除-->
+            <!--                </el-button>-->
+            <!--              </template>-->
+            <!--            </el-table-column>-->
           </el-table>
           <el-dialog
             title="物资字典-详情"
@@ -1823,7 +1835,7 @@ import selectUnBindHospProduct from "@/views/basic/product/unbindHospProduct";
 import {getBasicHospType, getListTree} from "@/api/basic/basicHospType";
 import {dlLastVersionByDi} from "@/api/basic/udiInfo";
 import {
-  getHead,executeFuc
+  getHead, executeFuc
 } from "@/utils/customConfig";
 
 export default {
@@ -1915,11 +1927,11 @@ export default {
       sysList: [],
       filterList: [],
       options: {
-        getSysFilter:[]
+        getSysFilter: []
       },
-      queryList:[],
-      tableHeader:[],
-      fromList:[],
+      queryList: [],
+      tableHeader: [],
+      fromList: [],
       total: 0,
       thirdNo: "",
       treeList: [],
@@ -1998,7 +2010,7 @@ export default {
     hideSearch() {
       this.showSearch = !this.showSearch;
     },
-    keyup_submit(_this,event) {
+    keyup_submit(_this, event) {
       _this.filterQuery.page = 1;
       _this.getList();
       event.target.select();
@@ -2079,7 +2091,7 @@ export default {
         });
     },
 
-    deleteDialog(_this,rowId) {
+    deleteDialog(_this, rowId) {
       _this.$confirm("此操作将永久删除该产品信息, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -2211,7 +2223,7 @@ export default {
           });
         });
     },
-    intentSelectUdi(_this,val) {
+    intentSelectUdi(_this, val) {
       _this.relId = val.id;
       _this.isImportUdi = true;
       _this.isImport = true;
@@ -2228,10 +2240,11 @@ export default {
         ylqxzcrbarmc: null,
       };
       this.isImport = false;
+      debugger
       this.selectLocalVisible = true;
     },
 
-    handleSelectionChange(_this,val) {
+    handleSelectionChange(_this, val) {
       _this.multipleSelection = val;
     },
 
@@ -2245,8 +2258,7 @@ export default {
       this.getList();
     },
 
-    handleModifyClick(_this,row) {
-      debugger
+    handleModifyClick(_this, row) {
       _this.uuid = row.uuid;
       _this.relId = row.id;
       _this.isImport = false;
@@ -2313,15 +2325,15 @@ export default {
       }
     },
 
-    getSysFilter(_this,query) {
+    getSysFilter(_this, query) {
       sysFilterOptimize()
         .then((response) => {
           _this.loading = false;
-           _this.options.getSysFilter = response.data.list || []
+          _this.options.getSysFilter = response.data.list || []
         })
         .catch(() => {
           _this.loading = false;
-          _this.options.getSysFilter =  []
+          _this.options.getSysFilter = []
         });
     },
     singleDiEdit() {
@@ -2334,7 +2346,7 @@ export default {
       this.editSingleFormat.nameCode = temp.nameCode;
       this.editSingleDiDialogVisible = true;
     },
-    diEdit(_this,row) {
+    diEdit(_this, row) {
       _this.uuid = row.uuid;
       _this.relId = row.id;
       _this.isImport = false;
@@ -2406,7 +2418,7 @@ export default {
         }
       });
     },
-    closeHandler(){
+    closeHandler() {
       // this.visible = false;
     },
     // selectSysParam() {
@@ -2525,11 +2537,11 @@ export default {
         .catch(() => {
         });
     },
-    executeFuc(row,type,clickFuc,value){
-      return executeFuc(this,row,type,clickFuc,value);
+    executeFuc(row, type, clickFuc, value) {
+      return executeFuc(this, row, type, clickFuc, value);
     },
-    executeEval(row,expression,defaultRet){
-      if(expression){
+    executeEval(row, expression, defaultRet) {
+      if (expression) {
         return eval(expression);
       }
       return defaultRet;
@@ -2550,7 +2562,7 @@ export default {
   },
   created() {
     this.findBasicProductSet();
-    getHead("product","1").then((re) => {
+    getHead("product", "1").then((re) => {
       // 处理返回的数据
       this.tableObj = re.data;
       this.tableHeader = re.data.tableList;
@@ -2560,7 +2572,7 @@ export default {
     });
     this.getTerrList();
     // this.selectSysParam();
-    this.getSysFilter(this,"");
+    this.getSysFilter(this, "");
 
   },
 };
diff --git a/src/views/pharmaceuticals/distribution/IoDealOrder.vue b/src/views/pharmaceuticals/distribution/IoDealOrder.vue
index 80c831d..8494fa6 100644
--- a/src/views/pharmaceuticals/distribution/IoDealOrder.vue
+++ b/src/views/pharmaceuticals/distribution/IoDealOrder.vue
@@ -333,7 +333,7 @@ export default {
         billNo: null,
         mainAction: null,
         action: null,
-        statusType: "unAllocate",
+        statusType: "unCheck",
         page: 1,
         limit: 10,
         startTime: null,