8.18

王震

2023-08-18 5cafe90e9e91127889a948ecb44dec61d6185bd4

8.18

 src/assets/api/controller.js

@@ -18,6 +18,10 @@
    selectSpBySt: "/rawInspect/selectSpBySt", //根据材料id查询所有型号,
    addRawInspects: "/rawInspect/addRawInspects"
}
//不合格原材料
const unqualifiedaa ={
    selectUnRawInspectsList: "/inspectUnaccepted/selectUnRawInspectsList"
}

// æˆå“æ£€éªŒ
const finishedIns = {
@@ -25,6 +29,7 @@
    // listMaterial:"/finished-inspect/list_material",//添加检验单时的项目列表
    finishedInspectUser: "/finished-inspect/page_user", //获取所有主机工
    projectListByfinishId: "/inspection-item/list_user", //根据id查询所有项目

}

// QMS实验室管理
@@ -39,6 +44,10 @@
  deleteDevice: "/device/delete", // åˆ é™¤å®žéªŒå®¤è®¾å¤‡
  deleteIdorFather: "/device/deleteIdorFather" // åˆ é™¤æ ‘模块数据
}
//不合格品处置
const dispose = {
    gettable:"/opinion/list_page"
}

const url = {
    enter: "user/enter", //登录
@@ -46,8 +55,11 @@
    ...raw,
  ...laboratory,
    ...finishedIns,
    ...unqualifiedaa,
    ...dispose,
    // ...gettable,
    selectSaleList: "sale/selectSaleList", //查询销售单列表
    selectSaleDatilById: "sale/selectSaleDatilById", //根据销售单id查看详情,
    selectSaleDatilById: "sale/selectSaleDatilById", //根据销售单id
    addSale: "sale/addSale", //新增销售单,
    seleRepe: "sale/seleRepe", //查询成品库存
}

 src/components/tool/icon.vue

@@ -1,3 +1,6 @@



