licp
2024-05-15 63116158434214f23d1318f54b78de1d0f47ab4e
Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
已修改3个文件
24 ■■■■ 文件已修改
src/components/view/a5-laboratory-management.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/b2-standard.vue 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
static/js/menu.js 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/components/view/a5-laboratory-management.vue
@@ -283,7 +283,6 @@
            return m
          })
          this.options[0].children = arr;
          this.fileComponentData.tagField.type.select = arr;
          this.fileComponentData.selectField.type.select = arr;
        })
      },
src/components/view/b2-standard.vue
@@ -230,7 +230,7 @@
          <el-table-column prop="manHourGroup" label="工时分组" width="100" show-overflow-tooltip></el-table-column>
          <el-table-column prop="templateId" label="模板" width="200">
            <template slot-scope="scope">
              <el-select v-model="scope.row.templateId" size="small" filterable
              <el-select v-model="scope.row.templateId" size="small" filterable :disabled="!upStandardProduct"
               @change="(value)=>upStandardProductListOfTemplate(value,scope.row.id)">
                <el-option v-for="(a, ai) in templateList" :key="ai" :label="a.name" :value="a.id"></el-option>
              </el-select>
@@ -247,8 +247,8 @@
        style="position: absolute;right: 16px;bottom: 1px;"
          @current-change="handleCurrentChange"
          :current-page="currentPage"
          :page-size="pageSize"
          layout="total, prev, pager, next, jumper"
          :page-size="50"
          :total="total">
        </el-pagination>
      </el-row>
@@ -490,7 +490,6 @@
        sectionList: [],
        templateList: [],
        total:0,
        pageSize:100,
        currentPage:1,
        standardId: 0,
        moreEdit:false,
@@ -525,6 +524,8 @@
        this.upIndex++
      },
      handleNodeClick(val, node, el) { //树的值
        this.total = 0
        this.currentPage = 1
        this.selectTree = ''
        this.getNodeParent(node)
        this.selectTree = this.selectTree.replace(' - ', '')
static/js/menu.js
@@ -13,7 +13,7 @@
    {
        v: "业务管理",
        i: "font icon-kexueyanjiuheshiyankaifa",
        p: "selectInsOrderParameter selectInsOrderPlanList pageInsReport pageInsUnPass",
        p: "selectInsOrderParameter selectInsOrderPlanList pageInsReport costStatistics selectWarehouse",
        c: [{
            v: "检验下单",
            i: "font icon-erjidaohang",
@@ -50,7 +50,7 @@
    {
        v: "标准集",
        i: "font icon-biaozhunji",
        p: "",
        p: "selectStandardTreeList selectStandardTemplatePageList",
        c: [{
            v: "标准库",
            i: "font icon-erjidaohang",
@@ -71,7 +71,7 @@
            v: "工时管理",
            i: "font icon-erjidaohang",
            u: "b3-work-time-management",
            p: ""
            p: "selectAuxiliaryWorkingHours"
        }, {
            v: "人员考勤",
            i: "font icon-erjidaohang",
@@ -101,7 +101,7 @@
            v: "班次",
            i: "font icon-erjidaohang",
            u: "b3-classes",
            p: ""
            p: "performanceShiftPage performanceShiftPageYear"
        }]
    },
    {
@@ -127,7 +127,7 @@
            v: "样品缺陷指数",
            i: "font icon-erjidaohang",
            u: "b4-sample-defects",
            p: ""
            p: "selectSampleDefects"
        }, {
            v: "耗材统计",
            i: "font icon-erjidaohang",
@@ -174,12 +174,12 @@
            v: "角色管理",
            i: "el-icon-s-tools",
            u: "role-manage",
            p: ""
            p: "selectRoleLists"
        }, {
            v: "用户管理",
            i: "el-icon-s-tools",
            u: "person-manage",
            p: ""
            p: "selectUserList"
        }, {
            v: "客户管理",
            i: "el-icon-s-tools",
@@ -189,7 +189,7 @@
            v: "系统日志",
            i: "el-icon-s-tools",
            u: "system-log",
            p: "selectSystemLogList"
            p: ""
        }, {
            v: "消息详情",
            i: "el-icon-s-tools",