bonus
/
bonus-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

测试问题修改zzy'

This commit is contained in:
zzyuan 2024-12-02 11:08:27 +08:00
parent d4cb578751
commit 8ba6fb2a13
10 changed files with 85 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/api/purchase/goodsEntry.js
View File

@ -19,6 +19,15 @@ export function purchaseWarehouse(data) {
}) })
} }
// 内层批量验收驳回API
export function rejectPurchaseWarehouse(data) {
return request({
url: '/material/purchase/storage/reject',
method: 'post',
data: data
})
}
// 查询入库编码列表 // 查询入库编码列表
export function getMachineById(data) { export function getMachineById(data) {

4
src/views/material/lease/protocol/index.vue
View File

@ -17,12 +17,12 @@
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="状态"> <!-- <el-form-item label="状态">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable> <el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
<el-option label="删除" value="0"></el-option> <el-option label="删除" value="0"></el-option>
<el-option label="启用" value="1"></el-option> <el-option label="启用" value="1"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>

6
src/views/material/ma/device/index.vue
View File

@ -12,7 +12,7 @@
</el-form-item> </el-form-item>
<el-form-item prop="materialType"> <el-form-item prop="materialType">
<el-select v-model="queryParams.materialType" placeholder="请选择物品种类" clearable> <el-select v-model="queryParams.materialType" placeholder="请选择物品种类" clearable filterable >
<el-option <el-option
v-for="dict in materialTypeList" v-for="dict in materialTypeList"
:key="dict.value" :key="dict.value"
@ -30,7 +30,7 @@
</el-form-item> </el-form-item>
<el-form-item prop="materialName"> <el-form-item prop="materialName">
<el-select v-model="queryParams.materialName" placeholder="请选择设备类型" clearable> <el-select v-model="queryParams.materialName" placeholder="请选择设备类型" clearable filterable >
<el-option <el-option
v-for="dict in materialNameList" v-for="dict in materialNameList"
:key="dict.value" :key="dict.value"
@ -41,7 +41,7 @@
</el-form-item> </el-form-item>
<el-form-item prop="materialModel"> <el-form-item prop="materialModel">
<el-select v-model="queryParams.materialModel" placeholder="请选择规格型号" clearable> <el-select v-model="queryParams.materialModel" placeholder="请选择规格型号" clearable filterable >
<el-option <el-option
v-for="dict in materialModelList" v-for="dict in materialModelList"
:key="dict.value" :key="dict.value"

30
src/views/material/purchase/goodsAccept/index.vue
View File

@ -20,16 +20,22 @@
maxlength="20" maxlength="20"
/> />
</el-form-item> </el-form-item>
<el-form-item prop="taskStatus"> <!-- <el-form-item prop="status">
<el-select v-model="queryParams.taskStatus" placeholder="请选择任务状态" clearable> <el-select
<el-option clearable
v-for="item in taskStatusList" filterable
:key="item.id" style="width: 240px"
:label="item.name" placeholder="请选择设备状态"
:value="item.id" v-model="queryParams.status"
/> >
</el-select> <el-option
</el-form-item> :key="dict.value"
:label="dict.label"
:value="dict.value"
v-for="dict in dict.type.purchase_task_status"
/>
</el-select>
</el-form-item> -->
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
@ -319,7 +325,7 @@
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
keyWord:undefined, keyWord:undefined,
taskStatus:undefined, status:undefined,
}, },
openPrint: false, openPrint: false,
printData: {}, printData: {},
@ -431,7 +437,7 @@
handleExport() { handleExport() {
this.download( this.download(
"/material/purchase_check_info/export", "/material/purchase_check_info/export",
{ ...this.queryParams }, { ...this.queryParams,statusList:[2,12] },
`新购到货验收_${new Date().getTime()}.xlsx` `新购到货验收_${new Date().getTime()}.xlsx`
); );
}, },

4
src/views/material/purchase/goodsArrived/component/addTools.vue
View File

@ -91,9 +91,9 @@
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleSave" >保存</el-button> <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleSave" >保存</el-button>
</el-col> </el-col>
<!-- <el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-if="isEdit">导出</el-button> <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" v-if="isEdit">导出</el-button>
</el-col> --> </el-col>
</el-row> </el-row>
<el-table <el-table

33
src/views/material/purchase/goodsArrived/component/home.vue
View File

