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

耗材字典样式修改

Browse Source
prod
郑明梁 2 years ago
parent da3e2ed648
commit 304011057a
11 changed files with 171 additions and 152 deletions
Show Stats Download Patch File Download Diff File

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

@ -15,7 +15,7 @@
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
</el-col> </el-col>
<el-col :span="21"> <el-col :span="21" style="border-left: 1px solid rgb(229 224 224)">
<el-form :model="filterQuery" size="mini" label-width="100px" v-show="showSearch"> <el-form :model="filterQuery" size="mini" label-width="100px" v-show="showSearch">
<el-row> <el-row>
<el-col :span="18"> <el-col :span="18">

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

@ -199,158 +199,169 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="使用周期(天):" label-width="140px">
<el-input
style="width: 80%"
size="small"
type="number"
splaceholder="请输入内容"
v-model="editQuery.useExpireTime"
></el-input>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row> <el-collapse v-model="activeNames">
<el-col :span="12"> <el-collapse-item title="高级设置" name="1" class="titel">
<el-form-item label="库存积压预警数量:" label-width="140px"> <div style="width: 85%;margin: 0 auto">
<el-input <el-row>
style="width: 80%" <el-col :span="12">
size="small" <el-form-item label="库存积压预警数量:" label-width="150px">
splaceholder="请输入内容" <el-input style="width: 80%" size="small" splaceholder="请输入内容" :disabled="this.useNumEnable" type="number" v-model="editQuery.overStockNum"></el-input>
:disabled="this.useNumEnable" </el-form-item>
type="number" </el-col>
v-model="editQuery.overStockNum" <el-col :span="12">
></el-input> <el-form-item label="低库存预警数量:" label-width="150px" >
</el-form-item> <el-input style="width: 80%" size="small" splaceholder="请输入内容" type="number" v-model="editQuery.lowStockNum"></el-input>
</el-col> </el-form-item>
<el-col :span="12"> </el-col>
<el-form-item label="低库存预警数量:" label-width="140px" > </el-row>
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
type="number"
v-model="editQuery.lowStockNum"
></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="最小包装可使用次数:" label-width="140px"> <el-form-item label="最小包装可使用次数:" label-width="150px">
<el-input <el-input style="width: 80%" size="small" splaceholder="请输入内容" :disabled="this.useNumEnable" type="number"v-model="editQuery.useNum"></el-input>
style="width: 80%" </el-form-item>
size="small" </el-col>
splaceholder="请输入内容" <el-col :span="12">
:disabled="this.useNumEnable" <el-form-item label="近效期预警时间:" label-width="150px">
type="number" <el-input style="width: 80%" size="small" splaceholder="请输入内容" type="number" v-model="editQuery.recentDateTime"></el-input>
v-model="editQuery.useNum" </el-form-item>
></el-input> </el-col>
</el-form-item> </el-row>
</el-col>
<el-col :span="6">
<el-form-item label="近效期预警时间:" label-width="140px">
<el-input
style="width: 80%"
size="small"
splaceholder="请输入内容"
type="number"
v-model="editQuery.recentDateTime"
></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="预警时间格式:" label-width="100px" style="margin-left: -25px">
<el-radio-group v-model="editQuery.isDateBy">
<el-radio :label=1>天</el-radio>
<el-radio :label=2>小时</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex" class="edit-row" >
<el-col :span="12">
<el-form-item label="使用周期(天):" label-width="150px">
<el-input style="width: 80%" size="small" type="number" splaceholder="请输入内容" v-model="editQuery.useExpireTime"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row type="flex">
<el-col>
<div style="margin-bottom: 18px;margin-left: 25px">
<el-col :span="12">
<el-form-item label="是否禁用:" label-width="125px" >
<el-radio-group v-model="editQuery.isDisable">
<el-radio :label='true' @change="diableChange">是</el-radio>
<el-radio :label='false'>否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否寄售:" label-width="125px">
<el-radio-group v-model="editQuery.isAdavence">
<el-radio :label='true'>是</el-radio>
<el-radio :label='false'>否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</div>
</el-col>
</el-row>
<el-row type="flex"> <el-row type="flex">
<el-col :span="24"> <el-col>
<div style="margin-bottom: 18px;margin-left: 25px"> <div style="margin-bottom: 18px;margin-left: 25px">
<el-checkbox v-model="editQuery.isDisable" <el-col :span="12">
@change="diableChange" <el-form-item label="允许无批次:" label-width="125px" >
style="width: 180px" <el-radio-group v-model="editQuery.allowNoBatch" >
border <el-radio :label='true'>允许</el-radio>
>是否禁用 <el-radio :label='false'>不允许</el-radio>
</el-checkbox> </el-radio-group>
<el-checkbox v-model="editQuery.isAdavence" </el-form-item>
border </el-col>
style="width: 180px"
>是否寄售
</el-checkbox>
<el-checkbox v-model="editQuery.allowNoBatch"
border
style="width: 180px"
>允许无批次号
</el-checkbox>
<el-checkbox v-model="editQuery.allowNoExpire"
border
style="width: 180px"
>允许无失效日期
</el-checkbox>
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="24" class="el-col">
<div style="margin-bottom: 18px;margin-left: 25px">
<el-checkbox v-model="editQuery.allowNoProduct" <el-col :span="12">
border <el-form-item label="允许无失效日期:" label-width="125px">
style="width: 180px" <el-radio-group v-model="editQuery.allowNoExpire">
>允许无生产日期 <el-radio :label='true'>允许</el-radio>
</el-checkbox> <el-radio :label='false'>不允许</el-radio>
<el-checkbox v-model="checked" </el-radio-group>
:disabled="!isUseDyCheck || editQuery.useMuti==true " </el-form-item>
@change="useDyCheckChange" </el-col>
style="width: 180px" </div>
border </el-col>
>启用使用单元 </el-row>
</el-checkbox>
<el-checkbox v-model="editQuery.useMuti"
:disabled="checked"
@change="useMutiChange"
style="width: 180px"
border
>多次/重复使用耗材
</el-checkbox>
<el-checkbox v-model="editQuery.dispatch" <el-row type="flex">
style="width: 180px" <el-col>
border <div style="margin-bottom: 18px;margin-left: 25px">
>是否可配送 <el-col :span="12">
</el-checkbox> <el-form-item label="允许无生产日期:" label-width="125px" >
<el-radio-group v-model="editQuery.allowNoProduct" >
<el-radio :label='true'>允许</el-radio>
<el-radio :label='false'>不允许</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="启用使用单元:" label-width="125px">
<el-radio-group v-model="checked" >
<el-radio :disabled="!isUseDyCheck || editQuery.useMuti==true " :label='true' @change="useDyCheckChange">是</el-radio>
<el-radio :disabled="!isUseDyCheck || editQuery.useMuti==true " :label='false'>否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</div>
</el-col>
</el-row>
<el-row type="flex">
<el-col>
<div style="margin-bottom: 18px;margin-left: 25px">
<el-col :span="12">
<el-form-item label="多次/重复使用耗材:" label-width="125px" >
<el-radio-group v-model="editQuery.useMuti" >
<el-radio :label='true' :disabled="checked" @change="useMutiChange">允许</el-radio>
<el-radio :label='false':disabled="checked">不允许</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否可配送:" label-width="125px">
<el-radio-group v-model="editQuery.dispatch" >
<el-radio :label='true' @change="useDyCheckChange">是</el-radio>
<el-radio :label='false'>否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</div>
</el-col>
</el-row>
<el-row type="flex">
<el-col>
<div style="margin-bottom: 18px;margin-left: 25px">
<el-col :span="12">
<el-form-item label="是否集采产品:" label-width="125px" >
<el-radio-group v-model="editQuery.groupBuy" >
<el-radio :label='true' @change="groupBuyChange">允许</el-radio>
<el-radio :label='false' >不允许</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="预警时间格式:" label-width="125px">
<el-radio-group v-model="editQuery.isDateBy">
<el-radio :label=1>天</el-radio>
<el-radio :label=2>小时</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</div>
</el-col>
</el-row>
</div>
</el-collapse-item>
</el-collapse>
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="24" class="el-col">
<div style="margin-bottom: 18px;margin-left: 25px">
<el-checkbox v-model="editQuery.groupBuy"
style="width: 180px"
@change="groupBuyChange"
border
>是否集采产品
</el-checkbox>
</div>
</el-col>
</el-row>
<el-divider></el-divider>
</el-form> </el-form>
<el-dialog <el-dialog
@ -535,7 +546,6 @@ export default {
this.editSingleDiDialogVisible = false; this.editSingleDiDialogVisible = false;
}, },
singleDiEdit(val) { singleDiEdit(val) {
debugger
let temp = val; let temp = val;
this.editSingleFormat.uuid = temp.uuid; this.editSingleFormat.uuid = temp.uuid;
this.editSingleFormat.id = temp.id; this.editSingleFormat.id = temp.id;
@ -543,6 +553,7 @@ export default {
this.editSingleFormat.packUnit = temp.packUnit; this.editSingleFormat.packUnit = temp.packUnit;
this.editSingleFormat.measname = temp.measname; this.editSingleFormat.measname = temp.measname;
this.editSingleFormat.nameCode = temp.nameCode; this.editSingleFormat.nameCode = temp.nameCode;
this.editSingleFormat.cpmctymc = temp.cpmctymc;
this.editSingleDiDialogVisible = true; this.editSingleDiDialogVisible = true;
}, },
onAddSingleSubmit() { onAddSingleSubmit() {

12
src/views/basic/product/productSingleEdit.vue
Unescape Escape View File

@ -7,6 +7,18 @@
border border
label-width="120px" label-width="120px"
> >
<el-row>
<el-form-item label="产品标识:">
<el-input style="width: 80%" size="small" :disabled="true" v-model="editQuery.nameCode"></el-input>
</el-form-item>
</el-row>
<el-row>
<el-form-item label="产品通用名:">
<el-input style="width: 80%" size="small" :disabled="true" v-model="editQuery.cpmctymc"></el-input>
</el-form-item>
</el-row>
<el-row> <el-row>
<el-form-item label="商品条码:"> <el-form-item label="商品条码:">
<el-input <el-input

10
src/views/basic/product/productUdiType.vue
Unescape Escape View File

@ -13,7 +13,7 @@
<el-button-group style="margin-left: 10px;display:flex;"> <el-button-group style="margin-left: 10px;display:flex;">
<el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button> <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button> <el-button type="primary" icon="el-icon-search" @click="onSubmit">查询</el-button>
<el-button type="primary" icon="el-icon-plus" @click="handleSubForm( null, 'add')">新增</el-button> <el-button type="primary" icon="el-icon-plus" @click="handleSubForm( pCode, 'add')">新增</el-button>
</el-button-group> </el-button-group>
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -24,6 +24,7 @@
row-key="id" row-key="id"
:default-expand-all="isExpandAll" :default-expand-all="isExpandAll"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}" :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
@current-change="getTreeName"
> >
<el-table-column label="序号" type="index" ref="dataForm"></el-table-column> <el-table-column label="序号" type="index" ref="dataForm"></el-table-column>
<el-table-column prop="name" label="名称"></el-table-column> <el-table-column prop="name" label="名称"></el-table-column>
@ -147,6 +148,7 @@ export default {
// page: 1, // page: 1,
// limit: 10, // limit: 10,
}, },
pCode:null,
isShow: null, isShow: null,
loading: true, loading: true,
list: [], list: [],
@ -219,12 +221,14 @@ export default {
if (formName === "edit") { if (formName === "edit") {
this.subData = JSON.parse(JSON.stringify(data)); this.subData = JSON.parse(JSON.stringify(data));
} else if (formName === "add") { } else if (formName === "add") {
this.subData = {advanceType: false,}; this.subData.parentCode = JSON.parse(JSON.stringify(this.pCode));
} }
this.getTreeselect(); this.getTreeselect();
this.subFormVisible = true; this.subFormVisible = true;
}, },
getTreeName(obj){
this.pCode=obj.parentCode;
},
hideForm() { // 新增，编辑---取消 hideForm() { // 新增，编辑---取消
this.formVisible = false; this.formVisible = false;
this.subFormVisible = false; this.subFormVisible = false;

1
src/views/inout/IOFinishCode.vue
Unescape Escape View File

@ -138,7 +138,6 @@ export default {
}, },
getCodeList() { getCodeList() {
debugger
this.loading = true; this.loading = true;
this.query.orderId = this.idQuery.billNo; this.query.orderId = this.idQuery.billNo;
findByOrderId(this.query) //查找该单号下的所有条码 findByOrderId(this.query) //查找该单号下的所有条码

1
src/views/inventory/inner/innerCodeDetail.vue
Unescape Escape View File

@ -425,7 +425,6 @@ export default {
this.pdffileUrl = this.BASE_URL + "/spms/donwload/pdf?fileName="; this.pdffileUrl = this.BASE_URL + "/spms/donwload/pdf?fileName=";
if (this.$isNotBlank(this.inQuery.id)) { if (this.$isNotBlank(this.inQuery.id)) {
this.formData = this.inQuery.formData; this.formData = this.inQuery.formData;
debugger
this.query.orderId = this.inQuery.id; this.query.orderId = this.inQuery.id;
this.query.orderIdFk = this.formData.id; this.query.orderIdFk = this.formData.id;
this.query.sOrderId = this.inQuery.id; this.query.sOrderId = this.inQuery.id;

1
src/views/inventory/trace/invUdiTraceOrder.vue
Unescape Escape View File

@ -464,7 +464,6 @@ export default {
// this.dialogTableVisible = true; // this.dialogTableVisible = true;
}, },
intentDetail(row) { intentDetail(row) {
debugger
this.codeDetailVisible = true; this.codeDetailVisible = true;
this.idQuery.id = row.id; this.idQuery.id = row.id;
this.idQuery.billNo=row.billNo; this.idQuery.billNo=row.billNo;

1
src/views/purchase/purOrder/purOrderDetailDialog.vue
Unescape Escape View File

@ -408,7 +408,6 @@ export default {
}) })
.catch(() => { .catch(() => {
}); });
debugger
let query1 = { let query1 = {
code: this.formData.targetSubInv, code: this.formData.targetSubInv,
}; };

1
src/views/purchase/purPlan/purPlanDetailDialog.vue
Unescape Escape View File

@ -408,7 +408,6 @@ export default {
}) })
.catch(() => { .catch(() => {
}); });
debugger
let query1 = { let query1 = {
code: this.formData.targetSubInv, code: this.formData.targetSubInv,
}; };

2
src/views/purchase/purPlan/selectPlanListDialog.vue
Unescape Escape View File

@ -266,7 +266,6 @@ export default {
}, },
combine() { combine() {
debugger
if (this.$isBlank(this.currentRow.id)) { if (this.$isBlank(this.currentRow.id)) {
this.$message.error("未选择申购单！"); this.$message.error("未选择申购单！");
} }
@ -287,7 +286,6 @@ export default {
}, },
created() { created() {
debugger
let end = new Date(); let end = new Date();
let start = new Date(); let start = new Date();
start.setTime(start.getTime() - 3600 * 1000 * 24 * 7); start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);

1
src/views/system/dept/invRelBusType.vue
Unescape Escape View File

@ -106,7 +106,6 @@ export default {
}, },
onAddSubmit() { onAddSubmit() {
debugger
var postRequesty = { var postRequesty = {
invCode: this.inputQuery.code, invCode: this.inputQuery.code,
selectActions: [], selectActions: [],

Write Preview
Loading…
Cancel
Save