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

bug修改

Browse Source
ywj_dev
anthonywj 3 years ago
parent efc2707565
commit c6ab446df1
2 changed files with 208 additions and 231 deletions
Show Stats Download Patch File Download Diff File

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

@ -50,176 +50,180 @@
<el-table-column label="包装单位" prop="packUnit" show-overflow-tooltip></el-table-column> <el-table-column label="包装单位" prop="packUnit" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" width="180px"> <el-table-column label="操作" width="180px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click.native.stop="singleDiEdit(scope.row)">编辑</el-button> </template> <el-button type="text" @click.native.stop="singleDiEdit(scope.row)">编辑</el-button>
</template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-card> </el-card>
<el-card>
<el-row type="flex" class="edit-row" style="margin-top: 20px">
<el-col :span="12">
<el-form-item label="计量单位:">
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.measname"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="生产厂家:">
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.manufactory"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" class="edit-row">
<el-col :span="12">
<el-form-item label="商品名称:">
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.spmc"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="产品描述:">
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.cpms"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" class="edit-row">
<el-col :span="12" v-if="productRemarkSet.remarkEnable1">
<el-form-item :label="productRemarkSet.remarkTitle1+':'" +>
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak1"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12" v-if="productRemarkSet.remarkEnable2">
<el-form-item :label="productRemarkSet.remarkTitle2+':'" +>
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak2"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" class="edit-row">
<el-col :span="12" v-if="productRemarkSet.remarkEnable3">
<el-form-item :label="productRemarkSet.remarkTitle3+':'" +>
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak3"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12" v-if="productRemarkSet.remarkEnable4">
<el-form-item :label="productRemarkSet.remarkTitle4+':'" +>
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak4"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" class="edit-row">
<el-col :span="12" v-if="productRemarkSet.remarkEnable5">
<el-form-item :label="productRemarkSet.remarkTitle5+':'" +>
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak5"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12" v-if="productRemarkSet.remarkEnable6">
<el-form-item :label="productRemarkSet.remarkTitle6+':'" +>
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak6"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" class="edit-row">
<el-col :span="12" v-if="productRemarkSet.remarkEnable7">
<el-form-item :label="productRemarkSet.remarkTitle7+':'" +>
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak7"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12" v-if="productRemarkSet.remarkEnable8">
<el-form-item :label="productRemarkSet.remarkTitle8+':'" +>
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak8"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" class="edit-row">
<el-col :span="12">
<el-form-item label="医保编码:">
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.ybbm"
></el-input>
</el-form-item>
</el-col>
</el-row>
</el-card>
<el-collapse v-model="activeNames" style="margin-top: 12px">
<el-collapse-item title="高级设置" name="1"
style="font-size: 19px;
margin-left: 25px;
font-weight: bold;">
<div style="width: 96%;margin: 0 auto">
<el-descriptions class="margin-top" :column="3" size="mini" border>
<el-descriptions-item>
<template slot="label">
<el-row type="flex" class="edit-row" style="margin-top: 20px">
<el-col :span="12">
<el-form-item label="计量单位:">
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.measname"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="生产厂家:">
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.manufactory"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" class="edit-row">
<el-col :span="12">
<el-form-item label="商品名称:">
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.spmc"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="产品描述:">
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.cpms"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" class="edit-row">
<el-col :span="12" v-if="productRemarkSet.remarkEnable1">
<el-form-item :label="productRemarkSet.remarkTitle1+':'" +>
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak1"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12" v-if="productRemarkSet.remarkEnable2">
<el-form-item :label="productRemarkSet.remarkTitle2+':'" +>
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak2"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" class="edit-row">
<el-col :span="12" v-if="productRemarkSet.remarkEnable3">
<el-form-item :label="productRemarkSet.remarkTitle3+':'" +>
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak3"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12" v-if="productRemarkSet.remarkEnable4">
<el-form-item :label="productRemarkSet.remarkTitle4+':'" +>
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak4"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" class="edit-row">
<el-col :span="12" v-if="productRemarkSet.remarkEnable5">
<el-form-item :label="productRemarkSet.remarkTitle5+':'" +>
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak5"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12" v-if="productRemarkSet.remarkEnable6">
<el-form-item :label="productRemarkSet.remarkTitle6+':'" +>
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak6"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" class="edit-row">
<el-col :span="12" v-if="productRemarkSet.remarkEnable7">
<el-form-item :label="productRemarkSet.remarkTitle7+':'" +>
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak7"
></el-input>
</el-form-item>
</el-col>
<el-col :span="12" v-if="productRemarkSet.remarkEnable8">
<el-form-item :label="productRemarkSet.remarkTitle8+':'" +>
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak8"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" class="edit-row">
<el-col :span="12">
<el-form-item label="医保编码:">
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.ybbm"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-collapse v-model="activeNames">
<el-collapse-item title="高级设置" name="1" class="titel">
<div style="width: 85%;margin: 0 auto">
<el-descriptions class="margin-top" :column="3" size="mini" border>
<el-descriptions-item>
<template slot="label">
<i class="el-icon-setting"></i>
设置项
</template> </template>
库存积压预警数量 库存积压预警数量
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
<i class="el-icon-set-up"></i>
参数值
</template> </template>
<el-input style="width: 100%" size="small" splaceholder="请输入内容" :disabled="this.useNumEnable" type="number" v-model="editQuery.overStockNum"></el-input> <el-input style="width: 100%" size="small" splaceholder="请输入内容" :disabled="this.useNumEnable"
type="number" v-model="editQuery.overStockNum"></el-input>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
@ -231,17 +235,16 @@
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
<i class="el-icon-setting"></i>
设置项
</template> </template>
低库存预警数量 低库存预警数量
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
<i class="el-icon-set-up"></i>
参数值
</template> </template>
<el-input style="width: 100%" size="small" splaceholder="请输入内容" :disabled="this.useNumEnable" type="number" v-model="editQuery.lowStockNum"></el-input> <el-input style="width: 100%" size="small" splaceholder="请输入内容" :disabled="this.useNumEnable"
type="number" v-model="editQuery.lowStockNum"></el-input>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
@ -254,17 +257,16 @@
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
<i class="el-icon-setting"></i>
设置项
</template> </template>
最小包装可使用次数 最小包装可使用次数
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
<i class="el-icon-set-up"></i>
参数值
</template> </template>
<el-input style="width: 100%" size="small" splaceholder="请输入内容" :disabled="this.useNumEnable" type="number" v-model="editQuery.useNum"></el-input> <el-input style="width: 100%" size="small" splaceholder="请输入内容" :disabled="this.useNumEnable"
type="number" v-model="editQuery.useNum"></el-input>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
@ -277,17 +279,16 @@
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
<i class="el-icon-setting"></i>
设置项
</template> </template>
近效期预警时间 近效期预警时间
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
<i class="el-icon-set-up"></i>
参数值
</template> </template>
<el-input style="width: 100%" size="small" splaceholder="请输入内容" :disabled="this.useNumEnable" type="number" v-model="editQuery.recentDateTime"></el-input> <el-input style="width: 100%" size="small" splaceholder="请输入内容" :disabled="this.useNumEnable"
type="number" v-model="editQuery.recentDateTime"></el-input>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
@ -299,17 +300,16 @@
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
<i class="el-icon-setting"></i>
设置项
</template> </template>
使用周期(天) 使用周期(天)
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
<i class="el-icon-set-up"></i>
参数值
</template> </template>
<el-input style="width: 100%" size="small" splaceholder="请输入内容" :disabled="this.useNumEnable" type="number" v-model="editQuery.useExpireTime"></el-input> <el-input style="width: 100%" size="small" splaceholder="请输入内容" :disabled="this.useNumEnable"
type="number" v-model="editQuery.useExpireTime"></el-input>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
@ -321,15 +321,13 @@
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
<i class="el-icon-setting"></i>
设置项
</template> </template>
物资分类 物资分类
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
<i class="el-icon-set-up"></i>
参数值
</template> </template>
<treeselect <treeselect
v-model="editQuery.relCode" v-model="editQuery.relCode"
@ -351,15 +349,13 @@
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
<i class="el-icon-setting"></i>
设置项
</template> </template>
是否禁用 是否禁用
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
<i class="el-icon-set-up"></i>
参数值
</template> </template>
<el-radio-group v-model="editQuery.isDisable"> <el-radio-group v-model="editQuery.isDisable">
<el-radio :label="true" :value="true">是</el-radio> <el-radio :label="true" :value="true">是</el-radio>
@ -376,15 +372,13 @@
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
<i class="el-icon-setting"></i>
设置项
</template> </template>
是否寄售 是否寄售
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
<i class="el-icon-set-up"></i>
参数值
</template> </template>
<el-radio-group v-model="editQuery.isAdavence"> <el-radio-group v-model="editQuery.isAdavence">
<el-radio :label="true" :value="true">是</el-radio> <el-radio :label="true" :value="true">是</el-radio>
@ -400,18 +394,15 @@
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
<i class="el-icon-setting"></i>
设置项
</template> </template>
多次/重复使用耗材 多次/重复使用耗材
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
<i class="el-icon-set-up"></i>
参数值
</template> </template>
<el-radio-group v-model="editQuery.useMuti"> <el-radio-group v-model="editQuery.useMuti">
<el-radio :label="true" :value="true">是</el-radio> <el-radio :label="true" :value="true">是</el-radio>
@ -429,15 +420,13 @@
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
<i class="el-icon-setting"></i>
设置项
</template> </template>
是否可配送 是否可配送
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
<i class="el-icon-set-up"></i>
参数值
</template> </template>
<el-radio-group v-model="editQuery.dispatch"> <el-radio-group v-model="editQuery.dispatch">
<el-radio :label="true" :value="true">是</el-radio> <el-radio :label="true" :value="true">是</el-radio>
@ -455,15 +444,13 @@
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
<i class="el-icon-setting"></i>
设置项
</template> </template>
是否集采产品 是否集采产品
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
<i class="el-icon-set-up"></i>
参数值
</template> </template>
<el-radio-group v-model="editQuery.groupBuy"> <el-radio-group v-model="editQuery.groupBuy">
<el-radio :label="true" :value="true">是</el-radio> <el-radio :label="true" :value="true">是</el-radio>
@ -481,15 +468,13 @@
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
<i class="el-icon-setting"></i>
设置项
</template> </template>
允许无批次 允许无批次
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
<i class="el-icon-set-up"></i>
参数值
</template> </template>
<el-radio-group v-model="editQuery.allowNoBatch"> <el-radio-group v-model="editQuery.allowNoBatch">
<el-radio :label="true" :value="true">允许</el-radio> <el-radio :label="true" :value="true">允许</el-radio>
@ -506,15 +491,13 @@
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
<i class="el-icon-setting"></i>
设置项
</template> </template>
允许无失效日期 允许无失效日期
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
<i class="el-icon-set-up"></i>
参数值
</template> </template>
<el-radio-group v-model="editQuery.allowNoExpire"> <el-radio-group v-model="editQuery.allowNoExpire">
<el-radio :label="true" :value="true">允许</el-radio> <el-radio :label="true" :value="true">允许</el-radio>
@ -531,15 +514,13 @@
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
<i class="el-icon-setting"></i>
设置项
</template> </template>
允许无生产日期 允许无生产日期
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
<i class="el-icon-set-up"></i>
参数值
</template> </template>
<el-radio-group v-model="editQuery.allowNoProduct"> <el-radio-group v-model="editQuery.allowNoProduct">
<el-radio :label="true" :value="true">允许</el-radio> <el-radio :label="true" :value="true">允许</el-radio>
@ -556,15 +537,13 @@
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
<i class="el-icon-setting"></i>
设置项
</template> </template>
预警时间格式 预警时间格式
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
<i class="el-icon-set-up"></i>
参数值
</template> </template>
<el-radio-group v-model="editQuery.isDateBy"> <el-radio-group v-model="editQuery.isDateBy">
<el-radio :label="1" :value="1">天</el-radio> <el-radio :label="1" :value="1">天</el-radio>
@ -581,15 +560,13 @@
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
<i class="el-icon-setting"></i>
设置项
</template> </template>
启用使用单元 启用使用单元
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"> <template slot="label">
<i class="el-icon-set-up"></i>
参数值
</template> </template>
<el-radio-group v-model="checked"> <el-radio-group v-model="checked">
<el-radio :label="true" :value="true">启用</el-radio> <el-radio :label="true" :value="true">启用</el-radio>
@ -711,7 +688,7 @@ export default {
useNumEnable: true, useNumEnable: true,
sysList: [], sysList: [],
detailList: [], detailList: [],
fromDeptOptions:[], fromDeptOptions: [],
defaultSys: null, defaultSys: null,
isImport: false, isImport: false,
selectErpDialogVisible: false, //选入ERP产品 selectErpDialogVisible: false, //选入ERP产品
@ -734,8 +711,8 @@ export default {
created() { created() {
this.useMutiChange(true) this.useMutiChange(true)
this.getThirdSysDetail(); this.getThirdSysDetail();
if(this.editQuery.isDateBy==1){ if (this.editQuery.isDateBy == 1) {
this.editQuery.recentDateTime=this.editQuery.recentDateTime/24; this.editQuery.recentDateTime = this.editQuery.recentDateTime / 24;
} }
console.log(this.editQuery) console.log(this.editQuery)
this.getTreeselect(); this.getTreeselect();
@ -920,7 +897,7 @@ export default {
getListMenu().then(response => { getListMenu().then(response => {
this.fromDeptOptions = []; this.fromDeptOptions = [];
const menu = {id: 0, name: '主类目', children: []}; const menu = {id: 0, name: '主类目', children: []};
menu.children = this.handleTree(response.data,"code", "parentCode"); menu.children = this.handleTree(response.data, "code", "parentCode");
this.fromDeptOptions.push(menu); this.fromDeptOptions.push(menu);
}); });
}, },

2
src/views/inout/IoDeliverySearchOrder.vue
Unescape Escape View File

@ -144,7 +144,7 @@
<el-button <el-button
type="text" type="text"
size="small" size="small"
v-if="customerId == 110" v-if="customerId == 110 && scope.row.status == 5"
@click.native.stop="reviewOrder(scope.row)" @click.native.stop="reviewOrder(scope.row)"
>审核 >审核
</el-button </el-button

Write Preview
Loading…
Cancel
Save