zuozhengqing
2023-10-19 6b2aa7f0bb3f43e040ae2e659009e3bee3f3db1c
Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into zzq
3个文件已修改
22 ■■■■ 已修改文件
src/assets/style/reset-element.scss 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/reportForm/inventoryReport/index.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/reportForm/locationReport/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/assets/style/reset-element.scss
@@ -65,8 +65,8 @@
.el-button--primary {
  color: #fff;
  background-color: $color-primary !important;
  border-color: $color-primary !important;
  background-color: $color-primary;
  border-color: $color-primary;
}
.el-pagination.is-background .el-pager li:not(.disabled).active {
@@ -81,6 +81,6 @@
}
.el-button--primary {
  color: #fff;
  background-color: #2a78fb !important;
  border-color: #2a78fb !important;
  background-color: #2a78fb;
  border-color: #2a78fb;
}
src/views/reportForm/inventoryReport/index.vue
@@ -46,20 +46,20 @@
            <template slot="tableButton">
              <el-table-column label="操作" width="220" align="center">
                <template slot-scope="scope">
                  <span @click="handleHistoryClick(scope.row)">
                  <span @click="handleHistoryClick(scope.row)" class="yes-cursor">
                    <i class="el-icon-refresh-left"></i>
                    <span>历史</span>
                  </span>
                  <span @click="handleAddGoods(scope)" class="margin_left_5px">
                  <span @click="handleAddGoods(scope)" class="margin_left_5px no-cursor">
                    <i class="el-icon-refresh"></i>
                    <span>补货</span>
                  </span>
                  <template>
                    <span @click="handleLocation(scope)" class="margin_left_5px">
                    <span @click="handleLocation(scope)" class="margin_left_5px yes-cursor">
                      <i class="el-icon-menu"></i>
                      <span>位置</span>
                    </span>
                    <span @click="handleForecast(scope)" class="margin_left_5px">
                    <span @click="handleForecast(scope)" class="margin_left_5px no-cursor">
                      <i class="el-icon-s-data"></i>
                      <span>预测</span>
                    </span>
@@ -279,7 +279,7 @@
      this.getInventoryData({
        page: 1,
        pageSize: this.pagerOptions.pageSize,
        keyWord:val,
        keyWord: val
      })
    },
    // 行点击
src/views/reportForm/locationReport/index.vue
@@ -24,11 +24,11 @@
          <template slot="tableButton">
            <el-table-column label="操作" width="210" align="center">
              <template slot-scope="scope">
                <span @click="handleHistoryClick(scope.row)">
                <span @click="handleHistoryClick(scope.row)" class="yes-cursor">
                  <i class="el-icon-refresh-left"></i>
                  <span>历史</span>
                </span>
                <span @click="handleAddGoods(scope)" class="margin_left_5px">
                <span @click="handleAddGoods(scope)" class="margin_left_5px no-cursor">
                  <i class="el-icon-refresh"></i>
                  <span>补货</span>
                </span>