Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-08-18 d245609c9e928670961ae011dd934c0f34cbbfd9

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/router/index.js

 src/App.vue

@@ -164,7 +164,7 @@
  border: 0;
}
/* å…¨å±€æ¨¡æ€æ¡†æ ·å¼ */
.el-dialog__header {
.el-dialog__header,.el-message-box__header {
  box-sizing: border-box;
  height: 56px;
  border-bottom: 1px solid rgb(238, 238, 238);
@@ -182,8 +182,24 @@
  margin-left: 32px;
  margin-right: 8.5px;
}

.el-message-box__header::before {
  content: "";
  display: inline-block;
  width: 4px;
  height: 30.24px;
  background: rgb(0, 95, 201);
  border-radius: 10px;
  margin-left: 20px;
  margin-right: 8.5px;
}

.el-dialog__header .el-dialog__title {
  font-size: 16px !important;
}

.el-dialog__footer{
    padding-right: 40px;
}

.el-dialog__footer .el-button * {
@@ -197,6 +213,17 @@
  padding: 0 14px;
}

.el-message-box__btns .el-button * {
  font-size: 14px !important;
}

.el-message-box__btns .el-button{
    height: 36px;
    border: 1px solid rgba(190, 190, 190, 0.44);
    box-shadow: 0px 2px 4px rgba(220, 220, 220, 0.41);
    padding: 0 14px;
}

.el-button--primary {
  background: #004ea2;
}

 src/assets/api/controller.js

@@ -8,6 +8,11 @@
    selectAllOrder: "/orders/selectAllOrder", //查询所有订单列表
    selectOrderById: "/orders/selectOrderById", //根据订单id查询订单详情
}
//技术管理-订单Bom
const purchaseorder= {
    selectAllOrder:"/orders/selectAllOrder",
    compile:"/orders/compile"    //编制			
}
// åŽŸææ–™æ£€éªŒ
const raw = {
    selectRawInspectsList: "rawInspect/selectRawInspectsList", //查询原材料检验单列表
@@ -18,6 +23,10 @@
    selectSpBySt: "/rawInspect/selectSpBySt", //根据材料id查询所有型号,
    addRawInspects: "/rawInspect/addRawInspects"
}
//不合格原材料
const unqualifiedaa ={
    selectUnRawInspectsList: "/inspectUnaccepted/selectUnRawInspectsList"
}

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

}

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

// QMS计量管理
@@ -56,9 +70,16 @@
      ...laboratory,
    ...measure,
    ...finishedIns,
    ...unqualifiedaa,
    ...dispose,
    ...purchaseorder,
    selectSaleList: "sale/selectSaleList", //查询销售单列表
    selectSaleDatilById: "sale/selectSaleDatilById", //根据销售单id查看详情,
    addSale: "sale/addSale", //新增销售单
    saleCheck: "sale/check", //审核销售单
    updateSaleById: "sale/updateSaleById", //根据销售单id修改详情信息
    delSale: "sale/delSale", //根据销售单id删除
    delAllSale: "sale/delAllSale", //批量删除销售单
}



 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/record-content.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,236 @@
<style scoped>
    .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;
    }

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

    .title * {
        font-size: 16px;
    }

    .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>
    .record_content .title .el-button * {
        font-size: 14px;
    }

    .record_content .title .el-button--default {
        color: #004EA2;
    }

    .record_content .thing * {
        font-size: 14px;
    }

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

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

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

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

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

