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

Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck_z

Browse Source 
# Conflicts:
#	.env.production
#	src/views/basic/product/productEdit.vue
#	src/views/thirdSys/invOrder/thrInvOrder.vue
20240912_adapter_z
chenhc 8 months ago
parent 3c7934de18 f528e377a8
commit 2aa9cffc7f
13 changed files with 629 additions and 50 deletions
Show Stats Download Patch File Download Diff File

16
.env.production
Unescape Escape View File

@ -12,7 +12,7 @@ ENV = 'production'
# VUE_APP_BASE_API = 'http://192.168.0.67:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://192.168.0.127:9170/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://dm.xmglxp.com:8082/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://dm.xmglxp.com:81/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://dm.xmglxp.com:82/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://dm.xmglxp.com:8001/UDI_WMS_MC/'
# 诏安总医院
@ -21,7 +21,7 @@ ENV = 'production'
# 平潭正式
# VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
# 漳州中医院
# VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/'
@ -41,13 +41,12 @@ ENV = 'production'
# VUE_APP_BASE_API = 'http://172.20.124.4:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://192.168.0.207:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://192.168.0.191:9150/UDI_WMS_MC/'
# 林纪裕centos
# VUE_APP_BASE_API = 'http://192.168.0.86:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://192.168.0.207:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://192.168.31.2:9150/UDI_WMS_MC/'
@ -58,6 +57,7 @@ ENV = 'production'
# 云霄妇幼保健
# VUE_APP_BASE_API = 'http://192.168.0.11:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://192.168.0.67:9150/UDI_WMS_MC/'
# 东山
# VUE_APP_BASE_API = 'https://mudi.dsxyy.org/UDI_WMS_MC/'
@ -65,16 +65,12 @@ ENV = 'production'
# 南靖
VUE_APP_BASE_API = 'http://192.168.10.225:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://192.168.10.225:9150/UDI_WMS_MC/'
# 测试NIGINX
# VUE_APP_BASE_API = 'https://test.udims.com/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://192.168.20.128:9150/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://192.168.0.235:9150/UDI_WMS_MC/'
# 东山外网测试
# VUE_APP_BASE_API = 'https://mudi.dsxyy.org/UDI_WMS_MC/'
# VUE_APP_BASE_API = 'http://192.168.0.132:9150/UDI_WMS_MC/'
# 应用访问路径 例如使用前缀 /admin/
VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/'

10
src/api/inout/order.js
Unescape Escape View File

