modified: src/App.vue modified: src/assets/api/controller.js new fil...

李林

2023-08-01 2686438ad8f3cbdb8deea79de53ffe4bb3e87fb7

	modified:   src/App.vue
	modified:   src/assets/api/controller.js
	new file:   src/components/view/raw-ins.vue
	modified:   src/components/view/standard-table/technology.vue
	modified:   src/components/view/standard.vue
	modified:   src/view/index.vue

 src/App.vue

@@ -47,11 +47,12 @@
    opacity: 1 !important;
  }

  .el-select-dropdown__item span,.el-cascader-node__label{
  .el-select-dropdown__item span,
  .el-cascader-node__label {
    font-size: 0.8rem;
  }

  .el-dialog{
  .el-dialog {
    border-radius: 6px;
    overflow: hidden;
    margin: 0 !important;
@@ -91,12 +92,12 @@
    font-size: 10px;
  }

  .el-message p{
  .el-message p {
    color: #666 !important;
    font-size: 12px;
  }

  .el-message{
  .el-message {
    background-color: #fff;
    border: 1px solid rgba(0, 0, 0, 0.1);
    padding: 6px 10px;
@@ -104,15 +105,34 @@
    border-radius: 6px;
  }

  table{
    border-collapse:collapse;
  table {
    border-collapse: collapse;
  }

  .el-popover{
  .el-popover {
    padding: 0;
  }

  .el-popper .popper__arrow{
    display: none ;
  .el-popper .popper__arrow {
    display: none;
  }
</style>

  .el-picker-panel * {
    font-size: 14px;
  }

  .el-pager .number {
    font-size: 14px;
    border: 1px solid rgba(0, 0, 0, 0.2);
    border-radius: 4px;
    margin: 0 2px;
    color: #999;
    font-weight: 500;
  }

  .el-pager .number.active {
    background-color: #004EA2;
    color: #fff;
    border: 0;
  }
</style>

 src/assets/api/controller.js

@@ -1,6 +1,7 @@
const url = {
  "enter": "user/enter", //登录
  "selectTreeByMaterial": "material/selectTreeByMaterial" //查询物料的树
  "selectTreeByMaterial": "material/selectTreeByMaterial" ,//查询物料的树
  "selectRawInspectsList": "rawInspect/selectRawInspectsList",//查询原材料检验单列表
}

export default function(Vue) {

 src/components/view/raw-ins.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,224 @@
<style scoped>
  .raw_ins {}

  .raw_ins .title .el-button {
    height: 32px;
    border: 1px solid rgba(190, 190, 190, 0.44);
    box-shadow: 0px 2px 4px rgba(220, 220, 220, 0.41);
    padding: 0 12px;
  }

  .raw_ins .title {
    margin-bottom: 10px;
    padding: 0 20px;
  }

  .choose {
    padding: 21px 24px;
    display: flex;
    align-items: center;
    background-color: #fff;
    border-bottom: 3px solid rgb(245, 247, 251);
  }

  .choose * {
    font-size: 14px;
  }

  .choose .el-button {
    height: 32px;
    border: 1px solid rgba(190, 190, 190, 0.44);
    box-shadow: 0px 2px 4px rgba(220, 220, 220, 0.41);
    padding: 0 12px;
  }

  .thing {
    width: calc(100% - 44px);
    height: calc(100% - 42px - 82px - 66px);
    background-color: #fff;
    overflow: auto;
    padding: 33px 22px;
  }

  .table_do {
    color: #004ea0;
    cursor: pointer;
  }
</style>
<style>
  .raw_ins .thing * {
    font-size: 14px;
  }

  .raw_ins .has-gutter .el-table__cell {
    background-color: #F0F1F5 !important;
    color: #333;
  }

  .raw_ins .has-gutter .el-table__cell .cell {
    font-size: 16px;
    font-weight: 500;
  }

  .raw_ins .cell {
    color: #333;
    padding-left: 17px !important;
  }

  .raw_ins .el-table__body-wrapper {
    height: 100%;
  }

  .raw_ins .el-table__body {
    height: 100%;
  }
</style>

<template>
  <div class="raw_ins">
    <div class="title">
      <el-row>
        <el-col :span="12" style="line-height: 32px;">原材料检验</el-col>
        <el-col :span="12" style="text-align: right;">
          <el-button type="primary" icon="el-icon-plus" style="background: #004EA2;">新增</el-button>
          <el-button icon="el-icon-download">删除</el-button>
        </el-col>
      </el-row>
    </div>
    <div class="choose">
      <span>来料日期：</span>
      <el-date-picker v-model="search.formTime" size="small" placeholder="请输入" style="width: 224px;margin-right: 30px;"
        clearable value-format="yyyy-MM-dd"></el-date-picker>
      <span>报检日期：</span>
      <el-date-picker v-model="search.createTime" size="small" placeholder="请输入"
        style="width: 224px;margin-right: 30px;" clearable value-format="yyyy-MM-dd"></el-date-picker>
      <span>检测状态：</span>
      <el-select v-model="search.insState" size="small" placeholder="请选择" style="width: 224px;margin-right: 30px;">
        <el-option label="全部" :value="2"></el-option>
        <el-option label="未检测" :value="0"></el-option>
        <el-option label="已检测" :value="1"></el-option>
      </el-select>
      <span>合格状态：</span>
      <el-select v-model="search.judgeState" size="small" placeholder="请选择" style="width: 224px;margin-right: 30px;">
        <el-option label="全部" :value="2"></el-option>
        <el-option label="不合格" :value="0"></el-option>
        <el-option label="合格" :value="1"></el-option>
      </el-select>
      <el-button size="mini" @click="clean()"><span>重 ç½®</span></el-button>
      <el-button size="mini" type="primary" style="background: #004EA2;" @click="selectRawInspectsList()"><span>查
          è¯¢</span></el-button>
    </div>
    <div class="thing">
      <el-table :data="tableData" border style="width: 100%;overflow-y: auto;min-height: calc(100% - 50px)"
        max-height="calc(100% - 50px)" @selection-change="handleSelectionChange" border default-expand-all
        :tree-props="{children: 'children', hasChildren: 'hasChildren'}" row-key="id">
        <el-table-column type="selection" width="50">
        </el-table-column>
        <el-table-column type="index" label="序号" width="70">
        </el-table-column>
        <el-table-column prop="formTime" label="来料日期">
        </el-table-column>
        <el-table-column prop="code" label="原材料编码">
        </el-table-column>
        <el-table-column prop="name" label="原材料名称">
        </el-table-column>
        <el-table-column prop="specifications" label="规格型号">
        </el-table-column>
        <el-table-column prop="unit" label="单位">
        </el-table-column>
        <el-table-column prop="number" label="数量">
        </el-table-column>
        <el-table-column prop="createTime" label="报检日期">
        </el-table-column>
        <el-table-column prop="userName" label="报检人">
        </el-table-column>
        <el-table-column prop="judgeState" label="合格状态" width="100">
          <template slot-scope="scope">
            <span style="color: #34BD66;" v-if="scope.row.judgeState==1">合格</span>
            <span style="color: #E84738;" v-else-if="scope.row.judgeState==0">不合格</span>
          </template>
        </el-table-column>
        <el-table-column prop="insState" label="检测状态" width="100">
          <template slot-scope="scope">
            <span style="color: #34BD66;" v-if="scope.row.insState==1">已检测</span>
            <span style="color: #E84738;" v-else-if="scope.row.insState==0">未检测</span>
          </template>
        </el-table-column>
        <el-table-column label="操作" width="100">
          <template slot-scope="scope">
            <span class="table_do">查看</span>
            <span class="table_do">打印</span>
          </template>
        </el-table-column>
      </el-table>
      <el-col style="height: 50px;display: flex;align-items: center;justify-content: right;">
        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
          :page-sizes="[1,10, 20, 30, 50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper"
          :total="countSize">
        </el-pagination>
      </el-col>
    </div>
  </div>
</template>

<script>
  export default {
    data() {
      return {
        search: {
          formTime: null,
          createTime: null,
          insState: 2,
          judgeState: 2
        },
        tableData: [],
        selects: [],
        currentPage: 1,
        countSize: 0,
        pageSize: 10
      }
    },
    mounted() {
      this.selectRawInspectsList()
    },
    methods: {
      handleSelectionChange(val) {
        this.selects = val;
      },
      handleSizeChange(val) {
        this.pageSize = val
        this.selectRawInspectsList()
      },
      handleCurrentChange(val) {
        this.currentPage = val
        this.selectRawInspectsList()
      },
      selectRawInspectsList() {
        this.axios.post(this.$api.url.selectRawInspectsList, {
          pageSize: this.currentPage,
          countSize: this.pageSize,
          formTime: this.search.formTime,
          createTime: this.search.createTime,
          insState: this.search.insState,
          judgeState: this.search.judgeState
        }).then(res => {
          this.tableData = res.data.data
          this.countSize = res.data.count
        })
      },
      clean() {
        this.selects = []
        this.currentPage = 1
        this.countSize = 0
        this.pageSize = 10
        this.search = {
            formTime: null,
            createTime: null,
            insState: 2,
            judgeState: 2
          },
          this.selectRawInspectsList()
      }
    }
  }
</script>

 src/components/view/standard-table/technology.vue

@@ -41,15 +41,15 @@

<template>
  <div class="standard">
    <el-table :data="tableData" border style="width: 100%" @selection-change="handleSelectionChange" row-key="id" border
    <el-table :data="tableData" border style="width: 100%" @selection-change="handleSelectionChange" border
      default-expand-all :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
      <el-table-column type="selection" width="50">
      </el-table-column>
      <el-table-column type="index" label="序号" width="75">
      <el-table-column type="index" label="序号" width="70">
      </el-table-column>
      <el-table-column prop="date" label="项目" width="350">
      <el-table-column prop="date" label="项目">
      </el-table-column>
      <el-table-column prop="name" label="单位" width="180">
      <el-table-column prop="name" label="单位">
      </el-table-column>
      <el-table-column prop="address" label="标准值">
      </el-table-column>
@@ -95,28 +95,6 @@
          name: '王小虎',
          address: '上海市普陀区金沙江路 1516 å¼„'
        }],
        tableData1: [{
          id: 1,
          date: '2016-05-02',
          name: '王小虎',
          address: '上海市普陀区金沙江路 1518 å¼„'
        }, {
          id: 2,
          date: '2016-05-04',
          name: '王小虎',
          address: '上海市普陀区金沙江路 1517 å¼„'
        }, {
          id: 3,
          date: '2016-05-01',
          name: '王小虎',
          address: '上海市普陀区金沙江路 1519 å¼„',
          hasChildren: true
        }, {
          id: 4,
          date: '2016-05-03',
          name: '王小虎',
          address: '上海市普陀区金沙江路 1516 å¼„'
        }],
        selects: []
      }
    },
@@ -127,4 +105,4 @@
      }
    }
  }
</script>
</script>

 src/components/view/standard.vue

@@ -12,6 +12,10 @@
    margin-bottom: 10px;
    padding: 0 20px;
  }
  
  .standard .title *{
    font-size: 16px;
  }

  .thing {
    width: 100%;
@@ -85,6 +89,10 @@
  .standard .title .el-button * {
    font-size: 14px;
  }
  
  .standard .title .el-button--default{
    color: #004EA2;
  }

  .standard .thing .left .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
    background: rgba(58, 124, 253, 0.3);
@@ -101,7 +109,7 @@
  <div class="standard">
    <div class="title">
      <el-row>
        <el-col :span="12">标准BOM</el-col>
        <el-col :span="12" style="line-height: 32px;">标准BOM</el-col>
        <el-col :span="12" style="text-align: right;">
          <el-button type="primary" icon="el-icon-plus" style="background: #004EA2;">新增</el-button>
          <el-button icon="el-icon-edit-outline">修改</el-button>

 src/view/index.vue

@@ -292,7 +292,7 @@
            k: 3,
            v: "原材料检验",
            i: "font icon-shouye",
            u: ""
            u: "raw-ins"
          }, {
            k: 4,
            v: "原材料不合格品",
@@ -330,14 +330,14 @@
            u: ""
          }]
        }],
        activeBox: 1,
        activeP: 1,
        tabActive: 1,
        activeBox: 0,
        activeP: 0,
        tabActive: 0,
        tabs: [{
          k: 1,
          v: "标准BOM",
          k: 0,
          v: "首页",
          i: "font icon-shouye",
          u: "standard"
          u: "index-index"
        }],
        upIndex: 0
      };