提交代码

唐耀东

2022-07-16 4ef06d948899e393515bd62819f4f773766f9449

提交代码

 package-lock.json

Diff too large

 package.json

@@ -49,6 +49,7 @@
    "js-beautify": "1.13.0",
    "js-cookie": "3.0.1",
    "jsencrypt": "3.2.1",
    "minio": "^7.0.28",
    "nprogress": "0.2.0",
    "quill": "1.3.7",
    "screenfull": "5.0.2",

 src/api/oa/rules.js

New file
@@ -0,0 +1,44 @@
import request from '@/utils/request'

// 查询规章制度列表
export function listRules(query) {
  return request({
    url: '/oa/rules/list',
    method: 'get',
    params: query
  })
}

// 查询规章制度详细
export function getRules(id) {
  return request({
    url: '/oa/rules/' + id,
    method: 'get'
  })
}

// 新增规章制度
export function addRules(data) {
  return request({
    url: '/oa/rules',
    method: 'post',
    data: data
  })
}

// 修改规章制度
export function updateRules(data) {
  return request({
    url: '/oa/rules',
    method: 'put',
    data: data
  })
}

// 删除规章制度
export function delRules(id) {
  return request({
    url: '/oa/rules/' + id,
    method: 'delete'
  })
}

 src/components/FileUpload/index.vue

