modified: src/layout/components/Sidebar/SidebarItem.vue modified: src...

zouyu

2023-09-07 d762fc609a101b1a82576a54f835834f4e9cd9b9

	modified:   src/layout/components/Sidebar/SidebarItem.vue
	modified:   src/router/index.js
	modified:   src/views/CNAS/nonConformanceManage/index.vue
	modified:   src/views/CNAS/reviewAnnualPlan/index.vue
	modified:   src/views/CNAS/satisfactionSurveys/index.vue
	modified:   src/views/basicData/index.vue
	modified:   src/views/experiment/inspectionApplication/index.vue
	modified:   src/views/inspectionManagement/commissionInspection/index.vue
	modified:   src/views/inspectionManagement/reportForInspection/index.vue
	modified:   src/views/laboratory/organizational/index.vue
	modified:   src/views/login/index.vue

 src/layout/components/Sidebar/SidebarItem.vue

@@ -6,6 +6,9 @@
          <item :show="onlyOneChild.meta.show" :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)" :title="onlyOneChild.meta.title" />
          <span v-if="onlyOneChild.meta.title==='主页'">主页</span>
          <span v-if="onlyOneChild.meta.title==='基础数据'">基础数据</span>
          <span v-if="onlyOneChild.meta.title==='标准库'">标准库</span>
          <span v-if="onlyOneChild.meta.title==='我的待办'">消息待办</span>
          <span v-if="onlyOneChild.meta.title==='我的信息'">个人管理</span>
        </el-menu-item>
      </app-link>
    </template>

 src/router/index.js

