合并dev

zuozhengqing

2024-02-05 75954b2d3519560691726fd043b99737524491fb

合并dev

 src/api/common/other.js

@@ -32,3 +32,11 @@
    data
  })
}
// 获取登录用户信息
export const getUserInfo = (data) => {
  return request({
    url: "/api-wms/v1/product/getUserInfo",
    method: "get",
    params: data
  })
}

 src/components/makepager/FormBtnsView.vue

@@ -28,13 +28,12 @@
    <div
      v-if="!showProduct && !showWarehouse && !showPosition"
      class="sub-number yes-cursor"
      @click="inOutBoundClick"
      :class="{ left_border: addProduct }"
    >
      <div class="left icon-view"><i class="el-icon-sort"></i></div>
      <div class="right">
        <div class="right-label">{{ "进: " + (countObject?.inputAmount ?? 0) }}</div>
        <div class="right-label">{{ "出: " + (countObject?.outputAmount ?? 0) }}</div>
        <div class="right-label"  @click="inOutBoundClick('进')">{{ "进: " + (countObject?.inputAmount ?? 0) }}</div>
        <div class="right-label"  @click="inOutBoundClick('出')">{{ "出: " + (countObject?.outputAmount ?? 0) }}</div>
      </div>
    </div>
    <!-- <div
@@ -161,8 +160,8 @@
      this.$emit("positionReport")
    },
    // 进出
    inOutBoundClick() {
      this.$emit("inOutBoundClick")
    inOutBoundClick(val) {
      this.$emit("inOutBoundClick",val)
    },
    // 产品
    productClick() {

 src/components/makepager/SearchCommonView.vue

@@ -260,6 +260,7 @@
      this.selList.push(ele.title)
    })
    this.selectArr = this.searchTaskMap
    this.searchInput = this.inputName
  },
  methods: {
    // 搜索

 src/views/operate/outEnterLibrary/index.vue

@@ -7,6 +7,7 @@
        :placeholder="'请根据单号、产品、业务类型进行搜索'"
        :amount-view="false"
        @addCommonClick="addBtnClick"
        :inputName="params.keyWord"
        @searchClick="getList"
      />
    </div>

 src/views/productManage/product/AddProductDialog.vue

@@ -305,9 +305,14 @@
                      placeholder="请选择"
                      size="mini"
                      style="width: 85%"
                      :disabled="!showFooter"
                      disabled
                    >
                      <el-option v-for="item in memberOptions" :key="item.id" :label="item.name" :value="item.name">
                      <el-option
                        v-for="(item, index) in memberOptions"
                        :key="index"
                        :label="item.userName"
                        :value="item.userName"
                      >
                      </el-option>
                    </el-select>
                  </el-form-item>
@@ -542,7 +547,7 @@
import IconCropper from "./IconCropper"
import { getProductCategoryList } from "@/api/product/productCategory"
import { getProductList, addProduct, updateProduct } from "@/api/product/product"
import { uploadFiles } from "@/api/common/other"
import { uploadFiles, getUserInfo } from "@/api/common/other"
import codeMixin from "@/components/mixin/codeMixin"
import { getDataByType } from "@/api/data"
import BomDialog from "./components/bomDialog";
@@ -593,7 +598,7 @@
        // 采购类型
        purchaseType: [{ required: true, message: "请选择", trigger: "blur" }]
      },
      memberOptions: [{ name: "管理员", id: 1 }],
      memberOptions: [],
      productCategoryOptions: [], // 产品类别
      productTypeOptions: [
        { name: "能消耗", id: 1 },
@@ -669,6 +674,7 @@
    }
    this.setOptionalFieldsToEmpty()
    this.formInfo()
    this.getUserInfo()
  },
  methods: {
    // 单位
@@ -708,6 +714,17 @@
      // });
      this.$refs.editDialog.editDialogVisible = false;

    },
    // 获取登录用户信息
    getUserInfo() {
      getUserInfo().then((res) => {
        console.log(res)
        if (res.code == 200) {
          this.editConfig.infomation.principal = res.data.userName
          this.memberOptions.push(res.data)
        }
        console.log(this.memberOptions)
      })
    },
    formInfo() {
      this.objCode.type = "物料编码"
@@ -908,11 +925,17 @@
      // console.log(formdata, "图片数据")
    },
    // 进出点击
    inOutBoundClick() {
    inOutBoundClick(val) {
      if (this.editConfig.title !== "新建") {
        console.log(this.editConfig.infomation)
        let url=''
        if(val=='进'){
          url='inboundOutboundDetail'
        }else{
          url='outboundDetail'
        }
        this.$router.push({
          name: "inboundOutboundDetail",
          name:url,
          params: {
            name: this.editConfig.infomation.name,
            id: this.editConfig.infomation.id

 src/views/reportForm/inboundOutboundDetail/index.vue

@@ -6,6 +6,7 @@
        :showAdd="false"
        :placeholder="'请根据单号、产品、业务类型进行搜索'"
        :amount-view="false"
        :inputName="params.keyWord"
        @addCommonClick="addBtnClick"
        @searchClick="getList"
      />

 src/views/reportForm/inventoryReport/index.vue

@@ -308,7 +308,7 @@
      this.$router.push({
        name: "inboundOutboundDetail",
        params: {
          keyWord: row.productType,
          keyWord: row.productName,
          produceId: row.produceId,
          unit: row.unit,
          productName: row.productName,

 src/views/reportForm/locationReport/index.vue

@@ -262,7 +262,7 @@
      this.$router.push({
        name: "outEnterLibrary",
        params: {
          keyWord:row.productTypeName,
          keyWord:row.productName,
          produceId:row.produceId,
          productName:row.productName,
          unit:row.unit,