用户管理和外购件调整

spring

2025-04-01 f24b25731e8f1c42c9d123327cfe3453e18b3fd1

用户管理和外购件调整

 src/api/system/user.js

@@ -155,7 +155,7 @@
  return request({
    url: "/companies/addPersonUser",
    method: "post",
    params: data,
    data: data,
  });
}
// 获取角色

 src/views/business/materialOrder/index.vue

@@ -17,10 +17,6 @@
            <el-input v-model="entity.partNo" clearable placeholder="请输入" size="small" @keyup.enter.native="goSearch">
            </el-input>
          </el-form-item>
          <el-form-item label="零件描述" prop="partDesc">
            <el-input v-model="entity.partDesc" clearable placeholder="请输入" size="small" @keyup.enter.native="goSearch">
            </el-input>
          </el-form-item>
          <el-form-item label="报检类型" prop="inspectionType">
            <el-select v-model="entity.inspectionType" clearable placeholder="请选择" size="small" @change="refreshTable"
              style="width: 100%">
@@ -29,12 +25,16 @@
            </el-select>
          </el-form-item>
          <el-form-item>
            <el-button v-if="tabIndex === 2 || tabIndex === 3 || tabIndex === 4"
            <el-button v-if="tabIndex === 1 || tabIndex === 2 || tabIndex === 3 || tabIndex === 4"
              :icon="!more ? 'el-icon-arrow-down' : 'el-icon-arrow-up'" style="color: #3A7BFA;" type="text"
              @click="more = !more">{{ !more ? '更多' : '收起' }}</el-button>
            <el-button size="mini" type="primary" @click="goSearch">查询</el-button>
            <el-button size="mini" @click="refresh()">重置</el-button>
          </el-form-item>
          <el-form-item label="零件描述" prop="partDesc" v-if="more">
            <el-input v-model="entity.partDesc" clearable placeholder="请输入" size="small" @keyup.enter.native="goSearch">
            </el-input>
          </el-form-item>
          <el-form-item label="供应商名称" prop="supplierName"
            v-if="(tabIndex === 2 || tabIndex === 3 || tabIndex === 4) && more">
            <el-input v-model="entity.supplierName" clearable placeholder="请输入" size="small"

 src/views/business/outsourcedParts/index.vue

@@ -23,62 +23,60 @@
        <!-- <el-button size="mini" type="primary" @click="openAdd('新增')">新增</el-button> -->
      </div>
    </div>
    <lims-table :tableData="tableData" :column="column" :tableLoading="tableLoading" :height="'calc(100vh - 220px)'"
    <lims-table :tableData="tableData" :column="column" :tableLoading="tableLoading" :height="'calc(100vh - 240px)'"
      :page="page" @pagination="pagination"></lims-table>
    <!-- 新增/编辑 -->
    <el-dialog :title="title" :visible.sync="addDia" width="500px">
      <el-form :model="addForm" v-if="addDia" ref="addForm" :rules="addRules" label-position="right"
        label-width="120px">
        <el-form-item label="产品" prop="name">
          <el-input size="small" placeholder="请输入" clearable v-model="addForm.name"
            :disabled="title == '检验'"></el-input>
          <el-input size="small" placeholder="请输入" clearable v-model="addForm.name" disabled></el-input>
        </el-form-item>
        <el-form-item label="来料数量" prop="num">
          <el-input size="small" placeholder="请输入" clearable v-model="addForm.num" :disabled="title == '检验'">
          <el-input size="small" placeholder="请输入" clearable v-model="addForm.num" disabled>
          </el-input>
        </el-form-item>
        <el-form-item label="供货厂家" prop="supplier">
          <el-input size="small" placeholder="请输入" clearable v-model="addForm.supplier" :disabled="title == '检验'">
          <el-input size="small" placeholder="请输入" clearable v-model="addForm.supplier" disabled>
          </el-input>
        </el-form-item>
        <el-form-item label="订单号" prop="orderNum">
          <el-input size="small" placeholder="请输入" clearable v-model="addForm.orderNum" :disabled="title == '检验'">
          <el-input size="small" placeholder="请输入" clearable v-model="addForm.orderNum" disabled>
          </el-input>
        </el-form-item>
        <el-form-item label="SP号" prop="spNum">
          <el-input size="small" placeholder="请输入" clearable v-model="addForm.spNum" :disabled="title == '检验'">
          <el-input size="small" placeholder="请输入" clearable v-model="addForm.spNum" disabled>
          </el-input>
        </el-form-item>
        <el-form-item label="备注" prop="remark">
          <el-input size="small" placeholder="请输入" type="textarea" :rows="2" clearable v-model="addForm.remark"
            :disabled="title == '检验'">
            disabled>
          </el-input>
        </el-form-item>
        <el-form-item label="外观" prop="inspectionItems" v-if="title == '检验'">
          <el-input size="small" placeholder="请输入" clearable v-model="addForm.inspectionItems">
        <el-form-item label="外观" prop="inspectionItems">
          <el-input size="small" placeholder="请输入" clearable v-model="addForm.inspectionItems"
            :disabled="title != '检验'">
          </el-input>
        </el-form-item>
        <el-form-item label="检测结果" prop="result" v-if="title == '检验'">
          <el-select v-model="addForm.result" placeholder="请选择">
        <el-form-item label="检测结果" prop="result">
          <el-select v-model="addForm.result" placeholder="请选择" :disabled="title != '检验'">
            <el-option label="合格" value="合格">
            </el-option>
            <el-option label="不合格" value="不合格">
            </el-option>
            <el-option label="不判断" value="不判断"> 
            <el-option label="不判断" value="不判断">
            </el-option>
          </el-select>
          <!-- <el-switch v-model="addForm.result" active-text="合格" inactive-text="不合格" active-value="合格"
            inactive-value="不合格">
          </el-switch> -->
        </el-form-item>
        <el-form-item label="测试文件" prop="file" v-if="title == '检验'">
          <el-upload action="#" :auto-upload="false" :multiple="false"
        <el-form-item label="测试文件" prop="file">
          <el-upload action="#" :auto-upload="false" :multiple="false" v-if="title == '检验'"
            accept='.jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.pdf,' :on-change="handleChangeUpload">
            <el-button size="mini" type="primary">上传附件</el-button>
          </el-upload>
          <a @click="handleDown(addForm)" v-else style="color: #3a7bfa;">{{ addForm.fileName }}</a>
        </el-form-item>
      </el-form>
      <span slot="footer" class="dialog-footer">
      <span slot="footer" class="dialog-footer" v-if="title == '检验'">
        <el-button @click="addDia = false">取 消</el-button>
        <el-button :loading="uploading" type="primary" @click="submitProduct('addForm')">确 认</el-button>
      </span>
