modified: src/views/quality/finishedProductInspection/finishedProduct-fo...

zouyu

2023-11-09 a8fb5d596d0fef7421c3946ad331588b84a390cd

	modified:   src/views/quality/finishedProductInspection/finishedProduct-form.vue
	modified:   src/views/quality/rawMaterial/rawMaterial-form.vue
	modified:   vue.config.js

 src/views/quality/finishedProductInspection/finishedProduct-form.vue

@@ -75,13 +75,8 @@
                </div>
            </el-form>
        </div>


    

        <div class="finishedProduct-detail" v-if="resultVal!=null && processInspectVo.id!=null" >
        <div class="finishedProduct-detail">
            <el-row style="width:100%;z-index: 10;height:30px;">
                <el-col :span="12" class="inspectionProject_span" @click="increase">添加</el-col>
                <el-col :span="12" class="inspectionProject_span">检验项目</el-col>
                <el-col v-if="resultVal==null" :span="12" class="inspectionProject_span" style="text-align: right;">
                    <el-button size="mini" @click="clickAddInspectionColumn()">添加检测值列</el-button>
@@ -182,40 +177,6 @@
                </el-col>
            </el-row>
        </div>
        <div v-else>

        </div>































        <div class="finishedProduct-result">
            <el-row style="width:100%">
                <el-col :span="24">检测结果</el-col>

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

@@ -127,7 +127,7 @@
                  </el-table-column>
                  <el-table-column prop="father" label="检验项目" width="260">
                    <template slot-scope="scope">
                      <el-input v-if="scope.row.children" style="width:120px" :disabled="dataForm.id!=null" v-model="scope.row.father" placeholder="请输入检验项目"></el-input>
                      <el-input v-if="scope.row.children" style="width:90%" :disabled="dataForm.id!=null" v-model="scope.row.father" placeholder="请输入检验项目"></el-input>
                    </template>
                  </el-table-column>
                  <el-table-column prop="name" label="项目" width="260">
@@ -167,8 +167,7 @@
                          <el-col v-else>                                     
                              <el-select style="width: 100%;" 
                              :disabled="scope.row.deviceId == null ||  (dataForm.id!=null&&resultVal!=null)"
                              v-model="scope.row.testValueList[index]" @change="aaa(scope.row)"
                                placeholder="请选择">
                              v-model="scope.row.testValueList[index]" placeholder="请选择">
                                  <el-option v-for="item in dataVal" :key="item.value" :label="item.label"
                                      :value="item.value">
                                  </el-option>
@@ -198,16 +197,18 @@
                  </el-table-column>
                  <el-table-column fixed="right" v-if="dataForm.id != null" prop="testState" label="结论" min-width="150">
                    <template slot-scope="scope">
                      <span v-if="scope.row.testState == 0" style="color:#F56C6C">不合格</span>
                      <span v-else-if="scope.row.testState == 1" style="color:#67C23A">合格</span>
                      <span v-else>暂无结论</span>
                      <div v-if="!scope.row.children">
                        <span v-if="scope.row.testState == 0" style="color:#F56C6C">不合格</span>
                        <span v-else-if="scope.row.testState == 1" style="color:#67C23A">合格</span>
                        <span v-else>暂无结论</span>
                      </div>
                    </template>
                  </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.children">
                          <el-button type="text"  @click="addwaydata(scope)">新增</el-button>
                          <el-button type="text" @click="clickDeleteline(scope)">取消</el-button>
                      <div>
                          <el-button v-if="scope.row.father!=null" type="text"  @click="addChildren(scope.row)">添加项目</el-button>
                          <el-button v-else type="text" @click="delChildren(scope,scope.$index)">取消</el-button>
                      </div>
                    </template>
                  </el-table-column>
