yangfeng
2023-09-22 dd845fb8c3972ba17b070e486ebf36f87378a587
出入库编辑接口联调、公共组件样式优化、添加产品页面优化
7个文件已修改
50 ■■■■■ 已修改文件
src/api/overview/overview.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/common/config/index.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/makepager/FormBtnsView.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/overview/AddOverviewDialog.vue 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/overview/OverviewListView.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/productManage/product/AddProductDialog.vue 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/productManage/product/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/overview/overview.js
@@ -57,8 +57,8 @@
// 编辑入库/出库
export function updateOperation(data) {
  return request({
    url: `/api-wms/v1/operation/operation/${data.id}`,
    method: "put",
    url: `/api-wms/v1/operation/update`,
    method: "post",
    data
  })
}
src/common/config/index.js
@@ -57,6 +57,5 @@
      result = "刚刚"
    }
  }
  console.log(result)
  return result
}
src/components/makepager/FormBtnsView.vue
@@ -60,7 +60,7 @@
        <div class="right-label">产品</div>
      </div>
    </div>
    <div v-if="!showWarehouse" class="sub-number">
    <div v-if="!showWarehouse" class="sub-number left_border">
      <div class="left"><i class="el-icon-refresh"></i></div>
      <div class="right">
        <div class="right-one">上架规则</div>
@@ -93,7 +93,7 @@
        <div class="right-one">当前库存</div>
      </div>
    </div>
    <div v-if="showWarehouse" class="sub-number">
    <div v-if="showWarehouse" class="sub-number left_border">
      <div class="left"><i class="el-icon-refresh"></i></div>
      <div class="right">
        <div class="right-one">路线</div>
src/views/overview/AddOverviewDialog.vue
@@ -364,13 +364,13 @@
        this.showEdit = false
        this.showFooter = true
        this.isValidateClick = false
      } else if (this.editConfig.infomation.status === "完成") {
      } else if (this.editConfig.infomation.status === 4) {
        this.showButton = true
        this.showEdit = false
        this.isDelClick = true
        this.showFooter = false
        this.isValidateClick = false
      } else if (this.editConfig.infomation.status === "已取消") {
      } else if (this.editConfig.infomation.status === 5) {
        this.showButton = true
        this.showEdit = false
        this.showFooter = false
@@ -442,15 +442,15 @@
      let contacterID = 0
      let contacterName = ""
      if (this.editConfig.title === "新建") {
        companyID = this.companyObj.length === 0 ? 0 : this.companyObj.value
        companyName = this.companyObj.length === 0 ? 0 : this.companyObj.label
        contacterID = this.contacterObj.length === 0 ? 0 : this.contacterObj.value
        contacterName = this.contacterObj.length === 0 ? 0 : this.contacterObj.label
        companyID = Object.keys(this.companyObj).length === 0 ? 0 : this.companyObj.value
        companyName = Object.keys(this.companyObj).length === 0 ? 0 : this.companyObj.label
        contacterID = Object.keys(this.contacterObj).length === 0 ? 0 : this.contacterObj.value
        contacterName = Object.keys(this.contacterObj).length === 0 ? 0 : this.contacterObj.label
      } else {
        companyID = this.companyObj.length === 0 ? data.companyID : this.companyObj.value
        companyName = this.companyObj.length === 0 ? data.companyName : this.companyObj.label
        contacterID = this.contacterObj.length === 0 ? data.contacterID : this.contacterObj.value
        contacterName = this.contacterObj.length === 0 ? data.contacterName : this.contacterObj.label
        companyID = Object.keys(this.companyObj).length === 0 ? data.companyID : this.companyObj.value
        companyName = Object.keys(this.companyObj).length === 0 ? data.companyName : this.companyObj.label
        contacterID = Object.keys(this.contacterObj).length === 0 ? data.contacterID : this.contacterObj.value
        contacterName = Object.keys(this.contacterObj).length === 0 ? data.contacterName : this.contacterObj.label
      }
      let params = {
        comment: data.comment || "",
@@ -464,6 +464,7 @@
        number: "",
        operationDate: data.operationDate || "",
        operationTypeId: this.editConfig.operationTypeId,
        operationTypeName: this.receiptType,
        sourceNumber: data.sourceNumber || "",
        status: 3,
        toLocationId: data.toLocationId || 0
src/views/overview/OverviewListView.vue
@@ -156,7 +156,7 @@
        // },
        {
          label: "入库类型",
          prop: "faultTime",
          prop: "operationTypeName",
          isShowColumn: showcol.includes("入库类型"),
          default: false
        },
src/views/productManage/product/AddProductDialog.vue
@@ -116,13 +116,19 @@
                      clearable
                      style="width: 85%"
                      :popper-append-to-body="false"
                      :disabled="!showFooter"
                    >
                      <el-option v-for="item in materialTypeList" :key="item.id" :label="item.name" :value="item.id">
                      </el-option>
                    </el-select>
                  </el-form-item>
                  <el-form-item label="单位" prop="unit" style="margin-left: 20px">
                    <el-input v-model="editConfig.infomation.unit" placeholder="请输入" style="width: 85%"></el-input>
                    <el-input
                      v-model="editConfig.infomation.unit"
                      placeholder="请输入"
                      style="width: 85%"
                      :disabled="!showFooter"
                    ></el-input>
                  </el-form-item>
                  <el-form-item label="产品标签" prop="productTagName" style="margin-left: 20px">
@@ -130,6 +136,7 @@
                      v-model="editConfig.infomation.productTagName"
                      placeholder="请输入"
                      style="width: 85%"
                      :disabled="!showFooter"
                    ></el-input>
                  </el-form-item>
                </div>
@@ -153,6 +160,7 @@
                      :min="0"
                      :controls="false"
                      style="width: 85%; margin-right: 5px"
                      :disabled="!showFooter"
                    ></el-input-number>
                  </el-form-item>
                  <el-form-item label="成本" prop="cost" style="margin-left: 20px">
@@ -294,7 +302,12 @@
                    ></el-input-number>
                    <span> 天数</span>
                  </el-form-item>
                  <el-form-item label="生产订单准备天数" prop="name" style="margin-left: 20px" label-width="130px">
                  <el-form-item
                    label="生产订单准备天数"
                    prop="customerTaxes"
                    style="margin-left: 20px"
                    label-width="130px"
                  >
                    <el-input-number
                      v-model="editConfig.infomation.customerTaxes"
                      placeholder="请输入"
src/views/productManage/product/index.vue
@@ -314,6 +314,7 @@
    padding: 8px;
    display: flex;
    align-items: center;
    cursor: pointer;
    .left {
      width: 60px;
      text-align: center;