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

本企业产品添加更多设置

Browse Source
ywj_dev
anthonywj 2 years ago
parent c6ab446df1
commit 35e1b55f54
7 changed files with 902 additions and 860 deletions
Show Stats Download Patch File Download Diff File

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

@ -710,7 +710,6 @@ export default {
}
,
bindId(val) {
debugger
if (this.curRow.code != null || this.type == 1) {
this.$emit("selectBindRl", val);
// this.$emit("closeBindDialog", true);

2
src/views/purchase/company/supCompanyAduditDialog.vue
Unescape Escape View File

@ -407,7 +407,6 @@ export default {
};
},
created() {
debugger
this.getRoIds();
this.getCompanyCertList();
this.customerlist();
@ -545,7 +544,6 @@ export default {
getRoIds(){
let params={companyId:this.inputQuery.customerId}
getRoId(params).then((res) =>{
debugger
this.inputQuery.roleId=parseInt(res.data.roleId);
})
},

1
src/views/purchase/purDelivery/DialogSelectDeliveryList.vue
Unescape Escape View File

@ -211,7 +211,6 @@ export default {
}
this.loading = true;
this.filterQuery.status = 3;
debugger
this.filterQuery.supId = this.customerId;
listOrder(this.filterQuery)
.then((response) => {

1
src/views/purchase/purReturned/purReturnedEditDialog.vue
Unescape Escape View File

@ -479,7 +479,6 @@ export default {
};
},
created() {
debugger
if (this.$isNotBlank(this.idQuery.id)) {
this.query.limit = 100;
this.pId = this.idQuery.id;

2
src/views/supplier/company/basicCompany.vue
Unescape Escape View File

@ -399,7 +399,7 @@ export default {
addType: "1", //证书类型：1:供应商；2.生产企业；3.产品品种
editTye: 1,
checkFlag: {
0: "草稿",
0: "未认证",
1: "已通过",
2: "已拒绝",
3: "变更未审核",

89
src/views/supplier/company/basicCompanyProducts.vue
Unescape Escape View File

@ -5,12 +5,14 @@
<el-row>
<el-col :span="6">
<el-form-item label="物品编号:">
<el-input v-model="filterQuery.unionCode" style="width: 90%" placeholder="请输入DI/医保编码/商品条码" clearable="true"></el-input>
<el-input v-model="filterQuery.unionCode" style="width: 90%" placeholder="请输入DI/医保编码/商品条码"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="产品通用名:">
<el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入产品通用名" clearable="true"></el-input>
<el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入产品通用名"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
@ -41,7 +43,8 @@
</el-col>
<el-col :span="6">
<el-form-item label="第三方产品编码:">
<el-input v-model="filterQuery.thrPiId" style="width: 90%" placeholder="请输入第三方产品编码" clearable="true"></el-input>
<el-input v-model="filterQuery.thrPiId" style="width: 90%" placeholder="请输入第三方产品编码"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
@ -60,14 +63,15 @@
<div class="top-right-btn">
<el-button-group style="display:flex;">
<el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
<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="search">查询</el-button>
<el-button type="primary" icon="el-icon-bottom-right" @click="selectProduct()">选入产品</el-button>
</el-button-group>
</div>
<el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" @selection-change="handleSelectionChange" border highlight-current-row>
<el-table v-loading="loading" :data="list" style="width: 100%" @selection-change="handleSelectionChange" border
highlight-current-row>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column label="最小销售产品标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>
<el-table-column label="产品编码" prop="thirdId" show-overflow-tooltip></el-table-column>
@ -83,12 +87,40 @@
</el-table-column>
<el-table-column width="180" label="操作">
<template slot-scope="scope">
<el-button v-if="isSpCombine" type="text" size="small" :disabled="scope.row.originUuid!=null || scope.row.lockStatus===3" @click.native.stop="intentSelectUdi(scope.row)">关联DI</el-button>
<el-button v-if="scope.row.lockStatus!=3" type="text" size="small" @click.native.stop="handleModifyClick(scope.row)">编辑</el-button>
<el-button v-if=" scope.row.lockStatus!=3" type="text" size="small" @click.native.stop="handleDetailClick(scope.row)">详情</el-button>
<el-button v-if="isSpCombine" type="text" size="small" :disabled="scope.row.lockStatus===3" @click.native.stop="sumitLockStatus(scope.row)">提交审核</el-button>
<el-button v-if="isSpCombine" type="text" size="small" @click.native.stop="splitSelectUdi(scope.row)" :disabled="scope.row.thirdId===scope.row.nameCode || scope.row.thirdId==null || scope.row.nameCode==null || scope.row.lockStatus===3">拆分产品</el-button>
<el-button type="text" size="small" @click.native.stop="deleteCompanyProductRelevance(scope.row)">移除</el-button>
<el-button v-if="isSpCombine" type="text" size="small"
:disabled="scope.row.originUuid!=null || scope.row.lockStatus===3"
@click.native.stop="intentSelectUdi(scope.row)">关联DI
</el-button>
<el-button v-if="scope.row.lockStatus!=3" type="text" size="small"
@click.native.stop="handleModifyClick(scope.row)">编辑
</el-button>
<el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"
>
<span class="el-dropdown-link">
<i class="el-icon-d-arrow-right el-icon--right"></i>更多
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="handleDetailClick" v-if=" scope.row.lockStatus!=3" >详情</el-dropdown-item>
<el-dropdown-item command="sumitLockStatus" v-if="isSpCombine" :disabled="scope.row.lockStatus===3">提交审核</el-dropdown-item>
<el-dropdown-item command="splitSelectUdi" v-if="isSpCombine" type="text" size="small"
:disabled="scope.row.thirdId===scope.row.nameCode || scope.row.thirdId==null || scope.row.nameCode==null || scope.row.lockStatus===3">拆分产品</el-dropdown-item>
<el-dropdown-item command="deleteCompanyProductRelevance">移除</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<!-- <el-button v-if=" scope.row.lockStatus!=3" type="text" size="small"-->
<!-- @click.native.stop="handleDetailClick(scope.row)">详情-->
<!-- </el-button>-->
<!-- <el-button v-if="isSpCombine" type="text" size="small" :disabled="scope.row.lockStatus===3"-->
<!-- @click.native.stop="sumitLockStatus(scope.row)">提交审核-->
<!-- </el-button>-->
<!-- <el-button v-if="isSpCombine" type="text" size="small" @click.native.stop="splitSelectUdi(scope.row)"-->
<!-- :disabled="scope.row.thirdId===scope.row.nameCode || scope.row.thirdId==null || scope.row.nameCode==null || scope.row.lockStatus===3">-->
<!-- 拆分产品-->
<!-- </el-button>-->
<!-- <el-button type="text" size="small" @click.native.stop="deleteCompanyProductRelevance(scope.row)">移除-->
<!-- </el-button>-->
</template>
</el-table-column>
</el-table>
@ -239,7 +271,10 @@ import {
removeRl, sysFilter, spcombie, lockStatus, removeDiRl
} from "../../../api/basic/udiRelevance";
import store from "../../../store/index";
import { deleteCompanyProductRelevance, filterCompanyProductRelevance } from "../../../api/supplier/companyProductRelevance";
import {
deleteCompanyProductRelevance,
filterCompanyProductRelevance
} from "../../../api/supplier/companyProductRelevance";
import {finProductSet, selectSysParamByKey} from "../../../api/param/systemParamConfig";
import {filterByUuid} from "../../../api/basic/udiInfo";
@ -256,7 +291,7 @@ import basicProductDetail from "@/views/supplier/company/basicCompanyproductDeta
export default {
data() {
return {
showSearch:true,
showSearch: true,
filterQuery: {
unionCode: null,
udiCode: null,
@ -355,9 +390,9 @@ export default {
};
this.getList();
},
refresh(){
refresh() {
this.getList();
this.editDialogVisible=false;
this.editDialogVisible = false;
},
search() {
this.filterQuery.page = 1;
@ -667,12 +702,33 @@ export default {
this.selectUdiDialogVisible = false;
this.selectErpDialogVisible = false;
this.selectLocalVisible = false;
this.detailDialogVisible=false;
this.detailDialogVisible = false;
this.selectVersionVisible = false;
if (val) {
this.cancelDialog();
}
},
// 更多操作触发
handleCommand(command, row) {
switch (command) {
case "handleDetailClick":
this.handleDetailClick(row);
break;
case "sumitLockStatus":
this.sumitLockStatus(row);
break;
case "splitSelectUdi":
this.splitSelectUdi(row);
break;
case "deleteCompanyProductRelevance":
this.deleteCompanyProductRelevance(row);
break;
default:
break;
}
},
getThirdSysDetail() {
let query = {
id: this.relevanceEdit.id,
@ -878,6 +934,7 @@ export default {
padding-bottom: 17px;
padding-top: 17px;
}
.el-form-item--mini.el-form-item {
margin-bottom: 9px;
}

36
src/views/userManage/userAccountManage.vue
Unescape Escape View File

@ -1,36 +1,28 @@
<template>
<div>
<el-card>
<el-form :model="query" label-width="100px">
<el-form :model="query" label-width="100px" :inline="true" class="query-form" size="mini">
<el-row>
<el-col :span="6">
<el-form-item label="用户账号:">
<el-input v-model="query.userName" style="width: 90%" placeholder="请输入用户账号"></el-input>
<el-input v-model="query.userName" placeholder="请输入用户账号"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="状态:">
<el-select v-model="query.userFlag" style="width: 90%" placeholder="请选择状态">
<el-select v-model="query.userFlag" placeholder="请选择状态">
<el-option label="全部" value=""></el-option>
<el-option label="禁用" value="0"></el-option>
<el-option label="正常" value="1"></el-option>
<el-option label="未验证" value="2"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item>
<el-button-group>
<el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
<el-button type="primary" icon="search" @click="onSubmit">查询</el-button>
<el-button type="primary" @click.native="handleForm(null, null)">新增</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-plus" @click.native="handleForm(null, null)">新增</el-button>
</el-button-group>
</el-form-item>
</el-col>
</el-row>
</el-form>
<el-table v-loading="loading" :data="list" border style="width: 100%">
<el-table-column label="序号" type="index" width="50" fixed></el-table-column>
<el-table-column label="用户账号" prop="userName" fixed></el-table-column>
@ -135,7 +127,7 @@ import {
authAdminDelete
} from '../../api/auth/authAdmin'
import { userInfo } from '../../api/auth/login'
import {userInfo} from '../../api/auth/login'
const formJson = {
id: '',
@ -198,10 +190,10 @@ export default {
formData: formJson,
formRules: {},
addRules: {
userName: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
userName: [{required: true, message: '请输入姓名', trigger: 'blur'}],
passWord: [
{ required: true, message: '请输入密码', trigger: 'blur' },
{ validator: validatePass, trigger: 'blur' }
{required: true, message: '请输入密码', trigger: 'blur'},
{validator: validatePass, trigger: 'blur'}
],
checkPassword: [
{
@ -209,14 +201,14 @@ export default {
message: '请再次输入密码',
trigger: 'blur'
},
{ validator: validatePass2, trigger: 'blur' }
{validator: validatePass2, trigger: 'blur'}
]
// userFlag: [
// { required: true, message: "请选择状态", trigger: "change" },
// ],
},
editRules: {
userName: [{ required: true, message: '请输入姓名', trigger: 'blur' }]
userName: [{required: true, message: '请输入姓名', trigger: 'blur'}]
// userFlag: [
// { required: true, message: "请选择状态", trigger: "change" },
// ],
@ -381,7 +373,7 @@ export default {
type: 'warning'
})
.then(() => {
let para = { id: row.id }
let para = {id: row.id}
this.deleteLoading = true
authAdminDelete(para)
.then((response) => {
@ -426,8 +418,6 @@ export default {
},
created() {
this.getList()
debugger
}
}
</script>

Write Preview
Loading…
Cancel
Save