<template>
    <div class="record_content">
        <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-edit-outline">修改</el-button>
                    <el-button icon="el-icon-delete">删除</el-button>
                </el-col>
            </el-row>
        </div>
        <div class="choose">
            <span>类型：</span>
            <el-select v-model="search.type" size="small" placeholder="请选择" style="width: 224px;margin-right: 30px;">
                <el-option label="橡胶连接器" :value="0"></el-option>
                <el-option label="金属连接器" :value="1"></el-option>
                <el-option label="湿插拔电连接器" :value="2"></el-option>
                <el-option label="分支组件" :value="3"></el-option>
            </el-select>
            <span>工序：</span>
            <el-select v-model="search.name" size="small" placeholder="请选择" style="width: 224px;margin-right: 30px;">
                <el-option v-for="(a, ai) in process" key="ai" :label="a.name" :value="a.id"></el-option>
            </el-select>
            <el-button size="mini" @click="clean()"><span>重 ç½®</span></el-button>
            <el-button size="mini" type="primary" style="background: #004EA2;"><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" 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="name" label="工序">
                    <template slot-scope="scope">
                        <span>
                            <font>{{scope.row.ids}}</font>{{scope.row.name}}
                        </span>
                    </template>
                </el-table-column>
                <el-table-column prop="address" label="备注">
                </el-table-column>
                <el-table-column label="操作" width="130">
                    <template slot-scope="scope">
                        <span class="table_do">编辑&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
                        <span class="table_do" @click="deleteRow(scope.$index, tableData)">删除</span>
                    </template>
                </el-table-column>
            </el-table>
        </div>
    </div>
</template>

<script>
    export default {
        data() {
            return {
                search: {
                    type: 0,
                    name: null
                },
                process: [],
                tableData: [{
                    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 å¼„',
                    children: [{
                        id: 31,
                        date: '2016-05-01',
                        name: '王小虎',
                        address: '上海市普陀区金沙江路 1519 å¼„',
                        children: [{
                            id: 33,
                            date: '2016-05-01',
                            name: '王小虎',
                            address: '上海市普陀区金沙江路 1519 å¼„'
                        }, {
                            id: 34,
                            date: '2016-05-01',
                            name: '王小虎',
                            address: '上海市普陀区金沙江路 1519 å¼„'
                        }]
                    }, {
                        id: 32,
                        date: '2016-05-01',
                        name: '王小虎',
                        address: '上海市普陀区金沙江路 1519 å¼„'
                    }]
                }, {
                    id: 4,
                    date: '2016-05-03',
                    name: '王小虎',
                    address: '上海市普陀区金沙江路 1516 å¼„'
                }],
                selects: []
            }
        },
        mounted() {
            this.selectDataList()
        },
        methods: {
            clean() {
                this.search = {
                    type: null,
                    name: null
                }
            },
            selectDataList(){
                this.tableData.forEach(a=>{
                    a.ids = '01'
                    if(a.children!=undefined){
                        a.children.forEach(b=>{
                            b.ids = '02'
                            if(b.children!=undefined){
                                b.children.forEach(c=>{
                                    c.ids = '03'
                                })
                            }
                        })
                    }
                })
            },
            handleSelectionChange(val) {
                this.selects = val;
            },
            del(ob) {
                console.log(ob)
            },
            deleteRow(index, rows) {
                console.log(index);
                console.log(rows);
                rows.splice(index, 1);
            }
        }
    }
</script>

 src/components/view/sale.vue

@@ -115,9 +115,9 @@
            <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" @click="addDia= true">新增</el-button>
                    <el-button icon="el-icon-edit-outline">修改</el-button>
                    <el-button icon="el-icon-delete">删除</el-button>
                    <el-button type="primary" icon="el-icon-plus" @click="openAddDia">新增</el-button>
                    <!-- <el-button icon="el-icon-edit-outline">修改</el-button> -->
                    <el-button icon="el-icon-delete" @click="delSales">删除</el-button>
                    <el-button icon="el-icon-download">导出</el-button>
                </el-col>
            </el-row>
@@ -145,8 +145,9 @@
            </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" default-expand-all row-key="id">
            <el-table ref="tableData" :data="tableData" border
                style="width: 100%;overflow-y: auto;min-height: calc(100% - 50px)" max-height="calc(100% - 50px)"
                @selection-change="handleSelectionChange" default-expand-all row-key="id">
                <el-table-column type="selection" width="50">
                </el-table-column>
                <el-table-column type="index" label="序号" width="65">
