diff --git a/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue b/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue
index 884a27adc..77b5f0582 100644
--- a/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/newCertificate/index.vue
@@ -117,7 +117,7 @@
       </div>
     </el-drawer>
 
-    <el-dialog title="新增/编辑优惠券" :visible.sync="centerDialogVisible" width="90%">
+    <el-dialog title="新增/编辑优惠券" :close-on-click-modal="false" :visible.sync="centerDialogVisible" width="90%">
       <!--          表-->
       <el-form :model="ruleForm" :rules="rules" :label-position="labelPosition" ref="ruleForm" label-width="120px"
                class="demo-ruleForm">
diff --git a/fuintAdmin/src/views/convenienceStore/goodsFile.vue b/fuintAdmin/src/views/convenienceStore/goodsFile.vue
index a877d89bd..c6c2d0169 100644
--- a/fuintAdmin/src/views/convenienceStore/goodsFile.vue
+++ b/fuintAdmin/src/views/convenienceStore/goodsFile.vue
@@ -2,14 +2,22 @@
   <div class="app-container">
     <div class="card-change" >
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-        <el-tabs v-model="activeName" @tab-click="handleClick">
-          <el-tab-pane label="商品档案" name="goods"></el-tab-pane>
-          <el-tab-pane label="商品回收站" name="recovery"></el-tab-pane>
-        </el-tabs>
+<!--        <el-tabs v-model="activeName" @tab-click="handleClick">-->
+<!--          <el-tab-pane label="商品档案" name="goods"></el-tab-pane>-->
+<!--          <el-tab-pane label="商品回收站" name="recovery"></el-tab-pane>-->
+<!--        </el-tabs>-->
+        <el-form-item label="" prop="name">
+          <el-input
+            v-model="queryParams.name"
+            placeholder="请输入商品名称"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
         <el-form-item label="" prop="cvsGoodId">
           <el-select
             v-model="queryParams.cvsGoodId"
-            placeholder="商品分类"
+            placeholder="请选择品类名称"
             clearable
           >
             <el-option v-for="item in cvsGoodList" :key="item.id" :label="item.name" :value="item.id"/>
@@ -18,26 +26,18 @@
         <el-form-item label="" prop="supplierId">
           <el-select
             v-model="queryParams.supplierId"
-            placeholder="供应商"
+            placeholder="请选择供应商"
             clearable
             style=""
           >
             <el-option v-for="item in supplierList" :key="item.id" :label="item.name" :value="item.id"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="" prop="name">
-          <el-input
-            v-model="queryParams.name"
-            placeholder="商品名称"
-            clearable
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
 
         <el-form-item label="" prop="shelfNumber">
           <el-input
             v-model="queryParams.shelfNumber"
-            placeholder="货架号"
+            placeholder="请输入货架号"
             clearable
             @keyup.enter.native="handleQuery"
           />
@@ -45,7 +45,7 @@
         <el-form-item label="" prop="status">
           <el-select
             v-model="queryParams.status"
-            placeholder="上架状态"
+            placeholder="请选择状态"
             clearable
           >
             <el-option label="上架" value="qy"/>
@@ -65,10 +65,11 @@
             @click="batchGrounding('jy')"
             v-hasPermi="['convenienceStore:goodsFile:down']"
           >商品下架</el-button>
+          <el-button type="primary" >新增商品</el-button>
         </el-form-item>
       </el-form>
 
-      <div v-if="activeName=='goods'">
+      <div>
 
         <div style="font-size: 12px;color: red;margin: 5px 0">注：库存为0或未设置零售价和会员价的商品不可上架</div>
       </div>
@@ -77,54 +78,52 @@
                 @selection-change="handleSelectionChange"
                 border
                 tooltip-effect="dark">
-        <el-table-column type="selection" width="55"/>
-<!--        <el-table-column type="index" width="80" align="center" label="序号"/>-->
-        <el-table-column label="分类名称" prop="cvsGoodName" align="center" width="120">
+        <el-table-column type="selection" width="40"/>
+        <el-table-column type="index" width="60" align="center" label="序号"/>
+        <el-table-column label="品类名称" prop="cvsGoodName" align="center">
           <template slot-scope="scope">
             <span>{{scope.row.cvsGoodName || "--"}}</span>
           </template>
         </el-table-column>
-        <el-table-column label="商品名称" prop="name" align="center" width="160"/>
-        <el-table-column label="供应商" prop="supplierName" align="center" width="120"/>
-        <el-table-column label="条码" prop="goodsNo" align="center" width="160"/>
-        <el-table-column label="拼音码" prop="pinyinCode" align="center" width="120"/>
-        <el-table-column label="货架号" prop="shelfNumber" align="center" width="60"/>
-        <el-table-column label="库存" prop="stock" align="center" width="100"/>
-        <el-table-column label="单位" prop="unit" align="center" width="60"/>
-        <el-table-column label="进货价" prop="buyingPrice" align="center" width="70"/>
-        <el-table-column label="零售价" prop="retailPrice" align="center" width="70"/>
-        <el-table-column label="会员价" prop="memberPrice" align="center" width="70"/>
-        <el-table-column label="排序" prop="sort" align="center" width="70"/>
+        <el-table-column label="商品名称" prop="name" align="center"/>
+        <el-table-column label="供应商" prop="supplierName" align="center"/>
+        <el-table-column label="条形码" prop="goodsNo" align="center" width="160"/>
+        <el-table-column label="拼音码" prop="pinyinCode" align="center"/>
+        <el-table-column label="货架号" prop="shelfNumber" align="center"/>
+        <el-table-column label="库存" prop="stock" align="center"/>
+        <el-table-column label="单位" prop="unit" align="center"/>
+        <el-table-column label="商品规格" prop="goodsSpecs" align="center"/>
+        <el-table-column label="成本价" prop="buyingPrice" align="center"/>
+        <el-table-column label="零售价" prop="retailPrice" align="center"/>
+        <el-table-column label="会员价" prop="memberPrice" align="center"/>
+        <el-table-column label="排序" prop="sort" align="center"/>
         <el-table-column label="状态" align="center" prop="status">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.status=='qy'">上架</el-tag>
             <el-tag type="info" v-if="scope.row.status=='jy'">下架</el-tag>
-<!--            <dict-tag :options="dict.type.zhzt" :value="scope.row.status"/>-->
           </template>
         </el-table-column>
-        <el-table-column label="更新时间" align="center" width="160" prop="updateTime">
+        <el-table-column label="操作人" prop="sort" align="center"/>
+        <el-table-column label="操作时间" align="center" width="160" prop="updateTime">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.updateTime) }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" v-if="activeName=='goods'" align="center" width="190" fixed='right'>
+        <el-table-column label="操作" align="center" width="190" fixed='right'>
           <template slot-scope="scope">
             <el-button
               size="mini"
               type="text"
-              icon="el-icon-edit"
               @click="handleUpdate(scope.row)"
               v-hasPermi="['convenienceStore:goodsFile:weih']"
-
             >商品维护</el-button>
+
             <el-button
               size="mini"
               type="text"
