UDI
/
udiwms-vue-frame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决冲突

Browse Source
20231126-yw
yuanwei 1 year ago
parent 5aa6359c78
commit 8a48704f89
13 changed files with 50 additions and 51 deletions
Show Stats Download Patch File Download Diff File

2
src/views/basic/product/product.vue
Unescape Escape View File

@ -570,7 +570,7 @@
v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:width="item.width"
:width="isChoose?50:180"
:key="item.columnName"
fixed="right"
>

3
src/views/basic/product/productCategory.vue
Unescape Escape View File

@ -62,10 +62,9 @@
<el-col style="border-left: 3px solid #dddddd; overflow-y: hidden">
<el-form
:model="filterQuery"
v-if="queryList && queryList.length > 0"
v-if="queryList && queryList.length > 0 && showSearch"
size="mini"
label-width="100px"
v-if="showSearch"
>
<el-row style=" display:flex; flex-wrap: wrap; ">
<template v-for="(item, index) in queryList" >

14
src/views/dev/deptDeviceCheck.vue
Unescape Escape View File

@ -33,12 +33,12 @@
<el-table-column label="任务名称" width="150" prop="name"/>
<el-table-column label="计划名称" width="150" prop="planName"/>
<el-table-column label="系统生成" width="80" prop="sysFlag">
<template scope="scope">
<template slot-scope="scope">
{{ scope.row.sysFlag ? '是' : '否' }}
</template>
</el-table-column>
<el-table-column label="完成情况" width="80" prop="finishFlag">
<template scope="scope">
<template slot-scope="scope">
<el-tag v-if="scope.row.finishFlag==true" type="success">已完成</el-tag>
<el-tag v-if="scope.row.finishFlag==false" type="warning">未完成</el-tag>
</template>
@ -88,7 +88,7 @@
<el-table-column label="科室" width="150" prop="deptName"/>
<el-table-column label="设备编码" width="150" prop="deviceCode"/>
<el-table-column label="完成情况" width="80" prop="finishFlag">
<template scope="scope">
<template slot-scope="scope">
<el-tag v-if="scope.row.finishFlag==true" type="success">已完成</el-tag>
<el-tag v-if="scope.row.finishFlag==false" type="warning">未完成</el-tag>
</template>
@ -115,7 +115,7 @@
<el-table-column label="udi码" width="150" prop="udi"/>
<el-table-column label="注册/备案号" width="150" prop="zczbhhzbapzbh"/>
<el-table-column label="操作" width="170" fixed="right">
<template scope="scope">
<template slot-scope="scope">
<el-button type="text" @click="openItem(scope.row)"
>查看巡检项目
</el-button>
@ -156,7 +156,7 @@
<el-table-column label="序号" width="50" type="index"/>
<el-table-column label="项目编码" width="150" prop="itemCode"/>
<el-table-column label="完成情况" width="80" prop="finishFlag">
<template scope="scope">
<template slot-scope="scope">
<el-tag v-if="scope.row.finishFlag==true" type="success">已完成</el-tag>
<el-tag v-if="scope.row.finishFlag==false" type="warning">未完成</el-tag>
</template>
@ -165,7 +165,7 @@
<el-table-column label="巡检部门" width="100" prop="checkDeptName"/>
<el-table-column label="巡检人" width="100" prop="checkUserName"/>
<el-table-column label="异常情况" width="80" prop="finishFlag">
<template scope="scope">
<template slot-scope="scope">
<el-tag v-if="scope.row.normalFlag==true" type="success">正常</el-tag>
<el-tag v-if="scope.row.normalFlag==false" type="danger">异常</el-tag>
</template>
@ -174,7 +174,7 @@
<el-table-column label="项目内容" width="450" prop="itemContent"/>
<el-table-column label="巡检意见" width="450" prop="suggestion"/>
<el-table-column label="操作" width="100" fixed="right">
<template scope="scope">
<template slot-scope="scope">
<el-button v-if="scope.row.finishFlag==false" type="text"
@click="itemRow = {...scope.row,normalFlag:true}">完成
</el-button>

8
src/views/dev/deviceChangeOrder.vue
Unescape Escape View File