@ -8,7 +8,7 @@
v-show="showSearch" v-show="showSearch"
label-width="100px" label-width="100px"
> >
<el-form-item label="日期"> <el-form-item>
<el-date-picker <el-date-picker
v-model="queryParams.time" v-model="queryParams.time"
type="daterange" type="daterange"
@ -21,24 +21,24 @@
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="设备状态" prop="typeId"> <!-- <el-form-item label="设备状态" prop="status">
<el-select <el-select
v-model="queryParams.typeId" clearable
placeholder="请选择设备状态" filterable
clearable style="width: 240px"
filterable placeholder="请选择设备状态"
style="width: 240px" v-model="queryParams.status"
> >
<el-option <el-option
v-for="typeItem in typesList" :key="dict.value"
:key="typeItem.typeId" :label="dict.label"
:label="typeItem.typeName" :value="dict.value"
:value="typeItem.typeId" v-for="dict in dict.type.purchase_task_status"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item label="关键字" prop="keyWord"> <el-form-item prop="keyWord">
<el-input <el-input
v-model="queryParams.keyWord" v-model="queryParams.keyWord"
placeholder="请输入关键字" placeholder="请输入关键字"
@ -615,6 +615,7 @@ export default {
pageSize: 10, pageSize: 10,
time: null, //申请时间 time: null, //申请时间
name: undefined, name: undefined,
status: undefined,
typeId: "", typeId: "",
keyWord: "", keyWord: "",
}, },
@ -896,7 +897,7 @@ export default {
handleExport() { handleExport() {
this.download( this.download(
"/material/purchase_check_info/export", "/material/purchase_check_info/export",
{ ...this.queryParams }, { ...this.queryParams,statusList: [1] },
`新购到货_${new Date().getTime()}.xlsx` `新购到货_${new Date().getTime()}.xlsx`
); );
}, },

9
src/views/material/purchase/goodsBind/component/home.vue
View File

@ -22,7 +22,7 @@
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="设备状态" prop="status"> <!-- <el-form-item label="设备状态" prop="status">
<el-select <el-select
clearable clearable
filterable filterable
@ -37,7 +37,7 @@
v-for="dict in dict.type.purchase_task_status" v-for="dict in dict.type.purchase_task_status"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item label="关键字" prop="keyWord"> <el-form-item label="关键字" prop="keyWord">
<el-input <el-input
@ -275,6 +275,11 @@ export default {
// 导出数据 // 导出数据
handleExport() { handleExport() {
console.log('数据导出') console.log('数据导出')
this.download(
"/material/purchase_check_info/export",
{ ...this.queryParams,statusList:[3,13] },
`新购到货入库_${new Date().getTime()}.xlsx`
);
}, },
// 列表复选框 // 列表复选框
handleSelectionChange(list) { handleSelectionChange(list) {

22
src/views/material/purchase/goodsEntry/detail.vue
View File

@ -114,9 +114,9 @@
<el-button size="mini" type="success" @click="pass(scope.row)" v-if="(scope.row.status!=19&&scope.row.manageType==1)||scope.row.manageType==0"> <el-button size="mini" type="success" @click="pass(scope.row)" v-if="(scope.row.status!=19&&scope.row.manageType==1)||scope.row.manageType==0">
入库 入库
</el-button> </el-button>
<!-- <el-button size="mini" type="danger" @click="reject(scope.row)"> <el-button size="mini" type="danger" @click="reject(scope.row)" v-if="(scope.row.status!=19&&scope.row.manageType==1)||scope.row.manageType==0">
驳回 驳回
</el-button> --> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -214,7 +214,7 @@
import { getDeviceType} from "@/api/ma/device"; import { getDeviceType} from "@/api/ma/device";
import { getManufacturerSelect} from "@/api/ma/supplier"; import { getManufacturerSelect} from "@/api/ma/supplier";
import { getPurchaseDetailsList,getPurchaseFileList,uploadPurchaseFile } from "@/api/purchase/goodsAccept"; import { getPurchaseDetailsList,getPurchaseFileList,uploadPurchaseFile } from "@/api/purchase/goodsAccept";
import { purchaseWarehouse,getMachineById } from "@/api/purchase/goodsEntry"; import { purchaseWarehouse,getMachineById,rejectPurchaseWarehouse } from "@/api/purchase/goodsEntry";
import { downloadFile } from '@/utils/download' import { downloadFile } from '@/utils/download'
import { getToken } from '@/utils/auth' import { getToken } from '@/utils/auth'
export default { export default {
@ -423,9 +423,21 @@ export default {
} }
}, },
//不合格 //驳回
reject(row) { reject(row) {
let obj = {
taskId: this.taskId,
typeId:row.typeId,
purchaseId: row.id
};
this.$modal.confirm('是否确认驳回该物资类型？')
.then(function() {
console.log(obj)
return rejectPurchaseWarehouse(obj)
}).then(() => {
this.$modal.msgSuccess('驳回成功')
this.getList()
}).catch(() => {});
}, },
//文件管理 //文件管理
openFileDialog(row){ openFileDialog(row){

15
src/views/material/purchase/goodsEntry/index.vue
View File

@ -28,7 +28,7 @@
maxlength="20" maxlength="20"
/> />
</el-form-item> </el-form-item>
<el-form-item prop="taskStatus"> <el-form-item prop="taskStatus">
<el-select <el-select
v-model="queryParams.taskStatus" v-model="queryParams.taskStatus"
placeholder="请选择任务状态" placeholder="请选择任务状态"
@ -351,9 +351,8 @@ export default {
showHouse: false, showHouse: false,
dateRange: [], dateRange: [],
taskStatusList: [ taskStatusList: [
{ id: '1', name: '待验收' }, { id: '21', name: '入库进行中' },
{ id: '2', name: '验收合格' }, { id: '22', name: '入库已完成' },
{ id: '3', name: '验收未通过' },
], ],
ids: [], ids: [],
// 总条数 // 总条数
@ -472,9 +471,11 @@ export default {
}, },
handleExport() { handleExport() {
// this.download('/material/ma_machine/export', { this.download(
// ...this.queryParams "/material/purchase_check_info/export",
// }, `仓库管理_${new Date().getTime()}.xlsx`) { ...this.queryParams,statusList:[3,13,4,14,19] },
`新购到货验收_${new Date().getTime()}.xlsx`
);
}, },
}, },
} }

3
vue.config.js
View File

@ -36,7 +36,8 @@ module.exports = {
// detail: https://cli.vuejs.org/config/#devserver-proxy // detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
// target: `http://localhost:18080`, // target: `http://localhost:18080`,
target: `http://192.168.2.246:18080`,//马 // target: `http://192.168.2.246:18080`,//马
target: `http://192.168.0.244:18580`,//测试
// target: `http://192.168.0.110:18080`,//洪 // target: `http://192.168.0.110:18080`,//洪
// target: `http://192.168.0.234:18080`,//阮 // target: `http://192.168.0.234:18080`,//阮
// target: `http://192.168.137.1:18080`,// // target: `http://192.168.137.1:18080`,//