Merge remote-tracking branch 'origin/master'

王震

2023-08-26 5fdfea676b2bc01e7d2066c32fb2453a9284b25e

Merge remote-tracking branch 'origin/master'

 src/utils/request.js

@@ -48,7 +48,6 @@

    // if the custom code is not 20000, it is judged as an error.
    if (res.code !== 200) {
      console.log(res.message || 'Error')
      // Message({
      //   message: res.message || 'Error',
      //   type: 'error',

 src/views/basicData/index.vue

@@ -136,7 +136,7 @@
      <el-table
        :data="tableData"
        style="width: 100%; margin-bottom: 20px"
        row-key="name"
        row-key="id"
        border
        height="calc(100vh - 250px)"
        default-expand-all

 src/views/experiment/inspectionApplication/index.vue

@@ -180,16 +180,17 @@
              title="新增检验单"
              :visible.sync="checkTypeVisible"
              width="50%"
                            top="10vh"
            >
              <div class="check-box">
                <el-radio-group v-model="type" @change="handleRadioChange">
                  <el-radio style="background-color: rgb(170, 236, 214);border-radius: 10px;" :label="0" border >原材料检验</el-radio>
                  <el-radio style="background-color: rgb(170, 236, 214);border-radius: 10px;" :label="1" border>委托检验</el-radio>
                  <el-radio style="background-color: rgb(170, 236, 214);border-radius: 10px;" :label="2" border>成品检验</el-radio>
                  <el-radio :style="`background-color: ${type==0?'rgb(170, 236, 214)':'#fff'};border-radius: 10px;`" :label="0" border>原材料检验</el-radio>
                  <el-radio :style="`background-color: ${type==1?'rgb(170, 236, 214)':'#fff'};border-radius: 10px;`" :label="1" border>委托检验</el-radio>
                  <el-radio :style="`background-color: ${type==2?'rgb(170, 236, 214)':'#fff'};border-radius: 10px;`" :label="2" border>成品检验</el-radio>
                </el-radio-group>
              </div>
              <div v-if="type === 0 || type === ''">
                <el-form :model="infoForm" ref="infoForm" class="checkTypeForm" label-position="top" label-width="200px" size="mini">
              <div v-if="type === 0">
                <el-form :model="infoForm" ref="infoForm" class="checkTypeForm" label-position="top" label-width="200px" size="medium">
                  <el-row :gutter="100">
                      <el-col :span="10">
                          <el-form-item label="来料日期：">
@@ -395,8 +396,6 @@
                    height="calc(100vh - 250px)"
                    default-expand-all
                    ref="multipleTable"
                    @select="selectTr"
                    @select-all="selectAll"
                    :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
                  >
                    <el-table-column type="selection" label="序号"> </el-table-column>
@@ -593,7 +592,6 @@
      </template>
      <template v-else>
        <router-view />

      </template>
    </div>
  </template>
@@ -647,7 +645,7 @@
          amount: '',
          checkdate: []
        },
        infoForm:'',
        infoForm:{},
        commisionSelection:{
          entrust_coding: '',
          entrusted: '',
@@ -688,11 +686,12 @@
        pageSize: 8, // 每页的数据条数
        radioValue: '全部',
        checkTypeVisible: false,
        type: '', // 默认不选中的状态
        type: 0, // 默认不选中的状态
        rawmaterialVisible: false,
        commisionVisible: false,
        tmp: '',
        Standardframe: false
        Standardframe: false,
                tableData: []
      }
    },
    watch: {
@@ -811,8 +810,7 @@
    },
    async handleRadioChange(){
      if(this.type === 0){
        原材料报检
        
        // 原材料报检
        this.rawmaterialVisible = true
        const res = await selectAll({type: this.type})
        var data = res.data
@@ -880,7 +878,7 @@
          type: this.type,
          unit: this.finishedTable.unit })
      }
      this.type = ''
      this.type = 0
      this.checkTypeVisible = false
      this.$message({
          message: '添加成功！',
@@ -927,7 +925,7 @@
          }
          height: auto;
          font-size: 22px !important;
          padding: 20px 40px !important;
          padding: 40px 50px !important;
          ::v-deep  .el-radio__label{
            font-size: 22px !important;
            padding-left: 0px !important;