@@ -113,6 +113,14 @@
    },
  },
  methods: {
    startLoading() {
      this.loading = this.$loading({
        lock: true,
        text: "Loading",
        spinner: "el-icon-loading",
        background: "rgba(0, 0, 0, 0.8)",
      });
    },
    // 上传前校检格式和大小
    handleBeforeUpload(file) {
      // 校检文件类型
@@ -130,6 +138,7 @@
          this.$message.error(`文件格式不正确, 请上传${this.fileType.join("/")}格式文件!`);
          return false;
        }
        this.startLoading();
      }
      // 校检文件大小
      if (this.fileSize) {
@@ -153,6 +162,7 @@
    handleUploadSuccess(res, file) {
      if (res.code === 200) {
        this.$message.success("上传成功");
        this.loading.close();
        this.fileList.push({ name: res.data.fileName, url: res.data.url });
        this.$emit("input", this.listToString(this.fileList));
      } else {

 src/components/FileUpload/minio.vue

New file
@@ -0,0 +1,341 @@
<template>
  <div class="upload-file">
    <el-upload
        :disabled="disabled"
        action
        :accept="accept"
        :before-upload="handleBeforeUpload"
        :file-list="fileList"
        :limit="limit"
        :on-error="handleUploadError"
        :on-exceed="handleExceed"
        :on-success="handleUploadSuccess"
        :show-file-list="false"
        :headers="headers"
        class="upload-file-uploader"
        ref="upload"
        :http-request="upload"
    >
      <!-- 上传按钮 -->
      <el-button size="mini" type="primary">选取文件</el-button>
      <!-- 上传提示 -->
      <div class="el-upload__tip" slot="tip" v-if="showTip">
        请上传
        <template v-if="fileSize"> 大小不超过 <b style="color: #f56c6c">{{ fileSize }}MB</b></template>
        <template v-if="fileType"> 格式为 <b style="color: #f56c6c">{{ fileType.join("/") }}</b></template>
        的文件
      </div>
    </el-upload>

    <!-- 文件列表 -->
    <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
      <li :key="file.uid" class="el-upload-list__item ele-upload-list__item-content" v-for="(file, index) in fileList">
        <el-link :href="`${file.url}`" :underline="false" target="_blank">
          <span class="el-icon-document"> {{ getFileName(file.name) }} </span>
        </el-link>
        <div class="ele-upload-list__item-content-action">
          <el-link :underline="false" @click="handleDelete(index)" type="danger" :disabled="disabled">删除</el-link>
        </div>
      </li>
    </transition-group>
  </div>
</template>

<script>
import {getToken} from "@/utils/auth";

let Minio = require('minio')
let stream = require('stream')
//连接minio文件服务器
var minioClient = new Minio.Client({
  endPoint: '39.101.132.31',   //对象存储服务的URL
  port: 9000,//端口号
  useSSL: false,   //true代表使用HTTPS
  accessKey: 'minioadmin',   //账户id
  secretKey: 'minioadmin..',   //密码
  partSize: '20M'
});
export default {
  name: "FileUpload",
  props: {
    // 值
    value: [String, Object, Array],
    // 数量限制
    limit: {
      type: Number,
      default: 1,
    },
    // 大小限制(MB)
    fileSize: {
      type: Number,
      default: 50,
    },
    // 文件类型, 例如['png', 'jpg', 'jpeg']
    fileType: {
      type: Array,
      default: () => ["doc", "xls", "ppt", "txt", "pdf", "zip"],
    },
    // 是否显示提示
    isShowTip: {
      type: Boolean,
      default: true
    },
    disabled: {
      type: Boolean,
      default: false
    },
    accept:{
      type: String,
      default: '',
    },
  },
  data() {
    return {
      baseUrl: process.env.VUE_APP_BASE_API,
      uploadFileUrl: process.env.VUE_APP_BASE_API + "/system/oss/upload", // 上传的图片服务器地址
      headers: {
        Authorization: "Bearer " + getToken(),
      },
      fileList: [],
    };
  },
  watch: {
    value: {
      handler(val) {
        if (val) {
          let temp = 1;
          // 首先将值转为数组
          const list = Array.isArray(val) ? val : this.value.split(',');
          // 然后将数组转为对象数组
          this.fileList = list.map(item => {
            if (typeof item === "string") {
              item = {name: item, url: item};
            }
            item.uid = item.uid || new Date().getTime() + temp++;
            return item;
          });
        } else {
          this.fileList = [];
          return [];
        }
      },
      deep: true,
      immediate: true
    }
  },
  computed: {
    // 是否显示提示
    showTip() {
      return this.isShowTip && (this.fileType || this.fileSize);
    },
  },
  methods: {
    startLoading() {
      this.loading = this.$loading({
        lock: true,
        text: "Loading",
        spinner: "el-icon-loading",
        background: "rgba(0, 0, 0, 0.8)",
      });
    },
    // 上传前校检格式和大小
    handleBeforeUpload(file) {
      // 校检文件类型
      if (this.fileType) {
        let fileExtension = "";
        if (file.name.lastIndexOf(".") > -1) {
          fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1);
        }
        const isTypeOk = this.fileType.some((type) => {
          if (file.type.indexOf(type) > -1) return true;
          if (fileExtension && fileExtension.indexOf(type) > -1) return true;
          return false;
        });
        if (!isTypeOk) {
          this.$message.error(`文件格式不正确, 请上传${this.fileType.join("/")}格式文件!`);
          return false;
        }
        this.startLoading();
      }
      // 校检文件大小
      if (this.fileSize) {
        const isLt = file.size / 1024 / 1024 < this.fileSize;
        if (!isLt) {
          this.$message.error(`上传文件大小不能超过 ${this.fileSize} MB!`);
          return false;
        }
      }
      return true;
    },
    // 文件个数超出
    handleExceed() {
      this.$message.error(`上传文件数量不能超过 ${this.limit} 个!`);
    },
    // 上传失败
    handleUploadError(err) {
      this.$message.error("上传失败, 请重试");
    },
    // 上传成功回调
    handleUploadSuccess(res, file, fileList) {
      if (res.code === 200) {
        this.$message.success("上传成功");
        this.loading.close();
        this.fileList.push({name: res.data.fileName, url: res.data.url});
        this.$emit("input", this.listToString(this.fileList));
      } else {
        this.$message.error(res.msg);
        this.loading.close();
      }
    },
    // 删除文件
    handleDelete(index) {
      this.fileList.splice(index, 1);
      this.$emit("input", this.listToString(this.fileList));
    },
    // 获取文件名称
    getFileName(name) {
      if (name.lastIndexOf("/") > -1) {
        return name.slice(name.lastIndexOf("/") + 1).toLowerCase();
      } else {
        return "";
      }
    },
    // 对象转成指定字符串分隔
    listToString(list, separator) {
      let strs = "";
      separator = separator || ",";
      for (let i in list) {
        strs += list[i].url + separator;
      }
      return strs != "" ? strs.substr(0, strs.length - 1) : "";
    },

    upload(fileObj) {
      let vm = this
      // const files = fileObj;
      if (fileObj) {
        let file = fileObj.file
        //判断是否选择了文件
        if (file == undefined) {
          //未选择
          console.log("请上传文件")
        } else {
          //选择
          //获取文件类型及大小
          const fileName = file.name
          const mineType = file.type
          const fileSize = file.size

          //参数
          let metadata = {
            "content-type": mineType,
            "content-length": fileSize
          }
          //判断储存桶是否存在
          minioClient.bucketExists('oafiles', function (err) {
            if (err) {
              if (err.code == 'NoSuchBucket') return console.log("bucket does not exist.")
              console.log('err', err)
              return
            }
            //存在
            console.log('Bucket exists.')
            //准备上传
            let reader = new FileReader();
            reader.readAsDataURL(file);
            reader.onloadend = function (e) {
              const dataurl = e.target.result
              //base64转blob
              const blob = vm.toBlob(dataurl)
              //blob转arrayBuffer
              let reader2 = new FileReader()
              reader2.readAsArrayBuffer(blob)

              reader2.onload = function (ex) {
                //定义流
                let bufferStream = new stream.PassThrough();
                //将buffer写入
                bufferStream.end(new Buffer(ex.target.result));
                //上传
                minioClient.putObject('oafiles', fileName, bufferStream, fileSize, metadata, function (err, etag) {
                  if (err == null) {
                    minioClient.presignedGetObject('oafiles', fileName, 24 * 60 * 60, function (err, presignedUrl) {
                      if (err) {
                        this.$message.error(err)
                        return
                      }
                      //输出url
                      console.log(presignedUrl)
                      vm.$message.success("上传成功");
                      vm.loading.close();
                      let url = presignedUrl.split("?")[0]
                      let name = url.split("/")[url.split("/").length - 1]
                      console.log(url)
                      console.log(name)
                      vm.fileList.push({ name: url, url: url });
                      vm.$emit("input", vm.listToString(vm.fileList));
                    })
                  }
                  //return console.log(err, etag)
                })
              }
            }
          })
        }

      }
    },
    //base64转blob
    toBlob(base64Data) {
      let byteString = base64Data
      if (base64Data.split(',')[0].indexOf('base64') >= 0) {
        byteString = atob(base64Data.split(',')[1]) // base64 解码
      } else {
        byteString = unescape(base64Data.split(',')[1])
      }
      // 获取文件类型
      let mimeString = base64Data.split(';')[0].split(":")[1] // mime类型

      // ArrayBuffer 对象用来表示通用的、固定长度的原始二进制数据缓冲区
      // let arrayBuffer = new ArrayBuffer(byteString.length) // 创建缓冲数组
      // let uintArr = new Uint8Array(arrayBuffer) // 创建视图

      let uintArr = new Uint8Array(byteString.length) // 创建视图

      for (let i = 0; i < byteString.length; i++) {
        uintArr[i] = byteString.charCodeAt(i)
      }
      // 生成blob
      const blob = new Blob([uintArr], {
        type: mimeString
      })
      // 使用 Blob 创建一个指向类型化数组的URL, URL.createObjectURL是new Blob文件的方法,可以生成一个普通的url,可以直接使用,比如用在img.src上
      return blob
    }
  },
};
</script>

<style scoped lang="scss">
.upload-file-uploader {
  margin-bottom: 5px;
}

.upload-file-list .el-upload-list__item {
  border: 1px solid #e4e7ed;
  line-height: 2;
  margin-bottom: 10px;
  position: relative;
}

.upload-file-list .ele-upload-list__item-content {
  display: flex;
  justify-content: space-between;
  align-items: center;
  color: inherit;
}

.ele-upload-list__item-content-action .el-link {
  margin-right: 10px;
}
</style>

 src/views/basics/manufacturer/index.vue

@@ -98,6 +98,7 @@
      </el-table-column>
      <el-table-column label="厂商名称" align="center" prop="name" show-overflow-tooltip/>
      <el-table-column label="厂商代码" align="center" prop="code" show-overflow-tooltip/>
      <el-table-column label="联系人" align="center" prop="contactBy" show-overflow-tooltip/>
      <el-table-column label="联系方式" align="center" prop="phone" show-overflow-tooltip/>
      <el-table-column label="邮箱" align="center" prop="mailbox" show-overflow-tooltip/>
      <el-table-column label="联系地址" align="center" prop="contactAddress" show-overflow-tooltip />
@@ -134,19 +135,25 @@
    <Dialog :title="title" :visible.sync="open" width="500px" :append-to-body="true" :close-on-click-modal="false">
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
        <el-form-item label="厂商名称" prop="name">
          <el-input v-model="form.name" placeholder="请输入厂商名称" />
          <el-input v-model="form.name" maxlength="30" show-word-limit placeholder="请输入厂商名称" />
        </el-form-item>
        <el-form-item label="厂商代码" prop="code">
          <el-input v-model="form.code" placeholder="请输入厂商代码" />
          <el-input v-model="form.code" maxlength="60" show-word-limit placeholder="请输入厂商代码" />
        </el-form-item>
        <el-form-item label="联系人" prop="contactBy">
          <el-input v-model="form.contactBy" maxlength="30" show-word-limit placeholder="请输入联系人" />
        </el-form-item>
        <el-form-item label="联系方式" prop="phoneNumber">
          <el-input v-model="form.phone" placeholder="请输入联系方式" />
          <el-input v-model="form.phone" maxlength="100" show-word-limit placeholder="请输入联系方式" />
        </el-form-item>
        <el-form-item label="邮箱" prop="mailbox">
          <el-input v-model="form.mailbox" placeholder="请输入邮箱" />
          <el-input v-model="form.mailbox" maxlength="30" show-word-limit placeholder="请输入邮箱" />
        </el-form-item>
        <el-form-item label="联系地址" prop="contactAddress">
          <el-input v-model="form.contactAddress" placeholder="请输入联系地址" />
          <el-input v-model="form.contactAddress" maxlength="128" show-word-limit placeholder="请输入联系地址" />
        </el-form-item>
        <el-form-item label="备注" prop="remarks">
          <el-input v-model="form.remarks" type="textarea" rows="4" maxlength="255" show-word-limit placeholder="请输入邮箱" />
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">

 src/views/basics/rules/index.vue

New file
@@ -0,0 +1,343 @@
<template>
  <div class="app-container">
    <!--    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">-->
    <!--      <el-form-item>-->
    <!--        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>-->
    <!--        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>-->
    <!--      </el-form-item>-->
    <!--    </el-form>-->

    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
        <el-button
            type="primary"
            plain
            icon="el-icon-plus"
            size="mini"
            @click="handleAdd"
        >新增
        </el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
            type="success"
            plain
            icon="el-icon-edit"
            size="mini"
            :disabled="single"
            @click="handleUpdate"
        >修改
        </el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
            type="danger"
            plain
            icon="el-icon-delete"
            size="mini"
            :disabled="multiple"
            @click="handleDelete"
        >删除
        </el-button>
      </el-col>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>

    <el-table v-loading="loading" :data="rulesList" :header-cell-style="{'text-align':'center'}" style="width: 100%"
              @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center"/>
      <el-table-column label="序号" align="left" width="50">
        <template slot-scope="scope">
          <span>{{ scope.$index + (queryParams.pageNum - 1) * queryParams.pageSize + 1 }} </span>
        </template>
      </el-table-column>
      <el-table-column label="规章制度" align="left" prop="rules">
        <template slot-scope="scope">
          <el-link v-if="scope.row.fileUrl" type="primary" :href="scope.row.fileUrl" target="_blank">
            {{ scope.row.rules }}
          </el-link>
          <el-link v-else type="primary">{{ scope.row.rules }}</el-link>
        </template>
      </el-table-column>
      <el-table-column label="发布版本" align="left" prop="versionCode" width="100"/>
      <el-table-column label="修订日期" align="left" prop="reviseTime" width="100">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.reviseTime, '{y}-{m}-{d}') }}</span>
        </template>
      </el-table-column>
      <!--      <el-table-column label="附件" align="center" prop="fileUrl" />-->
      <el-table-column label="发布时间" align="left" prop="createTime" width="100">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
        </template>
      </el-table-column>
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
              size="mini"
              type="text"
              icon="el-icon-edit"
              @click="handleUpdate(scope.row)"
          >修改
          </el-button>
          <el-button
              size="mini"
              type="text"
              icon="el-icon-document"
              @click="handleUpload(scope.row)"
          >附件
          </el-button>
          <el-button
              size="mini"
              type="text"
              class="del-btn"
              icon="el-icon-delete"
              @click="handleDelete(scope.row)"
          >删除
          </el-button>
        </template>
      </el-table-column>
    </el-table>

    <pagination
        v-show="total>0"
        :total="total"
        :page.sync="queryParams.pageNum"
        :limit.sync="queryParams.pageSize"
        @pagination="getList"
    />

    <!-- 添加或修改规章制度对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="500px" :append-to-body="true" :close-on-click-modal="false"
               :destroy-on-close="true">
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
        <el-form-item label="规章制度" prop="rules">
          <el-input v-model="form.rules" maxlength="64" show-word-limit placeholder="请输入规章制度"/>
        </el-form-item>
        <el-form-item label="发布版本" prop="versionCode">
          <el-input v-model="form.versionCode" maxlength="64" show-word-limit placeholder="请输入发布版本"/>
        </el-form-item>
        <el-form-item label="修订日期" prop="reviseTime">
          <el-date-picker clearable size="small"
                          v-model="form.reviseTime"
                          type="date"
                          value-format="yyyy-MM-dd"
                          style="width: 100%"
                          placeholder="选择修订日期">
          </el-date-picker>
        </el-form-item>
        <el-form-item label="附件">