@ -50,12 +50,12 @@
<el-table-column label="序号" width="50" type="index"/>
<el-table-column label="单号" width="150" prop="orderId"/>
<el-table-column label="类型" width="90" prop="typeName">
<template scope="scope">
<template slot-scope="scope">
<el-tag :type="`${deviceChangeType[scope.row.type].tagType}`">{{ scope.row.typeName }}</el-tag>
</template>
</el-table-column>
<el-table-column label="状态" width="120" prop="statusName">
<template scope="scope">
<template slot-scope="scope">
<el-tag :type="`${deviceChangeStatus[scope.row.status].tagType}`">{{ scope.row.statusName }}</el-tag>
</template>
</el-table-column>
@ -68,7 +68,7 @@
<el-table-column label="确认备注" width="180" prop="confirmRemark"/>
<el-table-column label="备注" width="180" prop="remark"/>
<el-table-column label="操作" width="120" fixed="right">
<template scope="scope">
<template slot-scope="scope">
<el-button type="text"
v-if="scope.row.status==deviceChangeStatus.DRAFT.key"
@click="openEdit(scope.row)">
@ -288,7 +288,7 @@
<el-table-column label="供应商" width="160" prop="supName"/>
<el-table-column label="注册/备案号" width="180" prop="zczbhhzbapzbh"/>
<el-table-column label="操作" fixed="right" :width="createData.type==deviceChangeType.ADD.key?170:50">
<template scope="scope">
<template slot-scope="scope">
<el-button type="text"
@click="editDeviceRow(scope.row)"
v-if="createData.type==deviceChangeType.ADD.key">编辑

12
src/views/dev/deviceCheck.vue
Unescape Escape View File

@ -33,12 +33,12 @@
<el-table-column label="任务名称" width="150" prop="name"/>
<el-table-column label="计划名称" width="150" prop="planName"/>
<el-table-column label="系统生成" width="80" prop="sysFlag">
<template scope="scope">
<template slot-scope="scope">
{{ scope.row.sysFlag ? '是' : '否' }}
</template>
</el-table-column>
<el-table-column label="完成情况" width="80" prop="finishFlag">
<template scope="scope">
<template slot-scope="scope">
<el-tag v-if="scope.row.finishFlag==true" type="success">已完成</el-tag>
<el-tag v-if="scope.row.finishFlag==false" type="warning">未完成</el-tag>
</template>
@ -110,7 +110,7 @@
<el-table-column label="科室" width="150" prop="deptName"/>
<el-table-column label="设备编码" width="150" prop="deviceCode"/>
<el-table-column label="完成情况" width="80" prop="finishFlag">
<template scope="scope">
<template slot-scope="scope">
<el-tag v-if="scope.row.finishFlag==true" type="success">已完成</el-tag>
<el-tag v-if="scope.row.finishFlag==false" type="warning">未完成</el-tag>
</template>
@ -135,7 +135,7 @@
<el-table-column label="udi码" width="150" prop="udi"/>
<el-table-column label="注册/备案号" width="150" prop="zczbhhzbapzbh"/>
<el-table-column label="操作" width="170" fixed="right">
<template scope="scope">
<template slot-scope="scope">
<el-button type="text" @click="openItem(scope.row)"
>查看巡检项目
</el-button>
@ -174,7 +174,7 @@
<el-table-column label="序号" width="50" type="index"/>
<el-table-column label="项目编码" width="150" prop="itemCode"/>
<el-table-column label="完成情况" width="80" prop="finishFlag">
<template scope="scope">
<template slot-scope="scope">
<el-tag v-if="scope.row.finishFlag==true" type="success">已完成</el-tag>
<el-tag v-if="scope.row.finishFlag==false" type="warning">未完成</el-tag>
</template>
@ -183,7 +183,7 @@
<el-table-column label="巡检部门" width="100" prop="checkDeptName"/>
<el-table-column label="巡检人" width="100" prop="checkUserName"/>
<el-table-column label="异常情况" width="80" prop="finishFlag">
<template scope="scope">
<template slot-scope="scope">
<el-tag v-if="scope.row.normalFlag==true" type="success">正常</el-tag>
<el-tag v-if="scope.row.normalFlag==false" type="danger">异常</el-tag>
</template>

