Merge remote-tracking branch 'origin/master'

zss

2024-01-11 17f0e644be8c98b547f6994a7e827d328e7b532e

 src/views/quality/packageinspect/packageInspect-form.vue

@@ -63,13 +63,19 @@
        </el-form>
      </div>
      <div class="packageInspect-detail">
        <el-row :gutter="10" style="width:100%;z-index: 10;height:50px;">
            <el-col :sm="18" :lg="20">检验项目</el-col>
            <el-col :sm="3" :lg="2" >
              <el-button v-if="resultVal=='' || resultVal==null" size="small" @click="clickAddLine()">添加检验项目</el-button>
            </el-col>
            <el-col :sm="3" :lg="2">
              <el-button v-if="resultVal=='' || resultVal==null" style="width:100%" type="primary"  size="small"
        <el-row :gutter="10" style="width:100%;z-index: 10;height:30px;">
            <el-col :span="12">检验项目</el-col>
            <el-col :span="12" style="text-align: right;">
                <el-dropdown @command="handleCommand" v-if="!isShow && resultVal==null">
                    <el-button size="mini" style="margin-right: 10px;" type="primary" >
                        切换检验项模板<i class="el-icon-arrow-down el-icon--right"></i>
                    </el-button>
                    <el-dropdown-menu slot="dropdown">
                        <el-dropdown-item :key="index" v-for="(item,index) in inspectMoulds" :command="item.father">{{item.father}}</el-dropdown-item>
                    </el-dropdown-menu>
                </el-dropdown>
              <el-button v-if="resultVal=='' || resultVal==null" size="mini" @click="clickAddLine()">添加检验项目</el-button>
              <el-button v-if="resultVal=='' || resultVal==null" type="primary" size="mini"
              @click="savePackIns()">保存</el-button>
            </el-col>
        </el-row>
@@ -90,19 +96,22 @@
                  </el-table-column>
                  <el-table-column prop="name" label="项目" width="160">
                    <template slot-scope="scope">
                        <el-input :readonly="resultVal!=null" v-if="scope.row.children" class="inline-input" style="width:80%;" v-model="scope.row.name"
                        <el-input :readonly="resultVal!=null || !scope.row.isEdit" v-if="scope.row.children" class="inline-input" style="width:80%;" v-model="scope.row.name"
                          placeholder="请输入项目名称"></el-input>
                    </template>
                  </el-table-column>
                  <el-table-column prop="required" label="要求" width="160" show-overflow-tooltip>
                  <el-table-column prop="required" label="要求" width="160">
                    <template slot-scope="scope">
                      <div v-if="!scope.row.children">
                      <el-input :readonly="resultVal!=null" v-model="scope.row.required"
                        placeholder="请输入要求"></el-input>
                        <el-tooltip :content="scope.row.required">
                            <el-input :readonly="resultVal!=null || !scope.row.isEdit"
                            v-model="scope.row.required"
                              placeholder="请输入要求"></el-input>
                        </el-tooltip>
                      </div>
                    </template>
                  </el-table-column>
                  <el-table-column prop="note" label="检验描述" width="160" show-overflow-tooltip>
                  <el-table-column prop="note" label="检验描述" width="160">
                    <template slot-scope="scope">
                      <div v-if="!scope.row.children">
                        <el-input :readonly="resultVal!=null" v-model="scope.row.note" placeholder="检验描述"></el-input>
@@ -114,15 +123,16 @@
                        <el-select style="width:100%" :disabled="resultVal!=null" @change="changeResult" v-model="scope.row.result" v-if="!scope.row.children">
                            <el-option label="合格" value="合格"></el-option>
                            <el-option label="不合格" value="不合格"></el-option>
                            <el-option label="不适用" value="不适用"></el-option>
                        </el-select>
                    </template>
                  </el-table-column>
                  <el-table-column v-if="resultVal=='' || resultVal==null" fixed="right" style="background-color: white;" label="操作" width="200">
                    <template slot-scope="scope">
                      <el-button v-if="scope.row.children" icon="el-icon-circle-plus-outline" type="text" @click="clickAddChildren(scope.row,scope.$index)">添加行</el-button>
                      <el-button v-if="!scope.row.children" icon="el-icon-circle-close" type="text" 
                      <el-button v-if="scope.row.children && scope.row.isEdit" icon="el-icon-circle-plus-outline" type="text" @click="clickAddChildren(scope.row,scope.$index)">添加行</el-button>
                      <el-button v-if="!scope.row.children && scope.row.isEdit" icon="el-icon-circle-close" type="text"
                      @click="clickDelLine(scope.row,scope.$index,scope.row.children!=null)">取消</el-button>
                      <el-button v-if="scope.row.children" icon="el-icon-circle-close" type="text"
                      <el-button v-if="scope.row.children && scope.row.isEdit" icon="el-icon-circle-close" type="text"
                      @click="clickDelLine(scope.row,scope.$index,scope.row.children!=null)">删除项目</el-button>

                    </template>
