public/files/hazard.xls | 补丁 | 查看 | 原始文档 | blame | 历史 | |
public/files/product.xls | 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/views/hazardousChemicals/accessRecords/components/productTable.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/views/hazardousChemicals/accessRecords/components/rawTable.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/views/hazardousChemicals/warehouseManage/components/addProDialog.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/views/hazardousChemicals/warehouseManage/components/addRawDialog.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
public/files/hazard.xlsBinary files differ
public/files/product.xlsBinary files differ
src/views/hazardousChemicals/accessRecords/components/productTable.vue
@@ -30,7 +30,7 @@ <el-table-column label="二维码识别号" prop="code" align="center" /> <el-table-column label="类型" prop="productBasic.productSn" align="center" > <template #default="scope"> <span>{{scope.row.state === 0 ? '入库' :scope.row.state === 1 ? '取用' :scope.row.state === 2 ? '归还' : scope.row.state === 3? '标签作废':scope.row.state === 4 ? '用尽登记':scope.row.state === 5? '销售': ''}}</span> <span>{{scope.row.state === 0 ? '入库' :scope.row.state === 1 ? '取用' :scope.row.state === 2 ? '归还' : scope.row.state === 3? '标签作废':scope.row.state === 4 ? '用尽登记':scope.row.state === 5? '销售': scope.row.state === 6?'零头入库':''}}</span> </template> </el-table-column> <el-table-column label="数量" prop="num" align="center" width="120" > src/views/hazardousChemicals/accessRecords/components/rawTable.vue
@@ -30,7 +30,7 @@ <el-table-column label="二维码识别号" prop="code" align="center" /> <el-table-column label="类型" prop="hazmatBasic.productSn" align="center" > <template #default="scope"> <span>{{scope.row.state === 0 ? '入库' :scope.row.state === 1 ? '取用' :scope.row.state === 2 ? '归还' : scope.row.state === 3? '标签作废':scope.row.state === 4 ? '用尽登记':scope.row.state === 5? '销售': ''}}</span> <span>{{scope.row.state === 0 ? '入库' :scope.row.state === 1 ? '取用' :scope.row.state === 2 ? '归还' : scope.row.state === 3? '标签作废':scope.row.state === 4 ? '用尽登记':scope.row.state === 5? '销售': scope.row.state === 6?'零头入库':''}}</span> </template> </el-table-column> <el-table-column label="数量" prop="num" align="center" width="120" > src/views/hazardousChemicals/warehouseManage/components/addProDialog.vue
@@ -88,8 +88,8 @@ if(value === ''){ callback(new Error('请输入最小包装数量')) }else{ if(value > choosePro.value.maxEntry ){ callback(new Error('输入数量不能大于单次入库最大数量')) if(choosePro.value && value > choosePro.value.maxEntry ){ callback(new Error(`输入数量不能大于单次入库最大数量(${choosePro.value.maxEntry})`)) }else { callback() } @@ -127,9 +127,10 @@ title.value = type === 'add' ? '新增' : type ==='edit' ? '编辑':'' ; if(type === 'edit' ) { state.form = value; state.form.basicName = value.productBasic.name state.form.basicName = value.productBasic.name + '—' + value.productBasic.productSn + ' (' + value.productBasic.metering +value.productBasic.unit+') ' state.form.warehouseName = value.warehouse.name; choosePro.value = value.productBasic choosePro.value.name = value.productBasic.name + '—' + value.productBasic.productSn + ' (' + value.productBasic.metering + value.productBasic.unit+') ' changeNum() } dialogVisible.value = true; @@ -148,7 +149,13 @@ } const res = await getFinishBasicList(param) if(res.code == 200){ state.proList = res.data.list state.proList = res.data.list.map(item => { return{ ...item, name: item.name + '—' + item.productSn + ' (' + item.metering +item.unit+') ' } }) }else{ ElMessage.warning(res.message) } @@ -167,13 +174,7 @@ } const res = await getWarehouse(param) if(res.code == 200){ state.wareHouseList = res.data.list.map(item => { return{ ...item, name: item.name + '—' + item.productSn + '(' + item.metering +item.unit+')' } }) state.wareHouseList = res.data.list }else{ ElMessage.warning(res.message) } @@ -228,12 +229,13 @@ state.form.basicId = item.id console.log('item',item) choosePro.value = item; changeNum() } }) } const changeNum = () => { const minPackageType = choosePro.value.minPackage == 0 ? '瓶' :choosePro.value.minPackage == 1?'袋':choosePro.value.minPackage == 2?'桶 ':choosePro.value.minPackage == 3?'盒':choosePro.value.minPackage == 4?'箱':'其他' state.message = `您将入库 { ${choosePro.value.name} },编号:{ ${choosePro.value.productSn} },最小包装${choosePro.value.metering}${choosePro.value.unit},类别:${minPackageType}。 \n 共计:${state.form.num}${minPackageType}` state.message = `您将入库 { ${choosePro.value.name.substring(0,choosePro.value.name.lastIndexOf('—')) } },编号:{ ${choosePro.value.productSn} },最小包装${choosePro.value.metering}${choosePro.value.unit},类别:${minPackageType}。 \n 共计:${state.form.num}${minPackageType}` } const selectWareValue = (val) => { state.wareHouseList.forEach(item => { src/views/hazardousChemicals/warehouseManage/components/addRawDialog.vue
@@ -94,8 +94,8 @@ if(value === ''){ callback(new Error('请输入最小包装数量')) }else{ if(value > choosePro.value.maxEntry ){ callback(new Error('输入数量不能大于单次入库最大数量')) if(choosePro.value && value > choosePro.value.maxEntry ){ callback(new Error(`输入数量不能大于单次入库最大数量(${choosePro.value.maxEntry})`)) }else { callback() } @@ -134,9 +134,10 @@ title.value = type === 'add' ? '新增' : type ==='edit' ? '编辑':'' ; if(type === 'edit' ) { state.form = JSON.parse(JSON.stringify(value)); state.form.basicName = value.hazmatBasic.name state.form.basicName = value.hazmatBasic.name + '—' + value.hazmatBasic.productSn + ' (' + value.hazmatBasic.metering + value.hazmatBasic.unit+') ' state.form.warehouseName = value.warehouse.name; choosePro.value = value.hazmatBasic choosePro.value.name = value.hazmatBasic.name + '—' + value.hazmatBasic.productSn + ' (' + value.hazmatBasic.metering + value.hazmatBasic.unit+') ' changeNum() } dialogVisible.value = true; @@ -158,7 +159,7 @@ state.rawList = res.data.list.map(item => { return{ ...item, name: item.name + '—' + item.productSn + '(' + item.metering +item.unit+')' name: item.name + '—' + item.productSn + ' (' + item.metering +item.unit+') ' } }) @@ -236,12 +237,13 @@ state.form.basicId = item.id console.log('item',item) choosePro.value = item; changeNum() } }) } const changeNum = () => { const minPackageType = choosePro.value.minPackage == 0 ? '瓶' :choosePro.value.minPackage == 1?'袋':choosePro.value.minPackage == 2?'桶 ':choosePro.value.minPackage == 3?'盒':choosePro.value.minPackage == 4?'箱':'其他' state.message = `您将入库 { ${choosePro.value.name} },编号:{ ${choosePro.value.productSn} },最小包装${choosePro.value.metering}${choosePro.value.unit},类别:${minPackageType}。 \n 共计:${state.form.num}${minPackageType}` state.message = `您将入库 { ${choosePro.value.name.substring(0,choosePro.value.name.lastIndexOf('—')) } },编号:{ ${choosePro.value.productSn} },最小包装${choosePro.value.metering}${choosePro.value.unit},类别:${minPackageType}。 \n 共计:${state.form.num}${minPackageType}` } const selectWareValue = (val) => { state.wareHouseList.forEach(item => { @@ -270,6 +272,7 @@ state.rawList = []; state.wareHouseList = []; state.message = ''; choosePro.value = {} } defineExpose({ openDialog