Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into dev

zuozhengqing

2023-10-28 c356ebfc46d6f98afb6eebc252db2db6718e25f2

Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into dev

 .env

New file
@@ -0,0 +1,18 @@
# 所有环境默认

# 页面 title 前缀
VUE_APP_TITLE=Basic
NODE_ENV=development
VUE_APP_BATH_PATH='http://192.168.20.119:9085'
# 网络请求公用地址
VUE_APP_API=/api/

# 仓库地址
VUE_APP_REPO=""

# 国际化配置
VUE_APP_I18N_LOCALE=zh-chs
VUE_APP_I18N_FALLBACK_LOCALE=en

# element 颜色
VUE_APP_ELEMENT_COLOR=#2A78FB

 .env.development

New file
@@ -0,0 +1,8 @@
# 开发环境
# 指定构建模式
NODE_ENV=development

# 页面 title 前缀
VUE_APP_TITLE=Basic
VUE_APP_BATH_PATH='http://192.168.20.119:9085'


 .env.preview

New file
@@ -0,0 +1,12 @@
# 构建预览页面

# 指定构建模式
NODE_ENV=production

# 标记当前构建方式
VUE_APP_BUILD_MODE=PREVIEW
VUE_APP_BATH_PATH='http://www.fai365.com:9083
VUE_APP_SCOURCE_LINK=TRUE

# 部署路径
VUE_APP_PUBLIC_PATH=/

 package.json