-              icon="el-icon-delete"
-              @click="isRecoveryBin(scope.row,1)"
-              v-hasPermi="['convenienceStore:goodsFile:movedel']"
-
-            >移至回收站</el-button>
+              @click="handleDelete(scope.row)"
+              v-hasPermi="['convenienceStore:goodsFile:del']"
+            >删除</el-button>
           </template>
         </el-table-column>
         <el-table-column label="操作" v-if="activeName=='recovery'" align="center" width="200" fixed='right'>
@@ -141,9 +140,9 @@
               size="mini"
               type="text"
               icon="el-icon-delete"
-              @click="handleDelete(scope.row)"
-              v-hasPermi="['convenienceStore:goodsFile:del']"
-            >删除</el-button>
+              @click="isRecoveryBin(scope.row,1)"
+              v-hasPermi="['convenienceStore:goodsFile:movedel']"
+            >移至回收站</el-button>
           </template>
         </el-table-column>
       </el-table>
diff --git a/fuintAdmin/src/views/convenienceStore/pinlei.vue b/fuintAdmin/src/views/convenienceStore/pinlei.vue
index f7b7807fc..33900e332 100644
--- a/fuintAdmin/src/views/convenienceStore/pinlei.vue
+++ b/fuintAdmin/src/views/convenienceStore/pinlei.vue
@@ -4,10 +4,10 @@
         <!-- 查询类别 -->
       <el-form :inline="true" :model="queryParams">
             <el-form-item label="" prop="name">
-                <el-input v-model="queryParams.name" placeholder="品类名称" clearable  @keyup.enter.native="handleQuery"></el-input>
+                <el-input v-model="queryParams.name" placeholder="请输入品类名称" clearable  @keyup.enter.native="handleQuery"></el-input>
             </el-form-item>
             <el-form-item label="">
-                <el-select v-model="queryParams.status" placeholder="状态" clearable >
+                <el-select v-model="queryParams.status" placeholder="请选择状态" clearable >
                     <el-option
                     v-for="dict in dict.type.zhzt"
                     :key="dict.value"
@@ -15,33 +15,18 @@
                     :value="dict.value"/>
                 </el-select>
             </el-form-item>
-<!--            <el-form-item>-->
-<!--                <el-button type="primary" icon="el-icon-search" @click="onQuery">搜索</el-button>-->
-<!--                <el-button @click="resetForm" icon="el-icon-refresh" >重置</el-button>-->
-<!--            </el-form-item>-->
         <el-form-item style="float: right;margin-right: 0px">
           <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
           <el-button @click="resetQuery" icon="el-icon-refresh" >重置</el-button>
           <el-button
             type="primary"
-            icon="el-icon-plus"
             @click="handleAdd"
             v-hasPermi="['convenienceStore:index:add']"
-
-          >添加品类</el-button>
+          >新增品类</el-button>
         </el-form-item>
       </el-form>
 
-
-<!--          <div class="tTop">品类列表-->
-<!--              <el-button  type="primary" @click="insertGoods" >添加品类</el-button>-->
-<!--          </div>-->
-      <!-- default-expand-all二级菜单默认展开 -->
-      <!-- 品类列表 -->
-<!--      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"-->
       <el-table ref="tables" v-loading="loading" :data="list" row-key="id" border>
-<!--                @selection-change="handleSelectionChange" :default-sort="defaultSort"-->
-<!--                @sort-change="handleSortChange">-->
         <el-table-column type="expand" >
           <template slot-scope="props">
             <el-table ref="tables" :data="props.row.goodsVoList">
@@ -57,7 +42,6 @@
                 <template slot-scope="scope">
                   <el-tag v-if="scope.row.status=='qy'">上架</el-tag>
                   <el-tag type="info" v-if="scope.row.status=='jy'">下架</el-tag>
-                  <!--            <dict-tag :options="dict.type.zhzt" :value="scope.row.status"/>-->
                 </template>
               </el-table-column>
               <el-table-column label="创建时间" align="center" width="160" prop="createTime"/>
@@ -66,47 +50,42 @@
         </el-table-column>
         <el-table-column type="index" width="80" align="center" label="序号"/>
         <el-table-column label="品类名称" align="center" prop="name"/>
-        <el-table-column label="商品编号" align="center" prop="code"/>
+<!--        <el-table-column label="商品编号" align="center" prop="code"/>-->
         <el-table-column label="排序" align="center" prop="sorted" />
         <el-table-column label="状态" align="center" prop="status">
           <template slot-scope="scope">
             <dict-tag :options="dict.type.zhzt" :value="scope.row.status"/>
           </template>
         </el-table-column>