@@ -171,16 +172,16 @@
                <el-table-column label="操作" width="220">
                    <template slot-scope="scope">
                        <span class="table_do" @click="changeShowDetail(scope.row)">&nbsp;查看详情&nbsp;</span>
                        <span class="table_do" v-if="scope.row.type==null">&nbsp;审核&nbsp;</span>
                        <span class="table_do" v-if="scope.row.type==null" @click="saleCheck(scope)">&nbsp;审核&nbsp;</span>
                        <span class="table_do" v-else>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
                        <span class="table_do">&nbsp;编辑&nbsp;</span>
                        <span class="table_do">&nbsp;删除&nbsp;</span>
                        <span class="table_do" @click="openUpDia(scope.row.id)">&nbsp;编辑&nbsp;</span>
                        <span class="table_do" @click="delSale(scope.$index)">&nbsp;删除&nbsp;</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"
                    :page-sizes="[10, 20, 30, 50]" :page-size="pageSize" layout="total, sizes, prev, pager, next, jumper"
                    :total="countSize">
                </el-pagination>
            </el-col>
@@ -208,7 +209,7 @@
                            <el-col :span="3" :offset="2">状态</el-col>
                            <el-col :span="8">
                                <div class="value" v-if="oneData.type == 1" style="color: #34BD66;">通过</div>
                                <div class="value" v-else-if="oneData.type == 2" style="color: #E84738;">不通过</div>
                                <div class="value" v-else-if="oneData.type == 0" style="color: #E84738;">不通过</div>
                                <div class="value" v-else>&nbsp;</div>
                            </el-col>
                        </el-row>
@@ -238,7 +239,7 @@
                        <el-row style="line-height: 30px;margin: 15px 0;">
                            <el-col :span="3">业务员</el-col>
                            <el-col :span="8">
                                <div class="value">{{JSON.parse(oneData.saleman)}}</div>
                                <div class="value">{{oneData.saleman}}</div>
                            </el-col>
                            <el-col :span="3" :offset="2">下单人</el-col>
                            <el-col :span="8">
@@ -252,13 +253,13 @@
                            </el-col>
                            <el-col :span="3" :offset="2">审核人</el-col>
                            <el-col :span="8">
                                <div class="value">{{JSON.parse(oneData.checkname)}}</div>
                                <div class="value">{{oneData.checkname==null?'&nbsp;': oneData.checkname}}</div>
                            </el-col>
                        </el-row>
                        <el-row style="line-height: 30px;margin: 15px 0;">
                            <el-col :span="3">审核日期</el-col>
                            <el-col :span="8">
                                <div class="value">{{oneData.checkTime}}</div>
                                <div class="value">{{oneData.checkTime==null?'&nbsp;': oneData.checkTime}}</div>
                            </el-col>
                        </el-row>
                    </div>
@@ -281,7 +282,7 @@
            </el-dialog>
        </div>
        <div class="select-model">
            <el-dialog title="销售新增" :visible.sync="addDia" width="750px">
            <el-dialog :title="`销售${upDia==true?'修改':'新增'}`" :visible.sync="addDia" width="800px">
                <div class="body">
                    <div class="head">基本信息</div>
                    <div class="content">
@@ -346,7 +347,8 @@
                        <el-table :data="addData.saleMaterialList" border style="width: 100%">
                            <el-table-column prop="name" label="产品名称" width="180">
                                <template slot-scope="scope">
                                    <el-input v-model="scope.row.name" size="small" clearable placeholder="请输入产品名称"></el-input>
                                    <el-input v-model="scope.row.name" size="small" clearable placeholder="请输入产品名称">
                                    </el-input>
                                </template>
                            </el-table-column>
                            <el-table-column prop="specifications" label="规格型号" width="200">