10
src/views/dev/deviceInfo.vue
Unescape Escape View File

@ -53,12 +53,12 @@
<el-table-column label="设备名称" width="150" prop="productName"/>
<el-table-column label="规格型号" width="160" prop="ggxh"/>
<el-table-column label="状态" width="120" prop="statusName">
<template scope="scope">
<template slot-scope="scope">
<el-tag :type="deviceStatus[scope.row.status].tagType">{{ scope.row.statusName }}</el-tag>
</template>
</el-table-column>
<el-table-column label="巡检锁定" width="120">
<template scope="scope">
<template slot-scope="scope">
<el-tag :type="scope.row.checkLock?'primark':'info'">{{ scope.row.checkLock ? '是' : '否' }}</el-tag>
</template>
</el-table-column>
@ -121,12 +121,12 @@
<el-table-column label="名称" width="150" prop="productName"/>
<el-table-column label="规格型号" width="160" prop="ggxh"/>
<el-table-column label="状态" width="80" prop="statusName">
<template scope="scope">
<template slot-scope="scope">
<el-tag :type="deviceStatus[scope.row.status].tagType">{{ scope.row.statusName }}</el-tag>
</template>
</el-table-column>
<el-table-column label="巡检锁定" width="80">
<template scope="scope">
<template slot-scope="scope">
<el-tag :type="scope.row.checkLock?'primark':'info'">{{ scope.row.checkLock ? '是' : '否' }}</el-tag>
</template>
</el-table-column>
@ -143,7 +143,7 @@
<el-table-column label="udi码" width="150" prop="udi"/>
<el-table-column label="注册/备案号" width="150" prop="zczbhhzbapzbh"/>
<el-table-column label="操作" :width="200" fixed="right">
<template scope="scope">
<template slot-scope="scope">
<el-button type="text" class="mr5" @click="getDeviceLogs(scope.row)"
>变更日志
</el-button>

10
src/views/dev/deviceInfoFull.vue
Unescape Escape View File

@ -58,12 +58,12 @@
<el-table-column label="设备名称" width="150" prop="productName"/>
<el-table-column label="规格型号" width="160" prop="ggxh"/>
<el-table-column label="状态" width="120" prop="statusName">
<template scope="scope">
<template slot-scope="scope">
<el-tag :type="deviceStatus[scope.row.status].tagType">{{ scope.row.statusName }}</el-tag>
</template>
</el-table-column>
<el-table-column label="巡检锁定" width="120">
<template scope="scope">
<template slot-scope="scope">
<el-tag :type="scope.row.checkLock?'primark':'info'">{{ scope.row.checkLock ? '是' : '否' }}</el-tag>
</template>
</el-table-column>
@ -126,12 +126,12 @@
<el-table-column label="名称" width="150" prop="productName"/>
<el-table-column label="规格型号" width="160" prop="ggxh"/>
<el-table-column label="状态" width="120" prop="statusName">
<template scope="scope">
<template slot-scope="scope">
<el-tag :type="deviceStatus[scope.row.status].tagType">{{ scope.row.statusName }}</el-tag>
</template>
</el-table-column>
<el-table-column label="巡检锁定" width="120">
<template scope="scope">
<template slot-scope="scope">
<el-tag :type="scope.row.checkLock?'primark':'info'">{{ scope.row.checkLock ? '是' : '否' }}</el-tag>
</template>
</el-table-column>
@ -148,7 +148,7 @@
<el-table-column label="udi码" width="150" prop="udi"/>
<el-table-column label="注册/备案号" width="150" prop="zczbhhzbapzbh"/>
<el-table-column label="操作" :width="150" fixed="right">
<template scope="scope">
<template slot-scope="scope">
<el-button class="mr10" type="text" @click="getDeviceLogs(scope.row)"
>变更日志
</el-button>

16
src/views/dev/devicePlan.vue
Unescape Escape View File

