modified: src/views/quality/Packaging_ledger/index.vue modified: src/...

zouyu

2023-12-09 bb1d5504c001edc22eb903ff61d92b21ec62e665

	modified:   src/views/quality/Packaging_ledger/index.vue
	modified:   src/views/quality/Packaging_ledger/pack-fromadd.vue
	modified:   src/views/quality/finishedProductInspection/finishedProduct-form.vue
	modified:   src/views/quality/finishedProductInspection/index.vue

 src/views/quality/Packaging_ledger/index.vue

@@ -71,23 +71,34 @@
              <el-table-column
                label="产品"
                prop="product"
                show-overflow-tooltip
                align="center"
              />
              <el-table-column
                label="产品编号"
                prop="productNo"
                show-overflow-tooltip
                align="center"
              >
              </el-table-column>
              <el-table-column
                label="批次号"
                prop="outBatchNo"
                show-overflow-tooltip
                align="center"
              >
              </el-table-column>
              <el-table-column
                label="规格型号"
                prop="specs"
                show-overflow-tooltip
                align="center"
              >
              </el-table-column>
              <el-table-column
                label="单位"
                prop="unit"
                show-overflow-tooltip
                align="center"
              >
              </el-table-column>
@@ -95,19 +106,16 @@
                label="数量"
                prop="number"
                align="center"
                show-overflow-tooltip
                width="80"
              >
                <template slot-scope="scope">
                  <el-input v-model="scope.row.number"></el-input>
                </template>
              </el-table-column>
              ></el-table-column>
              <el-table-column
                fixed="right"
                label="操作"
                align="center"
                width="80">
                <template slot-scope="scope">
                  <el-button @click="deleteadd(scope.row)"  size="small">删除</el-button>
                  <el-button type="text" @click="deleteadd(scope.row)" icon="el-icon-delete"  size="small">删除</el-button>
                </template>
              </el-table-column>
            </el-table>
@@ -419,9 +427,15 @@
         this.testStandardParams.forEach(el => {
              el.packageBoxId =this.goid
         });
         console.log(this.testStandardParams);
         return
        saveList(this.testStandardParams).then((res) =>{
          this.$message.success('保存成功')
          this.rightquery()
          if(res.status===200){
            this.$message.success('保存成功')
            this.rightquery()
          }
        }).catch(error=>{
          console.error(error);
        })
      },
      //删除

 src/views/quality/Packaging_ledger/pack-fromadd.vue

@@ -1,7 +1,7 @@
<template>
    <el-dialog
      width="60%"
      title="参数"
      title="产品库存明细"
      top="5vh"
      :visible.sync="innerVisible"
      :show="currshowlist"
@@ -43,7 +43,6 @@
    data() {
      return {
        datalist:[],
        datalistid:"",
        ajaxFun: dataadd,
        currentRow: false,
        typeOptions: [],
@@ -111,7 +110,43 @@
              sort: true,
              isTrue: true,
              isSearch: true,
              searchInfoType: 'datetimerange'
              searchInfoType: 'text'
            },
            {
              minWidth: '120',
              prop: 'outBatchNo',
              label: '批次号',
              sort: true,
              isTrue: true,
              isSearch: true,
              searchInfoType: 'text'
            },
            {
              minWidth: '120',
              prop: 'number',
              label: '数量',
              sort: true,
              isTrue: true,
              isSearch: true,
              searchInfoType: 'text'
            },
            {
              minWidth: '120',
              prop: 'locNo',
              label: '库位编号',
              sort: true,
              isTrue: true,
              isSearch: true,
              searchInfoType: 'text'
            },
            {
              minWidth: '120',
              prop: 'locName',
              label: '库位名称',
              sort: true,
              isTrue: true,
              isSearch: true,
              searchInfoType: 'text'
            },
          ],
        },
@@ -133,16 +168,10 @@
      this.getParamType()
    },
    methods: {
         // 获取数据列表
        getData() {
          this.$refs.paramTable.getDataList()
        },
        handleSelectionChange(val){
            let data = val
            data.forEach(el => {
                this.datalistid = el
            });
        },
      // 获取数据列表
      getData() {
        this.$refs.paramTable.getDataList()
      },
      handleSelectionChange(val){
        this.datalist = val
      },

 src/views/quality/finishedProductInspection/finishedProduct-form.vue

@@ -88,7 +88,7 @@
                            <el-form-item label="产品合格库位：" prop="locationId">
                                <el-select @change="changeLocation" clearable style="width:100%" 
                                v-model="processInspectVo.locationId" placeholder="请选择合格库位"
                                    autocomplete="off">
                                :disabled="resultVal!=null && processInspectVo.id!=null" autocomplete="off">
                                    <el-option v-for="(item,i) in locationList" :key="i" 
                                    :label="item.locName+'-'+item.locNo" :value="item.id"></el-option>
                                </el-select>
@@ -294,7 +294,7 @@
    mounted() {
        this.getDeviceList()
        this.processInspectVo.id = this.$route.query.id
        this.resultVal = this.$route.query.resultVal
        this.resultVal = this.$route.params.resultVal
        if(this.resultVal == null){
            let val = sessionStorage.getItem("finished-resultVal-"+this.processInspectVo.id);
            val == undefined ? this.resultVal=null : this.resultVal = val

 src/views/quality/finishedProductInspection/index.vue

@@ -285,6 +285,8 @@
                    name: 'finishedProductForm',
                    query: { 
                        id: row == null ? null : row.id,
                    },
                    params: {
                        resultVal: row == null ? null : row.result 
                    }
                })