<!--          <fileUpload v-model="form.fileUrl" :limit="1" :fileType="[`pdf`]"/>-->
          <minio-upload v-model="form.fileUrl" :limit="1" :fileType="[`pdf`]"></minio-upload>
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
      </div>
    </el-dialog>
    <!-- 附件窗体 -->
    <el-dialog :title="title" :visible.sync="uploadFlag" width="500px" :append-to-body="true"
               :close-on-click-modal="false"
               :destroy-on-close="true">
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
        <el-form-item label="附件">
          <!--          <fileUpload v-model="form.fileUrl" :limit="1" :fileType="[`pdf`]"/>-->
          <minio-upload v-model="form.fileUrl" :limit="1" :fileType="[`pdf`]"></minio-upload>
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
      </div>
    </el-dialog>
  </div>
</template>

<script>
import {listRules, getRules, delRules, addRules, updateRules} from "@/api/oa/rules";
import {Base64} from 'js-base64'
import minioUpload from '@/components/FileUpload/minio'

export default {
  name: "Rules",
  components: {minioUpload},
  data() {
    return {
      // 按钮loading
      buttonLoading: false,
      // 遮罩层
      loading: true,
      // 选中数组
      ids: [],
      // 非单个禁用
      single: true,
      // 非多个禁用
      multiple: true,
      // 显示搜索条件
      showSearch: true,
      // 总条数
      total: 0,
      // 规章制度表格数据
      rulesList: [],
      // 弹出层标题
      title: "",
      // 是否显示弹出层
      open: false,
      // 查询参数
      queryParams: {
        pageNum: 1,
        pageSize: 10,
      },
      // 表单参数
      form: {},
      // 表单校验
      rules: {
        id: [
          {required: true, message: "不能为空", trigger: "blur"}
        ],
        rules: [
          {required: true, message: "规章制度不能为空", trigger: "blur"}
        ],
        versionCode: [
          {required: true, message: "发布版本不能为空", trigger: "blur"}
        ],
        reviseTime: [
          {required: true, message: "修订日期不能为空", trigger: "blur"}
        ],
      },
      uploadFlag: false,
    };
  },
  created() {
    this.getList();
  },
  methods: {
    /** 查询规章制度列表 */
    getList() {
      this.loading = true;
      listRules(this.queryParams).then(response => {
        this.rulesList = response.rows;
        this.total = response.total;
        this.loading = false;
      });
    },
    // 取消按钮
    cancel() {
      this.open = false;
      this.uploadFlag = false;
      this.reset();
    },
    // 表单重置
    reset() {
      this.form = {
        id: undefined,
        rules: undefined,
        versionCode: undefined,
        reviseTime: undefined,
        fileUrl: undefined,
        createBy: undefined,
        createTime: undefined,
        updateBy: undefined,
        updateTime: undefined,
        delFlag: undefined
      };
      this.resetForm("form");
    },
    /** 搜索按钮操作 */
    handleQuery() {
      this.queryParams.pageNum = 1;
      this.getList();
    },
    /** 重置按钮操作 */
    resetQuery() {
      this.resetForm("queryForm");
      this.handleQuery();
    },
    // 多选框选中数据
    handleSelectionChange(selection) {
      this.ids = selection.map(item => item.id)
      this.single = selection.length !== 1
      this.multiple = !selection.length
    },
    /** 新增按钮操作 */
    handleAdd() {
      this.reset();
      this.open = true;
      this.title = "添加规章制度";
    },
    /** 修改按钮操作 */
    handleUpdate(row) {
      this.loading = true;
      this.reset();
      const id = row.id || this.ids
      getRules(id).then(response => {
        this.loading = false;
        this.form = response.data;
        this.open = true;
        this.title = "修改规章制度";
      });
    },
    /** 提交按钮 */
    submitForm() {
      this.$refs["form"].validate(valid => {
        if (valid) {
          this.buttonLoading = true;
          if (this.form.id != null) {
            updateRules(this.form).then(response => {
              this.$modal.msgSuccess("修改成功");
              this.open = false;
              this.uploadFlag = false;
              this.getList();
            }).finally(() => {
              this.buttonLoading = false;
            });
          } else {
            addRules(this.form).then(response => {
              this.$modal.msgSuccess("新增成功");
              this.open = false;
              this.getList();
            }).finally(() => {
              this.buttonLoading = false;
            });
          }
        }
      });
    },
    /** 删除按钮操作 */
    handleDelete(row) {
      const ids = row.id || this.ids;
      this.$modal.confirm('是否确认删除？').then(() => {
        this.loading = true;
        return delRules(ids);
      }).then(() => {
        this.loading = false;
        this.getList();
        this.$modal.msgSuccess("删除成功");
      }).finally(() => {
        this.loading = false;
      });
    },
    /** 导出按钮操作 */
    handleExport() {
      this.download('oa/rules/export', {
        ...this.queryParams
      }, `rules_${new Date().getTime()}.xlsx`)
    },
    handlePreview(r) {
      // window.open('http://47.95.0.46:8012/onlinePreview?url=' + encodeURIComponent(Base64.encode(r.fileUrl)));
    },
    handleUpload(row) {
      this.loading = true;
      this.reset();
      const id = row.id || this.ids
      getRules(id).then(response => {
        this.loading = false;
        this.form = response.data;
        this.uploadFlag = true;
        this.title = "上传附件";
      });
    },
  }
};
</script>

 src/views/components/organization/index.vue