-        <el-table-column label="创建时间" align="center" prop="createTime">
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.createTime) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="创建人" align="center" prop="createBy">
+        <el-table-column label="操作人" align="center" prop="createBy">
           <template slot-scope="scope">
             <span>{{ getName(scope.row.createBy) }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="操作时间" align="center" prop="createTime">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="操作" align="center" width="300" fixed='right'>
           <template slot-scope="scope">
             <el-button
               size="mini"
               type="text"
-              icon="el-icon-plus"
               @click="addGoods(scope.row)"
               v-hasPermi="['convenienceStore:index:addgoods']"
-
             >添加商品信息</el-button>
             <el-button
               size="mini"
               type="text"
-              icon="el-icon-edit"
               @click="handleUpdate(scope.row)"
               v-hasPermi="['convenienceStore:index:upodate']"
             >修改品类信息</el-button>
             <el-button
               size="mini"
               type="text"
-              icon="el-icon-delete"
               @click="handleDelete(scope.row)"
               v-hasPermi="['convenienceStore:index:del']"
-
             >删除</el-button>
           </template>
         </el-table-column>
diff --git a/fuintAdmin/src/views/convenienceStore/stockStatistic.vue b/fuintAdmin/src/views/convenienceStore/stockStatistic.vue
index 21e35d2d4..ac6009232 100644
--- a/fuintAdmin/src/views/convenienceStore/stockStatistic.vue
+++ b/fuintAdmin/src/views/convenienceStore/stockStatistic.vue
@@ -3,82 +3,87 @@
     <!--    搜索框-->
     <div class="card-change" >
       <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form-item label="" prop="name">
+          <el-input
+            v-model="queryParams.name"
+            placeholder="请输入商品名称"
+            clearable
+            style=""
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
         <el-form-item label="" prop="cvsGoodId">
-<!--          <el-cascader v-model="cvsGoodId"-->
-<!--                       :options="cvsGoodOptions"-->
-<!--                       :props="{ checkStrictly: true }"-->
-<!--                       clearable></el-cascader>-->
           <el-select
             v-model="queryParams.cvsGoodId"
-            placeholder="商品分类"
+            placeholder="请选择品类名称"
             clearable
           >
             <el-option v-for="item in cvsGoodList" :key="item.id" :label="item.name" :value="item.id"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="" prop="supplierId">
-          <el-select
-            v-model="queryParams.supplierId"
-            placeholder="供应商"
-            clearable
-            style=""
-          >
-            <el-option v-for="item in supplierList" :key="item.id" :label="item.name" :value="item.id"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="" prop="name">
-          <el-input
-            v-model="queryParams.name"
-            placeholder="商品名称"
-            clearable
-            style=""
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="" prop="pinyinCode">
-          <el-input
-            v-model="queryParams.pinyinCode"
-            placeholder="拼音码"
-            clearable
-            style=""
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="" prop="goodsNo">
-          <el-input
-            v-model="queryParams.goodsNo"
-            placeholder="条形码"
-            clearable
-            style=""
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="" prop="shelfNumber">
-          <el-input
-            v-model="queryParams.shelfNumber"
-            placeholder="货架号"
-            clearable
-            style=""
-            @keyup.enter.native="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item label="" prop="status">
-          <el-select
-            v-model="queryParams.status"
-            placeholder="上架状态"
-            clearable
-            style=""
-          >
-<!--            <el-option-->
-<!--              v-for="dict in dict.type.zhzt"-->
-<!--              :key="dict.value"-->
-<!--              :label="dict.label"-->
-<!--              :value="dict.value"-->
-<!--            />-->
-            <el-option label="上架" value="qy"/>
-            <el-option label="下架" value="jy"/>
-          </el-select>
+        <el-form-item label="">
+          <el-date-picker
+            v-model="beginTime"
+            style="width: 160px"
+            type="date"
+            placeholder="开始日期">
+          </el-date-picker>
+          至
+          <el-date-picker
+            v-model="endTime"
+            style="width: 160px"
+            type="date"
+            placeholder="结束日期">
+          </el-date-picker>
         </el-form-item>
+<!--        <el-form-item label="" prop="supplierId">-->
+<!--          <el-select-->
+<!--            v-model="queryParams.supplierId"-->
+<!--            placeholder="供应商"-->
+<!--            clearable-->
+<!--            style=""-->
+<!--          >-->
+<!--            <el-option v-for="item in supplierList" :key="item.id" :label="item.name" :value="item.id"/>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="" prop="pinyinCode">-->
+<!--          <el-input-->
+<!--            v-model="queryParams.pinyinCode"-->
+<!--            placeholder="拼音码"-->
+<!--            clearable-->
+<!--            style=""-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--          />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="" prop="goodsNo">-->
+<!--          <el-input-->
+<!--            v-model="queryParams.goodsNo"-->
+<!--            placeholder="条形码"-->
+<!--            clearable-->
+<!--            style=""-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--          />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="" prop="shelfNumber">-->
+<!--          <el-input-->
+<!--            v-model="queryParams.shelfNumber"-->
+<!--            placeholder="货架号"-->
+<!--            clearable-->
+<!--            style=""-->
+<!--            @keyup.enter.native="handleQuery"-->
+<!--          />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="" prop="status">-->
+<!--          <el-select-->
+<!--            v-model="queryParams.status"-->
+<!--            placeholder="上架状态"-->
+<!--            clearable-->
+<!--            style=""-->
+<!--          >-->
+<!--            <el-option label="上架" value="qy"/>-->
+<!--            <el-option label="下架" value="jy"/>-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <el-form-item style="float: right;">
           <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
           <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
@@ -95,32 +100,34 @@
                 @selection-change="handleSelectionChange" :default-sort="defaultSort"
                 @sort-change="handleSortChange">
         <el-table-column type="index" width="80" align="center" label="序号"/>
+        <el-table-column label="商品名称" align="center" prop="name" width="160" />
+        <el-table-column label="品类名称" align="center" prop="cvsGoodId" width="160">
+          <template slot-scope="scope">
+            <span>{{ getName(cvsGoodList, scope.row.cvsGoodId) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="条形码" align="center" prop="goodsNo" width="160" />
         <el-table-column label="供应商" align="center" prop="supplierId">
           <template slot-scope="scope">
             <span>{{ getName(supplierList, scope.row.supplierId) }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="分类名称" align="center" prop="cvsGoodId" width="160">
-          <template slot-scope="scope">
-            <span>{{ getName(cvsGoodList, scope.row.cvsGoodId) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="商品名称" align="center" prop="name" width="160" />
-        <el-table-column label="条码" align="center" prop="goodsNo" width="160" />
         <el-table-column label="货架号" align="center" prop="shelfNumber" />
-        <el-table-column label="零售价" align="center" prop="retailPrice" />
+        <el-table-column label="商品规格" align="center" prop="description" />
         <el-table-column label="单位" align="center" prop="unit" />
+        <el-table-column label="零售价" align="center" prop="retailPrice" />
         <el-table-column label="当前库存" align="center" prop="stock" />
+        <el-table-column label="货损量" align="center" prop="stock" />
         <el-table-column label="当前成本价" align="center" prop="buyingPrice" />
-        <el-table-column label="成本金额" align="center" prop="costAmount" />
+        <el-table-column label="成本总金额" align="center" prop="costAmount" />
         <el-table-column label="状态" align="center" prop="status">
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.status=='qy'">上架</el-tag>
-            <el-tag type="info" v-if="scope.row.status=='jy'">下架</el-tag>
-<!--            <dict-tag :options="dict.type.zhzt" :value="scope.row.status"/>-->
+            <div v-if="scope.row.status=='qy'" style="color: #0DC291">已上架</div>
+            <div v-if="scope.row.status=='jy'" style="color: #F44522">已下架</div>
           </template>
         </el-table-column>
-        <el-table-column label="更新时间" align="center" prop="updateTime" width="200">
+        <el-table-column label="操作人" align="center" prop="updateTime" width="200"></el-table-column>
+        <el-table-column label="操作时间" align="center" prop="updateTime" width="200">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.updateTime) }}</span>
           </template>
@@ -256,6 +263,9 @@ export default {
         shelfNumber: '',
         status: '',
       },
+      dateRange: [],
+      beginTime: "",
+      endTime: "",
       queryParam: {
         page: 1,
         pageSize: 10,
@@ -332,7 +342,12 @@ export default {
     // 查询列表
     getList() {
       this.loading = true;
-      listStock(this.queryParams).then(response => {
+      let dateRange = []
+      if (this.beginTime && this.endTime) {
+        dateRange.push(this.beginTime.toLocaleDateString())
+        dateRange.push(this.endTime.toLocaleDateString())
+      }
+      listStock(this.addDateRange(this.queryParams, dateRange)).then(response => {
         this.list = response.data.records;
         this.total = response.data.total;
         this.loading = false;
@@ -362,6 +377,8 @@ export default {
       this.cvsGoodId = ""
       this.resetForm("queryForm");
       this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order);
+      this.beginTime = ''
+      this.endTime = ''
       this.handleQuery();
     },
     // 是否关闭弹框
diff --git a/fuintAdmin/src/views/convenienceStore/supplier.vue b/fuintAdmin/src/views/convenienceStore/supplier.vue
index edbc923f4..4e8d54271 100644
--- a/fuintAdmin/src/views/convenienceStore/supplier.vue
+++ b/fuintAdmin/src/views/convenienceStore/supplier.vue
@@ -5,7 +5,7 @@
         <el-form-item label="" prop="name">
           <el-input
             v-model="queryParams.name"
-            placeholder="供应商"
+            placeholder="请输入供应商名称"
             clearable
             style="width: 240px;"
             @keyup.enter.native="handleQuery"
@@ -14,7 +14,7 @@
         <el-form-item label="" prop="contacts">
           <el-input
             v-model="queryParams.contacts"
-            placeholder="联系人"
+            placeholder="请输入联系人"
             clearable
             style="width: 240px;"
             @keyup.enter.native="handleQuery"
@@ -23,7 +23,7 @@
         <el-form-item label="" prop="mobile">
           <el-input
             v-model="queryParams.mobile"
-            placeholder="联系电话"
+            placeholder="请输入联系电话"
             clearable
             style="width: 240px;"
             @keyup.enter.native="handleQuery"
@@ -35,7 +35,6 @@
           <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
           <el-button
             type="primary"
-            icon="el-icon-plus"
             @click="handleAdd"
             v-hasPermi="['convenienceStore:supplier:add']"
           >新增供应商</el-button>
@@ -63,12 +62,13 @@
             <span>{{ scope.row.address ? scope.row.address : '-' }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="备注信息" align="center" prop="remark">
+        <el-table-column label="备注" align="center" prop="remark">
           <template slot-scope="scope">
             <span>{{ scope.row.remark ? scope.row.remark : '-' }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="创建时间" align="center" width="160" prop="createTime">
+        <el-table-column label="操作人" prop="name" align="center"/>
+        <el-table-column label="操作时间" align="center" width="160" prop="createTime">
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.createTime) }}</span>
           </template>
@@ -78,14 +78,12 @@
             <el-button
               size="mini"
               type="text"
-              icon="el-icon-edit"
               @click="handleUpdate(scope.row)"
               v-hasPermi="['convenienceStore:supplier:update']"
             >修改</el-button>
             <el-button
               size="mini"
               type="text"
-              icon="el-icon-delete"
               @click="handleDelete(scope.row)"
               v-hasPermi="['convenienceStore:supplier:del']"
             >删除</el-button>
@@ -104,21 +102,23 @@
 
     <!-- 添加或修改对话框 -->
     <el-dialog :close-on-click-modal="false" :title="title" width="600px" style="margin-top: 5%" :visible.sync="open" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="90px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="95px">
         <el-row>
           <el-col :span="24">
-            <el-form-item label="供应商" prop="name" style="width: 420px">
+            <el-form-item label="供应商名称" prop="name" style="width: 100%">
               <el-input v-model="form.name" placeholder="请输入供应商名称" maxlength="30" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
+          <el-col :span="24">
             <el-form-item label="联系人" prop="contacts">
               <el-input v-model="form.contacts" placeholder="供应商联系人" maxlength="30"/>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+        </el-row>
+        <el-row>
+          <el-col :span="24">
             <el-form-item label="联系电话" prop="mobile">
               <el-input v-model="form.mobile" placeholder="供应商联系电话" maxlength="30"/>
             </el-form-item>
@@ -136,8 +136,8 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button @click="cancel">取消</el-button>
+        <el-button type="primary" @click="submitForm">保存</el-button>
       </div>
     </el-dialog>
   </div>
@@ -189,6 +189,15 @@ export default {
         name: [
           { required: true, message: "供应商名称不能为空", trigger: "blur" },
         ],
+        contacts: [
+          { required: true, message: "联系人不能为空", trigger: "blur" },
+        ],
+        mobile: [
+          { required: true, message: "联系电话不能为空", trigger: "blur" },
+        ],
+        address: [
+          { required: true, message: "联系地址不能为空", trigger: "blur" },
+        ],
       }
     }
   },
@@ -240,7 +249,7 @@ export default {
     // 删除按钮操作
     handleDelete(row) {
       const name = row.name
-      this.$modal.confirm('确定删除"' + name + '"的供应商信息？').then(function() {
+      this.$modal.confirm('是否删除本条数据，删除后无法恢复！').then(function() {
         return delSupplier(row.id);
       }).then(() => {
         this.queryParams.page = 1
diff --git a/fuintAdmin/src/views/coupon/confirm/index.vue b/fuintAdmin/src/views/coupon/confirm/index.vue
index 9d7f6b022..e31b3e66c 100644
--- a/fuintAdmin/src/views/coupon/confirm/index.vue
+++ b/fuintAdmin/src/views/coupon/confirm/index.vue
@@ -17,7 +17,7 @@
     </div>
 
     <!--核销对话框 start-->
-    <el-dialog title="核销卡券" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
+    <el-dialog :close-on-click-modal="false" title="核销卡券" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
       <el-form ref="confirmForm" :model="confirmForm" :rules="confirmRules" label-width="120px">
         <el-row>
           <el-col :span="24">
diff --git a/fuintAdmin/src/views/coupon/coupon/index.vue b/fuintAdmin/src/views/coupon/coupon/index.vue
index 48e804ae6..146665f58 100644
--- a/fuintAdmin/src/views/coupon/coupon/index.vue
+++ b/fuintAdmin/src/views/coupon/coupon/index.vue
@@ -139,7 +139,7 @@
     />
 
     <!-- 添加或修改卡券对话框 start-->
-    <el-dialog :title="title" :visible.sync="open" class="common-dialog" width="800px" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" class="common-dialog" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="140px">
         <el-row>
           <el-col :span="24">
@@ -439,7 +439,7 @@
     <!-- 添加或修改卡券对话框 end-->
 
     <!--发券对话框 start-->
-    <el-dialog title="发放卡券" :visible.sync="openSendCouponDialog" class="common-dialog" width="700px" append-to-body>
+    <el-dialog :close-on-click-modal="false" title="发放卡券" :visible.sync="openSendCouponDialog" class="common-dialog" width="700px" append-to-body>
       <el-form ref="sendForm" :model="sendForm" :rules="sendFormRules" label-width="120px">
         <el-row>
           <el-col :span="24">
diff --git a/fuintAdmin/src/views/coupon/give/index.vue b/fuintAdmin/src/views/coupon/give/index.vue
index f1065a97b..6d96745ce 100644
--- a/fuintAdmin/src/views/coupon/give/index.vue
+++ b/fuintAdmin/src/views/coupon/give/index.vue
@@ -111,7 +111,7 @@
       @pagination="getList"
     />
 
-    <el-dialog title="转赠明细" :visible.sync="open" class="common-dialog" width="800px" append-to-body>
+    <el-dialog :close-on-click-modal="false" title="转赠明细" :visible.sync="open" class="common-dialog" width="800px" append-to-body>
       <el-table ref="tables" v-loading="loading" :data="itemList">
         <el-table-column label="ID" align="center" prop="id" width="60"/>
         <el-table-column label="手机号" align="center" width="120" prop="mobile"/>
diff --git a/fuintAdmin/src/views/coupon/group/index.vue b/fuintAdmin/src/views/coupon/group/index.vue
index 213bd3fef..4d7cac477 100644
--- a/fuintAdmin/src/views/coupon/group/index.vue
+++ b/fuintAdmin/src/views/coupon/group/index.vue
@@ -100,7 +100,7 @@
     />
 
     <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="24">
diff --git a/fuintAdmin/src/views/duty/index.vue b/fuintAdmin/src/views/duty/index.vue
index dc3df1c92..2b0b5bb88 100644
--- a/fuintAdmin/src/views/duty/index.vue
+++ b/fuintAdmin/src/views/duty/index.vue
@@ -93,7 +93,7 @@
     </div>
 
     <!-- 添加或修改角色配置对话框 -->
-    <el-dialog :title="title" :visible.sync="openDuty" width="700px" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="openDuty" width="700px" append-to-body>
       <el-form ref="form1" :model="form1" :rules="rules1" label-width="100px">
         <el-form-item label="角色名称" prop="roleName">
           <el-input v-model="form1.roleName" @input="$forceUpdate()" style="width: 300px" placeholder="请输入角色名称"/>
diff --git a/fuintAdmin/src/views/fleet/tab/fleetInfo.vue b/fuintAdmin/src/views/fleet/tab/fleetInfo.vue
index 3afdc90aa..f3e5506f3 100644
--- a/fuintAdmin/src/views/fleet/tab/fleetInfo.vue
+++ b/fuintAdmin/src/views/fleet/tab/fleetInfo.vue
@@ -128,7 +128,7 @@
       />
     </div>
     <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="32%" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="32%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="95px">
         <el-form-item label="车队名称" prop="fleetName">
           <el-input v-model="form.fleetName" placeholder="请输入车队名称" maxlength="30" />
@@ -186,7 +186,7 @@
       </div>
     </el-dialog>
     <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open1" width="32%" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open1" width="32%" append-to-body>
       <el-form ref="form1" :model="form1" :rules="rules" label-width="80px">
         <el-form-item label="车队名称" prop="fleetName">
           <el-input v-model="form1.fleetName" placeholder="请输入车队名称" maxlength="50"/>
diff --git a/fuintAdmin/src/views/fleet/tab/fleetMember.vue b/fuintAdmin/src/views/fleet/tab/fleetMember.vue
index 29462bec9..d1de3ce81 100644
--- a/fuintAdmin/src/views/fleet/tab/fleetMember.vue
+++ b/fuintAdmin/src/views/fleet/tab/fleetMember.vue
@@ -149,7 +149,7 @@
     </div>
 
     <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="30%" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="30%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="车队名称" prop="fleetId">
           <el-select v-model="form.fleetId" placeholder="请选择车队名称" style="width: 100%;">
@@ -202,7 +202,7 @@
       </div>
     </el-dialog>
     <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open1" width="30%" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open1" width="30%" append-to-body>
       <el-form ref="form1" :model="form1" :rules="rules" label-width="80px">
 
         <el-form-item label="副卡额度" prop="secondaryCardLimit">
@@ -248,7 +248,7 @@
     </el-dialog>
 
     <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open2" width="30%" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open2" width="30%" append-to-body>
       <el-form ref="form2" :model="form2" :rules="rules" label-width="80px">
 
         <el-form-item label="副卡额度" prop="secondaryCardLimit">
@@ -341,7 +341,7 @@
 
 
     <!--    批量导入结果-->
-    <el-dialog width="400px" style="margin-top: 150px" :title="title" :visible.sync="openResult" append-to-body>
+    <el-dialog :close-on-click-modal="false" width="400px" style="margin-top: 150px" :title="title" :visible.sync="openResult" append-to-body>
       <div class="huiyuan">
         认证总数：<span class="num">{{result.total}}</span> 人
       </div>
diff --git a/fuintAdmin/src/views/goods/cate/index.vue b/fuintAdmin/src/views/goods/cate/index.vue
index 6a2158663..26f26c19e 100644
--- a/fuintAdmin/src/views/goods/cate/index.vue
+++ b/fuintAdmin/src/views/goods/cate/index.vue
@@ -111,7 +111,7 @@
     />
 
     <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" class="common-dialog" width="700px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="24">
diff --git a/fuintAdmin/src/views/member/balanceRecharge.vue b/fuintAdmin/src/views/member/balanceRecharge.vue
index 61a8edf27..c712103a8 100644
--- a/fuintAdmin/src/views/member/balanceRecharge.vue
+++ b/fuintAdmin/src/views/member/balanceRecharge.vue
@@ -1,6 +1,6 @@
 <template>
   <!-- 充值对话框 -->
-  <el-dialog class="common-dialog" title="余额充值/扣减" :visible.sync="showDialog" width="700px" @close="cancel" destroy-on-close>
+  <el-dialog :close-on-click-modal="false" class="common-dialog" title="余额充值/扣减" :visible.sync="showDialog" width="700px" @close="cancel" destroy-on-close>
     <el-form ref="form" :model="form" :rules="rules" label-width="120px">
       <el-row>
         <el-col :span="24">
diff --git a/fuintAdmin/src/views/member/creditIndex.vue b/fuintAdmin/src/views/member/creditIndex.vue
index 8407408b6..ad57ba3c5 100644
--- a/fuintAdmin/src/views/member/creditIndex.vue
+++ b/fuintAdmin/src/views/member/creditIndex.vue
@@ -113,7 +113,7 @@
     </div>
 
     <!--      新增挂账单位信息-->
-    <el-dialog :title="title" :visible.sync="open1" width="700px" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open1" width="700px" append-to-body>
       <el-form ref="formName" :model="form1" :rules="rules1" label-width="120px">
         <el-row>
           <el-col :span="24">
diff --git a/fuintAdmin/src/views/member/index.vue b/fuintAdmin/src/views/member/index.vue
index afc3f5875..0bb93259d 100644
--- a/fuintAdmin/src/views/member/index.vue
+++ b/fuintAdmin/src/views/member/index.vue
@@ -406,7 +406,7 @@
     <div style="width: 100%;height: 10px;"></div>
 
     <!--    添加会员信息，选择是否批量录入-->
-    <el-dialog :title="title" width="40%" :visible.sync="openUser" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="title" width="40%" :visible.sync="openUser" append-to-body>
       <el-alert
         type="info"
         :closable="false">
diff --git a/fuintAdmin/src/views/member/manage.vue b/fuintAdmin/src/views/member/manage.vue
index 03166ff43..10215afb8 100644
--- a/fuintAdmin/src/views/member/manage.vue
+++ b/fuintAdmin/src/views/member/manage.vue
@@ -366,7 +366,7 @@
 
 
     <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="35%" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="35%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
 
         <el-form-item label="分组名称" prop="groupName">
diff --git a/fuintAdmin/src/views/member/pointRecharge.vue b/fuintAdmin/src/views/member/pointRecharge.vue
index aba41f934..78b16f753 100644
--- a/fuintAdmin/src/views/member/pointRecharge.vue
+++ b/fuintAdmin/src/views/member/pointRecharge.vue
@@ -1,6 +1,6 @@
 <template>
   <!-- 积分变更对话框 -->
-  <el-dialog title="积分变更" :visible.sync="showDialog" class="common-dialog" width="700px" @close="cancel" destroy-on-close>
+  <el-dialog :close-on-click-modal="false" title="积分变更" :visible.sync="showDialog" class="common-dialog" width="700px" @close="cancel" destroy-on-close>
     <el-form ref="form" :model="form" :rules="rules" label-width="120px">
       <el-row>
         <el-col :span="24">
diff --git a/fuintAdmin/src/views/member/userLabel.vue b/fuintAdmin/src/views/member/userLabel.vue
index 9f09cdbef..0a26fe51b 100644
--- a/fuintAdmin/src/views/member/userLabel.vue
+++ b/fuintAdmin/src/views/member/userLabel.vue
@@ -96,7 +96,7 @@
     </div>
 
     <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="30%" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="30%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
 
         <el-form-item label="标签名称" prop="labelName">
diff --git a/fuintAdmin/src/views/order/index.vue b/fuintAdmin/src/views/order/index.vue
index 6057d74c4..3cde47cff 100644
--- a/fuintAdmin/src/views/order/index.vue
+++ b/fuintAdmin/src/views/order/index.vue
@@ -108,7 +108,7 @@
     </el-card>
 
     <!-- 商品购买详情 -->
-    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="700px" append-to-body>
       <el-table ref="tables" v-loading="loading" :data="goodsList" :default-sort="defaultSort">
         <el-table-column label="商品名称" align="center" prop="name"/>
         <el-table-column label="商品数量" align="center" prop="num"/>
diff --git a/fuintAdmin/src/views/order/order_Cashier.vue b/fuintAdmin/src/views/order/order_Cashier.vue
index e2d86d266..8418d6336 100644
--- a/fuintAdmin/src/views/order/order_Cashier.vue
+++ b/fuintAdmin/src/views/order/order_Cashier.vue
@@ -225,7 +225,7 @@
     </el-card>
 
     <!--    订单详情-->
-    <el-dialog
+    <el-dialog :close-on-click-modal="false"
       title="订单详情"
       :visible.sync="dialogVisible">
       <div>
diff --git a/fuintAdmin/src/views/order/order_Goods.vue b/fuintAdmin/src/views/order/order_Goods.vue
index b8ca0ad16..edccd9051 100644
--- a/fuintAdmin/src/views/order/order_Goods.vue
+++ b/fuintAdmin/src/views/order/order_Goods.vue
@@ -212,7 +212,7 @@
       </el-dialog>
 
       <!-- 商品购买详情 -->
-      <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+      <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="700px" append-to-body>
         <el-table ref="tables" v-loading="loading" :data="goodsList" :default-sort="defaultSort">
           <el-table-column label="商品名称" align="center" prop="name"/>
           <el-table-column label="商品数量" align="center" prop="num"/>
diff --git a/fuintAdmin/src/views/order/order_Ordinary.vue b/fuintAdmin/src/views/order/order_Ordinary.vue
index 04b18ac0c..0161a5562 100644
--- a/fuintAdmin/src/views/order/order_Ordinary.vue
+++ b/fuintAdmin/src/views/order/order_Ordinary.vue
@@ -185,7 +185,7 @@
     </el-card>
 
     <!--    订单退款-->
-    <el-dialog
+    <el-dialog :close-on-click-modal="false"
       title="订单退款"
       width="25%"
       :visible.sync="dialogRefund">
diff --git a/fuintAdmin/src/views/order/order_Vip.vue b/fuintAdmin/src/views/order/order_Vip.vue
index baf3a59b4..7eba493fa 100644
--- a/fuintAdmin/src/views/order/order_Vip.vue
+++ b/fuintAdmin/src/views/order/order_Vip.vue
@@ -129,7 +129,7 @@
     </el-card>
 
     <!--    订单退款-->
-    <el-dialog
+    <el-dialog :close-on-click-modal="false"
       title="订单退款"
       width="25%"
       :visible.sync="dialogRefund">
diff --git a/fuintAdmin/src/views/power/linkManage.vue b/fuintAdmin/src/views/power/linkManage.vue
index 75c5f8c5b..3c7a6a6da 100644
--- a/fuintAdmin/src/views/power/linkManage.vue
+++ b/fuintAdmin/src/views/power/linkManage.vue
@@ -75,7 +75,7 @@
     </div>
 
     <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="30%" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="30%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
 
         <el-form-item label="页面/功能名称" prop="pageName">
diff --git a/fuintAdmin/src/views/power/message.vue b/fuintAdmin/src/views/power/message.vue
index 8443df6a4..d5d16c9dd 100644
--- a/fuintAdmin/src/views/power/message.vue
+++ b/fuintAdmin/src/views/power/message.vue
@@ -217,7 +217,7 @@
         @pagination="messageRecordListss"
       />
       <!-- 弹出框 -->
-      <el-dialog
+      <el-dialog :close-on-click-modal="false"
         title="短信接收人"
         :visible.sync="dialogVisible"
         width="50%">
@@ -338,7 +338,7 @@
         @pagination="getMessageCostList"
       />
 
-      <el-dialog
+      <el-dialog :close-on-click-modal="false"
         title="短信充值记录"
         :visible.sync="rechargedialogVisible"
         width="50%">
diff --git a/fuintAdmin/src/views/power/payment/index.vue b/fuintAdmin/src/views/power/payment/index.vue
index 358f9a6ad..653282679 100644
--- a/fuintAdmin/src/views/power/payment/index.vue
+++ b/fuintAdmin/src/views/power/payment/index.vue
@@ -407,7 +407,7 @@
         </el-table-column>
       </el-table>
     </div>
-    <el-dialog :title="addMerchantTitile" :visible.sync="addMerchants" width="550px">
+    <el-dialog :close-on-click-modal="false" :title="addMerchantTitile" :visible.sync="addMerchants" width="550px">
       <el-form :model="form" ref="formAdd" :rules="rules"  :inline="true">
         <el-form-item label="所属机构" :label-width="formLabelWidth" prop="deptId">
           <el-select v-model="form.deptId+''" disabled placeholder="请选择所属机构" style="width: 350px">
@@ -454,7 +454,7 @@
         <el-button type="primary" @click="submitMerchant">确 定</el-button>
       </div>
     </el-dialog>
-    <el-dialog :title="Ruletitle" :visible.sync="addRule">
+    <el-dialog :close-on-click-modal="false" :title="Ruletitle" :visible.sync="addRule">
       <el-form :model="formRule" ref="formRule" :rules="rules">
         <el-form-item label="规则名称" :label-width="formLabelWidth" prop="ruleName">
           <el-input v-model="formRule.ruleName" placeholder="请输入规则名称" autocomplete="off" style="width: 350px"></el-input>
@@ -546,7 +546,7 @@
         <el-button type="primary" @click="submitAddRule">确 定</el-button>
       </div>
     </el-dialog>
-    <el-dialog title="启用" :visible.sync="Enable" width="650px">
+    <el-dialog :close-on-click-modal="false" title="启用" :visible.sync="Enable" width="650px">
       <el-form :model="formRule">
         <el-form-item label="开始时间" required>
           <div style="display: flex;align-items: center;">
@@ -568,7 +568,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog :title="title" :visible.sync="dialogVisible" width="30%">
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="dialogVisible" width="30%">
       <el-form :model="form1" ref="form1" :rules="rules" label-width="100px">
         <el-form-item label="支付通道" :label-width="formLabelWidth" prop="merchantName" width="300px">
           <el-select
@@ -604,7 +604,7 @@
       </span>
     </el-dialog>
 
-    <el-dialog :title="title" :visible.sync="show" width="25%" style="margin-top: 200px">
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="show" width="25%" style="margin-top: 200px">
       <span>请输入备注信息</span>
       <el-input placeholder="请输入备注信息" style="margin-top: 20px"
                 v-model="merchantConfig.remark"
@@ -617,7 +617,7 @@
       </span>
     </el-dialog>
     <!--    编辑通道规则-->
-    <el-dialog :title="title" :visible.sync="dialogFormVisible"
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="dialogFormVisible"
                width="30%">
       <el-form :model="form" ref="form">
         <el-form-item label="支付通道" :label-width="formLabelWidth" width="300px">
diff --git a/fuintAdmin/src/views/staff/device/tab/oilEngineList.vue b/fuintAdmin/src/views/staff/device/tab/oilEngineList.vue
index a2222a251..9603b42da 100644
--- a/fuintAdmin/src/views/staff/device/tab/oilEngineList.vue
+++ b/fuintAdmin/src/views/staff/device/tab/oilEngineList.vue
@@ -85,7 +85,7 @@
     </el-card>
 
     <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="30%" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="30%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
 
         <el-form-item label="设备名称" prop="realName">
diff --git a/fuintAdmin/src/views/staff/device/tab/printList.vue b/fuintAdmin/src/views/staff/device/tab/printList.vue
index 6339861a4..f9b15a8bd 100644
--- a/fuintAdmin/src/views/staff/device/tab/printList.vue
+++ b/fuintAdmin/src/views/staff/device/tab/printList.vue
@@ -110,7 +110,7 @@
     </el-card>
 
     <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="30%" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="30%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
 
         <el-form-item label="设备名称" prop="realName">
diff --git a/fuintAdmin/src/views/staff/list.vue b/fuintAdmin/src/views/staff/list.vue
index 98fd39e66..39cc42cc8 100644
--- a/fuintAdmin/src/views/staff/list.vue
+++ b/fuintAdmin/src/views/staff/list.vue
@@ -229,7 +229,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog
+    <el-dialog :close-on-click-modal="false"
       :title="title"
       :visible.sync="dialogVisible"
       style="margin-top: 100px"
@@ -243,7 +243,7 @@
       </span>
     </el-dialog>
 
-    <el-dialog title="码牌列表" :visible.sync="openShow" width="800px" append-to-body>
+    <el-dialog :close-on-click-modal="false" title="码牌列表" :visible.sync="openShow" width="800px" append-to-body>
 
       <div class="wrap-box">
         <div class="gang-box">
diff --git a/fuintAdmin/src/views/stock/index.vue b/fuintAdmin/src/views/stock/index.vue
index a29c3472f..b7b78f600 100644
--- a/fuintAdmin/src/views/stock/index.vue
+++ b/fuintAdmin/src/views/stock/index.vue
@@ -113,7 +113,7 @@
       @pagination="getList"
     />
     <!--编辑商品库存-->
-    <el-dialog :title="title" :visible.sync="open" class="common-dialog" width="80%" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" class="common-dialog" width="80%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="24">
diff --git a/fuintAdmin/src/views/stock/selectGoodsDialog.vue b/fuintAdmin/src/views/stock/selectGoodsDialog.vue
index dd5e9752b..e18b1c912 100644
--- a/fuintAdmin/src/views/stock/selectGoodsDialog.vue
+++ b/fuintAdmin/src/views/stock/selectGoodsDialog.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog class="common-dialog" title="选择商品" :visible="showDialog" @close="close" width="70%" destroy-on-close>
+  <el-dialog :close-on-click-modal="false" class="common-dialog" title="选择商品" :visible="showDialog" @close="close" width="70%" destroy-on-close>
     <el-form :model="params" ref="queryForm" class="main-search" size="small" :inline="true" label-width="100px">
       <el-form-item label="商品关键字" prop="keyword">
         <el-input
diff --git a/fuintAdmin/src/views/store/list.vue b/fuintAdmin/src/views/store/list.vue
index 26cf87ea4..a79dec6e0 100644
--- a/fuintAdmin/src/views/store/list.vue
+++ b/fuintAdmin/src/views/store/list.vue
@@ -102,7 +102,7 @@
     />
 
     <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open" class="common-dialog" width="800px" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" class="common-dialog" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="24">
diff --git a/fuintAdmin/src/views/tool/gen/importTable.vue b/fuintAdmin/src/views/tool/gen/importTable.vue
index d8fe9dc29..fe2bbb7ff 100644
--- a/fuintAdmin/src/views/tool/gen/importTable.vue
+++ b/fuintAdmin/src/views/tool/gen/importTable.vue
@@ -1,6 +1,6 @@
 <template>
   <!-- 导入表 -->
-  <el-dialog title="导入表" :visible.sync="visible" width="800px" top="5vh" append-to-body>
+  <el-dialog :close-on-click-modal="false" title="导入表" :visible.sync="visible" width="800px" top="5vh" append-to-body>
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
       <el-form-item label="表名称" prop="tableName">
         <el-input
diff --git a/fuintAdmin/src/views/tool/gen/index.vue b/fuintAdmin/src/views/tool/gen/index.vue
index 65cc782ab..7c5031106 100644
--- a/fuintAdmin/src/views/tool/gen/index.vue
+++ b/fuintAdmin/src/views/tool/gen/index.vue
@@ -158,7 +158,7 @@
       @pagination="getList"
     />
     <!-- 预览界面 -->
-    <el-dialog :title="preview.title" :visible.sync="preview.open" width="80%" top="5vh" append-to-body class="scrollbar">
+    <el-dialog :close-on-click-modal="false" :title="preview.title" :visible.sync="preview.open" width="80%" top="5vh" append-to-body class="scrollbar">
       <el-tabs v-model="preview.activeName">
         <el-tab-pane
           v-for="(value, key) in preview.data"
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/entity/LJGoods.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/entity/LJGoods.java
index 9f0d5e230..2ba125058 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/entity/LJGoods.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/entity/LJGoods.java
@@ -118,6 +118,10 @@ public class LJGoods extends BaseEntity implements Serializable {
      * 可否使用兑换券兑换；0可以，1不可以
      */
     private String canUseExchange;
+    /**
+     * 商品规格
+     */
+    private String goodsSpecs;
 
 }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/StockStatisticMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/StockStatisticMapper.xml
index aa0b9019b..1502394e6 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/StockStatisticMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/StockStatisticMapper.xml
@@ -33,6 +33,12 @@
             <if test="stock.status != null and stock.status != ''">
                 and mg.status = #{stock.status}
             </if>
+            <if test="allOrderInfo.params.beginTime != null and allOrderInfo.params.beginTime != ''"><!-- 开始时间检索 -->
+                and date_format(mg.update_time,'%y%m%d') &gt;= date_format(#{allOrderInfo.params.beginTime},'%y%m%d')
+            </if>
+            <if test="allOrderInfo.params.endTime != null and allOrderInfo.params.endTime != ''"><!-- 结束时间检索 -->
+                and date_format(mg.update_time,'%y%m%d') &lt;= date_format(#{allOrderInfo.params.endTime},'%y%m%d')
+            </if>
         </where>
         order by st.update_time desc
     </select>
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/controller/SysBannerController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/controller/SysBannerController.java
index decdbe347..3fe1b18d2 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/controller/SysBannerController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/sys/controller/SysBannerController.java
@@ -14,6 +14,7 @@ import io.lettuce.core.dynamic.annotation.Param;
 
 
 import javax.annotation.Resource;
+import java.util.Objects;
 
 /**
  * 存储Banner信息的表(SysBanner)表控制层
@@ -91,9 +92,10 @@ public class SysBannerController extends BaseController {
      */
     @PutMapping
     public ResponseObject edit(@RequestBody SysBanner sysBanner) {
-        try {
+//        try {
 //          先查询名称是否存在
-            if(this.sysBannerService.queryByName(sysBanner.getBannerName())!=null){
+            SysBanner sysBanner1 = this.sysBannerService.queryByName(sysBanner.getBannerName());
+            if(sysBanner1 !=null && !Objects.equals(sysBanner1.getId(), sysBanner.getId())){
                 return getFailureResult(500,"名称已存在");
             }
             SysLog sysLog =new SysLog();
@@ -101,7 +103,7 @@ public class SysBannerController extends BaseController {
             sysLog.setMoudle("banner配置");
             sysLog.setContent("更新banner配置");
             sysLogService.saveVo(sysLog);
-        }catch (Exception ignored){}
+//        }catch (Exception ignored){}
         return getSuccessResult(this.sysBannerService.update(sysBanner));
     }
 
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue b/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue
index f98cf6105..6f4d421e7 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue
@@ -303,7 +303,7 @@
     </el-drawer>
 
 <!--      新增挂账记录-->
-    <el-dialog title="新增挂账记录" :visible.sync="open" width="700px" append-to-body>
+    <el-dialog :close-on-click-modal="false" title="新增挂账记录" :visible.sync="open" width="700px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="24">
@@ -351,7 +351,7 @@
     </el-dialog>
 
 <!--      新增挂账单位信息-->
-    <el-dialog title="新增挂账单位" :visible.sync="open1" width="700px" append-to-body>
+    <el-dialog :close-on-click-modal="false" title="新增挂账单位" :visible.sync="open1" width="700px" append-to-body>
       <el-form ref="formName" :model="form1" :rules="rules1" label-width="120px">
         <el-row>
           <el-col :span="24">
@@ -439,7 +439,7 @@
     </el-dialog>
 
 <!--      挂账归还-->
-    <el-dialog title="挂账归还" :visible.sync="open2" width="700px" append-to-body>
+    <el-dialog :close-on-click-modal="false" title="挂账归还" :visible.sync="open2" width="700px" append-to-body>
       <el-descriptions class="margin-top" :column="2" border>
         <el-descriptions-item content-width="100%">
           <template slot="label">
@@ -594,7 +594,7 @@
     </el-dialog>
 
 <!--      批量挂账归还-->
-    <el-dialog title="批量挂账归还" :visible.sync="open3" append-to-body>
+    <el-dialog :close-on-click-modal="false" title="批量挂账归还" :visible.sync="open3" append-to-body>
       <div>
         <el-table
           ref="multipleTable"
@@ -651,7 +651,7 @@
     </el-dialog>
 
 <!--    批量挂账归还-->
-    <el-dialog title="挂账归还" :visible.sync="open4" width="700px" append-to-body>
+    <el-dialog :close-on-click-modal="false" title="挂账归还" :visible.sync="open4" width="700px" append-to-body>
       <el-form ref="formName" :model="form4" label-width="80px">
         <el-row>
           <el-col :span="24">
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
index 9a8138478..9e0997019 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
@@ -248,7 +248,7 @@
       </div>
     </div>
     <!--    弹窗-->
-    <el-dialog
+    <el-dialog :close-on-click-modal="false"
       title="送券"
       :visible.sync="freeTicket"
       width="800px"
@@ -291,7 +291,7 @@
 
 
     </el-dialog>
-    <el-dialog
+    <el-dialog :close-on-click-modal="false"
       title="新增会员"
       :visible.sync="newMember"
       width="439px"
@@ -307,7 +307,7 @@
         <el-button type="primary" @click="handleDownloadqrCode('collection')">下载二维码</el-button>
       </span>
     </el-dialog>
-    <el-dialog
+    <el-dialog :close-on-click-modal="false"
       title="扫码支付"
       :visible.sync="ScanCodePayment"
       width="439px"
@@ -345,7 +345,7 @@
     <!--        <el-button type="primary" @click="cashPaymentClick()">确定收款</el-button>-->
     <!--      </span>-->
     <!--    </el-dialog>-->
-    <el-dialog
+    <el-dialog :close-on-click-modal="false"
       title="挂单"
       :visible.sync="hangingAnOrder"
       width="542px"
@@ -369,7 +369,7 @@
         <el-button type="primary" @click="pendingOrders()">确定挂单</el-button>
       </span>
     </el-dialog>
-    <el-dialog
+    <el-dialog :close-on-click-modal="false"
       title="支付结果"
       :visible.sync="paymentResults"
       width="439px"
@@ -396,7 +396,7 @@
         <el-button type="primary" @click="paymentResults = false">关闭（3s)</el-button>
       </span>
     </el-dialog>
-    <el-dialog
+    <el-dialog :close-on-click-modal="false"
       title="取单"
       :visible.sync="pickUpTheOrder"
       width="910px"
@@ -413,7 +413,7 @@
         <el-button type="primary" @click="getPendingOrdersList">取单</el-button>
       </span>
     </el-dialog>
-    <el-dialog
+    <el-dialog :close-on-click-modal="false"
       title="挂账"
       :visible.sync="accountPending"
       width="542px"
@@ -425,7 +425,7 @@
     <el-button type="primary" @click="addHangbill">确 定</el-button>
       </span>
     </el-dialog>
-    <el-dialog
+    <el-dialog :close-on-click-modal="false"
       title="会员充值"
       :visible.sync="memberRecharge"
       width="910px"
@@ -437,7 +437,7 @@
              <el-button type="primary" @click="rechargeConfirm()">确认充值</el-button>
       </span>
     </el-dialog>
-    <el-dialog
+    <el-dialog :close-on-click-modal="false"
       title="加油金额"
       :visible.sync="refuelingAmount"
       width="542px"
@@ -542,7 +542,7 @@
     </el-dialog>
 
 <!--    车队卡支付-->
-    <el-dialog
+    <el-dialog :close-on-click-modal="false"
       title="车队卡支付"
       :visible.sync="dialogVisible"
       width="30%">