Fixiaobai
2023-08-09 93dc072c15fca34c6247830cd62210a70c898165
	new file:   src/api/urlEnum/nonConformanceReview.js
new file: src/api/urlEnum/nonConformingFeedback.js
new file: src/api/util/requestUtil.js
modified: src/views/experiment/nonConformanceReview/index.vue
modified: src/views/experiment/nonConformingFeedback/index.vue
已修改2个文件
已添加3个文件
443 ■■■■■ 文件已修改
src/api/urlEnum/nonConformanceReview.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/urlEnum/nonConformingFeedback.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/util/requestUtil.js 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/experiment/nonConformanceReview/index.vue 212 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/experiment/nonConformingFeedback/index.vue 197 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/urlEnum/nonConformanceReview.js
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
const baseurl='/nonConformanceReview'
const url={
    "getNonConformanceReview": baseurl+"/getNonConformanceReview",//获取不合格品评审
}
export default{
    url
}
src/api/urlEnum/nonConformingFeedback.js
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
const baseurl='/non-conforming-feedback'
const url={
    "getNonConformingFeedback": baseurl+"/getNonConformingFeedback",//获取不合格品反馈
}
export default{
    url
}
src/api/util/requestUtil.js
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
 import request from '@/utils/request'
export function get(path, params) {
    return request({
        url: path,
        method: 'get',
        params
    })
}
export function post(path, data) {
    return request({
        url: path,
        method: 'post',
        data
    })
}
src/views/experiment/nonConformanceReview/index.vue
@@ -1,25 +1,207 @@
<template>
  <div>
    <el-row span="22">
      <el-col span="5">
        <el-input placeholder="请输入内容">
        </el-input>
      </el-col>
      <el-col span=""></el-col>
      <el-col></el-col>
      <el-col></el-col>
      <el-col></el-col>
    </el-row>
    <el-row span="22">
    </el-row>
  <div class="content-main">
    <div class="top-bar">
      <el-form ref="form" style="width: 1000px;" :inline="true">
        <!-- <el-input v-model="input" class="input-form" placeholder="请直接输入样式编号/样品名称/型号规格/进行搜索或下拉选择进行组合查询"
            @keyup.enter.native="getData" /> -->
        <el-form-item style="width: 800px;">
          <el-col style="display: flex; justify-content: space-around;" :span="8">
            <el-row>样式编号:</el-row>
            <el-row><el-input size="small" v-model="materialCode" placeholder="请输入样式编号"></el-input></el-row>
          </el-col>
          <el-col style="display: flex; justify-content: space-around;" :span="8">
            <el-row>样式名称:</el-row>
            <el-row><el-input size="small" v-model="materialName" placeholder="请输入样式名称"></el-input></el-row>
          </el-col>
          <el-col style="display: flex; justify-content: space-around;" :span="8">
            <el-row>申请单号:</el-row>
            <el-row><el-input size="small" v-model="inspectionCode" placeholder="请输入申请单号"></el-input></el-row>
          </el-col>
        </el-form-item>
        <el-form-item>
          <el-button type="primary" size="small" @click="getData()">查询</el-button>
          <el-button type="primary" size="small" plain @click="resetData()">重置</el-button>
          <el-dropdown style="margin-left: 7px;">
            <span class="el-dropdown-link">
              é«˜çº§æœç´¢<i class="el-icon-arrow-down el-icon--right"></i>
            </span>
            <el-dropdown-menu slot="dropdown">
              <el-dropdown-item>黄金糕</el-dropdown-item>
              <el-dropdown-item>狮子头</el-dropdown-item>
              <el-dropdown-item>螺蛳粉</el-dropdown-item>
              <el-dropdown-item disabled>双皮奶</el-dropdown-item>
              <el-dropdown-item divided>蚵仔煎</el-dropdown-item>
            </el-dropdown-menu>
          </el-dropdown>
        </el-form-item>
      </el-form>
      <el-form>
        <el-button size="40" type="primary">批量提交</el-button>
      </el-form>
    </div>
    <div class="library-table">
      <div class="table-box">
        <el-table ref="tableData" :max-height="800" :cell-style="{ textAlign: 'center' }"
          :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'center' }"
          :data="tableData" style="width: 100%">
          <el-table-column type="selection" label="" min-width="5%" />
          <el-table-column  label="样品编号" min-width="10%">
            <template slot-scope="scope">
              <a style="color: #3894d1;">{{ scope.row.materialCode }}</a>
            </template>
          </el-table-column>
          <el-table-column prop="materialName" label="样品名称" min-width="10%" />
          <el-table-column label="申请单号" min-width="10%" >
            <template slot-scope="scope">
              <a style="color: #3894d1;">{{ scope.row.inspectionCode }}</a>
            </template>
          </el-table-column>
          <el-table-column prop="createTime" label="登记日期" min-width="10%" />
          <el-table-column prop="testManager" label="检验负责人" min-width="10%" />
          <el-table-column prop="specifications" label="规格型号" min-width="10%" />
          <el-table-column prop="inspectionStatus" label="结论" min-width="10%">
            <template slot-scope="scope">
              <el-tag type="danger">不合格</el-tag>
            </template>
          </el-table-column>
          <el-table-column label="操作" min-width="8%">
            <template slot-scope="scope">
              <el-button type="text" size="small">提交</el-button>
              <el-button type="text" size="small">作废</el-button>
            </template>
          </el-table-column>
        </el-table>
        <!-- åˆ†é¡µå™¨ -->
        <div>
          <el-pagination :current-page="page" :page-sizes="[10, 20, 30, 40]" :page-size="pageSize"
            layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handleSizeChange"
            @current-change="handleCurrentChange" />
        </div>
      </div>
    </div>
  </div>