@@ -5,7 +5,9 @@
  "scripts": {
    "serve": "vue-cli-service serve",
    "build": "vue-cli-service build",
    "lint": "vue-cli-service lint"
    "lint": "vue-cli-service lint",
    "build:preview": "NODE_OPTIONS=--max_old_space_size=4096 vue-cli-service build --mode preview",
    "test:unit": "vue-cli-service test:unit"
  },
  "dependencies": {
    "axios": "^1.4.0",

 src/components/layout/components/appsidebar/index.vue

@@ -30,6 +30,7 @@
          </template>
          <el-menu-item index="/productManage/product">产品</el-menu-item>
          <el-menu-item index="/productManage/productCategory">产品类别</el-menu-item>
          <el-menu-item index="/productManage/reorderRules">重订货规则</el-menu-item>
        </el-submenu>
        <el-submenu index="3">
          <template slot="title">

 src/components/makepager/CommonFormTableView.vue

@@ -130,18 +130,16 @@
                    style="width: 63%"
                    @change="selCommonClick"
                  >
                    <el-option v-for="item in selOptions" :key="item.id" :label="item.name" :value="item"> </el-option>
                    <el-option v-for="(item, index) in selOptions" :key="index" :label="item.name" :value="item">
                    </el-option>
                  </el-select>
                </div>
              </el-form-item>
              <!-- 位置 -->
              <el-form-item v-else-if="item.location" label=" " :prop="'tableData.' + scope.$index + '.' + item.prop">
                <div class="custom-name">
                  <span v-if="scope.row.isEdit || scope.row.editable">{{
                    scope.row[item.prop]?.label ?? scope.row[item.prop]
                  }}</span>
                  <el-select
                    v-else
                    v-if="!scope.row.isEdit && scope.row.isOrder"
                    v-model="scope.row[item.prop]"
                    placeholder="请选择"
                    size="mini"
@@ -160,6 +158,9 @@
                    >
                    </el-option>
                  </el-select>
                  <span v-else-if="scope.row.isEdit || scope.row.editable">{{
                    scope.row[item.prop]?.label ?? scope.row[item.prop]
                  }}</span>
                </div>
              </el-form-item>
              <!-- 产品 -->
@@ -179,8 +180,8 @@
                    "
                  >
                    <el-option
                      v-for="item in productNameOptions"
                      :key="item.id"
                      v-for="(item, index) in productNameOptions"
                      :key="index"
                      :label="item.name"
                      :value="{
                        value: item.id,
@@ -238,12 +239,38 @@
                  </el-select> -->
                </div>
              </el-form-item>
              <!-- 路线 -->
              <el-form-item v-else-if="item.route" label=" " :prop="'tableData.' + scope.$index + '.' + item.prop">
                <div class="custom-name">
                  <span v-if="scope.row.isEdit">{{ scope.row[item.prop]?.label ?? scope.row[item.prop] }}</span>
                  <el-select
                    v-else
                    v-model="scope.row[item.prop]"
                    placeholder="请选择"
                    size="mini"
                    style="width: 80%"
                    @change="
                      (val) => {
                        selRoteClick(val, item.prop)
                      }
                    "
                  >
                    <el-option
                      v-for="(item, index) in selRouteOptions"
                      :key="index"
                      :label="item.name"
                      :value="{ value: item.id, label: item.name }"
                    >
                    </el-option>
                  </el-select>
                </div>
              </el-form-item>
              <!-- 公司 -->
              <el-form-item v-else-if="item.company" label=" " :prop="'tableData.' + scope.$index + '.' + item.prop">
                <div class="custom-name">
                  <span v-if="scope.row.isEdit">{{ scope.row[item.prop] }}</span>
                  <el-select v-else v-model="scope.row[item.prop]" placeholder="请选择" size="mini" style="width: 80%">
                    <el-option v-for="item in companyOptions" :key="item.id" :label="item.name" :value="item">
                    <el-option v-for="(item, index) in companyOptions" :key="index" :label="item.name" :value="item">
                    </el-option>
                  </el-select>
                </div>
@@ -332,7 +359,8 @@
        { id: 2, name: "打" }
      ],
      selLocationOptions: [], // 位置
      companyOptions: [] // 公司
      companyOptions: [], // 公司
      selRouteOptions: [] // 路线
    }
  },
  created() {
@@ -488,6 +516,25 @@
      }
      this.$emit("selLocationClick", item, prop)
    },
    // 选择路线
    selRoteClick(item, prop) {
      console.log(item, prop)
      console.log(this.tableList.tableData)
      // if (this.isinventory) {
      //   getRuleList({
      //     locationId: item.value,
      //     productId: ""
      //   }).then((res) => {
      //     console.log(res)
      //     if (res.code === 200) {
      //       const list = res.data ? res.data : []
      //       // this.selLocationOptions = list.locationList
      //       this.productNameOptions = list.productList
      //     }
      //   })
      // }
      // this.$emit("selLocationClick", item, prop)
    },
    // 选择单位/用户
    selCommonClick(item) {
      console.log(item)

 src/router/product/index.js

@@ -5,6 +5,7 @@
const productCategory = (resolve) => require(["@/views/productManage/productCategory/index"], resolve) // 产品类别
const productList = (resolve) => require(["@/views/productManage/productCategory/ProductList"], resolve) // 产品类别-产品
const overviewList = (resolve) => require(["@/views/overview/OverviewListView"], resolve) // 概述-产品列表
const reorderRules = (resolve) => require(["@/views/productManage/reorderRules/index"], resolve) // 重订货规则

const appconfig = [
  {
@@ -46,6 +47,14 @@
    meta: {
      title: "采购入库"
    }
  },
  {
    path: "/productManage/reorderRules",
    name: "reorderRules",
    component: reorderRules,
    meta: {
      title: "重订货规则"
    }
  }
]


 src/views/overview/OverviewListView.vue

@@ -40,7 +40,7 @@
      v-if="editConfig.visible"
      :work-type="workType"
      :edit-common-config="editConfig"
      :add-name="this.$route.params.name"
      :add-name="addName"
      :display-edit="displayEdit"
    />
  </div>
@@ -78,7 +78,8 @@
      params: {},
      displayEdit: false,
      formLabel: "",
      toLabel: ""
      toLabel: "",
      addName: ""
    }
  },
  created() {
@@ -259,14 +260,16 @@
      console.log(row)
      this.editConfig.visible = true
      this.editConfig.title = val
      this.editConfig.operationTypeId = this.$route.params.id
      this.editConfig.operationTypeId = this.params.id
      this.editConfig.infomation = { ...row }
    },
    // 新建
    addBtnClick() {
      this.editConfig.title = "新建"
      this.editConfig.operationTypeId = this.$route.params.id
      this.editConfig.code=this.$route.params.code
      this.addName = this.params.name
      console.log(this.params, "ss刷新")
      this.editConfig.operationTypeId = this.params.id
      this.editConfig.code = this.params.code
      this.editConfig.infomation = {}
      this.editConfig.visible = true
    },

 src/views/productManage/reorderRules/index.vue