<style scoped>
  ::-webkit-scrollbar {
    width: 8px;

 src/components/view/Processingproducts.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,192 @@
<template>
    <div>
        <div class="article-main" style="overflow: hidden;">
            <el-row>
            <el-col :span="12" style="line-height: 32px;">不合格品处置</el-col>
            <el-col :span="12" style="text-align: right;">
                <el-button icon="el-icon-download" size="mini" @click="()=>{}">导出</el-button>
            </el-col>
            </el-row>
            <div>
                
                <div style="margin-top: 10px;">
                    <el-card shadow="hover" class="margin-30"> 
                            <el-form ref="form" :model="searchform" label-width="80px">
                            <el-row :gutter="25">
                                <el-col :span="7" >
                                    <el-form-item label="产品名称:">
                                        <el-input v-model="searchform.name" placeholder="请输入"></el-input>
                                    </el-form-item>
                                </el-col>
                                <el-col :span="7" >
                                    <el-form-item label="规格型号:">
                                        <el-input v-model="searchform.stude" placeholder="请输入"></el-input>                      
                                    </el-form-item> 
                                </el-col> 
                                <el-col :span="5">
                                    <el-button size="default"  @click="">重置</el-button>
                                    <el-button type="primary" size="default" style="background:0, 78, 162 ;" @click="getDetailInfo">查询</el-button>

                                </el-col>        
                            </el-row>                                                 
                            </el-form>
                    </el-card> 
                </div>
                
                <div style="margin-top: 30px;">
                    <el-card shadow="hover" class="margin-30"> 
                        <el-table
                            ref="multipleTable"
                            :data="tableData"
                            tooltip-effect="dark"
                            style="width: 100%"
                            @selection-change="handleSelectionChange">
                            <el-table-column
                            type="selection"
                            width="55">
                            </el-table-column>
                            <el-table-column
                            label="日期"
                            width="120">
                            <template slot-scope="scope">{{ scope.row.date }}</template>
                            </el-table-column>
                            <el-table-column
                            prop="name"
                            label="姓名"
                            width="120">
                            </el-table-column>
                            <el-table-column
                            prop="address"
                            label="地址"
                            show-overflow-tooltip>
                            </el-table-column>
                        </el-table>
                    </el-card>
                    <el-col style="height: 50px;display: flex;align-items: center;justify-content: right;">
                        <el-pagination
                        @size-change="handleSizeChange" 
                        @current-change="handleCurrentChange"
                        :current-page="4"
                        :page-sizes="[1,10, 20, 30, 50]" 
                        :page-size="4" 
                        layout="total, sizes, prev, pager, next, jumper"
                        :total="countSize">
                        </el-pagination>
                    </el-col>
                </div>           
            </div>       
        </div>
    </div>  
</template>



<script>
export default {
    data() {
      return {       
        searchform:{ 
            name:'',
            stude:''
        },
        tableData: [
            {
          date: '2016-05-03',
          name: '王小虎',
          address: '上海市普陀区金沙江路 1518 å¼„'
        }, {
          date: '2016-05-02',
          name: '王小虎',
          address: '上海市普陀区金沙江路 1518 å¼„'
        }, {
          date: '2016-05-04',
          name: '王小虎',
          address: '上海市普陀区金沙江路 1518 å¼„'
        }, {
          date: '2016-05-01',
          name: '王小虎',
          address: '上海市普陀区金沙江路 1518 å¼„'
        }, {
          date: '2016-05-08',
          name: '王小虎',
          address: '上海市普陀区金沙江路 1518 å¼„'
        }, {
          date: '2016-05-06',
          name: '王小虎',
          address: '上海市普陀区金沙江路 1518 å¼„'
        }, {
          date: '2016-05-07',
          name: '王小虎',
          address: '上海市普陀区金沙江路 1518 å¼„'
        }
    ],
        pageSize:3,
        countSize:1,
        currentPage:2,
        multipleSelection:''
      }
    },
    created(){
        // this.getDetailInfo()
    },
    methods:{
        handleSelectionChange(val) {
            // console.log(val);
        // this.multipleSelection = val;
      },
        handleSizeChange(val) {
            console.log(val);
        // this.pageSize = 1
        // this.countSize= val
        // this.getDetailInfo()
        },
        handleCurrentChange(val) {
        // this.pageSize = val
        // this.getDetailInfo()
        },
        getDetailInfo() {
            let aa = [0,5]
            aa.map(el =>{
                console.log(el);
            })            
            console.log(this.searchform.name);
            console.log(this.searchform.stude);
            // this.tableData
            // this.axios.get(this.$api.url.gettable,{
            //     params:{pageNo:10,
            //         pageSize:1,
            //         productName:this.searchform.name,
            //         specificationsModels:this.searchform.stude
            //     },
            // }).then(res=>{
            //     console.log(res);
            //     this.tableData = res.data.row
            // })
        }
}}
    //   methods:{
    //     toggleSelection(rows) {
    //     if (rows) {
    //       rows.forEach(row => {
    //         this.$refs.multipleTable.toggleRowSelection(row);
    //       });
    //     } else {
    //       this.$refs.multipleTable.clearSelection();
    //     }
    //   },
    
    //  }
    // }
  

</script>
<style scoped>
.card-2{
    display: flex;
    margin-top: 30px;
}

.ssss{
    background-color: #fff;
}
</style>

 src/components/view/processInspection.vue

@@ -123,7 +123,7 @@
                  >
                      <template slot-scope="scope">
                      <el-button type="text" size="small" @click="handleClick(scope.row)">查看</el-button>
                      <el-button type="text" size="small">打印</el-button>
                      <el-button type="text" size="small" style="margin-left: 0;">打印</el-button>
                      </template>
                  </el-table-column>
              </el-table>
@@ -157,7 +157,7 @@
                          <el-row :gutter="450">
                          <el-col :span="5">
                          <el-form-item label="订单号：">
                              <el-input style="width: 180px;" v-model="addInspectionform.number" placeholder="请输入订单号" autocomplete="off" />  
                              <el-input style="width: 180px;" v-model="addInspectionform.number" placeholder="请输入订单号" autocomplete="off" />
                          </el-form-item>
                          </el-col>
                          <el-col :span="5">
@@ -278,11 +278,11 @@
                  </el-table>
              </div>
          </div>
  

    </div>
  </template>
  
  


  <script>
  export default {
      data(){
@@ -324,7 +324,7 @@
                  operation: ''
              }],
              currentPage: 1, // å½“前页码
              pageSize: 100, 
              pageSize: 100,
              showAddPage: false,
              addInspectionform: [{
                  number: '',
@@ -374,14 +374,14 @@
              this.showAddPage=true
          }
      }
  

  }
  </script>
  

  <style>
  .title{
      padding: 12px;
  

  }
  .nav{
      display: flex;
@@ -432,4 +432,4 @@
      background-color: #fff;
      padding: 10px 12px;
  }
  </style>
  </style>

 src/components/view/raw-ins.vue

