modified: src/views/inspectionManagement/reportForInspection/index.vue ...

zouyu

2023-09-04 2631ca1e0a9ddefc5292598b7f9ef2a31c7af29a

	modified:   src/views/inspectionManagement/reportForInspection/index.vue
	modified:   src/views/laboratory/ledger/index.vue
	modified:   src/views/laboratory/organizational/index.vue
	modified:   src/views/laboratory/personnel/index.vue

 src/views/inspectionManagement/reportForInspection/index.vue

@@ -72,7 +72,9 @@
                <div class="table-box">
                    <el-table ref="inspectionTable" :max-height="450" :cell-style="{textAlign: 'left'}"
                        :header-cell-style="{border:'0px',background:'#f5f7fa',color:'#606266',boxShadow: 'inset 0 1px 0 #ebeef5',textAlign: 'left'}"
                        :data="inspectionTable" style="width: 100%" @selection-change="handleSelectionChange">
                        :data="inspectionTable" style="width: 100%" @selection-change="handleSelectionChange"
                        :default-sort = "{prop: 'createTime', order: 'descending'}"
                        >
                        <el-table-column type="selection" :selectable="checkSelect" min-width="5%"></el-table-column>
                        <el-table-column type="index" label="序号" min-width="8%" />
                        <el-table-column prop="dateSurvey" label="来料日期" min-width="8%" />
@@ -83,6 +85,7 @@
                        <el-table-column prop="unit" label="单位" min-width="5%" />
                        <el-table-column prop="quantity" label="数量" min-width="5%" />
                        <el-table-column prop="inspectionDate" label="报检日期" min-width="8%" />
                        <el-table-column v-if="1===0" prop="createTime" label="日期" min-width="8%" />
                        <el-table-column prop="surveyor" label="检验人" min-width="8%" />
                        <el-table-column prop="type" label="状态" min-width="8%">
                            <template slot-scope="scope">

 src/views/laboratory/ledger/index.vue

@@ -25,7 +25,7 @@
        <div class="bom-item-search">
          <el-row>
            <el-col :span="19">
              <el-input v-model="filterText" placeholder="输入关键字进行过滤" />
              <el-input v-model="filterText" clearable placeholder="输入关键字进行过滤" />
            </el-col>
            <el-col :span="5">
              <el-button type="primary" size="small" @click="addClassVisible = true"><i
@@ -33,7 +33,7 @@
            </el-col>
          </el-row>
        </div>
        <el-tree ref="classTree" :data="classTree" :props="defaultProps" :default-expand-all="true"
        <el-tree highlight-current="true" ref="classTree" :data="classTree" :props="defaultProps" :default-expand-all="true"
          :filter-node-method="filterNode" @node-click="nodeClickHandler" />
      </div>
      <div class="library-table">
@@ -63,8 +63,11 @@
            <el-table-column prop="termValidity" label="计量截止有效期" min-width="200" />
            <el-table-column prop="conditions" label="设备状态" min-width="120">
              <template slot-scope="scope">
                <el-tag :type="scope.row.conditions === 0 ? 'primary' : 'success'" disable-transitions>{{
                  scope.row.conditions | conditionsFilter }}</el-tag>
                <el-tag v-if="scope.row.conditions === 1" type="success" disable-transitions>运行</el-tag>
                <el-tag v-if="scope.row.conditions === 2" type="danger" disable-transitions>故障</el-tag>
                <el-tag v-if="scope.row.conditions === 3" type="warning" disable-transitions>报修</el-tag>
                <el-tag v-if="scope.row.conditions === 4" type="warning" disable-transitions>检修</el-tag>
                <el-tag v-if="scope.row.conditions === 5" disable-transitions>待机</el-tag>
              </template>
            </el-table-column>
            <el-table-column prop="storage_place" label="存放地" min-width="200" />