@ -523,6 +523,16 @@ export function deleteInvByCode(query) {
});
}
export function deleteAllInvByCode(query) {
return axios({
url: "/udiwms/inout/code/finish/deleteAll",
method: "post",
data: query
});
}
export function rollbackOrder(params) {
return axios({
url: "/udiwms/inout/order/received/rollback",

7
src/api/purchase/supCertRedmindMsg.js
Unescape Escape View File

@ -23,3 +23,10 @@ export function ignoreMsg(params) {
params: params
});
}
export function getSupCertgetCount(params) {
return axios({
url: "/sup/cert/remind/msg/getCount",
method: "get",
params: params
});
}

10
src/api/system/sysMsgTodoApi.js
Unescape Escape View File

@ -0,0 +1,10 @@
import request from '@/utils/request'
export function sysMsgTodoPage(query) {
return request({
url: '/spms/sysMsgTodo/page',
method: 'POST',
data: query
})
}

1
src/assets/svg/已对照产品.svg
Unescape Escape View File

@ -0,0 +1 @@
<?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="1700041612651" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4572" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M887.466667 627.2c-2.133333 0-2.133333 0 0 0-6.4-4.266667-12.8-10.666667-12.8-19.2V192c0-12.8-8.533333-21.333333-21.333334-21.333333h-177.066666c-38.4 0-72.533333-25.6-83.2-64-10.666667-40.533333-46.933333-66.133333-87.466667-64-36.266667 2.133333-66.133333 29.866667-76.8 66.133333C418.133333 145.066667 384 170.666667 347.733333 170.666667H170.666667c-12.8 0-21.333333 8.533333-21.333334 21.333333v768c0 12.8 8.533333 21.333333 21.333334 21.333333h352c8.533333 0 14.933333 4.266667 19.2 10.666667 6.4 14.933333-2.133333 29.866667-19.2 29.866667H170.666667c-36.266667 0-64-27.733333-64-64V192c0-36.266667 27.733333-64 64-64h177.066666c19.2 0 36.266667-12.8 40.533334-32 14.933333-55.466667 64-96 123.733333-96s108.8 40.533333 123.733333 96c4.266667 19.2 21.333333 32 40.533334 32H853.333333c36.266667 0 64 27.733333 64 64v416c0 14.933333-17.066667 25.6-29.866666 19.2zM256 746.666667h256c14.933333 0 25.6 14.933333 19.2 29.866666-2.133333 8.533333-10.666667 12.8-19.2 12.8H256c-12.8 0-21.333333-8.533333-21.333333-21.333333s8.533333-21.333333 21.333333-21.333333z m0-192h426.666667c12.8 0 21.333333 8.533333 21.333333 21.333333s-8.533333 21.333333-21.333333 21.333333H256c-12.8 0-21.333333-8.533333-21.333333-21.333333s8.533333-21.333333 21.333333-21.333333zM469.333333 170.666667c-12.8 0-21.333333-8.533333-21.333333-21.333334s8.533333-21.333333 21.333333-21.333333h85.333334c12.8 0 21.333333 8.533333 21.333333 21.333333s-8.533333 21.333333-21.333333 21.333334h-85.333334z m320 213.333333c0 12.8-8.533333 21.333333-21.333333 21.333333H256c-12.8 0-21.333333-8.533333-21.333333-21.333333s8.533333-21.333333 21.333333-21.333333h512c10.666667 0 21.333333 8.533333 21.333333 21.333333z m-134.4 490.666667l64 61.866666 162.133334-162.133333c8.533333-8.533333 21.333333-8.533333 29.866666 0 8.533333 8.533333 8.533333 21.333333 0 29.866667l-192 192-93.866666-91.733334c-8.533333-8.533333-8.533333-21.333333 0-29.866666 8.533333-8.533333 21.333333-8.533333 29.866666 0z" fill="#409EFF" p-id="4573"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

1
src/assets/svg/库存预警.svg
Unescape Escape View File

@ -0,0 +1 @@
<?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="1700041424195" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="18284" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M453.030445 733.571375l117.7938 0 0 117.7938-117.7938 0L453.030445 733.571375zM486.377948 674.67601l57.674561 0 26.770713-294.485011-117.7938 0L486.377948 674.67601zM996.086765 969.130322l0 0.029676-966.975239 0c-15.247262 0-27.608801-12.361539-27.608801-27.608801 0-5.248537 1.465374-10.155291 4.00829-14.332427l-0.064468 0 480.603943-854.407464c3.911076-10.494005 14.020318-17.971303 25.877367-17.971303 11.857049 0 21.966291 7.477298 25.877367 17.971303l480.013495 853.358575c2.955308 4.396123 4.680603 9.68764 4.680603 15.381315C1022.497275 956.395276 1010.778372 968.500988 996.086765 969.130322zM976.214159 931.340647l-464.285279-825.515437-464.3477 825.515437L976.214159 931.340647z" fill="#fd1403" p-id="18285"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

1
src/assets/svg/资质预警.svg
Unescape Escape View File

@ -0,0 +1 @@
<?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="1700041341581" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="16800" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M438.272 546.05824v83.968h119.45984c48.0256-69.2224 128.04096-115.17952 218.9312-115.17952h6.8608V176.59904s-90.89024-3.97312-192.63488-43.13088c-101.1712-39.7312-167.48544-84.56192-175.5136-90.23488L411.97568 40.96l-2.8672 1.69984c-2.84672 1.69984-70.8608 48.80384-176.04608 90.23488C131.2768 173.19936 40.96 176.59904 40.96 176.59904v405.77024c0 84.5824 21.15584 171.39712 114.8928 257.08544 82.90304 75.48928 216.6784 137.91232 256.1024 137.91232 19.456 0 78.88896-22.71232 140.63616-56.75008-26.86976-42.57792-41.73824-91.38176-41.73824-141.88544 0-32.91136 6.28736-64.12288 17.16224-93.06112H207.872v-56.19712h67.46112v-147.5584h56.60672v146.98496h49.152V392.25344h56.58624v99.328h119.48032v53.90336l-118.90688 0.57344z m20.56192-207.1552h-93.75744l-138.32192 125.41952-37.74464-41.984 153.78432-140.1856h135.4752l157.77792 141.312-38.87104 41.43104-138.3424-125.99296z m318.40256 235.52c-113.74592 0-205.78304 91.38176-205.78304 204.30848C571.45344 891.6992 663.49056 983.04 777.216 983.04 891.00288 983.04 983.04 891.67872 983.04 778.73152c0-112.92672-92.03712-204.30848-205.80352-204.30848z m107.47904 175.37024l-110.8992 110.65344c-5.14048 5.12-12.57472 7.94624-19.43552 7.94624h-1.14688c-6.8608 0-14.29504-2.82624-19.43552-7.94624l-1.14688-1.1264-64.02048-61.8496c-10.8544-10.79296-10.28096-28.95872 1.14688-40.30464s29.71648-11.91936 40.59136-1.1264l43.43808 40.8576 89.74336-89.088c10.8544-10.79296 29.16352-10.24 40.59136 1.1264 11.42784 11.91936 12.00128 30.06464 0.57344 40.8576z" fill="#fd1403" p-id="16801"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

19
src/views/basic/product/productEdit.vue
Unescape Escape View File

@ -511,6 +511,24 @@
</el-col>
</el-row>
<el-divider></el-divider>
<el-row>
<el-col span="5">
<span class="sptext">是否组套</span>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="5">
<el-select v-model="editQuery.isStack" style="width: 65%" placeholder="选择是否组套" clearable>
<el-option label="是" :value="true"></el-option>
<el-option label="否" :value="false"></el-option>
</el-select>
</el-col>
<el-divider direction="vertical"></el-divider>
<el-col span="13">
<span class="sptext">是否组套</span>
</el-col>
</el-row>
<el-divider></el-divider>
<el-row>
<el-col span="5">
<span class="sptext">多次/重复使用耗材</span>
@ -898,6 +916,7 @@ export default {
selectmedicalSuppliesDialog
},
created() {
console.log("dayinshshhs", this.editQuery)
this.useMutiChange(true)
this.getThirdSysDetail();
if (this.editQuery.isDateBy == 1) {

400
src/views/index.vue
Unescape Escape View File

@ -1,34 +1,410 @@
<template>
<div class="app-container home">
<el-row :gutter="20">
<el-col :sm="24" :lg="12" style="padding-left: 20px">
<h2>欢迎使用UDI管理平台</h2>
<div>
<h2>欢迎使用UDI管理平台</h2>
<el-divider/>
</div>
<!-- 分割线 -->
<div class="mt10 grid-container grid-container3" style="height: 15%">
<el-card class="grid-item" body-style="padding:0px;height:100%" v-hasPermi="['home:index:product']">
<el-row>
<div class="height-full fl center ml20" style="width: 30%">
<el-image style="border-radius: 4%;width: 80%;height: 80%"
:src="productSvg">
<div slot="placeholder" class="image-slot">
加载中<span class="dot">...</span>
</div>
</el-image>
</div>
<div class="height-full fr center mr20">
<span class="header d-block">
已对照产品
</span>
<span class="d-block mt10" :style="{'font-size': '32px','font-weight': 'bolder',color:'#394047'}">
{{ productCount }}
</span>
</div>
</el-row>
</el-card>
</el-col>
</el-row>
<el-divider/>
<el-card class="grid-item" body-style="padding:0px;height:100%" v-hasPermi="['home:index:invWarn']">
<el-row>
<div class="height-full fl center ml20" style="width: 30%">
<el-image style="border-radius: 4%;width: 80%;height: 80%"
:src="invSvg">
<div slot="placeholder" class="image-slot">
加载中<span class="dot">...</span>
</div>
</el-image>
</div>
<div class="height-full fr center mr20" @click="linkPage('/remind/invRemindMsg')">
<span class="header d-block">
库存预警
</span>
<span class="d-block mt10" :style="{'font-size': '32px','font-weight': 'bolder',color:'#FF0000'}">
{{ invMsgCount }}
</span>
</div>
</el-row>
</el-card>
<el-card class="grid-item" body-style="padding:0px;height:100%" v-hasPermi="['home:index:certWarn']">
<el-row>
<div class="height-full fl center ml20" style="width: 30%">
<el-image style="border-radius: 4%;width: 80%;height: 80%"
:src="certSvg">
<div slot="placeholder" class="image-slot">
加载中<span class="dot">...</span>
</div>
</el-image>
</div>
<div class="height-full fr center mr20" @click="linkPage('/remind/supCertRemindMsg')">
<span class="header d-block">
资质预警
</span>
<span class="d-block mt10" :style="{'font-size': '32px','font-weight': 'bolder',color:'#FF0000'}"
>
{{ certMsgCount }}
</span>
</div>
</el-row>
</el-card>
</div>
<!-- 分割线 -->
<div class="m0 grid-container grid-container2" style="height: calc(40%);margin-top: 10px">
<el-card class="grid-item" body-style="padding:0px;height:100%" v-hasPermi="['home:index:todo']">
<div slot="header" class="header">
<el-icon class="el-icon-s-management"/>
待办事项{{ `(${todoCount}条)` }}
<div class="fr">
<el-button type="text" style="font-size: 15px;color: unset" @click="getSysMsgTodoList">
<el-icon class="el-icon-refresh"/>
重新加载
</el-button>
<el-button type="text" style="font-size: 15px;color: unset"
@click.stop="">
更多
<el-icon class="el-icon-d-arrow-right"/>
</el-button>
</div>
</div>
<el-table
v-loading="msgLoading"
:data="msgList"
height="calc(90%)"
stripe
style="">
<el-table-column
type="index"
label="序号"
width="50"/>
<el-table-column
label="消息编码"
prop="code"
width="120"/>
<el-table-column
label="消息类型"
prop="msgTypeName"
width="120"/>
<el-table-column
label="消息内容"
prop="msgContent"
width="280"/>
<el-table-column
label="处理状态"
prop="dealStatusName"
width="120"/>
<el-table-column
label="推送状态"
prop="pushStatusName"
width="120"/>
<el-table-column
label="仓库"
prop="invName"
width="120"/>
<el-table-column
label="部门"
prop="deptName"
width="120"/>
<el-table-column
label="创建时间"
prop="createTime"
width="140"/>
<el-table-column label="操作" width="80" fixed="right">
<template slot-scope="scope">
<el-button
type="text"
@click="linkPage('/system/msg/sysMsgTodo')"
>处理
</el-button>
</template>
</el-table-column>
</el-table>
</el-card>
<el-card class="grid-item" body-style="padding:0px;height:100%" v-hasPermi="['home:index:ioAudit']">
<div slot="header" class="header">
<el-icon class="el-icon-s-platform"/>
审核送货单{{ `(${orderTotal}条)` }}
<div class="fr">
<el-button type="text" style="font-size: 15px;color: unset" @click="getOrderList">
<el-icon class="el-icon-refresh"/>
重新加载
</el-button>
<el-button type="text" style="font-size: 15px;color: unset"
@click="linkPage('/order/checked')">更多
<el-icon class="el-icon-d-arrow-right"/>
</el-button>
</div>
</div>
<el-table
v-loading="orderLoading"
:data="orderList"
height="calc(90%)"
stripe>
<el-table-column
type="index"
label="序号"
width="50"/>
<el-table-column label="送货单号" prop="billNo" width="180"/>
<el-table-column label="单据类型" prop="billTypeName" width="150"/>
<el-table-column label="送货单位" prop="fromName" width="220"/>
<el-table-column label="创建时间" prop="createTime" width="150"/>
<el-table-column label="核对时间" prop="checkTime" width="150"/>
<el-table-column label="采购部门" prop="deptName" width="120">
</el-table-column>
<el-table-column label="收货仓库" prop="invName" width="120">
</el-table-column>
<el-table-column label="核对人" prop="checkUserName" width="120">
</el-table-column>
<el-table-column label="来源单号" prop="corpOrderId" width="180"/>
<!-- <el-table-column label="来源" prop="fromType" width="120">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ fromTypeMap[scope.row.fromType] }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="审核状态" prop="status" width="100">-->
<!-- <template slot-scope="scope">-->
<!-- <el-tag :type="statusFilterType(scope.row.status)">{{-->
<!-- checkStatus[scope.row.status]-->
<!-- }}-->
<!-- </el-tag>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="备注" prop="remark" width="180"/>
<el-table-column label="操作" width="80" fixed="right">
<template slot-scope="scope">
<el-button
type="text"
@click="linkPage('/order/checked')"
>处理
</el-button>
</template>
</el-table-column>
</el-table>
</el-card>
</div>
</div>
</template>
<script>
import {getOrderList} from "../api/inout/order";
import {sysMsgTodoPage} from "../api/system/sysMsgTodoApi";
import productSvg from "@/assets/svg/已对照产品.svg"
import invSvg from "@/assets/svg/库存预警.svg"
import certSvg from "@/assets/svg/资质预警.svg"
import {getInvRemindMsgList} from "../api/system/invRemindMsg";
import {getUdiInfos} from "../api/basic/udiRelevance";
import {getSupCertgetCount, getSupCertRemindMsgList} from "../api/purchase/supCertRedmindMsg";
export default {
name: "Index",
data() {
return {
// 版本号
version: "4.3.0",
productSvg: productSvg,
invSvg: invSvg,
certSvg: certSvg,
productCount: 0,
invMsgCount: 0,
certMsgCount: 0,
// 待办==================================================
msgLoading: false,
todoCount: 0,
msgList: [],
// =======================================================================
// 单据==================================================
orderLoading: false,
orderTotal: 0,
orderList: [],
// =======================================================================
};
},
created() {
this.getProductCount()
this.getInvMsgCount()
this.getCertMsgCount()
this.getSysMsgTodoList()
this.getOrderList()
},
methods: {
goTarget(href) {
window.open(href, "_blank");
getProductCount() {
let param = {
page: 1,
limit: 1,
addType: 1,
filterType: 1
}
getUdiInfos(param).then(res => {
this.productCount = res.data?.total || 0
})
},
getInvMsgCount() {
let param = {
page: 1,
limit: 1,
status: 1,
ignoreStatus: 0
}
getInvRemindMsgList(param).then(res => {
this.invMsgCount = res.data?.total || 0
})
},
getCertMsgCount() {
let param = {
page: 1,
limit: 1,
status: 1,
ignoreStatus: 0
}
getSupCertgetCount(param).then(res => {
this.certMsgCount = res.data
})
},
linkPage(path) {
console.log(path)
this.$router.push(path)
},
getSysMsgTodoList() {
this.msgLoading = true
let msgQuery = {
page: 1,
limit: 5
}
sysMsgTodoPage(msgQuery).then(res => {
this.msgLoading = false
if (res.code != 20000) {
this.$message.error(res.message())
return
}
this.msgList = res.data.list || []
this.todoCount = res.data.total || 0
}).catch(e => {
this.$message.error(e.message)
this.msgLoading = false
this.msgList = []
this.todoCount = 0
})
},
getOrderList() {
this.orderLoading = true
let orderQuery = {
page: 1,
limit: 10,
// status: 10,
statusType: "waitAudited"
// vueType: "supDelivery",
}
getOrderList(orderQuery)
.then((res) => {
this.orderLoading = false;
if (res.code === 20000) {
this.orderList = res.data.list || [];
this.orderTotal = res.data.total || 0;
} else {
this.$message.error(res.message);
}
})
.catch((error) => {
this.$message.error(error.message)
this.orderLoading = false;
this.orderList = [];
this.orderTotal = 0;
});
},
},
};
</script>
<style scoped lang="scss">
.center {
display: flex;
flex-direction: column;
align-items: flex-start;
justify-content: center;
}
.el-row .el-card {
margin: 0;
.el-card__body {
padding: 0 !important;
}
}
.grid-item {
height: 100%;
padding: 15px;
.el-row, .el-col {
height: 100%;
}
.header {
color: #676a6c;
font-size: 20px;
font-weight: bolder;
}
.el-table {
margin-top: 10px;
width: 100%;
}
}
.grid-container {
height: inherit;
display: grid;
grid-gap: 10px;
.el-card {
margin: 0;
}
}
.grid-container1 {
grid-template-columns: repeat(1, 1fr);
}
.grid-container2 {
grid-template-columns: repeat(2, 1fr);
}
.grid-container3 {
grid-template-columns: repeat(3, 1fr);
}
.grid-container4 {
grid-template-columns: repeat(4, 1fr);
}
.home {
blockquote {
padding: 10px 20px;
margin: 0 0 20px;
@ -52,6 +428,7 @@ export default {
margin: 0;
}
height: calc(100%);
font-family: "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
font-size: 13px;
color: #676a6c;
@ -68,7 +445,8 @@ export default {
h2 {
margin-top: 10px;
font-size: 26px;
font-weight: 100;
color: #000610;
font-weight: bolder;
}
p {

170
src/views/inout/DialogSelectInvProduct.vue
Unescape Escape View File

@ -68,28 +68,123 @@
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row="false" border
@current-change="handleChange"
ref="multipleTable">
<el-table-column label width="45" v-if="type==3 ">
<template slot-scope="scope">
<el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
</template>
</el-table-column>
<el-table-column type="selection" width="55" v-if="type!=3"></el-table-column>
<el-table-column label="序号" type="index" width="55"></el-table-column>
<el-table-column label="DI/物资编码" prop="nameCode" width="120" show-overflow-tooltip></el-table-column>
<el-table-column label="物资名称" prop="cpmctymc" width="160" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" width="160"></el-table-column>
<el-table-column label="包装规格" prop="bzgg" width="100"></el-table-column>
<el-table-column label="计量单位" prop="measname" width="90"></el-table-column>
<el-table-column label="批次号" prop="batchNo" width="90"></el-table-column>
<el-table-column label="价格" prop="price"></el-table-column>
<el-table-column label="生产日期" prop="productionDate" width="90"></el-table-column>
<el-table-column label="失效日期" prop="expireDate" width="90"></el-table-column>
<el-table-column label="入库数量" prop="inCount" width="90"></el-table-column>
<el-table-column label="出库数量" prop="outCount" width="90"></el-table-column>
<el-table-column label="结余数量" prop="reCount" width="90"></el-table-column>
<el-table-column label="生产企业" prop="ylqxzcrbarmc" width="180"></el-table-column>
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="180"></el-table-column>
<el-table-column label="供应商" prop="supName" width="180"></el-table-column>
<!-- <el-table-column label width="45" v-if="type==3 ">-->
<!-- <template slot-scope="scope">-->
<!-- <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column type="selection" width="55" v-if="type!=3"></el-table-column>-->
<!-- <el-table-column label="序号" type="index" width="55"></el-table-column>-->
<!-- <el-table-column label="DI/物资编码" prop="nameCode" width="120" show-overflow-tooltip></el-table-column>-->
<!-- <el-table-column label="物资名称" prop="cpmctymc" width="160" show-overflow-tooltip></el-table-column>-->
<!-- <el-table-column label="规格型号" prop="ggxh" width="160"></el-table-column>-->
<!-- <el-table-column label="包装规格" prop="bzgg" width="100"></el-table-column>-->
<!-- <el-table-column label="计量单位" prop="measname" width="90"></el-table-column>-->
<!-- <el-table-column label="批次号" prop="batchNo" width="90"></el-table-column>-->
<!-- <el-table-column label="价格" prop="price"></el-table-column>-->
<!-- <el-table-column label="生产日期" prop="productionDate" width="90"></el-table-column>-->
<!-- <el-table-column label="失效日期" prop="expireDate" width="90"></el-table-column>-->
<!-- <el-table-column label="入库数量" prop="inCount" width="90"></el-table-column>-->
<!-- <el-table-column label="出库数量" prop="outCount" width="90"></el-table-column>-->
<!-- <el-table-column label="结余数量" prop="reCount" width="90"></el-table-column>-->
<!-- <el-table-column label="生产企业" prop="ylqxzcrbarmc" width="180"></el-table-column>-->
<!-- <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="180"></el-table-column>-->
<!-- <el-table-column label="供应商" prop="supName" width="180"></el-table-column>-->
<template v-for="(item, index) in tableHeader">
<el-table-column
v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
type="index" :label="item.columnDesc"></el-table-column>
<el-table-column
v-if="item.columnType == 'selection'"
type="selection"
:width="item.width"
:selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
></el-table-column>
<el-table-column
v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{
item.lableRuleObj[scope.row[item.columnName]]
}}</span>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-tag
:type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
<span>{{
item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName]
}}</span>
</el-tag>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:width="item.width"
:key="item.columnName"
fixed="right"
>
<template slot-scope="scope">
<el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
:type="buttonItem.type"
:size="buttonItem.size"
:style="buttonItem.style"
:key="buttonItem"
v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
:disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
@click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
>{{ buttonItem.name }}
</el-button>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
scope.row[item.columnName]
}}</span>
</template>
</el-table-column>
</template>
</el-table>
</el-card>
@ -112,6 +207,7 @@ import {addBizProduct} from "@/api/inout/orderDetailCode";
import {getInvPreInProduct, getInvPreInProductStock} from "@/api/inventory/invPreInSearch";
import {getInvPreProduct, getInvPreProductStock} from "@/api/inventory/invPreProduct";
import {finProductSet} from "@/api/param/systemParamConfig";
import {executeFuc, getHead} from "@/utils/customConfig";
export default {
@ -172,10 +268,29 @@ export default {
currentRow: null,
radioCheck: null,
tableHeader: [],
queryList: [],
fromList: [],
};
},
components: {},
methods: {
//界面配置----------------
executeFuc(row, type, clickFuc, value) {
return executeFuc(this, row, type, clickFuc, value);
},
executeEval(row, expression, defaultRet) {
if (expression) {
return eval(expression);
}
return defaultRet;
},
onReset() {
this.$router.push({
@ -391,7 +506,16 @@ export default {
created() {
this.findBasicProductSet();
// 加载表格数据
this.getList();
getHead("selectInvProduct", "1").then((re) => {
// 处理返回的数据
this.tableObj = re.data;
this.tableHeader = re.data.tableList;
this.queryList = re.data.queryList;
this.fromList = re.data.fromList;
this.getList();
});
}
,
}

29
src/views/inout/IoEditOrderCodeDetail.vue
Unescape Escape View File

@ -25,6 +25,12 @@
<el-table-column label="创建时间" prop="createTime" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" width="150">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native.stop="deleteAllDialog(scope.row)"
>删除
</el-button>
<el-button
type="text"
size="small"
@ -97,6 +103,7 @@
<script>
import {
deleteAllInvByCode,
deleteInvByCode, updateOrderInfo
} from "../../api/inout/order";
import {getCodeListForEdit} from "@/api/inout/code";
@ -242,6 +249,28 @@ export default {
.catch(() => {
});
},
deleteAllDialog(row) {
this.$confirm("是否确定删除条码?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
deleteAllInvByCode(row).then((res) => {
if (res.code === 20000) {
this.$message.success("操作成功");
this.getList();
} else {
this.$message.error(res.message);
}
}).catch((error) => {
this.$message.error(error.message);
});
})
.catch(() => {
});
},
},
filters: {
statusFilterType(status) {

14
src/views/inventory/addInvRemindSetDialog.vue
Unescape Escape View File

@ -29,17 +29,17 @@
</el-col>
</el-row>
<el-divider></el-divider>
<el-row>
<el-col :span="10">
<el-form-item class="query-form-item" label="低库存预警数量：">
<el-input v-model="formData.lowStockNum" disabled></el-input>
<el-input v-model="formData.lowStockNum" ></el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item class="query-form-item" label="库存积压预警数量：">
<el-input v-model="formData.overStockNum" disabled></el-input>
<el-input v-model="formData.overStockNum" ></el-input>
</el-form-item>
</el-col>
</el-row>
@ -47,14 +47,16 @@
<el-row>
<el-col :span="10">
<el-form-item class="query-form-item" label="近效期预警时间：">
<el-input v-model="formData.recentDateTime" disabled></el-input>
<el-input v-model="formData.recentDateTime" ></el-input>
</el-form-item>
</el-col>
<el-col :span="10">
<el-form-item class="query-form-item" label="近效期预警时间单位：">
<el-input v-show="formData.isDateBy == 1" value="天" disabled></el-input>
<el-input v-show="formData.isDateBy == 2" value="小时" disabled></el-input>
<el-select v-model="formData.isDateBy">
<el-option :value=1 label="天" ></el-option>
<el-option :value=2 label="小时" ></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>

1
src/views/thirdSys/invOrder/thrInvOrder.vue
Unescape Escape View File

@ -49,6 +49,7 @@
:picker-options="pickerOptions"
v-model="actDateRange"
type="datetimerange"
format="yyyy-MM-dd HH:mm:ss"
value-format="yyyy-MM-dd HH:mm:ss"
range-separator="至"
start-placeholder="开始日期"

Write Preview
Loading…
Cancel
Save