Merge branch 'master' of https://gitee.com/yuanchu_code/lims-front-end

Goldennfish

2023-07-25 ccfd5dc264d07471d831d2287ff03f293c295981

 src/views/standardLibrary/index.vue

@@ -14,6 +14,7 @@
          :props="defaultProps"
          default-expand-all
          :filter-node-method="filterNode"
          :render-content="renderContent"
          @node-click="nodeClick"
        />
      </div>
@@ -71,7 +72,7 @@
                  <el-tag
                    :type="scope.row.spe_state === 0 ? 'primary' : 'success'"
                    disable-transitions
                  >{{ scope.row.spe_state === 0 ? '未同意' : '已同意' }}</el-tag>
                  >{{ scope.row.spe_state === 0 ? '已停用' : '已启用' }}</el-tag>
                </template>
              </el-table-column>
              <el-table-column
@@ -90,12 +91,12 @@
                    placement="top"
                    width="30"
                  >
                    <div @click=" getRowID(scope.row)" style="text-align: center; margin: 0">
                    <div style="text-align: center; margin: 0" @click=" getRowID(scope.row)">
                      <div>
                        <el-button size="mini" @click="dialogFormVisible4=true" type="text">编辑</el-button>
                        <el-button size="mini" type="text" @click="dialogFormVisible4=true">编辑</el-button>
                      </div>
                      <div>
                        <el-button size="mini" @click="dialogFormVisible5 = true" type="text">停用</el-button>
                        <el-button size="mini" type="text" @click="dialogFormVisible5 = true">停用</el-button>
                      </div>
                    </div>
                    <el-button slot="reference" type="text"><i class="el-icon-more" /></el-button>
@@ -107,18 +108,18 @@
          <!-- 弹出表单页 -->
          <div>
            <!-- 添加标准 -->
            <el-dialog title="添加标准" :visible.sync="dialogFormVisible1">
              <el-form ref="standardForm" :model="standardForm" :rules="rulesStandard">
                <el-form-item label="标准号" :label-width="formLabelWidth" prop="standardnumber">
            <el-dialog title="添加标准" :visible.sync="dialogFormVisible1" width="33%">
              <el-form :model="standardForm" :rules="rulesStandard">
                <el-form-item label="标准号" label-width="100px" prop="standardnumber">
                  <el-input v-model="standardForm.standardnumber" autocomplete="off" />
                </el-form-item>
                <el-form-item label="标准名称" :label-width="formLabelWidth" prop="standardname">
                <el-form-item label="标准名称" label-width="100px" prop="standardname">
                  <el-input v-model="standardForm.standardname" autocomplete="off" />
                </el-form-item>
                <el-form-item label="英文名称" :label-width="formLabelWidth" prop="standardenname">
                <el-form-item label="英文名称" label-width="100px" prop="standardenname">
                  <el-input v-model="standardForm.engname" autocomplete="off" />
                </el-form-item>
                <el-form-item label="父级分类" :label-width="formLabelWidth">
                <el-form-item label="父级分类" label-width="100px">
                  <el-select v-model="standardForm.type" placeholder="请选择">
                    <el-option label="原材料" value="0" />
                    <el-option label="电线电缆" value="1" />
@@ -131,7 +132,7 @@
              </div>
            </el-dialog>
            <!-- 添加型号 -->
            <el-dialog title="添加型号" :visible.sync="dialogFormVisible2">
            <el-dialog title="添加型号" :visible.sync="dialogFormVisible2" width="30%">
              <el-form ref="form" :model="modelForm" :rules="rulesModel">
                <el-form-item label="型号" :label-width="formLabelWidth" prop="model">
                  <el-input v-model="modelForm.model" autocomplete="off" />
@@ -146,7 +147,7 @@
              </div>
            </el-dialog>
            <!-- 添加规格 -->
            <el-dialog title="添加规格" :visible.sync="dialogFormVisible3">
            <el-dialog title="添加规格" :visible.sync="dialogFormVisible3" width="30%">
              <el-form ref="form" :model="specificationForm" :rules="rulesspecification">
                <el-form-item label="规格名称" :label-width="formLabelWidth" prop="name">
                  <el-input v-model="specificationForm.name" autocomplete="off" />