@@ -84,4 +84,4 @@

<style scoped>

</style>
</style>

 src/views/components/organization/organizationList.vue

@@ -28,9 +28,9 @@
        @current-change="handleCurrentChange"
    >
      <el-table-column label="序号" type="index" width="55"></el-table-column>
      <el-table-column label="机构名称" align="left" prop="name"/>
      <el-table-column label="机构名称" align="left" prop="name" width="400"/>
      <el-table-column label="机构编号" prop="code"/>
      <el-table-column label="显示顺序" align="center" prop="orderNum"/>
      <el-table-column label="显示顺序" align="center" prop="orderNum" width="150"/>
    </el-table>
  </div>
</template>

 src/views/device/peripheralUnit/index.vue

@@ -3,57 +3,57 @@
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="外设代码" prop="code">
        <el-input
          v-model="queryParams.code"
          placeholder="请输入外设代码"
          clearable
          size="small"
          @keyup.enter.native="handleQuery"
            v-model="queryParams.code"
            placeholder="请输入外设代码"
            clearable
            size="small"
            @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="外设名称" prop="name">
        <el-input
          v-model="queryParams.name"
          placeholder="请输入外设名称"
          clearable
          size="small"
          @keyup.enter.native="handleQuery"
            v-model="queryParams.name"
            placeholder="请输入外设名称"
            clearable
            size="small"
            @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="规格型号" prop="model">
        <el-input
          v-model="queryParams.model"
          placeholder="请输入规格型号"
          clearable
          size="small"
          @keyup.enter.native="handleQuery"
            v-model="queryParams.model"
            placeholder="请输入规格型号"
            clearable
            size="small"
            @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="生产厂商" prop="manufacturer">
        <el-select v-model="queryParams.manufacturer" placeholder="请选择生产厂商" clearable size="small">
          <el-option
            v-for="item in manufacturerList"
            :key="item.id"
            :label="item.name"
            :value="item.id"
              v-for="item in manufacturerList"
              :key="item.id"
              :label="item.name"
              :value="item.id"
          />
        </el-select>
      </el-form-item>
