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

机具问题修改

This commit is contained in:
zhouzy062 2023-12-24 02:23:07 +08:00
parent f90f5bea54
commit 1da8faf169
4 changed files with 56 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sgzb-ui/src/views/store/newBuy/newDevices/newDevicesAccept.vue
View File

@ -307,8 +307,8 @@ export default {
field101fileList:[], field101fileList:[],
//上传地址 //上传地址
// uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system // uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system
// uploadUrl:'http://112.29.103.165:21624/system',//线上服务器地址+system uploadUrl:'http://112.29.103.165:21624/system',//线上服务器地址+system
uploadUrl:'http://10.40.92.102:9201',//本地测试 // uploadUrl:'http://10.40.92.102:9201',//本地测试
dialogImageUrl: '', dialogImageUrl: '',
dialogVisible: false, dialogVisible: false,
//-------------- //--------------

32
sgzb-ui/src/views/store/tools/devices.vue
View File

@ -13,9 +13,10 @@
<el-form-item label="物品种类" prop="itemId"> <el-form-item label="物品种类" prop="itemId">
<el-select <el-select
v-model="queryParams.itemId" v-model="queryParams.itemId"
placeholder="请选择设备类型" placeholder="请选择物品种类"
clearable clearable filterable
style="width: 240px" style="width: 240px"
@change="selectItem"
> >
<el-option <el-option
v-for="typeItem in itemList" v-for="typeItem in itemList"
@ -30,8 +31,9 @@
<el-select <el-select
v-model="queryParams.deviceId" v-model="queryParams.deviceId"
placeholder="请选择设备类型" placeholder="请选择设备类型"
clearable clearable filterable
style="width: 240px" style="width: 240px"
@change="selectDevice"
> >
<el-option <el-option
v-for="typeItem in typeList" v-for="typeItem in typeList"
@ -45,7 +47,7 @@
<el-select <el-select
v-model="queryParams.typeId" v-model="queryParams.typeId"
placeholder="请选择规格型号" placeholder="请选择规格型号"
clearable clearable filterable
style="width: 240px" style="width: 240px"
> >
<el-option <el-option
@ -58,7 +60,7 @@
</el-form-item> </el-form-item>
<el-form-item label="资产属性" prop="propId"> <el-form-item label="资产属性" prop="propId">
<el-select v-model="queryParams.propId" placeholder="请选择资产属性"> <el-select v-model="queryParams.propId" clearable filterable placeholder="请选择资产属性">
<el-option <el-option
v-for="keeper in propList" v-for="keeper in propList"
:key="keeper.propId" :key="keeper.propId"
@ -96,12 +98,12 @@
<el-table-column label="规格型号" align="center" prop="specificationType" :show-overflow-tooltip="true"> <el-table-column label="规格型号" align="center" prop="specificationType" :show-overflow-tooltip="true">
</el-table-column> </el-table-column>
<el-table-column label="设备编码" align="center" prop="maCode" width="200" /> <el-table-column label="设备编码" align="center" prop="maCode" width="200" />
<el-table-column label="采购单号" align="center" prop="buyTask" width="180"/>
<el-table-column label="设备状态" align="center" prop="maStatusName"> <el-table-column label="设备状态" align="center" prop="maStatusName">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.maStatusName"/> <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.maStatusName"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="采购单号" align="center" prop="buyTask" width="180"/>
<el-table-column label="固定资产编号" align="center" prop="assetsCode" /> <el-table-column label="固定资产编号" align="center" prop="assetsCode" />
<el-table-column label="设备原编号" align="center" prop="preCode" /> <el-table-column label="设备原编号" align="center" prop="preCode" />
@ -340,7 +342,7 @@
</template> </template>
<script> <script>
import {addMachine, delMachine, getMachine, listMachine, updateMachine,supplierInfoList} from "@/api/store/tools"; import {addMachine, delMachine, getMachine, listMachine, updateMachine,supplierInfoList,getListByMaType} from "@/api/store/tools";
import { getProLists } from "@/api/base/base"; import { getProLists } from "@/api/base/base";
import { imgUpLoad } from "@/api/system/upload"; import { imgUpLoad } from "@/api/system/upload";
import { getTypeList } from "@/api/store/warehousing"; import { getTypeList } from "@/api/store/warehousing";
@ -440,6 +442,22 @@ export default {
this.modelList = response.data; this.modelList = response.data;
} }
); );
},
//选择物品种类
selectItem(id){
console.log(id)
getListByMaType({typeId:id}).then(response => {
this.typeList = response.data;
}
);
},
//选择设备类型
selectDevice(id){
console.log(id)
getListByMaType({typeId:id}).then(response => {
this.modelList = response.data;
}
);
}, },
/** 查询资产属性下拉 */ /** 查询资产属性下拉 */
getPropData() { getPropData() {

46
sgzb-ui/src/views/store/warehousing/repairWarehousing.vue
View File

@ -10,19 +10,19 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="维修时间时间"> <el-form-item label="维修时间">
<el-date-picker <el-date-picker
v-model="queryParams.wxTime" v-model="queryParams.wxTime"
style="width: 240px" style="width: 240px"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
type="date" type="date"
range-separator="-" range-separator="-"
placeholder="提交入库时间" placeholder="维修时间"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
<!-- <el-form-item label="设备类型" prop="typeId"> <el-form-item label="设备类型" prop="deviceTypeId">
<el-select <el-select
v-model="queryParams.typeId" v-model="queryParams.deviceTypeId"
placeholder="请选择设备类型" placeholder="请选择设备类型"
clearable clearable
style="width: 240px" style="width: 240px"
@ -35,7 +35,7 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="规格型号" prop="modelId"> <!-- <el-form-item label="规格型号" prop="modelId">
<el-select <el-select
v-model="queryParams.modelId" v-model="queryParams.modelId"
placeholder="请选择规格型号" placeholder="请选择规格型号"
@ -136,7 +136,7 @@
type="text" type="text"
icon="el-icon-edit" icon="el-icon-edit"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-if="taskStatus=='入库进行中'" v-if="scope.row.taskStatus=='入库进行中'"
>审核</el-button> >审核</el-button>
<!-- <el-button--> <!-- <el-button-->
<!-- size="mini"--> <!-- size="mini"-->
@ -256,16 +256,16 @@
<el-table-column label="规格型号" align="center" prop="typeName" :show-overflow-tooltip="true" /> <el-table-column label="规格型号" align="center" prop="typeName" :show-overflow-tooltip="true" />
<el-table-column label="数量" align="center" prop="repairNum" :show-overflow-tooltip="true" /> <el-table-column label="数量" align="center" prop="repairNum" :show-overflow-tooltip="true" />
<el-table-column label="编号" align="center" prop="maCode" :show-overflow-tooltip="true" /> <el-table-column label="编号" align="center" prop="maCode" :show-overflow-tooltip="true" />
<el-table-column label="提交入库人员" align="center" prop="updateBy" :show-overflow-tooltip="true" /> <el-table-column label="提交入库人员" align="center" prop="updateBy" :show-overflow-tooltip="true" width="100"/>
<el-table-column label="提交入库时间" align="center" prop="updateTime" width="180"> <el-table-column label="提交入库时间" align="center" prop="updateTime" width="100">
</el-table-column> </el-table-column>
<el-table-column label="不通过原因" align="center" prop="remark" :show-overflow-tooltip="true" /> <el-table-column label="不通过原因" align="center" prop="remark" :show-overflow-tooltip="true" />
<el-table-column label="状态" align="center" prop="status"> <el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope"> <!-- <template slot-scope="scope">
<span v-if="scope.row.status=='0'">未审核</span> <span v-if="scope.row.status=='0'">未审核</span>
<span v-if="scope.row.status=='1'">已入库</span> <span v-if="scope.row.status=='1'">已入库</span>
<span v-if="scope.row.status=='2'">驳回 </span> <span v-if="scope.row.status=='2'">驳回 </span>
</template> </template> -->
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="showHandle"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="showHandle">
@ -274,12 +274,12 @@
size="mini" size="mini"
type="text" type="text"
@click="pass(scope.row)" @click="pass(scope.row)"
v-if="scope.row.status=='0'" v-if="scope.row.status=='进行中'"
>通过</el-button> >通过</el-button>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
v-if="scope.row.status=='0'" v-if="scope.row.status=='进行中'"
@click="refused(scope.row)" @click="refused(scope.row)"
>不通过</el-button> >不通过</el-button>
<!-- <el-button--> <!-- <el-button-->
@ -481,7 +481,10 @@ export default {
repairNum:row.repairNum, repairNum:row.repairNum,
} }
let param =[obj] let param = {
params:JSON.stringify([obj])
}
console.log(param)
inputByType(param).then(response => { inputByType(param).then(response => {
if(response.code==200){ if(response.code==200){
this.$modal.msgSuccess("审批成功"); this.$modal.msgSuccess("审批成功");
@ -499,8 +502,10 @@ export default {
item.checkType = '1' item.checkType = '1'
item.type= item.manageType//0.编号 1.计数 item.type= item.manageType//0.编号 1.计数
}); });
let param = {
inputByType(this.ids).then(response => { params:JSON.stringify(this.ids)
}
inputByType(param).then(response => {
if(response.code==200){ if(response.code==200){
this.$modal.msgSuccess("审批成功"); this.$modal.msgSuccess("审批成功");
this.getDialogTable(); this.getDialogTable();
@ -524,8 +529,9 @@ export default {
remark:row.remark, remark:row.remark,
repairNum:row.repairNum, repairNum:row.repairNum,
} }
let param = {
let param =[obj] params:JSON.stringify([obj])
}
inputByType(param).then(response => { inputByType(param).then(response => {
if(response.code==200){ if(response.code==200){
this.$modal.msgSuccess("审批成功"); this.$modal.msgSuccess("审批成功");
@ -543,8 +549,10 @@ export default {
item.checkType = '2' item.checkType = '2'
item.type=item.manageType item.type=item.manageType
}); });
let param = {
inputByType(this.ids).then(response => { params:JSON.stringify(this.ids)
}
inputByType(param).then(response => {
if(response.code==200){ if(response.code==200){
this.$modal.msgSuccess("审批成功"); this.$modal.msgSuccess("审批成功");
this.getDialogTable(); this.getDialogTable();

2
sgzb-ui/vue.config.js
View File

@ -41,7 +41,7 @@ module.exports = {
// target: `http://192.168.5.12:8080`,//丁 // target: `http://192.168.5.12:8080`,//丁
// target: `http://10.40.92.102:8080`,//丁/ // target: `http://10.40.92.102:8080`,//丁/
// target: `http://10.40.92.126:8080`,//高 // target: `http://10.40.92.126:8080`,//高
// target: `http://10.40.92.111:8080`,//亮 // target: `http://10.40.92.104:8080`,//亮
// target: `http://10.40.92.209:8080`,//刘川 // target: `http://10.40.92.209:8080`,//刘川
changeOrigin: true, changeOrigin: true,