@@ -337,7 +338,6 @@
            dataRule: {},
            deviceList: [],
            restaurants:[],
            whetherNot:'',
        }
    },
    beforeUpdate(){
@@ -355,9 +355,6 @@
      this.init()
      this.getDeviceList()
      this.restaurants = this.loadAll();
      
      console.log(this.dataForm);

    },
    watch:{
      dialogVisible(newVal){
@@ -365,7 +362,6 @@
          this.unqualifiedNum = null
        }
      },
      
    },
    methods:{
      querySearch(queryString, cb) {
@@ -408,11 +404,6 @@
          this.dataForm.message = param.message
          this.dataForm.projectName = param.projectName
          this.projectList = param.rawInsProducts == null ? [] : param.rawInsProducts
          console.log(param.rawInsProducts);
          param.rawInsProducts.forEach(item =>{
            item.iid = Math.random()
            console.log(item);
          })
          param.rawInsProducts.forEach(o=>{
            this.clickAddLine(o)
          })
@@ -426,8 +417,6 @@
        this.showPart = true
      },
      updateDevice(row,index){
        console.log(row);
        return
        if(this.dataForm.id != null){
          updateDeviceById({deviceId:row.deviceId,rpId:row.rpId}).then(res=>{
            this.list[index].testValue = ''
@@ -450,9 +439,6 @@
          this.resultVal = resultVal
          this.conclusionTable[0].testState = resultVal
          sessionStorage.setItem("raw-resultVal-"+this.dataForm.id,resultVal)
      },
      aaa(row){
        console.log(row);
      },
      showDialog(){
        let pro = this.list.filter(item => {
@@ -488,7 +474,6 @@
        if(row){
          let userNameList = []
          row.children.forEach(item => {
            console.log("item--",item);
              item.iid = Math.random()
              let arr = []
              item.testValue = ''
@@ -503,7 +488,6 @@
              if (arr.length > this.empiricalValueAdd) {
                  this.empiricalValueAdd = arr.length
              }
            console.log("aaaa----",row);
            this.list.push(row)
          })
        }else{
@@ -623,38 +607,29 @@
          this.conclusionTable = []
        }
      },
       // 删除行
       clickDeleteline(scope) {
        console.log(scope);
        let index = this.list.findIndex(el =>{
          return el.children.find(ele => ele.iid == scope.row.iid)
        })

        let childrenIndex = this.list[index].children.findIndex(el => {
          return el.iid == scope.row.iid
        })
        // console.log(this.list);
        console.log(index); 
        console.log(childrenIndex);
      
        this.list[index].children.splice(childrenIndex , 1);
        if(childrenIndex == 0){
          this.list.splice(scope.row,1)
        }
       // 删除子项目
       delChildren(scope,index) {
        console.log(scope,index);
        
      },
      addwaydata(row){
        console.log(row.row);
       let index = this.list.findIndex(el =>{
          return el.children.find(ele => ele.iid == row.row.iid)
        })
        console.log(index);
      //添加子项目
      addChildren(row){
        console.log(row);
        let obj = {
          iid:Math.random(),
          name:'',
          required:'',
          unit:''
          deviceId: null,
          deviceName: null,
          iid: Math.random(),
          required: null,
          rpId: null,
          name: null,
          unit: null,
          userName: null,
          testValue: null,
          testValueList: [],
          note: null,
          testState: null
        }
        this.list[index].children.push(obj)
        row.children.push(obj)
      },
      save(){
        console.log(this.dataForm);
@@ -662,20 +637,12 @@
        console.log(data);
        console.log(this.list);
        data.rawInsProducts = this.list
        // console.log(data.rawInsProducts);
        // data.rawInsProducts.forEach(item=>{
        //   console.log(item);
        //   let val = item.testValueList.join(",")
        //   item.testValue = val
        //   console.log(item.testValue);
        // })
        // console.log(data);
        console.log('=====>');
        addRawInspects(data).then(res=>{
            // this.$message.success("保存成功")
            this.$message.success("保存成功")
            this.$router.go(-1)
        }).catch(error=>{
          // this.$message.error(error||'error')
          this.$message.error(error)
        })
      },
      getDeviceList(){

 vue.config.js

@@ -2,8 +2,8 @@
 * 配置参考:
 * https://cli.vuejs.org/zh/config/
 */
// const url = 'http://192.168.0.23:9999'
const url = 'http://192.168.0.51:9999'
const url = 'http://192.168.0.23:9999'
// const url = 'http://192.168.0.51:9999'
// const url = 'http://ztt-gateway:9999'
const localUrl = 'http://localhost:8089'
//const localUrl = 'http://10.88.15.95:8089'