<!--      <el-form-item label="厂商代码" prop="vendorCode">-->
<!--        <el-input-->
<!--          v-model="queryParams.vendorCode"-->
<!--          placeholder="请输入厂商代码"-->
<!--          clearable-->
<!--          size="small"-->
<!--          @keyup.enter.native="handleQuery"-->
<!--        />-->
<!--      </el-form-item>-->
      <!--      <el-form-item label="厂商代码" prop="vendorCode">-->
      <!--        <el-input-->
      <!--          v-model="queryParams.vendorCode"-->
      <!--          placeholder="请输入厂商代码"-->
      <!--          clearable-->
      <!--          size="small"-->
      <!--          @keyup.enter.native="handleQuery"-->
      <!--        />-->
      <!--      </el-form-item>-->
      <el-form-item label="波特率" prop="baudRate">
        <el-select v-model="queryParams.baudRate" placeholder="请选择波特率" clearable size="small">
          <el-option
            v-for="dict in dict.type.DICT103"
            :key="dict.value"
            :label="dict.label"
            :value="dict.value"
              v-for="dict in dict.type.DICT103"
              :key="dict.value"
              :label="dict.label"
              :value="dict.value"
          />
        </el-select>
      </el-form-item>
@@ -66,36 +66,36 @@
    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
        <el-button
          type="primary"
          plain
          icon="el-icon-plus"
          size="mini"
          @click="handleAdd"
          v-hasPermi="['oa:peripheralUnit:add']"
            type="primary"
            plain
            icon="el-icon-plus"
            size="mini"
            @click="handleAdd"
            v-hasPermi="['oa:peripheralUnit:add']"
        >新增
        </el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="success"
          plain
          icon="el-icon-edit"
          size="mini"
          :disabled="single"
          @click="handleUpdate"
          v-hasPermi="['oa:peripheralUnit:edit']"
            type="success"
            plain
            icon="el-icon-edit"
            size="mini"
            :disabled="single"
            @click="handleUpdate"
            v-hasPermi="['oa:peripheralUnit:edit']"
        >修改
        </el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="danger"
          plain
          icon="el-icon-delete"
          size="mini"
          :disabled="multiple"
          @click="handleDelete"
          v-hasPermi="['oa:peripheralUnit:remove']"
            type="danger"
            plain
            icon="el-icon-delete"
            size="mini"
            :disabled="multiple"
            @click="handleDelete"
            v-hasPermi="['oa:peripheralUnit:remove']"
        >删除
        </el-button>
      </el-col>