@@ -42,21 +42,21 @@
      path: '/standardLibrary',
      component: Layout,
      redirect: '/standardLibrary/index',
      meta: { title: '标准库', icon: 'el-icon-s-help' },
      // meta: { title: '标准库', icon: 'el-icon-s-help' },
      children: [
        {
          path: 'index',
          name: 'StandardLibrary',
          component: () => import('@/views/standardLibrary/index'),
          meta: { title: '标准库', icon: 'form' }
          meta: { title: '标准库', icon: 'el-icon-s-help' }
        },
        {
          path: 'specificationDetails/:id',
          name: 'SpecificationDetails',
          // hidden: true,
          component: () => import('@/views/standardLibrary/SpecificationDetails'),
          meta: { title: '产品规格详情', icon: 'form', show: false }
        }
        // {
        //   path: 'specificationDetails/:id',
        //   name: 'SpecificationDetails',
        //   // hidden: true,
        //   component: () => import('@/views/standardLibrary/SpecificationDetails'),
        //   meta: { title: '产品规格详情', icon: 'form', show: false }
        // }
      ]
    },
    {
@@ -254,19 +254,20 @@
      component: Layout,
      redirect: '/message/toDo',
      name: 'Message',
      meta: { title: '消息待办', icon: 'el-icon-s-help' },
      // meta: { title: '消息待办', icon: 'el-icon-s-help' },
      children: [
        {
          path: 'toDo',
          name: 'ToDo',
          component: () => import('@/views/message/toDo/index'),
          meta: { title: '我的待办', icon: 'tree' }
          // meta: { title: '消息待办', icon: 'tree' }
          meta: { title: '我的待办', icon: 'el-icon-s-help' },
        },
        {
          path: 'message',
          name: 'Message',
          component: () => import('@/views/message/message/index'),
        },
        // {
        //   path: 'message',
        //   name: 'Message',
        //   component: () => import('@/views/message/message/index'),
        // },
      ]
    },
    {
@@ -274,20 +275,21 @@
      component: Layout,
      redirect: '/personal/myInformation',
      name: 'Personal',
      meta: { title: '个人管理', icon: 'el-icon-s-help' },
      // meta: { title: '个人管理', icon: 'el-icon-s-help' },
      children: [
        {
          path: 'myInformation',
          name: 'MyInformation',
          component: () => import('@/views/personal/myInformation/index'),
          meta: { title: '我的信息', icon: 'table' }
          // meta: { title: '个人管理', icon: 'el-icon-s-help' }
          meta: { title: '我的信息', icon: 'el-icon-s-help' }
        },
        {
          path: 'myBusiness',
          name: 'MyBusiness',
          component: () => import('@/views/personal/myBusiness/index'),
          meta: { title: '我的企业', icon: 'tree', show: false }
        }
        // {
        //   path: 'myBusiness',
        //   name: 'MyBusiness',
        //   component: () => import('@/views/personal/myBusiness/index'),
        //   meta: { title: '我的企业', icon: 'tree', show: false }
        // }
      ]
    },
    {

 src/views/CNAS/nonConformanceManage/index.vue

@@ -39,7 +39,7 @@
            </el-form>
            <el-form class="rightBtn" style="margin-top: 10px;">
              <el-form-item class="createBtn">
                <el-button size="small" type="primary" icon="el-icon-document-add" style="margin-right: 10px;">新增记录</el-button>
                <el-button size="small" type="primary" icon="el-icon-plus" style="margin-right: 10px;">新增记录</el-button>
              </el-form-item>
              <el-form-item class="getDataBtn">
                <el-button size="small" type="primary" icon="el-icon-download">导出</el-button>

 src/views/CNAS/reviewAnnualPlan/index.vue

@@ -78,7 +78,7 @@
          <el-button
            size="small"
            type="primary"
            icon="el-icon-document-add"
            icon="el-icon-plus"
            @click="
              dialogFormVisible2 = true;
              newly = {};

 src/views/CNAS/satisfactionSurveys/index.vue

@@ -28,7 +28,7 @@
        </el-form-item>
      </el-form>
      <el-form style="margin-top: 10px;">
        <el-button size="small" @click="getFillName()" icon="el-icon-document-add" type="primary">新增记录</el-button>
        <el-button size="small" @click="getFillName()" icon="el-icon-plus" type="primary">新增记录</el-button>
      </el-form>
    </div>
    <div class="library-table">

 src/views/basicData/index.vue

@@ -17,8 +17,8 @@
                    <el-button type="primary" class="top_div_button" size="small" @click="selectProductModelTable">查询</el-button>
                    <el-button class="top_div_button" size="small" @click="clean">重置</el-button>
                </el-form-item>
                <el-form-item>
                    <el-button class="top_div_button" type="primary" size="small" icon="el-icon-folder-add"
                <el-form-item style="margin-left: 25%;">
                    <el-button class="top_div_button" type="primary" size="small" icon="el-icon-plus"
                        @click="centerDialogVisible = true">新增</el-button>
                    <el-button class="top_div_button" icon="el-icon-delete-solid" size="small" style="color: #00a5ff"
                        @click="deleteListClick">删除</el-button>
@@ -35,7 +35,7 @@
                    <el-form-item>
                        <span>项目分组：</span>
                        <el-autocomplete class="inline-input" v-model="form.father" :fetch-suggestions="querySearch2"
                            placeholder="请输入样品分组" style="width: calc(100% - 70px);"></el-autocomplete>
                            placeholder="请输入项目分组" style="width: calc(100% - 70px);"></el-autocomplete>
                    </el-form-item>
                    <el-row :gutter="24">
                        <el-col :span="12"><el-form-item prop="name" required><span>项目名称：</span>
@@ -193,12 +193,8 @@
                });
            },
            handleClose(done) {
                this.$confirm("确认关闭？")
                    .then((_) => {
                        this.centerDialogVisible = false;
                        done();
                    })
                    .catch((_) => {});
                this.centerDialogVisible = false;
                done();
            },
            selectProductModelTable() {
                selectproductModelApi(this.params).then((res) => {

 src/views/experiment/inspectionApplication/index.vue

@@ -29,7 +29,7 @@
                    </el-form>
                    <el-form class="rightBtn">
                        <el-form-item class="createBtn">
                            <el-button size="small" type="primary" icon="el-icon-document-add" @click="checkTypeVisible = true"
                            <el-button size="small" type="primary" icon="el-icon-plus" @click="checkTypeVisible = true"
                                style="background-color: rgb(1, 102, 226);">新增检验单</el-button>
                        </el-form-item>
                        <el-form-item class="getDataBtn">
@@ -229,13 +229,13 @@
                                <el-row :gutter="100">
                                    <el-col :span="10">
                                        <el-form-item label="来料日期：">
                                            <el-input style="width: 300px" type="text" disabled v-model="finishedTable.deliverydate"
                                            <el-input style="width: 300px" type="text" v-model="finishedTable.deliverydate"
                                                placeholder="请输入来料日期" autocomplete="off" />
                                        </el-form-item>
                                    </el-col>
                                    <el-col :span="10">
                                        <el-form-item label="供应商名称：">
                                            <el-input style="width: 300px" type="text" disabled v-model="finishedTable.supplier" placeholder="请输入供应商名称"
                                            <el-input style="width: 300px" type="text" v-model="finishedTable.supplier" placeholder="请输入供应商名称"
                                                autocomplete="off" />
                                        </el-form-item>
                                    </el-col>
@@ -243,13 +243,13 @@
                                <el-row :gutter="100">
                                    <el-col :span="10">
                                        <el-form-item label="成品编码：">
                                            <el-input style="width: 300px" type="text" disabled v-model="finishedTable.code" placeholder="请输入成品编码"
                                            <el-input style="width: 300px" type="text" v-model="finishedTable.code" placeholder="请输入成品编码"
                                                autocomplete="off" />
                                        </el-form-item>
                                    </el-col>
                                    <el-col :span="10">
                                        <el-form-item label="成品名称：">
                                            <el-input style="width: 300px" type="text" disabled v-model="finishedTable.name" placeholder="请输入成品名称"
                                            <el-input style="width: 300px" type="text" v-model="finishedTable.name" placeholder="请输入成品名称"
                                                autocomplete="off" />
                                        </el-form-item>
                                    </el-col>
@@ -257,13 +257,13 @@
                                <el-row :gutter="100">
                                    <el-col :span="10">
                                        <el-form-item label="规格型号：">
                                            <el-input style="width: 300px" type="text" disabled v-model="finishedTable.modelandspecification"
                                            <el-input style="width: 300px" type="text" v-model="finishedTable.modelandspecification"
                                                placeholder="请输入规格型号" autocomplete="off" />
                                        </el-form-item>
                                    </el-col>
                                    <el-col :span="10">
                                        <el-form-item label="单位：">
                                            <el-input style="width: 300px" type="text" disabled v-model="finishedTable.unit" placeholder="请输入单位"
                                            <el-input style="width: 300px" type="text" v-model="finishedTable.unit" placeholder="请输入单位"
                                                autocomplete="off" />
                                        </el-form-item>
                                    </el-col>
@@ -271,7 +271,7 @@
                                <el-row :gutter="100">
                                    <el-col :span="10">
                                        <el-form-item label="数量：">
                                            <el-input style="width: 300px" type="text" disabled v-model="finishedTable.amount" placeholder="请输入数量"
                                            <el-input style="width: 300px" type="text" v-model="finishedTable.amount" placeholder="请输入数量"
                                                autocomplete="off" />
                                        </el-form-item>
                                    </el-col>
@@ -673,8 +673,9 @@
            },
            // 新增检验
            async addInspection() {
                let obj = {};
                if (this.type === 0) {
                    addInspect({
                    obj = {
                        endTime: this.infoForm.checkdate[1],
                        formTime: this.infoForm.formTime,
                        mcode: this.infoForm.mcode,
@@ -687,18 +688,10 @@
                        type: this.type,
                        unit: this.infoForm.unit,
                        version: this.version
                    }).then(res => {
                        this.$message({
                            message: '添加成功！',
                            type: 'success'
                        });
                        this.$router.push(`Viewdetails/${res.data}`)
                    }).catch(error=>{
                        this.$message.error(error.message);
                    })
                    }
                }
                if (this.type === 1) {
                    const res = await addInspect({
                    obj = {
                        endTime: this.commisionSelection.checkdate[1],
                        formTime: this.commisionSelection.formTime,
                        mcode: this.commisionSelection.mcode,
@@ -710,30 +703,34 @@
                        type: this.type,
                        unit: this.commisionSelection.unit,
                        version: this.version
                    })
                    }
                }
                if (this.type === 2) {
                    const res = await addInspect({
                        endTime: '2023-08-15',
                    obj = {
                        endTime: this.finishedTable.checkdate[1],
                        formTime: this.finishedTable.deliverydate,
                        mcode: this.finishedTable.code,
                        name: this.finishedTable.name,
                        num: parseInt(this.finishedTable.amount),
                        specifications: this.finishedTable.modelandspecification,
                        startTime: '2023-08-14',
                        startTime: this.finishedTable.checkdate[1],
                        supplier: this.finishedTable.supplier,
                        type: this.type,
                        unit: this.finishedTable.unit,
                        version: this.version
                    })
                    }
                }
                this.type = 0
                this.checkTypeVisible = false
                // this.$message({
                //     message: '添加成功！',
                //     type: 'success'
                // });
                // this.$router.push({name: 'Viewdetails'})
                addInspect(obj).then(res => {
                    this.$message({
                        message: '添加成功！',
                        type: 'success'
                    });
                    this.type = 2
                    this.checkTypeVisible = false
                    this.$router.push(`Viewdetails/${res.data}`)
                }).catch(error=>{
                    this.$message.error(error.message);
                })
            },
            // 每页条数改变时触发 选择一页显示多少行
            handleSizeChange(val) {

 src/views/inspectionManagement/commissionInspection/index.vue

@@ -251,7 +251,7 @@
                this.addReportDialog = false
            },
            checkSelect(row) {
                if (row.type === 1) {
                if (row.inspection_status === 2) {
                    return false;
                } else {
                    return true;

 src/views/inspectionManagement/reportForInspection/index.vue

@@ -146,9 +146,6 @@
    import {
        getRawMaterialList,
        addInspect,
        selectInspectsListById,
        selectUser,
        selectEquipment,
        deleteMaterial,
        addMaterial,
        getMaterielName,
@@ -156,7 +153,6 @@
    getChooseVersion,
    lookProByVer
    } from '@/api/inspection/rawmaterial'
import ItemVue from '@/layout/components/Sidebar/Item.vue'
    export default {
        data() {
            return {
@@ -406,7 +402,7 @@
                    "name": val.materialName,
                    "num": val.quantity,
                    "specifications": val.specificationsModels,
                    "specificationsId": val.specificationsId,
                    "specificationId": val.specificationsId,
                    "startTime": dateArr[0],
                    "supplier": val.supplierName,
                    "type": val.type,
@@ -425,7 +421,7 @@
                    this.$message.success('报检成功')
                    this.$router.push(`/experiment/Viewdetails/${res.data}`)
                }).catch(error =>{
                    this.$message.error('报检失败')
                    this.$message.error(error.message)
                });
            },
            // 获取分页列表数据

 src/views/laboratory/organizational/index.vue

@@ -23,7 +23,7 @@
          <el-button
            type="primary"
            size="small"
            icon="el-icon-circle-plus-outline"
            icon="el-icon-plus"
            @click="dialogVisible = true"
            >新增</el-button
          >

 src/views/login/index.vue

@@ -118,7 +118,7 @@
        <div class="title_big">欢迎您登录！</div>
        <div class="title_small">装备电缆LIMS实验室管理系统</div>
        <el-form :model="ruleForm" :rules="rules" ref="ruleForm" class="elform" :hide-required-asterisk="true">
          <el-form-item label="用户名" prop="username">
          <el-form-item label="账号" prop="username">
            <el-input v-model="ruleForm.username" placeholder="请输入账号" clearable></el-input>
          </el-form-item>
          <el-form-item label="密码" prop="password">