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

haoxuan

2023-09-21 e267aaa1629571bf8fc6cdcf80152c5558342425

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

 src/api/common/other.js

@@ -1,9 +1,9 @@
// import request from "@/common/untils/request.js"
import axios from "axios"

// 负责人
export const getMemberListFromGrpc = async (data) => {
  return await axios.get(`/api/m/getMemberListFromGrpc`, {
// 查询公司列表
export const getCompanyList = async (data) => {
  return await axios.get(`/api-wms/v1/company/company`, {
    params: data
  })
}

 src/api/overview/overview.js

New file
@@ -0,0 +1,81 @@
import request from "@/common/untils/request.js"
import axios from "axios"

// 查询业务类型列表
export const getOperationType = async (data) => {
  return await axios.get(`/api-wms/v1/operationType/operationType`, {
    params: data
  })
}
// 添加业务类型
export function addOperationType(data) {
  return request({
    url: "/api-wms/v1/operationType/operationType",
    method: "post",
    data
  })
}
// 删除业务类型
export function deleteOperationType(id) {
  return request({
    url: `/api-wms/v1/operationType/operationType/${id}`,
    method: "delete",
    id
  })
}
// 编辑业务类型
export function updateOperationType(data) {
  return request({
    url: `/api-wms/v1/operationType/operationType/${data.id}`,
    method: "put",
    data
  })
}

// 查询入库/出库列表
export const getOperation = async (data) => {
  return await axios.get(`/api-wms/v1/operation/operation`, {
    params: data
  })
}
// 添加入库/出库
export function addOperation(data) {
  return request({
    url: "/api-wms/v1/operation/operation",
    method: "post",
    data
  })
}
// 删除入库/出库
export function deleteOperation(id) {
  return request({
    url: `/api-wms/v1/operation/operation/${id}`,
    method: "delete",
    id
  })
}
// 编辑入库/出库
export function updateOperation(data) {
  return request({
    url: `/api-wms/v1/operation/operation/${data.id}`,
    method: "put",
    data
  })
}
// 验证 更改记录状态
export function updateStatus(id) {
  return request({
    url: `/api-wms/v1/operation/finish/${id}`,
    method: "put",
    id
  })
}

// 获取位置列表
export function getLocationList(data) {
  return request({
    url: "/api-wms/v1/location/getLocationList",
    method: "post",
    data
  })
}

 src/api/product/product.js

@@ -2,39 +2,40 @@
import axios from "axios"

// 产品列表
export const getProductList = async (data) => {
  return await axios.get(`/api/p/getProductList`, {
    params: data
export function getProductList(data) {
  return request({
    url: "/api-wms/v1/product/getProductList",
    method: "post",
    data
  })
}
// 创建产品
export function createProduct(data) {
// 添加产品
export function addProduct(data) {
  return request({
    url: "/api/p/createProduct",
    url: "/api-wms/v1/product/addProduct",
    method: "post",
    data
  })
}
// 删除产品
export function deleteProduct(data) {
export function deleteProduct(id) {
  return request({
    url: "/api/p/deleteProduct",
    url: `/api-wms/v1/product/deleteProduct/${id}`,
    method: "delete",
    data
    id
  })
}
// 更新产品
// 修改产品
export function updateProduct(data) {
  return request({
    url: "/api/p/updateProduct",
    method: "put",
    url: "/api-wms/v1/product/updateProduct",
    method: "post",
    data
  })
}

// 添加产品获取产品列表
export const getProductListFromGrpc = async (data) => {
  return await axios.get(`/api/p/getProductListFromGrpc`, {
// 获取产品详情
export const getProductDetails = async (data) => {
  return await axios.get(`/api-wms/v1/product/getProductDetails/${data.id}`, {
    params: data
  })
}

 src/api/supplierManage/supplier.js

File was deleted

 src/components/makepager/CommonFormTableView.vue

@@ -50,10 +50,19 @@
                    v-model="scope.row[item.prop]"
                    placeholder="请选择"
                    size="mini"
                    style="width: 63%"
                    @change="selProductClick"
                    style="width: 80%"
                    @change="
                      (val) => {
                        selProductClick(val)
                      }
                    "
                  >
                    <el-option v-for="item in productNameOptions" :key="item.id" :label="item.name" :value="item">
                    <el-option
                      v-for="item in productNameOptions"
                      :key="item.id"
                      :label="item.name"
                      :value="{ value: item.id, label: item.name, amount: item.amount, unit: item.unit }"
                    >
                    </el-option>
                  </el-select>
                </div>
@@ -144,7 +153,7 @@
</template>

<script>
// import { getProductListFromGrpc, getProductList } from "@/api/productManage/product"
import { getProductList } from "@/api/product/product"
// import SelectCommonDialog from "@/views/other/commonDialog/SelectCommonDialog"
export default {
  name: "CommmonFormTableView",
@@ -182,10 +191,7 @@
        infomation: {}
      },
      productIndex: 0,
      productNameOptions: [
        { id: 1, name: "aaaaa" },
        { id: 2, name: "bbbbbbbbbb" }
      ],
      productNameOptions: [],
      selOptions: [
        { id: 1, name: "件" },
        { id: 2, name: "打" }
@@ -193,7 +199,7 @@
    }
  },
  created() {
    // this.getProductList()
    this.getProductList()
    this.tableList = this.productTableList
  },
  computed: {},
@@ -205,24 +211,29 @@
  methods: {
    // 产品名称
    async getProductList() {
      // let fn = this.sign == "purchase" ? getProductList : getProductListFromGrpc
      let fn
      await fn({
      await getProductList({
        page: 1,
        pageSize: 100
      }).then((res) => {
        console.log(res.data)
        if (res.data.code === 200) {
          if (res.data.data.list && res.data.data.list.length > 0) {
            this.productList = res.data.data.list
        // console.log(res.data)
        if (res.code === 200) {
          if (res.data && res.data.length > 0) {
            this.productNameOptions = res.data
          }
        }
      })
    },
    // 选择产品
    selProductClick(val) {
      console.log("aaa")
      console.log(val)
    selProductClick(item) {
      this.tableList.tableData.map((ite) => {
        if (ite.productName.label === item.label) {
          ite.productId = item.value
          ite.productName = item.label
          ite.amount = item.amount
          ite.unit = item.unit
        }
      })
      console.log(this.tableList.tableData)
    },
    // 选择单位
    selCommonClick(item) {

 src/components/makepager/FormBtnsView.vue

@@ -34,6 +34,18 @@
        <div class="right-label">{{ "出: " + 0 }}</div>
      </div>
    </div>
    <div
      v-if="!showProduct && !showWarehouse && !showPosition"
      class="sub-number"
      @click="inOutBoundClick"
      :class="{ left_border: addProduct }"
    >
      <div class="left"><i class="el-icon-s-shop"></i></div>
      <div class="right">
        <div class="right-label">{{ 0 }}</div>
        <div class="right-label">BOM</div>
      </div>
    </div>
    <div v-if="!showProduct && !showWarehouse && !showPosition" class="sub-number">
      <div class="left"><i class="el-icon-refresh"></i></div>
      <div class="right">
@@ -66,6 +78,13 @@
      <div class="right">
        <div class="right-label">{{ "0.00" + "件" }}</div>
        <div class="right-label">已采购</div>
      </div>
    </div>
    <div v-if="!showProduct && !showWarehouse && !showPosition && showSale" class="sub-number">
      <div class="left"><i class="el-icon-bank-card"></i></div>
      <div class="right">
        <div class="right-label">{{ "0.00" + "件" }}</div>
        <div class="right-label">已售</div>
      </div>
    </div>
    <div v-if="showPosition" class="sub-number">
@@ -105,6 +124,10 @@
    showProcure: {
      type: Boolean,
      default: true
    },
    showSale: {
      type: Boolean,
      default: true
    }
  },
  data() {

 src/components/makepager/StatusCommonView.vue

@@ -1,6 +1,7 @@
<template>
  <div class="common-status">
    <div v-if="showButton" style="margin-left: 30px">
      <el-button v-if="isValidateClick" plain size="mini" @click="validateClick">验证</el-button>
      <el-button plain size="mini" @click="delClick" :disabled="isDelClick">删除</el-button>
      <el-button plain size="mini" disabled>打印</el-button>
    </div>
@@ -57,12 +58,21 @@
    isDelClick: {
      type: Boolean,
      default: false
    },
    isValidateClick: {
      type: Boolean,
      default: false
    }
  },
  data() {
    return {}
  },
  methods: {
    // 验证
    validateClick() {
      this.$emit("validateClick")
    },
    // 删除
    delClick() {
      this.$emit("delClick")
    }

 src/components/makepager/TableCommonView.vue

@@ -35,21 +35,19 @@
      >
        <template slot-scope="scope">
          <span v-if="item.price">{{ "￥" + number_format(scope.row[item.prop], 2, ".", ",") }}</span>
          <!-- 带点的功能 -->
          <!-- 状态显示 -->
          <div v-else-if="item.status">
            <!-- <span v-if="scope.row.status == '完成'" class="Badge greenSlot"></span>
            <span v-else-if="scope.row.status == '草稿'" class="Badge redSlot"></span>
            <span v-else-if="scope.row.status == '就绪'" class="Badge redSlot"></span>
            <span v-else-if="scope.row.status == '已取消'" class="Badge yellowSlot"></span> -->
            <span
              class="Badge"
              :class="{
                greenSlot: scope.row.status == '完成',
                redSlot: scope.row.status == '已取消',
                blueSlot: scope.row.status == '就绪',
                graySlot: scope.row.status == '草稿'
                greenSlot: scope.row.status == '4',
                redSlot: scope.row.status == '5',
                blueSlot: scope.row.status == '3',
                graySlot: scope.row.status == '1'
              }"
              >{{ scope.row[item.prop] }}</span
              >{{
                item.isCallMethod ? item.getCallMethod(scope.row[item.prop], scope.row) : scope.row[item.prop]
              }}</span
            >
          </div>
          <!-- 调用方法显示文字 -->
@@ -71,13 +69,12 @@
            @click="selCommonClick(scope.row)"
            >{{ scope.row[item.prop] }}</span
          >
          <span v-else-if="item.propType=='mulitple'">
            {{  scope.row[item.prop][item.propTwo]?scope.row[item.prop][item.propTwo]:'--' }}
          <span v-else-if="item.propType == 'mulitple'">
            {{ scope.row[item.prop][item.propTwo] ? scope.row[item.prop][item.propTwo] : "--" }}
          </span>
          <span :class="item.className ? item.className : ''" v-else>{{
            scope.row[item.prop] ? scope.row[item.prop] : scope.row[item.prop] === 0 ? scope.row[item.prop] : "--"
          }}</span>
          
        </template>
      </el-table-column>
      <slot name="tableButton" />

 src/components/makepager/pager/PagerView.vue

@@ -40,7 +40,7 @@
      default: () => {
        return {
          currPage: 1,
          pageSize: 10,
          pageSize: 15,
          totalCount: 0
        }
      }

 src/components/makepager/pager/mixin/pageMixin.js

@@ -7,7 +7,7 @@
    return {
      pagerOptions: {
        currPage: 1,
        pageSize: 10,
        pageSize: 15,
        totalCount: 0
      },
      pagerEvents

 src/router/index.js

@@ -101,10 +101,10 @@
    (to.path === "/overview/overviewList" ||
      to.path === "/reportForm/inOutboundDetail" ||
      to.path === "/productManage/productList") &&
    to.query.name
    to.params.name
  ) {
    console.log(from, next)
    to.meta.title = to.query.name
    to.meta.title = to.params.name
    document.title = to.meta.title
  }
})

 src/router/product/index.js

@@ -12,7 +12,7 @@
    name: "product",
    component: product,
    meta: {
      title: "产品管理"
      title: "产品"
    }
  },
  {

 src/views/overview/AddOverviewDialog.vue

@@ -33,18 +33,46 @@
      >
        <div>
          <!-- <div>aaa</div> -->
          <StatusCommonView :showButton="showButton" :isDelClick="isDelClick" :list="list" @delClick="delClick" />
          <StatusCommonView
            :showButton="showButton"
            :isValidateClick="isValidateClick"
            :isDelClick="isDelClick"
            :list="list"
            @delClick="delClick"
            @validateClick="validateClick"
          />
        </div>
        <div class="basic-info">
          <div class="basic-info-view">
            <el-row>
              <el-col :span="12">
                <el-form-item v-if="workType === '收货'" label="客户" prop="client_name">
                <el-form-item prop="companyName">
                  <span slot="label">{{ workType === 1 ? "客户" : workType === 2 ? "送货地址" : "联系人" }}</span>
                  <el-select
                    v-model="editConfig.infomation.memberId"
                    v-model="editConfig.infomation.companyName"
                    placeholder="请选择"
                    size="mini"
                    style="width: 63%"
                    style="width: 90%"
                    :disabled="!showFooter"
                    @change="companyChange"
                  >
                    <el-option
                      v-for="item in companyOptions"
                      :key="item.id"
                      :label="item.name"
                      :value="{ value: item.id, label: item.name }"
                    >
                    </el-option>
                  </el-select>
                </el-form-item>
              </el-col>
              <!-- <el-col :span="12">
                <el-form-item v-if="workType === 3" label="联系人" prop="contacterName">
                  <el-select
                    v-model="editConfig.infomation.contacterName"
                    placeholder="请选择"
                    size="mini"
                    style="width: 90%"
                    :disabled="!showFooter"
                  >
                    <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
@@ -53,94 +81,71 @@
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item v-if="workType === '内部调拨'" label="联系人" prop="client_name">
                <el-form-item v-if="workType === 2" label="送货地址" prop="client_name">
                  <el-select
                    v-model="editConfig.infomation.memberId"
                    placeholder="请选择"
                    size="mini"
                    style="width: 63%"
                    style="width: 90%"
                    :disabled="!showFooter"
                  >
                    <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
                    </el-option>
                  </el-select>
                </el-form-item>
              </el-col>
              </el-col> -->
              <el-col :span="12">
                <el-form-item v-if="workType === '发货'" label="送货地址" prop="client_name">
                  <el-select
                    v-model="editConfig.infomation.memberId"
                    placeholder="请选择"
                    size="mini"
                    style="width: 63%"
                    :disabled="!showFooter"
                  >
                    <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
                    </el-option>
                  </el-select>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="日期" prop="refundDate">
                <el-form-item label="日期" prop="operationDate">
                  <el-date-picker
                    v-model="editConfig.infomation.refundDate"
                    v-model="editConfig.infomation.operationDate"
                    value-format="yyyy-MM-dd"
                    type="date"
                    placeholder="选择日期"
                    style="width: 63%"
                    style="width: 90%"
                    :disabled="!showFooter"
                  >
                  </el-date-picker>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="入库类型" prop="client_name">
                  <el-select
                    v-model="editConfig.infomation.memberId"
                    placeholder="请选择"
                    size="mini"
                    style="width: 63%"
                    :disabled="!showFooter"
                  >
                    <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
                    </el-option>
                  </el-select>
                <el-form-item label="入库类型">
                  <el-input v-model="receiptType" disabled style="width: 90%"></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item label="来源单据" prop="memberId">
                <el-form-item label="来源单据" prop="sourceNumber">
                  <el-input
                    v-model="editConfig.infomation.memberId"
                    v-model="editConfig.infomation.sourceNumber"
                    placeholder="例如:PO0032"
                    style="width: 63%"
                    style="width: 90%"
                    :disabled="!showFooter"
                  ></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item v-if="workType !== '收货'" label="源位置" prop="client_name">
                <el-form-item v-if="workType !== 1" label="源位置" prop="fromLocationId">
                  <el-select
                    v-model="editConfig.infomation.memberId"
                    v-model="editConfig.infomation.fromLocationId"
                    placeholder="请选择"
                    size="mini"
                    style="width: 63%"
                    style="width: 90%"
                    :disabled="!showFooter"
                  >
                    <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
                    <el-option v-for="item in toLocationOptions" :key="item.id" :label="item.name" :value="item.id">
                    </el-option>
                  </el-select>
                </el-form-item>
              </el-col>
              <el-col :span="12">
                <el-form-item v-if="workType !== '发货'" label="仓库位置" prop="client_name">
                <el-form-item v-if="workType !== 2" label="仓库位置" prop="toLocationId">
                  <el-select
                    v-model="editConfig.infomation.memberId"
                    v-model="editConfig.infomation.toLocationId"
                    placeholder="请选择"
                    size="mini"
                    style="width: 63%"
                    style="width: 90%"
                    :disabled="!showFooter"
                  >
                    <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
                    <el-option v-for="item in toLocationOptions" :key="item.id" :label="item.name" :value="item.id">
                    </el-option>
                  </el-select>
                </el-form-item>
@@ -149,33 +154,39 @@
          </div>
          <div class="bottom">
            <el-tabs v-model="activeName" type="card">
              <el-tab-pane v-if="workType !== '收货'" label="详情" name="detail"> </el-tab-pane>
              <!-- <el-tab-pane v-if="workType !== 1" label="详情" name="detail"> </el-tab-pane> -->
              <el-tab-pane label="操作" name="first"> </el-tab-pane>
              <el-tab-pane label="其他信息" name="second">
                <div class="purchase-view">
                  <div class="left">
                    <div class="second-label">其他信息</div>
                    <el-form-item v-if="workType !== '收货'" label="送货策略" prop="client_name">
                    <el-form-item v-if="workType !== 1" label="送货策略" prop="client_name">
                      <el-select
                        v-model="editConfig.infomation.memberId"
                        placeholder="请选择"
                        size="mini"
                        style="width: 63%"
                        style="width: 90%"
                        :disabled="!showFooter"
                      >
                        <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
                        </el-option>
                      </el-select>
                    </el-form-item>
                    <el-form-item label="负责人" prop="client_name">
                    <el-form-item label="负责人" prop="contacterName">
                      <el-select
                        v-model="editConfig.infomation.memberId"
                        v-model="editConfig.infomation.contacterName"
                        placeholder="请选择"
                        size="mini"
                        style="width: 63%"
                        style="width: 90%"
                        :disabled="!showFooter"
                        @change="contacterChange"
                      >
                        <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
                        <el-option
                          v-for="item in memberOptions"
                          :key="item.id"
                          :label="item.name"
                          :value="{ value: item.id, label: item.name }"
                        >
                        </el-option>
                      </el-select>
                    </el-form-item>
@@ -184,9 +195,9 @@
                </div>
              </el-tab-pane>
              <el-tab-pane label="备注" name="third">
                <el-form-item label="备注" prop="desc">
                <el-form-item label="备注" prop="comment">
                  <el-input
                    v-model.trim="editConfig.infomation.desc"
                    v-model.trim="editConfig.infomation.comment"
                    size="mini"
                    type="textarea"
                    style="width: 85%"
@@ -216,7 +227,7 @@
              </CommonFormTableView>
            </div>
            <!-- 详情 -->
            <div v-if="activeName === 'detail'">
            <!-- <div v-if="activeName === 'detail'">
              <CommonFormTableView
                :product-table-list="detailTableList"
                :detail-enter="!showFooter"
@@ -233,7 +244,7 @@
                  </el-table-column>
                </template>
              </CommonFormTableView>
            </div>
            </div> -->
          </div>
        </div>
      </el-form>
@@ -249,6 +260,8 @@

<script>
import CommonFormTableView from "@/components/makepager/CommonFormTableView"
import { getLocationList, addOperation, updateOperation, updateStatus, deleteOperation } from "@/api/overview/overview"
import { getCompanyList } from "@/api/common/other"
export default {
  name: "AddOverviewDialog",
  props: {
@@ -258,13 +271,14 @@
        return {
          visible: false,
          title: "新建",
          operationTypeId: 0,
          infomation: {}
        }
      }
    },
    workType: {
      type: String,
      default: "收货"
      type: Number,
      default: 1
    },
    addName: {
      type: String,
@@ -278,26 +292,26 @@
      dialogWidth: "50%",
      editConfig: this.editCommonConfig,
      rules: {
        client_name: [{ required: true, message: "请选择客户名称", trigger: "change" }],
        number: [{ required: true, message: "请输入退款单编号", trigger: "blur" }],
        refundDate: [{ required: true, message: "请选择退款日期", trigger: "change" }],
        memberId: [{ required: true, message: "请选择销售负责人", trigger: "change" }],
        sale_return_nunber: [{ required: true, message: "请选择销售退货单", trigger: "change" }]
        sourceNumber: [{ required: true, message: "请输入来源单据", trigger: "blur" }],
        operationDate: [{ required: true, message: "请选择日期", trigger: "change" }],
        toLocationId: [{ required: true, message: "请选择仓库位置", trigger: "change" }],
        fromLocationId: [{ required: true, message: "请选择源位置", trigger: "change" }]
      },
      memberOptions: [],
      paymentTypeListOptions: [],
      companyOptions: [], // 公司
      memberOptions: [{ id: 1, name: "管理员" }],
      toLocationOptions: [], //  源位置 仓库位置
      list: [
        { label: "草稿", status: "todo" },
        { label: "正在等待", status: "todo" },
        { label: "就绪", status: "todo" },
        { label: "完成", status: "todo" }
        { label: "草稿", status: "todo", value: 1 },
        { label: "正在等待", status: "todo", value: 2 },
        { label: "就绪", status: "todo", value: 3 },
        { label: "完成", status: "todo", value: 4 }
      ],
      showButton: true,
      activeName: "first",
      productTableList: {},
      tableData: [{ name: "ssss" }],
      productId: 0,
      isNoProduct: false, // 添加明细行时是否有产品未选择
      tableData: [],
      countId: 0,
      isNoProduct: true, // 添加明细行时是否有产品未选择
      showEdit: false, // 是否显示编辑按钮
      isDelClick: false, // 删除按钮是否可点击
      showFooter: false, // 是否显示取消保存
@@ -306,41 +320,72 @@
      detailTableData: [{ name: "ssss" }],
      detailId: 0,
      isNoDetail: false, // 添加详情明细行时是否未选择
      tableColumn: []
      tableColumn: [],
      receiptType: this.addName, // 入库类型
      companyObj: {},
      contacterObj: {},
      isValidateClick: false // 验证是否显示
    }
  },
  created() {
    this.setTableForm()
    this.setBottonView()
    this.setDetailTableForm()
    this.activeName = this.workType === "收货" ? "first" : "detail"
    this.getCompanyList()
    this.getLocationList()
  },
  methods: {
    // 获取公司列表
    async getCompanyList() {
      await getCompanyList().then((res) => {
        console.log(res)
        if (res.data.code === 200) {
          this.companyOptions = res.data.data
        }
      })
    },
    // 获取仓库位置列表
    async getLocationList() {
      await getLocationList({
        keyWord: "",
        page: 0,
        pageSize: 0
      }).then((res) => {
        console.log(res)
        if (res.code === 200) {
          this.toLocationOptions = res.data
        }
      })
    },
    // 设置删除/打印/编辑是否显示
    setBottonView() {
      if (this.editConfig.title === "新建") {
        this.showButton = false
        this.showEdit = false
        this.showFooter = true
        this.isValidateClick = false
      } else if (this.editConfig.infomation.status === "完成") {
        this.showButton = true
        this.showEdit = false
        this.isDelClick = true
        this.showFooter = false
        this.isValidateClick = false
      } else if (this.editConfig.infomation.status === "已取消") {
        this.showButton = true
        this.showEdit = false
        this.showFooter = false
        this.isValidateClick = false
      } else {
        this.showButton = true
        this.showEdit = true
        this.showFooter = false
        this.isValidateClick = true
      }
      if (this.editConfig.title === "新建") {
        this.list[0].status = "active"
      } else {
        this.list.map((item) => {
          if (item.label === this.editConfig.infomation.status) {
          if (item.value === this.editConfig.infomation.status) {
            item.status = "active"
          } else {
            item.status = "todo"
@@ -360,28 +405,102 @@
      this.setTableForm()
    },
    // 保存
    saveClick() {},
    saveClick(formName) {
      this.$refs[formName].validate((valid) => {
        if (valid) {
          for (let i = 0; i < this.tableData.length; i++) {
            if (this.tableData[i].productName.length === 0) {
              this.isNoProduct = true
              break
            } else {
              this.isNoProduct = false
            }
          }
          if (this.isNoProduct) {
            this.$message.error("请添加明细行或选择产品不能为空")
          } else {
            let requestUrl = this.editConfig.title === "新建" ? addOperation : updateOperation
            let params = this.saveParams()
            requestUrl({
              ...params
            }).then((res) => {
              console.log(res)
              this.editConfig.visible = false
              if (res.code === 200) {
                this.$message.success("添加成功")
                this.$parent.getData()
              }
            })
          }
        }
      })
    },
    saveParams() {
      let data = this.editConfig.infomation
      let companyID = 0
      let companyName = ""
      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
      } 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
      }
      let params = {
        comment: data.comment || "",
        companyID: companyID,
        companyName: companyName,
        contacterID: contacterID,
        contacterName: contacterName,
        details: this.tableData,
        fromLocationId: data.fromLocationId || 0,
        id: data.id,
        number: "",
        operationDate: data.operationDate || "",
        operationTypeId: this.editConfig.operationTypeId,
        sourceNumber: data.sourceNumber || "",
        status: 3,
        toLocationId: data.toLocationId || 0
      }
      return params
    },
    // 删除
    delClick() {},
    async delClick() {
      await deleteOperation(this.editConfig.infomation.id).then((res) => {
        console.log(res)
        this.editConfig.visible = false
        if (res.code === 200) {
          this.$message.success("删除成功")
          this.$parent.getData()
        }
      })
    },
    // 操作列表
    setTableForm() {
      this.tableData = this.editConfig.title !== "新建" ? this.editConfig.infomation.details : []
      this.productTableList = {
        tableData: this.tableData,
        tableColumn: [
          { label: "产品", prop: "name", productName: true, isRequird: true },
          { label: "说明", prop: "number", input: true },
          { label: "日期", prop: "amount", date: true, isRequird: true },
          { label: "截止日期", prop: "price", date: true },
          { label: "完成", prop: "total", inputFloat: true },
          { label: "计量单位", prop: "total", select: true }
          { label: "产品", prop: "productName", productName: true, isRequird: true },
          // { label: "说明", prop: "number", input: true },
          // { label: "日期", prop: "amount", date: true, isRequird: true },
          // { label: "截止日期", prop: "price", date: true },
          { label: "完成", prop: "amount", inputFloat: true },
          { label: "计量单位", prop: "unit" }
        ]
      }
    },
    // 操作输入
    inputContent(val, prop, row) {
      this.productId = row.productId
      this.countId = row.countId
      this.tableData.map((item) => {
        if (item.productId === row.productId) {
        if (item.countId === row.countId) {
          item[prop] = val
        }
      })
@@ -391,24 +510,21 @@
      if (value === "操作") {
        console.log(this.tableData)
        for (let i = 0; i < this.tableData.length; i++) {
          if (this.tableData[i].name.length === 0) {
            this.isNoProduct = true
          if (this.tableData[i].productName.length === 0) {
            this.isNoProduct = false
            break
          } else {
            this.isNoProduct = false
            this.isNoProduct = true
          }
        }
        if (!this.isNoProduct) {
          this.productId++
        if (this.isNoProduct) {
          this.countId++
          this.tableData.push({
            productId: this.productId,
            id: 0,
            countId: this.countId,
            productId: "",
            amount: 0,
            desc: "",
            name: "",
            number: "",
            price: 0,
            total: 0
            unit: "",
            productName: ""
          })
        }
      } else {
@@ -479,6 +595,26 @@
          item[prop] = val
        }
      })
    },
    // 客户选择
    companyChange(val) {
      console.log(val)
      this.companyObj = val
    },
    // 负责人选择
    contacterChange(val) {
      this.contacterObj = val
    },
    // 验证
    async validateClick() {
      await updateStatus(this.editConfig.infomation.id).then((res) => {
        console.log(res)
        this.editConfig.visible = false
        if (res.code === 200) {
          this.$message.success("验证成功")
          this.$parent.getData()
        }
      })
    }
  }
}

 src/views/overview/OverviewListView.vue

@@ -27,14 +27,14 @@
      v-if="editConfig.visible"
      :work-type="workType"
      :edit-common-config="editConfig"
      :add-name="this.$route.query.name"
      :add-name="this.$route.params.name"
    />
  </div>
</template>

<script>
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
import { getProductList } from "@/api/product/product"
import { getOperation } from "@/api/overview/overview"
// import DetailProduct from "@/views/productManage/product/DetailProduct"
import AddOverviewDialog from "@/views/overview/AddOverviewDialog"

@@ -59,12 +59,13 @@
        title: "新建",
        infomation: {}
      },
      workType: this.$route.query.workType
      workType: this.$route.params.workType
    }
  },
  created() {
    this.setTable()
    this.getData()
    console.log(this.$route.params.workType)
  },
  methods: {
    setTable() {
@@ -88,37 +89,37 @@
      let tableColumn = [
        {
          label: "单号",
          prop: "id",
          prop: "number",
          isShowColumn: true,
          default: true
        },
        {
          label: "从",
          prop: "deviceName",
          prop: "from",
          isShowColumn: showcol.includes("从"),
          default: false
        },
        {
          label: "至",
          prop: "id",
          prop: "to",
          isShowColumn: showcol.includes("至"),
          default: false
        },
        {
          label: "联系人",
          prop: "deviceId",
          prop: "companyName",
          isShowColumn: showcol.includes("联系人"),
          default: false
        },
        {
          label: "负责人",
          prop: "shopName",
          prop: "contacterName",
          isShowColumn: showcol.includes("负责人"),
          default: false
        },
        {
          label: "日期",
          prop: "preTime",
          prop: "operationDate",
          isShowColumn: showcol.includes("日期"),
          default: false,
          date: true
@@ -143,7 +144,7 @@
        },
        {
          label: "来源单据",
          prop: "faultLevel",
          prop: "sourceNumber",
          isShowColumn: showcol.includes("来源单据"),
          default: false
        },
@@ -165,7 +166,9 @@
          width: 120,
          isShowColumn: showcol.includes("状态"),
          default: false,
          status: true
          status: true,
          isCallMethod: true,
          getCallMethod: this.getStatus
        }
      ]
      return tableColumn
@@ -175,23 +178,23 @@
      this.tableList.tableColumn = this.setTableColumn(val)
    },
    // 请求数据
    async getData(val, content) {
      await getProductList({
        [val]: content,
    async getData() {
      await getOperation({
        operationTypeId: this.$route.params.id,
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize
      }).then((res) => {
        console.log(res.data.data)
        if (res.data.code === 200) {
          const list = res.data.data.list.map((item) => {
          const list = res.data.data.map((item) => {
            return {
              ...item,
              supplierNumber: item.supplier.number,
              status: "就绪",
              preTime: "2023-09-04 11:20:00"
              from: item.fromLocation.name,
              to: item.toLocation.name
            }
          })
          this.tableList.tableInfomation = list || []
          this.pagerOptions.totalCount = res.data.data.total
          this.pagerOptions.totalCount = res.data.total
        }
      })
    },
@@ -204,12 +207,19 @@
      console.log(row)
      this.editConfig.visible = true
      this.editConfig.title = "编辑"
      this.editConfig.operationTypeId = this.$route.params.id
      this.editConfig.infomation = { ...row }
    },
    // 新建
    addBtnClick() {
      this.editConfig.visible = true
      this.editConfig.title = "新建"
      this.editConfig.operationTypeId = this.$route.params.id
      this.editConfig.infomation = {}
    },
    // 状态
    getStatus(val) {
      return val === 1 ? "草稿" : val === 3 ? "就绪" : "完成"
    }
  }
}

 src/views/overview/index.vue

@@ -10,9 +10,9 @@
          v-for="item in tableList"
          :key="item.id"
          :class="{
            overview_active: item.status === 'active',
            overview_done: item.status === 'done',
            overview_todo: item.status === 'todo'
            overview_active: item.baseOperationType === 1,
            overview_done: item.baseOperationType === 2,
            overview_todo: item.baseOperationType === 3
          }"
        >
          <div class="top">
@@ -48,6 +48,7 @@

<script>
import pageMixin from "@/components/makepager/pager/mixin/pageMixin"
import { getOperationType } from "@/api/overview/overview"

export default {
  name: "OverView",
@@ -57,48 +58,7 @@
  computed: {},
  data() {
    return {
      tableList: [
        {
          name: "采购入库",
          status: "active",
          workType: "收货"
        },
        {
          name: "内部调拨",
          status: "done",
          workType: "内部调拨"
        },
        {
          name: "订单发货出库",
          status: "done",
          workType: "发货"
        },
        {
          name: "2",
          status: "active",
          workType: "收货"
        },
        {
          name: "3",
          status: "todo",
          workType: "收货"
        },
        {
          name: "2",
          status: "active",
          workType: "收货"
        },
        {
          name: "3",
          status: "todo",
          workType: "收货"
        },
        {
          name: "4444444",
          status: "todo",
          workType: "发货"
        }
      ],
      tableList: [],
      editConfig: {
        visible: false,
        title: "新建",
@@ -106,15 +66,38 @@
      }
    }
  },
  created() {},
  created() {
    this.getData()
  },
  methods: {
    getList(val) {
      console.log(val)
    },
    labelClick(item) {
      this.$router.push({ path: "/overview/overviewList", query: { name: item.name, workType: item.workType } })
      console.log(item)
      this.$router.push({
        name: "overviewList",
        params: { name: item.name, workType: item.baseOperationType, id: item.id }
      })
    },
    getData() {}
    async getData() {
      await getOperationType({
        keyword: "",
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize
      }).then((res) => {
        console.log(res.data.data)
        if (res.data.code === 200) {
          const list = res.data.data.map((item) => {
            return {
              ...item
            }
          })
          this.tableList = list || []
          this.pagerOptions.totalCount = res.data.total
        }
      })
    }
  }
}
</script>

 src/views/productManage/product/AddProductDialog.vue

@@ -38,27 +38,28 @@
        </div>

        <div class="basic-info">
          <FormBtnsView :add-product="addProduct" @inOutBoundClick="inOutBoundClick" :show-procure="showProcure" />
          <FormBtnsView
            :add-product="addProduct"
            @inOutBoundClick="inOutBoundClick"
            :show-procure="showProcure"
            :show-sale="showSale"
          />
          <div class="basic-info-view">
            <el-row>
              <el-col :span="20">
                <div style="margin-left: 20px">产品名称</div>
                <el-form-item label="" prop="client_name" label-width="20px">
                  <el-input
                    v-model="editConfig.infomation.client_name"
                    placeholder=""
                    :disabled="!showFooter"
                  ></el-input>
              <el-col :span="23">
                <div style="margin-left: 20px"><span style="color: #f56c6c">*</span>产品名称</div>
                <el-form-item label="" prop="name" label-width="20px">
                  <el-input v-model="editConfig.infomation.name" placeholder="" :disabled="!showFooter"></el-input>
                </el-form-item>
              </el-col>
              <el-col :span="4">
              <!-- <el-col :span="4">
                <div class="upload" @click="toGetImg">
                  <img v-if="imageSrc" :src="imageSrc" style="height: 90px; width: 90px" />
                  <div v-else class="upload-icon"><i class="el-icon-plus"></i></div>
                </div>
              </el-col>
              <el-col :span="24">
                <div style="margin-left: 20px; margin-top: -30px">
              </el-col> -->
              <!-- <el-col :span="24">
                <div style="margin-left: 20px">
                  <el-checkbox v-model="marketable" :disabled="!showFooter" @change="checkboxChange('销售', $event)"
                    >可销售</el-checkbox
                  >
@@ -66,144 +67,135 @@
                    >可采购</el-checkbox
                  >
                </div>
              </el-col>
              </el-col> -->
            </el-row>
          </div>
          <div class="bottom">
            <el-tabs v-model="activeName" type="card">
              <el-tab-pane label="基本信息" name="first"></el-tab-pane>
              <el-tab-pane label="销售" name="sale"></el-tab-pane>
              <el-tab-pane label="采购" name="second"></el-tab-pane>
              <!-- <el-tab-pane label="销售" name="sale"></el-tab-pane>
              <el-tab-pane label="采购" name="second"></el-tab-pane> -->
              <el-tab-pane label="库存" name="third"></el-tab-pane>
              <el-tab-pane label="会计" name="four"></el-tab-pane>
              <!-- <el-tab-pane label="会计" name="four"></el-tab-pane> -->
            </el-tabs>
            <!-- 基本信息 -->
            <div v-if="activeName === 'first'">
              <div class="purchase-view">
                <div class="left">
                  <el-form-item label="产品类型" prop="client_name" style="margin-left: 20px">
                  <el-form-item label="产品类型" prop="productType" style="margin-left: 20px">
                    <el-select
                      v-model="editConfig.infomation.memberId"
                      v-model="editConfig.infomation.productType"
                      placeholder="请选择"
                      size="mini"
                      style="width: 85%"
                      :disabled="!showFooter"
                    >
                      <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
                      <el-option v-for="item in productTypeOptions" :key="item.id" :label="item.name" :value="item.id">
                      </el-option>
                    </el-select>
                  </el-form-item>
                  <el-form-item label="开票策略" prop="client_name" style="margin-left: 20px">
                  <el-form-item label="开票策略" prop="invoicingStrategy" style="margin-left: 20px">
                    <el-select
                      v-model="editConfig.infomation.memberId"
                      v-model="editConfig.infomation.invoicingStrategy"
                      placeholder="请选择"
                      size="mini"
                      style="width: 85%"
                      :disabled="!showFooter"
                    >
                      <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
                      <el-option v-for="item in strategyOptions" :key="item.id" :label="item.name" :value="item.id">
                      </el-option>
                    </el-select>
                    <div class="font_size_13" style="color: gray">可储存的产品是您管理库存水平的实物项目。</div>
                    <div class="font_size_13" style="color: gray">您可以在发货前为其开具结算单。</div>
                  </el-form-item>
                  <el-form-item label="物料类型" prop="model">
                  <el-form-item label="物料类型" prop="model" style="margin-left: 20px">
                    <el-select
                      v-model="form.model"
                      v-model="editConfig.infomation.model"
                      placeholder="请选择"
                      filterable
                      clearable
                      style="width: 100%"
                      style="width: 85%"
                      :popper-append-to-body="false"
                    >
                      <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">
                    <el-input v-model="form.unit" placeholder="请输入"></el-input>
                  <el-form-item label="单位" prop="unit" style="margin-left: 20px">
                    <el-input v-model="editConfig.infomation.unit" placeholder="请输入" style="width: 85%"></el-input>
                  </el-form-item>
                  <el-form-item label="产品类别" prop="client_name" style="margin-left: 20px">
                    <el-select
                      v-model="editConfig.infomation.memberId"
                      placeholder="请选择"
                      size="mini"

                  <el-form-item label="产品标签" prop="productTagName" style="margin-left: 20px">
                    <el-input
                      v-model="editConfig.infomation.productTagName"
                      placeholder="请输入"
                      style="width: 85%"
                      :disabled="!showFooter"
                    >
                      <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
                      </el-option>
                    </el-select>
                  </el-form-item>
                  <el-form-item label="产品标签" prop="client_name" style="margin-left: 20px">
                    <el-select
                      v-model="editConfig.infomation.memberId"
                      placeholder="请选择"
                      size="mini"
                      style="width: 85%"
                      :disabled="!showFooter"
                    >
                      <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
                      </el-option>
                    </el-select>
                  </el-form-item>
                  <el-form-item label="公司" prop="client_name" style="margin-left: 20px">
                    <el-select
                      v-model="editConfig.infomation.memberId"
                      placeholder="请选择"
                      size="mini"
                      style="width: 85%"
                      :disabled="!showFooter"
                    >
                      <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
                      </el-option>
                    </el-select>
                    ></el-input>
                  </el-form-item>
                </div>
                <div class="right">
                  <el-form-item label="销售价格" prop="name" style="margin-left: 20px">
                  <el-form-item label="销售价格" prop="salePrice" style="margin-left: 20px">
                    <span>￥</span>
                    <el-input
                      v-model.trim="editConfig.infomation.name"
                    <el-input-number
                      v-model.trim="editConfig.infomation.salePrice"
                      placeholder="请输入"
                      :min="0"
                      :controls="false"
                      size="mini"
                      style="width: 85%"
                      style="width: 81%"
                      :disabled="!showFooter"
                    ></el-input>
                    ></el-input-number>
                  </el-form-item>
                  <el-form-item label="销项税" prop="client_name" style="margin-left: 20px">
                  <el-form-item label="销项税" prop="customerTaxes" style="margin-left: 20px">
                    <el-input-number
                      v-model="editConfig.infomation.customerTaxes"
                      placeholder="请输入"
                      :min="0"
                      :controls="false"
                      style="width: 85%; margin-right: 5px"
                    ></el-input-number>
                  </el-form-item>
                  <el-form-item label="成本" prop="cost" style="margin-left: 20px">
                    <span>￥</span>
                    <el-input-number
                      v-model.trim="editConfig.infomation.cost"
                      placeholder="请输入"
                      :min="0"
                      :controls="false"
                      size="mini"
                      style="width: 81%"
                      :disabled="!showFooter"
                    ></el-input-number>
                  </el-form-item>
                  <el-form-item label="产品类别" prop="categoryId" style="margin-left: 20px">
                    <el-select
                      v-model="editConfig.infomation.memberId"
                      multiple
                      v-model="editConfig.infomation.categoryId"
                      placeholder="请选择"
                      size="mini"
                      style="width: 85%"
                      :disabled="!showFooter"
                    >
                      <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
                      <el-option
                        v-for="item in productCategoryOptions"
                        :key="item.id"
                        :label="item.name"
                        :value="item.id"
                      >
                      </el-option>
                    </el-select>
                  </el-form-item>
                  <el-form-item label="成本" prop="name" style="margin-left: 20px">
                    <span>￥</span>
                  <el-form-item label="内部参考" prop="internalReference" style="margin-left: 20px">
                    <el-input
                      v-model.trim="editConfig.infomation.name"
                      v-model.trim="editConfig.infomation.internalReference"
                      placeholder="请输入"
                      size="mini"
                      style="width: 85%"
                      :disabled="!showFooter"
                    ></el-input>
                  </el-form-item>
                  <el-form-item label="内部参考" prop="name" style="margin-left: 20px">
                  <el-form-item label="条码" prop="barcode" style="margin-left: 20px">
                    <el-input
                      v-model.trim="editConfig.infomation.name"
                      placeholder="请输入"
                      size="mini"
                      style="width: 85%"
                      :disabled="!showFooter"
                    ></el-input>
                  </el-form-item>
                  <el-form-item label="条码" prop="name" style="margin-left: 20px">
                    <el-input
                      v-model.trim="editConfig.infomation.name"
                      v-model.trim="editConfig.infomation.barcode"
                      placeholder="请输入"
                      size="mini"
                      style="width: 85%"
@@ -214,41 +206,197 @@
              </div>
              <div class="all">
                <div class="second-label">内部说明</div>
                <el-form-item label="" prop="name" style="margin-left: 20px" label-width="0px">
                <el-form-item label="" prop="internalNotes" style="margin-left: 20px" label-width="0px">
                  <el-input
                    v-model.trim="editConfig.infomation.desc"
                    v-model.trim="editConfig.infomation.internalNotes"
                    placeholder="请输入"
                    size="mini"
                    type="textarea"
                    style="width: 100%"
                    style="width: 95%"
                    :autosize="{ minRows: 4 }"
                    :disabled="!showFooter"
                  ></el-input>
                </el-form-item>
              </div>
            </div>
            <!-- 销售 -->
            <div v-if="activeName === 'sale'">
            <!-- 库存 -->
            <div v-if="activeName === 'third'">
              <div class="purchase-view">
                <div class="all">
                  <div class="second-label">物流</div>
                </div>
              </div>
              <div class="purchase-view">
                <!-- <div class="left">
                  <div class="second-label">操作</div>
                  <el-form-item label="路线" prop="checkedRoute" style="margin-left: 20px">
                    <el-checkbox-group v-model="checkedRoute" :min="1" :max="2">
                      <el-checkbox v-for="city in route" :label="city" :key="city" class="list-item">{{
                        city.length > 20 ? city.substring(0, 20) + "..." : city
                      }}</el-checkbox>
                    </el-checkbox-group>
                  </el-form-item>
                </div> -->

                <div class="left">
                  <div class="second-label">{{ "加售&交叉销售" }}</div>
                  <el-form-item label="可选产品" prop="checkedCities" style="margin-left: 20px">
                  <el-form-item label="负责人" prop="principal" style="margin-left: 20px" label-width="80px">
                    <el-select
                      v-model="editConfig.infomation.memberId"
                      v-model="editConfig.infomation.principal"
                      placeholder="请选择"
                      size="mini"
                      style="width: 85%"
                      :disabled="!showFooter"
                    >
                      <el-option v-for="item in memberOptions" :key="item.id" :label="item.name" :value="item.name">
                      </el-option>
                    </el-select>
                  </el-form-item>
                  <el-form-item label="重量" prop="weight" style="margin-left: 20px" label-width="80px">
                    <el-input-number
                      v-model="editConfig.infomation.weight"
                      placeholder="请输入"
                      :min="0"
                      :precision="2"
                      :controls="false"
                      style="width: 85%"
                      :disabled="!showFooter"
                    ></el-input-number>
                    <span> kg</span>
                  </el-form-item>
                  <el-form-item label="体积" prop="volume" style="margin-left: 20px" label-width="80px">
                    <el-input-number
                      v-model="editConfig.infomation.volume"
                      placeholder="请输入"
                      :min="0"
                      :precision="2"
                      :controls="false"
                      style="width: 85%"
                      :disabled="!showFooter"
                    ></el-input-number>
                    <span> m³</span>
                  </el-form-item>
                </div>
                <div class="right">
                  <el-form-item
                    label="制造前置时间"
                    prop="deliveryAdvanceTime"
                    style="margin-left: 20px"
                    label-width="130px"
                  >
                    <el-input-number
                      v-model="editConfig.infomation.deliveryAdvanceTime"
                      placeholder="请输入"
                      :min="0"
                      :precision="0"
                      :controls="false"
                      style="width: 85%"
                      :disabled="!showFooter"
                    ></el-input-number>
                    <span> 天数</span>
                  </el-form-item>
                  <el-form-item label="生产订单准备天数" prop="name" style="margin-left: 20px" label-width="130px">
                    <el-input-number
                      v-model="editConfig.infomation.customerTaxes"
                      placeholder="请输入"
                      :min="0"
                      :precision="0"
                      :controls="false"
                      style="width: 85%"
                      :disabled="!showFooter"
                    ></el-input-number>
                    <span> 天数</span>
                  </el-form-item>
                  <el-form-item label="客户前置时间" prop="aaa" style="margin-left: 20px" label-width="130px">
                    <el-select
                      v-model="editConfig.infomation.aaa"
                      multiple
                      placeholder="请选择"
                      size="mini"
                      style="width: 85%"
                      :disabled="!showFooter"
                    >
                      <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
                      <el-option v-for="item in aaaOptions" :key="item.id" :label="item.username" :value="item.id">
                      </el-option>
                    </el-select>
                  </el-form-item>
                </div>
              </div>
              <div class="purchase-view">
                <div class="left">
                  <div class="second-label">收货说明</div>
                  <el-form-item label="" prop="inStorageExplain" style="margin-left: 20px" label-width="0px">
                    <el-input
                      v-model.trim="editConfig.infomation.inStorageExplain"
                      placeholder="此说明添加到收货订单中(例如，产品在仓库的存储位置)"
                      size="mini"
                      type="textarea"
                      style="width: 95%"
                      :autosize="{ minRows: 4 }"
                      :disabled="!showFooter"
                    ></el-input>
                  </el-form-item>
                </div>
                <div class="right">
                  <div class="second-label">出库单说明</div>
                  <el-form-item label="" prop="outStorageExplain" style="margin-left: 20px" label-width="0px">
                    <el-input
                      v-model.trim="editConfig.infomation.outStorageExplain"
                      placeholder="此通知已添加到送货单中"
                      size="mini"
                      type="textarea"
                      style="width: 95%"
                      :autosize="{ minRows: 4 }"
                      :disabled="!showFooter"
                    ></el-input>
                  </el-form-item>
                </div>
              </div>
              <div class="purchase-view">
                <div class="left">
                  <div class="second-label">内部调拨说明</div>
                  <el-form-item label="" prop="internalTransferExplain" style="margin-left: 20px" label-width="0px">
                    <el-input
                      v-model.trim="editConfig.infomation.internalTransferExplain"
                      placeholder="此说明添加到内部调拨订单中(例如，在仓库中何处提取产品)"
                      size="mini"
                      type="textarea"
                      style="width: 100%"
                      :autosize="{ minRows: 4 }"
                      :disabled="!showFooter"
                    ></el-input>
                  </el-form-item>
                </div>
                <div class="right"></div>
              </div>
            </div>
            <!-- 下面不要删 二期或三期会用到 -->
            <!-- 销售 -->
            <!-- <div v-if="activeName === 'sale'">
              <div class="purchase-view">
                <div class="left">
                  <div class="second-label">{{ "加售&交叉销售" }}</div>
                  <el-form-item label="可选产品" prop="selectProduct" style="margin-left: 20px">
                    <el-select
                      v-model="editConfig.infomation.selectProduct"
                      multiple
                      placeholder="请选择"
                      size="mini"
                      style="width: 85%"
                      :disabled="!showFooter"
                    >
                      <el-option
                        v-for="item in selectProductOptions"
                        :key="item.id"
                        :label="item.name"
                        :value="item.id"
                      >
                      </el-option>
                    </el-select>
                  </el-form-item>
                  <div class="second-label">销售说明</div>
                  <el-form-item label="" prop="desc" style="margin-left: 20px" label-width="20px">
                  <el-form-item label="" prop="sellExplain" style="margin-left: 20px" label-width="20px">
                    <el-input
                      v-model.trim="editConfig.infomation.desc"
                      v-model.trim="editConfig.infomation.sellExplain"
                      size="mini"
                      type="textarea"
                      style="width: 85%"
@@ -259,9 +407,9 @@
                </div>
                <div class="right"></div>
              </div>
            </div>
            </div> -->
            <!-- 采购 -->
            <div v-if="activeName === 'second'">
            <!-- <div v-if="activeName === 'second'">
              <CommonFormTableView
                :product-table-list="productTableList"
                :detail-enter="!showFooter"
@@ -316,137 +464,7 @@
                  </el-form-item>
                </div>
              </div>
            </div>
            <!-- 库存 -->
            <div v-if="activeName === 'third'">
              <div class="purchase-view">
                <div class="left">
                  <div class="second-label">作业</div>
                  <el-form-item label="路线" prop="checkedCities" style="margin-left: 20px">
                    <el-checkbox-group v-model="checkedCities" :min="1" :max="2">
                      <el-checkbox v-for="city in cities" :label="city" :key="city" class="list-item">{{
                        city.length > 20 ? city.substring(0, 20) + "..." : city
                      }}</el-checkbox>
                    </el-checkbox-group>
                  </el-form-item>
                </div>
                <div class="right">
                  <div class="second-label">物流</div>
                  <el-form-item label="负责人" prop="name" style="margin-left: 20px">
                    <el-select
                      v-model="editConfig.infomation.memberId"
                      multiple
                      placeholder="请选择"
                      size="mini"
                      style="width: 85%"
                      :disabled="!showFooter"
                    >
                      <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
                      </el-option>
                    </el-select>
                  </el-form-item>
                  <el-form-item label="重量" prop="client_name" style="margin-left: 20px">
                    <el-input
                      v-model.trim="editConfig.infomation.name"
                      placeholder="请输入"
                      size="mini"
                      style="width: 85%"
                      :disabled="!showFooter"
                    ></el-input>
                    <span> kg</span>
                  </el-form-item>
                  <el-form-item label="体积" prop="client_name" style="margin-left: 20px">
                    <el-input
                      v-model.trim="editConfig.infomation.name"
                      placeholder="请输入"
                      size="mini"
                      style="width: 85%"
                      :disabled="!showFooter"
                    ></el-input>
                    <span> m³</span>
                  </el-form-item>
                  <el-form-item label="客户前置时间" prop="client_name" style="margin-left: 20px">
                    <el-input
                      v-model.trim="editConfig.infomation.name"
                      placeholder="请输入"
                      size="mini"
                      style="width: 85%"
                      :disabled="!showFooter"
                    ></el-input>
                    <span> 天</span>
                  </el-form-item>
                  <el-form-item label="HS编码" prop="name" style="margin-left: 20px">
                    <el-input
                      v-model.trim="editConfig.infomation.name"
                      placeholder="请输入"
                      size="mini"
                      style="width: 85%"
                      :disabled="!showFooter"
                    ></el-input>
                  </el-form-item>
                  <el-form-item label="货物原产地" prop="name" style="margin-left: 20px">
                    <el-select
                      v-model="editConfig.infomation.memberId"
                      multiple
                      placeholder="请选择"
                      size="mini"
                      style="width: 85%"
                      :disabled="!showFooter"
                    >
                      <el-option v-for="item in memberOptions" :key="item.id" :label="item.username" :value="item.id">
                      </el-option>
                    </el-select>
                  </el-form-item>
                </div>
              </div>
              <div class="purchase-view">
                <div class="left">
                  <div class="second-label">收货说明</div>
                  <el-form-item label="" prop="name" style="margin-left: 20px" label-width="0px">
                    <el-input
                      v-model.trim="editConfig.infomation.desc"
                      placeholder="此说明添加到收货订单中"
                      size="mini"
                      type="textarea"
                      style="width: 100%"
                      :autosize="{ minRows: 4 }"
                      :disabled="!showFooter"
                    ></el-input>
                  </el-form-item>
                </div>
                <div class="right">
                  <div class="second-label">出库单说明</div>
                  <el-form-item label="" prop="name" style="margin-left: 20px" label-width="0px">
                    <el-input
                      v-model.trim="editConfig.infomation.desc"
                      placeholder="请输入"
                      size="mini"
                      type="textarea"
                      style="width: 100%"
                      :autosize="{ minRows: 4 }"
                      :disabled="!showFooter"
                    ></el-input>
                  </el-form-item>
                </div>
              </div>
              <div class="purchase-view">
                <div class="left">
                  <div class="second-label">内部调拨说明</div>
                  <el-form-item label="" prop="name" style="margin-left: 20px" label-width="0px">
                    <el-input
                      v-model.trim="editConfig.infomation.desc"
                      placeholder="请输入"
                      size="mini"
                      type="textarea"
                      style="width: 100%"
                      :autosize="{ minRows: 4 }"
                      :disabled="!showFooter"
                    ></el-input>
                  </el-form-item>
                </div>
                <div class="right"></div>
              </div>
            </div>
            </div> -->
          </div>
        </div>
      </el-form>
@@ -461,7 +479,9 @@
</template>

<script>
import CommonFormTableView from "@/components/makepager/CommonFormTableView"
// import CommonFormTableView from "@/components/makepager/CommonFormTableView"
import { getProductCategoryList } from "@/api/product/productCategory"
import { getProductList, addProduct, updateProduct } from "@/api/product/product"

let inputElement = null
export default {
@@ -473,32 +493,40 @@
        return {
          visible: false,
          title: "新建",
          infomation: { type: [] }
          infomation: {}
        }
      }
    }
  },
  components: { CommonFormTableView },
  components: {},
  computed: {},
  data() {
    return {
      dialogWidth: "50%",
      editConfig: this.editCommonConfig,
      rules: {
        client_name: [{ required: true, message: "请选择客户名称", trigger: "change" }],
        number: [{ required: true, message: "请输入退款单编号", trigger: "blur" }],
        refundDate: [{ required: true, message: "请选择退款日期", trigger: "change" }],
        memberId: [{ required: true, message: "请选择销售负责人", trigger: "change" }],
        sale_return_nunber: [{ required: true, message: "请选择销售退货单", trigger: "change" }]
        name: [{ required: true, message: "请输入产品名称", trigger: "blur" }],
        model: [{ required: true, message: "请选择物料类型", trigger: "change" }],
        salePrice: [{ required: true, message: "请输入销售价格", trigger: "blur" }],
        unit: [{ required: true, message: "请输入单位", trigger: "blur" }]
      },
      memberOptions: [],
      paymentTypeListOptions: [],
      numberList: [
        { label: "草稿", status: "todo" },
        { label: "正在等待", status: "todo" },
        { label: "就绪", status: "todo" },
        { label: "完成", status: "todo" }
      memberOptions: [
        {
          name: "admin",
          id: 1
        }
      ],
      productCategoryOptions: [], // 产品类别
      productTypeOptions: [
        { name: "能消耗", id: 1 },
        { name: "服务", id: 2 },
        { name: "可库存产品", id: 3 }
      ], // 产品类型
      strategyOptions: [
        { name: "订购数量", id: 1 },
        { name: "交付数量", id: 2 }
      ], // 开票策略
      selectProductOptions: [], // 可选产品
      showButton: true,
      activeName: "first",
      productTableList: {},
@@ -510,10 +538,11 @@
      imageSrc: "", // 图片地址
      marketable: true, // 可销售
      procurable: true, // 可采购
      checkedCities: ["上海", "北京"],
      cities: ["上海对对对对对对多多多多多多多北京对对对对对对", "北京对对对对对对多", "广州", "深圳"],
      checkedRoute: [],
      route: ["制造", "河池生产制造仓"],
      addProduct: false,
      showProcure: true,
      showSale: true,
      materialTypeList: [
        {
          name: "原材料",
@@ -543,10 +572,42 @@
    }
  },
  created() {
    this.getProductCategoryList()
    this.getProductList()
    this.setTableForm()
    this.setBottonView()
  },
  methods: {
    // 获取产品类别
    async getProductCategoryList() {
      await getProductCategoryList({
        keyWord: "",
        page: 0,
        pageSize: 0
      }).then((res) => {
        if (res.code === 200) {
          this.productCategoryOptions = res.data
        }
      })
    },
    // 获取可选产品
    async getProductList() {
      await getProductList({
        keyWord: "",
        page: 1,
        pageSize: 20
      }).then((res) => {
        if (res.code === 200) {
          const list = res.data.map((item) => {
            return {
              id: item.id,
              name: item.name
            }
          })
          this.selectProductOptions = list || []
        }
      })
    },
    // 设置删除/打印/编辑是否显示
    setBottonView() {
      if (this.editConfig.title === "新建") {
@@ -572,7 +633,24 @@
      this.setTableForm()
    },
    // 保存
    saveClick() {},
    saveClick(formName) {
      console.log(this.editConfig.infomation)
      this.$refs[formName].validate((valid) => {
        if (valid) {
          let requestUrl = this.editConfig.title === "新建" ? addProduct : updateProduct
          requestUrl({
            ...this.editConfig.infomation
          }).then((res) => {
            console.log(res)
            this.editConfig.visible = false
            if (res.code === 200) {
              this.$message.success("添加成功")
              this.$parent.getData()
            }
          })
        }
      })
    },
    // 删除
    delClick() {},
    setTableForm() {
@@ -679,12 +757,16 @@
    },
    // 进出点击
    inOutBoundClick() {
      this.$router.push({ path: "/reportForm/inOutboundDetail", query: { name: "产品名称/出入库明细" } })
      if (this.editConfig.title !== "新建") {
        this.$router.push({ path: "/reportForm/inOutboundDetail", query: { name: "产品名称/出入库明细" } })
      }
    },
    // 可销售/可采购
    checkboxChange(val, param) {
      if (val === "采购") {
        this.showProcure = param
      } else if (val === "销售") {
        this.showSale = param
      }
    }
  }
@@ -775,9 +857,13 @@
    .right {
      width: 50%;
    }
    .all {
      width: 100%;
    }
  }
  .second-label {
    margin-left: 20px;
    margin-right: 20px;
    border-bottom: 1px solid #d9d9d9;
    margin-bottom: 10px;
  }
@@ -827,5 +913,8 @@
    line-height: 30px;
    font-size: 13px;
  }
  .el-input__inner {
    text-align: left;
  }
}
</style>

 src/views/productManage/product/index.vue

@@ -35,15 +35,16 @@
          </div>
          <div class="right">
            <div class="label">
              <span>南方丝巢SOUTHSILK 19姆米真丝睡衣女 100%桑蚕丝 长版套装家 </span>
              <span>{{ item.name }}</span>
            </div>
            <div class="price">
              <span>价格:￥</span>
              <span>{{ item.name }}</span>
              <span>{{ item.salePrice }}</span>
            </div>
            <div class="library">
              <span>在库：</span>
              <span>{{ item.name }}</span>
              <span>{{ item.amount }}</span>
              <span style="margin-left: 5px">{{ item.unit }}</span>
            </div>
          </div>
        </div>
@@ -62,7 +63,7 @@
        </div> -->
      </div>
      <div class="btn-pager">
        <PagerView class="page" :pager-options="pagerOptions" v-on="pagerEvents" />
        <PagerView class="page" :pager-options="pagerOptions" :page-size="pageSizes" v-on="pagerEvents" />
      </div>
    </div>
    <!-- 新建/编辑 -->
@@ -98,7 +99,8 @@
        infomation: {}
      },
      isIconIndex: "1", // 1 图标 2 列表
      url: "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg"
      url: "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg",
      pageSizes: [15, 30]
    }
  },
  created() {
@@ -107,6 +109,10 @@
  },
  methods: {
    setTable() {
      if (this.isIconIndex === "1") {
        this.pageSizes = [30, 60]
        this.pagerOptions.pageSize = 30
      }
      this.tableList = {
        tableInfomation: [],
        selectBox: true,
@@ -127,75 +133,74 @@
      let tableColumn = [
        {
          label: "产品名称",
          prop: "id",
          prop: "name",
          isShowColumn: true,
          default: true
        },
        {
          label: "内部参考",
          prop: "deviceName",
          prop: "internalReference",
          isShowColumn: showcol.includes("内部参考"),
          default: false
        },
        {
          label: "负责人",
          prop: "id",
          prop: "principal",
          isShowColumn: true,
          default: true
        },
        {
          label: "产品标签",
          prop: "deviceId",
          prop: "productTagName",
          isShowColumn: showcol.includes("产品标签"),
          default: false
        },
        {
          label: "条码",
          prop: "shopName",
          prop: "barcode",
          isShowColumn: showcol.includes("条码"),
          default: false
        },
        {
          label: "销售价格",
          prop: "faultLevel",
          prop: "salePrice",
          isShowColumn: showcol.includes("销售价格"),
          default: false
        },
        {
          label: "成本",
          prop: "status",
          prop: "cost",
          isShowColumn: showcol.includes("成本"),
          default: false,
          status: true
          default: false
        },
        {
          label: "产品类别",
          prop: "faultTime",
          prop: "categoryName",
          isShowColumn: showcol.includes("产品类别"),
          default: false
        },
        {
          label: "产品类型",
          prop: "shopName",
          prop: "productType",
          isShowColumn: showcol.includes("产品类型"),
          default: false
        },
        {
          label: "在库数量",
          prop: "faultLevel",
          prop: "amount",
          isShowColumn: showcol.includes("在库数量"),
          default: false
        },
        {
          label: "预测数量",
          prop: "status",
          isShowColumn: showcol.includes("预测数量"),
          default: false,
          status: true
        },
        // {
        //   label: "预测数量",
        //   prop: "status",
        //   isShowColumn: showcol.includes("预测数量"),
        //   default: false,
        //   status: true
        // },
        {
          label: "计量单位",
          prop: "faultTime",
          prop: "unit",
          isShowColumn: showcol.includes("计量单位"),
          default: false
        }
@@ -207,33 +212,34 @@
      this.tableList.tableColumn = this.setTableColumn(val)
    },
    // 请求数据
    async getData(val, content) {
    async getData(val) {
      await getProductList({
        [val]: content,
        keyWord: val,
        page: this.pagerOptions.currPage,
        pageSize: this.pagerOptions.pageSize
      }).then((res) => {
        if (res.data.code === 200) {
          const list = res.data.data.list.map((item) => {
        if (res.code === 200) {
          const list = res.data.map((item) => {
            return {
              ...item,
              supplierNumber: item.supplier.number
              ...item
            }
          })
          this.tableList.tableInfomation = list || []
          this.pagerOptions.totalCount = res.data.data.total
          this.pagerOptions.totalCount = res.total
        }
      })
    },
    // 搜索
    searchClick(val) {
      console.log(val)
      this.getData()
      this.pagerOptions.currPage = 1
      this.getData(val)
    },
    // 新建
    addBtnClick() {
      this.editConfig.visible = true
      this.editConfig.title = "新建"
      this.editConfig.infomation = {}
    },
    // 行点击
    tableRowClick(row) {
@@ -244,7 +250,16 @@
    },
    // 切换列表展现形式
    selIconSwitchClick(value) {
      this.pagerOptions.currPage = 1
      this.isIconIndex = value
      if (value === "1") {
        this.pageSizes = [30, 60]
        this.pagerOptions.pageSize = 30
      } else {
        this.pageSizes = [15, 30]
        this.pagerOptions.pageSize = 15
      }
      this.getData()
    }
  }
}
@@ -288,8 +303,8 @@
  justify-content: flex-start;
  align-content: flex-start;
  .product-box {
    width: 295px;
    height: 84px;
    width: 294px;
    height: 94px;
    margin-bottom: 10px;
    margin-right: 20px;
    border: 1px solid #dee2e6;
@@ -298,6 +313,7 @@
    -webkit-box-shadow: inset 0 0 2px #dee2e6;
    padding: 8px;
    display: flex;
    align-items: center;
    .left {
      width: 60px;
      text-align: center;
@@ -308,6 +324,7 @@
      margin-left: 10px;
      .label {
        color: #212529;
        margin-top: -10px;
        margin-right: 15px;
        word-break: break-all;
        word-wrap: break-word;
@@ -315,7 +332,7 @@
      .price,
      .library {
        color: #495057;
        margin-top: 3px;
        margin-top: 15px;
      }
    }
  }