@@ -151,7 +154,7 @@
              <span><i class="el-icon-edit" />验收日期：{{ equipmentDetail.acceptanceDate }}</span>
            </div>
            <div class="message-item">
              <span><i class="el-icon-edit" />保管人：{{ equipmentDetail.userId }}</span>
              <span><i class="el-icon-edit" />保管人：{{ equipmentDetail.name }}</span>
            </div>
            <div class="message-item">
              <span><i class="el-icon-edit" />是否支持数采：{{ equipmentDetail.whetherDataAcquisition == 1 ? '支持' : '不支持'
@@ -247,7 +250,7 @@
          <el-row :gutter="50">
            <el-col :span="11">
              <el-form-item label="所属分类：" prop="classifyId" label-width="80" :rules="[
                { required: true, message: '请选择所属分类', trigger: 'change' }
                { required: true, message: '请选择所属分类', trigger: 'blur' }
              ]">
                <el-cascader style="width: 100%;" v-model="equipmentform.classifyId" :options="classTree" :show-all-levels="false" />
              </el-form-item>
@@ -268,7 +271,7 @@
            </el-col>
            <el-col :span="11">
              <el-form-item label="状态：" prop="conditions"
                :rules="[{ required: true, message: '请选择仪器设备状态', trigger: 'change' }]" label-width="80">
                :rules="[{ required: true, message: '请选择仪器设备状态', trigger: 'blur' }]" label-width="80">
                <el-select v-model="equipmentform.conditions" clearable filterable :allow-create="true"
                  placeholder="请选择仪器设备状态" style="width:100%">
                  <el-option v-for="item in conditionsOptions" :key="item.value" :label="item.label"
@@ -310,7 +313,7 @@
            </el-col>
            <el-col :span="11">
              <el-form-item label="到货日期：" label-width="80">
                <el-date-picker v-model="equipmentform.arrivalDate" type="date" placeholder="请选择到货日期"
                <el-date-picker value-format="yyyy-MM-dd" v-model="equipmentform.arrivalDate" type="date" placeholder="请选择到货日期"
                  style="width:100%" />
              </el-form-item>
            </el-col>
@@ -318,7 +321,7 @@
          <el-row :gutter="50">
            <el-col :span="11">
              <el-form-item label="验收日期：" label-width="80">
                <el-date-picker v-model="equipmentform.acceptanceDate" type="date" placeholder="请选择验收日期"
                <el-date-picker  value-format="yyyy-MM-dd" v-model="equipmentform.acceptanceDate" type="date" placeholder="请选择验收日期"
                  style="width:100%" />
              </el-form-item>
            </el-col>
@@ -348,7 +351,7 @@
          <el-row v-show="equipmentform.equipmentMeasurement === 1" :gutter="50">
            <el-col :span="12">
              <el-form-item label="计量截止有效期：" label-width="80">
                <el-input v-model="equipmentform.termValidity" placeholder="请填写计量有效期" type="number" />
                <el-input min="0" v-model="equipmentform.termValidity" placeholder="请填写计量有效期" type="number" />
              </el-form-item>
            </el-col>
          </el-row>
@@ -372,7 +375,7 @@
      <el-form label-position="top" ref="addmeasureForm" :model="measureForm">
        <el-row :gutter="20">
          <el-col :span="12">
            <el-form-item label="负责人" prop="userId" :rules="[{ required: true, message: '请选择负责人', trigger: 'change' }]">
            <el-form-item label="负责人" prop="userId" :rules="[{ required: true, message: '请选择负责人', trigger: 'blur' }]">
              <el-select v-model="measureForm.userId" clearable filterable :allow-create="true" placeholder="负责人"
                style="width:100%">
                <el-option v-for="item in userOpetions" :key="item.id" :label="item.label" :value="item.value" />
@@ -388,7 +391,7 @@
        </el-row>
        <el-row :gutter="20">
          <el-col :span="24">
            <el-form-item label="检定有效期" prop="date" :rules="[{ required: true, message: '请选择检定有效期', trigger: 'change' }]">
            <el-form-item label="检定有效期" prop="date" :rules="[{ required: true, message: '请选择检定有效期', trigger: 'blur' }]">
              <el-date-picker v-model="measureForm.date" type="daterange" range-separator="至" start-placeholder="开始日期"
                end-placeholder="结束日期" />
            </el-form-item>
@@ -402,7 +405,7 @@
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="结果" prop="result" :rules="[{ required: true, message: '请选择结果', trigger: 'change' }]">
            <el-form-item label="结果" prop="result" :rules="[{ required: true, message: '请选择结果', trigger: 'blur' }]">
              <el-select v-model="measureForm.result" clearable filterable :allow-create="true" placeholder="请选择结果"
                style="width:100%">
                <el-option v-for="item in resultOptions" :key="item.id" :label="item.label" :value="item.value" />
@@ -427,7 +430,7 @@
        <el-row :gutter="20">
          <el-col :span="24">
            <el-form-item label="">
              <el-upload class="upload-demo" action="#" :on-change="handleUpload" :auto-upload="false">
              <el-upload ref="upload" class="upload-demo" action="#" :on-change="handleUpload" :auto-upload="false">
                <el-button size="small" type="primary">点击上传</el-button>
              </el-upload>
            </el-form-item>
@@ -460,29 +463,7 @@
} from '@/api/laboratory/ledger'
import { parseTime } from '@/utils/index'
export default {
  filters: {
    conditionsFilter(value) {
      let returnValue = null
      switch (+value) {
        case 1:
          returnValue = '运行'
          break
        case 2:
          returnValue = '故障'
          break
        case 3:
          returnValue = '报修'
          break
        case 4:
          returnValue = '检修'
          break
        case 5:
          returnValue = '待机'
          break
      }
      return returnValue
    }
  },
  filters: {},
  data() {
    return {
      // 用户下拉框配置项
@@ -631,6 +612,12 @@
  watch: {
    filterText(val) {
      this.$refs.classTree.filter(val)
    },
    measureFormVisible(newVal){
      if(newVal === false){
        this.measureForm.file = null;
        this.$refs['upload'].clearFiles();
      }
    }
  },
  created() {
@@ -790,6 +777,8 @@
          this.$message.error('添加失败')
        }
        this.$message.success('添加成功')
        let d = this.nodeclicked
        this.nodeClickHandler(d);
        this.addDrawerVisible = false
        this.equipmentform = {}
        return
@@ -805,13 +794,15 @@
      }
    },
    cancelAddEq() {
      this.resetForm('addDrawer')
      this.addDrawerVisible = false
      // this.resetForm('addNewEquipment')
    },
    resetForm(formName) {
      this.$refs[formName].resetFields();
    },
    cancelAddMeasure() {
      this.$refs['upload'].clearFiles();
      this.measureForm.file = null;
      this.measureFormVisible = false
      this.resetForm('addmeasureForm')
    },
@@ -849,12 +840,16 @@
      } catch (error) {
        this.$message.error('添加失败')
      }
      this.measureForm.file = null;
      this.$refs['upload'].clearFiles();
    },
    // 关闭设备详情抽屉
    closeDetailDrawer() {
      this.equipmentDetail = {}
      this.codePointsTable = []
      this.measureTable = []
      this.measureForm.file = null;
      this.$refs['upload'].clearFiles();
    },
    // 关闭添加修改设备抽屉
    closeAddOrChangeDrawer() {
@@ -951,9 +946,8 @@
    },
    async deleteInstrument() {
      await deleteInstrument({ instrumentId: this.instrumentId }).then(res=>{
        this.$message.error('删除成功！');
        this.$message.success('删除成功！');
        let d = this.nodeclicked
        console.log(d);
        this.nodeClickHandler(d);
      }).catch(()=>{
        this.$message.error('删除失败！');

 src/views/laboratory/organizational/index.vue

@@ -92,7 +92,6 @@
          <el-input
            placeholder="请输入部门名称"
            v-model="formData.department"
            clearable
            style="width: 80%"
          >
          </el-input>
@@ -281,7 +280,10 @@
      handler(newVal, oldVal) {
        if (newVal == false) {
          this.isUpdate = false;
          this.formData = {};
          this.formData = {
            fatherId: "",
            department: "",
          };
          this.$refs.ruleForm.resetFields();
        }
      },

 src/views/laboratory/personnel/index.vue

@@ -44,6 +44,12 @@
                                </el-option>
                            </el-select>
                        </el-form-item>
                        <el-form-item label="在职状态" v-if="isUpdate" :label-width="formLabelWidth" prop="jobState">
                            <el-select v-model="form.jobState" clearable style="width: 100%" placeholder="请选择在职状态">
                                <el-option v-for="(item,index) in jobList" :key="index" :label="item.label" :value="item.value">
                                </el-option>
                            </el-select>
                        </el-form-item>
                    </el-form>
                    <div slot="footer" class="dialog-footer">
                        <el-button @click="dialogFormVisible = false">取 消</el-button>
@@ -97,10 +103,8 @@
              }}
                        </template>
                    </el-table-column>
                    <el-table-column prop="jobState" label="在职状态" min-width="120" :filters="[
              { text: '在职', value: 1 },
              { text: '离岗', value: 0 },
            ]" column-key="status" :filter-method="filterTag" filter-placement="bottom-end">
                    <el-table-column prop="jobState" label="在职状态" min-width="120" :filters="[{ text: '在职', value: 1 },{ text: '离岗', value: 0 },]"
                     column-key="status" :filter-method="filterTag" filter-placement="bottom-end">
                        <template slot-scope="scope">
                            <el-tag :type="scope.row.jobState === 0 ? 'danger' : 'success'"
                                disable-transitions>{{ scope.row.jobState === 0 ? "离岗" : "在职" }}</el-tag>
