Merge remote-tracking branch 'origin/master'

zss

2023-12-05 a1c751283d02c8a572f39ea18c2573fce3372ef0

 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,7 +290,9 @@
        })
      },
      handleCurrentChange(row){
        console.log(row,"一行");
        if(row.state=='已报检'){
          this.isCheck = true
        }
        this.dataway = row
        this.packageBoxId = {
          packageBoxId:row.id
@@ -299,7 +302,6 @@
      },
      rightquery(){
        list({packageBoxId:this.goid}).then((res) =>{
          console.log(res,"nihaoa");
          this.testStandardParams = res.data.data
        })
      },
@@ -317,19 +319,16 @@
      },
      //右边保存
      addpreserve(){
        console.log(this.testStandardParams,"保存数据");
         this.testStandardParams.forEach(el => {
              el.packageBoxId =this.goid
         });
        saveList(this.testStandardParams).then((res) =>{
          console.log(res,"保存成功");
          this.$message.success('保存成功')
          this.rightquery()
        })
      },
      //删除
      deleteadd(row){
          console.log(row,"");
          deledata({id:row.id}).then((res)=>{
          this.$message.success('删除成功')
          this.rightquery()
@@ -337,7 +336,6 @@
      },
      //审核
      check(row){
        console.log(row,"审核");
        let packageBox = {
                id:row.id,
                packageNo:row.packageNo,