jn517618 2 years ago
commit 5d3e5c93c7
  1. 28
      src/const/limsConfig/equipmentManage.js
  2. 8
      src/page/index/index.vue
  3. 14
      src/page/index/sidebar/index.vue
  4. 8
      src/page/index/top/index.vue
  5. 2
      src/store/modules/common.js
  6. 1
      src/styles/sidebar.scss
  7. 2
      src/views/capital/components/outStatic.vue
  8. 6
      src/views/capital/components/scrapQuery.vue
  9. 1
      src/views/capital/productstoreList.vue
  10. 16
      src/views/inspection/insTask.vue
  11. 4
      src/views/inspection/leavepoints.vue
  12. 2
      src/views/inspection/setting/points.vue
  13. 10
      src/views/oiling/statistics.vue
  14. 2
      src/views/oiling/task.vue
  15. 28
      src/views/repair/proposer.vue
  16. 117
      src/views/repair/repairAppyDetail.vue
  17. 22
      src/views/system/user.vue
  18. 3
      src/views/wel/index.vue

@ -45,20 +45,20 @@ export const tableOption = {
overHidden: true,
rules: [{ required: true, message: "请输入仪器/设备名称" }],
},
{
type: "select",
label: "仪器设备类型",
dicUrl: "/api/blade-system/dict-biz/dictionary?code=instrument",
props: {
label: "dictValue",
value: "dictKey",
},
span: 8,
display: true,
prop: "type",
align: "left",
overHidden: true,
},
// {
// type: "select",
// label: "仪器设备类型",
// dicUrl: "/api/blade-system/dict-biz/dictionary?code=instrument",
// props: {
// label: "dictValue",
// value: "dictKey",
// },
// span: 8,
// display: true,
// prop: "type",
// align: "left",
// overHidden: true,
// },
{
type: "input",
span: 8,

@ -94,10 +94,10 @@ export default {
clearInterval(this.timer);
return;
}
if (this.itemList.length === 0) {
this.notifyList = [];
this.notice();
}
// if (this.itemList.length === 0) {
// this.notifyList = [];
// this.notice();
// }
}, 20000);
},
//

@ -7,6 +7,7 @@
</div>
<el-menu unique-opened
:default-active="nowTagValue"
:default-openeds="menuArr"
mode="vertical"
:show-timeout="200"
:collapse="keyCollapse">
@ -30,9 +31,19 @@
components: {sidebarItem, logo},
inject: ["index"],
data() {
return {};
return {
menuArr:[]
};
},
created() {
console.log(this.tag)
if(this.tag.label == '首页') {
setTimeout(() =>{
this.menu.map((item,index) =>{
this.menuArr.push(item.path)
})
},300)
}
this.index.openMenu();
},
computed: {
@ -42,7 +53,6 @@
}
},
methods: {
}
};
</script>

@ -40,7 +40,7 @@
<top-color></top-color>
</div>
</el-tooltip> -->
<span style="color:#E6A23C;margin-right:20px;font-weight:600;cursor: pointer;" v-if="total>0" @click="oneClickRead">一键已读 {{total}}</span>
<!-- <span style="color:#E6A23C;margin-right:20px;font-weight:600;cursor: pointer;" v-if="total>0" @click="oneClickRead">一键已读 {{total}}</span>
<el-tooltip
effect="dark"
content="切换输入框颜色"
@ -55,7 +55,7 @@
<div class="iconfont iconicon_scan code" @click="codeHandle">
</div>
</el-tooltip>
</el-tooltip> -->
<el-tooltip
v-if="showLock"
effect="dark"
@ -76,7 +76,7 @@
<top-theme></top-theme>
</div>
</el-tooltip>
<el-tooltip
<!-- <el-tooltip
effect="dark"
:content="$t('navbar.notice')"
placement="bottom"
@ -93,7 +93,7 @@
<div class="top-bar__item top-bar__item--show">
<top-lang></top-lang>
</div>
</el-tooltip>
</el-tooltip> -->
<el-tooltip
v-if="showFullScren"
effect="dark"

