modified: src/views/product/workbench/feed-form.vue modified: src/vie...

zouyu

2023-12-04 e66d566722ec3e65cb93e36bc71b3926e6a318fc

	modified:   src/views/product/workbench/feed-form.vue
	modified:   src/views/product/workbench/feed-pane.vue
	modified:   src/views/quality/Packaging_ledger/index.vue
	modified:   src/views/quality/packageinspect/index.vue
	modified:   src/views/quality/packageinspect/packageInspect-form.vue

 src/views/product/workbench/feed-form.vue

@@ -1,6 +1,7 @@
<template>
  <el-dialog
    width="40%"
    width="60%"
    top="5vh"
    title="投料"
    :visible.sync="innerVisible"
    append-to-body
@@ -15,17 +16,20 @@
          :key="tableKey"
          :data="dataList"
          border
          style="width: 100%;"
          height="400"
          style="width: 100%;overflow-y: scroll;"
          @cell-dblclick="dblhandleCurrentChange"
          show-summary
          :span-method="objectSpanMethod"
          :summary-method="getSummaries"
        >
          <el-table-column header-align="center" align="center" type="index" label="序号"></el-table-column>
          <el-table-column
            prop="partNo"
            header-align="center"
            align="center"
            label="零件编号"
            show-overflow-tooltip
          >
          </el-table-column>
          <el-table-column
@@ -33,6 +37,7 @@
            header-align="center"
            align="center"
            label="零件"
            show-overflow-tooltip
          >
          </el-table-column>
          <el-table-column
@@ -40,6 +45,7 @@
            header-align="center"
            align="center"
            label="批号"
            show-overflow-tooltip
          >
          </el-table-column>
          <!-- <el-table-column
@@ -72,7 +78,13 @@
            header-align="center"
            align="center"
            label="单位"
            show-overflow-tooltip
          >
          </el-table-column>
          <el-table-column prop="menu" label="操作"  header-align="center" align="center">
            <template scope="scope">
              <el-button type="text" icon="el-icon-circle-close" @click="cancelFeed(scope.$index,scope.row)">取消</el-button>
            </template>
          </el-table-column>
        </el-table>
      </div>