@@ -132,39 +132,39 @@
      <el-table-column label="问询指令" align="center" width="220" prop="readInstruction" show-overflow-tooltip/>
      <el-table-column label="指令长度" width="80" align="center" prop="orderLength" show-overflow-tooltip/>
      <el-table-column label="返回长度" width="80" align="center" prop="loopLength" show-overflow-tooltip/>
<!--      <el-table-column label="解析说明" align="center" min-width="300" show-overflow-tooltip prop="description"/>-->
      <!--      <el-table-column label="解析说明" align="center" min-width="300" show-overflow-tooltip prop="description"/>-->
      <el-table-column label="操作" align="center" fixed="right" width="240" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
            size="mini"
            type="text"
            icon="el-icon-view"
            @click="handleInfo(scope.row)"
            v-hasPermi="['oa:peripheralUnit:info']"
              size="mini"
              type="text"
              icon="el-icon-view"
              @click="handleInfo(scope.row)"
              v-hasPermi="['oa:peripheralUnit:info']"
          >查看
          </el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-edit"
            @click="handleUpdate(scope.row)"
            v-hasPermi="['oa:peripheralUnit:edit']"
              size="mini"
              type="text"
              icon="el-icon-edit"
              @click="handleUpdate(scope.row)"
              v-hasPermi="['oa:peripheralUnit:edit']"
          >修改
          </el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-document"
            @click="handleUpload(scope.row)"
              size="mini"
              type="text"
              icon="el-icon-document"
              @click="handleUpload(scope.row)"
          >附件
          </el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-delete"
            class="del-btn"
            @click="handleDelete(scope.row)"
            v-hasPermi="['oa:peripheralUnit:remove']"
              size="mini"
              type="text"
              icon="el-icon-delete"
              class="del-btn"
              @click="handleDelete(scope.row)"
              v-hasPermi="['oa:peripheralUnit:remove']"
          >删除
          </el-button>
        </template>