@ -18,7 +18,7 @@ const common = {
showTag: true,
showDebug: true,
showCollapse: true,
showSearch: true,
showSearch: false,
showLock: true,
showFullScren: true,
showTheme: true,

@ -41,6 +41,7 @@
box-shadow: 2px 0 6px rgba(0,21,41,.35);
.el-scrollbar__wrap {
overflow-x: hidden;
height: 93% !important;
}
&--tip{
width:90%;

@ -113,7 +113,7 @@
</div>
</div>
<div class="export_box">
<el-button class="export_btn" @click="exportDetail">导出</el-button>
<!-- <el-button class="export_btn" @click="exportDetail">导出</el-button> -->
</div>
</el-dialog>
</div>

@ -53,7 +53,7 @@ export default {
return {
//
searchForm: {
goodsName: "",
reportGoodsName: "",
},
searchText: {
flag: 1,
@ -101,10 +101,10 @@ export default {
//
searchHandle (item, index) {
this.page.currentPage = 1
this.searchForm.goodsName = item.name
this.searchForm.reportGoodsName = item.name
if (index === 1) {
this.searchForm = {
goodsName: "",
reportGoodsName: "",
}
this.onLoad(this.page)
} else {

@ -554,6 +554,7 @@
<!-- <span>申领数:&emsp;&emsp;&emsp;</span> -->
<el-input
v-model="item.applyNum"
readonly
placeholder="请输入申领数"
type="text"
style="width: 240px; height: 40px"

@ -176,7 +176,15 @@
</el-form-item>
</el-col>
<el-col :span="6" style="width: 31%; margin-left: 1%">
<el-form-item label="巡检班组" prop="groupId">
<el-form-item label="巡检班组" prop="groupName">
<el-input
style="width: 98%"
v-model="addForm.groupName"
placeholder="巡检班组"
disabled
></el-input>
</el-form-item>
<!-- <el-form-item label="巡检班组" prop="groupId">
<el-select
v-model="addForm.groupId"
placeholder="请选择巡检班组"
@ -184,7 +192,7 @@
>
<el-option v-for="item in groupList" :key="item.id" :label="item.fullName" :value="item.id"></el-option>
</el-select>
</el-form-item>
</el-form-item> -->
</el-col>
</el-row>
<el-row :gutter="20">
@ -470,7 +478,7 @@
<el-descriptions-item span="1" label="巡检名称">{{taskForm.planName}}</el-descriptions-item>
<el-descriptions-item span="1" label="计划单据">{{taskForm.taskCode}}</el-descriptions-item>
<el-descriptions-item span="1" label="巡检班组">
{{taskForm.groupId | groupName}}
{{taskForm.groupName}}
</el-descriptions-item>
<el-descriptions-item span="1" label="实际开始">{{taskForm.actStartTime}}</el-descriptions-item>
<el-descriptions-item span="1" label="实际完成">{{taskForm.actFinishTime}}</el-descriptions-item>
@ -1036,6 +1044,7 @@ export default {
console.log('res =====>',res)
this.addForm = res.data.data
this.addForm.orderList = res.data.data.taskPointList
this.addForm.planInspectionMethod = Number(this.addForm.planInspectionMethod)
this.showAddDialog = true
})
},
@ -1060,6 +1069,7 @@ export default {
getInsTaskDetail(this.currentId).then(res =>{
this.addForm = res.data.data
this.addForm.orderList = res.data.data.taskPointList
this.addForm.planInspectionMethod = Number(this.addForm.planInspectionMethod)
this.showExecuteDialog = false
this.onLoad()
this.$message.success('执行成功')

@ -114,7 +114,7 @@
:before-close="handleClose"
:cell-style="tableCellStyle"
:visible.sync="showPlanDialog"
title="查看异常巡检任务单"
title="查看漏检巡检点"
width="70%"
:append-to-body="true"
:close-on-click-modal="false"
@ -569,7 +569,7 @@ export default {
//
onLoad() {
this.loading = true
getLeavePointList({current:this.listPage.current,size:this.listPage.size,...this.searchForm}).then(res =>{
getLeavePointList({current:this.listPage.current,size:this.listPage.size,pointStatus:3,...this.searchForm}).then(res =>{
this.data = res.data.data.records
this.listPage.total = res.data.data.total
this.loading = false

@ -1306,6 +1306,8 @@ export default {
this.addForm = {
orderList:[]
}
this.fileList = []
this.imgList = []
this.title = '新建巡检点位'
this.$refs.addForm.clearValidate()
})

@ -84,10 +84,16 @@ export default {
overHidden: true,
align: "left",
},
// {
// label: "ID",
// align: "left",
// prop: "assetId",
// overHidden: true,
// },
{
label: "设备ID",
label: "设备名称",
align: "left",
prop: "assetId",
prop: "assetName",
overHidden: true,
},
{

@ -1847,7 +1847,7 @@ export default {
},
//
handleComplete(row,index){
this.$confirm("确定删除此保养任务吗?", "提示", {
this.$confirm("确定完成此保养任务吗?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",

@ -211,20 +211,20 @@ export default {
},
],
},
{
type: "select",
label: "设备类型",
dicUrl: "/api/blade-system/dict-biz/dictionary?code=instrument",
props: {
label: "dictValue",
value: "dictKey",
},
span: 8,
display: true,
prop: "type",
align: "left",
overHidden: true,
},
// {
// type: "select",
// label: "",
// dicUrl: "/api/blade-system/dict-biz/dictionary?code=instrument",
// props: {
// label: "dictValue",
// value: "dictKey",
// },
// span: 8,
// display: true,
// prop: "type",
// align: "left",
// overHidden: true,
// },
{
type: "select",
label: "申请维修部门",

@ -5,6 +5,7 @@
<el-form
ref="form"
:model="form"
:rules="formRules"
label-width="140px"
label-position="top"
>
@ -76,11 +77,11 @@
<el-input v-model="form.name" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<!-- <el-col :span="6">
<el-form-item label="仪器设备类型">
<el-input v-model="form.type" readonly></el-input>
</el-form-item>
</el-col>
</el-col> -->
<el-col :span="6">
<el-form-item label="制造商">
<el-input v-model="form.manufacturer" readonly></el-input>
@ -91,8 +92,6 @@
<el-input v-model="form.model" readonly></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="出场日期">
<el-date-picker
@ -104,6 +103,8 @@
></el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="启用日期">
<el-date-picker
@ -300,7 +301,7 @@
</div>
<el-row v-if="this.status >= 1 || (viewType == 'view' && status == -4)">
<el-col :span="6">
<el-form-item label="维修班组" >
<el-form-item label="维修班组" prop="repairTeam">
<el-select
v-model="form.repairTeam"
:rows="3"
@ -312,9 +313,9 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="维修人员" >
<el-form-item label="维修人员" prop="repairPerson">
<el-select
v-model="repairPerson"
v-model="form.repairPerson"
:rows="3"
:disabled="status > 1 || viewType == 'view'"
>
@ -647,6 +648,14 @@ export default {
repairPerson:'',
repairContent:''
},
formRules:{
repairTeam:[
{required:true,message:'请选择维修班组',trigger:'change'}
],
repairPerson:[
{required:true,message:'请选择维修人员',trigger:'change'}
]
},
//
status: 0,
//id
@ -690,6 +699,7 @@ export default {
this.groupId = val
getMainPer({deptId:val}).then(res =>{
this.perData = res.data.data
this.form.repairPerson = ''
})
},
//
@ -748,7 +758,7 @@ export default {
}
getMainPer({deptId:this.form.repairTeam}).then(res =>{
this.perData = res.data.data
this.repairPerson = row.repairPerson
this.form.repairPerson = row.repairPerson
})
//
@ -778,50 +788,55 @@ export default {
* 按钮报修单提交
*/
async submit() {
if (this.status > 2) {
if (this.form.status2 === undefined || this.form.status2 === "") {
this.$message({ type: "warning", message: "请选择维修结果" });
return;
this.$refs.form.validate((valid) =>{
if(valid){
if (this.status > 2) {
if (this.form.status2 === undefined || this.form.status2 === "") {
this.$message({ type: "warning", message: "请选择维修结果" });
return;
}
}
let status;
if (this.form.status2 === undefined || this.form.status2 === "") {
status = this.status + 1;
} else {
status = this.form.status2;
}
// id
const params = {
id: this.id,
instrumentId: this.instrumentId,
...this.form,
status,
// repairPerson:this.repairPerson
};
if(this.imgList.length !== 0){
params.repairAttach = this.imgList[0].url
}
this.$delete(params, "status2");
this.$delete(params, "applyUser");
this.$delete(params, "applyUserName");
// console.log('params ==============>',params)
reportModify(params);
// if (this.status === 0) {
// await reportModify(1, this.id)
// } else if (this.status === 1) {
// await reportModify(2, this.id)
// } else if (this.status === 2) {
// await reportModify(3, this.id)
// } else if (this.status === 3) {
// await reportModify(4, this.id)
// }
// await reportModify(this.status + 1, this.id)
//
const tag = this.$store.getters.tagList.find(
(item) => item.value === this.$route.fullPath
);
this.$store.commit("DEL_TAG", tag);
this.$router.push({ path: "/repair/proposer" });
}
}
let status;
if (this.form.status2 === undefined || this.form.status2 === "") {
status = this.status + 1;
} else {
status = this.form.status2;
}
// id
const params = {
id: this.id,
instrumentId: this.instrumentId,
...this.form,
status,
repairPerson:this.repairPerson
};
if(this.imgList.length !== 0){
params.repairAttach = this.imgList[0].url
}
this.$delete(params, "status2");
this.$delete(params, "applyUser");
this.$delete(params, "applyUserName");
// console.log('params ==============>',params)
await reportModify(params);
// if (this.status === 0) {
// await reportModify(1, this.id)
// } else if (this.status === 1) {
// await reportModify(2, this.id)
// } else if (this.status === 2) {
// await reportModify(3, this.id)
// } else if (this.status === 3) {
// await reportModify(4, this.id)
// }
// await reportModify(this.status + 1, this.id)
//
const tag = this.$store.getters.tagList.find(
(item) => item.value === this.$route.fullPath
);
this.$store.commit("DEL_TAG", tag);
this.$router.push({ path: "/repair/proposer" });
})
},
},
};

@ -659,7 +659,8 @@ export default {
label: "所属部门",
prop: "deptId",
type: "tree",
multiple: true,
popperClass:'popperClass',
// multiple: true,
dicData: [],
props: {
label: "title",
@ -920,7 +921,7 @@ export default {
},
rowSave(row, done, loading) {
console.log(row, "rowww");
row.deptId = row.deptId.join(",");
// row.deptId = row.deptId.join(",");
row.roleId = row.roleId.join(",");
row.postId = row.postId.join(",");
add(row).then(
@ -940,7 +941,7 @@ export default {
);
},
rowUpdate(row, index, done, loading) {
row.deptId = row.deptId.join(",");
// row.deptId = row.deptId.join(",");
row.roleId = row.roleId.join(",");
row.postId = row.postId.join(",");
this.$delete(row, "electronicSignature");
@ -1148,9 +1149,9 @@ export default {
if (["edit", "view"].includes(type)) {
getUser(this.form.id).then((res) => {
this.form = res.data.data;
if (this.form.hasOwnProperty("deptId")) {
this.form.deptId = this.form.deptId.split(",");
}
// if (this.form.hasOwnProperty("deptId")) {
// this.form.deptId = this.form.deptId.split(",");
// }
if (this.form.hasOwnProperty("roleId")) {
this.form.roleId = this.form.roleId.split(",");
}
@ -1310,4 +1311,13 @@ export default {
line-height: 20px;
width: 90px;
}
</style>
<style lang="scss">
.popperClass {
.el-select-dropdown__item{
height: 80px !important;
overflow-y: auto;
}
}
</style>

@ -258,7 +258,7 @@ export default {
{ index: 15, label: '接收货品', clickHanderCode: 43, mouseoverCode: 10, mouseleaveCode: 10, shouldRoleId: false,imgSrc: indexicon.Receivinggoods, },
{ index: 16, label: '申领出库', clickHanderCode: 45, mouseoverCode: 11, mouseleaveCode: 11, shouldRoleId: false,imgSrc: indexicon.Claimoutofthewarehouse, },
{ index: 17, label: '供应商 ', clickHanderCode: 46, mouseoverCode: 9, mouseleaveCode: 9, shouldRoleId: false,imgSrc: indexicon.vendor, },
{ index: 18, label: '物品申领', clickHanderCode: 42, mouseoverCode: 2, mouseleaveCode: 2, shouldRoleId: false,imgSrc: indexicon.wupinshenling, }
// { index: 18, label: '', clickHanderCode: 42, mouseoverCode: 2, mouseleaveCode: 2, shouldRoleId: false,imgSrc: indexicon.wupinshenling, }
]
};
},
@ -567,6 +567,7 @@ export default {
//
//
const res1 = await getEveryStatusAndCount({ deptId: this.userInfo.deptId ,roleId:this.userInfo.roleId })
console.log('res =====>',res1)
let result1 = res1.data.data;
this.cardInfoList[0].judjeVariable = result1.djy //
this.cardInfoList[1].judjeVariable = result1.djh //

Loading…
Cancel
Save