@ -42,7 +42,7 @@
<el-table-column label="负责部门" width="150" prop="chargeDeptName"/>
<el-table-column label="设备数量" width="150" prop="deviceCount"/>
<el-table-column label="执行情况" width="150" prop="chargeDeptName">
<template scope="scope">
<template slot-scope="scope">
<el-tag v-if="scope.row.isActive==true" type="success">已进入周期</el-tag>
<el-tag v-if="scope.row.isActive==false" type="info">未进入周期</el-tag>
</template>
@ -50,14 +50,14 @@
<el-table-column label="开始日期" width="150" prop="startDate"/>
<el-table-column label="结束日期" width="150" prop="endDate"/>
<el-table-column label="执行周期（次）" width="160" prop="frequency">
<template scope="scope">
<template slot-scope="scope">
{{ `${scope.row.frequency}天` }}
</template>
</el-table-column>
<el-table-column label="已执行次数" width="200" prop="execCount"/>
<el-table-column label="备注" width="200" prop="remark"/>
<el-table-column label="操作" width="240" fixed="right">
<template scope="scope">
<template slot-scope="scope">
<el-button type="text" @click.stop="openCreate(scope.row.planId)">
编辑
</el-button>
@ -131,7 +131,7 @@
<el-table-column label="生产企业" prop="manufactory"/>
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh"/>
<el-table-column label="操作" width="120">
<template scope="prop">
<template slot-scope="prop">
<el-button type="text" @click="openCreate(prop.row.planId,prop.row,2,true)"
>巡检项目
</el-button>
@ -160,7 +160,7 @@
<el-table-column label="生产企业" prop="manufactory"/>
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh"/>
<el-table-column label="操作" width="120">
<template scope="scope">
<template slot-scope="scope">
<el-button type="text" @click.stop="openCreate(scope.row.planId,scope.row,2)"
>巡检项目
</el-button>
@ -308,7 +308,7 @@
<el-table-column label="生产企业" prop="manufactory"/>
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh"/>
<el-table-column label="操作" width="120">
<template scope="prop">
<template slot-scope="prop">
<el-button type="text" @click="openCreate(prop.row.planId,prop.row,2,true)"
>巡检项目
</el-button>
@ -338,7 +338,7 @@
<el-table-column label="生产企业" prop="manufactory"/>
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh"/>
<el-table-column label="操作" width="120">
<template scope="scope">
<template slot-scope="scope">
<el-button type="text" @click.stop="changeActive(true,scope.row)"
>巡检项目
</el-button>
@ -369,7 +369,7 @@
<el-table-column label="项目名称" width="150" prop="name"/>
<el-table-column label="项目内容" width="500" prop="content"/>
<el-table-column label="操作" width="50">
<template scope="scope">
<template slot-scope="scope">
<el-button type="text"
v-if="!itemQuery.deviceCode&&!scope.row.deviceCode || itemQuery.deviceCode&&scope.row.deviceCode"
@click="delDetailItem(scope.row)"

4
src/views/dev/deviceRepair.vue
Unescape Escape View File

@ -44,7 +44,7 @@
<el-table-column label="序号" width="50" type="index"/>
<el-table-column label="维修号" width="150" prop="id"/>
<el-table-column label="状态" width="150" prop="statusName">
<template scope="scope">
<template slot-scope="scope">
<el-tag :type="scope.row.finishFlag?'success':'warning'">{{
scope.row.finishFlag ? '已完成' : '未完成'
}}
@ -52,7 +52,7 @@
</template>
</el-table-column>
<el-table-column label="维修方式" width="150" prop="statusName">
<template scope="scope">
<template slot-scope="scope">
{{ scope.row.innerFlag ? '内部维修' : '外部维修' }}
</template>
</el-table-column>

6
src/views/dev/deviceRepairApply.vue
Unescape Escape View File

