Merge branch 'master' of http://192.168.0.22:9001/r/mom-before

zouyu

2023-09-12 6e60bc042d1670013ecdc93e87618ac95cd3b332

 src/components/view/technical.vue

@@ -11,7 +11,7 @@
    <div class="search-header">
      <el-form v-model="searchData" :inline="true">
        <el-form-item label="订单号:">
          <el-input v-model="searchData.id"></el-input>
          <el-input v-model="searchData.id" ></el-input>
        </el-form-item>
        <el-form-item label="下单日期:">
          <el-date-picker
@@ -21,7 +21,16 @@
            placeholder="选择日期">
          </el-date-picker>
        </el-form-item>
        <el-form-item>
        <el-form-item label="产品名称:">
          <el-input v-model="searchData.name" @input="query"></el-input>
        </el-form-item>
        <el-form-item label="编制状态:" >
          <el-select v-model="searchData.type" placeholder="全部" style="width: 310px;">
              <el-option label="待编制" :value="0"></el-option>
                     <el-option label="已编制" :value="1"></el-option>
          </el-select>
        </el-form-item>
        <el-form-item >
                <el-button  plain @click="resetBtn">重 置</el-button>
                <el-button  @click="searchTechnical">查 询</el-button>
        </el-form-item>
@@ -222,7 +231,9 @@
    return {
       searchData:{
        id:'',
        date:''
        date:'',
        name:'',
        condition:'',
       },
       compiledata:{},
       technicalTable: [],
@@ -242,8 +253,6 @@
      authorizedstrength(row) {
        this.compiledata = row
        this.compile()
        // let ccc = row
        // console.log(row);
      },
      //编制
      compile() {
@@ -255,23 +264,35 @@
      })
        this.getTechnicalTableData()
      },

      async showDetails(row){
        this.showDetail = true
        const res = await this.$axios.get(this.$api.url.selectOrderById,{params:{id:row.id}})
        this.selectedRow = res.data
        console.log(this.selectedRow)
      },


      async  getTechnicalTableData() {
        const res = await this.$axios.get(this.$api.url.selectAllOrder,{
          params:{
            pageSize:(this.pageParams.pageNo-1),
            countSize:this.pageParams.pageSize,...this.searchData}})
            countSize:this.pageParams.pageSize,...this.searchData,
            orderCode:this.searchData.id, 
            time:this.searchData.date,
            name:this.searchData.name,
            type:this.searchData.type, 
          }
        }) 
        this.technicalTable = res.data.row
        this.pageParams.total = res.data.total
      },


      // 头部条件查询-重置
      resetBtn() {
        this.searchData={}
        this.getTechnicalTableData()
      },
      // 头部条件查询-查询
      searchTechnical() {
@@ -294,6 +315,9 @@
    height: 100%;
    width: 100%;
  }
  .el-form-item__label{
    padding: 0 60px 0;
  }
  .technical .title .el-button {
    height: 32px;
    border: 1px solid rgba(190, 190, 190, 0.44);
@@ -311,9 +335,12 @@
  background: #fff;
  padding: 24px 32px;
}
.search-header .el-form-item__label{
  padding: 0 30px 0 0;
}
.search-header .el-form-item{
  margin: 0px;
  font-size: 14px;
  font-size: 20px;
}
.search-header .el-form-item:nth-child(1){
  margin-right: 48px;