@@ -151,6 +149,16 @@
              type: "text",
              clickFun: (row) => {
                this.openAdd('检验', row);
              },
              disabled: (row) => {
                return row.inspectionStatus > 0
              },
            },
            {
              name: "查看",
              type: "text",
              clickFun: (row) => {
                this.openAdd('查看', row);
              },
            },
          ],
@@ -303,7 +311,10 @@
    handleChangeUpload(file, fileLists) {
      this.addForm.file = file
    },

    // 下载附件的文件
    handleDown(row) {
      this.$download.saveAs(row.fileUrl, row.fileName);
    },
  }
}
</script>

 src/views/system/user/index.vue

@@ -215,8 +215,8 @@
            <el-input v-model="search2" placeholder="输入关键字搜索" clearable size="small" @clear="searchFilter2"
              @keyup.enter.native="searchFilter2" prefix-icon="el-icon-search" style="margin-bottom: 20px;width: 90%" />
            <el-tree :data="datathirdParty" node-key="companyId" :props="defaultProps0" @node-click="nodeClick2"
              style="height: calc(100% - 42px);" @node-expand="nodeOpen0" :filter-node-method="filterNode2" ref="tree2"
              highlight-current>
              style="height: calc(100% - 42px);overflow-y: auto;" @node-expand="nodeOpen0"
              :filter-node-method="filterNode2" ref="tree2" highlight-current>
            </el-tree>
          </el-col>
          <el-col :span="companiesList.length == 1 ? 24 : 16" style="height: 70vh;padding-left: 8px;">
@@ -416,7 +416,8 @@
      addOb: {
        fatherId: 10001,
        nickName: '',
      }
      },
      multipleSelection: []
    };
  },
  watch: {
@@ -550,6 +551,7 @@
      this.ids = selection.map(item => item.userId);
      this.single = selection.length != 1;
      this.multiple = !selection.length;
      this.multipleSelection = selection
    },
    // 更多操作触发
    handleCommand(command, row) {
@@ -584,7 +586,7 @@
      }).catch(() => {
        this.thirdPartyLoading = false;
      })
      if (this.componentData.entity.roleId > 10000) this.$message.warning('由于未选中具体角色，新增用户将成为默认角色')
      if (this.queryParams.deptId > 10000) this.$message.warning('由于未选中具体角色，新增用户将成为默认角色')
    },
    tranListToTreeData(list, rootValue) {
      const arr = [];
@@ -629,14 +631,14 @@
      }
    },
    nodeOpen0(data, node, el) {
      this.currentCompaniesList[node.level - nodeOpen01] = data.id
      // this.currentCompaniesList[node.level - nodeOpen01] = data.id
    },
    filterNode2(value, data) {
      if (!value) return true;
      return data['companyName'].indexOf(value) !== -1;
    },
    addUser2() {
      if (this.ids.length === 0) {
      if (this.multipleSelection.length === 0) {
        return this.$message.error('请选择人员')
      }
      if (this.currentCompaniesList.length === 0) {
@@ -654,10 +656,11 @@
        arr.push(obj)
      })
      this.addLoad = true
      // console.log(11111, this.multipleSelection)
      addPersonUser({
        company: arr,
        person: this.multipleSelection,
        roleId: this.componentData.entity.roleId
        deptId: this.queryParams.deptId
      }).then(res => {
        this.$message.success('操作成功')
        this.multipleSelection = []