admin
2024-11-26 d6049cdf6566f6985b8c713217907c8710a50711
-物料信息 工位信息 优化
已修改3个文件
288 ■■■■■ 文件已修改
billion-ui/src/views/main/bs/materialInfo/index.vue 150 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
billion-ui/src/views/main/bs/routeInfo/ProductSelector.vue 115 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
billion-ui/src/views/main/bs/routeInfo/index.vue 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
billion-ui/src/views/main/bs/materialInfo/index.vue
@@ -169,66 +169,96 @@
    <!-- 添加或修改物料信息对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
      <el-form :inline="true" ref="form" :model="form" :rules="rules" label-width="80px">
        <el-form-item label="物料编号" prop="materialCode">
          <el-input v-model="form.materialCode" placeholder="请输入物料编号" />
        </el-form-item>
        <el-form-item label="物料名称" prop="materialName">
          <el-input v-model="form.materialName" placeholder="请输入物料名称" />
        </el-form-item>
        <el-form-item label="视图" prop="materialView">
          <el-input v-model="form.materialView" placeholder="请输入视图" />
        </el-form-item>
        <el-form-item label="种类" prop="typeZ">
          <el-select v-model="form.typeZ" placeholder="请选择种类">
            <el-option
              v-for="dict in dict.type.type_z"
              :key="dict.value"
              :label="dict.label"
              :value="dict.value"
            ></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="类型" prop="typeL">
          <el-select v-model="form.typeL" placeholder="请选择类型">
            <el-option
              v-for="dict in dict.type.type_l"
              :key="dict.value"
              :label="dict.label"
              :value="dict.value"
            ></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="单位" prop="unit">
          <el-select v-model="form.unit" placeholder="请选择单位">
            <el-option
              v-for="dict in dict.type.unit"
              :key="dict.value"
              :label="dict.label"
              :value="dict.value"
            ></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="版本" prop="version">
          <el-input v-model="form.version" placeholder="请输入版本" />
        </el-form-item>
        <el-form-item label="状态" prop="status">
          <el-radio-group v-model="form.status">
            <el-radio
              v-for="dict in dict.type.sys_normal_disable"
              :key="dict.value"
              :label="dict.value"
            >{{dict.label}}</el-radio>
          </el-radio-group>
        </el-form-item>
        <el-form-item label="厂商" prop="supplier">
          <el-input v-model="form.supplier" placeholder="请输入厂商" />
        </el-form-item>
        <el-form-item label="备注" prop="remark">
          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
        </el-form-item>
        <el-form-item label="数据来源" prop="dataSource">
          <el-input v-model="form.dataSource" placeholder="请输入数据来源" />
        </el-form-item>
        <el-row :gutter="10">
          <el-col span="8">
            <el-form-item label="物料编号" prop="materialCode">
              <el-input v-model="form.materialCode" placeholder="请输入物料编号" />
            </el-form-item>
          </el-col>
          <el-col span="8">
            <el-form-item label="物料名称" prop="materialName">
              <el-input v-model="form.materialName" placeholder="请输入物料名称" />
            </el-form-item>
          </el-col>
          <el-col span="8">
            <el-form-item label="视图" prop="materialView">
              <el-input v-model="form.materialView" placeholder="请输入视图" />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="10">
          <el-col span="8">
            <el-form-item label="种类" prop="typeZ">
              <el-select style="width: 93%" v-model="form.typeZ" placeholder="请选择种类">
                <el-option
                  v-for="dict in dict.type.type_z"
                  :key="dict.value"
                  :label="dict.label"
                  :value="dict.value"
                ></el-option>
              </el-select>
            </el-form-item>
          </el-col>
          <el-col span="8">
            <el-form-item label="类型" prop="typeL">
              <el-select style="width: 93%" v-model="form.typeL" placeholder="请选择类型">
                <el-option
                  v-for="dict in dict.type.type_l"
                  :key="dict.value"
                  :label="dict.label"
                  :value="dict.value"
                ></el-option>
              </el-select>
            </el-form-item>
          </el-col>
          <el-col span="8">
            <el-form-item label="单位" prop="unit">
              <el-select style="width: 93%" v-model="form.unit" placeholder="请选择单位">
                <el-option
                  v-for="dict in dict.type.unit"
                  :key="dict.value"
                  :label="dict.label"
                  :value="dict.value"
                ></el-option>
              </el-select>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="10">
          <el-col span="8">
            <el-form-item label="版本" prop="version">
              <el-input v-model="form.version" placeholder="请输入版本" />
            </el-form-item>
          </el-col>
          <el-col span="8">
            <el-form-item label="数据来源" prop="dataSource">
              <el-input v-model="form.dataSource" placeholder="请输入数据来源" />
            </el-form-item>
          </el-col>
          <el-col span="8">
            <el-form-item label="厂商" prop="supplier">
              <el-input v-model="form.supplier" placeholder="请输入厂商" />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="10">
          <el-col span="8">
            <el-form-item label="备注" prop="remark">
              <el-input v-model="form.remark" placeholder="请输入内容" />
            </el-form-item>
          </el-col>
          <el-col span="8">
            <el-form-item label="状态" prop="status">
              <el-radio-group v-model="form.status">
                <el-radio
                  v-for="dict in dict.type.sys_normal_disable"
                  :key="dict.value"
                  :label="dict.value"
                >{{dict.label}}</el-radio>
              </el-radio-group>
            </el-form-item>
          </el-col>
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitForm">确 定</el-button>
billion-ui/src/views/main/bs/routeInfo/ProductSelector.vue
@@ -1,11 +1,70 @@
<template>
  <el-dialog :title="title" :visible.sync="visible" @close="handleClose">
    <el-table :data="gridData" selection="single" ref="multipleTable" @selection-change="productSelectionChange">
      <el-table-column type="selection" width="55"></el-table-column>
      <el-table-column property="date" label="日期" width="150"></el-table-column>
      <el-table-column property="name" label="姓名" width="200"></el-table-column>
      <el-table-column property="address" label="地址"></el-table-column>
  <el-dialog :title="title" :visible.sync="visible" width="1000px" @close="handleClose">
    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="物料编号" prop="materialCode">
        <el-input
          v-model="queryParams.materialCode"
          placeholder="请输入物料编号"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="物料名称" prop="materialName">
        <el-input
          v-model="queryParams.materialName"
          placeholder="请输入物料名称"
          clearable
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item style="float: right">
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
      </el-form-item>
    </el-form>
    <el-table border ref="multipleTable" v-loading="loading" :data="materialInfoList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column :show-overflow-tooltip="true" label="物料编号" align="center" prop="materialCode" />
      <el-table-column :show-overflow-tooltip="true" label="物料名称" align="center" prop="materialName" />
      <el-table-column :show-overflow-tooltip="true" label="视图" align="center" prop="materialView" />
      <el-table-column label="种类" align="center" prop="typeZ">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.type_z" :value="scope.row.typeZ"/>
        </template>
      </el-table-column>
      <el-table-column label="类型" align="center" prop="typeL">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.type_l" :value="scope.row.typeL"/>
        </template>
      </el-table-column>
      <el-table-column label="单位" align="center" prop="unit">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.unit" :value="scope.row.unit"/>
        </template>
      </el-table-column>
      <el-table-column :show-overflow-tooltip="true" label="版本" align="center" prop="version" />
      <el-table-column label="状态" align="center" prop="status">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
        </template>
      </el-table-column>
      <el-table-column :show-overflow-tooltip="true" label="厂商" align="center" prop="supplier" />
      <el-table-column :show-overflow-tooltip="true" label="备注" align="center" prop="remark" />
      <el-table-column :show-overflow-tooltip="true" label="数据来源" align="center" prop="dataSource" />
      <el-table-column :show-overflow-tooltip="true" label="创建用户" align="center" prop="createBy" />
      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
      </el-table-column>
      <el-table-column :show-overflow-tooltip="true" label="更改用户" align="center" prop="updateBy" />
      <el-table-column label="更改时间" align="center" prop="updateTime" width="180">
      </el-table-column>
    </el-table>
    <pagination
      v-show="total>0"
      :total="total"
      :page.sync="queryParams.pageNum"
      :limit.sync="queryParams.pageSize"
      @pagination="getList"
    />
    <div slot="footer" class="dialog-footer">
      <el-button @click="handleClose">取 消</el-button>
      <el-button type="primary" @click="confirmSelection">确 定</el-button>
