屏蔽原材料报检

spring

2025-03-25 60a71d062b9360bb2a1e3dd190d3b25251eefa29

屏蔽原材料报检

 src/views/business/materialOrder/index.vue

@@ -22,8 +22,8 @@
            </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%">
            <el-select v-model="entity.inspectionType" clearable placeholder="请选择" size="small" @change="refreshTable"
              style="width: 100%">
              <el-option label="原辅料" value="原辅料"></el-option>
              <el-option label="包材" value="包材"></el-option>
            </el-select>
@@ -269,13 +269,13 @@
                this.exemption(row);
              },
            },
            {
              name: '撤销报检',
              type: 'text',
              clickFun: (row) => {
                this.cancelDeclare(row);
              },
            },
            // {
            //   name: '撤销报检',
            //   type: 'text',
            //   clickFun: (row) => {
            //     this.cancelDeclare(row);
            //   },
            // },
          ]
        }
      ],

 src/views/business/outsourcedParts/index.vue

@@ -20,7 +20,7 @@
      </el-form>
      <div>
        <el-button size="mini" type="primary">获取订单</el-button>
        <el-button size="mini" type="primary" @click="openAdd('新增')">新增</el-button>
        <!-- <el-button size="mini" type="primary" @click="openAdd('新增')">新增</el-button> -->
      </div>
    </div>
    <lims-table :tableData="tableData" :column="column" :tableLoading="tableLoading" :height="'calc(100vh - 220px)'"
@@ -59,9 +59,17 @@
          </el-input>
        </el-form-item>
        <el-form-item label="检测结果" prop="result" v-if="title == '检验'">
          <el-switch v-model="addForm.result" active-text="合格" inactive-text="不合格" active-value="合格"
          <el-select v-model="value" placeholder="请选择">
            <el-option label="合格" value="合格">
            </el-option>
            <el-option label="不合格" value="不合格">
            </el-option>
            <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-switch> -->
        </el-form-item>
        <el-form-item label="测试文件" prop="file" v-if="title == '检验'">
          <el-upload action="#" :auto-upload="false" :multiple="false"
@@ -120,23 +128,23 @@
          dataType: "action",
          label: "操作",
          operation: [
            {
              name: "编辑",
              type: "text",
              clickFun: (row) => {
                this.openAdd("编辑", row);
              },
            },
            {
              name: "删除",
              type: "text",
              clickFun: (row) => {
                this.handleDelete(row);
              },
              disabled: (row) => {
                return !!row.ratifyUser
              },
            },
            // {
            //   name: "编辑",
            //   type: "text",
            //   clickFun: (row) => {
            //     this.openAdd("编辑", row);
            //   },
            // },
            // {
            //   name: "删除",
            //   type: "text",
            //   clickFun: (row) => {
            //     this.handleDelete(row);
            //   },
            //   disabled: (row) => {
            //     return !!row.ratifyUser
            //   },
            // },
            {
              name: "检验",
              type: "text",
@@ -246,9 +254,11 @@
            // 检验
            let fd = new FormData();
            //文件信息中raw才是真的文件
            if (this.file) {
              fd.append("file", this.file.raw);
            if (this.addForm.file) {
              fd.append("file", this.addForm.file.raw);
            }
            fd.append("inspectionItems", this.addForm.inspectionItems);
            fd.append("result", this.addForm.result);
          }
        } else {
          return false;

 src/views/business/rawMaterialInspection/index.vue

@@ -325,16 +325,16 @@
                return this.tabIndex === 0
              },
            },
            {
              name: '撤销报检',
              type: 'text',
              clickFun: (row) => {
                this.cancelDeclare(row);
              },
              showHide: (row) => {
                return this.tabIndex === 1
              },
            },
            // {
            //   name: '撤销报检',
            //   type: 'text',
            //   clickFun: (row) => {
            //     this.cancelDeclare(row);
            //   },
            //   showHide: (row) => {
            //     return this.tabIndex === 1
            //   },
            // },
          ]
        }
      ],

 src/views/system/user/index.vue

@@ -47,7 +47,8 @@
            </div>
          </div>
          <el-col>
            <el-table v-loading="loading" :data="userList" :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
            <el-table v-loading="loading" :data="userList"
              :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border>
              <el-table-column label="序号" align="center" type="index" />
              <el-table-column label="姓名" align="center" key="nickName" prop="nickName" :show-overflow-tooltip="true" />
              <el-table-column label="账号" align="center" key="userName" prop="userName" :show-overflow-tooltip="true" />
@@ -59,7 +60,7 @@
                </template>
              </el-table-column>
              <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" width="120" />
              <el-table-column label="操作" align="center" width="160" class-nickName="small-padding fixed-width">
              <el-table-column label="操作" align="center" width="160" class="small-padding fixed-width">
                <template slot-scope="scope">
                  <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                    v-hasPermi="['system:user:edit']">修改</el-button>
@@ -213,7 +214,7 @@
          <el-col :span="8" style="height: 70vh;overflow: hidden;" v-if="companiesList.length != 1">
            <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="defaultProps" @node-click="nodeClick2"
            <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>
            </el-tree>
@@ -225,13 +226,13 @@
                style="width: 50%" @keyup.enter.native="searchPerson()"></el-input>
            </div>
            <el-table height="67vh" stripe :data="personList" v-loading="personLoad" ref="personTable"
                      :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
              :header-cell-style="{ background: '#f8f8f9', color: '#515a6e' }" border
              @selection-change="handleSelectionChange">
              <el-table-column type="selection" width="50">
              </el-table-column>
              <el-table-column prop="employeeID" label="员工号">
              </el-table-column>
              <el-table-column prop="nickName" label="员工姓名">
              <el-table-column prop="name" label="员工姓名">
              </el-table-column>
              <el-table-column prop="department" label="部门" min-width="200">
              </el-table-column>
@@ -330,6 +331,10 @@
        children: "children",
        label: "label"
      },
      defaultProps0: {
        children: "children",
        label: "companyName"
      },
      // 用户导入参数
      upload: {
        // 是否显示弹出层（用户导入）
@@ -411,7 +416,7 @@
      addOb: {
        fatherId: 10001,
        nickName: '',
      },
      }
    };
  },
  watch: {
@@ -631,7 +636,7 @@
      return data['companyName'].indexOf(value) !== -1;
    },
    addUser2() {
      if (this.multipleSelection.length === 0) {
      if (this.ids.length === 0) {
        return this.$message.error('请选择人员')
      }
      if (this.currentCompaniesList.length === 0) {