@@ -171,13 +171,13 @@
          formTime: null,
          createTime: null,
          insState: 2,
          judgeState: 2
          judgeState: 10
        },
        tableData: [],
        selects: [],
        currentPage: 1,
        countSize: 0,
        pageSize: 10
        pageSize: 2
      }
    },
    props:['goDetail'],

 src/components/view/rawInsDetail.vue

@@ -89,7 +89,7 @@
                          <el-option v-for="item in materialOptions" :key="item.id" :label="item.name" :value="item.name"></el-option>
                        </el-select>
                    </el-form-item>
                    

                </el-col>
                <el-col :span="7">
                    <el-form-item label="规格型号:">
@@ -134,13 +134,13 @@
                    </el-form-item>
                </el-col>
                <el-col  :span="3">
                    <el-form-item v-show="detailId===null" label="" label-width="100px">
                    <el-form-item v-show="detailId===null" label="" label-width="50px">
                        <el-button  @click="addNewRawInspect">保存提交</el-button>
                    </el-form-item>
                </el-col>
            </el-row>
             <el-row>
                

                <el-col :span="7">
                    <el-form-item v-show="detailId!==null" label="报检日期:">
                        <el-input :disabled="detailId!==null" v-model="detailInfo.createTime"></el-input>
@@ -151,7 +151,7 @@
                        <el-input :disabled="detailId!==null" v-model="detailInfo.userName"></el-input>
                    </el-form-item>
                </el-col>
                

            </el-row>
        </el-form>
        <!-- <el-form v-show="detailId ===null" v-model="rawInsParams" label-position="right" label-width="120px" >
@@ -190,7 +190,7 @@
                        <el-input placeholder="产品编码" disabled  v-model="code"></el-input>
                    </el-form-item>
                </el-col>
                

            </el-row>
             <el-row>
                <el-col :span="7">
@@ -345,7 +345,7 @@
        this.getDetailInfo()
      }else{
        this.getOptions()
      }  
      }
    },
    mounted(){
    },
@@ -422,9 +422,9 @@
        this.getDetailInfo()
      },
      async getOptions() {
        // const {data} = await this.$axios.get(this.$api.url.listMaterial) 
        // const {data} = await this.$axios.get(this.$api.url.listMaterial)
        // this.materialOptions = data
        const {data} = await this.$axios.get(this.$api.url.selectRawMaterial) 
        const {data} = await this.$axios.get(this.$api.url.selectRawMaterial)
        this.materialOptions = data
        console.log(this.materialOptions)
      },
@@ -436,7 +436,7 @@
            this.detailInfo.code = item.code
            this.$axios.get(this.$api.url.selectSpBySt,{params:{id:item.id}}).then(res=>{
              this.specificationOptions= res.data
            }) 
            })
          }
        })
      }

 src/components/view/rawUnqualified/raw.vue

@@ -4,7 +4,7 @@
    max-height: 100%;
    display: flex;
    flex-direction: column;
    overflow-y: scroll;
   /* overflow-y: scroll; */
}
  .unqualifiedBox .title .el-button {
    height: 32px;
@@ -16,7 +16,7 @@
    margin-bottom: 10px;
    padding: 0 20px;
  }
/* æ¡ä»¶æŸ¥è¯¢å¤´éƒ¨æ ·å¼ */
<!-- /* æ¡ä»¶æŸ¥è¯¢å¤´éƒ¨æ ·å¼ */ -->
  .choose {
    padding: 21px 24px;
    display: flex;
@@ -25,7 +25,7 @@
    border-bottom: 3px solid rgb(245, 247, 251);
  }

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

@@ -35,193 +35,237 @@
    box-shadow: 0px 2px 4px rgba(220, 220, 220, 0.41);
    padding: 0 12px;
  }
  /* ä¸åˆæ ¼è¡¨æ ¼æ ·å¼ */
  <!-- /* ä¸åˆæ ¼è¡¨æ ¼æ ·å¼ */
  .unqualifiedTable{
    flex: 1;
    background: #fff;
    margin-top: 11px;
    padding: 23px 21px;
  }
  .tableno{
    margin-top: 30px;
  }
</style>

