Merge remote-tracking branch 'origin/master'

86134

2023-11-11 4652431ce329b4dec6c4dcc0758d5c4ff97e0666

 src/views/quality/rawMaterial/rawMaterial-form.vue

@@ -39,7 +39,7 @@
            </el-col>
            <el-col :span="6">
                <el-form-item prop="formTime" label="来料日期">
                <el-date-picker 
                <el-date-picker
                    style="width:100%"
                    v-model="dataForm.formTime"
                    type="datetime"
@@ -98,7 +98,7 @@
      </div>


      

      <div class="rawMaterial-detail">
        <el-row style="width:100%;z-index: 10;height:50px;">
            <el-col :span="18">检验项目</el-col>
@@ -114,16 +114,16 @@
        </el-row>
        <el-row style="width:100%;">
            <el-col :span="24">
                <el-table 
                :header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}" 
                <el-table
                :header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}"
                :cell-style="{textAlign:'center'}"
                 ref="table"
                :data="list" 
                border 
                :data="list"
                border
                style="width: 100%;"
                 height="400"
                  row-key="iid" 
                  default-expand-all 
                  row-key="iid"
                  default-expand-all
                  :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
                  <el-table-column type="index" label="序号" width="60">
                  </el-table-column>
@@ -146,7 +146,7 @@
                      <el-input :disabled="dataForm.id != null" v-model="scope.row.unit" placeholder="请输入单位"></el-input>
                    </div>
                    </template>
                  

                  </el-table-column>
                  <el-table-column prop="required" label="标准值" width="260">
                    <template slot-scope="scope">
@@ -174,9 +174,9 @@
                  <el-table-column prop="deviceName" label="试验设备" min-width="260">
                    <template slot-scope="scope">
                      <div v-if="!scope.row.children">
                        <el-select :disabled="dataForm!=null && resultVal!=null" style="width:100%" 
                        <el-select :disabled="dataForm!=null && resultVal!=null" style="width:100%"
                        v-model="scope.row.deviceId" filterable @change="updateDevice(scope.row,scope.$index)">
                            <el-option v-for="(item,index) in deviceList" 
                            <el-option v-for="(item,index) in deviceList"
                            :key="index" :value="item.id" :label="item.code +'-'+ item.name"></el-option>
                        </el-select>
                      </div>
@@ -211,7 +211,7 @@
            </el-col>
        </el-row>
      </div>
      


      <div class="rawMaterial-result">
        <el-row>
@@ -220,7 +220,7 @@
        <el-row style="width:100%">
          <el-col :span="24">
            <el-table border height="90" :data="conclusionTable" ref="conclusion" v-model="conclusion"
            :header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}" 
            :header-cell-style="{textAlign:'center',color:'black',backgroundColor:'#fafafa'}"
            :cell-style="{textAlign:'center'}">
                <el-table-column prop="code" label="物料编号"></el-table-column>
                <el-table-column prop="name" label="物料名称"></el-table-column>
@@ -261,7 +261,7 @@
</template>

<script>
import { 
import {
  selectDevice,
  addRawInspects,
  getObj,
@@ -358,7 +358,6 @@
      },
      // 确认回调
      selectPart(param, nodePart, index) {
        console.log(param)
        if (typeof param !== 'undefined') {
          this.dataForm.code = param.code
          this.dataForm.name = param.name
@@ -400,7 +399,7 @@
                console.log(error)
            })
        },
      

      // updateDevice(row,index){
      //   if(this.dataForm.id != null){
      //     updateDeviceById({deviceId:row.deviceId,rpId:row.rpId}).then(res=>{
@@ -528,8 +527,8 @@
      updateTestValue(row,index){
        console.log(row);
        if(row.rpId == null){
          
          


          return
        }
        let val = row.testValueList.join(",");
@@ -550,7 +549,7 @@
          this.$message.error(error)
        })
      },
    


      init(){
        if(this.dataForm.id){
@@ -582,11 +581,11 @@
                        userNameList.push(obj.userName)
                      }
                      let arr= []
                    

                      if(obj.testValue){
                        arr = obj.testValue.split(",")
                      }
                     

                      let o = {
                        deviceId: obj.deviceId,
                        deviceName: obj.deviceName,
@@ -605,7 +604,7 @@
                    })
                    this.list.push(ele)
                }
            })         
            })
            this.conclusionTable = [{
              code: data.code,
              name: data.name,
@@ -626,7 +625,7 @@
                row.testValueList.forEach(e => {
                  val += e + ","
                })
             

                // if (note === undefined || note === '' || note === null) {
                //     return
                // }
@@ -636,7 +635,7 @@
                    return
                }

                

                let obj = {
                  deviceId: row.deviceId,
                rpId: row.rpId,
@@ -695,7 +694,21 @@
        row.children.push(obj)
      },
      save(){

        let data = this.dataForm
        console.log('--------',data);
        console.log("-----",this.list);
        this.list.forEach(item=>{
          item.children.forEach(c=>{
            let arr=c.testValueList
            let val=''
            arr.forEach(a=>{
              val+=a+","
            })
            let end=val.substring(0,val.length-1)
            c.testValue=end
          })
        })
        data.rawInsProducts = this.list
        addRawInspects(data).then(res=>{
            this.$message.success("保存成功")