</template>
<script>
import { get, post } from '@/api/util/requestUtil';
import urlInfo from '../../../api/urlEnum/nonConformingFeedback.js'
export default {
  data() {
    return {
      input: '',
      tableData: [],
      page: 1,
      total: 0,
      pageSize: 10,
      materialCode: null,
      materialName: null,
      inspectionCode: null
    }
  },
  created() {
  },
  mounted() {
    this.getData()
  },
  methods: {
    handleCurrentChange() {
    },
    handleSizeChange() {
    },
    exportData() {
    },
    // é‡ç½®æŒ‰é’®
    resetData() {
      this.page = 1
      this.pageSize = 10
      this.materialCode=null
      this.materialName=null
      this.inspectionCode=null
      this.getData()
    },
    async getData() {
      let param = {
        "currentPage": this.page,
        'pageNum': this.pageSize,
        "inspectionCode": this.inspectionCode,
        "materialCode": this.materialCode,
        "materialName": this.materialName
      }
      let res = await get(urlInfo.url.getNonConformingFeedback, param)
      this.tableData = res.data.nonConformingFeedbackList
      this.total = res.data.total
    }
  }
}
</script>
<style lang="scss" scoped></style>
<style lang="scss" scoped>
.top-bar {
  margin: -25px -15px;
  background: #fff;
  display: flex;
  justify-content: space-between;
  padding: 5px 24px 0px 24px;
  .input-form {
    width: 800px;
  }
  .el-dropdown-link {
    cursor: pointer;
    color: #409EFF !important;
  }
  .el-icon-arrow-down {
    font-size: 12px !important;
  }
}
.library-table {
  background-color: #fff;
  flex: 1;
  margin: 0px -15px;
  margin-top: 40px;
  display: flex;
  flex-direction: column;
  .table-header {
    padding: 20px;
    display: flex;
    justify-content: space-between;
    .el-form-item {
      margin-bottom: 30px !important;
    }
  }
  .table-box {
    padding: 0px 20px;
    margin-top: 20px;
    flex: 1;
    background: #fff;
    display: flex;
    flex-direction: column;
    >div:nth-child(2) {
      display: flex;
      justify-content: end;
      margin: 10px 0;
    }
  }
}
</style>
<style >
.content-main {
  .el-form .el-form-item .el-form-item__content {
    width: 100% !important;
  }
}
</style>
src/views/experiment/nonConformingFeedback/index.vue
@@ -1,16 +1,207 @@
<template>
  <div>
      ä¸ç¬¦åˆå“è¯„审
  <div class="content-main">
    <div class="top-bar">
      <el-form ref="form" style="width: 1000px;" :inline="true">
        <!-- <el-input v-model="input" class="input-form" placeholder="请直接输入样式编号/样品名称/型号规格/进行搜索或下拉选择进行组合查询"
            @keyup.enter.native="getData" /> -->
        <el-form-item style="width: 800px;">
          <el-col style="display: flex; justify-content: space-around;" :span="8">
            <el-row>样式编号:</el-row>
            <el-row><el-input size="small" v-model="materialCode" placeholder="请输入样式编号"></el-input></el-row>
          </el-col>
          <el-col style="display: flex; justify-content: space-around;" :span="8">
            <el-row>样式名称:</el-row>
            <el-row><el-input size="small" v-model="materialName" placeholder="请输入样式名称"></el-input></el-row>
          </el-col>
          <el-col style="display: flex; justify-content: space-around;" :span="8">
            <el-row>申请单号:</el-row>
            <el-row><el-input size="small" v-model="inspectionCode" placeholder="请输入申请单号"></el-input></el-row>
          </el-col>
        </el-form-item>
        <el-form-item>
          <el-button type="primary" size="small" @click="getData()">查询</el-button>
          <el-button type="primary" size="small" plain @click="resetData()">重置</el-button>
          <el-dropdown style="margin-left: 7px;">
            <span class="el-dropdown-link">
              é«˜çº§æœç´¢<i class="el-icon-arrow-down el-icon--right"></i>
            </span>
            <el-dropdown-menu slot="dropdown">
              <el-dropdown-item>黄金糕</el-dropdown-item>
              <el-dropdown-item>狮子头</el-dropdown-item>
              <el-dropdown-item>螺蛳粉</el-dropdown-item>
              <el-dropdown-item disabled>双皮奶</el-dropdown-item>
              <el-dropdown-item divided>蚵仔煎</el-dropdown-item>
            </el-dropdown-menu>
          </el-dropdown>
        </el-form-item>
      </el-form>
      <el-form>
        <el-button size="40" type="primary">批量提交</el-button>
      </el-form>
    </div>
    <div class="library-table">
      <div class="table-box">
        <el-table ref="tableData" :max-height="800" :cell-style="{ textAlign: 'center' }"
          :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'center' }"
          :data="tableData" style="width: 100%">
          <el-table-column type="selection" label="" min-width="5%" />
          <el-table-column  label="样品编号" min-width="10%">
            <template slot-scope="scope">
              <a style="color: #3894d1;">{{ scope.row.materialCode }}</a>
            </template>
          </el-table-column>
          <el-table-column prop="materialName" label="样品名称" min-width="10%" />
          <el-table-column label="申请单号" min-width="10%" >
            <template slot-scope="scope">
              <a style="color: #3894d1;">{{ scope.row.inspectionCode }}</a>
            </template>
          </el-table-column>
          <el-table-column prop="createTime" label="登记日期" min-width="10%" />
          <el-table-column prop="testManager" label="检验负责人" min-width="10%" />
          <el-table-column prop="specifications" label="规格型号" min-width="10%" />
          <el-table-column prop="inspectionStatus" label="结论" min-width="10%">
            <template slot-scope="scope">
              <el-tag type="danger">不合格</el-tag>
            </template>
          </el-table-column>
          <el-table-column label="操作" min-width="8%">
            <template slot-scope="scope">
              <el-button type="text" size="small">操作</el-button>
              <el-button type="text" size="small">作废</el-button>
            </template>
          </el-table-column>
        </el-table>
        <!-- åˆ†é¡µå™¨ -->
        <div>
          <el-pagination :current-page="page" :page-sizes="[10, 20, 30, 40]" :page-size="pageSize"
            layout="total, sizes, prev, pager, next, jumper" :total="total" @size-change="handleSizeChange"
            @current-change="handleCurrentChange" />
        </div>
      </div>
    </div>
  </div>
