Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before

王震

2023-12-04 8afbe0b83915dc417cea62221782e7ce15c00c78

 src/views/quality/Packaging_ledger/index.vue

@@ -41,6 +41,7 @@
                    </el-col>
                    <el-col :span="2">
                    <el-button
                        v-if="!isCheck"
                        style="float: right; padding: 3px 0"
                        type="text"
                        @click="relateOperationParam()"
@@ -118,8 +119,7 @@
        <!-- 新增 -->
        <packfrom
        :currshowlist.sync="addOrUpdateVisible"
        @way = "wayRenovate"
        >
        @refreshDataList="getData">
        </packfrom>
        <packfromadd
        :currshowlist.sync="increase"
@@ -139,6 +139,7 @@
export default {
    data(){
        return {
          isCheck: false,
          dataway:{},
          goid:'',
          testStandardParams: [],
@@ -240,7 +241,7 @@
                operator: [
                    {
                      text: '检验',
                      icon: 'el-icon-delete',
                      icon: 'el-icon-position',
                      type: 'text',
                      size: 'small',
                      fun: this.check
@@ -289,6 +290,9 @@
        })
      },
      handleCurrentChange(row){
        if(row.state=='已报检'){
          this.isCheck = true
        }
        this.dataway = row
        this.packageBoxId = {
          packageBoxId:row.id
@@ -306,7 +310,7 @@
        if (this.dataway.state == "未报检") {
            this.increase = true
        }else{
          this.$message.error('改项目已完成检验')
          this.$message.error('请先选择包装项目')
        }
      },
      preserve(datalist){