@ -43,7 +43,7 @@
<el-table-column label="序号" width="50" type="index"/>
<el-table-column label="报修号" width="150" prop="id"/>
<el-table-column label="状态" width="150" prop="statusName">
<template scope="scope">
<template slot-scope="scope">
<el-tag :type="deviceRepairApplyStatus[scope.row.status].tagType">{{ scope.row.statusName }}</el-tag>
</template>
</el-table-column>
@ -88,12 +88,12 @@
<el-table-column label="名称" width="150" prop="productName"/>
<el-table-column label="规格型号" width="160" prop="ggxh"/>
<el-table-column label="状态" width="160" prop="statusName">
<template scope="scope">
<template slot-scope="scope">
<el-tag :type="deviceRepairApplyDetailStatus[scope.row.status].tagType">{{ scope.row.statusName }}</el-tag>
</template>
</el-table-column>
<el-table-column label="是否维修" width="160" prop="repairFlag">
<template scope="scope">
<template slot-scope="scope">
<span>{{
scope.row.repairFlag == null ? "" : scope.row.repairFlag ? "维修" : "不维修(报废/销毁)"
}}

6
src/views/dev/deviceRepairApplyHall.vue
Unescape Escape View File

@ -51,7 +51,7 @@
<el-table-column label="序号" width="50" type="index"/>
<el-table-column label="报修号" width="150" prop="id"/>
<el-table-column label="状态" width="150" prop="statusName">
<template scope="scope">
<template slot-scope="scope">
<el-tag :type="deviceRepairApplyStatus[scope.row.status].tagType">{{ scope.row.statusName }}</el-tag>
</template>
</el-table-column>
@ -96,7 +96,7 @@
<el-table-column label="名称" width="150" prop="productName"/>
<el-table-column label="规格型号" width="160" prop="ggxh"/>
<el-table-column label="状态" width="160" prop="statusName">
<template scope="scope">
<template slot-scope="scope">
<el-tag :type="deviceRepairApplyDetailStatus[scope.row.status].tagType">{{
scope.row.statusName
}}
@ -104,7 +104,7 @@
</template>
</el-table-column>
<el-table-column label="是否维修" width="160" prop="repairFlag">
<template scope="scope">
<template slot-scope="scope">
<span>{{
scope.row.repairFlag==null?"":scope.row.repairFlag ? "维修" : "不维修(报废/销毁)"
}}

2
src/views/inventory/count/InvCountOrderCompleted.vue
Unescape Escape View File

@ -1,7 +1,7 @@
<template>
<div>
<el-card class="el-card">
<el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="120px" v-show="showSearch">
<el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" class="query-form" size="mini" label-width="120px">
<!-- <el-row>
<el-col :span="8">
<el-form-item class="query-form-item" label="盘点单号:">

8
src/views/inventory/stockCompare.vue
Unescape Escape View File

@ -89,7 +89,7 @@
</template>
</el-table-column>
<el-table-column label="单据类型" width="110" prop="actionName">
<template scope="scope">
<template slot-scope="scope">
{{ scope.row.actionName || '未选择' }}
</template>
</el-table-column>
@ -128,7 +128,7 @@
<el-table-column label="规格型号" width="120" prop="ggxh" show-overflow-tooltip/>
<el-table-column label="批次号" width="110" prop="batchNo" show-overflow-tooltip/>
<el-table-column label="出入库类型" width="90" prop="mainAction" show-overflow-tooltip>
<template scope="scope">
<template slot-scope="scope">
{{ mainActionMap[scope.row.mainAction] }}
</template>
</el-table-column>
@ -268,7 +268,7 @@
<el-table-column label="产品名称" width="120" prop="productName" show-overflow-tooltip/>
<el-table-column label="规格型号" width="120" prop="ggxh" show-overflow-tooltip/>
<el-table-column label="出入库类型" width="90" prop="mainAction" show-overflow-tooltip>
<template scope="scope">
<template slot-scope="scope">
{{ mainActionMap[scope.row.mainAction] }}
</template>
</el-table-column>
@ -305,7 +305,7 @@
<el-table-column label="注册/备案证号" width="220" prop="zczbhhzbapzbh" show-overflow-tooltip/>
<el-table-column label="操作" v-if="editRow&&editRow.status==stockCompareStatusEnum.DRAFT.key" width="80"
fixed="right">
<template scope="scope">
<template slot-scope="scope">
<el-button type="text" @click="removeDetail(scope.row)">移除</el-button>
</template>
</el-table-column>

Write Preview
Loading…
Cancel
Save