</template>
<script>
import { get, post } from '@/api/util/requestUtil';
import urlInfo from '../../../api/urlEnum/nonConformanceReview.js'
export default {
  data() {
    return {
      input: '',
      tableData: [],
      page: 1,
      total: 0,
      pageSize: 10,
      materialCode: null,
      materialName: null,
      inspectionCode: null
    }
  },
  created() {
  },
  mounted() {
    this.getData()
  },
  methods: {
    handleCurrentChange() {
    },
    handleSizeChange() {
    },
    exportData() {
    },
    // é‡ç½®æŒ‰é’®
    resetData() {
      this.page = 1
      this.pageSize = 10
      this.materialCode=null
      this.materialName=null
      this.inspectionCode=null
      this.getData()
    },
    async getData() {
      let param = {
        "currentPage": this.page,
        'pageNum': this.pageSize,
        "inspectionCode": this.inspectionCode,
        "materialCode": this.materialCode,
        "materialName": this.materialName
      }
      let res = await get(urlInfo.url.getNonConformanceReview, param)
      this.tableData = res.data.nonConformanceReviewList
      this.total = res.data.total
    }
  }
}
</script>
<style lang="scss" scoped>
.top-bar {
  margin: -25px -15px;
  background: #fff;
  display: flex;
  justify-content: space-between;
  padding: 5px 24px 0px 24px;
  .input-form {
    width: 800px;
  }
  .el-dropdown-link {
    cursor: pointer;
    color: #409EFF !important;
  }
  .el-icon-arrow-down {
    font-size: 12px !important;
  }
}
.library-table {
  background-color: #fff;
  flex: 1;
  margin: 0px -15px;
  margin-top: 40px;
  display: flex;
  flex-direction: column;
  .table-header {
    padding: 20px;
    display: flex;
    justify-content: space-between;
    .el-form-item {
      margin-bottom: 30px !important;
    }
  }
  .table-box {
    padding: 0px 20px;
    margin-top: 20px;
    flex: 1;
    background: #fff;
    display: flex;
    flex-direction: column;
    >div:nth-child(2) {
      display: flex;
      justify-content: end;
      margin: 10px 0;
    }
  }
}
</style>
<style >
.content-main {
  .el-form .el-form-item .el-form-item__content {
    width: 100% !important;
  }
}
</style>