@@ -362,7 +364,8 @@
                            <el-table-column prop="number" label="数量">
                                <template slot-scope="scope">
                                    <el-input v-model.number="scope.row.number" size="small"
                                        @change="scope.row.number = isNaN(scope.row.number)?0:scope.row.number" clearable placeholder="请输入"></el-input>
                                        @change="scope.row.number = isNaN(scope.row.number)?0:scope.row.number" clearable
                                        placeholder="请输入"></el-input>
                                </template>
                            </el-table-column>
                            <el-table-column prop="price" label="单价">
@@ -370,11 +373,17 @@
                                    <el-input v-model="scope.row.price" size="small" clearable placeholder="请输入"></el-input>
                                </template>
                            </el-table-column>
                            <el-table-column prop="price" label="操作" width="65px">
                                <template slot-scope="scope">
                                    <el-button type="text" @click.native.prevent="deleteRow(scope.$index, addData.saleMaterialList)">删除</el-button>
                                </template>
                            </el-table-column>
                        </el-table>
                    </div>
                </div>
                <span slot="footer" class="dialog-footer">
                    <el-button type="primary" @click="addSale">ç¡® å®š</el-button>
                    <el-button v-if="upDia==false" type="primary" @click="addSale">ç¡® å®š</el-button>
                    <el-button v-else-if="upDia==true" type="primary" @click="upSale">ç¡® å®š</el-button>
                    <el-button @click="addDia = false">取 æ¶ˆ</el-button>
                </span>
            </el-dialog>
@@ -399,10 +408,21 @@
                pageSize: 10,
                selectDia: false,
                oneData: null,
                addDia: true,
                addDia: false,
                addData: {
                    orderNumber: null,
                    code: null,
                    name: null,
                    proname: null,
                    adress: null,
                    username: null,
                    delTime: null,
                    orderName: null,
                    phone: null,
                    saleMaterialList: []
                }
                },
                repeList: [],
                upDia: false
            }
        },
        mounted() {
@@ -410,7 +430,7 @@
        },
        methods: {
            handleSelectionChange(val) {
                this.selects = val;
                this.selects = val.id;
            },
            handleSizeChange(val) {
                this.pageSize = val
@@ -462,12 +482,146 @@
                this.addData.saleMaterialList.push({})
            },
            addSale() {
                for (var b = 0; b < this.addData.saleMaterialList.length; b++) {
                    if (Object.keys(this.addData.saleMaterialList[b]).length == 0) {
                        this.addData.saleMaterialList.splice(b, 1)
                        b--
                    } else {
                        for (var c in this.addData.saleMaterialList[b]) {
                            if (this.addData.saleMaterialList[b][c] == null || this.addData.saleMaterialList[b][c] == '' || Object
                                .keys(this.addData.saleMaterialList[b]).length != 5) {
                                this.$message.error('产品信息有必填项未填写')
                                return
                            }
                        }
                    }
                }
                for (var a in this.addData) {
                    if (this.addData[a] == null || this.addData[a] == '') {
                        if (a == 'saleMaterialList') {
                            this.$message.error('产品信息不能为空')
                        } else {
                            this.$message.error('销售订单有必填项未填写')
                        }
                        return
                    }
                }
                this.axios.post(this.$api.url.addSale, this.addData, {
                    headers: {
                        'Content-Type': 'application/json'
                    }
                }).then(res => {
                    console.log(res);
                    this.$message.success('添加成功')
                    this.addDia = false
                    this.selectRawInspectsList()
                })
            },
            openAddDia() {
                this.addDia = !(this.addDia)
                this.upDia = false
            },
            upRepe(index, i) {
                var data = this.repeList[index]
                if (data == undefined) {
                    this.addData.saleMaterialList[i] = {}
                } else {
                    this.addData.saleMaterialList[i].unit = data.unit
                    this.addData.saleMaterialList[i].specifications = data.specifications
                }
            },
            saleCheck(ob) {
                this.$confirm(`订单${ob.row.code}的信息是否通过`, '销售订单审核', {
                    distinguishCancelAndClose: true,
                    confirmButtonText: '通过',
                    cancelButtonText: '不通过'
                }).then(res => {
                    this.$axios.post(this.$api.url.saleCheck, {
                        id: ob.row.id,
                        type: 1
                    }).then(res => {
                        this.selectRawInspectsList()
                    })
                }).catch(e => {
                    if (e == 'cancel') {
                        this.$axios.post(this.$api.url.saleCheck, {
                            id: ob.row.id,
                            type: 0
                        }).then(res => {
                            this.selectRawInspectsList()
                        })
                    }
                })
            },
            openUpDia(index) {
                this.addDia = true
                this.upDia = true
                this.axios.get(this.$api.url.selectSaleDatilById, {
                    params: {
                        id: index
                    }
                }).then(res => {
                    this.addData = res.data
                    this.addData.id = index
                })
            },
            upSale() {
                console.log(this.addData);
                for (var b = 0; b < this.addData.saleMaterialList.length; b++) {
                    if (Object.keys(this.addData.saleMaterialList[b]).length == 0) {
                        this.addData.saleMaterialList.splice(b, 1)
                        b--
                    } else {
                        for (var c in this.addData.saleMaterialList[b]) {
                            if (this.addData.saleMaterialList[b][c] == null || this.addData.saleMaterialList[b][c] == '' || Object
                                .keys(this.addData.saleMaterialList[b]).length != 6) {
                                this.$message.error('产品信息有必填项未填写')
                                return
                            }
                        }
                    }
                }
                for (var a in this.addData) {
                    if ((this.addData[a] == null || this.addData[a] == '') && a != 'type') {
                        if (a == 'saleMaterialList') {
                            this.$message.error('产品信息不能为空')
                        } else {
                            this.$message.error('销售订单有必填项未填写')
                        }
                        return
                    }
                }
                this.axios.post(this.$api.url.updateSaleById, {
                    id: this.addData.id,
                    str: JSON.stringify(this.addData)
                }).then(res => {
                    this.$message.success('编辑成功')
                    this.addDia = false
                    this.upDia = false
                    this.selectRawInspectsList()
                })
            },
            deleteRow(index, rows) {
                rows.splice(index, 1);
            },
            delSale(index){
                this.axios.post(this.$api.url.delSale, {
                    id: this.tableData[index].id,
                }).then(res => {
                    this.$message.success('删除成功')
                    this.tableData.splice(index, 1)
                })
            },
            delSales(){
                console.log(this.selects);
                this.axios.post(this.$api.url.delAllSale,{
                    ids: this.selects
                }, {
                    headers: {
                        'Content-Type': 'application/json'
                    }
                }).then(res=>{
                    this.$message.success('删除成功')
                    this.selectRawInspectsList()
                })
            }
        }

 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

