modified: src/views/quality/finishedProductInspection/index.vue modifie...

zouyu

2023-11-09 07c23ff09a49c2236df798e5dde365e4c616f21a

	modified:   src/views/quality/finishedProductInspection/index.vue
	modified:   src/views/quality/rawMaterial/rawMaterial-form.vue

 src/views/quality/finishedProductInspection/index.vue

@@ -16,7 +16,7 @@
            top="10vh"
            title="打印预览"
            :visible.sync="printDialogVisible"
            width="70%">
            width="65%">
            <div style="width:100%;height: 60vh;overflow-y: scroll;">
                <printTemplate id="printRaw" :formData="printFormData"></printTemplate>
            </div>
@@ -33,7 +33,7 @@
    import ttable from '@/views/common/ztt-table.vue'
    import * as fecha from 'element-ui/lib/utils/date'
    import finishedProductInspectionAdd from './finishedProduct-form'
    import { page,deletePro,exportExaminationProducts } from '@/api/quality/finishedProduct'
    import { page,deletePro,exportExaminationProducts,queryById } from '@/api/quality/finishedProduct'
    import { transform } from '@/util/fileTransform'
    import printTemplate from './finishedProduct-print.vue'
    import PrintJS from 'print-js'
@@ -196,8 +196,8 @@
        },
        created() { },
        methods: {
                    //打印按钮
        printFun() {
            //打印按钮
            printFun() {
            this.printDialogVisible = false;
                PrintJS({
                    printable: "printRaw",
@@ -209,8 +209,13 @@
                    orientation: 'portrait'
                });
            },
            showPrint(){
                this.printDialogVisible = true
            showPrint(row){
                queryById(row.id).then(res=>{
                    console.log(res);
                    this.printDialogVisible = true
                }).catch(error=>{
                    console.log(error);
                })
            },
            exportExcel(){
                console.log("============");

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

@@ -101,13 +101,10 @@
      
      <div class="rawMaterial-detail">
        <el-row style="width:100%;z-index: 10;height:50px;">
            <el-col :span="19">检验项目</el-col>
            <el-col :span="5">
            <el-col :span="18">检验项目</el-col>
            <el-col :span="6">
                <div style="width:100%;text-align: right;">
                    <el-col :span="12"  >
                    <el-button v-if="dataForm.id==null"  icon="el-icon-plus"  type="primary" size="small" @click="increase">添加检验项目</el-button>
                    </el-col>
                    <!-- <el-button v-if="dataForm.id==null" size="small" @click="clickAddLine">添加检验行</el-button> -->
                    <el-button v-if="dataForm.id==null" size="small" @click="clickAddLine()">添加检验项目</el-button>
                    <el-button v-if="resultVal==null || dataForm.id==null" size="small" @click="addTeatValueColumn()">添加检测值列</el-button>
                    <el-button v-if="resultVal==null || dataForm.id==null" size="small" @click="delTeatValueColumn()">删除检测值列</el-button>
                </div>
@@ -130,17 +127,13 @@
                  </el-table-column>
                  <el-table-column prop="father" label="检验项目" width="260">
                    <template slot-scope="scope">
                      <el-input v-if="scope.row.children"  :disabled="dataForm.id != null" v-model="scope.row.father" placeholder="请输入检验项目"></el-input>
                      <el-input v-if="scope.row.children" style="width:120px" :disabled="dataForm.id!=null" v-model="scope.row.father" placeholder="请输入检验项目"></el-input>
                    </template>
                  </el-table-column>
                  <el-table-column prop="name" label="项目" width="260">
                    <template slot-scope="scope">
                    <div v-if="!scope.row.children">
                      <!-- <el-select v-if="projectList.length > 0" :disabled="dataForm.id != null" class="inline-input" v-model="scope.row.name"
                      filterable allow-create placeholder="请输入或选择项目名称" style="width:100%" @change="changeName(scope.$index,scope.row)">
                        <el-option v-for="(item,index) in projectList" :key="index" :label="item.name" :value="item.name"/>
                    </el-select>   -->
                      <el-input class="inline-input" v-model="scope.row.name"
                      <el-input class="inline-input" :disabled="dataForm.id!=null" v-model="scope.row.name"
                        placeholder="请输入项目名称"></el-input>
                  </div>
                      </template>
@@ -161,33 +154,26 @@
                      </div>
                    </template>
                  </el-table-column>
                  <el-table-column prop="testValue" label="检测值" min-width="260" >
                  <el-table-column prop="testValue" label="检测值" min-width="260" v-for="(item,index) in empiricalValueAdd" :key="index">
                    <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-input :disabled="dataForm.id != null"
                         v-model="scope.row.testValueList"
                          placeholder="请输入检测值"></el-input> -->

                        <!-- <el-autocomplete style="width:100%" :disabled="scope.row.deviceId == null ||  (dataForm.id!=null&&resultVal!=null)" class="inline-input" v-model="scope.row.testValueList[index]"
                          :fetch-suggestions="querySearch"  placeholder="请输入检测值"  @select="handleSelect"
                        ></el-autocomplete> -->
                        <el-col v-if="scope.row.itype === '1'">                             
                                            <el-input :disabled="scope.row.deviceId == null ||  (dataForm.id!=null&&resultVal!=null)"
                                                v-model="scope.row.testValueList"
                                                placeholder="请输入检测值"></el-input>                                                                                
                                    </el-col>
                                    <el-col v-else>                                     
                                            <el-select style="width: 100%;" 
                                            :disabled="scope.row.deviceId == null ||  (dataForm.id!=null&&resultVal!=null)"
                                            v-model="scope.row.testValueList"
                                             placeholder="请选择">
                                                <el-option v-for="item in dataVal" :key="item.value" :label="item.label"
                                                    :value="item.value">
                                                </el-option>
                                            </el-select>
                                    </el-col>
                            <el-input :disabled="scope.row.deviceId == '' ||  (dataForm.id!=null&&resultVal!=null)"
                                v-model="scope.row.testValueList[index]"
                                placeholder="请输入检测值"></el-input>                                                                                
                        </el-col>
                          <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="请选择">
                                  <el-option v-for="item in dataVal" :key="item.value" :label="item.label"
                                      :value="item.value">
                                  </el-option>
                              </el-select>
                          </el-col>
                        </el-tooltip>
                      </div>
                    </template>
@@ -195,7 +181,7 @@
                  <el-table-column prop="deviceName" label="试验设备" min-width="260">
                    <template slot-scope="scope">
                      <div v-if="!scope.row.children">
                        <el-select :disabled="resultVal!=null && dataForm.id!=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" 
                            :key="index" :value="item.id" :label="item.code +'-'+ item.name"></el-option>
@@ -382,13 +368,9 @@
      
    },
    methods:{
      increase(){

      },
      querySearch(queryString, cb) {
        var restaurants = this.restaurants;
        var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;

        cb(results);
      },
      // createFilter(queryString) {
@@ -428,28 +410,9 @@
          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(item => {
          //               item.iid = Math.random()
          //               if (item.children != undefined) {
          //                   item.children.forEach(obj => {
          //                       let arr = []
          //                       if (obj.userName) {
          //                         userNameList.push(obj.userName)
          //                       }
          //                       if (obj.inspectionValue) {
          //                           arr = obj.inspectionValue.split(",")
          //                       }
          //                       obj.empiricalValueAddss = arr
          //                       if (arr.length > this.empiricalValueAdd) {
          //                           this.empiricalValueAdd = arr.length
          //                       }
          //                   })
          //               }
          //           })
          //           this.list.push( param.rawInsProducts)
            item.iid = Math.random()
            console.log(item);
          })
          param.rawInsProducts.forEach(o=>{
            this.clickAddLine(o)
          })
@@ -463,6 +426,8 @@
        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 = ''
@@ -485,6 +450,9 @@
          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 => {
@@ -517,52 +485,49 @@
      },
      // 添加行
      clickAddLine(row) {
        console.log(row);
        // console.log(row.children[0]);
        // this.componentData = row;
  
        let obj = {
          father:null,
          // componentData.deviceId: null,
          // name: "",
          // required: "",
          // testValue: "",
          // unit: "",
          // testState: null,
          children:[],
          testValueList: [],
        };
        let userNameList = []
        row.children.forEach(item => {
                        item.iid = Math.random()
                        if (item.children != undefined) {
                            item.children.forEach(obj => {
                                let arr = []
                                if (obj.userName) {
                                  userNameList.push(obj.userName)
                                }
                                if (obj.inspectionValue) {
                                    arr = obj.inspectionValue.split(",")
                                }
                                obj.empiricalValueAddss = arr
                                if (arr.length > this.empiricalValueAdd) {
                                    this.empiricalValueAdd = arr.length
                                }
                            })
                        }
                    })
                  
                  console.log(this.list);
        if(row){
          let userNameList = []
          row.children.forEach(item => {
            console.log("item--",item);
              item.iid = Math.random()
              let arr = []
              item.testValue = ''
              item.testValueList= []
              if (item.userName) {
                userNameList.push(item.userName)
              }
              if (item.inspectionValue) {
                  arr = item.inspectionValue.split(",")
              }
              item.empiricalValueAddss = arr
              if (arr.length > this.empiricalValueAdd) {
                  this.empiricalValueAdd = arr.length
              }
            console.log("aaaa----",row);
            this.list.push(row)
          })
        }else{
          let ele = {
            father: '',
            iid: Math.random(),
            children:[{
              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.push(ele)
        }

                    // this.list = row.children
        this.list.push(row)
        // console.log(this.list);
        // if(row!=undef.list){
        //   obj.name = row.children.name
        //   obj.unit = row.children.unit
        //   obj.required = row.children.required
        // }
        // this.list.push(obj)
      },
      delTeatValueColumn(){
        if (this.empiricalValueAdd - 1 === 0) { } else {
@@ -597,7 +562,6 @@
      init(){
        if(this.dataForm.id){
          getObj(this.dataForm.id).then(res=>{

            console.log(res);
            let data = res.data.data
            this.dataForm.name = data.name
@@ -612,80 +576,46 @@
            this.dataForm.createUser = data.createUser
            let userNameList = []
            this.list = []
            // data.children.forEach(item=>{
            //   userNameList.push(item.userName)
            //   let arr = []
            //   if(item.testValue != undefined ){
            //     arr = item.testValue.split(",")
            //     if(arr.length > this.empiricalValueAdd){
            //       this.empiricalValueAdd = arr.length
            //     }
            //   }
            //   this.userdata = item.children[0];
            //   console.log(this.userdata);
            //   this.list.push({
            //     father: item.rpFather,
            //     note: this.userdata.note,
            //     deviceId: this.userdata.deviceId,
            //     deviceName: this.userdata.deviceName,
            //     name: this.userdata.rpName,
            //     required: this.userdata.required,
            //     testValue: this.userdata.testValue,
            //     unit: this.userdata.rpUnit,
            //     testState: this.userdata.testState,
            //     rpId: this.userdata.rpId,
            //     testValueList: arr
            //   })
            // })
            console.log("=======================");
            console.log(data.children);
            // data.children.forEach(item => {
            //             item.iid = Math.random()
            //             if (item.children != undefined) {
            //                 item.children.forEach(obj => {
            //                   console.log(obj);
            //                   obj.ild = Math.random()
            //                     // let arr = []
            //                     // if (obj.userName) {
            //                     //   userNameList.push(obj.userName)
            //                     // }
            //                     // if (obj.inspectionValue) {
            //                     //     arr = obj.inspectionValue.split(",")
            //                     // }
            //                     // obj.empiricalValueAddss = arr
            //                     // if (arr.length > this.empiricalValueAdd) {
            //                     //     this.empiricalValueAdd = arr.length
            //                     // }
            //                 })
            //             }
            //           })
                      console.log(data.children);
            //             this.userdata = data.children      
                                        
            //             this.list.push({
            //               father: item.rpFather,
            //               note: this.userdata.note,
            //               deviceId: this.userdata.deviceId,
            //               deviceName: this.userdata.deviceName,
            //               name: this.userdata.rpName,
            //               required: this.userdata.required,
            //               testValue: this.userdata.testValue,
            //               unit: this.userdata.rpUnit,
            //               testState: this.userdata.testState,
            //               rpId: this.userdata.rpId,
            //               testValueList: arr
            //             })
            //         })
                    // console.log(this.list);
                    // this.userdata = data.children           
                        this.list.push(data.children )
                    console.log( this.list);
                    this.conclusionTable = [{
                      code: data.code,
                      name: data.name,
                      userName: Array.from(new Set(userNameList)).join(','),
                      testState: this.resultVal==null?null:this.resultVal
                    }]
            data.children.forEach(item => {
              if (item.children) {
                    let ele = {
                      iid: null,
                      father: null,
                      children: []
                    }
                    ele.iid = Math.random()
                    ele.father = item.rpFather
                    item.children.forEach(obj => {
                      console.log(obj);
                      let arr= []
                      if(obj.testValue){
                        arr = obj.testValue.split(",")
                      }
                      let o = {
                        deviceId: obj.deviceId,
                        deviceName: obj.deviceName,
                        iid: Math.random(),
                        required: obj.required,
                        rpId: obj.rpId,
                        name: obj.rpName,
                        unit: obj.rpUnit,
                        userName: obj.userName,
                        testValue: obj.testValue?obj.testValue:'',
                        testValueList: arr,
                        note: obj.note?obj.note:'',
                        testState: obj.testState
                      }
                      ele.children.push(o)
                    })
                    this.list.push(ele)
                }
            })         
            this.conclusionTable = [{
              code: data.code,
              name: data.name,
              userName: Array.from(new Set(userNameList)).join(','),
              testState: this.resultVal==null?null:this.resultVal
            }]
          }).catch(error=>{
            this.$message.error("获取失败",error)
          })
@@ -695,7 +625,6 @@
      },
       // 删除行
       clickDeleteline(scope) {
        // console.log(55555);
        console.log(scope);
        let index = this.list.findIndex(el =>{
          return el.children.find(ele => ele.iid == scope.row.iid)
@@ -712,21 +641,6 @@
        if(childrenIndex == 0){
          this.list.splice(scope.row,1)
        }
      },
      increase(){
        let obj = {
          iid:Math.random(),
          father:'',
          children:[
            {
              iid:Math.random(),
              name:'',
              required:'',
              unit:''
            }
          ]
        }
        this.list.push(obj)
      },
      addwaydata(row){
        console.log(row.row);