<template>
<div class="unqualifiedBox">
    <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 icon="el-icon-download" @click="()=>{}">导出</el-button>
        </el-col>
      </el-row>

  <div class="unqualifiedBox">
    <el-row>
          <el-col :span="12" style="line-height: 32px;">原材料不合格</el-col>
          <el-col :span="12" style="text-align: right;">
            <el-button icon="el-icon-download" size="mini" @click="()=>{}">导出</el-button>
          </el-col>
        </el-row>
    <div style="margin-top: 10px;">
    <el-card shadow="hover" class="margin-30" style="height: 80px;">

      <div class="choose" >
        <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-select>
        <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>
        <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>
    </el-card>
    </div>
    <div class="choose">
      <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-select>
      <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>
      <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 class="tableno" style="height:300px">
        <!-- <el-table :data=" unqualifiedTable"  border style ="width: 100%;overflow-y: auto;min-height: calc(100% - 50px)"
              max-height="calc(100% - 50px)"  row-key="id"
              :tree-props="{children: 'children', hasChildren: 'hasChildren'}"> -->
              <el-card shadow="hover" class="margin-30">

              <el-table :data=" unqualifiedTable" border ref="multipleTable" tooltip-effect="dark"
              style="width: 100%"  @selection-change="handleSelectionChange">

              <el-table-column
                  type="selection"
                  width="50">
              </el-table-column>
              <el-table-column
                  type="index"
                  label="序号"
                  >
              </el-table-column>
              <el-table-column
                  prop="来料日期"
                  label="来料日期"
                  >
              </el-table-column>
              <el-table-column
                  prop="reason"
                  label="缺陷名称"
                  >
              </el-table-column>
              <el-table-column
                  prop="material_code"
                  label="材料编码"
                  >
              </el-table-column>
              <el-table-column
                  prop="id"
                  label="材料名称">
              </el-table-column>
              <el-table-column
                  prop="specifications_model"
                  label="规格型号"
                  >
              </el-table-column>
              <el-table-column
                  prop="unit"
                  label="单位"
                  >
              </el-table-column>
              <el-table-column
                  prop="quantity"
                  label="数量"
                  >
              </el-table-column>
              <el-table-column
                  prop="报检日期"
                  label="报检日期"
                  >
              </el-table-column>
              <el-table-column
                  prop="name"
                  label="报检人"
                  >
              </el-table-column>
              <el-table-column
                  prop="报检日期"
                  label="报检日期"
                  >
              </el-table-column>
              <el-table-column
                  prop="deal_state"
                  label="处理状态"
                  width="100">
                  <template slot-scope="scope">
                    <span style="color:#34BD66;" v-if="scope.row.deal_state==1">已处理</span>
                    <span style="color:#E84738;" v-else-if="scope.row.deal_state==0">待处理</span>
                  </template>
              </el-table-column>
              <el-table-column
                  prop="deal_reasult"
                  label="处理结果"
                  width="100">

                  <template slot-scope="scope">
                    <span style="color:#34BD66;" v-if="scope.row.deal_reasult==1">不通过</span>
                    <span style="color:#E84738;" v-else-if="scope.row.deal_reasult==0">通过</span>
                  </template>
              </el-table-column>
              <el-table-column
                  label="操作"
                  width="100"
                  >
                  <template slot-scope="scope">
                  <div style="display: flex;">
                    <el-button type="text" siae="small"  size="mini">评审</el-button>
                    <el-button type="text" siae="small"  size="mini" style=" color:87, 138, 193 ;" @click="">查看</el-button>
                  </div>
                  </template>
              </el-table-column>


            </el-table>
          </el-card>
          <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 class="unqualifiedTable">
        <el-table :data="unqualifiedData" height="620">
            <el-table-column
                type="selection"
                width="55">
            </el-table-column>
            <el-table-column
                type="index"
                label="序号"
                width="60">
            </el-table-column>
            <el-table-column
                prop="name"
                label="缺陷名称"
                width="97">
            </el-table-column>
            <el-table-column
                prop="address"
                label="材料编码"
                width="141">
            </el-table-column>
            <el-table-column
                prop="name"
                label="材料名称"
                width="214">
            </el-table-column>
            <el-table-column
                prop="address"
                label="规格型号">
            </el-table-column>
            <el-table-column
                prop="address"
                label="单位"
                width="250">
            </el-table-column>
            <el-table-column
                prop="address"
                label="数量"
                width="75">
            </el-table-column>
            <el-table-column
                prop="address"
                label="报检日期"
                width="128">
            </el-table-column>
            <el-table-column
                prop="address"
                label="报检人"
                width="78">
            </el-table-column>
            <el-table-column
                prop="address"
                label="处理日期"
                width="120">
            </el-table-column>
            <el-table-column
                prop="address"
                label="处理状态"
                width="100">
            </el-table-column>
            <el-table-column
                prop="address"
                label="处理结果"
                width="100">
            </el-table-column>
            <el-table-column
                prop="address"
                label="操作"
                width="118">
            </el-table-column>
        </el-table>
        <el-col style="height: 50px;display: flex;align-items: center;justify-content: right;">
        <el-pagination
          :current-page="currentPage"
          :page-sizes="[10, 20, 30, 50]" 
          :page-size="pageSize" 
          layout="total, sizes, prev, pager, next, jumper"
          :total="countSize">
        </el-pagination>
      </el-col>
    </div>