@@ -12,6 +12,9 @@
import swal from 'sweetalert'

Vue.prototype.LOCATIONVUE = "http://127.0.0.1:80/"; //前端本地端口
Vue.prototype.HaveJson = (val) => {
    return JSON.parse(JSON.stringify(val))
}

Vue.use(VueAxios, axios)
Vue.config.productionTip = false
@@ -20,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'
@@ -30,70 +33,70 @@
Vue.prototype.$axios = axios

import {
  Message
    Message
} from 'element-ui';
axios.interceptors.request.use(function(config) {
  let tk = sessionStorage.getItem("token")
  let token;
  if (tk != undefined && tk != '') {
    token = tk
  }
  if (token) {
    config.headers['token'] = "" + token
    // config.headers['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'
    // config.headers['Content-Type'] = 'application/json'
  }
  // console.log(config)
  if (config.method === 'post' || config.method === 'put') {
    
    config.data = qs.stringify(config.data)
  }
  if(config.headers['Content-Type'] =='application/json'){
    config.data = qs.parse(config.data)
    // console.log(config.data)
  }
  
  return config
    let tk = sessionStorage.getItem("token")
    let token;
    if (tk != undefined && tk != '') {
        token = tk
    }
    if (token) {
        config.headers['token'] = "" + token
        // config.headers['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'
        // config.headers['Content-Type'] = 'application/json'
    }
    // console.log(config)
    if (config.method === 'post' || config.method === 'put') {

        config.data = qs.stringify(config.data)
    }
    if (config.headers['Content-Type'] == 'application/json') {
        config.data = qs.parse(config.data)
        // console.log(config.data)
    }

    return config
}, function(error) {
  return Promise.reject(error)
    return Promise.reject(error)
})

