modified: .gitignore modified: src/views/quality/rawMaterial/index.vu...

zouyu

2023-11-24 ef0c3a4140ba4af8b629838c7a34884e39a64126

 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">
@@ -160,7 +160,7 @@
                    <template slot-scope="scope">
                      <div v-if="!scope.row.children">
                      <el-tooltip :disabled="scope.row.deviceId != null" class="item" effect="dark" content="请先选择设备！" placement="top-start">
                          <el-select style="width:100%" allow-create filterable default-first-option
                          <el-select @blur="changeState(scope.row, index)" style="width:100%" allow-create filterable default-first-option
                          :disabled="scope.row.deviceId == null ||  (dataForm.id!=null&&resultVal!=null)"
                          v-model="scope.row.testValueList[index]"
                          placeholder="请输入或选择检测值" @change="updateTestValue(scope.row,scope.$index)">
@@ -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>
@@ -185,7 +185,7 @@
                  <el-table-column prop="note" label="检验描述" width="260" >
                    <template slot-scope="scope">
                      <div v-if="!scope.row.children">
                        <el-input :disabled="scope.row.deviceId == null ||  (dataForm.id!=null&&resultVal!=null)" v-model="scope.row.note" placeholder="检验描述"></el-input>
                        <el-input @blur="changeState(scope.row, scope.$index)" :disabled="scope.row.deviceId == null ||  (dataForm.id!=null&&resultVal!=null)" v-model="scope.row.note" placeholder="检验描述"></el-input>
                      </div>
                    </template>
                  </el-table-column>
@@ -200,7 +200,7 @@
                  </el-table-column>
                  <el-table-column fixed="right" style="background-color: white;" v-if="dataForm.id == null" label="操作" width="150">
                    <template slot-scope="scope">
                      <div v-if="scope.row.father!=null">
                      <div v-if="scope.row.fId!=null">
                          <el-button type="text"  @click="addChildren(scope.row)">添加项目</el-button>
                          <el-button type="text" @click="delChildren(scope.row,scope.$index,true)">删除行</el-button>
                      </div>
@@ -211,8 +211,6 @@
            </el-col>
        </el-row>
      </div>
      

      <div class="rawMaterial-result">
        <el-row>
          <el-col :span="24">检验结论</el-col>
@@ -220,7 +218,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 +259,7 @@
</template>