@@ -142,6 +154,12 @@
      password: null
    }
  },
  beforeUpdate(){
    this.$nextTick(()=>{
      this.objectSpanMethod()
      this.$refs.table.doLayout()
    })
  },
  directives: {
    focus: {
      inserted: function(el, option) {
@@ -162,6 +180,10 @@
    }
  },
  methods: {
    //投入取消按钮
    cancelFeed(index,row){
      this.dataList.splice(index,1)
    },
    confirmData() {
      if (this.password != null) {
        checkSubmitPassword({ password: this.password }).then((response) => {
@@ -286,16 +308,16 @@
      return reg.test(value)
    },
    objectSpanMethod() {
      setTimeout(() => {
      this.$nextTick(()=>{
        if (this.$refs.table.$el) {
          const current = this.$refs.table.$el
            .querySelector('.el-table__footer-wrapper')
            .querySelector('.el-table__footer')
          const cell = current.rows[0].cells
          // cell[1].style.display = 'none'
          cell[0].colSpan = '4'
          cell[0].colSpan = '6'
        }
      }, 50)
      })
    },
    getSummaries(param) {
      const { columns, data } = param
@@ -325,12 +347,19 @@
  },
  watch: {
    currshowlist() {
      this.innerVisible = this.currshowlist
      this.password = null
      if (this.currshowlist) {
        this.$nextTick(() => {})
      const _than = this
      _than.innerVisible = _than.currshowlist
      _than.password = null
      if (!_than.currshowlist) {
        _than.$nextTick(() => {
        })
      }
    }
    },
  },
  created(){
    this.$nextTick(()=>{
      this.objectSpanMethod()
    })
  },
  mounted() {}
}

 src/views/product/workbench/feed-pane.vue

@@ -2200,6 +2200,14 @@
    }
  },
  watch: {
    showFeedForm:{
      handler(newVal,oldVal){
        if(!newVal){
          this.$refs.stockTable.toggleAllSelection(false)
        }
      },
      deep: true
    },
    workstationId() {
      this.$nextTick(() => {
        if (this.currItem != null && this.currItem === 'feed') {

 src/views/quality/Packaging_ledger/index.vue

@@ -241,7 +241,7 @@
                operator: [
                    {
                      text: '检验',
                      icon: 'el-icon-delete',
                      icon: 'el-icon-position',
                      type: 'text',
                      size: 'small',
                      fun: this.check

 src/views/quality/packageinspect/index.vue

@@ -204,7 +204,7 @@
                query: { 
                    id: row == null ? null : row.id
                 },
                 params:{resultVal : row == null ? null : row.result}
                 params:{resultVal : row.result=='' ? null : row.result}
            })
        },
        formatResult(row, column, cellValue){

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

@@ -3,7 +3,8 @@
    <div class="page-header">
      <div class="header-left">
        <a @click="$router.go(-1)"><i class="icon-btn-back"></i></a>
        <h2>编辑-包装检验</h2>
        <h2 v-if="resultVal=='' || resultVal==null">编辑-包装检验</h2>
        <h2 v-else>查看-包装检验</h2>
      </div>
      <div class="btn-group header-right">
      </div>
@@ -65,10 +66,10 @@
        <el-row :gutter="10" style="width:100%;z-index: 10;height:50px;">
            <el-col :span="20">检验项目</el-col>
            <el-col :span="2">
              <el-button v-if="resultVal==''" style="width:100%" size="small" @click="clickAddLine()">添加检验项目</el-button>
              <el-button v-if="resultVal=='' || resultVal==null" style="width:100%" size="small" @click="clickAddLine()">添加检验项目</el-button>
            </el-col>
            <el-col :span="2">
              <el-button v-if="resultVal==''" style="width:100%" type="primary"  size="small"
              <el-button v-if="resultVal=='' || resultVal==null" style="width:100%" type="primary"  size="small"
              @click="savePackIns()">保存</el-button>
            </el-col>
        </el-row>
@@ -89,14 +90,14 @@
                  </el-table-column>
                  <el-table-column prop="name" label="项目" width="260">
                    <template slot-scope="scope">
                        <el-input :readonly="resultVal!=''" v-if="scope.row.children" class="inline-input" style="width:90%;" v-model="scope.row.name"
                        <el-input :readonly="resultVal!=null" v-if="scope.row.children" class="inline-input" style="width:90%;" v-model="scope.row.name"
                          placeholder="请输入项目名称"></el-input>
                    </template>
                  </el-table-column>
                  <el-table-column prop="required" label="要求" width="260">
                    <template slot-scope="scope">
                      <div v-if="!scope.row.children">
                      <el-input :readonly="resultVal!=''" v-model="scope.row.required"
                      <el-input :readonly="resultVal!=null" v-model="scope.row.required"
                        placeholder="请输入要求"></el-input>
                      </div>
                    </template>
@@ -104,19 +105,19 @@
                  <el-table-column prop="note" label="检验描述" width="260" >
                    <template slot-scope="scope">
                      <div v-if="!scope.row.children">
                        <el-input :readonly="resultVal!=''" v-model="scope.row.note" placeholder="检验描述"></el-input>
                        <el-input :readonly="resultVal!=null" v-model="scope.row.note" placeholder="检验描述"></el-input>
                      </div>
                    </template>
                  </el-table-column>
                  <el-table-column prop="testState" label="结论" min-width="150">
                    <template slot-scope="scope">
                        <el-select :disabled="resultVal!=''" @change="changeResult" v-model="scope.row.result" v-if="!scope.row.children">
                        <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-select>
                    </template>
                  </el-table-column>
                  <el-table-column v-if="resultVal==''" fixed="right" style="background-color: white;" label="操作" width="200">
                  <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" 
@@ -143,7 +144,7 @@
                <el-table-column prop="userName" label="检验员"></el-table-column>
                <el-table-column prop="result" label="检验结论">
                  <template slot-scope="scope">
                    <el-select :disabled="resultVal!=''" style="width:100%" v-model="scope.row.result">
                    <el-select :disabled="resultVal!=null" style="width:100%" v-model="scope.row.result">
                        <el-option label="合格" value="合格"></el-option>
                        <el-option label="不合格" value="不合格"></el-option>
                    </el-select>
@@ -151,7 +152,7 @@
                </el-table-column>
                <el-table-column  label="操作">
                    <template>
                        <el-button type="text" :disabled="resultVal!=''" @click="submitSave()" size="small">上报</el-button>
                        <el-button type="text" :disabled="resultVal!=null" @click="submitSave()" size="small">上报</el-button>
                    </template>
                </el-table-column>
            </el-table>
@@ -221,15 +222,13 @@
      this.init()
    },
    watch:{
      list(){
        this.changeResult()
      }
    },
    methods:{
      changeResult(){
        let result = '合格'
        let result = ''
        let data = this.list
        if(data){
          result='合格'
          data.forEach(item=>{
            if(item.children){
              item.children.forEach(ele=>{
@@ -244,26 +243,39 @@
      },
      //上报
      submitSave(){
        let data = {
          id: this.dataForm.id,
          result: this.conclusionTable[0].result,
        const _than = this
        this.$confirm('上报前，请确认检验项目是否已保存!', '提示', {
          confirmButtonText: '确认上报',
          cancelButtonText: '取消',
          type: 'warning'
        }).then(() => {
          let data = {
          id: _than.dataForm.id,
          result: _than.conclusionTable[0].result,
        }
        updatePackageInspectById(data).then(res => {
          if(res.data.code === 0){
            this.resultVal = res.data.data
            sessionStorage.setItem("packIns-resultVal-"+this.dataForm.id,res.data.data)
            this.$message.success("上报成功");
            _than.resultVal = res.data.data
            sessionStorage.setItem("packIns-resultVal-"+_than.dataForm.id,res.data.data)
            _than.$message.success("上报成功");
          }else{
            this.$message.error("上报失败",res.data.data);
            _than.$message.error("上报失败",res.data.data);
          }
        });
        })
        }).catch(() => {})
      },
      // 添加行
      clickAddLine(row) {
      clickAddLine() {
          this.list.push({
            name: '',
            randomId: Math.random(),
            children: []
            children: [{
              name: '',
              note: '',
              required: '',
              result: '',
              randomId: Math.random(),
            }]
          })
      },
      //添加子级
@@ -368,6 +380,11 @@
                userName: Array.from(new Set(userNameList)).join(','),
                result: null
              }]
              this.$nextTick(()=>{
                if(this.list.length>0){
                  this.changeResult()
                }
              })
          }).catch(error=>{
            this.$message.error("获取失败",error)
          })