Merge branch 'feature/eccs-upgrade' of lvjian/eccs into feature/eccs-upgrade

修复Eccs 20230515 bug

eccs-biz/src/main/resources/mapper/biz/mall/SalesDetailMapper.xml

@@ -137,6 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="edlp != null">edlp,</if>
             <if test="currentPrice != null">current_price,</if>
             <if test="costPrice != null">cost_price,</if>
+            <if test="taxPrice != null">tax_price,</if>
             <if test="taxRate != null">tax_rate,</if>
             <if test="productCategory != null">product_category,</if>
             <if test="supplierName != null">supplier_name,</if>
@@ -175,6 +176,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="edlp != null">#{edlp},</if>
         <if test="currentPrice != null">#{currentPrice},</if>
         <if test="costPrice != null">#{costPrice},</if>
+        <if test="taxPrice != null">#{taxPrice},</if>
         <if test="taxRate != null">#{taxRate},</if>
         <if test="productCategory != null">#{productCategory},</if>
         <if test="supplierName != null">#{supplierName},</if>

eccs-ui/src/views/mall/salesdetail/index.vue

@@ -152,12 +152,12 @@
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="修改人编号" align="center" prop="moderSn" />
+      <!-- <el-table-column label="修改人编号" align="center" prop="moderSn" />
       <el-table-column label="修改时间" align="center" prop="modTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.modTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -430,6 +430,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.dateRange = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },

eccs-ui/src/views/warehouse/invemng/index.vue

@@ -112,7 +112,7 @@
           v-hasPermi="['biz:invemng:export']"
         >导出</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           icon="el-icon-download"
@@ -120,7 +120,7 @@
           @click="openPullDialog"
           v-hasPermi="['biz:invemng:pull']"
         >拉取</el-button>
-      </el-col>
+      </el-col> -->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 

eccs-ui/src/views/warehouse/shopinve/index.vue

@@ -149,7 +149,7 @@
           v-hasPermi="['biz:shopinve:export']"
         >导出</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           icon="el-icon-download"
@@ -157,7 +157,7 @@
           @click="openPullDialog"
           v-hasPermi="['biz:storeinvemng:pull']"
         >拉取</el-button>
-      </el-col>
+      </el-col> -->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>