@@ -185,7 +186,7 @@
              </div>
            </el-dialog>
            <!-- 编辑规格 -->
            <el-dialog title="编辑规格" :visible.sync="dialogFormVisible4">
            <el-dialog title="编辑规格" :visible.sync="dialogFormVisible4" width="30%">
              <el-form ref="form" :model="editSpeForm" :rules="rulesspecification">
                <el-form-item label="规格名称" :label-width="formLabelWidth" prop="name">
                  <el-input v-model="editSpeForm.name" autocomplete="off" />
@@ -234,7 +235,8 @@
            <el-dialog
              title="提示"
              :visible.sync="dialogFormVisible5"
              width="30%">
              width="30%"
            >
              <span>确认停用吗？</span>
              <span slot="footer" class="dialog-footer">
                <el-button @click="dialogFormVisible5 = false">取 消</el-button>
@@ -246,7 +248,7 @@
            <!-- 分页器 -->
            <el-pagination
              :current-page="pageParams.pageNo"
              :page-sizes="[1, 2, 3, 4]"
              :page-sizes="[10, 15, 20, 25]"
              :page-size="pageParams.pageNo"
              layout="total, sizes, prev, pager, next, jumper"
              :total="pageParams.total"
@@ -284,42 +286,13 @@
        keyword: ''
      },
      tableData: [
        {
          id: 2,
          name: 'AB',
          updateTime: '2023-07-12 00:00:12',
          username: '小小',
          vel: 'V1.0',
          spe_state: 1,
          visible: false
        },
        {
          id: 3,
          name: 'AB',
          updateTime: '2023-07-12 00:00:12',
          username: '小小',
          vel: 'V1.0',
          spe_state: 1,
          visible: false

        },
        {
          id: 4,
          name: 'AB',
          updateTime: '2023-07-12 00:00:12',
          username: '小小',
          vel: 'V1.0',
          spe_state: 1,
          visible: false

        }
      ],
      oldtableData: [],
      // 分页参数
      pageParams: {
        pageNo: 1,
        pageSize: 1,
        total: 3
        pageSize: 10,
        total: 0
      },
      tablespecifications: [
      ],
@@ -356,7 +329,7 @@
        spe_state: '',
        voltageLevel: ''
      }],
      formLabelWidth: '120',
      formLabelWidth: '100px',
      rulesStandard: {
        standardnumber: [
          {
@@ -446,6 +419,7 @@
      // 跳转产品规格详情页
      this.$router.push(`/standardLibrary/SpecificationDetails/${row.id}`)
    },
    // 获取当前规格的行id
    getRowID(row) {
      // console.log(row.id)
      this.id = row.id
@@ -616,13 +590,37 @@
      await updateSpeState({ id: this.rowId,
        spe_state: '0' })
      this.dialogFormVisible5 = false
    },
    renderContent(h, { node, data, store }) {
      // console.log('data', data)
      // console.log('node', node)
      // 判断是否是父节点或文件夹
      const isFolder = ('children') in data
      return (
        <span>
          {isFolder ? (
            <i
              class={node.expanded ? 'el-icon-folder-opened blue-folder' : 'el-icon-folder blue-folder'}
            ></i>
          ) : (
            <i class='el-icon-document blue-folder'></i>
          )}
          <span> {data.label}</span>
        </span>
      )
    }
  }
}
</script>

<style lang="scss" scoped>

// .dialogform {
//   transform: translate(-50%, -50%);
//   top: 50% !important;
//   left: 50% !important;
//   width: 1000px;
//   height: 800px;
// }
.standard-library-main{
  width: 100%;
  height: 100%;
@@ -641,6 +639,16 @@
      margin-right: 12px;
      .el-tree {
        // margin-top: 12px;
        ::v-deep .el-tree-node__content{
          height: 24px !important;
          font-size: 16px;
          display: inline-block !important;
          padding: 2px;
          color: #333;
          .blue-folder{
            color: rgb(64, 158, 255)
          }
        }
      }
      // .el-tree {
      //   margin-top: 12px;