bug修改

zhouwx

2024-08-19 cd84a28754fc1b3fadb7027245333d6d3ff330a3

 src/views/hazardousChemicals/warehouseManage/components/productTable.vue

@@ -11,10 +11,10 @@
          >新增</el-button>
        </el-form-item>
        <el-form-item label="品名：" >
          <el-input v-model="data.queryParams.name" placeholder="请输入品名" clearable></el-input>
          <el-input v-model="data.queryParams.params.name" placeholder="请输入品名" clearable></el-input>
        </el-form-item>
        <el-form-item label="产品编号：" >
          <el-input v-model="data.queryParams.productSn" placeholder="请输入产品编号" clearable></el-input>
          <el-input v-model="data.queryParams.params.productSn" placeholder="请输入产品编号" clearable></el-input>
        </el-form-item>
        <el-form-item >
          <el-button
@@ -34,28 +34,31 @@
      <el-table-column label="序号" type="index" align="center" width="80" />
      <el-table-column label="品名" prop="productBasic.name" align="center"  />
      <el-table-column label="产品编号" prop="productBasic.productSn" align="center" />
      <el-table-column label="CAS号" prop="productBasic.cas" align="center" />
      <el-table-column label="厂家" prop="productBasic.manufacturer" align="center" />
      <el-table-column label="供应商" prop="productBasic.supplier" align="center" />
      <el-table-column label="危险性质" prop="productBasic.productCharacter" align="center" />
      <el-table-column label="最小包装" prop="productBasic.productSn" align="center" width="120">
        <template #default="scope">
          <span>{{scope.row.productBasic.metering}}{{scope.row.productBasic.unit}} / {{scope.row.productBasic.minPackage == 0 ? '瓶' :scope.row.productBasic.minPackage == 1?'袋':scope.row.productBasic.minPackage == 2?'桶 ':scope.row.productBasic.minPackage == 3?'盒':scope.row.productBasic.minPackage == 4?'箱':'其他'}}</span>
        </template>
      </el-table-column>
      <el-table-column label="批号" prop="batchNo" align="center" width="120" />
<!--      <el-table-column label="CAS号" prop="productBasic.cas" align="center" />-->
<!--      <el-table-column label="厂家" prop="productBasic.manufacturer" align="center" />-->
<!--      <el-table-column label="供应商" prop="productBasic.supplier" align="center" />-->
<!--      <el-table-column label="危险性质" prop="productBasic.productCharacter" align="center" />-->
<!--      <el-table-column label="最小包装" prop="productBasic.productSn" align="center" width="120">-->
<!--        <template #default="scope">-->
<!--          <span>{{scope.row.productBasic.metering}}{{scope.row.productBasic.unit}} / {{scope.row.productBasic.minPackage == 0 ? '瓶' :scope.row.productBasic.minPackage == 1?'袋':scope.row.productBasic.minPackage == 2?'桶 ':scope.row.productBasic.minPackage == 3?'盒':scope.row.productBasic.minPackage == 4?'箱':'其他'}}</span>-->
<!--        </template>-->
<!--      </el-table-column>-->
      <el-table-column label="数量" prop="num" align="center" width="120" />
      <el-table-column label="所在仓库" prop="warehouseName" align="center" >
        <template #default="scope">
          <span>{{scope.row.warehouse.name}}</span>
        </template>
      </el-table-column>
      <el-table-column label="批号" prop="batchNo" align="center" width="120" />
      <el-table-column label="状态" prop="state" align="center">
        <template #default="scope">
          <span>{{scope.row.state === 0 ? '未入库' : '已入库'}}</span>
        </template>
      </el-table-column>
      <el-table-column label="创建时间" prop="createTime" align="center" width="120" />
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200" >
        <template #default="scope">
          <el-button link type="primary" v-if="scope.row.state == 1" @click="toDetail(scope.row)">查看详情</el-button>
          <el-button link type="primary" v-if="scope.row.state == 0" @click="doEntry(scope.row)">入库</el-button>
          <el-button link type="primary" v-if="scope.row.state == 1" @click="printCode(scope.row)">打印二维码</el-button>
          <el-button link type="primary" @click="openDialog('edit',scope.row)" v-if="scope.row.state == 0">编辑</el-button>
@@ -88,16 +91,21 @@
  getProWarehouseRecord
} from "@/api/hazardousChemicals/productRecord";
import {delRawRecord} from "@/api/hazardousChemicals/rawRecord";
import {useRoute, useRouter} from "vue-router";
const { proxy } = getCurrentInstance();
const loading = ref(false);
const dialogRef = ref();
const codeRef = ref();
const router = useRouter()
const route = useRoute()
const data = reactive({
  queryParams: {
    pageNum: 1,
    pageSize: 10,
    name: '',
    productSn: ''
    params :{
      name: '',
      productSn: ''
    }
  },
  total: 0,
  dataList: []
@@ -130,8 +138,10 @@
  data.queryParams = {
    pageNum: 1,
    pageSize: 10,
    name: '',
    productSn: ''
    params :{
      name: '',
      productSn: ''
    }
  }
  getList()
}
@@ -178,6 +188,16 @@
  codeRef.value.openDialog('pro',val);

}
const toDetail = (val) => {
  const obj = {
    pageNum: data.queryParams.pageNum,
    pageSize: data.queryParams.pageSize,
    entryId: val.id,
  }
  const v = JSON.stringify(obj)
  router.push({ path: "/whProDetail", query: { val: v } });
}

defineExpose({
  getList
});