Skip to content

X
xtj-ui
Commit ee5f6e69 by T
Options

1.首页新增消息提醒、2.维护提醒、3.储柜灯控制、4.业务流优化和其他bug优化

parent 972f2df6
正在显示 包含 868 行增加 和 291 行删除
public/index.html
......@@ -9,7 +9,7 @@
<script>
window._CONFIG = {};
// window._CONFIG['dlURL'] = 'http://192.168.2.105:5007';
//window._CONFIG['dlURL'] = 'http://192.168.3.188:5007';
// window._CONFIG['dlURL'] = 'http://192.168.3.188:5007';
window._CONFIG['dlURL'] = 'http://41.204.124.248:5001';
</script>
......
src/assets/images/保养.png 0 → 100644
src/assets/images/保养.png

1.43 KB

src/assets/images/报废.png 0 → 100644
src/assets/images/报废.png

1.23 KB

src/assets/images/维修2.png 0 → 100644
src/assets/images/维修2.png

2.35 KB

src/components/bo-ui/bigAside.vue
......@@ -14,7 +14,7 @@
active-text-color="#ffd04b"
>
<el-submenu :class="item.children? '' :'d-none'" v-for="item in asidList" :key="item.id" :index="item.id.toString()">
<template slot="title" style="text-algin: left" >
<template slot="title" style="text-algin:left" >
<div @click="aa(item)">
<svg-icon :icon-class="item.icon" class="svgicon"></svg-icon>
<span slot="title" >{{ item.menuName }}</span>
......@@ -34,7 +34,7 @@
import SvgIcon from '../SvgIcon/index.vue'
export default {
name: 'bo-big-aside',
components: [SvgIcon],
components: {SvgIcon},
props: {
// v-if="item.path === this.$route.path.split('/')[1]"
......@@ -112,7 +112,7 @@ export default {
height: 80px;
width: 100%;
padding: 0 2px;
background: radial-gradient(ellipse at center, #012a47 0% 80%) !important;
//background: radial-gradient(ellipse at center, #012a47 0% 80%) !important;
user-select: none;
cursor: pointer;
box-sizing: border-box;
......
src/icons/svg/消息提醒.svg 0 → 100644
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1677402465080" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="32854" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M578.236052 421.891749 337.761142 421.891749c-7.384178 0-13.360286-5.982248-13.360286-13.359262 0-7.378038 5.975085-13.360286 13.360286-13.360286l240.47491 0c7.384178 0 13.360286 5.982248 13.360286 13.360286C591.596338 415.910525 585.620229 421.891749 578.236052 421.891749z" fill="#bfbfbf" p-id="32855"></path><path d="M685.114245 421.891749l-40.079834 0c-7.384178 0-13.360286-5.982248-13.360286-13.359262 0-7.378038 5.976108-13.360286 13.360286-13.360286l40.079834 0c7.384178 0 13.359262 5.982248 13.359262 13.360286C698.473507 415.910525 692.498422 421.891749 685.114245 421.891749z" fill="#bfbfbf" p-id="32856"></path><path d="M498.077408 555.490513l-146.957003 0c-7.384178 0-13.360286-5.976108-13.360286-13.361309 0-7.377014 5.975085-13.359262 13.360286-13.359262l146.957003 0c7.384178 0 13.359262 5.982248 13.359262 13.359262C511.437693 549.514405 505.462608 555.490513 498.077408 555.490513z" fill="#bfbfbf" p-id="32857"></path><path d="M578.236052 555.490513l-26.719548 0c-7.384178 0-13.359262-5.976108-13.359262-13.361309 0-7.377014 5.975085-13.359262 13.359262-13.359262l26.719548 0c7.384178 0 13.360286 5.982248 13.360286 13.359262C591.596338 549.514405 585.620229 555.490513 578.236052 555.490513z" fill="#bfbfbf" p-id="32858"></path><path d="M274.34174 729.322607c-92.161003-65.455781-143.369292-159.352311-140.472312-257.605056 5.101181-172.965353 177.446411-319.094502 376.342344-319.094502 70.425979 0 137.784086 18.415418 195.581444 49.590442-0.404206-4.168949-0.639566-8.389064-0.639566-12.662391 0-15.721053 2.975774-30.711466 8.18031-44.61922-60.888765-29.074176-130.231063-45.747927-203.122187-45.747927-227.024573 0-423.831938 169.880085-429.754834 370.953613-3.432169 116.428709 55.95643 226.77591 162.938999 302.760488 12.042267 8.55791 28.702716 5.714142 37.261649-6.315846C289.20117 754.555292 286.370705 737.868237 274.34174 729.322607z" fill="#bfbfbf" p-id="32859"></path><path d="M836.168566 317.011051c31.794124 46.223764 50.359968 98.958826 50.359968 153.917532 0 182.882214-168.81073 331.664795-376.316761 331.664795-4.488221 0-8.897647 1.121544-12.837376 3.273557l-121.360022 66.447365 0.678452-1.616824c10.476609-22.074761 24.684192-62.482053 2.12643-85.064374-10.437723-10.4367-27.359115-10.425444-37.795814 0-9.028631 9.027607-10.254551 22.908756-3.653203 33.255405-0.352017 6.066159-4.383844 19.178805-9.471722 30.045293l-30.528294 73.100902c-4.370541 10.476609-1.657756 22.571065 6.783497 30.163997 5.02341 4.527107 11.428284 6.848988 17.874089 6.848988 4.397147 0 8.806573-1.069355 12.837376-3.273557l182.275393-99.793844c233.781464-3.340071 422.826028-174.771489 422.826028-385.05068 0-60.086493-17.612123-117.347638-48.350195-168.190607C874.941638 311.419705 856.128153 316.482001 836.168566 317.011051z" fill="#bfbfbf" p-id="32860"></path><path d="M955.623191 177.502693c0 61.788252-50.100048 111.874997-111.87602 111.874997-61.788252 0-111.873973-50.085722-111.873973-111.874997 0-61.782112 50.085722-111.867834 111.873973-111.867834C905.523143 65.63486 955.623191 115.720581 955.623191 177.502693z" fill="#bfbfbf" p-id="32861"></path></svg>
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1677402465080" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="32854" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M578.236052 421.891749 337.761142 421.891749c-7.384178 0-13.360286-5.982248-13.360286-13.359262 0-7.378038 5.975085-13.360286 13.360286-13.360286l240.47491 0c7.384178 0 13.360286 5.982248 13.360286 13.360286C591.596338 415.910525 585.620229 421.891749 578.236052 421.891749z" fill="#bfbfbf" p-id="32855"></path><path d="M685.114245 421.891749l-40.079834 0c-7.384178 0-13.360286-5.982248-13.360286-13.359262 0-7.378038 5.976108-13.360286 13.360286-13.360286l40.079834 0c7.384178 0 13.359262 5.982248 13.359262 13.360286C698.473507 415.910525 692.498422 421.891749 685.114245 421.891749z" fill="#bfbfbf" p-id="32856"></path><path d="M498.077408 555.490513l-146.957003 0c-7.384178 0-13.360286-5.976108-13.360286-13.361309 0-7.377014 5.975085-13.359262 13.360286-13.359262l146.957003 0c7.384178 0 13.359262 5.982248 13.359262 13.359262C511.437693 549.514405 505.462608 555.490513 498.077408 555.490513z" fill="#bfbfbf" p-id="32857"></path><path d="M578.236052 555.490513l-26.719548 0c-7.384178 0-13.359262-5.976108-13.359262-13.361309 0-7.377014 5.975085-13.359262 13.359262-13.359262l26.719548 0c7.384178 0 13.360286 5.982248 13.360286 13.359262C591.596338 549.514405 585.620229 555.490513 578.236052 555.490513z" fill="#bfbfbf" p-id="32858"></path><path d="M274.34174 729.322607c-92.161003-65.455781-143.369292-159.352311-140.472312-257.605056 5.101181-172.965353 177.446411-319.094502 376.342344-319.094502 70.425979 0 137.784086 18.415418 195.581444 49.590442-0.404206-4.168949-0.639566-8.389064-0.639566-12.662391 0-15.721053 2.975774-30.711466 8.18031-44.61922-60.888765-29.074176-130.231063-45.747927-203.122187-45.747927-227.024573 0-423.831938 169.880085-429.754834 370.953613-3.432169 116.428709 55.95643 226.77591 162.938999 302.760488 12.042267 8.55791 28.702716 5.714142 37.261649-6.315846C289.20117 754.555292 286.370705 737.868237 274.34174 729.322607z" fill="#bfbfbf" p-id="32859"></path><path d="M836.168566 317.011051c31.794124 46.223764 50.359968 98.958826 50.359968 153.917532 0 182.882214-168.81073 331.664795-376.316761 331.664795-4.488221 0-8.897647 1.121544-12.837376 3.273557l-121.360022 66.447365 0.678452-1.616824c10.476609-22.074761 24.684192-62.482053 2.12643-85.064374-10.437723-10.4367-27.359115-10.425444-37.795814 0-9.028631 9.027607-10.254551 22.908756-3.653203 33.255405-0.352017 6.066159-4.383844 19.178805-9.471722 30.045293l-30.528294 73.100902c-4.370541 10.476609-1.657756 22.571065 6.783497 30.163997 5.02341 4.527107 11.428284 6.848988 17.874089 6.848988 4.397147 0 8.806573-1.069355 12.837376-3.273557l182.275393-99.793844c233.781464-3.340071 422.826028-174.771489 422.826028-385.05068 0-60.086493-17.612123-117.347638-48.350195-168.190607C874.941638 311.419705 856.128153 316.482001 836.168566 317.011051z" fill="#bfbfbf" p-id="32860"></path><path d="M955.623191 177.502693c0 61.788252-50.100048 111.874997-111.87602 111.874997-61.788252 0-111.873973-50.085722-111.873973-111.874997 0-61.782112 50.085722-111.867834 111.873973-111.867834C905.523143 65.63486 955.623191 115.720581 955.623191 177.502693z" fill="#bfbfbf" p-id="32861"></path></svg>
\ No newline at end of file
src/main.js
......@@ -33,7 +33,7 @@ Vue.config.productionTip = false
//axios.defaults.baseURL = 'http://192.168.3.74:5001'
//开发环境
//axios.defaults.baseURL = 'http://192.168.3.188:5007'
// axios.defaults.baseURL = 'http://192.168.3.188:5007'
//现场
axios.defaults.baseURL = 'http://41.204.124.248:5001'
......
src/router/modules/warehouse.js
......@@ -30,6 +30,13 @@ const warehouse = [
name: 'warehouseInventory',
component: () => import('@/warehouse/warehouseInventory')
}
,
{
//维护提醒
path: '/warehouse/equMaintenanceReminder',
name: 'equMaintenanceReminder',
component: () => import('@/warehouse/equMaintenanceReminder')
}
]
......
src/views/baseInfo/Materiel.vue
......@@ -17,7 +17,7 @@
<el-breadcrumb-item :to="{ path: '/index' }"
>首页</el-breadcrumb-item
>
<el-breadcrumb-item>仓库管理 </el-breadcrumb-item>
<el-breadcrumb-item>基础信息 </el-breadcrumb-item>
<el-breadcrumb-item>物料管理</el-breadcrumb-item>
</el-breadcrumb></el-col
>
......@@ -69,7 +69,7 @@
v-model="searchData.IsHaoCai"
filterable
clearable
placeholder="请选择是否贴标"
placeholder="是否贴标"
>
<el-option
v-for="item in optionsEquipment"
......@@ -215,7 +215,7 @@
</td>
<th class="textHeader">是否贴标</th>
<td class="textContentLast">
{{ detailData.IsHaoCai == 1 ? "未贴标" : "已贴标" }}
{{ detailData.IsHaoCai == 1 ? "否" : "是" }}
</td>
</tr>
<tr style="border-bottom: 1px solid #e8e8e8">
......@@ -250,7 +250,7 @@
<tr style="border-bottom: 1px solid #e8e8e8">
<th class="textHeader">使用说明</th>
<td class="textContentLast">
<span v-html="detailData.Instructions">
<span>
{{ detailData.Instructions }}
</span>
</td>
......@@ -278,8 +278,8 @@
</el-card>
<div slot="footer" class="dialog-footer">
<!-- <el-button @click="borrowTableVisible = false">取 消</el-button> -->
<el-button type="primary" @click="borrowTableVisible = false"
>确 定</el-button
<el-button @click="borrowTableVisible = false"
>关 闭</el-button
>
</div>
</el-dialog>
......@@ -329,7 +329,7 @@
class="inputA"
:disabled="codeDis"
v-model="EditRuleForm.Code"
placeholder="请输入编码"
placeholder="请输入编码（必须5位）"
></el-input>
</el-form-item>
<el-form-item class="diaB" label="是否贴标">
......@@ -341,7 +341,7 @@
>
</el-form-item>
<el-form-item class="diaB" label="保养周期">
<el-form-item class="diaB" label="保养周期(天)">
<el-input-number
class="inputA"
v-model="EditRuleForm.TermDays"
......@@ -441,8 +441,9 @@
controls="controls">
您的浏览器不支持视频播放
</video>
<i v-else-if="videoForm.storageurl =='' && !videoFlag"
class="el-icon-plus avatar-uploader-icon"></i>
<!-- <i v-else-if="videoForm.storageurl =='' && !videoFlag"
class="el-icon-plus avatar-uploader-icon"></i> -->
<el-button size="small" type="primary">点击上传 <i class="el-icon-film"></i></el-button>
<el-progress v-if="videoFlag == true"
type="circle"
v-bind:percentage="videoUploadPercent"
......@@ -450,13 +451,21 @@
</el-upload>
</el-form-item>
<el-form-item class="diaC" label="使用说明">
<quill-editor
<!-- <quill-editor
ref="text"
style="height: 200px; width: 88%"
v-model="EditRuleForm.Instructions"
class="myQuillEditor"
:options="editorOption"
/>
/> -->
<el-input
type="textarea"
:autosize="{ minRows: 2, maxRows: 4 }"
v-model="EditRuleForm.Instructions"
class="areaClass"
placeholder="请输入使用说明"
>
</el-input>
</el-form-item>
<el-form-item v-if="false">
......@@ -542,11 +551,11 @@ export default {
},
{
value: "1",
label: "未贴标",
label: "否",
},
{
value: "0",
label: "已贴标",
label: "是",
},
],
videoForm: {
......@@ -885,7 +894,7 @@ console.log("up")
})
.catch((e) => {
this.$message.error("已取消删除");
this.$message.warning("已取消删除");
});
},
......@@ -904,9 +913,9 @@ console.log("up")
},
stateFormat(row) {
if (row.IsHaoCai === 0) {
return "已贴标";
return "是";
} else {
return "未贴标";
return "否";
}
},
closeForm() {
......@@ -924,24 +933,24 @@ body {
font-size: 15px;
}
.avatar-uploader-icon {
border: 1px dashed #d9d9d9 !important;
border: 10px dashed #d9d9d9 !important;
}
.avatar-uploader .el-upload {
border: 1px dashed #d9d9d9 !important;
border: 10px dashed #d9d9d9 !important;
border-radius: 6px !important;
position: relative !important;
overflow: hidden !important;
}
.avatar-uploader .el-upload:hover {
border: 1px dashed #d9d9d9 !important;
border: 10px dashed #d9d9d9 !important;
border-color: #409eff;
}
.avatar-uploader-icon {
font-size: 28px;
font-size: 100px;
color: #8c939d;
width: 300px;
height: 178px;
line-height: 178px;
width: 50px;
height: 48px;
line-height: 48px;
text-align: center;
}
.avatar {
......@@ -994,7 +1003,7 @@ body {
min-height: 192px;
}
.diaC {
font-weight: 1000;
font-weight: 300;
margin-left: 29px;
margin-bottom: 12px;
}
......
src/views/baseInfo/equipmentType.vue
......@@ -17,7 +17,7 @@
<el-breadcrumb-item :to="{ path: '/index' }"
>首页</el-breadcrumb-item
>
<el-breadcrumb-item>仓库管理 </el-breadcrumb-item>
<el-breadcrumb-item>基础信息 </el-breadcrumb-item>
<el-breadcrumb-item>装备类别</el-breadcrumb-item>
</el-breadcrumb></el-col
>
......@@ -111,6 +111,15 @@
@click="edit(scope.row)"
>修改</a-button
>
<a-button
type="primary"
class="actions"
ghost
round
size="small"
@click="deleteClick(scope.row)"
>删除</a-button
>
</template>
</el-table-column>
</el-table>
......@@ -145,7 +154,7 @@
<!-- </el-card> -->
<div slot="footer" class="dialog-footer">
<el-button @click="addVisible = false,resetForm('ruleForm')">取 消</el-button>
<el-button @click="resetForm('ruleForm')">重 置</el-button>
<el-button @click="resetForm('ruleForm')" v-if="title !== '修改大类'">重 置</el-button>
<el-button type="primary" @click="submitForm('ruleForm', title)"
>提交</el-button
>
......@@ -290,13 +299,34 @@ export default {
this.addVisible = true;
this.codeDis=true;
this.$nextTick(async()=>{
await this.resetForm('ruleForm')
//await this.resetForm('ruleForm')
this.ruleForm = JSON.parse(JSON.stringify(row));;
})
},
//删除大类
deleteClick(row) {
const url = "/api/EqCategory/" + row.ID;
this.$confirm("此操作将永久删除该条数据, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(async () => {
const { data: res } = await this.$axios.delete(url);
if (res.Success === true) {
this.getQueuData();
this.$message.success("已删除该数据");
} else {
this.$message.error(res.Remark);
}
})
.catch((e) => {
this.$message.warning("已取消删除");
});
},
//获取详细信息
async getDetailInfo(row) {
this.picVisible = true;
......
src/views/baseInfo/size.vue
......@@ -17,7 +17,7 @@
<el-breadcrumb-item :to="{ path: '/index' }"
>首页</el-breadcrumb-item
>
<el-breadcrumb-item>仓库管理 </el-breadcrumb-item>
<el-breadcrumb-item>基础信息 </el-breadcrumb-item>
<el-breadcrumb-item>号型管理</el-breadcrumb-item>
</el-breadcrumb></el-col
>
......@@ -43,7 +43,7 @@
></el-input>
<el-select
class="textboxBo"
v-model="searchData.ClassID"
v-model="searchData.CategoryId"
filterable
clearable
placeholder="请选择类型"
......@@ -278,11 +278,11 @@ export default {
},
{
value: "1",
label: "未贴标",
label: "不贴标",
},
{
value: "0",
label: "已贴标",
label: "贴标",
},
],
searchEqCategoryData: {
......@@ -556,7 +556,7 @@ export default {
}
})
.catch((e) => {
this.$message.error("已取消删除");
this.$message.warning("已取消删除");
});
},
......@@ -575,9 +575,9 @@ export default {
},
stateFormat(row) {
if (row.EqHaoCai === 0) {
return "已贴标";
return "贴标";
} else {
return "未贴标";
return "不贴标";
}
},
closeForm() {
......
src/views/borrow/return.vue
......@@ -69,7 +69,7 @@
icon="search"
style="height: 40px"
class="textboxBo"
@click="getQueuData()"
@click="getQueuData(1)"
>查询</a-button
>
......@@ -201,7 +201,10 @@ export default {
this.imgurl =window._CONFIG['dlURL'] + "/"+row.ImagePath;
},
async getQueuData() {
async getQueuData(arg) {
if(arg) {
this.searchData.Page = 1
}
this.loading=true;
const { data: res } = await this.$axios.get('api/ReturnLog', {params: this.searchData});
this.total = res.Total;
......
src/views/borrow/user.vue
......@@ -17,7 +17,7 @@
<el-breadcrumb-item :to="{ path: '/index' }"
>首页</el-breadcrumb-item
>
<el-breadcrumb-item>借领管理</el-breadcrumb-item>
<el-breadcrumb-item>业务管理</el-breadcrumb-item>
<el-breadcrumb-item>人员借用</el-breadcrumb-item>
</el-breadcrumb></el-col
>
......
src/views/borrow/userGet.vue
......@@ -17,7 +17,7 @@
<el-breadcrumb-item :to="{ path: '/index' }"
>首页</el-breadcrumb-item
>
<el-breadcrumb-item>借领管理</el-breadcrumb-item>
<el-breadcrumb-item>业务管理</el-breadcrumb-item>
<el-breadcrumb-item>领用管理</el-breadcrumb-item>
</el-breadcrumb></el-col
>
......@@ -78,7 +78,7 @@
icon="search"
style="height: 40px"
class="textboxBo"
@click="getQueuData()"
@click="getQueuData(1)"
>查询</a-button
>
......@@ -120,15 +120,21 @@
align="center"
/>
<el-table-column prop="ExamineTime" label="审核时间" align="center" />
<el-table-column
prop="ExamineStateName"
label="审核状态"
align="center"
/>
<el-table-column prop="LyTime" label="领用时间" align="center" />
<el-table-column
prop="SubmitStateName"
label="状 态"
label="当前状态"
:formatter="SubmitFormat"
align="center"
/>
<el-table-column
prop="SubmitState"
fixed="right"
label="操作"
width="100"
>
......@@ -323,6 +329,58 @@
<el-form
:model="ruleForm"
ref="ruleForm"
label-position="left"
style="margin-top: 30px"
>
<!-- class="inputClass" -->
<el-row :gutter="90" style="margin-top: 30px">
<el-col :span="8" style="padding-top: 42px">
<el-form-item style="padding-left: 12px" label="部门选择">
<treeselect
style="width: 247px; float: left; margin-left: 18px"
noOptionsText="暂无数据"
:options="departOptions"
placeholder="请选择上级部门"
:normalizer="normalizer"
@select="selectDepart"
/>
</el-form-item>
<el-form-item class="diaC"
>人员选择
<el-select
class="diaD"
v-model="ruleForm.submitUserName"
placeholder="请选择人员"
@change="policeSelect"
>
<el-option
v-for="item in policeOptions"
:key="item.ID"
:label="item.UserName"
:value="item.ID"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item class="labelClass"
>备注
<el-input
type="textarea"
:autosize="{ minRows: 6, maxRows: 50 }"
v-model="ruleForm.Remarks"
></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-divider style="margin-bottom: 35px"></el-divider>
<el-form
:model="ruleForm"
ref="ruleForm"
label-width="100px"
style="margin-top: 10px; margin-bottom: 35px"
>
......@@ -448,58 +506,7 @@
<el-col :span="10"> </el-col>
</el-row>
</el-form>
<el-divider style="margin-bottom: 35px"></el-divider>
<el-form
:model="ruleForm"
ref="ruleForm"
label-position="left"
style="margin-top: 30px"
>
<!-- class="inputClass" -->
<el-row :gutter="90" style="margin-top: 30px">
<el-col :span="8" style="padding-top: 42px">
<el-form-item style="padding-left: 12px" label="部门选择">
<treeselect
style="width: 247px; float: left; margin-left: 18px"
noOptionsText="暂无数据"
:options="departOptions"
placeholder="请选择上级部门"
:normalizer="normalizer"
@select="selectDepart"
/>
</el-form-item>
<el-form-item class="diaC"
>人员选择
<el-select
class="diaD"
v-model="ruleForm.userID"
placeholder="请选择人员"
@change="policeSelect"
>
<el-option
v-for="item in policeOptions"
:key="item.ID"
:label="item.UserName"
:value="item.ID"
>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item class="labelClass"
>备注
<el-input
type="textarea"
:autosize="{ minRows: 6, maxRows: 50 }"
v-model="ruleForm.Remarks"
></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="addVisible = false">取 消</el-button>
......@@ -767,6 +774,7 @@ export default {
this.AddPlanForm.parentName = node.DepartName;
this.AddPlanForm.parentId = node.ID;
this.searchUserData.DeparId = node.ID;
this.ruleForm.submitUserName='';
const { data: res } = await this.$axios.get("api/User", {
params: this.searchUserData,
});
......@@ -895,10 +903,20 @@ export default {
deleteEquipment(row) {
this.ruleForm.BorrowList.splice(row, 1);
},
SubmitFormat(row) {
if (row.SubmitStateName === '同意申请') {
return "待领取";
}else if(row.SubmitStateName==='等待审批') {
return "待审批";
}
else
{
return row.SubmitStateName;
}
},
//下发领用
async addRecive() {
this.title = "领用下发(未贴标物资)";
this.title = "领用下发(不贴标物资)";
this.addVisible = true;
this.ruleForm.BorrowList = [];
//
......@@ -970,8 +988,10 @@ export default {
if(this.$route.query.options!=undefined)
{ this.searchData.SubmitState=this.$route.query.options;}
},
async getQueuData() {
async getQueuData(arg) {
if(arg) {
this.searchData.Page = 1
}
this.loading = true;
const { data: res } = await this.$axios.get("api/Borrow", {
params: this.searchData,
......
src/views/index.vue
......@@ -4,6 +4,7 @@
<el-header>
<!-- logo区域 -->
<div class="logo" @click="goHome()">
<!-- <img src="../assets/logo_xtj.png" alt="logo" /> -->
<img src="../assets/logo_xtj.png" alt="logo" />
<span>巡特警装备管理系统</span>
</div>
......@@ -142,8 +143,8 @@ export default {
// 头部样式
.el-header {
// background: linear-gradient(to bottom, #344534, #284527 20%, #344534 65%, #284527 80%, #344534) !important;
background: radial-gradient(ellipse at center, #0f3854 0%, #000000 80%);
background: #04436f no-repeat 100% 100%;
background: radial-gradient(ellipse at center, #0f3854 20%, #000000 160%);
// background: #04436f no-repeat 100% 100%;
// background-size: 20% 100%;
background-position: center;
display: flex;
......
src/views/log/doorLog.vue
......@@ -49,7 +49,7 @@
icon="search"
style="height: 40px"
class="textboxBo"
@click="getQueuData()"
@click="getQueuData(1)"
>查询</a-button
>
</el-form>
......@@ -266,7 +266,10 @@ export default {
// console.log("1",this.searchData.BeginTime)
// console.log("2",this.searchData.EndTime)
},
async getQueuData() {
async getQueuData(arg) {
if(arg) {
this.searchData.Page = 1
}
this.loading=true;
const { data: res } = await this.$axios.get("api/MenJingLog", {
params: this.searchData,
......
src/views/log/outinExceptionPhto.vue 0 → 100644
<template>
<el-dialog title="照片查看" :visible.sync="picVisible" width="900px">
<img
:src="imgurl"
class="picOutIn"
width="855px"
height="512px"
alt=""
/>
<div slot="footer" class="dialog-footer">
<el-button @click="picVisible = false">关 闭</el-button>
</div>
</el-dialog>
</template>
<script>
import outinExceptionPhto from './outinExceptionPhto'
export default {
components: { outinExceptionPhto},
data() {
return {
loading: false,
input: "",
form: {},
DepartName:"",
departOptions: [],
policeOptions:[],
tableData: [],
detailData: [],
picVisible:false,
imgurl: [],
borrowData: [],
outInExVisible: false,
};
},
created() {
},
methods: {
//查看照片信息
async getDetailInfo(row) {
this.picVisible = true;
this.imgurl = window._CONFIG["dlURL"] + "/" + row.PhotoUrl;
},
//关闭窗口
closeForm() {
//this.resetForm();
this.outInExVisible = false;
},
},
computed: {},
};
</script>
\ No newline at end of file
src/views/log/outinLog.vue
......@@ -17,7 +17,7 @@
<el-breadcrumb-item :to="{ path: '/index' }"
>首页</el-breadcrumb-item
>
<el-breadcrumb-item>借领管理</el-breadcrumb-item>
<el-breadcrumb-item>日志查看</el-breadcrumb-item>
<el-breadcrumb-item>出入库记录</el-breadcrumb-item>
</el-breadcrumb></el-col
>
......@@ -75,9 +75,17 @@
icon="search"
style="height: 40px"
class="textboxBo"
@click="getQueuData()"
@click="getQueuData(1)"
>查询</a-button
>
<el-button
type="danger"
icon="el-icon-document-remove"
style="height: 40px"
class="funcButton"
@click="exceptionHandling()"
>异常出库处理</el-button
>
</el-form>
<!-- 列表区域 -->
......@@ -96,23 +104,35 @@
<el-table-column prop="ID" v-if="false" />
<el-table-column prop="PhotoUrl" v-if="false" />
<el-table-column
prop="Type" :formatter="stateFormat" label="类型" width="120" align="center" />
<el-table-column
prop="MaterielName"
label="物料名称"
width="250"
align="center"
/>
<el-table-column prop="EqSizeName" label="号型名称" width="200" align="center" />
<el-table-column prop="EquName" label="装备名称" width="250" align="center" />
<el-table-column prop="UserName" label="出入库人员" width="100" align="center" />
<el-table-column prop="EqSizeName" label="号型名称" width="100" align="center" />
<el-table-column prop="LocationName" label="储位名称" width="100" align="center" />
<el-table-column prop="UserName" label="操作人员" width="100" align="center" />
<el-table-column
prop="CreateTime"
label="出入库时间"
width="250"
align="center"
/>
<el-table-column fixed="right" label="照片查看" align="center">
<el-table-column prop="Type" label="出入库类型" width="120" align="center" >
<template slot-scope="scope">
<el-tag v-if="scope.row.Type === 0" type="success">入库</el-tag>
<el-tag v-else-if="scope.row.Type === 1" type="warning">出库</el-tag>
<el-tag v-else-if="scope.row.Type === 11" type="danger">异常出库</el-tag>
</template>
</el-table-column>
<el-table-column prop="IsReturned" label="异常出库处理" width="100" align="center" >
<template slot-scope="slotp">
<el-tag v-if="slotp.row.IsReturned === true && slotp.row.Type === 11 " type="success">已归还</el-tag>
<el-tag v-else-if="slotp.row.Type === false " ></el-tag>
</template>
</el-table-column>
<el-table-column label="照片查看" align="center">
<template slot-scope="scope">
<el-button
v-if="scope.row.PhotoUrl !== null"
......@@ -223,6 +243,9 @@
</div>
</el-dialog>
<!-- 表单组件-引用异常出库页面 -->
<outinExceptionHandling ref="outinExceptionHandling" />
<!-- 分页功能 -->
<el-row type="flex" justify="center" align="middle">
<el-pagination
......@@ -242,7 +265,9 @@
<script>
import outinExceptionHandling from './outinExceptionHandling'
export default {
components: { outinExceptionHandling },
data() {
return {
loading: false,
......@@ -307,7 +332,8 @@ export default {
},
created() {
this.searchData.State = this.$route.query.State || this.searchData.State;
this.searchData.Type =
this.searchData.Type = this.$route.query.Type || this.searchData.Type;
this.getQueuData();
},
......@@ -317,8 +343,17 @@ export default {
this.picVisible = true;
this.imgurl = window._CONFIG["dlURL"] + "/" + row.PhotoUrl;
},
async InitQuery()
{
if(this.$route.query.options!=undefined)
{ this.searchData.Type=this.$route.query.options;}
},
///获取详细信息
async getQueuData() {
async getQueuData(arg) {
if(arg) {
this.searchData.Page = 1
}
this.loading = true;
const { data: res } = await this.$axios.get(
"api/Borrow/GetInventoryLog",
......@@ -336,19 +371,27 @@ export default {
this.getQueuData();
},
stateFormat(row) {
if (row.Type === 0) {
return "入库";
} else if(row.Type===1) {
return "出库";
}
else if(row.Type===11) {
return "异常出库";
}
else
{
return "";
}
// stateFormat(row) {
// if (row.Type === 0) {
// return "入库";
// } else if(row.Type===1) {
// return "出库";
// }
// else if(row.Type===11) {
// return "异常出库";
// }
// else
// {
// return "";
// }
// },
exceptionHandling(){
const _this = this.$refs.outinExceptionHandling
_this.outInExVisible = true;
_this.getQueuData();
_this.selectDepart();
console.log('cl')
},
// 分页功能
// 每页显示条数发生改变时
......
src/views/log/pdaLog.vue
......@@ -48,7 +48,7 @@
icon="search"
style="height: 40px"
class="textboxBo"
@click="getQueuData()"
@click="getQueuData(1)"
>查询</a-button
>
</el-form>
......@@ -284,7 +284,10 @@ export default {
// console.log("1",this.searchData.BeginTime)
// console.log("2",this.searchData.EndTime)
},
async getQueuData() {
async getQueuData(arg) {
if(arg) {
this.searchData.Page = 1
}
this.loading=true;
const { data: res } = await this.$axios.get("api/MoblieLog", {
params: this.searchData,
......
src/views/log/receiveLog.vue
......@@ -78,7 +78,7 @@
icon="search"
style="height: 40px"
class="textboxBo"
@click="getQueuData()"
@click="getQueuData(1)"
>查询</a-button
>
</el-form>
......@@ -392,7 +392,10 @@ export default {
// console.log("1",this.searchData.BeginTime)
// console.log("2",this.searchData.EndTime)
},
async getQueuData() {
async getQueuData(arg) {
if(arg) {
this.searchData.Page = 1
}
this.loading = true;
const { data: res } = await this.$axios.get(
"api/LingYongList/GetLingYongLog",
......
src/views/login/Login.vue
......@@ -36,7 +36,7 @@
<el-input
v-model="loginForm.UserAccount"
style="width: 350px"
placeholder="请输入登录ID"
placeholder="请输入账号"
>
<i slot="prefix">
<img src="@icons/user.png" alt="" />
......@@ -209,6 +209,12 @@ export default {
menuName: "仓库盘点",
icon: "盘点",
},
{
id: 3 - 6,
path: "/warehouse/equMaintenanceReminder",
menuName: "维护提醒",
icon: "消息提醒",
},
],
},
{
......
src/views/statistics/stock.vue
......@@ -80,6 +80,7 @@
size="small"
border
highlight-current-row
max-height="460"
>
<el-table-column
width="100"
......@@ -91,9 +92,11 @@
<el-table-column prop="MaterielName" label="物料名称" align="center" />
<el-table-column prop="MaterielCode" label="物料编码" align="center" />
<el-table-column prop="EqTotalCount" label="装备总数" align="center" />
<el-table-column prop="ResCount" label="已贴标数" align="center" />
<el-table-column prop="InStoreCount" label="装备在库数" align="center" />
<el-table-column prop="OutOfStoreCount" label="装备出库数" align="center" />
<el-table-column prop="ResCount" label="装备已注册" align="center" />
<el-table-column prop="WeixiuCount" label="装备维修数" align="center" />
<el-table-column prop="BaofeiCount" label="装备报废数" align="center" />
<el-table-column prop="LibaryName" label="仓库名称" align="center" />
<el-table-column prop="Storage" label="库 位" align="center" />
<el-table-column
......@@ -146,6 +149,7 @@ export default {
Order: "ASC",
OrderBy: "",
MaterialName:"",
LibraryID:"",
},
warehouseOptions:[],
searchWarehouseData: {
......@@ -265,6 +269,7 @@ export default {
async getQueuData() {
this.warehouseOptions=[];
this.loading = true;
this.searchData.MaterialName=this.searchData.MaterialName;
const { data: res } = await this.$axios.get(
"api/ChartStatistics/GetStock",
{
......
src/views/systemConfig/department.vue
......@@ -58,7 +58,7 @@
icon="search"
style="height: 40px"
class="textboxBo"
@click="getQueuData()"
@click="getQueuData(1)"
>查询</a-button
>
<el-button
......@@ -241,8 +241,8 @@ export default {
this.ruleForm = {
ID: 0,
DepartName: "",
parentName: "",
parentId: "",
//parentName: "",
// parentId: "",
Remarks: "",
};
},
......@@ -311,8 +311,8 @@ export default {
formData.append("ID", this.ruleForm.ID);
formData.append("DepartName", this.ruleForm.DepartName);
formData.append("parentName", this.ruleForm.parentName);
formData.append("parentId", this.ruleForm.parentId);
formData.append("parentName", this.ruleForm.parentName===undefined||this.ruleForm.parentName===null?"":this.ruleForm.parentName);
formData.append("parentId", this.ruleForm.parentId===undefined||this.ruleForm.parentId===null?"":this.ruleForm.parentId);
formData.append("Remarks", this.ruleForm.Remarks===null?"":this.ruleForm.Remarks);
const config = {
......@@ -326,7 +326,7 @@ export default {
formData,
config
);
if (res.Success !== true) return this.$message(res.message);
if (res.Success !== true) return this.$message(res.Remark);
} else {
//修改仓库类型
// console.log(this.ruleForm.ID)
......@@ -336,7 +336,7 @@ export default {
formData,
config
);
if (res.Success !== true) return this.$message(res.message);
if (res.Success !== true) return this.$message(res.Remark);
}
this.getQueuData();
this.addVisible = false;
......@@ -383,7 +383,7 @@ export default {
}
})
.catch((e) => {
this.$message.error("已取消删除");
this.$message.warning("已取消删除");
});
},
async getSuperiorDepartment() {
......@@ -428,7 +428,10 @@ export default {
this.getSuperiorDepartment();
});
},
async getQueuData() {
async getQueuData(arg) {
if(arg) {
this.searchData.Page = 1
}
this.loading = true;
const { data: res } = await this.$axios.get("api/Department", {
params: this.searchData,
......
src/views/systemConfig/equipmentInfo.vue
......@@ -17,7 +17,7 @@
<el-breadcrumb-item :to="{ path: '/index' }"
>首页</el-breadcrumb-item
>
<el-breadcrumb-item>系统设置 </el-breadcrumb-item>
<el-breadcrumb-item>个人中心 </el-breadcrumb-item>
<el-breadcrumb-item>装备信息</el-breadcrumb-item>
</el-breadcrumb></el-col
>
......@@ -77,7 +77,7 @@
icon="search"
style="height: 40px"
class="textboxBo"
@click="getQueuData()"
@click="getQueuData(1)"
>查询</a-button
>
......@@ -190,7 +190,7 @@
</td>
<th class="textHeader">是否贴标</th>
<td class="textContent">
{{ detailData.IsHaoCai == 1 ? "未贴标" : "已贴标" }}
{{ detailData.IsHaoCai == 1 ? "否" : "是" }}
</td>
<th class="textHeader">数量</th>
<td class="textContentLast">
......@@ -448,11 +448,11 @@ export default {
},
{
value: "1",
label: "未贴标",
label: "不贴标",
},
{
value: "0",
label: "已贴标",
label: "贴标",
},
],
......@@ -692,7 +692,10 @@ export default {
});
},
async getQueuData() {
async getQueuData(arg) {
if(arg) {
this.searchData.Page = 1
}
this.loading = true;
const { data: resclass } = await this.$axios.get("api/EqCategory", {
params: this.searchEqCategoryData,
......@@ -750,9 +753,9 @@ export default {
},
stateFormat(row) {
if (row.IsHaoCai == 0) {
return "已贴标";
return "是";
} else {
return "未贴标";
return "否";
}
},
closeForm() {
......
src/views/systemConfig/police.vue
......@@ -60,7 +60,7 @@
icon="search"
style="height: 40px"
class="textboxBo"
@click="getQueuData()"
@click="getQueuData(1)"
>查询</a-button
>
<el-button
......@@ -261,7 +261,7 @@
<el-input
style="width: 300px"
v-model="ruleForm.PoliceCode"
placeholder="请输入警员编号"
placeholder="请输入警员编号(6位)"
></el-input>
</el-form-item>
<el-form-item label="出口指纹机密码" prop="PolicePassword">
......@@ -407,7 +407,7 @@
</td>
<th class="textHeader">单警柜密码</th>
<td class="textContentLast">
{{ detailData.StoragePassword }}
{{ detailData.StoragePassword===null?' ': detailData.StoragePassword}}
</td>
</tr>
<tr>
......@@ -487,6 +487,9 @@ export default {
DeparId: [
{ required: true, message: "请选择所属部门", trigger: "blur" },
],
PoliceCode: [
{ required: true, message: "请输入警员编号", trigger: "blur" },
],
PoliceCategoryId: [
{ required: true, message: "请选择所属警种", trigger: "blur" },
],
......@@ -751,7 +754,7 @@ export default {
formData.append("DeparId", this.ruleForm.DeparId);
formData.append("DepartName", this.ruleForm.DepartName);
formData.append("PoliceCategoryId", this.ruleForm.PoliceCategoryId);
formData.append("PecoliePassword",this.ruleForm.PecoliePassword==null?"":this.ruleForm.PecoliePassword);
formData.append("PecoliePassword",this.ruleForm.PecoliePassword===null?"":this.ruleForm.PecoliePassword);
formData.append(
"PoliceCategoryldName",
this.ruleForm.PoliceCategoryldName
......@@ -905,8 +908,8 @@ export default {
formData.append("ID", this.ruleForm.ID);
formData.append("UserPassword", this.ruleForm.UserPassword);
formData.append("StorageId", this.ruleForm.StorageId);
formData.append("StoragePassword", this.ruleForm.StoragePassword);
console.log("password",this.ruleForm.StoragePassword)
formData.append("StoragePassword", this.ruleForm.StoragePassword===null?"":this.ruleForm.StoragePassword);
console.log("password",this.ruleForm.StoragePassword===null?"":this.ruleForm.StoragePassword)
console.log("pass",formData);
if(this.ruleForm.ID!==0)
{
......@@ -940,7 +943,7 @@ export default {
}
})
.catch((e) => {
this.$message.error("已取消删除");
this.$message.warning("已取消删除");
});
},
//修改部门
......@@ -1026,7 +1029,10 @@ export default {
this.getSuperiorDepartment();
this.GetPoliceCategory();
},
async getQueuData() {
async getQueuData(arg) {
if(arg) {
this.searchData.Page = 1
}
this.loading = true;
const { data: res } = await this.$axios.get("api/User", {
params: this.searchData,
......
src/views/systemConfig/policeType.vue
......@@ -60,7 +60,7 @@
icon="search"
style="height: 40px"
class="textboxBo"
@click="getQueuData()"
@click="getQueuData(1)"
>查询</a-button
>
<el-button
......@@ -345,7 +345,10 @@ export default {
this.$nextTick(()=>{
this.resetForm('ruleForm')})
},
async getQueuData() {
async getQueuData(arg) {
if(arg) {
this.searchData.Page = 1
}
this.loading = true;
const { data: res } = await this.$axios.get("api/PoliceCategory", {
params: this.searchData,
......
src/views/systemConfig/receiveApply.vue
......@@ -17,7 +17,7 @@
<el-breadcrumb-item :to="{ path: '/index' }"
>首页</el-breadcrumb-item
>
<el-breadcrumb-item>系统设置 </el-breadcrumb-item>
<el-breadcrumb-item>个人中心 </el-breadcrumb-item>
<el-breadcrumb-item>领用申请</el-breadcrumb-item>
</el-breadcrumb></el-col
>
......@@ -70,7 +70,7 @@
icon="search"
style="height: 40px"
class="textboxBo"
@click="getQueuData()"
@click="getQueuData(1)"
>查询</a-button
>
<el-button
......@@ -104,17 +104,26 @@
<el-table-column prop="ExameReason" label="审核理由" align="center">
</el-table-column>
<el-table-column prop="ExamineTime" label="审核时间" align="center" />
<el-table-column
prop="ExamineStateName"
label="审核状态"
align="center"
/>
<el-table-column prop="LyTime" label="领用时间" align="center">
</el-table-column>
<el-table-column prop="SubmitStateName" label="状态" align="center">
</el-table-column>
<el-table-column
prop="SubmitStateName"
label="当前状态"
:formatter="SubmitFormat"
align="center"
/>
<el-table-column prop="Remarks" label="备注" align="center">
</el-table-column>
<el-table-column
label="操作"
align="left"
fixed="right"
width="240px"
prop="SubmitState"
>
......@@ -484,7 +493,7 @@ export default {
SubmitState: [
{
value: "-3",
value: "-99",
label: "全部",
},
{
......@@ -753,7 +762,7 @@ export default {
},
//新增领用申请
async addRecive() {
this.title = "领用申请(未贴标物资)";
this.title = "领用申请(不贴标物资)";
this.addVisible = true;
this.ruleForm.BorrowList = [];
// console.log("rule",this.ruleForm)
......@@ -850,6 +859,10 @@ export default {
},
//添加装备
addEquipment() {
if(this.AddPlanForm.MaterielId==="")
{
return this.$message.warning("请选择物料添加");
}
var obj = {};
var plan = {
LyCount: 1,
......@@ -863,7 +876,7 @@ export default {
};
console.log("添加物资", plan);
obj = this.ruleForm.BorrowList.find(function (item) {
return item.EqSizeId === plan.EqSizeId;
return item.MaterielID === plan.MaterielID;
});
if (obj === undefined) {
this.ruleForm.BorrowList.push(plan);
......@@ -892,7 +905,7 @@ export default {
stateName="撤销"
}
const url = "/api/Borrow/ChangeState" ;
this.$confirm("是否"+stateName+"提交该数据?", "提示", {
this.$confirm("是否"+stateName+"该数据?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
......@@ -907,7 +920,7 @@ export default {
}
})
.catch((e) => {
this.$message.error(""+stateName+"申请");
this.$message.warning("已取消该"+stateName+"操作");
});
},
......@@ -942,7 +955,7 @@ export default {
}
})
.catch((e) => {
this.$message.error(""+stateName+"操作");
this.$message.warning("已取消"+stateName+"操作");
});
},
......@@ -956,12 +969,12 @@ export default {
const borrowUrl = "/api/Borrow?" + "IsAdmin=" + IsAdmin;
this.$refs[formName].validate(async (valid) => {
if (valid) {
if (type === "领用申请(未贴标物资)") {
if (type === "领用申请(不贴标物资)") {
const { data: res } = await this.$axios.post(
borrowUrl,
this.ruleForm
);
if (res.Success !== true) return this.$message(res.message);
if (res.Success !== true) return this.$message(res.Remark);
} else {
//修改预案类型
// console.log(this.ruleForm.ID)
......@@ -969,7 +982,7 @@ export default {
borrowUrl,
this.ruleForm
);
if (res.Success !== true) return this.$message(res.message);
if (res.Success !== true) return this.$message(res.Remark);
}
this.getQueuData();
this.addVisible = false;
......@@ -990,8 +1003,21 @@ export default {
// "userData",
// ]),
// },
async getQueuData() {
SubmitFormat(row) {
if (row.SubmitStateName === '同意申请') {
return "待领取";
}else if(row.SubmitStateName==='等待审批') {
return "待审批";
}
else
{
return row.SubmitStateName;
}
},
async getQueuData(arg) {
if(arg) {
this.searchData.Page = 1
}
this.borrowType=0;
this.loading = true;
this.searchData.SubmitUsrID = this.userData.Id;
......@@ -1028,7 +1054,7 @@ export default {
}
})
.catch((e) => {
this.$message.error("已取消删除");
this.$message.warning("已取消该删除操作");
});
},
......@@ -1047,9 +1073,9 @@ export default {
},
stateFormat(row) {
if (row.EqHaoCai === 0) {
return "已贴标";
return "贴标";
} else {
return "未贴标";
return "不贴标";
}
},
closeForm() {
......
src/views/systemConfig/repairApply.vue
......@@ -17,7 +17,7 @@
<el-breadcrumb-item :to="{ path: '/index' }"
>首页</el-breadcrumb-item
>
<el-breadcrumb-item>系统设置 </el-breadcrumb-item>
<el-breadcrumb-item>个人中心 </el-breadcrumb-item>
<el-breadcrumb-item>维修申请</el-breadcrumb-item>
</el-breadcrumb></el-col
>
......@@ -70,25 +70,44 @@
icon="search"
style="height: 40px"
class="textboxBo"
@click="getQueuData()"
@click="getQueuData(1)"
>查询</a-button
>
<el-button
<!-- <el-button
type="primary"
icon="el-icon-plus"
style="height: 40px"
class="funcButton"
@click="addHCRecive()"
>维修申请（未贴标）</el-button
>
>维修申请（不贴标）</el-button
> -->
<el-button
type="primary"
icon="el-icon-plus"
style="height: 40px; margin-right: 20px"
class="funcButton"
@click="addIssued()"
>维修申请</el-button
>
<el-dialog :visible.sync="addIssuedDialogVisible" title="请选择要创建的维修下发单据类型" width="500px" align="center">
<div slot="footer" class="dialog-footer" align="center">
<el-button
type="warning"
icon="el-icon-setting"
@click="addHCRecive()"
>维修申请(不贴标)</el-button
>
<el-button
type="success"
icon="el-icon-setting"
@click="addNHCRecive()"
>维修申请（已贴标）</el-button
>维修申请(贴标)</el-button
>
<!-- <el-button type="primary" @click="clickOrderType">确认</el-button> -->
</div>
</el-dialog>
</el-form>
<!-- 列表区域 -->
......@@ -118,11 +137,19 @@
<el-table-column prop="ExameReason" label="审核理由" align="center">
</el-table-column>
<el-table-column prop="ExamineTime" label="审核时间" align="center" />
<el-table-column
prop="ExamineStateName"
label="审核状态"
align="center"
/>
<el-table-column prop="LyTime" label="维修时间" align="center">
</el-table-column>
<el-table-column prop="SubmitStateName" label="状态" align="center">
</el-table-column>
<el-table-column
prop="SubmitState"
label="当前状态"
:formatter="SubmitFormat"
align="center"
/>
<el-table-column prop="Remarks" label="备注" align="center">
</el-table-column>
<el-table-column prop="SubmitReason" label="申请原因" align="center">
......@@ -271,11 +298,11 @@
class="box-card"
style="text-align: center; margin-top: 35px"
>
<label class="labelBorrow">维修装备表(未贴标)</label>
<label class="labelBorrow">维修装备表(不贴标)</label>
<el-divider></el-divider>
<template>
<el-table :data="HctableData" border class="details">
<el-table-column
<!-- <el-table-column
prop="MaterielName"
label="装备大类"
align="center"
......@@ -286,10 +313,10 @@
label="装备物料"
align="center"
>
</el-table-column>
</el-table-column> -->
<el-table-column
prop="MaterielName"
label="装备名称"
label="物料名称"
align="center"
>
</el-table-column>
......@@ -299,6 +326,12 @@
align="center"
>
</el-table-column>
<el-table-column
prop="LyCount"
label="数量"
align="center"
>
</el-table-column>
</el-table>
</template>
</el-card>
......@@ -307,7 +340,7 @@
class="box-card"
style="text-align: center; margin-top: 35px"
>
<label class="labelBorrow">维修装备表(已贴标)</label>
<label class="labelBorrow">维修装备表(贴标)</label>
<el-divider></el-divider>
<template>
<el-table :data="NHctableData" border class="details">
......@@ -757,7 +790,7 @@ export default {
return {
SubmitState: [
{
value: "-3",
value: "-99",
label: "全部",
},
{
......@@ -786,6 +819,7 @@ export default {
},
],
HCVisible: false,
addIssuedDialogVisible:false,
// 用户选中日期
timeData: [],
// 日期配置
......@@ -1100,7 +1134,7 @@ export default {
},
//新增耗材申请
async addHCRecive() {
this.title = "维修申请（未贴标）";
this.title = "维修申请（不贴标）";
this.HCVisible = true;
this.HCruleForm.BorrowList = [];
// console.log("rule",this.ruleForm)
......@@ -1111,7 +1145,7 @@ export default {
},
//新增维修申请
async addNHCRecive() {
this.title = "维修申请（已贴标）";
this.title = "维修申请（贴标）";
this.addVisible = true;
this.ruleForm.BorrowList = [];
// console.log("rule",this.ruleForm)
......@@ -1120,13 +1154,16 @@ export default {
});
this.classOption = resclass.Rows;
},
addIssued(){
this.addIssuedDialogVisible = true;
},
//编辑信息
async edit(row) {
console.log(row);
if (row.IsHaoCai === 0) {
//非耗材
this.addVisible = true;
this.title = "修改维修申请（已贴标）";
this.title = "修改维修申请（贴标）";
this.addVisible = true;
var url = "api/Borrow/" + row.ID;
const { data: res } = await this.$axios.get(url);
......@@ -1138,7 +1175,7 @@ export default {
this.classOption = resclass.Rows;
} else {
//耗材
this.title = "修改维修申请（未贴标）";
this.title = "修改维修申请（不贴标）";
this.HCVisible = true;
var url = "api/Borrow/" + row.ID;
const { data: res } = await this.$axios.get(url);
......@@ -1415,7 +1452,7 @@ export default {
}
})
.catch((e) => {
this.$message.error("" + stateName + "申请");
this.$message.warning("已取消该" + stateName + "操作");
});
},
// 领取操作
......@@ -1478,7 +1515,7 @@ export default {
const borrowUrl = "/api/Borrow?" + "IsAdmin=" + IsAdmin;
this.$refs[formName].validate(async (valid) => {
if (valid) {
if (type === "维修申请（未贴标）") {
if (type === "维修申请（不贴标）") {
const { data: res } = await this.$axios.post(
borrowUrl,
this.HCruleForm
......@@ -1493,6 +1530,7 @@ export default {
}
this.getQueuData();
this.HCVisible = false;
this.addIssuedDialogVisible =false;
} else {
return false;
}
......@@ -1513,7 +1551,7 @@ export default {
const borrowUrl = "/api/Borrow?" + "IsAdmin=" + IsAdmin;
this.$refs[formName].validate(async (valid) => {
if (valid) {
if (type === "维修申请（已贴标）") {
if (type === "维修申请（贴标）") {
const { data: res } = await this.$axios.post(
borrowUrl,
this.ruleForm
......@@ -1530,13 +1568,31 @@ export default {
}
this.getQueuData();
this.addVisible = false;
this.addIssuedDialogVisible =false;
} else {
return false;
}
});
},
async getQueuData() {
SubmitFormat(row) {
if (row.SubmitState === 1) {
return "待出库";
} else if(row.SubmitState===2) {
return "待入库";
}
else if(row.SubmitState===3)
{
return "已入库";
}
else
{
return row.SubmitStateName;
}
},
async getQueuData(arg) {
if(arg) {
this.searchData.Page = 1
}
this.loading = true;
this.searchData.SubmitUsrID = this.userData.Id;
const { data: res } = await this.$axios.get("api/Borrow", {
......@@ -1572,7 +1628,7 @@ export default {
}
})
.catch((e) => {
this.$message.error("已取消删除");
this.$message.warning("已取消该删除操作");
});
},
//借出/归还
......@@ -1603,13 +1659,13 @@ export default {
const { data: res } = await this.$axios.post(url,this.editForm);
if (res.Success === true) {
this.getQueuData();
this.$message.success("已"+stateName);
this.$message.success("已"+stateName+"成功");
} else {
this.$message.error(res.Remark);
}
})
.catch((e) => {
this.$message.error(""+stateName+"操作");
this.$message.warning("已取消"+stateName+"操作");
});
},
......@@ -1628,9 +1684,9 @@ export default {
},
stateFormat(row) {
if (row.IsHaoCai === 0) {
return "已贴标";
return "贴标";
} else if (row.IsHaoCai === 1) {
return "未贴标";
return "不贴标";
} else {
return "";
}
......
src/views/warehouse/cabEditEquForm.vue
......@@ -598,7 +598,7 @@ export default {
},
};
if (type === "添加装备(未贴标)") {
if (type === "添加装备(不贴标)") {
const { data: res } = await this.$axios.post(
"/api/Equipment",
formData,
......@@ -915,9 +915,9 @@ export default {
},
stateFormat(row) {
if (row.EqHaoCai === 0) {
return "已贴标";
return "贴标";
} else {
return "未贴标";
return "不贴标";
}
},
},
......
src/views/warehouse/cabinet.vue
......@@ -69,7 +69,7 @@
icon="search"
style="height: 40px"
class="textboxBo"
@click="getQueuData()"
@click="getQueuData(1)"
>查询</a-button
>
<el-button
......@@ -110,8 +110,8 @@
</el-table-column>
<el-table-column prop="Remarks" label="备注" align="center">
</el-table-column>
<el-table-column prop="CreateName" label="创建人" align="center">
</el-table-column>
<!-- <el-table-column prop="CreateName" label="创建人" align="center">
</el-table-column> -->
<el-table-column prop="CreateTime" label="创建日期" sortable align="center">
</el-table-column>
<el-table-column label="操作" width="200" align="center">
......@@ -146,6 +146,17 @@
>
</template>
</el-table-column>
<el-table-column label="储位灯开关" width="160" align="center">
<template v-slot="scope">
<el-switch
v-model="scope.row.isOpen"
@change="changeLight(scope.row)"
:active-isOpen="true"
:inactive-isOpen="false"
>
</el-switch>
</template>
</el-table-column>
</el-table>
<!-- 查看详情 -->
<el-dialog title="查看储位详情" :visible.sync="borrowTableVisible" width="73%">
......@@ -191,7 +202,7 @@
</td>
<th class="textHeader">所属人员</th>
<td class="textContent">
{{ detailData.UserName ? detailData.UserName : "无所属" }}
{{ detailData.PoliceName ? detailData.PoliceName : "无所属" }}
</td>
<tr style="border-bottom: 1px solid #e8e8e8">
<th class="textHeader">储位灯光 IP地址</th>
......@@ -378,7 +389,7 @@
label="柜子灯地址"
prop="RightAddress"
>
<el-input v-model="ruleForm.RightAddress" placeholder="GPIO的IP: 端口(9701)-接口(0、1、2...)"></el-input>
<el-input v-model="ruleForm.RightAddress" placeholder="例： 41.204.124.185:9701-12"></el-input>
</el-form-item>
<el-form-item
......@@ -386,7 +397,7 @@
label="地面灯地址"
prop="YinDaoAddress"
>
<el-input type="textarea" :rows='5' v-model="ruleForm.YinDaoAddress" placeholder="地面灯带引导灯GPIO的IP: 端口(9701)-接口(0、1、2...),需配置多个时记得使用回车进行换行"></el-input>
<el-input type="textarea" :rows='5' v-model="ruleForm.YinDaoAddress" placeholder="例： 41.204.124.185:9701-12,需配置多个时记得使用回车进行换行"></el-input>
</el-form-item>
<el-form-item label="备注" prop="Remarks">
......@@ -439,6 +450,7 @@ export default {
inject:['reload'],
data() {
return {
isOpen: false,
rules: {
StorageCode: [
{ required: true, message: "请输入储位名称", trigger: "blur" },
......@@ -573,12 +585,29 @@ export default {
},
methods: {
//改变灯光状态
async changeLight(row){
//console.log('改变灯光状态')
this.code=row.StorageCode;
this.isOpen=row.isOpen;
//console.log('kd'+ this.code +this.isOpen)
const { data: res } = await this.$axios.post("api/Storage/ControlStorageLight",
{code: this.code,isOpen: this.isOpen}
);
if (res.Success !== true) return this.$message.error(res.Remark);
// 提交信息成功后要关闭对话框,并且刷新数据
if(this.isOpen==true){
this.$message.success("灯光已打开,若未手动开闭，5分钟后自动关闭！");
}else{
this.$message.success("已手动开闭！");
}
},
//提交表单
submitForm(formName, type) {
this.$refs[formName].validate(async (valid) => {
if (valid) {
const formData = new FormData();
console.log("ru", this.ruleForm);
//console.log("ru", this.ruleForm);
formData.append("ID", this.ruleForm.ID);
formData.append("StorageCode", this.ruleForm.StorageCode);
formData.append("StorageType", this.ruleForm.StorageType2);
......@@ -586,8 +615,8 @@ export default {
formData.append("LibraryId", this.ruleForm.LibraryId);
formData.append("Remarks", this.ruleForm.Remarks===null?"":this.ruleForm.Remarks);
formData.append("LockAddress", this.ruleForm.LockAddress);
formData.append("RightAddress", this.ruleForm.RightAddress);
formData.append("YinDaoAddress", this.ruleForm.YinDaoAddress);
formData.append("RightAddress", this.ruleForm.RightAddress===null?"":this.ruleForm.RightAddress);
formData.append("YinDaoAddress", this.ruleForm.YinDaoAddress===null?"":this.ruleForm.YinDaoAddress);
const config = {
headers: {
......@@ -600,17 +629,18 @@ export default {
formData,
config
);
if (res.Success !== true) return this.$message(res.message);
if (res.Success !== true) return this.$message('储位名称重复，请重新输入');
} else {
//修改储位
formData.append("ID", this.ruleForm.ID);
console.log(formData.append("ID", this.ruleForm.ID));
const { data: res } = await this.$axios.put(
"/api/Storage",
formData,
config
);
if (res.Success !== true) return this.$message(res.message);
if (res.Success !== true) return this.$message('储位名称重复，请重新输入');
}
this.getQueuData();
this.addVisible = false;
......@@ -649,7 +679,7 @@ export default {
}
})
.catch((e) => {
this.$message.error("已取消删除");
this.$message.warning("已取消删除");
});
},
......@@ -755,7 +785,10 @@ export default {
this.Users = User.Rows;
},
async getQueuData() {
async getQueuData(arg) {
if(arg) {
this.searchData.Page = 1
}
this.loading = true;
const { data: res } = await this.$axios.get("api/Storage", {
......
src/views/warehouse/emergencyPlan.vue
......@@ -60,7 +60,7 @@
icon="search"
style="height: 40px"
class="textboxBo"
@click="getQueuData()"
@click="getQueuData(1)"
>查询</a-button
>
<el-button
......@@ -625,8 +625,8 @@
</template>
</el-card>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="baseTableVisible = false"
>确 定</el-button
<el-button @click="baseTableVisible = false"
>关 闭</el-button
>
</div>
</el-dialog>
......@@ -888,7 +888,7 @@ export default {
formData,
config
);
if (res.Success !== true) return this.$message(res.message);
if (res.Success !== true) return this.$message(res.Remark);
this.getQueuData();
},
//修改
......@@ -923,7 +923,7 @@ export default {
}
})
.catch((e) => {
this.$message.error("已取消删除");
this.$message.warning("已取消删除");
});
},
///获取装备模块内容
......@@ -1015,7 +1015,10 @@ export default {
});
this.PlanModelOption = resPlanMod.Rows;
},
async getQueuData() {
async getQueuData(arg) {
if(arg) {
this.searchData.Page = 1
}
this.loading = true;
const { data: res } = await this.$axios.get("api/Plan", {
params: this.searchData,
......
src/views/warehouse/equMaintenanceLog.vue 0 → 100644
<template>
<el-dialog title="保养记录表" :visible.sync="byVisible" width="60%">
<el-row style="margin-top: 10px">
<!-- 主表 -->
<el-table
:data="baoYangData"
stripe
style="width: 100%;margin-top: 10px;"
size="small"
border
highlight-current-row
max-height="600"
>
<el-table-column prop="ID" v-if="false" />
<el-table-column prop="EqId" v-if="false" />
<el-table-column prop="EqName" label="装备名称" align="center" />
<el-table-column prop="EqCode" label="装备编号" align="center">
</el-table-column>
<el-table-column prop="BaoyangPersonName" label="保养人" align="center">
</el-table-column>
<el-table-column prop="BaoyangTime" label="保养时间" align="center" />
<el-table-column prop="Remark" label="保养备注" align="center" />
<!-- <el-table-column label="操作" width="200" align="center">
<template v-slot="scope">
<a-button
type="primary"
class="actions"
ghost
round
size="small"
@click="equCheck(scope.row)"
>查看</a-button
>
<a-button
style="color:#5ab96b;border-color: #5ab96b;"
type="primary"
class="actions"
ghost
round
size="small"
@click="baoYangClick(scope.row)"
>保养</a-button
>
</template>
</el-table-column> -->
</el-table>
<!-- 分页功能 -->
<el-row type="flex" justify="center" align="middle">
<el-pagination
background
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="searchData.page"
:page-sizes="[10, 20, 30, 40]"
layout="total, sizes, prev, pager, next, jumper"
:total="total"
/>
</el-row>
</el-row>
</el-dialog>
</template>
<script>
export default {
data() {
return {
byVisible: false,
baoYangData: [],
detailData: [],
// 总条数
total: 0,
searchData: {
Page: 1,
Rows: 10,
Sort: "ID",
Order: "ESC",
Epc: "",
EqName:"",
EqCode:"",
EqId:"",
},
};
},
created() {
//this.getQueuDataList();
},
methods: {
async getQueuDataList(arg) {
if(arg) {
this.searchData.Page = 1
}
this.loading = true;
const { data: res } = await this.$axios.get("/api/Equipment/GetBaoYangLogListByPage", {
params: this.searchData,
});
this.total = res.Total;
this.baoYangData = res.Rows;
},
//查看信息
async equCheck(row) {
this.borrowTableVisible = true;
const borrowUrl = "/api/Equipment/" + row.ID;
const { data: res } = await this.$axios.get(borrowUrl);
if (res.Success == false) return this.$message(res.Remark);
this.detailData = res;
console.log("ro",row)
this.videoUrl=row.VideoUrl;
this.videoUrlSrc=window._CONFIG['dlURL']+'/'+this.videoUrl;
},
stateFormat(row) {
if (row.EqHaoCai === 0) {
return "是";
} else {
return "否";
}
},
// 每页显示条数发生改变时
handleSizeChange(val) {
this.searchData.Rows = val;
this.getQueuDataList();
},
// 当前页数发生改变时
handleCurrentChange(val) {
this.searchData.Page = val;
this.getQueuDataList();
},
},
};
</script>
\ No newline at end of file
src/views/warehouse/modularization.vue
......@@ -18,7 +18,7 @@
>首页</el-breadcrumb-item
>
<el-breadcrumb-item>仓库管理 </el-breadcrumb-item>
<el-breadcrumb-item>模块化管理</el-breadcrumb-item>
<el-breadcrumb-item>模块管理</el-breadcrumb-item>
</el-breadcrumb></el-col
>
</el-row>
......@@ -60,7 +60,7 @@
icon="search"
style="height: 40px"
class="textboxBo"
@click="getQueuData()"
@click="getQueuData(1)"
>查询</a-button
>
<el-button
......@@ -127,6 +127,17 @@
>
</template>
</el-table-column>
<el-table-column label="模块灯开关" width="160" align="center">
<template v-slot="scope">
<el-switch
v-model="scope.row.isOpen"
@change="changeMLight(scope.row)"
:active-isOpen="true"
:inactive-isOpen="false"
>
</el-switch>
</template>
</el-table-column>
</el-table>
<el-dialog
width="70%"
......@@ -386,8 +397,8 @@
</template>
</el-card>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="baseTableVisible = false"
>确 定</el-button
<el-button @click="baseTableVisible = false"
>关 闭</el-button
>
</div>
</el-dialog>
......@@ -505,6 +516,7 @@ export default {
history_Num: "",
// 总条数
total: 0,
isOpen: true,
};
},
......@@ -577,27 +589,25 @@ export default {
}
});
},
//改变预案停启用状态
async changeState(row) {
const formData = new FormData();
formData.append("ID", row.ID);
formData.append("PlanState", row.PlanState);
this.ruleForm.ID = row.ID;
this.ruleForm.PlanState = row.PlanState;
const config = {
headers: {
"Content-Type": "multipart/form-data",
},
};
const { data: res } = await this.$axios.post(
"/api/PlanModel/UpdateState",
formData,
config
//改变mk灯光状态
async changeMLight(row){
//console.log('改变灯光状态')
this.id=row.ID;
this.isOpen=row.isOpen;
//console.log('kd'+ this.ID +this.isOpen)
const { data: res } = await this.$axios.post("api/PlanModel/ControlStorageLight",
{id:this.id,isOpen:this.isOpen}
);
if (res.Success !== true) return this.$message(res.message);
this.getQueuData();
if (res.Success !== true) return this.$message.error(res.Remark);
// 提交信息成功后要关闭对话框,并且刷新数据
if(this.isOpen==true){
this.$message.success("灯光已打开,若未手动开闭，5分钟后自动关闭！");
}else{
this.$message.success("已手动开闭！");
}
},
//修改
async edit(row) {
......@@ -631,7 +641,7 @@ export default {
}
})
.catch((e) => {
this.$message.error("已取消删除");
this.$message.warning("已取消删除");
});
},
///获取物料内容
......@@ -686,7 +696,10 @@ export default {
});
this.classOption = resclass.Rows;
},
async getQueuData() {
async getQueuData(arg) {
if(arg) {
this.searchData.Page = 1
}
this.loading = true;
const { data: res } = await this.$axios.get("api/PlanModel", {
params: this.searchData,
......
src/views/warehouse/storehouse.vue
......@@ -60,7 +60,7 @@
icon="search"
style="height: 40px"
class="textboxBo"
@click="getQueuData()"
@click="getQueuData(1)"
>查询</a-button
>
<el-button
......@@ -118,6 +118,15 @@
@click="edit(scope.row)"
>修改</a-button
>
<a-button
type="primary"
class="actions"
ghost
round
size="small"
@click="deleteClick(scope.row)"
>删除</a-button
>
</template>
</el-table-column>
</el-table>
......@@ -309,7 +318,7 @@ export default {
formData,
config
);
if (res.Success !== true) return this.$message(res.message);
if (res.Success !== true) return this.$message(res.Remark);
} else {//修改仓库类型
// console.log(this.ruleForm.ID)
formData.append("ID", this.ruleForm.ID);
......@@ -318,7 +327,7 @@ export default {
formData,
config
);
if (res.Success !== true) return this.$message(res.message);
if (res.Success !== true) return this.$message(res.Remark);
}
this.getQueuData();
this.addVisible = false;
......@@ -335,6 +344,27 @@ export default {
this.ruleForm.LibaryType=JSON.parse(JSON.stringify(row.LibaryTypeName));
console.log(this.ruleForm)
},
//删除仓库
deleteClick(row) {
const url = "/api/Libary/" + row.ID;
this.$confirm("此操作将永久删除该条数据, 是否继续?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(async () => {
const { data: res } = await this.$axios.delete(url);
if (res.Success === true) {
this.getQueuData();
this.$message.success("已删除该数据");
} else {
this.$message.error(res.Remark);
}
})
.catch((e) => {
this.$message.warning("已取消删除");
});
},
//查看照片
watchPic() {},
clickLI(id) {
......@@ -359,7 +389,10 @@ export default {
// this.$nextTick(()=>{
// this.resetForm('ruleForm')})
},
async getQueuData() {
async getQueuData(arg) {
if(arg) {
this.searchData.Page = 1
}
this.loading = true;
const { data: res } = await this.$axios.get("api/Libary", {
params: this.searchData,
......
src/views/warehouse/warehouseInventory.vue
......@@ -261,9 +261,9 @@
</template>
</el-card> -->
<div slot="footer" class="dialog-footer">
<el-button @click="borrowTableVisible = false">取 消</el-button>
<el-button type="primary" @click="borrowTableVisible = false"
>确 定</el-button
<!-- <el-button @click="borrowTableVisible = false">取 消</el-button> -->
<el-button @click="borrowTableVisible = false"
>关 闭</el-button
>
</div>
</el-dialog>
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论