New file
@@ -0,0 +1,337 @@
<template>
  <div class="rightContent">
    <div class="top">
      <SearchCommonView
        :add-title="addTitle"
        :show-discard="showDiscard"
        :show-apply="false"
        :placeholder="'请输入位置/产品'"
        :amount-view="false"
        @addCommonClick="addProductClick"
        @searchClick="getList"
        @discardBtnClick="discardBtnClick"
        @applyBtnClick="applyBtnClick"
      />
    </div>
    <div class="list-view">
      <div class="table">
        <CommonFormTableView
          ref="tablelistRef"
          :isinventory="true"
          :product-table-list="tableList"
          @inputContent="inputContent"
          @selLocationClick="selLocationClick"
          @selProductClick="selProductClick"
          @tableRowClick="tableRowClick"
        >
          <template slot="tableButton">
            <el-table-column label="操作" width="180" align="center">
              <template slot-scope="scope">
                <span
                  v-if="scope.row.isEdit && scope.row.isView"
                  @click.stop="handleOrderOnceClick(scope.row)"
                  class="yes-cursor"
                >
                  <i class="el-icon-truck"></i>
                  <span>订购一次</span>
                </span>
              </template>
            </el-table-column>
          </template>
        </CommonFormTableView>
      </div>
      <div class="btn-pager">
        <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
      </div>
    </div>
  </div>
</template>