axios.interceptors.response.use(res => {
  return res.data
    return res.data
}, async function(err) {
  if (JSON.stringify(err).indexOf('timeout of') > -1) {
    Message.error('请求超时，请检查网络设置')
  } else if (JSON.stringify(err).indexOf('ERR_CONNECTION_RESET') > -1 || JSON.stringify(err).indexOf(
      'Network Error') > -1) {
    Message.error('网络连接错误')
  } else if (err.response.status == "503") {
    Message.error('服务未响应')
  } else if (err.response.status == "404") {
    Message.error('请求失败，链接地址不存在')
  } else if (err.response.status == "403") {
    Message.error('token不存在')
  }else if (err.response.status == "402") {
    Message.error('无效签名，请重新登录')
    localStorage.removeItem('autoenter')
    window.location.href = '/enter'
  }  else if (err.response.status == "401") {
    await axios.post(javaApi + "user/refresh", {
      reToken: sessionStorage.getItem('reToken')
    }).then(res => {
      if (res.data.code==201) {
        Message.error('认证失败，需要重新登录')
        localStorage.removeItem('autoenter')
        window.location.href = '/enter'
        return Promise.reject(err)
      }
      sessionStorage.setItem('token', res.data.token)
      sessionStorage.setItem('reToken', res.data.reToken)
    })
    return axios(err.config)
  } else if (err.response.status == "500") {
    Message.error('服务端出现错误')
  }
  return Promise.reject(err)
    if (JSON.stringify(err).indexOf('timeout of') > -1) {
        Message.error('请求超时，请检查网络设置')
    } else if (JSON.stringify(err).indexOf('ERR_CONNECTION_RESET') > -1 || JSON.stringify(err).indexOf(
            'Network Error') > -1) {
        Message.error('网络连接错误')
    } else if (err.response.status == "503") {
        Message.error('服务未响应')
    } else if (err.response.status == "404") {
        Message.error('请求失败，链接地址不存在')
    } else if (err.response.status == "403") {
        Message.error('token不存在')
    } else if (err.response.status == "402") {
        Message.error('无效签名，请重新登录')
        localStorage.removeItem('autoenter')
        window.location.href = '/enter'
    } else if (err.response.status == "401") {
        await axios.post(javaApi + "user/refresh", {
            reToken: sessionStorage.getItem('reToken')
        }).then(res => {
            if (res.data.code == 201) {
                Message.error('认证失败，需要重新登录')
                localStorage.removeItem('autoenter')
                window.location.href = '/enter'
                return Promise.reject(err)
            }
            sessionStorage.setItem('token', res.data.token)
            sessionStorage.setItem('reToken', res.data.reToken)
        })
        return axios(err.config)
    } else if (err.response.status == "500") {
        Message.error('服务端出现错误')
    }
    return Promise.reject(err)
})

// è·¯ç”±æ‹¦æˆªå™¨
@@ -111,7 +114,7 @@
// });

new Vue({
  el: '#app',
  router,
  render: h => h(App)
    el: '#app',
    router,
    render: h => h(App)
});

 src/router/index.js

@@ -23,6 +23,5 @@
  {
    path: "/enter",
    component: () => import("../view/enter.vue")
  },
  ]
})
  }]
})

 src/view/index.vue

@@ -67,7 +67,7 @@
  color: #fff;
  width: 68px;
  height: 68px;
  margin: 20px 0;
  margin: 8px 0;
  cursor: pointer;
  display: flex;
  align-items: center;
