diff --git a/public/config.json b/public/config.json
index 7ca6b5f..07fe4ff 100644
--- a/public/config.json
+++ b/public/config.json
@@ -1,6 +1,6 @@
 {
     "UDI_SYNC_SERVER_IP": "http://192.168.0.109:9995/",
-    "BASE_URL":"http://192.168.0.109:9991/",
-    "SERVER_IP": "http://192.168.0.109:9991/",
+    "BASE_URL":"http://139.9.178.73:8080/UDI_WMS_MC/",
+    "SERVER_IP": "http://139.9.178.73:8080/",
     "WEBSOCKET_URL": "ws://192.168.0.109:9991/UDI_WMS_MC/api/websocket/"
 }
diff --git a/src/api/basic/companyProductRelevance.js b/src/api/basic/companyProductRelevance.js
new file mode 100644
index 0000000..a281b21
--- /dev/null
+++ b/src/api/basic/companyProductRelevance.js
@@ -0,0 +1,29 @@
+import axios from "../../utils/axios";
+
+export function filterCompanyProductRelevance(query) {
+    return axios(
+        {
+            url: "/sale/info/company/product/relevance/filter",
+            method: "get",
+            params: query
+        }
+    )
+}
+export function insertFilter(query) {
+    return axios(
+        {
+            url: "/sale/info/insertFilter",
+            method: "post",
+            data: query
+        }
+    );
+}
+
+
+
+
+
+
+
+
+
diff --git a/src/api/thrsys/spsSyncStatus.js b/src/api/thrsys/spsSyncStatus.js
new file mode 100644
index 0000000..a6ca2e2
--- /dev/null
+++ b/src/api/thrsys/spsSyncStatus.js
@@ -0,0 +1,45 @@
+import axios from "../../utils/axios";
+
+
+export function filterLog(query) {
+    return axios({
+        url: "/spssync/basic/udiinfo/filter",
+        method: "get",
+        params: query
+    });
+}
+
+
+export function deleteLog(query) {
+    return axios({
+        url: "/spssync/basic/udiinfo/deleteByStatus",
+        method: "post",
+        data: query
+    });
+}
+
+export function createSchedule(query) {
+    return axios({
+        url: "/spssync/basic/schedule/create",
+        method: "post",
+        data: query
+    });
+}
+
+
+export function findConfig(query) {
+    return axios({
+        url: "/system/param/syncData/config",
+        method: "get",
+        params: query
+    });
+}
+
+export function updateConfig(query) {
+    return axios({
+        url: "/system/param/syncData/save",
+        method: "post",
+        data: query
+    });
+}
+
diff --git a/src/router/index.js b/src/router/index.js
index 706d26d..6548e20 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -92,6 +92,7 @@ import thrCorpsImport from "../views/thrsys/ThrCorpsImport.vue";
 //供应商管理
 import corpExportSmp from "../views/basic/CorpExportSmp.vue";
 import udiinfoExportSmp from "../views/basic/UdiinfoExportSmp.vue";
+import UdiInfoManageSp from "../views/basic/UdiInfoManageSp.vue"
 import UdiInfoDonwloadSmp from "../views/basic/UdiInfoDonwloadSmp.vue";
 import thrOrderExportSmp from "../views/thrsys/ThrOrderExportSmp.vue";
 import thrProductsExportSmp from "../views/thrsys/ThrProductsExportSmp.vue";
@@ -99,6 +100,7 @@ import thrCorpsExportSmp from "../views/thrsys/ThrCorpsExportSmp.vue";
 
 
 import thrInvWarehouse from "@/views/thrsys/ThrInvWarehouse";
+import syncConfig from "../views/thrsys/SysUdimsConfig.vue";
 // Vue.use(VueRouter);
 
 const err401 = r =>
@@ -227,6 +229,14 @@ export const asyncRouterMap = [
                             authRule: ["system/systemParamConfig"]
                         },
                     },