@@ -184,12 +194,17 @@
  updatePackageInspectById,
  getCustomer,
} from '@/api/quality/packageInspect'
import {getAllTemplateByEnable} from '@/api/quality/packageInspectTemp'
import {inspect1,inspect2} from '@/const/defaultPackageInspect'
export default {
    computed:{},
    computed:{
    },
    components:{
    },
    data(){
        return{
            inspectMoulds: [],
            isShow: false,
            submitData: {
              id:null,
              result: null,
@@ -240,7 +255,10 @@
          this.resultVal=val
        }
      }
      this.getAllInspect()
      this.init()
      this.checkShowState()

    },
    watch:{
      dialogVisible(newVal){
@@ -250,6 +268,35 @@
      }
    },
    methods:{
      checkShowState(){
        let num = 0
        this.list.forEach(ele=>{
            if(ele.children){
                ele.children.forEach(c=>{
                    if(c.pid){
                        num++
                    }
                })
            }
        })
        this.isShow = num==0
      },
      getAllInspect(){
        getAllTemplateByEnable().then(res=>{
            if(res.status===200){
                this.inspectMoulds = res.data.data
            }
        }).catch(error=>{
            console.error(error)
        })
      },
      handleCommand(command) {
        this.inspectMoulds.forEach(ele=>{
            if(ele.father==command){
                this.init(ele.children)
            }
        })
      },
      changeResult(){
        let result = ''
        let data = this.list
@@ -322,12 +369,14 @@
          this.list.push({
            name: '',
            randomId: Math.random(),
            isEdit: true,
            children: [{
              name: '',
              note: '',
              required: '',
              result: '',
              randomId: Math.random(),
              isEdit: true,
            }]
          })
      },
@@ -339,6 +388,7 @@
            required: '',
            result: '',
            randomId: Math.random(),
            isEdit: true,
        })
      },
      // 删除行
@@ -392,22 +442,47 @@
          })
        }
      },
      init(){
        if(this.dataForm.id){
          fetchListById(this.dataForm.id).then(res=>{
      init(dataList){
        const _than = this
        if(_than.dataForm.id){
          fetchListById(_than.dataForm.id).then(res=>{
            let data = res.data.data
            this.dataForm.packInsNo = data.packInsNo
            this.dataForm.packageNo = data.packageNo
            this.dataForm.contractNo = data.contractNo
            this.dataForm.customerName = data.customerName
            this.dataForm.projectName = data.projectName
            this.dataForm.createTime = data.createTime
            this.dataForm.createUser = data.createUser
            this.list = []
            _than.dataForm.packInsNo = data.packInsNo
            _than.dataForm.packageNo = data.packageNo
            _than.dataForm.contractNo = data.contractNo
            _than.dataForm.customerName = data.customerName
            _than.dataForm.projectName = data.projectName
            _than.dataForm.createTime = data.createTime
            _than.dataForm.createUser = data.createUser
            _than.list = []
            let userNameList = []
            if(dataList){
                let tempList = []
                dataList.forEach(ele=>{
                    let obj = {
                        randomId: Math.random(),
                        name: ele.inspectName,
                        children: []
                    }
                    if(ele.children){
                        ele.children.forEach(e=>{
                            obj.children.push({
                                required: e.inspectRequired,
                                randomId: Math.random(),
                                isEdit: false,
                                note: '',
                                result: ''
                            })
                        })
                    }
                    tempList.push(obj)
                })
                _than.list = tempList
            }
            data.packageInsProductS.forEach(item => {
              if (item.children) {
                    let ele = {
                      isEdit: true,
                      randomId: Math.random(),
                      name: null,
                      children: []
@@ -420,6 +495,7 @@
                      let o = {
                        name: item.name,
                        randomId: Math.random(),
                        isEdit: true,
                        required: obj.required,
                        pid: obj.pid,
                        note: obj.note?obj.note:'',
@@ -427,24 +503,27 @@
                      }
                      ele.children.push(o)
                    })
                    this.list.push(ele)
                    _than.list.push(ele)
                }
              })
              this.conclusionTable = [{
            //   let find1 = this.list.find(ele=>ele.name===inspect1[0].name&&ele.isEdit) !=undefined;
            //   let find2 = this.list.find(ele=>ele.name===inspect2[0].name&&ele.isEdit) !=undefined;
            //   this.isShow = find1||find2
              _than.conclusionTable = [{
                packageNo: data.packageNo,
                userName: Array.from(new Set(userNameList)).join(','),
                result: null
              }]
              this.$nextTick(()=>{
                if(this.list.length>0){
                  this.changeResult()
              _than.$nextTick(()=>{
                if(_than.list.length>0){
                    _than.changeResult()
                }
              })
          }).catch(error=>{
            this.$message.error("获取失败",error)
            _than.$message.error("获取失败",error)
          })
        }else{
          this.conclusionTable = []
            _than.conclusionTable = []
        }
      },
    },