@@ -319,6 +319,74 @@
            }
          ]
        },
                {
                  k: 4,
                  v: "生产管理",
                  i: "font icon-shouye",
                  c: [
                    {
                      k: 12,
                      v: "生产订单",
                      i: "font icon-shouye",
                      u: ""
                    },
                    {
                      k: 13,
                      v: "生产计划",
                      i: "font icon-shouye",
                      u: ""
                    },
                    {
                      k: 14,
                      v: "生产报工",
                      i: "font icon-shouye",
                      u: ""
                    }
                  ]
                },
                {
                  k: 5,
                  v: "WMS管理",
                  i: "font icon-shouye",
                  c: [
                    {
                      k: 15,
                      v: "原材料库存",
                      i: "font icon-shouye",
                      u: ""
                    },
                    {
                      k: 16,
                      v: "回单管理",
                      i: "font icon-shouye",
                      u: ""
                    },
                    {
                      k: 17,
                      v: "半成品库存",
                      i: "font icon-shouye",
                      u: ""
                    },
                    {
                      k: 18,
                      v: "成品库存",
                      i: "font icon-shouye",
                      u: ""
                    },
                    {
                      k: 19,
                      v: "成品发货",
                      i: "font icon-shouye",
                      u: ""
                    },
                    {
                      k: 20,
                      v: "成品入库",
                      i: "font icon-shouye",
                      u: ""
                    }
                  ]
                },
        {
          k: 1,
          v: "技术管理",
@@ -332,9 +400,9 @@
            },
            {
              k: 2,
              v: "技术文件",
              v: "订单Bom",
              i: "font icon-shouye",
              u: "technical"
              u: "technicalaa"
            }
          ]
        },
@@ -390,9 +458,83 @@
              v: "计量管理",
              i: "font icon-shouye",
              u: "measurementManagement"
            },
            {
              k: 10.1,
              v: "巡检",
              i: "font icon-shouye",
              u: ""
            },
            {
              k: 10.2,
              v: "不合格品处置",
              i: "font icon-shouye",
              u: "Processingproducts"
            }
          ]
        }
        },
        {
          k: 6,
          v: "核算管理",
          i: "font icon-shouye",
          c: [
            {
              k: 21,
              v: "产量工资",
              i: "font icon-shouye",
              u: ""
            },
            {
              k: 22,
              v: "员工出勤",
              i: "font icon-shouye",
              u: ""
            }
          ]
        },
                {
                  k: 7,
                  v: "基础数据",
                  i: "font icon-shouye",
                  c: [
                    {
                      k: 23,
                      v: "工序维护",
                      i: "font icon-shouye",
                      u: ""
                    },
                    {
                      k: 24,
                      v: "自检维护",
                      i: "font icon-shouye",
                      u: ""
                    },
                    {
                      k: 25,
                      v: "技术指标维护",
                      i: "font icon-shouye",
                      u: ""
                    },
                    {
                      k: 26,
                      v: "工艺路线维护",
                      i: "font icon-shouye",
                      u: ""
                    },
                    {
                      k: 27,
                      v: "设备维护",
                      i: "font icon-shouye",
                      u: ""
                    },
                    {
                      k: 28,
                      v: "物料清单维护",
                      i: "font icon-shouye",
                      u: ""
                    }
                  ]
                }
      ],
      activeBox: 0,
      activeP: 0,
@@ -445,11 +587,19 @@
        this.activeBox = 0;
      } else if (num > 0 && num <= 2) {
        this.activeBox = 1;
      } else if (num > 2 && num <= 10) {
      } else if (num > 2 && num < 11) {
        this.activeBox = 2;
      } else if (num == 11) {
        this.activeBox = 3;
      }
      } else if (num > 11 && num <=14){
                this.activeBox = 4;
            } else if (num>14 && num<=20){
                this.activeBox = 5
            } else if (num>20 && num<=22){
                this.activeBox = 6
            } else if (num>22 && num<=28){
                this.activeBox = 7
            }
    },
    out() {
      sessionStorage.clear();