+                    {
+                        path: "syncConfig",
+                        name: "同步设置",
+                        component: syncConfig,
+                        meta: {
+                            authRule: ["systemConfig/syncConfig"]
+                        }
+                    },
                     {
                         path: "bussinessType",
                         name: "扫码单据类型",
@@ -567,7 +577,16 @@ export const asyncRouterMap = [
                         meta: {
                             authRule: ["basic/products/export"]
                         }
-                    },]
+                    },
+                    {
+                        path: "UdiInfoManageSp",
+                        name: "供应商器械信息",
+                        component: UdiInfoManageSp,
+                        meta: {
+                            authRule: ["product/UdiInfoManageSp"]
+                        }
+                    },
+                ]
             },
             {
                 path: "/unit",
diff --git a/src/views/basic/BussinessTypeLocl.vue b/src/views/basic/BussinessTypeLocl.vue
index 85e323f..b31619c 100644
--- a/src/views/basic/BussinessTypeLocl.vue
+++ b/src/views/basic/BussinessTypeLocl.vue
@@ -49,11 +49,11 @@
                         <span>{{ enableMap[scope.row.changeEnable] }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="允许供应商使用" prop="spUse" fixed>
-                    <template slot-scope="scope">
-                        <span>{{ enableMap[scope.row.spUse] }}</span>
-                    </template>
-                </el-table-column>
+<!--                <el-table-column label="允许供应商使用" prop="spUse" fixed>-->
+<!--                    <template slot-scope="scope">-->
+<!--                        <span>{{ enableMap[scope.row.spUse] }}</span>-->
+<!--                    </template>-->
+<!--                </el-table-column>-->
 
 
                 <el-table-column label="操作" fixed="right">
diff --git a/src/views/basic/UdiInfoManageSp.vue b/src/views/basic/UdiInfoManageSp.vue
index d23d2e6..f1a078a 100644
--- a/src/views/basic/UdiInfoManageSp.vue
+++ b/src/views/basic/UdiInfoManageSp.vue
@@ -2,9 +2,7 @@
     <div>
         <el-card>
             <el-form :inline="true" :model="filterQuery" size="mini">
-
                 <el-row>
-
                     <el-form-item class="query-form-item">
                         <el-select
                             v-model="filterQuery.companyName"
@@ -18,11 +16,11 @@
                         >
                             <el-option
                                 v-for="item in fromOptions"
-                                :key="item.companyName"
-                                :label="item.companyName"
-                                :value="item.companyName"
+                                :key="item.name"
+                                :label="item.name"
+                                :value="item.name"
                             >
-                                <span style="float: left">{{ item.companyName }}</span>
+                                <span style="float: left">{{ item.name }}</span>
                             </el-option>
                         </el-select>
                     </el-form-item>
@@ -37,8 +35,6 @@
                     <el-form-item class="query-form-item">
                         <el-input v-model="filterQuery.ggxh" placeholder="规格型号" clearable="true"></el-input>
                     </el-form-item>
-
-
                 </el-row>
 
                 <el-row>
@@ -72,20 +68,6 @@
                         <el-button-group>
                             <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
                             <el-button type="primary" icon="search" @click="getList">查询</el-button>
-                            <!--                        <el-button type="primary" icon="search" @click="intentDetail"-->
-                            <!--                        >关联选入-->
-                            <!--                        </el-button>-->
-
-                            <!--                        <el-button type="primary" icon="search" @click="intentImportUdi"-->
-                            <!--                        >选入DI器械-->
-                            <!--                        </el-button-->
-                            <!--                        >-->
-
-                            <!--                        <el-button type="primary" icon="search" @click="intentImportErp"-->
-                            <!--                        >选入产品信息-->
-                            <!--                        </el-button-->
-                            <!--                        >-->
-
                             <el-button type="primary" icon="search" @click="lockProducts('3')" v-if="isSpCombine"
                             >锁定
                             </el-button
@@ -94,9 +76,6 @@
                             >退回
                             </el-button
                             >
-                            <!-- <el-button type="primary" icon="search" @click="uploadErpProduct"
-                                          >更新下载ERP存货产品</el-button
-                                        > -->
                         </el-button-group>
                     </el-form-item>
                 </el-row>
@@ -170,29 +149,12 @@
 
                 <el-table-column width="80" label="操作" fixed="right">
                     <template slot-scope="scope">
-                        <!--                        <el-button-->
-                        <!--                            type="text"-->
-                        <!--                            size="small"-->
-                        <!--                            :disabled="scope.row.thirdId == null || scope.row.thirdId == '' || scope.row.flbm!=null"-->
-                        <!--                            @click.native.stop="intentSelectUdi(scope.row)"-->
-                        <!--                        >关联DI-->
-                        <!--                        </el-button>-->
-                        <!--<el-button-->
-                        <!--type="text"-->
-                        <!--size="small"-->
-                        <!--@click.native.stop="intentSelectErp(scope.row)"-->
-                        <!--&gt;关联ERP-->
-                        <!--</el-button>-->
-                        <!--:disabled="scope.row.tyshxydm == null"-->
                         <el-button
                             type="text"
                             size="small"
                             @click.native.stop="handleModifyClick(scope.row)"
                         >详情
                         </el-button>
-                        <!--                        <el-button type="text" size="small" @click.native.stop="deleteDialog(scope.row)"-->
-                        <!--                        >删除-->
-                        <!--                        </el-button>-->
                     </template>
                 </el-table-column>
             </el-table>
@@ -225,23 +187,6 @@
                     <el-table-column label="规格型号" prop="spec" show-overflow-tooltip></el-table-column>
                     <el-table-column label="注册/备案凭证号" prop="registerNo" show-overflow-tooltip></el-table-column>
                     <el-table-column label="生产厂家" prop="manufactory" show-overflow-tooltip></el-table-column>
-
-                    <!--                    <el-table-column label="操作" fixed="right">-->
-                    <!--                        <template slot-scope="scope">-->
-                    <!--                            <el-button-->
-                    <!--                                type="text"-->
-                    <!--                                size="small"-->
-                    <!--                                @click="addSelectErp(scope.row)"-->
-                    <!--                                :disabled="scope.row.thirdId==editQuery.nameCode"-->
-                    <!--                            >关联-->
-                    <!--                            </el-button-->
-                    <!--                            >-->
-                    <!--                            <el-button type="text" size="small" @click.native.stop="removeErp(scope.row)"-->
-                    <!--                                       :disabled="editQuery.flbm==null || scope.row.thirdId==null || scope.row.thirdId==''"-->
-                    <!--                            >解绑-->
-                    <!--                            </el-button>-->
-                    <!--                        </template>-->
-                    <!--                    </el-table-column>-->
                 </el-table>
                 <el-table
                     v-loading="loading"
@@ -691,15 +636,6 @@
                         </el-col>
                     </el-row>
                 </el-form>
-
-                <!--                <div style="text-align: center">-->
-                <!--                    <el-button type="primary" size="small" icon="search" @click="onAddSubmit"-->
-                <!--                    >提交-->
-                <!--                    </el-button>-->
-                <!--                    <el-button type="primary" size="small" icon="search" @click="cancelDialog"-->
-                <!--                    >取消-->
-                <!--                    </el-button>-->
-                <!--                </div>-->
             </el-dialog>
             <el-dialog
                 title="关联选入器械信息"
@@ -782,8 +718,8 @@ import {
 } from "../../api/basic/udiRelevance";
 import {selectSysParamByKey} from "../../api/param/systemParamConfig";
 import {filterByUuid, filterCompany} from "../../api/basic/udiInfo";
-import {filterCompanyProductRelevance} from "../../api/warehouse/companyProductRelevance";
-import {filterCustomers} from "../../api/auth/customer"
+import {filterCompanyProductRelevance} from "../../api/basic/companyProductRelevance";
+import {getBasicUnitMaintains} from "../../api/basic/basicUnitMaintain"
 
 import selectUdi from "./UdiInfoRelevance.vue";
 import selectErp from "./UdiInfoselectErpUdi";
@@ -1245,14 +1181,14 @@ export default {
         findMethod(query) {
             console.log(query);
             let cQuery = {
-                customerName: query,
+                key: query,
                 page: 1,
                 limit: 10,
             };
-            filterCustomers(cQuery)
+            getBasicUnitMaintains(cQuery)
                 .then((response) => {
                     this.loading = false;
-                    this.fromOptions = response.data.list || [];
+                    this.fromOptions = response.data.page.list || [];
                 })
                 .catch(() => {
                     this.loading = false;
diff --git a/src/views/basic/UdiInfoRelevance.vue b/src/views/basic/UdiInfoRelevance.vue
index 2184057..58ad486 100644
--- a/src/views/basic/UdiInfoRelevance.vue
+++ b/src/views/basic/UdiInfoRelevance.vue
@@ -213,6 +213,18 @@
                         prop="zczbhhzbapzbh"
                         show-overflow-tooltip
                     ></el-table-column>
+
+                    <el-table-column label="操作" fixed="right">
+                        <template slot-scope="scope">
+                            <el-button
+                                type="text"
+                                size="small"
+                                @click="diDetail(scope.row)"
+                            >详情
+                            </el-button
+                            >
+                        </template>
+                    </el-table-column>
                 </el-table>
                 <el-pagination
                     :page-size="unionQuery.limit"
@@ -222,6 +234,19 @@
                 ></el-pagination>
             </div>
         </el-card>
+
+        <el-dialog
+            title="器械信息详情"
+            :close-on-click-modal="false"
+            :close-on-press-escape="false"
+            :visible.sync="selectDialog"
+            width="65%"
+            append-to-body
+            v-if="selectDialog"
+        >
+            <selectDiDetail :editQuery="diDetails"
+            ></selectDiDetail>
+        </el-dialog>-
     </div>
 </template>
 
@@ -230,6 +255,7 @@ import {getUdiInfos, filterCompany} from "../../api/basic/udiInfo";
 import {combineUdi} from "../../api/basic/udiRelevance";
 import {getBasicThirdSys} from "../../api/basic/basicThirdSys";
 import {getInvbasdoc} from "../../api/basic/getErps";
+import selectDiDetail from "@/views/basic/SelectDIDetailDialog";
 
 export default {
     name: "closeDialog",
@@ -279,6 +305,8 @@ export default {
             multipleUdiSelection: [],
             thirdSys: [],
             thirdSysFk: null,
+            diDetails: null,
+            selectDialog: false,
         };
     },
     methods: {
@@ -333,7 +361,10 @@ export default {
             // this.unionQuery.zczbhhzbapzbh = this.currentRow.registerNo;
             // this.unionQuery.ggxh = this.currentRow.spec;
         },
-
+        diDetail(row) {
+            this.diDetails = row;
+            this.selectDialog = true;
+        },
         searchErpList() {
             this.erpQuery.page = 1;
             this.getErpList();
@@ -483,6 +514,9 @@ export default {
     created() {
         this.getBasicThirdSys();
     },
+    components: {
+        selectDiDetail,
+    },
 };
 </script>
 
diff --git a/src/views/business/stockOrder.vue b/src/views/business/stockOrder.vue
index 480feb3..8f71974 100644
--- a/src/views/business/stockOrder.vue
+++ b/src/views/business/stockOrder.vue
@@ -482,6 +482,14 @@ export default {
             this.actDateRange = [];
         },
         onSubmit() {
+            if (this.actDateRange !== null) {
+                this.filterQuery.startTime = this.actDateRange[0];
+                this.filterQuery.endTime = this.actDateRange[1];
+            } else {
+                this.filterQuery.startTime = null;
+                this.filterQuery.endTime = null;
+            }
+
             this.getList();
             if (this.query.status === "202" || this.query.status === "502") {
                 this.haveDistributionVisible = true;
diff --git a/src/views/business/stockOrderEditDistribution.vue b/src/views/business/stockOrderEditDistribution.vue
index ca905e7..d382446 100644
--- a/src/views/business/stockOrderEditDistribution.vue
+++ b/src/views/business/stockOrderEditDistribution.vue
@@ -10,15 +10,6 @@
                         :loading="loading"
                     >保存
                     </el-button>
-                    <!--&gt;-->
-                    <!--<el-button-->
-                    <!--type="primary"-->
-                    <!--@click.native="saveOrder('2')"-->
-                    <!--:loading="loading"-->
-                    <!--&gt;未配货提交-->
-                    <!--</el-button-->
-                    <!--&gt;-->
-
                     <el-button
                         type="primary"
                         @click.native="saveOrder('3')"
@@ -49,7 +40,6 @@
                     </el-col>
                     <el-col :span="7">
                         <el-form-item prop="billdate">
-                            <!--                            <el-input v-model="formData.billdate" auto-complete="off"></el-input>-->
                             <el-date-picker
                                 v-model="formData.billdate"
                                 type="date"
@@ -71,24 +61,6 @@
                     <el-col :span="7">
                         <el-form-item prop="corpName">
                             <el-input v-model="formData.corpName" auto-complete="off" :disabled="true"></el-input>
-                            <!--                            <el-select-->
-                            <!--                                style="width: 100%"-->
-                            <!--                                v-model="sValue"-->
-                            <!--                                :multiple="false"-->
-                            <!--                                filterable-->
-                            <!--                                remote-->
-                            <!--                                reserve-keyword-->
-                            <!--                                placeholder="请输入供应商名称"-->
-                            <!--                                :remote-method="remoteMethod"-->
-                            <!--                                :loading="sLoading"-->
-                            <!--                                @change="selectOne">-->
-                            <!--                                <el-option-->
-                            <!--                                    v-for="item in sOptions"-->
-                            <!--                                    :key="idx"-->
-                            <!--                                    :label="item.name"-->
-                            <!--                                    :value="item">-->
-                            <!--                                </el-option>-->
-                            <!--                        </el-select>-->
                         </el-form-item>
                     </el-col>
                     <el-col :span="3">
@@ -98,14 +70,13 @@
                     </el-col>
                     <el-col :span="7">
                         <el-form-item prop="billType">
-
                             <el-select v-model="formData.billType" placeholder="请选择业务类型" disabled>
                                 <el-option
                                     v-for="item in busTypes"
                                     :key="item.name"
                                     :label="item.name"
-                                    :value="item.action">
-                                    <span style="float: left">{{ item.name }}</span>
+                                    :value="item.localAction">
+                                    <span style="float: left">{{ item.localName }}</span>
                                 </el-option>
                             </el-select>
                         </el-form-item>
@@ -113,19 +84,6 @@
                 </el-row>
 
                 <el-row :gutter="20" style="margin-top: -10px;">
-                    <!--                    <el-col :span="3">-->
-                    <!--                        <div class="ao-text">-->
-                    <!--                            <span>采购类型：</span>-->
-                    <!--                        </div>-->
-                    <!--                    </el-col>-->
-                    <!--                    <el-col :span="7">-->
-                    <!--                        <el-form-item prop="type">-->
-                    <!--                            <el-select v-model="formData.type" style="width: 100%" placeholder="采购类型">-->
-                    <!--                                <el-option label="预入库" value="1"></el-option>-->
-                    <!--                                <el-option label="普通采购" value="2"></el-option>-->
-                    <!--                            </el-select>-->
-                    <!--                        </el-form-item>-->
-                    <!--                    </el-col>-->
                     <el-col :span="3">
                         <div class="ao-text">
                             <span>当前仓库：</span>
@@ -134,9 +92,6 @@
 
                     <el-col :span="7">
                         <el-form-item prop="locStorageCode">
-                            <!--<el-select v-model="formData.billType" style="width: 100%" placeholder="业务类型" :disabled="true">-->
-                            <!--<el-option label="送货单" value="deliveryNote"></el-option>-->
-                            <!--</el-select>-->
                             <el-select v-model="formData.locStorageCode" placeholder="当前仓库信息" disabled>
                                 <el-option
                                     v-for="item in storageList"
@@ -163,55 +118,9 @@
                     </el-button
                     >
                 </el-button-group>
-
-                <!--                <el-row :gutter="20">-->
-                <!--                    <el-col :span="3">-->
-                <!--                        <div class="ao-text">-->
-                <!--                            <span>扫码录入：</span>-->
-                <!--                        </div>-->
-                <!--                    </el-col>-->
-                <!--                    <el-col :span="10">-->
-                <!--                        <el-form-item prop="code">-->
-
-                <!--                            &lt;!&ndash;                            @keyup.native.enter="focusNext('iCount')"   @focus="getInputFocus($event)"-->
-                <!--                               @keypress.enter.native="selectProductFunction($event)"-->
-                <!--                            &ndash;&gt;-->
-                <!--                            <el-input-->
-
-                <!--                                @keyup.enter.native="selectProductFunction($event)"-->
-                <!--                                v-model="code"-->
-                <!--                                auto-complete="off"-->
-                <!--                                ref='inputRef'-->
-                <!--                                @focus="getInputFocus($event)"-->
-                <!--                            ></el-input>-->
-                <!--                        </el-form-item>-->
-                <!--                    </el-col>-->
-                <!--                    &lt;!&ndash;                    <el-col :span="3">&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                        <div class="ao-text">&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                            <span>数量：</span>&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                        </div>&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                    </el-col>&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                    <el-col :span="4">&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                        <el-form-item prop="iCount">&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                            &lt;!&ndash;                            @keypress.enter.native="addCode()"&ndash;&gt;&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                            <el-input v-model="iCount" auto-complete="off" ref="iCount"&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                                      @keypress.enter.native="iCountEnterFunction()"&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                                      @focus="getInputFocus($event)"&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                                      @input="iCountChange"&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                                      oninput="value=value.replace(/[^\d]/g,'')"></el-input>&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                        </el-form-item>&ndash;&gt;-->
-                <!--                    &lt;!&ndash;                    </el-col>&ndash;&gt;-->
-                <!--                </el-row>-->
-
-                <!--                highlight-current-row-->
-                <!--                @current-change="rowChange"-->
                 <el-table v-loading="loading" :data="codeArray" style="width: 100%;"
                           :row-class-name="tableRowClassName"
                           max-height="300" height="300" ref="multipleTable">
-                    <!--                    <el-table-column-->
-                    <!--                        type="selection"-->
-                    <!--                        width="55">-->
-                    <!--                    </el-table-column>-->
                     <el-table-column label="序号" type="index" width="50"></el-table-column>
                     <el-table-column width="150"
                                      label="产品通用名"
@@ -223,26 +132,6 @@
                                      prop="spec"
                                      show-overflow-tooltip
                     ></el-table-column>
-                    <!--                    <el-table-column-->
-                    <!--                        label="批次号"-->
-                    <!--                        prop="batchNo"-->
-                    <!--                        show-overflow-tooltip-->
-                    <!--                    ></el-table-column>-->
-                    <!--                    <el-table-column-->
-                    <!--                        label="生产日期"-->
-                    <!--                        prop="productDate"-->
-                    <!--                        show-overflow-tooltip-->
-                    <!--                    ></el-table-column>-->
-                    <!--                    <el-table-column-->
-                    <!--                        label="失效日期"-->
-                    <!--                        prop="expireDate"-->
-                    <!--                        show-overflow-tooltip-->
-                    <!--                    ></el-table-column>-->
-                    <!--                    <el-table-column-->
-                    <!--                        label="数量"-->
-                    <!--                        prop="count"-->
-                    <!--                        show-overflow-tooltip-->
-                    <!--                    ></el-table-column>-->
                     <el-table-column width="150" label="批次号">
                         <template slot-scope="scope">
                             <el-input size="small" v-model="scope.row.batchNo"
@@ -253,15 +142,6 @@
                     </el-table-column>
                     <el-table-column width="180" label="生产日期">
                         <template slot-scope="scope">
-                            <!--                            <el-date-picker-->
-                            <!--                                type="date"-->
-                            <!--                                size="small" v-model="scope.row.productDate"-->
-                            <!--                                :disabled="scope.row.index !== selectedIndex"-->
-                            <!--                                placeholder="请选择生产日期" style="width: 80%"-->
-                            <!--                                value-format="yyMMdd"-->
-                            <!--                                format="yyyy-MM-dd"-->
-                            <!--                            >-->
-                            <!--                            </el-date-picker>-->
                             <el-input v-model="scope.row.productDate" auto-complete="off"
                                       oninput="if(value.length>6)value=value.slice(0,6)"
                                       :disabled="scope.row.index !== selectedIndex"
@@ -271,15 +151,6 @@
                     </el-table-column>
                     <el-table-column width="180" label="失效日期">
                         <template slot-scope="scope">
-                            <!--                            <el-date-picker-->
-                            <!--                                type="date"-->
-                            <!--                                size="small" v-model="scope.row.expireDate"-->
-                            <!--                                :disabled="scope.row.index !== selectedIndex"-->
-                            <!--                                placeholder="请选择失效日期" style="width: 80%"-->
-                            <!--                                value-format="yyMMdd"-->
-                            <!--                                format="yyyy-MM-dd"-->
-                            <!--                            >-->
-                            <!--                            </el-date-picker>-->
                             <el-input v-model="scope.row.expireDate" auto-complete="off"
                                       oninput="if(value.length>6)value=value.slice(0,6)"
                                       :disabled="scope.row.index !== selectedIndex"
@@ -306,11 +177,6 @@
                             ></el-input>
                         </template>
                     </el-table-column>
-                    <!--                    <el-table-column width="150"-->
-                    <!--                                     label="单据数量"-->
-                    <!--                                     prop="count"-->
-                    <!--                                     show-overflow-tooltip-->
-                    <!--                    ></el-table-column>-->
                     <el-table-column width="150" label="单据数量">
                         <template slot-scope="scope">
                             <el-input size="small" v-model="scope.row.count"
@@ -334,8 +200,6 @@
                     ></el-table-column>
                     <el-table-column label="操作" fixed="right" width="150">
                         <template slot-scope="scope">
-
-                            <!--                            v-if="orderEditor && scope.row.index !== selectedIndex"-->
                             <el-button
                                 type="text"
                                 size="small"
@@ -345,16 +209,6 @@
                             >编辑
                             </el-button
                             >
-                            <!--                            <el-button-->
-                            <!--                                type="text"-->
-                            <!--                                size="small"-->
-                            <!--                                v-if="orderEditor && scope.row.index === selectedIndex"-->
-                            <!--                                :disabled="scope.row.index !== selectedIndex"-->
-                            <!--                                @click.stop="true"-->
-                            <!--                                @click.native="saveCodeArray(scope.$index, scope.row)"-->
-                            <!--                            >保存-->
-                            <!--                            </el-button-->
-                            <!--                            >-->
                             <el-button
                                 type="text"
                                 size="small"
@@ -375,33 +229,8 @@
                     </el-table-column>
                 </el-table>
 
-                <!--                <div class="block" v-if="orderEditor">-->
-                <!--                    <el-pagination-->
-                <!--                        @current-change="handleCurrentChange"-->
-                <!--                        layout="prev, pager, next"-->
-                <!--                        :page-size="query.limit"-->
-                <!--                        :total="total">-->
-                <!--                    </el-pagination>-->
-                <!--                </div>-->
             </el-card>
         </el-form>
-
-        <!--        <el-dialog-->
-        <!--            title="产品录入"-->
-        <!--            :visible.sync="selectProductVisible"-->
-        <!--            width="85%"-->
-        <!--            v-if="selectProductVisible"-->
-        <!--            :append-to-body='true'-->
-        <!--            :close-on-click-modal="false"-->
-        <!--            :close-on-press-escape="false"-->
-        <!--        >-->
-        <!--            <stockOrderNewSelectProduct-->
-        <!--                :closeDialog="closeDialogC2"-->
-        <!--                :data="thisData"-->
-        <!--            ></stockOrderNewSelectProduct>-->
-        <!--        </el-dialog>-->
-
-
         <el-dialog
             title="产品录入"
             :visible.sync="selectProductVisible"
@@ -477,10 +306,6 @@ export default {
             type: Object,
             required: true,
         }
-        // closeConfirmFunction: {
-        //     type: Function,
-        //     required: true,
-        // },
     },
     data() {
         return {
diff --git a/src/views/business/stockOrderEditor.vue b/src/views/business/stockOrderEditor.vue
index f9b3c5d..f37ab1e 100644
--- a/src/views/business/stockOrderEditor.vue
+++ b/src/views/business/stockOrderEditor.vue
@@ -359,6 +359,7 @@
                     <el-col :span="7">
                         <el-form-item prop="reCount">
                             <el-input v-model="detailFormData.reCount" auto-complete="off"
+                                      clearable
                                       oninput="value=value.replace(/[^\d]/g,'')"></el-input>
                         </el-form-item>
                     </el-col>
@@ -371,19 +372,10 @@
                     </el-col>
                     <el-col :span="7">
                         <el-form-item prop="productDate">
-                            <!--              <el-input v-model="detailFormData.productDate" auto-complete="off"-->
-                            <!--                        :disabled="false"></el-input>-->
-                            <!--                            <el-date-picker-->
-                            <!--                                type="date"-->
-                            <!--                                size="small" v-model="detailFormData.productDate"-->
-                            <!--                                placeholder="请选择生产日期" style="width: 80%"-->
-                            <!--                                value-format="yyMMdd"-->
-                            <!--                                format="yyyy-MM-dd"-->
-                            <!--                            >-->
-                            <!--                            </el-date-picker>-->
                             <el-input v-model="detailFormData.productDate" auto-complete="off"
                                       oninput="if(value.length>6)value=value.slice(0,6)"
                                       type="number"
+                                      clearable
                                       :disabled="false"></el-input>
                         </el-form-item>
                     </el-col>
@@ -398,18 +390,11 @@
                             <!--                        :disabled="false"></el-input>-->
                             <el-input v-model="detailFormData.expireDate" auto-complete="off"
                                       oninput="if(value.length>6)value=value.slice(0,6)"
+                                      clearable
                                       type="number"
                                       :disabled="false"></el-input>
 
 
-                            <!--                            <el-date-picker-->
-                            <!--                                type="date"-->
-                            <!--                                size="small" v-model="detailFormData.expireDate"-->
-                            <!--                                placeholder="请选择失效日期" style="width: 80%"-->
-                            <!--                                value-format="yyMMdd"-->
-                            <!--                                format="yyyy-MM-dd"-->
-                            <!--                            >-->
-                            <!--                            </el-date-picker>-->
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -421,7 +406,9 @@
                     </el-col>
                     <el-col :span="7">
                         <el-form-item prop="batchNo">
-                            <el-input v-model="detailFormData.batchNo" auto-complete="off" :disabled="false"></el-input>
+                            <el-input v-model="detailFormData.batchNo"
+                                      clearable
+                                      auto-complete="off" :disabled="false"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="3">
@@ -431,20 +418,11 @@
                     </el-col>
                     <el-col :span="7">
                         <el-form-item prop="price">
-                            <el-input v-model="detailFormData.price" auto-complete="off" :disabled="false"></el-input>
+                            <el-input v-model="detailFormData.price"
+                                      clearable
+                                      auto-complete="off" :disabled="false"></el-input>
                         </el-form-item>
                     </el-col>
-                    <!--                    <el-col :span="3">-->
-                    <!--                        <div class="ao-text">-->
-                    <!--                            <span>扫码数量：</span>-->
-                    <!--                        </div>-->
-                    <!--                    </el-col>-->
-                    <!--                    <el-col :span="7">-->
-                    <!--                        <el-form-item prop="sweepCount">-->
-                    <!--                            <el-input v-model="detailFormData.sweepCount" auto-complete="off" :disabled="false"-->
-                    <!--                                      oninput="value=value.replace(/[^\d]/g,'')" ></el-input>-->
-                    <!--                        </el-form-item>-->
-                    <!--                    </el-col>-->
                 </el-row>
             </el-form>
             <div slot="footer" class="dialog-footer">
@@ -547,18 +525,18 @@ export default {
             },
             distributionVisible: false,
             detailFormRules: {
-                batchNo: [
-                    {required: true, message: "请输入批次号", trigger: "blur"}
-                ],
-                productDate: [
-                    {required: true, message: "请输入生产日期", trigger: "blur"}
-                ],
-                expireDate: [
-                    {required: true, message: "请输入失效日期", trigger: "blur"}
-                ],
-                sweepCount: [
-                    {required: true, message: "请输入扫码数量", trigger: "blur"}
-                ]
+                // batchNo: [
+                //     {required: true, message: "请输入批次号", trigger: "blur"}
+                // ],
+                // productDate: [
+                //     {required: true, message: "请输入生产日期", trigger: "blur"}
+                // ],
+                // expireDate: [
+                //     {required: true, message: "请输入失效日期", trigger: "blur"}
+                // ],
+                // sweepCount: [
+                //     {required: true, message: "请输入扫码数量", trigger: "blur"}
+                // ]
             },
             detailFormVisible: false,
             detailFormData: {},
@@ -864,14 +842,20 @@ export default {
                 if (valid) {
                     this.detailLoading = true;
                     let tQuery = this.detailFormData;
-                    console.log(this.detailCountMax + "---" + this.detailFormData.count + "---" + this.detailFormData.reCount)
                     if (this.detailCountMax) {
                         if (this.detailFormData.count < this.detailFormData.reCount) {
                             this.$message.error("实际数量不能高于订单数量");
                             return;
                         }
                     }
-
+                    if (this.$isBlank(tQuery.batchNo)) {
+                        if (!tQuery.allowNoBatch) {
+                            return this.$message.error('批次号不能为空');
+                        }
+                    }
+                    if (this.$isBlank(tQuery.productDate) && this.$isBlank(tQuery.expireDate)) {
+                        return this.$message.error('生产日期与失效日期不能全部为空');
+                    }
                     uploadStockOrderDetail(tQuery).then((response) => {
                         this.detailLoading = false;
                         if (response.code === 20000) {
diff --git a/src/views/business/stockOrderNew.vue b/src/views/business/stockOrderNew.vue
index 38ec197..361da0d 100644
--- a/src/views/business/stockOrderNew.vue
+++ b/src/views/business/stockOrderNew.vue
@@ -340,7 +340,9 @@
                     </el-col>
                     <el-col :span="7">
                         <el-form-item prop="count">
-                            <el-input v-model="detailFormData.count" auto-complete="off" :disabled="false"></el-input>
+                            <el-input v-model="detailFormData.count" auto-complete="off"
+                                      clearable
+                                      :disabled="false"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="3">
@@ -350,20 +352,11 @@
                     </el-col>
                     <el-col :span="7">
                         <el-form-item prop="batchNo">
-                            <el-input v-model="detailFormData.batchNo" auto-complete="off" :disabled="false"></el-input>
+                            <el-input v-model="detailFormData.batchNo"
+                                      clearable
+                                      auto-complete="off" :disabled="false"></el-input>
                         </el-form-item>
                     </el-col>
-                    <!--                    <el-col :span="3">-->
-                    <!--                        <div class="ao-text">-->
-                    <!--                            <span>实际数量：</span>-->
-                    <!--                        </div>-->
-                    <!--                    </el-col>-->
-                    <!--                    <el-col :span="7">-->
-                    <!--                        <el-form-item prop="reCount">-->
-                    <!--                            <el-input v-model="detailFormData.reCount" auto-complete="off"-->
-                    <!--                                      oninput="value=value.replace(/[^\d]/g,'')"></el-input>-->
-                    <!--                        </el-form-item>-->
-                    <!--                    </el-col>-->
                 </el-row>
                 <el-row :gutter="20">
                     <el-col :span="3">
@@ -374,6 +367,7 @@
                     <el-col :span="7">
                         <el-form-item prop="productDate">
                             <el-input v-model="detailFormData.productDate" auto-complete="off"
+                                      clearable
                                       oninput="if(value.length>6)value=value.slice(0,6)"
                                       type="number"
                                       :disabled="false"></el-input>
@@ -386,22 +380,12 @@
                     </el-col>
                     <el-col :span="7">
                         <el-form-item prop="expireDate">
-                            <!--              <el-input v-model="detailFormData.expireDate" auto-complete="off"-->
-                            <!--                        :disabled="false"></el-input>-->
-
                             <el-input v-model="detailFormData.expireDate" auto-complete="off"
+                                      clearable
                                       oninput="if(value.length>6)value=value.slice(0,6)"
                                       type="number"
                                       :disabled="false"></el-input>
 
-                            <!--                            <el-date-picker-->
-                            <!--                                type="date"-->
-                            <!--                                size="small" v-model="detailFormData.expireDate"-->
-                            <!--                                placeholder="请选择失效日期" style="width: 80%"-->
-                            <!--                                value-format="yyMMdd"-->
-                            <!--                                format="yyyy-MM-dd"-->
-                            <!--                            >-->
-                            <!--                            </el-date-picker>-->
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -413,7 +397,9 @@
                     </el-col>
                     <el-col :span="7">
                         <el-form-item prop="batchNo">
-                            <el-input v-model="detailFormData.price" auto-complete="off" :disabled="false"></el-input>
+                            <el-input v-model="detailFormData.price"
+                                      clearable
+                                      auto-complete="off" :disabled="false"></el-input>
                         </el-form-item>
                     </el-col>
 
@@ -499,18 +485,6 @@ export default {
             newSpDistributionVisible: false,
             isSp: store.getters.customerId,
             detailFormRules: {
-                batchNo: [
-                    {required: true, message: "请输入批次号", trigger: "blur"}
-                ],
-                productDate: [
-                    {required: true, message: "请输入生产日期", trigger: "blur"}
-                ],
-                expireDate: [
-                    {required: true, message: "请输入失效日期", trigger: "blur"}
-                ],
-                sweepCount: [
-                    {required: true, message: "请输入扫码数量", trigger: "blur"}
-                ]
             },
             busTypes: [],
             detailFormVisible: false,
@@ -852,6 +826,16 @@ export default {
                 if (valid) {
                     this.detailLoading = true;
                     let tQuery = this.detailFormData;
+                    if (this.$isBlank(tQuery.batchNo)) {
+                        if (!tQuery.allowNoBatch) {
+                            return this.$message.error('批次号不能为空');
+                        }
+                    }
+
+                    if (this.$isBlank(tQuery.productDate) && this.$isBlank(tQuery.expireDate)) {
+                        return this.$message.error('生产日期与失效日期不能全部为空');
+                    }
+
                     uploadStockOrderDetail(tQuery).then((response) => {
                         this.detailLoading = false;
                         if (response.code === 20000) {
diff --git a/src/views/business/stockOrderNewDistribution.vue b/src/views/business/stockOrderNewDistribution.vue
index 030f05d..627355e 100644
--- a/src/views/business/stockOrderNewDistribution.vue
+++ b/src/views/business/stockOrderNewDistribution.vue
@@ -560,9 +560,6 @@ export default {
                 locStorageCode: [
                     {required: true, message: "请选择当前仓库", trigger: "blur"}
                 ],
-                // type: [
-                //     {required: true, message: "请选择采购类型", trigger: "blur"}
-                // ],
             },
             codeArray: [],
             fromOptions: [],
@@ -635,9 +632,7 @@ export default {
                         if (!this.$isBlank(this.codeArray[i].expireDate) && this.codeArray[i].expireDate.length != 6) {
                             return this.$message.error('失效日期格式错误');
                         }
-
                     }
-
                     if (status === '3') {
                         for (let i = 0; i < this.codeArray.length; i++) {
                             if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
@@ -651,11 +646,6 @@ export default {
                             if (this.$isBlank(this.codeArray[i].productDate) && this.$isBlank(this.codeArray[i].expireDate)) {
                                 return this.$message.error('生产日期与失效日期不能全部为空');
                             }
-                            // if (this.$isBlank(this.codeArray[i].expireDate)) {
-                            //     return this.$message.error('失效日期不能为空');
-                            // }
-
-
                         }
                     }
                     if (status === '2') {
@@ -663,14 +653,6 @@ export default {
                             if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
                                 return this.$message.error('单据数量不能为0');
                             }
-
-                            // if (!this.$isBlank(this.codeArray[i].productDate && this.codeArray[i].productDate.length != 6)) {
-                            //     return this.$message.error('生产日期格式错误');
-                            // }
-                            // if (!this.$isBlank(this.codeArray[i].expireDate && this.codeArray[i].expireDate.length != 6)) {
-                            //     return this.$message.error('失效日期不能为空');
-                            // }
-
                         }
                     }
 
diff --git a/src/views/business/stockOrderWaitCheck.vue b/src/views/business/stockOrderWaitCheck.vue
index 8ad5b8f..af433b7 100644
--- a/src/views/business/stockOrderWaitCheck.vue
+++ b/src/views/business/stockOrderWaitCheck.vue
@@ -454,6 +454,15 @@ export default {
             this.actDateRange = [];
         },
         onSubmit() {
+
+            if (this.actDateRange !== null) {
+                this.filterQuery.startTime = this.actDateRange[0];
+                this.filterQuery.endTime = this.actDateRange[1];
+            } else {
+                this.filterQuery.startTime = null;
+                this.filterQuery.endTime = null;
+            }
+
             this.getList();
             if (this.query.status === "202" || this.query.status === "502") {
                 this.haveDistributionVisible = true;
diff --git a/src/views/inventory/InvProducts.vue b/src/views/inventory/InvProducts.vue
index 8a76d50..cb88494 100644
--- a/src/views/inventory/InvProducts.vue
+++ b/src/views/inventory/InvProducts.vue
@@ -1,151 +1,151 @@
 <template>
-  <div>
-    <el-card>
-      <el-form :inline="true" :model="filterQuery" size="mini">
-        <el-row style="width: 100%">
-          <el-form-item class="query-form-item">
-            <el-input v-model="filterQuery.nameCode" placeholder="产品标识DI"></el-input>
-          </el-form-item>
-          <el-form-item class="query-form-item">
-            <el-input v-model="filterQuery.productsName" placeholder="产品名称"></el-input>
-          </el-form-item>
-          <el-form-item class="query-form-item">
-            <el-input v-model="filterQuery.batchNo" placeholder="批次号"></el-input>
-          </el-form-item>
-          <el-form-item class="query-form-item">
-            <el-select
-                v-model="filterQuery.supId"
-                filterable
-                remote
-                clearable="true"
-                reserve-keyword
-                placeholder="请输入供应商名称"
-                :remote-method="findMethod"
-                size="mini"
-                :loading="loading"
-            >
-              <el-option
-                  v-for="item in fromOptions"
-                  :key="item.name"
-                  :label="item.name"
-                  :value="item.erpId"
-              >
-                <span style="float: left">{{ item.name }}</span>
-              </el-option>
-            </el-select>
-          </el-form-item>
+    <div>
+        <el-card>
+            <el-form :inline="true" :model="filterQuery" size="mini">
+                <el-row style="width: 100%">
+                    <el-form-item class="query-form-item">
+                        <el-input v-model="filterQuery.nameCode" placeholder="产品标识DI" clearable></el-input>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-input v-model="filterQuery.productsName" placeholder="产品名称" clearable></el-input>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-input v-model="filterQuery.batchNo" placeholder="批次号" clearable></el-input>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-select
+                            v-model="filterQuery.supId"
+                            filterable
+                            remote
+                            clearable="true"
+                            reserve-keyword
+                            placeholder="请输入供应商名称"
+                            :remote-method="findMethod"
+                            size="mini"
+                            :loading="loading"
+                        >
+                            <el-option
+                                v-for="item in fromOptions"
+                                :key="item.name"
+                                :label="item.name"
+                                :value="item.erpId"
+                            >
+                                <span style="float: left">{{ item.name }}</span>
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
 
 
-        </el-row>
-        <el-row style="width: 100%">
+                </el-row>
+                <el-row style="width: 100%">
 
-          <el-form-item class="query-form-item">
-            <el-input v-model="filterQuery.ggxh" placeholder="规格型号"></el-input>
-          </el-form-item>
-          <el-form-item class="query-form-item">
-            <el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="批准文号"></el-input>
-          </el-form-item>
-          <el-form-item class="query-form-item">
-            <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产厂家"></el-input>
-          </el-form-item>
-          <el-form-item class="query-form-item">
-            <el-select v-model="filterQuery.invStorageCode" placeholder="请选择当前仓库" clearable="true"
-                       size="mini">
-              <el-option
-                  v-for="item in storageList"
-                  :key="item.name"
-                  :label="item.name"
-                  :value="item.code">
-                <span style="float: left">{{ item.name }}</span>
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item>
-            <el-button-group>
-              <el-button
-                  type="primary"
-                  icon="el-icon-refresh"
-                  @click="onReset"
-              ></el-button>
-              <el-button type="primary" icon="search" @click="onSubmit"
-              >查询
-              </el-button
-              >
-            </el-button-group>
-          </el-form-item>
-        </el-row>
-      </el-form>
-      <el-table v-loading="loading" :data="list" style="width: 100%">
-        <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="产品标识" prop="nameCode" width="120"></el-table-column>
-        <el-table-column label="产品名称" prop="cpmctymc" width="180">
-        </el-table-column>
-        <el-table-column label="规格型号" prop="ggxh" width="180"></el-table-column>
-        <el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
-        <el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
-        <el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
-        <el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>
-        <el-table-column label="出库数量" prop="outCount" width="120"></el-table-column>
+                    <el-form-item class="query-form-item">
+                        <el-input v-model="filterQuery.ggxh" placeholder="规格型号" clearable></el-input>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="批准文号" clearable></el-input>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产厂家" clearable></el-input>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="filterQuery.invStorageCode" placeholder="请选择当前仓库" clearable="true"
+                                   size="mini">
+                            <el-option
+                                v-for="item in storageList"
+                                :key="item.name"
+                                :label="item.name"
+                                :value="item.code">
+                                <span style="float: left">{{ item.name }}</span>
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button-group>
+                            <el-button
+                                type="primary"
+                                icon="el-icon-refresh"
+                                @click="onReset"
+                            ></el-button>
+                            <el-button type="primary" icon="search" @click="onSubmit"
+                            >查询
+                            </el-button
+                            >
+                        </el-button-group>
+                    </el-form-item>
+                </el-row>
+            </el-form>
+            <el-table v-loading="loading" :data="list" style="width: 100%">
+                <el-table-column label="序号" type="index"></el-table-column>
+                <el-table-column label="产品标识" prop="nameCode" width="120"></el-table-column>
+                <el-table-column label="产品名称" prop="cpmctymc" width="180">
+                </el-table-column>
+                <el-table-column label="规格型号" prop="ggxh" width="180"></el-table-column>
+                <el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
+                <el-table-column label="生产日期" prop="productionDate" width="120"></el-table-column>
+                <el-table-column label="失效日期" prop="expireDate" width="120"></el-table-column>
+                <el-table-column label="入库数量" prop="inCount" width="120"></el-table-column>
+                <el-table-column label="出库数量" prop="outCount" width="120"></el-table-column>
 
-        <el-table-column label="结余数量" prop="reCount" width="120">
-          <template slot-scope="scope">
-            {{ (scope.row.inCount - scope.row.outCount) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="生产厂家" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
-                         width="120"></el-table-column>
+                <el-table-column label="结余数量" prop="reCount" width="120">
+                    <template slot-scope="scope">
+                        {{ (scope.row.inCount - scope.row.outCount) }}
+                    </template>
+                </el-table-column>
+                <el-table-column label="生产厂家" prop="ylqxzcrbarmc" v-if="showSup" show-overflow-tooltip
+                                 width="120"></el-table-column>
 
-        <el-table-column label="供应商" prop="companyName" v-if="showSup" show-overflow-tooltip
-                         width="120"></el-table-column>
-        <el-table-column label="仓库" prop="invStorageName" v-if="showSup"
-                         show-overflow-tooltip width="120"></el-table-column>
-        <el-table-column label="操作" width="120" fixed="right">
-          <template slot-scope="scope">
-            <el-button
-                type="text"
-                size="small"
-                @click.native.stop="intentDetail(scope.row)"
-            >详情
-            </el-button
-            >
+                <el-table-column label="供应商" prop="companyName" v-if="showSup" show-overflow-tooltip
+                                 width="120"></el-table-column>
+                <el-table-column label="仓库" prop="invStorageName" v-if="showSup"
+                                 show-overflow-tooltip width="120"></el-table-column>
+                <el-table-column label="操作" width="120" fixed="right">
+                    <template slot-scope="scope">
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native.stop="intentDetail(scope.row)"
+                        >详情
+                        </el-button
+                        >
 
-            <el-button
-                type="text"
-                size="small"
-                @click.native.stop="deleteDialog(scope.row.id)"
-            >删除
-            </el-button
-            >
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native.stop="deleteDialog(scope.row.id)"
+                        >删除
+                        </el-button
+                        >
+                    </template>
+                </el-table-column>
+            </el-table>
+        </el-card>
 
-    <el-dialog
-        title="库存详情"
-        :visible.sync="codeDetailVisible"
-        width="85%"
-        v-if="codeDetailVisible"
-    >
-      <codeDetail
-          :idQuery="idQuery"
-          v-on:closeDetailDialog="closeDetailDialog"
-      ></codeDetail>
-    </el-dialog>
-    <el-pagination
-        :page-size="filterQuery.limit"
-        @current-change="handleCurrentChange"
-        layout="prev, pager, next"
-        :total="total"
-    ></el-pagination>
-  </div>
+        <el-dialog
+            title="库存详情"
+            :visible.sync="codeDetailVisible"
+            width="85%"
+            v-if="codeDetailVisible"
+        >
+            <codeDetail
+                :idQuery="idQuery"
+                v-on:closeDetailDialog="closeDetailDialog"
+            ></codeDetail>
+        </el-dialog>
+        <el-pagination
+            :page-size="filterQuery.limit"
+            @current-change="handleCurrentChange"
+            layout="prev, pager, next"
+            :total="total"
+        ></el-pagination>
+    </div>
 </template>
 
 <script>
 import {
-  filterProducts,
-  filterDetailProducts,
-  deleteProducts,
+    filterProducts,
+    filterDetailProducts,
+    deleteProducts,
 } from "../../api/inventory/InvProducts";
 import draggable from "vuedraggable";
 import codeDetail from "./InvProductsDetail";
@@ -156,220 +156,220 @@ import {filterAllByUser, filterUplLocInv} from "@/api/basic/invWarehouse";
 
 
 export default {
-  data() {
-    return {
-      filterQuery: {
-        invStorageCode: null,
-        productsName: null,
-        nameCode: null,
-        relIdFk: null,
-        batchNo: null,
-        page: 1,
-        limit: 20,
-        customerId: null,
-        supId: null,
-        unitFk: null,
-      },
-      detailQuery: {
-        code: null,
-        productIdFk: null,
-        page: 1,
-        limit: 20,
-      },
-      list: [],
-      storageList: [],
-      codeDetailVisible: false,
-      total: 0,
-      loading: true,
-      index: null,
-      dialogTableVisible: false,
-      formLoading: false,
-      dialogVisible: false,
-      deleteLoading: false,
-      busTypes: [],
-      idQuery: null,
-      showSup: false,
-      fromOptions: [],
-    };
-  },
-  components: {
-    draggable,
-    codeDetail,
-  },
-  methods: {
-    onReset() {
-      this.$router.push({
-        path: "",
-      });
-      this.filterQuery = {
-        productsName: null,
-        nameCode: null,
-        relIdFk: null,
-        batchNo: null,
-        customerId: null,
-        unitFk: null,
-        supId: null,
-        page: 1,
-        limit: 20,
-      };
-      this.getList();
+    data() {
+        return {
+            filterQuery: {
+                invStorageCode: null,
+                productsName: null,
+                nameCode: null,
+                relIdFk: null,
+                batchNo: null,
+                page: 1,
+                limit: 20,
+                customerId: null,
+                supId: null,
+                unitFk: null,
+            },
+            detailQuery: {
+                code: null,
+                productIdFk: null,
+                page: 1,
+                limit: 20,
+            },
+            list: [],
+            storageList: [],
+            codeDetailVisible: false,
+            total: 0,
+            loading: true,
+            index: null,
+            dialogTableVisible: false,
+            formLoading: false,
+            dialogVisible: false,
+            deleteLoading: false,
+            busTypes: [],
+            idQuery: null,
+            showSup: false,
+            fromOptions: [],
+        };
     },
-    onSubmit() {
-      this.loading = true;
-      this.getList();
-    },
-    handleSizeChange(val) {
-      this.filterQuery.limit = val;
-      this.getList();
-    },
-    handleCurrentChange(val) {
-      this.filterQuery.page = val;
-      this.getList();
-    },
-    handleUnitClick(row) {
-      this.curIndex = row.id;
-      this.dialogTableVisible = true;
-    },
-    closeDetailDialog(val) {
-      this.codeDetailVisible = false;
+    components: {
+        draggable,
+        codeDetail,
     },
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: "",
+            });
+            this.filterQuery = {
+                productsName: null,
+                nameCode: null,
+                relIdFk: null,
+                batchNo: null,
+                customerId: null,
+                unitFk: null,
+                supId: null,
+                page: 1,
+                limit: 20,
+            };
+            this.getList();
+        },
+        onSubmit() {
+            this.loading = true;
+            this.getList();
+        },
+        handleSizeChange(val) {
+            this.filterQuery.limit = val;
+            this.getList();
+        },
+        handleCurrentChange(val) {
+            this.filterQuery.page = val;
+            this.getList();
+        },
+        handleUnitClick(row) {
+            this.curIndex = row.id;
+            this.dialogTableVisible = true;
+        },
+        closeDetailDialog(val) {
+            this.codeDetailVisible = false;
+        },
 
-    closeDialog() {
-      this.getList();
-    },
-    getList() {
-      this.loading = true;
-      this.filterQuery.customerId = store.getters.customerId;
-      filterProducts(this.filterQuery)
-          .then((response) => {
-            console.log(response)
-            this.showSup = response.data.showSup;
-            this.loading = false;
-            this.list = response.data.list || [];
-            this.total = response.data.total || 0;
-          })
-          .catch(() => {
-            this.loading = false;
-            this.list = [];
-            this.total = 0;
-          });
-    },
+        closeDialog() {
+            this.getList();
+        },
+        getList() {
+            this.loading = true;
+            this.filterQuery.customerId = store.getters.customerId;
+            filterProducts(this.filterQuery)
+                .then((response) => {
+                    console.log(response)
+                    this.showSup = response.data.showSup;
+                    this.loading = false;
+                    this.list = response.data.list || [];
+                    this.total = response.data.total || 0;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
+                });
+        },
 
-    deleteOrders(data) {
-      this.loading = true;
-      let query = {
-        id: data,
-      }
-      deleteProducts(query)
-          .then((response) => {
-            if (response.code == 20000) {
-              this.getList();
-              this.$message({
-                type: "success",
-                message: "删除成功！",
-              });
-            } else {
-              this.$message.error(response.message);
+        deleteOrders(data) {
+            this.loading = true;
+            let query = {
+                id: data,
             }
+            deleteProducts(query)
+                .then((response) => {
+                    if (response.code == 20000) {
+                        this.getList();
+                        this.$message({
+                            type: "success",
+                            message: "删除成功！",
+                        });
+                    } else {
+                        this.$message.error(response.message);
+                    }
 
-          })
-          .catch(() => {
-          });
-    },
+                })
+                .catch(() => {
+                });
+        },
 
-    deleteDialog(rowId) {
-      this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-          .then(() => {
-            this.deleteOrders(rowId);
-          })
-          .catch(() => {
-          });
-    },
-    findMethod(query) {
-      console.log(query);
-      this.fromOptions = [];
-      let cQuery = {
-        key: query,
-        customerName: query,
-        page:1,
-        limit:20
+        deleteDialog(rowId) {
+            this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    this.deleteOrders(rowId);
+                })
+                .catch(() => {
+                });
+        },
+        findMethod(query) {
+            console.log(query);
+            this.fromOptions = [];
+            let cQuery = {
+                key: query,
+                customerName: query,
+                page: 1,
+                limit: 20
 
-      };
-      getBasicUnitMaintains(cQuery)
-          .then((response) => {
-            this.loading = false;
-            this.fromOptions = response.data.page.list || [];
-          })
-          .catch(() => {
-            this.loading = false;
-          });
-    },
-    getStorage() {
-      this.storageList = [];
-      filterUplLocInv()
-          .then((response) => {
-            this.storageList = response.data || [];
-          })
-          .catch(() => {
-          });
-    },
-    intentDetail(row) {
+            };
+            getBasicUnitMaintains(cQuery)
+                .then((response) => {
+                    this.loading = false;
+                    this.fromOptions = response.data.page.list || [];
+                })
+                .catch(() => {
+                    this.loading = false;
+                });
+        },
+        getStorage() {
+            this.storageList = [];
+            filterUplLocInv()
+                .then((response) => {
+                    this.storageList = response.data || [];
+                })
+                .catch(() => {
+                });
+        },
+        intentDetail(row) {
 
-      this.idQuery = row;
-      // this.idQuery.supId = null;
-      this.idQuery.customerId = null;
-      this.codeDetailVisible = true;
+            this.idQuery = row;
+            // this.idQuery.supId = null;
+            this.idQuery.customerId = null;
+            this.codeDetailVisible = true;
+        },
+        getBusType() {
+            let query = {
+                enabled: true,
+            };
+            getBussinessType(query)
+                .then((response) => {
+                    this.busTypes = response.data.list || [];
+                    this.filterQuery.billAction = this.busTypes[0].action;
+                    // this.getList();
+                })
+                .catch(() => {
+                });
+        },
+        getActionName(action) {
+            for (let i = 0; i < this.busTypes.length; i++) {
+                if (this.busTypes[i].action === action) {
+                    return this.busTypes[i].name;
+                }
+            }
+        },
     },
-    getBusType() {
-      let query = {
-        enabled: true,
-      };
-      getBussinessType(query)
-          .then((response) => {
-            this.busTypes = response.data.list || [];
-            this.filterQuery.billAction = this.busTypes[0].action;
-            // this.getList();
-          })
-          .catch(() => {
-          });
+    filters: {
+        statusFilterType(status) {
+            const statusMap = {
+                false: "success",
+                true: "danger",
+            };
+            return statusMap[status];
+        },
     },
-    getActionName(action) {
-      for (let i = 0; i < this.busTypes.length; i++) {
-        if (this.busTypes[i].action === action) {
-          return this.busTypes[i].name;
-        }
-      }
+    mounted() {
+        document.body.ondrop = function (event) {
+            event.preventDefault();
+            event.stopPropagation();
+        };
     },
-  },
-  filters: {
-    statusFilterType(status) {
-      const statusMap = {
-        false: "success",
-        true: "danger",
-      };
-      return statusMap[status];
+    created() {
+        this.getStorage();
+        this.getBusType();
+        this.findMethod();
+        let query = this.$route.query;
+        this.filterQuery = Object.assign(this.filterQuery, query);
+        this.filterQuery.limit = parseInt(this.filterQuery.limit);
+        // 加载表格数据
+        this.getList();
     },
-  },
-  mounted() {
-    document.body.ondrop = function (event) {
-      event.preventDefault();
-      event.stopPropagation();
-    };
-  },
-  created() {
-    this.getStorage();
-    this.getBusType();
-    this.findMethod();
-    let query = this.$route.query;
-    this.filterQuery = Object.assign(this.filterQuery, query);
-    this.filterQuery.limit = parseInt(this.filterQuery.limit);
-    // 加载表格数据
-    this.getList();
-  },
 };
 </script>
 
diff --git a/src/views/inventory/InvStatistics.vue b/src/views/inventory/InvStatistics.vue
index 76f8048..381c850 100644
--- a/src/views/inventory/InvStatistics.vue
+++ b/src/views/inventory/InvStatistics.vue
@@ -5,13 +5,13 @@
 
                 <el-row style="width: 100%">
                     <el-form-item class="query-form-item">
-                        <el-input v-model="filterQuery.nameCode" placeholder="产品标识DI"></el-input>
+                        <el-input v-model="filterQuery.nameCode" placeholder="产品标识DI" clearable></el-input>
                     </el-form-item>
                     <el-form-item class="query-form-item">
-                        <el-input v-model="filterQuery.productsName" placeholder="产品名称"></el-input>
+                        <el-input v-model="filterQuery.productsName" placeholder="产品名称" clearable></el-input>
                     </el-form-item>
                     <el-form-item class="query-form-item">
-                        <el-input v-model="filterQuery.batchNo" placeholder="批次号"></el-input>
+                        <el-input v-model="filterQuery.batchNo" placeholder="批次号" clearable></el-input>
                     </el-form-item>
                     <el-form-item class="query-form-item">
                         <el-select
@@ -41,13 +41,13 @@
                 <el-row style="width: 100%">
 
                     <el-form-item class="query-form-item">
-                        <el-input v-model="filterQuery.ggxh" placeholder="规格型号"></el-input>
+                        <el-input v-model="filterQuery.ggxh" placeholder="规格型号" clearable></el-input>
                     </el-form-item>
                     <el-form-item class="query-form-item">
-                        <el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="批准文号"></el-input>
+                        <el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="批准文号" clearable></el-input>
                     </el-form-item>
                     <el-form-item class="query-form-item">
-                        <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产厂家"></el-input>
+                        <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产厂家" clearable></el-input>
                     </el-form-item>
                     <el-form-item class="query-form-item">
                         <el-select v-model="filterQuery.invStorageCode" placeholder="请选择当前仓库" clearable="true"
@@ -101,7 +101,7 @@
 
                 <el-table-column label="供应商" prop="companyName" v-if="showSup" show-overflow-tooltip
                                  width="120"></el-table-column>
-<!--                <el-table-column label="仓库" prop="invStorageName" v-if="showSup"-->
+                <!--                <el-table-column label="仓库" prop="invStorageName" v-if="showSup"-->
                 <!--                                 show-overflow-tooltip width="120"></el-table-column>-->
             </el-table>
         </el-card>
@@ -253,8 +253,8 @@ export default {
             this.fromOptions = [];
             let cQuery = {
                 key: query,
-                page:1,
-                limit:20
+                page: 1,
+                limit: 20
 
             };
             getBasicUnitMaintains(cQuery)
diff --git a/src/views/inventory/UdiCodeTrace.vue b/src/views/inventory/UdiCodeTrace.vue
index c8449ec..438ce3e 100644
--- a/src/views/inventory/UdiCodeTrace.vue
+++ b/src/views/inventory/UdiCodeTrace.vue
@@ -14,6 +14,7 @@
                             v-model="query.code"
                             placeholder="UDI码"
                             style="width: 500px"
+                            clearable
                             @keyup.enter.native="keyup_submit($event)"
                         ></el-input>
                     </el-form-item>
diff --git a/src/views/inventory/invPreProducts.vue b/src/views/inventory/invPreProducts.vue
index a9d7fe2..301b94d 100644
--- a/src/views/inventory/invPreProducts.vue
+++ b/src/views/inventory/invPreProducts.vue
@@ -4,13 +4,13 @@
             <el-form :inline="true" :model="filterQuery" size="mini">
                 <el-row style="width: 100%">
                     <el-form-item class="query-form-item">
-                        <el-input v-model="filterQuery.nameCode" placeholder="产品标识DI"></el-input>
+                        <el-input v-model="filterQuery.nameCode" placeholder="产品标识DI" clearable></el-input>
                     </el-form-item>
                     <el-form-item class="query-form-item">
-                        <el-input v-model="filterQuery.productsName" placeholder="产品名称"></el-input>
+                        <el-input v-model="filterQuery.productsName" placeholder="产品名称" clearable></el-input>
                     </el-form-item>
                     <el-form-item class="query-form-item">
-                        <el-input v-model="filterQuery.batchNo" placeholder="批次号"></el-input>
+                        <el-input v-model="filterQuery.batchNo" placeholder="批次号" clearable></el-input>
                     </el-form-item>
                     <el-form-item class="query-form-item">
                         <el-select
@@ -51,13 +51,13 @@
                     <!--                        </el-select>-->
                     <!--                    </el-form-item>-->
                     <el-form-item class="query-form-item">
-                        <el-input v-model="filterQuery.ggxh" placeholder="规格型号"></el-input>
+                        <el-input v-model="filterQuery.ggxh" placeholder="规格型号" clearable></el-input>
                     </el-form-item>
                     <el-form-item class="query-form-item">
-                        <el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="批准文号"></el-input>
+                        <el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="批准文号" clearable></el-input>
                     </el-form-item>
                     <el-form-item class="query-form-item">
-                        <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产厂家"></el-input>
+                        <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产厂家" clearable></el-input>
                     </el-form-item>
                     <el-form-item>
                         <el-button-group>
diff --git a/src/views/inventory/invUdiTraceOrder.vue b/src/views/inventory/invUdiTraceOrder.vue
index 1929552..7ce7920 100644
--- a/src/views/inventory/invUdiTraceOrder.vue
+++ b/src/views/inventory/invUdiTraceOrder.vue
@@ -18,6 +18,7 @@
                             ref='inputRef'
                             style="width: 500px"
                             @keypress.enter.native="enterKey($event)"
+                            clearable
                         ></el-input>
                         <el-checkbox v-model="sitcomScan" style="margin-left: 15px">分段扫码</el-checkbox>
                     </el-form-item>
diff --git a/src/views/thrsys/SysUdimsConfig.vue b/src/views/thrsys/SysUdimsConfig.vue
new file mode 100644
index 0000000..880cce9
--- /dev/null
+++ b/src/views/thrsys/SysUdimsConfig.vue
@@ -0,0 +1,139 @@
+<template>
+    <el-card>
+
+        <el-descriptions class="margin-top" title="数据同步设置" :column="1" :size="100" border>
+            <template slot="extra">
+                <el-button type="primary" size="small" @click="saveConfig()">保存</el-button>
+            </template>
+            <el-descriptions-item>
+                <template slot="label">
+                    参数设置
+                </template>
+                <el-row :gutter="20" class="el-row" type="flex">
+                    <el-col :span="4" class="el-col" style="margin-top: 6px">
+                        <el-checkbox v-model="configQuery.downstreamEnable">上游是否联通</el-checkbox>
+                    </el-col>
+                    <el-col :span="20" class="el-col" >
+                        <div>
+                            <span>数据同步轮询时间(单位:分钟):&nbsp;</span>
+                            <el-input
+                                style="width: 100px"
+                                size="small"
+                                type="number"
+                                v-model="configQuery.syncTime"
+                                splaceholder="请输入内容"
+                            ></el-input>
+                        </div>
+                    </el-col>
+                </el-row>
+
+            </el-descriptions-item>
+
+            <el-descriptions-item>
+                <template slot="label">
+                    单据类型
+                </template>
+                <el-checkbox v-model="configQuery.typeBus">业务单据类型</el-checkbox>
+                <el-checkbox v-model="configQuery.typeScan">扫码单据类型</el-checkbox>
+                <el-checkbox v-model="configQuery.typeThird">第三方单据类型</el-checkbox>
+            </el-descriptions-item>
+
+            <el-descriptions-item>
+                <template slot="label">
+                    基础信息
+                </template>
+                <el-checkbox v-model="configQuery.basicProducts">耗材字典</el-checkbox>
+                <el-checkbox v-model="configQuery.basicCorp">往来单位字典</el-checkbox>
+                <el-checkbox v-model="configQuery.basicInv">仓库字典</el-checkbox>
+                <el-checkbox v-model="configQuery.basicThirdProducts">第三方产品信息</el-checkbox>
+                <el-checkbox v-model="configQuery.basicThirdCorp">第三方往来信息</el-checkbox>
+                <el-checkbox v-model="configQuery.basicThirdInv">第三方仓库信息</el-checkbox>
+                <el-checkbox v-model="configQuery.basicThirdBusOrder">第三方业务单据</el-checkbox>
+            </el-descriptions-item>
+
+            <el-descriptions-item>
+                <template slot="label">
+                    单据
+                </template>
+                <el-checkbox v-model="configQuery.orderScanFinish">已完成扫码单据</el-checkbox>
+            </el-descriptions-item>
+
+        </el-descriptions>
+
+
+
+
+    </el-card>
+</template>
+
+<script>
+import {findConfig, updateConfig} from "@/api/thrsys/spsSyncStatus";
+import store from "@/store";
+
+export default {
+    name: "SysUdimsConfig",
+    data() {
+        return {
+            configQuery: {
+                id: null,
+                typeBus: null,
+                typeScan: null,
+                typeThird: null,
+                basicProducts: null,
+                basicCorp: null,
+                basicInv: null,
+                basicThirdProducts: null,
+                basicThirdCorp: null,
+                basicThirdInv: null,
+                basicThirdBusOrder: null,
+                orderScanFinish: null,
+                dbDiProducts: null,
+                downstreamEnable:null,
+                syncTime:null,
+            },
+        }
+    },
+    methods:{
+        getConfig() {
+            findConfig()
+                .then((response) => {
+                    if (response.code == 20000) {
+                        this.configQuery = response.data;
+                    } else {
+                        this.$message.error(response.message);
+                    }
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
+                });
+        },
+        saveConfig() {
+            updateConfig(this.configQuery)
+                .then((response) => {
+                    this.loading = false;
+                    if (response.code == 20000) {
+                        this.$message.success("更新成功！");
+                        this.getConfig();
+                    }
+                })
+                .catch(() => {
+                    this.loading = false;
+                });
+        },
+
+    },
+    created() {
+        this.headers = {
+            ADMIN_ID: store.getters.adminId,
+            ADMIN_TOKEN: store.getters.token,
+        };
+        this.getConfig();
+    },
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/userManage/admin/authAdmin.vue b/src/views/userManage/admin/authAdmin.vue
index 251991d..b7bd64d 100644
--- a/src/views/userManage/admin/authAdmin.vue
+++ b/src/views/userManage/admin/authAdmin.vue
@@ -9,17 +9,8 @@
           <el-option label="全部" value=""></el-option>
           <el-option label="禁用" value="0"></el-option>
           <el-option label="正常" value="1"></el-option>
-          <el-option label="未验证" value="2"></el-option>
         </el-select>
       </el-form-item>
-      <!--
-            <el-form-item class="query-form-item">
-                <el-select v-model="query.roleId" placeholder="角色">
-                    <el-option label="全部角色" value=""></el-option>
-                    <el-option v-for="item in roles" :key="item.id" :label="item.name" :value="item.id"></el-option>
-                </el-select>
-            </el-form-item>
--->
       <el-form-item>
         <el-button-group>
           <el-button
@@ -56,7 +47,6 @@
         <template slot-scope="scope">
           <i class="el-icon-time"></i>
           <span> {{ scope.row.lastLoginTime }}</span>
-          <!-- <span>{{ formatTime(scope.row.lastLoginTime,"yyyy-MM-dd") }}</span> -->
         </template>
       </el-table-column>
 
@@ -147,7 +137,6 @@
           <el-radio-group v-model="formData.userFlag">
             <el-radio :label="0">禁用</el-radio>
             <el-radio :label="1">正常</el-radio>
-            <el-radio :label="2">未验证</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="角色">
@@ -419,8 +408,8 @@ export default {
         statusFilterName(status) {
             const statusMap = {
                 0: "禁用",
-                1: "正常",
-                2: "未验证"
+                1: "正常"
+
             };
             return statusMap[status];
         }