新购机具代码提交
This commit is contained in:
parent
1666636cab
commit
58bce3e6a3
|
|
@ -108,7 +108,7 @@
|
|||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="7">
|
||||
<el-form-item label="后缀范围" prop="count">
|
||||
<el-form-item label="后缀范围">
|
||||
<div style="display: flex;"><el-input v-model="form.str" placeholder="0001"></el-input> - <el-input v-model="form.str1" placeholder="0005"></el-input></div>
|
||||
|
||||
</el-form-item>
|
||||
|
|
@ -146,10 +146,14 @@
|
|||
<el-table-column label="规格型号" align="center" prop="specificationType" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="设备编码" align="center" prop="maCode" :show-overflow-tooltip="true">
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.maCode" v-bind:class="[scope.row.statusFlag==1 ? redColor : '']"></el-input>
|
||||
<el-input v-model="scope.row.maCode" :disabled="scope.row.statusFlag==0" οninput="value=value.replace(/[^0-9.]/g,'')"></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="固定资产编码" align="center" prop="assetsCode" >
|
||||
<template slot-scope="scope">
|
||||
<el-input v-model="scope.row.assetsCode" v-show="form.isFixed=='0'"></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="固定资产编码" align="center" prop="assetsCode" width="120" />
|
||||
<el-table-column
|
||||
label="操作"
|
||||
align="center"
|
||||
|
|
@ -227,9 +231,10 @@ export default {
|
|||
},
|
||||
// 表单参数
|
||||
form: {
|
||||
exCode:'NSJJ',
|
||||
count:1,
|
||||
// isFixed:'',
|
||||
exCode:'',
|
||||
str:'',
|
||||
str1:'',
|
||||
isFixed:'1',
|
||||
typeId:''
|
||||
},
|
||||
codeList: [],//弹窗列表list
|
||||
|
|
@ -283,16 +288,16 @@ export default {
|
|||
},
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
this.reset()
|
||||
this.open = false;
|
||||
},
|
||||
// 表单重置
|
||||
reset() {
|
||||
this.form = {
|
||||
maId: undefined,
|
||||
dictName: undefined,
|
||||
dictType: undefined,
|
||||
status: "0",
|
||||
remark: undefined
|
||||
str: undefined,
|
||||
str1: undefined,
|
||||
isFixed:'1',
|
||||
|
||||
};
|
||||
this.resetForm("form");
|
||||
},
|
||||
|
|
@ -322,7 +327,11 @@ export default {
|
|||
/** 编码按钮操作 */ //getCodeList newCodeList
|
||||
handleCode(row) {
|
||||
console.log(row)
|
||||
this.reset()
|
||||
this.form = row;
|
||||
this.$set(this.form,'str','')
|
||||
this.$set(this.form,'str1','')
|
||||
this.$set(this.form,'isFixed','1')
|
||||
let arr = this.form.arrivalTime.split('-')
|
||||
this.form.exCode = 'NSJJ'+this.form.typeCode+this.form.specsCode+arr[0][2]+arr[0][3]+arr[1];
|
||||
this.form.count = row.checkNum;
|
||||
|
|
@ -341,38 +350,38 @@ export default {
|
|||
},
|
||||
//生成列表codeList
|
||||
createCodeList(){
|
||||
if(this.codeList.length>=this.form.checkNum){
|
||||
this.$modal.msgError("生成编码数量不可超过采购验收数量!!!");
|
||||
}else{
|
||||
for(let i = 0; i < this.form.count; i++) {
|
||||
let obj = {
|
||||
typeName:this.form.typeName,
|
||||
specificationType:this.form.specificationType,
|
||||
typeId: this.form.typeId,
|
||||
taskId: this.form.taskId,
|
||||
assetsCode:'',
|
||||
isFixed:this.form.isFixed,
|
||||
}
|
||||
this.newCodeList.push(obj)
|
||||
}
|
||||
console.log(this.newCodeList,'this.newCodeList')
|
||||
this.codeList = this.getCodeList.concat(this.newCodeList)
|
||||
}
|
||||
// if(this.codeList.length>=this.form.checkNum){
|
||||
// this.$modal.msgError("生成编码数量不可超过采购验收数量!!!");
|
||||
// }else{
|
||||
// for(let i = 0; i < this.form.count; i++) {
|
||||
// let obj = {
|
||||
// typeName:this.form.typeName,
|
||||
// specificationType:this.form.specificationType,
|
||||
// typeId: this.form.typeId,
|
||||
// taskId: this.form.taskId,
|
||||
// assetsCode:'',
|
||||
// isFixed:this.form.isFixed,
|
||||
// }
|
||||
// this.newCodeList.push(obj)
|
||||
// }
|
||||
// console.log(this.newCodeList,'this.newCodeList')
|
||||
// this.codeList = this.getCodeList.concat(this.newCodeList)
|
||||
// }
|
||||
},
|
||||
//填充按钮
|
||||
fillingCodeList(){
|
||||
console.log(Number(this.form.str))
|
||||
this.codeList = []
|
||||
let num = Number(this.form.str)
|
||||
console.log(Number(this.form.str1))
|
||||
// console.log(Number(this.form.str1))
|
||||
let num1 = Number(this.form.str1)
|
||||
let count= num1-num+1;//生成数量
|
||||
|
||||
console.log()
|
||||
let sum = count + this.form.bindNum;
|
||||
console.log(sum)
|
||||
if(sum>this.form.checkNum){
|
||||
this.$modal.msgError("编码数量已超过验收数量");
|
||||
}else{
|
||||
// if(sum>this.form.checkNum){
|
||||
// this.$modal.msgError("已绑定编码"+this.form.bindNum+"个,总数量已超过验收数量,请调整后缀范围。");
|
||||
// }else{
|
||||
if(num1>num){
|
||||
for(let i = 0; i < count; i++) {
|
||||
let obj = {
|
||||
|
|
@ -380,14 +389,16 @@ export default {
|
|||
specificationType:this.form.specificationType,
|
||||
typeId: this.form.typeId,
|
||||
taskId: this.form.taskId,
|
||||
maCode:this.form.exCode+(i+num),
|
||||
maCode:this.form.exCode+("00000" + (num+i)).slice(-4),
|
||||
assetsCode:'',
|
||||
isFixed:this.form.isFixed,
|
||||
}
|
||||
this.codeList.push(obj)
|
||||
}
|
||||
}else{
|
||||
this.$modal.msgError("编码后缀范围输入格式不正确");
|
||||
}
|
||||
}
|
||||
// }
|
||||
},
|
||||
|
||||
/** 提交按钮 */
|
||||
|
|
@ -407,15 +418,14 @@ export default {
|
|||
}else{
|
||||
editPurchaseMacode(this.codeList).then(response => {
|
||||
console.log(response.data)
|
||||
if(response.data && response.length>0){
|
||||
if(response.data && response.data.length>0){
|
||||
this.codeList = response.data;
|
||||
this.$modal.msgError("编码绑定失败,存在重复编码,请重新输入");
|
||||
}else{
|
||||
this.$modal.msgSuccess("绑定成功");
|
||||
this.$modal.msgSuccess("编码绑定成功");
|
||||
this.open = false;
|
||||
this.getList();
|
||||
}
|
||||
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -434,13 +444,19 @@ export default {
|
|||
});
|
||||
},
|
||||
delCode(row) {
|
||||
const maCode = row.maCode ;
|
||||
this.$modal.confirm('是否确认删除该数据项?').then(function() {
|
||||
return delMacodeList(maCode);
|
||||
}).then(() => {
|
||||
this.getdetailmaCodeList(row);
|
||||
this.$modal.msgSuccess("删除成功");
|
||||
}).catch(() => {});
|
||||
console.log(row)
|
||||
this.codeList.forEach((item,index) => {
|
||||
if(item.maCode==row.maCode){
|
||||
this.codeList.splice(index,1)
|
||||
}
|
||||
});
|
||||
// const maCode = row.maCode ;
|
||||
// this.$modal.confirm('是否确认删除该数据项?').then(function() {
|
||||
// return delMacodeList(maCode);
|
||||
// }).then(() => {
|
||||
// this.getdetailmaCodeList(row);
|
||||
// this.$modal.msgSuccess("删除成功");
|
||||
// }).catch(() => {});
|
||||
},
|
||||
// 返回列表页
|
||||
jumpList(){
|
||||
|
|
|
|||
|
|
@ -76,7 +76,19 @@
|
|||
<el-table-column label="到货日期" align="center" prop="arrivalTime" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="采购机具设备" align="center" prop="purchasingTypeName" :show-overflow-tooltip="true" width="250"/>
|
||||
<el-table-column label="采购员" align="center" prop="purchaserName" :show-overflow-tooltip="true" width="100"/>
|
||||
<el-table-column label="采购状态" align="center" prop="purchasingStatus" :show-overflow-tooltip="true" width="100"/>
|
||||
<el-table-column label="采购状态" align="center" prop="purchasingStatus" :show-overflow-tooltip="true" width="100">
|
||||
<!-- <template slot-scope="scope">
|
||||
<span v-if="scope.row.purchasingStatus=='26'">已验收合格</span>
|
||||
<span v-if="scope.row.purchasingStatus=='28'">已入库</span>
|
||||
<span v-if="scope.row.purchasingStatus=='26'">已验收合格</span>
|
||||
<span v-if="scope.row.purchasingStatus=='28'">已入库</span>
|
||||
|
||||
</template> -->
|
||||
</el-table-column>
|
||||
|
||||
|
||||
|
||||
|
||||
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
|
||||
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="250">
|
||||
|
|
|
|||
|
|
@ -118,9 +118,10 @@
|
|||
<el-table-column label="发布时间" align="center" prop="createTime" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="不通过原因" align="center" prop="remark" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="状态" align="center" prop="taskStatus">
|
||||
<!-- <template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
|
||||
</template> -->
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.taskStatus=='26'">已验收合格</span>
|
||||
<span v-if="scope.row.taskStatus=='28'">已入库</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
|
|
@ -135,6 +136,7 @@
|
|||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
v-if="scope.row.taskStatus=='26'"
|
||||
@click="handleUpdate(scope.row)"
|
||||
>审核</el-button>
|
||||
<!-- <el-button-->
|
||||
|
|
@ -253,12 +255,15 @@
|
|||
<el-table-column label="序号" align="center" type="index" />
|
||||
<el-table-column label="机具类型" align="center" prop="typeName" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="规格型号" align="center" prop="specificationType" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="数量" align="center" prop="repairNum" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="数量" align="center" prop="checkNum" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="编号" align="center" prop="maCode" :show-overflow-tooltip="true" />
|
||||
|
||||
<el-table-column label="不通过原因" align="center" prop="remark" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="状态" align="center" prop="status">
|
||||
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.status=='0'">未入库</span>
|
||||
<span v-if="scope.row.status=='1'">已入库</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" v-if="showHandle">
|
||||
|
|
@ -266,11 +271,13 @@
|
|||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
v-if="scope.row.status=='0'"
|
||||
@click="pass(scope.row)"
|
||||
>通过</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
v-if="scope.row.status=='0'"
|
||||
@click="refused(scope.row)"
|
||||
>不通过</el-button>
|
||||
<!-- <el-button-->
|
||||
|
|
@ -453,16 +460,17 @@ export default {
|
|||
row.taskId = this.query.taskId;
|
||||
let obj = {
|
||||
taskId:this.query.taskId,
|
||||
checkResult:'1',//1 审核通过 2 驳回 -必填
|
||||
maId:row.maId,
|
||||
inputNum:row.checkNum,
|
||||
maCode:row.maCode,
|
||||
typeId:row.typeId,
|
||||
|
||||
// remark:row.remark,
|
||||
// repairNum:row.repairNum,
|
||||
}
|
||||
|
||||
let param =[obj]
|
||||
let param ={
|
||||
taskId:this.query.taskId,
|
||||
checkResult:'1',
|
||||
inputRecordList:[obj]
|
||||
}
|
||||
changePutinStatus(param).then(response => {
|
||||
if(response.code==200){
|
||||
this.$modal.msgSuccess("审批成功");
|
||||
|
|
@ -477,11 +485,17 @@ export default {
|
|||
console.log(this.ids)
|
||||
this.ids.forEach(item => {
|
||||
item.taskId = this.query.taskId;
|
||||
item.checkType = '1'
|
||||
item.type= item.manageType//0.编号 1.计数
|
||||
item.typeId= item.typeId
|
||||
item.maId= item.maId
|
||||
item.inputNum= item.checkNum
|
||||
item.maCode= item.maCode
|
||||
});
|
||||
|
||||
changePutinStatus(this.ids).then(response => {
|
||||
let param ={
|
||||
taskId:this.query.taskId,
|
||||
checkResult:'1',
|
||||
inputRecordList:this.ids
|
||||
}
|
||||
changePutinStatus(param).then(response => {
|
||||
if(response.code==200){
|
||||
this.$modal.msgSuccess("审批成功");
|
||||
this.getDialogTable();
|
||||
|
|
@ -497,16 +511,17 @@ export default {
|
|||
row.taskId = this.query.taskId;
|
||||
let obj = {
|
||||
taskId:this.query.taskId,
|
||||
id:row.id,
|
||||
checkType:'2',//1 审核通过 2 驳回 -必填
|
||||
type:row.manageType,//0.编号 1.计数
|
||||
maId:row.maId,
|
||||
maCode:row.maCode,
|
||||
inputNum:row.checkNum,
|
||||
typeId:row.typeId,
|
||||
remark:row.remark,
|
||||
repairNum:row.repairNum,
|
||||
}
|
||||
|
||||
let param =[obj]
|
||||
let param ={
|
||||
taskId:this.query.taskId,
|
||||
checkResult:'2',
|
||||
inputRecordList:[obj]
|
||||
}
|
||||
changePutinStatus(param).then(response => {
|
||||
if(response.code==200){
|
||||
this.$modal.msgSuccess("审批成功");
|
||||
|
|
@ -521,11 +536,18 @@ export default {
|
|||
console.log(this.ids)
|
||||
this.ids.forEach(item => {
|
||||
item.taskId = this.query.taskId;
|
||||
item.checkType = '2'
|
||||
item.type=item.manageType
|
||||
item.typeId= item.typeId
|
||||
item.maId= item.maId
|
||||
item.inputNum= item.checkNum
|
||||
item.maCode= item.maCode
|
||||
});
|
||||
let param ={
|
||||
taskId:this.query.taskId,
|
||||
checkResult:'2',
|
||||
inputRecordList:this.ids
|
||||
}
|
||||
|
||||
changePutinStatus(this.ids).then(response => {
|
||||
changePutinStatus(param).then(response => {
|
||||
if(response.code==200){
|
||||
this.$modal.msgSuccess("审批成功");
|
||||
this.getDialogTable();
|
||||
|
|
|
|||
|
|
@ -99,17 +99,17 @@
|
|||
<!-- v-hasPermi="['system:user:export']"-->
|
||||
<!-- >导出</el-button>-->
|
||||
<!-- </el-col>-->
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" ></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="50" align="center" />
|
||||
<el-table-column label="序号" align="center" type="index" />
|
||||
<el-table-column label="物品种类" align="center" key="typeId" prop="typeId" v-if="columns[1].visible" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="类型名称" align="center" key="typeId" prop="typeId" v-if="columns[2].visible" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="规格型号" align="center" key="houseName" prop="dept.houseName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="设备编码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
|
||||
<el-table-column label="货架编号" align="center" key="houseId" prop="dept.houseId" v-if="columns[3].visible" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="物品种类" align="center" key="itemType" prop="itemType" class-name="" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="类型名称" align="center" key="machineTypeName" prop="machineTypeName" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="规格型号" align="center" key="specificationType" prop="specificationType" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="设备编码" align="center" key="maCode" prop="maCode" />
|
||||
<el-table-column label="货架编号" align="center" key="houseName" prop="houseName" :show-overflow-tooltip="true" />
|
||||
<el-table-column
|
||||
label="操作"
|
||||
align="center"
|
||||
|
|
@ -124,12 +124,12 @@
|
|||
<!-- @click="handleUpdate(scope.row)"-->
|
||||
<!-- v-hasPermi="['system:user:edit']"-->
|
||||
<!-- >修改</el-button>-->
|
||||
<el-button
|
||||
<!-- <el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
>删除</el-button>
|
||||
>删除</el-button> -->
|
||||
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
|
@ -355,16 +355,7 @@ export default {
|
|||
status: undefined,
|
||||
deptId: undefined
|
||||
},
|
||||
// 列信息
|
||||
columns: [
|
||||
{ key: 0, label: `用户编号`, visible: true },
|
||||
{ key: 1, label: `用户名称`, visible: true },
|
||||
{ key: 2, label: `用户昵称`, visible: true },
|
||||
{ key: 3, label: `部门`, visible: true },
|
||||
{ key: 4, label: `手机号码`, visible: true },
|
||||
{ key: 5, label: `状态`, visible: true },
|
||||
{ key: 6, label: `创建时间`, visible: true }
|
||||
],
|
||||
|
||||
// 表单校验
|
||||
rules: {
|
||||
userName: [
|
||||
|
|
@ -432,8 +423,8 @@ export default {
|
|||
},
|
||||
// 节点单击事件
|
||||
handleNodeClick(data) {
|
||||
this.queryParams.deptId = data.id;
|
||||
this.handleQuery();
|
||||
// this.queryParams.deptId = data.id;
|
||||
// this.handleQuery();
|
||||
},
|
||||
|
||||
// 取消按钮
|
||||
|
|
|
|||
|
|
@ -1,57 +1,72 @@
|
|||
<template>
|
||||
<div class="app-container">
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
||||
<el-form-item label="关键字" prop="dictName">
|
||||
<el-form-item label="关键字" prop="keyWord">
|
||||
<el-input
|
||||
v-model="queryParams.dictName"
|
||||
v-model="queryParams.keyWord"
|
||||
placeholder="请输入关键字"
|
||||
clearable
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="物品种类" prop="dictType">
|
||||
<el-input
|
||||
v-model="queryParams.dictType"
|
||||
placeholder="请选择物品种类"
|
||||
clearable
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="资产类型" prop="dictType">
|
||||
<el-input
|
||||
v-model="queryParams.dictType"
|
||||
placeholder="是否是固定资产"
|
||||
clearable
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="设备类型" prop="dictType">
|
||||
<el-input
|
||||
v-model="queryParams.dictType"
|
||||
placeholder="请选择设备类型"
|
||||
clearable
|
||||
style="width: 240px"
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="规格型号" prop="status">
|
||||
<el-form-item label="物品种类" prop="itemId">
|
||||
<el-select
|
||||
v-model="queryParams.status"
|
||||
placeholder="规格型号"
|
||||
clearable
|
||||
style="width: 240px"
|
||||
v-model="queryParams.itemId"
|
||||
placeholder="请选择设备类型"
|
||||
clearable
|
||||
style="width: 240px"
|
||||
>
|
||||
<el-option
|
||||
v-for="dict in dict.type.sys_normal_disable"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
v-for="typeItem in itemList"
|
||||
:key="typeItem.typeId"
|
||||
:label="typeItem.typeName"
|
||||
:value="typeItem.typeId"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="设备类型" prop="deviceId">
|
||||
<el-select
|
||||
v-model="queryParams.deviceId"
|
||||
placeholder="请选择设备类型"
|
||||
clearable
|
||||
style="width: 240px"
|
||||
>
|
||||
<el-option
|
||||
v-for="typeItem in typeList"
|
||||
:key="typeItem.typeId"
|
||||
:label="typeItem.typeName"
|
||||
:value="typeItem.typeId"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="规格型号" prop="typeId">
|
||||
<el-select
|
||||
v-model="queryParams.typeId"
|
||||
placeholder="请选择规格型号"
|
||||
clearable
|
||||
style="width: 240px"
|
||||
>
|
||||
<el-option
|
||||
v-for="model in modelList"
|
||||
:key="model.typeId"
|
||||
:label="model.typeName"
|
||||
:value="model.typeId"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="资产属性" prop="propId">
|
||||
<el-select v-model="queryParams.propId" placeholder="请选择资产属性">
|
||||
<el-option
|
||||
v-for="keeper in propList"
|
||||
:key="keeper.propId"
|
||||
:label="keeper.propName"
|
||||
:value="keeper.propId"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="创建时间">
|
||||
<el-date-picker
|
||||
v-model="dateRange"
|
||||
|
|
@ -73,7 +88,7 @@
|
|||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
|
||||
<el-table v-loading="loading" :data="devicesList" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column label="序号" align="center" type="index" />
|
||||
<el-table-column label="物品种类" align="center" prop="itemType" />
|
||||
|
|
@ -90,10 +105,11 @@
|
|||
<dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.maStatusName"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="采购单号" align="center" prop="buyTask" />
|
||||
<el-table-column label="固定资产编号" align="center" prop="assetsCode" />
|
||||
<el-table-column label="设备原编号" align="center" prop="preCode" />
|
||||
<el-table-column label="购置批次" align="center" prop="buyTask" />
|
||||
<el-table-column label="绑定标签" align="center" prop="typeId" />
|
||||
|
||||
<el-table-column label="二维码" align="center" prop="" />
|
||||
<el-table-column label="所在仓库" align="center" prop="ownHouse" />
|
||||
<!-- <el-table-column label="创建时间" align="center" prop="createTime" width="180">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
|
|
@ -104,12 +120,13 @@
|
|||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
type="primary"
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
@click="handleUpdate(scope.row)"
|
||||
>编辑</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="danger"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
>删除</el-button>
|
||||
|
|
@ -157,27 +174,30 @@
|
|||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="固定资产编号" prop="assetsCode">
|
||||
<el-input v-model="form.assetsCode" placeholder="请输入固定资产编号" />
|
||||
<el-form-item label="二维码编号" >
|
||||
<!-- <el-input v-model="form.dictName" placeholder="请输入字典名称" /> -->
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="采购单号" prop="buyTask">
|
||||
<el-input v-model="form.buyTask" placeholder="请输入购置批次" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="设备原编号" prop="preCode">
|
||||
<el-input v-model="form.preCode" placeholder="请输入设备原编号" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="购置批次" prop="buyTask">
|
||||
<el-input v-model="form.buyTask" placeholder="请输入购置批次" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="绑定标签" >
|
||||
<!-- <el-input v-model="form.dictName" placeholder="请输入字典名称" /> -->
|
||||
<el-form-item label="固定资产编号" prop="assetsCode">
|
||||
<el-input v-model="form.assetsCode" placeholder="请输入固定资产编号" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
|
|
@ -227,15 +247,15 @@
|
|||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="出入库编号" prop="outFacCode">
|
||||
<el-input v-model="form.dictName" placeholder="请输入字典名称" />
|
||||
<el-form-item label="出入库次数" prop="outFacCode">
|
||||
<el-input v-model="form.dictName" placeholder="请输入字典名称" disabled/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<!-- <el-col :span="8">
|
||||
<el-form-item label="管理员" prop="dictName">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="厂家" prop="dictName">
|
||||
<el-input v-model="form.dictName" placeholder="" />
|
||||
</el-form-item>
|
||||
</el-col> -->
|
||||
</el-col>
|
||||
<el-col :span="16">
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input v-model="form.remark" type="textarea" placeholder="" />
|
||||
|
|
@ -275,7 +295,7 @@
|
|||
import {addMachine, delMachine, getMachine, listMachine, updateMachine} from "@/api/store/tools";
|
||||
import { getProLists } from "@/api/base/base";
|
||||
import { imgUpLoad } from "@/api/system/upload";
|
||||
|
||||
import { getTypeList } from "@/api/store/warehousing";
|
||||
|
||||
export default {
|
||||
name: "Dict",
|
||||
|
|
@ -297,13 +317,17 @@ export default {
|
|||
// 总条数
|
||||
total: 0,
|
||||
// 字典表格数据
|
||||
typeList: [],
|
||||
devicesList: [],
|
||||
// 弹出层标题
|
||||
title: "",
|
||||
// 是否显示弹出层
|
||||
open: false,
|
||||
// 日期范围
|
||||
dateRange: [],
|
||||
|
||||
itemList:[],
|
||||
typeList:[],
|
||||
modelList:[],
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
|
|
@ -328,9 +352,24 @@ export default {
|
|||
created() {
|
||||
this.getList();
|
||||
this.getPropData();
|
||||
|
||||
this.getTypeList();
|
||||
},
|
||||
methods: {
|
||||
//设备类型
|
||||
getTypeList() {
|
||||
getTypeList({level:'2'}).then(response => {
|
||||
this.itemList = response.data;
|
||||
}
|
||||
);
|
||||
getTypeList({level:'3'}).then(response => {
|
||||
this.typeList = response.data;
|
||||
}
|
||||
);
|
||||
getTypeList({level:'4'}).then(response => {
|
||||
this.modelList = response.data;
|
||||
}
|
||||
);
|
||||
},
|
||||
/** 查询资产属性下拉 */
|
||||
getPropData() {
|
||||
getProLists().then(response => {
|
||||
|
|
@ -340,8 +379,10 @@ export default {
|
|||
/** 查询列表 */
|
||||
getList() {
|
||||
this.loading = true;
|
||||
listMachine(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
|
||||
this.typeList = response.rows;
|
||||
this.queryParams.beginTime=this.dateRange[0]
|
||||
this.queryParams.endTime=this.dateRange[1]
|
||||
listMachine(this.queryParams).then(response => {
|
||||
this.devicesList = response.rows;
|
||||
this.total = response.total;
|
||||
this.loading = false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -35,12 +35,14 @@ module.exports = {
|
|||
proxy: {
|
||||
// detail: https://cli.vuejs.org/config/#devserver-proxy
|
||||
[process.env.VUE_APP_BASE_API]: {
|
||||
//192.168.0.14:28080
|
||||
// target: `http://192.168.0.14:21624`,//线上环境
|
||||
// target: `http://10.40.92.140:8080`,//丁/
|
||||
//192.168.0.14
|
||||
// target: `http://112.29.103.165:21624`,//线上环境
|
||||
target: `http://192.168.0.14:21624`,//线上环境
|
||||
// target: `http://192.168.4.2:8080`,//丁
|
||||
// target: `http://10.40.92.138:8080`,//丁/
|
||||
// target: `http://10.40.92.126:8080`,//高
|
||||
// target: `http://10.40.92.111:8080`,//亮
|
||||
target: `http://10.40.92.209:8080`,//刘川
|
||||
// target: `http://10.40.92.209:8080`,//刘川
|
||||
|
||||
changeOrigin: true,
|
||||
pathRewrite: {
|
||||
|
|
|
|||
Loading…
Reference in New Issue