查看详情页

王震

2023-08-25 95fda13c28cb664a57336dd2e01d5b41ec4f717f

查看详情页

 .env.development

@@ -2,4 +2,4 @@
ENV = 'development'

# base api
VUE_APP_BASE_API =  'http://192.168.110.167:1234/'
VUE_APP_BASE_API =  'http://192.168.110.107:1234/'

 src/api/experiment/planAssignments.js

@@ -31,3 +31,19 @@
    data
  })
}
//检验单详情
export function selectInspectsListById(params){
  return request({
    url: '/inspection/selectInspectsListById',
    method: 'get',
    params
  })
}
//选择责任项目检验人
export function selectUser(params){
  return request({
    url: '/inspection/selectUser',
    method: 'get',
    params
  })
}

 src/views/experiment/inspectionApplication/Viewdetails/index.vue

@@ -12,7 +12,7 @@
                <el-form ref="form" :model="searchData" label-width="80px">
                    <el-col :span="6">
                        <el-form-item label="来料日期:" >
                            <el-input :disabled="true" v-model="searchData.from_time"></el-input>
                            <el-input :disabled="true" v-model="searchData.formTime"></el-input>
                            
                        </el-form-item>
                    </el-col>
@@ -23,7 +23,7 @@
                    </el-col>                    
                    <el-col :span="6">
                        <el-form-item label="产品编号:">
                            <el-input :disabled="true" v-model="searchData.mcode"></el-input>
                            <el-input :disabled="true" v-model="searchData.code"></el-input>
                        </el-form-item> 
                    </el-col>
                </el-form>
@@ -60,7 +60,7 @@
                    <el-col :span="6">

                        <el-form-item label="登记日期:">
                            <el-input :disabled="true" v-model="searchData.end_time"></el-input>
                            <el-input :disabled="true" v-model="searchData.endTime"></el-input>
                        </el-form-item>
                    </el-col>
                    
@@ -86,7 +86,7 @@
        <div>        
            <el-card style="margin: 10px;">
                <el-table
                    :data="tableData"
                    :data="insProducts"
                    border      
                    style="width: 100%">
                    <el-table-column
@@ -95,52 +95,37 @@
                    width="50">
                    </el-table-column>
                    <el-table-column
                        prop="date"
                        prop="name"
                        label="项目"
                        width="180">
                    </el-table-column>
                    <el-table-column
                        prop="name"
                        prop="unit"
                        label="单位"
                        width="180">
                    </el-table-column>
                    <el-table-column
                        prop="kk"
                        prop="internal"
                        label="标准值">
                    </el-table-column>
                    <el-table-column
                        prop="zz"
                        prop="required"
                        label="内控值">
                    </el-table-column>
                    <el-table-column
                        prop="oo"
                        wight="200"
                        label="经验人">
                        <template>
                            <el-select v-model="value" placeholder="黄晓明">
                                <el-option
                                    v-for="item in cities"
                                    :key="item.value"
                                    :label="item.label"
                                    :value="item.value">
                                    <span style="float: left">{{ item.label }}</span>
                                    <span style="float: right; color: #8492a6; font-size: 13px">{{ item.value }}</span>
                                    </el-option>
                    <el-table-column prop="userName" label="经验人">
                        <template slot-scope="scope">
                            <el-select v-model="ZERENren" size="small" slot="append" style="width: 220px;">
                            <el-option v-for="item in ZERENren" :key="item.id" :label="item.name">{{ item}}</el-option>
                            </el-select>
                        </template>
                    </el-table-column>
                    <el-table-column
                        prop="pp"
                        prop="inspectionMaterialId"
                        label="实验设备">
                        <template>
                            <el-select v-model="value" placeholder="拉力机">
                                <el-option
                                v-for="item in cities"
                                :key="item.value"
                                :label="item.label"
                                :value="item.value">
                                </el-option>
                            </el-select>
                            <!-- <el-select v-model="scope.row.checker" size="small" slot="append" style="width: 260px;">
                            <el-option v-for="item in checkeroptions" :key="item.value" :label="item.label">{{ item.label }}</el-option>
                            </el-select> -->
                        </template>
                    </el-table-column>
                </el-table>
@@ -151,126 +136,39 @@
</div>       
</template>
<script>
  import { selectInspectsList, selectAll, addInspect} from '@/api/experiment/planAssignments'
  import { selectInspectsListById,selectUser} from '@/api/experiment/planAssignments'