@@ -14,8 +73,11 @@
</template>
<script>
import {listMaterialInfo} from "@/api/main/bs/materialInfo";
export default {
  name: "ProductSelector",
  dicts: ['sys_normal_disable', 'type_l', 'unit', 'type_z'],
  props: {
    visible: Boolean,
    title: {
@@ -26,14 +88,50 @@
  },
  data() {
    return {
      multipleSelection: []
      // 总条数
      total: 0,
      // 物料信息表格数据
      materialInfoList: [],
      // 遮罩层
      loading: true,
      showSearch: true,
      multipleSelection: [],
      // 查询参数
      queryParams: {
        pageNum: 1,
        pageSize: 10,
        materialCode: null,
        materialName: null,
        materialView: null,
        typeZ: null,
        typeL: null,
        unit: null,
        status: null,
      },
    };
  },
  created() {
    this.getList();
  },
  methods: {
    /** 查询物料信息列表 */
    getList() {
      this.loading = true;
      listMaterialInfo(this.queryParams).then(response => {
        this.materialInfoList = response.rows;
        this.total = response.total;
        this.loading = false;
      });
    },
    /** 搜索按钮操作 */
    handleQuery() {
      this.queryParams.pageNum = 1;
      this.getList();
    },
    handleClose() {
      this.$emit('update:visible', false);
    },
    productSelectionChange(selection) {
    handleSelectionChange(selection) {
      if (selection.length > 1) {
        this.$refs.multipleTable.clearSelection();
        this.$refs.multipleTable.toggleRowSelection(selection[selection.length - 1], true);
@@ -46,6 +144,7 @@
      if (this.multipleSelection.length > 0) {
        this.$emit('select-product', this.multipleSelection[0]);
        this.handleClose();
        this.$refs.multipleTable.clearSelection();
      } else {
        this.$message({
          message: '警告哦,未选择任何行',
billion-ui/src/views/main/bs/routeInfo/index.vue
@@ -193,7 +193,6 @@
    <!-- 产品选择器组件 -->
    <ProductSelector
      :visible="dialogTableVisible"
      :gridData="gridData"
      @select-product="handleSelectProduct"
      @update:visible="dialogTableVisible = $event"
    />
@@ -212,23 +211,6 @@
  data() {
    return {
      multipleSelection: [],
      gridData: [{
        date: '2016-05-02',
        name: '王一虎',
        address: '上海市普陀区金沙江路 1518 弄'
      }, {
        date: '2016-05-04',
        name: '王二虎',
        address: '上海市普陀区金沙江路 1518 弄'
      }, {
        date: '2016-05-01',
        name: '王三虎',
        address: '上海市普陀区金沙江路 1518 弄'
      }, {
        date: '2016-05-03',
        name: '王四虎',
        address: '上海市普陀区金沙江路 1518 弄'
      }],
      dialogTableVisible: false,
      advancedSearchVisible: false,
      // 遮罩层
@@ -281,8 +263,9 @@
  },
  methods: {
    handleSelectProduct(selectedProduct) {
      this.form.productCode = selectedProduct.date;  // 假设你需要的是日期字段
      this.form.productName = selectedProduct.name;  // 假设你需要的是姓名字段
      console.log(selectedProduct)
      this.form.productCode = selectedProduct.materialCode;  // 假设你需要的是日期字段
      this.form.productName = selectedProduct.materialName;  // 假设你需要的是姓名字段
    },
    toggleAdvancedSearch() {
      this.advancedSearchVisible = !this.advancedSearchVisible;