Merge remote-tracking branch 'origin/master'

value

2023-08-29 8e85533ae6269e2a224b5fcf593ad12a9ccf9aaf

 src/views/experiment/inspectionApplication/index.vue

@@ -194,19 +194,21 @@
                  <el-row :gutter="100">
                      <el-col :span="10">
                          <el-form-item label="来料日期：">
                              <el-input style="width: 300px" type="text" :value="infoForm.startTime" placeholder="请输入来料日期" autocomplete="off" />
                          </el-form-item>
                              <!-- <el-input style="width: 300px" type="text" :value="infoForm.startTime" placeholder="请输入来料日期" autocomplete="off" /> -->
                              <el-date-picker style="width: 300px"
                                    v-model="infoForm.startTime" type="date" placeholder="选择日期"> </el-date-picker>
                            </el-form-item>
                      </el-col>
                      <el-col :span="10">
                          <el-form-item label="供应商名称：">
                              <el-input style="width: 300px" type="text" :value="infoForm.supplierName" placeholder="请输入供应商名称" autocomplete="off" />
                              <el-input style="width: 300px" type="text" :value="infoForm.supplier" placeholder="请输入供应商名称" autocomplete="off" />
                          </el-form-item>
                      </el-col>
                      </el-row>
                      <el-row :gutter="100">
                      <el-col :span="10">
                          <el-form-item label="原材料编码：">
                              <el-input style="width: 300px" type="text" :value="infoForm.mcode" placeholder="请输入原材料编码" autocomplete="off" />
                              <el-input style="width: 300px"  type="text" :value="infoForm.mcode" placeholder="请输入原材料编码" autocomplete="off" />
                          </el-form-item>
                      </el-col>
                      <el-col :span="10">
@@ -380,7 +382,7 @@
              title="标准库"
              :visible.sync="Standardframe"
              width="49%"
              height="">
              >
              <el-card>
                  <template slot-scope="scope" >
                    <span>版本选择：</span>
@@ -396,7 +398,7 @@
                    style="width: 100%; margin-bottom: 20px"
                    row-key="id"
                    border
                    height="calc(90vh - 250px)"
                    height="calc(80vh - 250px)"
                    default-expand-all
                    ref="multipleTable"
                    :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
@@ -485,7 +487,7 @@
                min-width="8%"
              />
              <el-table-column
                prop="supplierName"
                prop="supplier"
                label="供应商名称"
                min-width="12%"
              />
@@ -520,7 +522,7 @@
                min-width="8%"
              />
              <el-table-column
                prop="supplier"
                prop="surveyor"
                label="检验人"
                min-width="8%"
              />
@@ -530,12 +532,12 @@
                min-width="8%"
              />
              <el-table-column
                prop="condition"
                prop="type"
                label="状态"
                min-width="8%"
              >
              <template slot-scope="scope">
                <span :style="{ color: scope.row.state === 1 ? 'green' : 'red' }">
                <span :style="{ color: scope.row.state === type ? 'green' : 'red' }">
                  {{ scope.row.state===1 ? '已检测':'待检测' }}
                </span>
              </template>
@@ -606,6 +608,7 @@
  import { selectInspectsList, selectAll, addInspect,chooseVer,lookProByVer} from '@/api/experiment/planAssignments'
  export default {
    data() {

      return {
        showDetail: false,
        searchData: {
@@ -614,6 +617,7 @@
          state: '',
        },
        valu:{},
        inputValue: '',
        icode:'',
        inspectionTable: [],
        rawMaterialTable: [],
@@ -706,7 +710,7 @@
      },
      async selectAll(){
        const res = selectAll({type:2})
        console.log(res);
        // console.log(res);
        this.commisionTable = res.data
      },
      async handleClick(row){
@@ -715,6 +719,13 @@
        this.$router.push({name:'Viewdetails',query: {id:row.id}});
        this.selectInspectsList()
      },
      // validateInput() {
      //   if (this.inputValue.trim() === '') {
      //  }
      // },      // 输入值为空，弹出提示信息或进行其他处理
      //     alert('输入值不能为空');
      //     return;
     
      //版本库
      async chooseVer() {
        console.log(this.tmp.materialCoding);
@@ -738,7 +749,7 @@
          specifications:this.tmp.specifications,
          version:this.aa
        })
        console.log(res);
        // console.log(res);
        this.tableData = res.data
      },
      ccc(val){
@@ -819,6 +830,8 @@
    },
    handleRawMaterialSelection(){
      this.infoForm = this.tmp
      // console.log( this.infoForm );
      this.infoForm.endTime=[this.infoForm.startTime,this.infoForm.endTime]
      // console.log(this.infoForm);

      this.rawmaterialVisible = false
@@ -916,7 +929,9 @@
      //确定跳转
      QUEding(){
        // this.tableRow = a
        
        this.Standardframe = true

        this.chooseVer()
        
      },