<script>
import { 
import {
  selectDevice,
  addRawInspects,
  getObj,
@@ -330,7 +328,7 @@
        this.$refs.table.doLayout();
      })
    },
    mounted(){
    created(){
      this.dataForm.id = this.$route.query.id
      this.resultVal = this.$route.query.resultVal
      if(this.resultVal == null){
@@ -348,17 +346,8 @@
      },
    },
    methods:{
      changeName(index,row){
        this.projectList.forEach(item=>{
          if(row.name == item.name){
            this.list[index].unit = item.unit
            this.list[index].required = item.required
          }
        })
      },
      // 确认回调
      selectPart(param, nodePart, index) {
        console.log(param)
        if (typeof param !== 'undefined') {
          this.dataForm.code = param.code
          this.dataForm.name = param.name
@@ -382,24 +371,25 @@
        }
        this.showPart = true
      },
      updateDevice(row,index){
        if(this.dataForm.id != null){
          updateDeviceById({deviceId:row.deviceId,rpId:row.rpId}).then(res=>{
            this.list[index].testValue = ''
            this.list[index].testState = null
            this.list[index].testValueList = []
          }).catch(error=>{
            console.log(error)
      updateDevice(row, index) {
          updateDeviceById({ deviceId: row.deviceId, rpId: row.rpId }).then(res => {
            row.testValue = null
            row.testState = null
            row.testValueList = []
            row.note = null
          }).catch(error => {
              console.log(error)
          })
        }
      },
      checkTestState(){
          let resultVal = '1'
          this.list.forEach(item=>{
              if(item.children){
                if(obj.testState == 0){
                    resultVal = '0'
                }
                item.children.forEach(ele=>{
                  if(ele.testState == 0){
                      resultVal = '0'
                  }
                })
              }
          })
          this.resultVal = resultVal
@@ -429,26 +419,29 @@
          number: this.unqualifiedNum,
        }
        updateRawInspectsById(data).then(res => {
          if(res.data.code == 0){
          if(res.data.code == 0 && (res.data.data=='1'|| res.data.data=='0')){
            sessionStorage.setItem("raw-resultVal-"+this.dataForm.id,res.data.data)
            this.$message.success("上报成功");
            this.dialogVisible = false
          }else{
            this.$message.error("上报失败，",res.data.data);
          }
          this.dialogVisible = false
          this.checkTestState()
        });
        this.checkTestState()
      },
      addTeatValueColumn(){
        this.empiricalValueAdd = this.empiricalValueAdd + 1;
      },
      // 添加行
      clickAddLine(row) {
        console.log(row);
        let ele = {
            father: row.father?row.father:null,
            fId: Math.random(),
            father: null,
            iid: Math.random(),
            children:[]
        }
        if(row){
          ele.father = row.father?row.father:null
          row.children.forEach(item => {
              ele.children.push({
                deviceId: null,
@@ -469,10 +462,10 @@
              if (arr.length > this.empiricalValueAdd) {
                  this.empiricalValueAdd = arr.length
              }
            })
            this.list.push(ele)
          })
        }else{
          ele.push({
          ele.children.push({
              deviceId: null,
              deviceName: null,
              iid: Math.random(),
@@ -481,17 +474,17 @@
              name: null,
              unit: null,
              userName: null,
              testValue: null,
              testValue: '',
              testValueList: [],
              note: null,
              testState: null
              testState: ''
            })
          this.list.push(ele)
        }

      },
      delTeatValueColumn(){
        if (this.empiricalValueAdd - 1 === 0) { } else {
        if (this.empiricalValueAdd - 1 > 0) {
          if (this.empiricalValueAddMaxNumber != this.empiricalValueAdd - 1) {
            this.empiricalValueAdd = this.empiricalValueAdd - 1;
            this.list.forEach(i => {
@@ -501,7 +494,6 @@
        }
      },
      updateTestValue(row,index){
        console.log(row);
        if(row.rpId == null){
          return
        }
@@ -548,13 +540,17 @@
                    }
                    ele.iid = Math.random()
                    ele.father = item.rpFather
                    if (item.children != undefined) {
                    item.children.forEach(obj => {
                      let arr= []
                      if(obj.userName){
                        userNameList.push(obj.userName)
                      }
                      let arr= []
                      if(obj.testValue){
                        arr = obj.testValue.split(",")
                      }
                      if (arr.length > this.empiricalValueAdd) {
                          this.empiricalValueAdd = arr.length
                      }
                      let o = {
                        deviceId: obj.deviceId,
@@ -573,8 +569,8 @@
                      ele.children.push(o)
                    })
                    this.list.push(ele)
                }
            })         
                }}
            })
            this.conclusionTable = [{
              code: data.code,
              name: data.name,
@@ -587,6 +583,28 @@
        }else{
          this.conclusionTable = []
        }
      },
      changeState(row, index) {
          if (row.rpId != null && row.rpId != '') {
            let val = row.testValueList.join(",")
            if (val === undefined || val === '' || val === null) {
                return
            }
            let obj = {
              deviceId: row.deviceId,
              rpId: row.rpId,
              testValue: val,
              note: row.note
            }
            updateRawInsProduct(obj).then(res => {
                if (res.data.code == 0) {
                    this.$message.success("更新成功")
                } else {
                    this.$message.error("更新失败")
                }
                this.init()
            })
          }
      },
      // 删除子项目
      delChildren(row,index,isParent) {
@@ -607,7 +625,6 @@
      },
      //添加子项目
      addChildren(row){
        console.log(row);
        let obj = {
          deviceId: null,
          deviceName: null,
@@ -626,6 +643,11 @@
      },
      save(){
        let data = this.dataForm
        this.list.forEach(item=>{
          item.children.forEach(c=>{
            c.testValue=c.testValueList.join(",")
          })
        })
        data.rawInsProducts = this.list
        addRawInspects(data).then(res=>{
            this.$message.success("保存成功")