<script>
import CommonFormTableView from "@/components/makepager/CommonFormTableView"
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
import {
  getInventoryAdjustmentList,
  addInventoryAdjustment,
  updateInventoryAdjustment,
  finishInventoryAdjustment
} from "@/api/operate/inventoryAdjustment"
import { currentTime } from "@/common/config/index"
export default {
  name: "ReorderRules",
  props: {},
  components: { CommonFormTableView },
  mixins: [pageMixin],
  computed: {},
  data() {
    return {
      addTitle: "新建",
      showDiscard: false,
      tableList: {},
      tableData: [],
      searchOptions: [],
      countId: 0,
      isNoProduct: true, // 添加明细行时是否有产品未选择
      isRowClick: false,
      locationId: 0,
      productId: 0,
      differenceAmount: 0,
      amount: 0,
      operationId: 0,
      adjustAmount: 0
    }
  },
  created() {
    this.setTable()
    this.getData()
  },
  methods: {
    setTable() {
      this.tableList = {
        tableData: this.tableData,
        selectBox: false,
        selectIndex: true,
        tableColumn: [
          { label: "产品", prop: "productName", product: true },
          { label: "位置", prop: "locationName", location: true },
          { label: "在库数量", prop: "amount" },
          { label: "预测", prop: "forecastAmount" },
          { label: "首选路线", prop: "route", route: true },
          { label: "最小数量", prop: "minAmount", inputFloat: true },
          { label: "最大数量", prop: "maxAmount", inputFloat: true },
          { label: "订购", prop: "orderAmount", inputFloat: true },
          { label: "计量单位", prop: "unit" }
        ]
      }
    },
    // 请求数据
    async getData() {
      await getInventoryAdjustmentList({
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize
      }).then((res) => {
        if (res.code === 200) {
          console.log(res)
          const list = res.data.map((item) => {
            item.adjustAmount = 0
            let forecastAmount = 500
            let maxAmount = 600
            return {
              ...item,
              isSet: false,
              isEdit: true,
              editable: true,
              isOrder: true,
              forecastAmount: forecastAmount,
              maxAmount: maxAmount,
              adjustAmount: 0,
              isView: maxAmount - forecastAmount > 0 ? true : false
            }
          })
          this.tableList.tableData = list || []
          this.tableData = list || []
          this.pagerOptions.totalCount = res.total
        }
      })
    },
    // 操作输入
    inputContent(val, prop, row) {
      console.log(val, prop, row)
      console.log(val - row.amount, "结果")
      this.adjustAmount = val - row.amount
      this.tableList.tableData[row.index].adjustAmount = this.adjustAmount
      // this.differenceAmount = val
      this.differenceAmount = val
    },
    // 新增
    addProductClick() {
      console.log(this.tableData)
      console.log(this.addTitle)
      this.isSel()
      if (this.isNoProduct && this.addTitle === "新建") {
        this.$refs.tablelistRef.getRuleList()
        this.addTitle = "保存"
        this.showDiscard = true
        this.isRowClick = false
        this.operationId = 0
        this.currentRowId = 0
        this.countId++
        this.tableData.unshift({
          countId: this.countId,
          amount: 0,
          adjustAmount: 0,
          productId: "",
          differenceAmount: 0,
          locationId: 0,
          createDate: this.currentTime(),
          isSet: true,
          isEdit: false,
          editable: false,
          isOrder: true
        })
        this.locationId = 0
        this.subLocationId = 0
        this.productCategoryId = 0
        this.productId = 0
      } else {
        this.addTitle = "新建"
        this.showDiscard = false
        let requestUrl = this.currentRowId === 0 ? addInventoryAdjustment : updateInventoryAdjustment

        requestUrl({
          amount: this.amount,
          // adjustAmount: this.adjustAmount,
          differenceAmount: this.differenceAmount,
          locationId: this.locationId,
          operationId: this.operationId,
          productId: this.productId
        })
          .then((res) => {
            console.log(res)
            if (res.code === 200) {
              let tipStr = this.currentRowId === 0 ? "添加成功" : "修改成功"
              this.$message.success(tipStr)
              this.getData()
            }
          })
          .catch((err) => {
            console.log(err)
            this.getData()
          })
        // }
      }
    },
    // 是否选择产品
    isSel() {
      for (let i = 0; i < this.tableData.length; i++) {
        if (this.tableData && this.tableData[i].productName.length === 0) {
          this.isNoProduct = false
          break
        } else {
          this.isNoProduct = true
        }
      }
    },
    // 取消
    discardBtnClick() {
      this.tableList.tableData.forEach((item) => {
        item.differenceAmount = 0
        item.adjustAmount = 0
      })
      this.tableList
      if (this.isRowClick) {
        this.tableData.map((item) => {
          item.isEdit = true
        })
      } else {
        this.tableData.splice(0, 1)
      }
      this.addTitle = "新建"
      this.showDiscard = false
    },
    // 应用全部
    applyBtnClick() {
      console.log("应用全部")
    },
    // 历史
    handleHistoryClick(row) {
      this.isSel()
      console.log(row)
      if (this.isNoProduct) {
        console.log("历史")
        this.$router.push({
          name: "inventoryAdjustmentHistory",
          params: { locationId: row.locationId, productId: row.productId, baseOperationType: row.baseOperationType }
        })
      }
    },
    // 设置
    handleSetClick(scope) {
      this.isSel()
      if (this.isNoProduct) {
        scope.row.isSet = !scope.row.isSet
      }
    },
    // 应用
    handleUseClick(row) {
      // scope.row.isSet = !scope.row.isSet
      finishInventoryAdjustment({
        locationProductAmountId: row.locationProductAmountId,
        operationId: row.operationId,
        productId: row.productId
      }).then((res) => {
        console.log(res)
        if (res.code === 200) {
          this.$message.success("应用成功")
          this.getData()
        }
      })
    },
    // 清除
    handleCleanupClick(scope) {
      scope.row.isSet = !scope.row.isSet
    },
    // 行点击
    tableRowClick(row, rowIndex) {
      this.locationId = row.locationId
      this.rowIndex = rowIndex
      this.isSel()
      if (!this.isNoProduct && this.currentRowId === 0) {
        this.$message.error("请完成当前新建或取消新建")
      } else {
        this.currentRowId = row.id
        this.addTitle = "保存"
        this.showDiscard = true
        this.isRowClick = true
        if (!this.isNoProduct) {
          this.tableData.splice(this.tableData.length - 1, 1)
        }
        this.tableData.map((item, index) => {
          if (index === rowIndex) {
            item.isEdit = false
            item.editable = true
            item.isOrder = true
          } else {
            item.isEdit = true
          }
        })
        this.differenceAmount = row.differenceAmount
        this.amount = row.amount
        this.productId = row.productId
        this.operationId = row.operationId
      }
    },
    // 搜索
    getList(val) {
      this.keyword = val
      this.pagerOptions.currPage = 1
      this.getData()
    },
    // 选择位置方法
    selLocationClick(item, prop) {
      console.log(item, prop)
      this.locationId = item.value
    },
    // 选中产品方法
    selProductClick(item) {
      console.log(item)
      this.productId = item.value
    },
    // 获取当前时间
    currentTime() {
      return currentTime()
    }
  }
}
</script>

<!-- Add "scoped" attribute to limit CSS to this component only -->
<style lang="scss" scoped>
::v-deep {
  .el-table {
    border-top-left-radius: 12px;
    border-top-right-radius: 12px;
    overflow: auto;
  }
}
</style>