@@ -172,11 +172,11 @@
    </el-table>

    <pagination
      v-show="total>0"
      :total="total"
      :page.sync="queryParams.pageNum"
      :limit.sync="queryParams.pageSize"
      @pagination="getList"
        v-show="total>0"
        :total="total"
        :page.sync="queryParams.pageNum"
        :limit.sync="queryParams.pageSize"
        @pagination="getList"
    />

    <!-- 添加或修改外设单元对话框 -->
@@ -192,25 +192,26 @@
          <el-input v-model="form.model" placeholder="请输入规格型号" :disabled="disabled"/>
        </el-form-item>
        <el-form-item label="生产厂商" prop="manufacturer">
          <el-select v-model="form.manufacturer" placeholder="请选择生产厂商" clearable size="small" :disabled="disabled">
          <el-select v-model="form.manufacturer" placeholder="请选择生产厂商" clearable size="small" :disabled="disabled"
                     style="width: 100%;">
            <el-option
              v-for="item in manufacturerList"
              :key="item.id"
              :label="item.name"
              :value="item.id"
                v-for="item in manufacturerList"
                :key="item.id"
                :label="item.name"
                :value="item.id"
            />
          </el-select>
        </el-form-item>
<!--        <el-form-item label="厂商代码" prop="vendorCode">-->
<!--          <el-input v-model="form.vendorCode" placeholder="请输入厂商代码" :disabled="disabled"/>-->
<!--        </el-form-item>-->
        <!--        <el-form-item label="厂商代码" prop="vendorCode">-->
        <!--          <el-input v-model="form.vendorCode" placeholder="请输入厂商代码" :disabled="disabled"/>-->
        <!--        </el-form-item>-->
        <el-form-item label="波特率" prop="baudRate">
          <el-select v-model="form.baudRate" placeholder="请选择波特率" :disabled="disabled">
          <el-select v-model="form.baudRate" placeholder="请选择波特率" :disabled="disabled" style="width: 100%;">
            <el-option
              v-for="dict in dict.type.DICT103"
              :key="dict.value"
              :label="dict.label"
              :value="dict.value"
                v-for="dict in dict.type.DICT103"
                :key="dict.value"
                :label="dict.label"
                :value="dict.value"
            ></el-option>
          </el-select>
        </el-form-item>