@@ -147,6 +151,7 @@
                personData: [], // 用来存放接口传过来的人员列表数据
                dialogFormVisible: false,
                form: {
                    id: "",
                    account: "",
                    age: "",
                    email: "",
@@ -154,7 +159,9 @@
                    phone: "",
                    organizationId: "",
                    roleId: "",
                    jobState: "",
                },
                jobList:[{ label: '在职', value: 1 },{ label: '离岗', value: 0 }],
                myProp: {
                    value: "id",
                    label: "department",
@@ -215,10 +222,11 @@
                this.currentPage = 1;
                this.pageSize = val;
            },
            filterTag(value) {
                this.status = "";
                this.status = value;
                return true;
            filterTag(value,row) {
                // console.log("filterTag--",value);
                // this.status = "";
                // this.status = value;
                return row.jobState === value;
            },
            // 当前页改变时触发 跳转其他页
            handleCurrentChange(val) {
@@ -252,24 +260,38 @@
                this.$refs.form.validate((valid) => {
                    if (valid) {
                        let departmentId = this.form.organizationId;
                        this.form.organizationId = departmentId[departmentId.length - 1];
                        let form = {
                            id: this.form.id,
                            account: this.form.account,
                            age: this.form.age,
                            email: this.form.email,
                            name: this.form.name,
                            phone: this.form.phone,
                            organizationId: departmentId[departmentId.length - 1],
                            roleId: this.form.roleId,
                            jobState: this.form.jobState
                        }
                        if (!this.isUpdate) {
                            post("/user/add_new_personnel", this.form).then((response) => {
                            post("/user/add_new_personnel", form).then((response) => {
                                this.$message({
                                    message: response.message,
                                    type: "success",
                                });
                                this.dialogFormVisible = false;
                                this.getData();
                            }).catch((error)=>{
                                this.$message.error(error.message);
                            });
                        } else {
                            put("/user/update_new_personnel", this.form).then((res) => {
                            put("/user/update_new_personnel", form).then((res) => {
                                this.$message({
                                    message: res.message,
                                    type: "success",
                                });
                                this.dialogFormVisible = false;
                                this.getData();
                            }).catch((error)=>{
                                this.$message.error(error.message);
                            });
                        }
                    } else {
@@ -312,6 +334,7 @@
            },

            handleClick(row) {
                console.log(row);
                this.isUpdate = true;
                this.dialogFormVisible = true;
                this.form.name = row.username;
@@ -319,11 +342,12 @@
                this.form.phone = row.phone;
                this.form.id = row.id;
                this.form.email = row.email;
                this.form.jobState = row.jobState;
                this.form.organizationId = this.getParentsById(
                    this.options,
                    row.departmentId
                );
                this.form.roleId = row.roleName;
                this.form.roleId = row.roleId;
                this.form.age = row.age;
                this.form.account = row.account;
            },
@@ -344,7 +368,17 @@
                handler(newVal, oldVal) {
                    if (newVal == false) {
                        this.isUpdate = false;
                        this.form = {};
                        this.form = {
                            id: "",
                            account: "",
                            age: "",
                            email: "",
                            name: "",
                            phone: "",
                            organizationId: "",
                            roleId: "",
                            jobState: "",
                        };
                        this.$refs.form.resetFields();
                    } else {
                        this.getRoleList();