export default {
    data(){
        return {
            searchData:{
                from_time:'',
                supplier:'',
                mcode:'',
                name:'',
                specifications:'',
                unit:'',
                num:'',
                userName:'',
                end_time:'',

            searchData:{ },
            insProducts:[],
            ZERENren:{
            },
            value:{},
            cities:[{
                value: 'Beijing',
                label: '黄小明'
                }, {
                value: 'Shanghai',
                label: '黄小明'
                }, {
            }],
            tableData:[{            
            date: '导线',
            name: 'mm',
            kk:'30.0',
            zz:'30.0',
            oo:'黄晓明',
            pp:'拉力机',
          },{
            date: '导线',
            name: 'mm',
            kk:'30.0',
            zz:'30.0',
            oo:'黄晓明',
            pp:'拉力机',
          },{
            date: '导线',
            name: 'mm',
            kk:'30.0',
            zz:'30.0',
            oo:'黄晓明',
            pp:'拉力机',
          },{
            date: '导线',
            name: 'mm',
            kk:'30.0',
            zz:'30.0',
            oo:'黄晓明',
            pp:'拉力机',
          },{
            date: '导线',
            name: 'mm',
            kk:'30.0',
            zz:'30.0',
            oo:'黄晓明',
            pp:'拉力机',
          }],
          currentPage:1,
          pageSize:8,
          id:''
            uu:''
        }
    },
    created(){
        console.log(this.$route.query.icode);
        this.id = this.$route.query.icode;
        this.selectInspectsList()
        console.log(this.$route.query.id);
        this.uu = this.$route.query.id;
        this.selectInspectsListById()
        // this.selectUser()
    },
    methods: {
        //返回
      async goback(){
        
        this.$router.push({name:'inspectionApplication'})
      },
      async selectInspectsList() {

        // 获取分页列表
        const res = await selectInspectsList({ countSize: this.pageSize, pageSize: this.currentPage ,message:this.id})
        // this.inspectionTable = data
        console.log(res)
        
    //     res.data.forEach((item) => {
    //       var formTime = item["DATE_FORMAT(`form_time`,'%Y-%m-%d')"]
    //       var startTime = item["DATE_FORMAT(i"]["`start_time`,'%Y-%m-%d')"]
    //       var endTime = item["DATE_FORMAT(i"]["`end_time`,'%Y-%m-%d')"]
    //       var checkdate = startTime + '~' + endTime
    //       var createTime = item["DATE_FORMAT(i"]["`create_time`,'%Y-%m-%d')"]
    //       item['formTime'] = formTime // 来料日期
    //       item['checkdate'] = checkdate // 检验日期
    //       item['createTime'] = createTime // 登记日期
    //   })
        this.searchData.mcode = res.data.row[0].mcode
        this.searchData.supplier = res.data.row[0].supplier
        this.searchData.from_time = res.data.row[0]["DATE_FORMAT(`form_time`,'%Y-%m-%d')"]
        this.searchData.name = res.data.row[0].name
        this.searchData.specifications = res.data.row[0].specifications
        this.searchData.unit = res.data.row[0].unit
        this.searchData.num = res.data.row[0].num
        this.searchData.end_time = res.data.row[0]["DATE_FORMAT(i"]["`end_time`,'%Y-%m-%d')"]
        this.searchData.userName = res.data.row[0].userName



        
        const data = res.data.row
        data.forEach((item) => {
          var formTime = item["DATE_FORMAT(`form_time`,'%Y-%m-%d')"]
          var startTime = item["DATE_FORMAT(i"]["`start_time`,'%Y-%m-%d')"]
          var endTime = item["DATE_FORMAT(i"]["`end_time`,'%Y-%m-%d')"]
          var checkdate = startTime + '~' + endTime
          var createTime = item["DATE_FORMAT(i"]["`create_time`,'%Y-%m-%d')"]
          item['formTime'] = formTime // 来料日期
          item['checkdate'] = checkdate // 检验日期
          item['createTime'] = createTime // 登记日期
      })
        this.inspectionTable = data
        this.total = res.data.total
      //检验单责任人
      async selectUser(){
        const res = await selectUser()
        this.ZERENren = res.data
      },
      //检验单表
      async selectInspectsListById() {
        const res = await selectInspectsListById({id:this.uu})
        this.searchData = res.data
        this.insProducts = res.data.insProducts
      }
}
}
</script>

 src/views/experiment/inspectionApplication/index.vue

@@ -183,7 +183,7 @@
            >
              <div class="check-box">
                <el-radio-group v-model="type" @change="handleRadioChange">
                  <el-radio :label="0" border >原材料检验</el-radio>
                  <el-radio style="background-color: rgb(170, 236, 214);border-radius: 10px;" :label="0" border >原材料检验</el-radio>
                  <el-radio :label="1" border>委托检验</el-radio>
                  <el-radio :label="2" border>成品检验</el-radio>
                </el-radio-group>
@@ -662,14 +662,14 @@

        // console.log(res);
        this.inspectionTable = row;
        console.log(row.icode);
        this.icode = row.icode
        this.$router.push({name:'Viewdetails',query: {icode:row.icode}});
        console.log(row.id);
        this.id = row.id
        this.$router.push({name:'Viewdetails',query: {id:row.id}});
        this.selectInspectsList()
      },
      async selectInspectsList() {
        // 获取分页列表
        const res = await selectInspectsList({ countSize: this.pageSize, pageSize: this.currentPage,message:this.icode})
        const res = await selectInspectsList({ countSize: this.pageSize, pageSize: this.currentPage,message:this.id})
        // this.inspectionTable = data
        // console.log(res.data.row)
        const data = res.data.row

 src/views/experiment/reportAuditing/index.vue

@@ -78,7 +78,7 @@
              </span>
            </template></el-table-column
          >
          <el-table-column
          <el-table-columne
            prop="materialName"
            label="样品名称"
            min-width="10%"
@@ -86,7 +86,7 @@
          <el-table-column prop="status" label="审批状态" min-width="8%" v-model="Auditconclusion">
            <template slot-scope="scope">
              <span>
                <el-tag type="warning">{{
                <el-tag :color="scope.row.status == 0 ? '' : 'rgb(187, 237, 221)'" type="warning">{{
                  scope.row.status == 0 ? "待通过" : "通过"
                }}</el-tag>
              </span>
@@ -153,7 +153,7 @@
      reportTable: [],
      page: 1,
      total: 0,
      pageSize: 10,
      pageSize: 8,
      checkskipvisible: false,
      form:{},
      // handleClose:{},
@@ -216,7 +216,7 @@
    },
    //审核
    async transmitData(id) { 
      let param={"id":id,"result":1}
      let param={"id":id,"result":2}
     let data = await checkApi(param)     
    },
    // 查询列表

 src/views/inspectionManagement/commissionInspection/index.vue

@@ -44,7 +44,10 @@
                <el-button class="rightBtn" type="primary" @click="showLink">新增委托</el-button>
              </el-form>
          </div>
          <div class="library-table">
        </div>

          <el-card style="margin: 20px 8px;">
          <div >
            <div class="table-header">
              <div class="search-bar">
                <el-radio-group v-model="radioValue" @change="radioclick">
@@ -53,11 +56,12 @@
              </el-radio-button>
              </el-radio-group>
              </div>

              <div class="generateInsp">
                <el-button type="primary" size="mini" icon="el-icon-document" style="background-color: rgb(1, 102, 226);">生成报检单</el-button>
              </div>
            </div>
            <div class="table-box">

              <el-table
                ref="commisionTable"
                :max-height="800"
@@ -145,18 +149,21 @@
              <!-- 分页器 -->
              <div>
                <el-pagination
                  class="pagination"
                  @size-change="handleSizeChange"
                  @current-change="handleCurrentChange"
                  :current-page="currentPage"
                  :page-sizes="[5, 10, 20]"
                  :page-sizes="[10,20,30]"
                  :page-size="pageSize"
                  layout="total, sizes, prev, pager, next, jumper"
                  :total="total">
                </el-pagination>
              </div>


            </div>
          </div>
      </div>
        </el-card>
    
  </div>
  </div>
</template>
@@ -327,7 +334,7 @@
}
</script>

<style scoped>
<style lang="scss" scoped>
    .top-bar {
        margin: -25px -15px;
        background: #fff;
@@ -364,85 +371,33 @@
    }
  }

.library-table{
      background-color: #fff;
      flex: 1;
      margin: 0px -15px;
      margin-top: 40px;
      display: flex;
      flex-direction: column;
      .table-header{
        padding: 20px;
        display: flex;
        justify-content: space-between;
        .el-form-item{
          margin-bottom: 30px !important;
        }
      }
      .table-box{
          padding: 0px 20px;
          margin-top: 0px;
          flex: 1;
          background: #fff;
          /* padding: 20px 20px 10px 20px; */
          display: flex;
          flex-direction: column;
          .el-table {
            flex: 1;
          }
          >div:nth-child(2){
            display: flex;
            justify-content: end;
            margin: 10px 0;
          }
      }
    }

    .rightBtn {
        background-color: rgb(1, 102, 226);
    }

    .library-table {
        background-color: #fff;
        flex: 1;
        margin: 0px -15px;
        margin-top: 40px;
        display: flex;
        flex-direction: column;


    }
        .table-header {
            padding: 20px;
            display: flex;
            justify-content: space-between;

            .el-form-item {
                margin-bottom: 30px !important;
    margin-bottom: 10px;
    .search-bar{
      width: 50%;
            }
        }

        .table-box {
            padding: 0px 20px;
            margin-top: 0px;
            flex: 1;
            background: #fff;
            /* padding: 20px 20px 10px 20px; */
            display: flex;
            flex-direction: column;

            .el-table {
                flex: 1;
            }

            >div:nth-child(2) {
    .generateInsp{
      width: 50%;
                display: flex;
                justify-content: end;
                margin: 10px 0;
            }
        }
  .pagination{
  display: flex;
  margin-top: 20px;
  justify-content: end;
    }
	
    .vue_qr_div{
        text-align: center;
    }
}

</style>