@@ -224,7 +225,8 @@
          <el-input v-model="form.loopLength" type='number' placeholder="请输入返回长度" :disabled="disabled"/>
        </el-form-item>
        <el-form-item label="解析说明" prop="description">
          <el-input v-model="form.description" type="textarea" placeholder="请输入内容" maxlength="512" show-word-limit :disabled="disabled"/>
          <el-input v-model="form.description" type="textarea" placeholder="请输入内容" maxlength="512" show-word-limit
                    :disabled="disabled"/>
        </el-form-item>
        <el-form-item label="附件">
          <fileUpload v-model="form.filePath" :disabled="disabled"/>
@@ -260,7 +262,7 @@
  updatePeripheralUnit
} from "@/api/oa/peripheralUnit";
import {Base64} from 'js-base64';
import { listManufacturer } from "@/api/common/common"
import {listManufacturer} from "@/api/common/common"

export default {
  name: "PeripheralUnit",
@@ -326,7 +328,7 @@
        ],
        name: [
          {required: true, message: "外设名称不能为空", trigger: "blur"},
          {max: 32, message: '最多输入32个字符', trigger: 'blur' }
          {max: 32, message: '最多输入32个字符', trigger: 'blur'}
        ],
        model: [
          {required: true, validator: validateModel, trigger: "blur"}
@@ -336,14 +338,14 @@
        ],
        vendorCode: [
          {required: true, message: "厂商代码不能为空", trigger: "blur"},
          {max: 32, message: '最多输入32个字符', trigger: 'blur' }
          {max: 32, message: '最多输入32个字符', trigger: 'blur'}
        ],
        baudRate: [
          {required: true, message: "波特率不能为空", trigger: "change"}
        ],
        readInstruction: [
          {required: true, message: "问询指令不能为空", trigger: "blur"},
          {max: 128, message: '最多输入128个字符', trigger: 'blur' }
          {max: 128, message: '最多输入128个字符', trigger: 'blur'}
        ],
        orderLength: [
          {required: true, message: "指令长度不能为空", trigger: "blur"}
@@ -355,7 +357,7 @@
          {required: true, message: "附件不能为空", trigger: "blur"}
        ],
        description: [
          {max: 512, message: '最多输入512个字符', trigger: 'blur' }
          {max: 512, message: '最多输入512个字符', trigger: 'blur'}
        ]
      },
      disabled: false,
@@ -456,7 +458,7 @@
      this.loading = true;
      this.disabled = false
      this.reset();
      //this.getManufacturerList();
      this.getManufacturerList();
      const id = row.id || this.ids
      getPeripheralUnit(id).then(response => {
        this.loading = false;