</div>
  </div>

</template>

<script>

export default {
    data() {

        return {
            // æœç´¢æ¡ä»¶
            search:{},
            unqualifiedData:[
                {
                    date: '2016-05-02',
                    name: '王小虎',
                    address: '上海市'
                }, {
                    date: '2016-05-04',
                    name: '王小虎',
                    address: '上海市'
                }, {
                    date: '2016-05-01',
                    name: '王小虎',
                    address: '上海市'
                }, {
                    date: '2016-05-03',
                    name: '王小虎',
                    address: '上海市'
                }, {
                    date: '2016-05-04',
                    name: '王小虎',
                    address: '上海市'
                }, {
                    date: '2016-05-01',
                    name: '王小虎',
                    address: '上海市'
                }, {
                    date: '2016-05-03',
                    name: '王小虎',
                    address: '上海市'
                }, {
                    date: '2016-05-04',
                    name: '王小虎',
                    address: '上海市'
                }, {
                    date: '2016-05-01',
                    name: '王小虎',
                    address: '上海市'
                }, {
                    date: '2016-05-03',
                    name: '王小虎',
                    address: '上海市'
                }, {
                    date: '2016-05-04',
                    name: '王小虎',
                    address: '上海市'
                }, {
                    date: '2016-05-01',
                    name: '王小虎',
                    address: '上海市'
                }, {
                    date: '2016-05-03',
                    name: '王小虎',
                    address: '上海市'
                }
            ],
            countSize:1,
            pageSize:10,
            currentPage:1
            search:{
              formTime: "null",
              deal_state:2,
              deal_reasult:2,
            },
            unqualifiedTable:[],
            // articlelist:[] ,
            selects:[],
            countSize: 0,
            pageSize: 2,
            currentPage: 10


        }
    },
    props:['godata'],
    created(){
        this.getDetailInfo()
    },
   mounted() {
      this.getDetailInfo()
    },
    methods:{

      handleSizeChange(val) {
        this.pageSize = 1
        this.countSize= val
        this.getDetailInfo()
      },
      handleCurrentChange(val) {
        this.pageSize = val
        this.getDetailInfo()
      },

      getDetailInfo() {
        // console.log(this.$api.url.selectUnRawInspectsList);

          this.axios.get(this.$api.url.selectUnRawInspectsList, {
            params:{countSize:this.currentPage, pageSize:this.pageSize},
              // pageSize: this.currentPage,
              // countSize: this.pageSize,
              // formTime: this.search.formTime,
              // deal_state: this.search. deal_state,
              // deal_reasult: this.search.deal_reasult,
          }).then(res=>{
            // console.log(res);
            this.unqualifiedTable = res.data.row
            // console.log(this.unqualifiedTable);
            // this.countSize = res.data.count
            // console.log(111);

          })
      },
      changeShowDetail({id}){
        this.godata()

      }
  }
}
</script>

</script>





 src/components/view/unqualifiedManagement.vue

@@ -11,7 +11,9 @@

<script>
import Unqualified from './rawUnqualified/raw.vue'
// import Unqualified from './rawUnqualified/Subqualified.vue'

export default {
  components:{Unqualified}
}
</script>
</script>

 src/main.js

@@ -23,7 +23,7 @@
Vue.use(qs);
Vue.use(api);

const javaApi = 'http://localhost:8001/'
const javaApi = 'http://192.168.110.167:8001/'

axios.defaults.baseURL = javaApi
axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'
@@ -117,4 +117,4 @@
    el: '#app',
    router,
    render: h => h(App)
});
});

 src/view/index.vue

@@ -469,7 +469,7 @@
              k: 10.2,
              v: "不合格品处置",
              i: "font icon-shouye",
              u: ""
              u: "Processingproducts"
            }
          ]
        },