zuozhengqing
2023-10-23 2d33e0c0fb91fbf58f7d7f415d56dffd96d6263b
Merge branch 'dev' of http://192.168.5.5:10010/r/web/WMS into dev
4个文件已修改
14 ■■■■■ 已修改文件
src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/overview/AddOverviewDialog.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/overview/OverviewListView.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/overview/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/operate/inventoryAdjustment/inventoryAdjustmentHistory.vue
@@ -31,7 +31,8 @@
      searchOptions: [],
      keyword: "",
      locationId: 0,
      productId: ""
      productId: "",
      baseOperationType:""
    }
  },
  created() {
@@ -130,6 +131,7 @@
    // 请求数据
    async getData() {
      await historyInventoryAdjustment({
        baseOperationType:this.baseOperationType,
        locationId: this.locationId,
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize,
src/views/overview/AddOverviewDialog.vue
@@ -144,7 +144,7 @@
                    style="width: 90%"
                    :disabled="!showFooter"
                  >
                    <el-option v-for="item in toLocationOptions" :key="item.id" :label="item.name" :value="item.id">
                    <el-option v-for="item in toLocationOptions" :key="item.id" :label="item.jointName" :value="item.id">
                    </el-option>
                  </el-select>
                </el-form-item>
@@ -158,7 +158,7 @@
                    style="width: 90%"
                    :disabled="!showFooter"
                  >
                    <el-option v-for="item in toLocationOptions" :key="item.id" :label="item.name" :value="item.id">
                    <el-option v-for="item in toLocationOptions" :key="item.id" :label="item.jointName" :value="item.id">
                    </el-option>
                  </el-select>
                </el-form-item>
@@ -374,6 +374,7 @@
    async getLocationList() {
      await getLocationList({
        keyWord: "",
        jointName:this.editConfig.code,
        page: 0,
        pageSize: 0
      }).then((res) => {
src/views/overview/OverviewListView.vue
@@ -264,10 +264,11 @@
    },
    // 新建
    addBtnClick() {
      this.editConfig.visible = true
      this.editConfig.title = "新建"
      this.editConfig.operationTypeId = this.$route.params.id
      this.editConfig.code=this.$route.params.code
      this.editConfig.infomation = {}
      this.editConfig.visible = true
    },
    // 状态
    getStatus(val) {
src/views/overview/index.vue
@@ -90,7 +90,7 @@
      console.log(item)
      this.$router.push({
        name: "overviewList",
        params: { name: item.name, workType: item.baseOperationType, id: item.id, status: status }
        params: { name: item.name, workType: item.baseOperationType, id: item.id, status: status,code:item.warehouse.code }
      })
    },
    async getData() {