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

修改bug

Browse Source
tagView
zhengmingliang 3 years ago
parent 7d36c0d2fd
commit 92161ff5b4
10 changed files with 67 additions and 24 deletions
Show Stats Download Patch File Download Diff File

17
src/views/basic/BusTypeChange.vue
Unescape Escape View File

@ -2,13 +2,26 @@
<div> <div>
<el-card> <el-card>
<el-form :inline="true" :model="filterQuery" class="query-form" size="mini"> <el-form :inline="true" :model="filterQuery" class="query-form" size="mini">
<el-form-item class="query-form-item">
<el-input
v-model="filterQuery.originName"
placeholder="单据类型名称"
style="width: 200px"
></el-input>
</el-form-item>
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<el-input <el-input
v-model="filterQuery.originAction" v-model="filterQuery.originAction"
placeholder="业务类型" placeholder="单据类型代码"
style="width: 400px" style="width: 200px"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item">
<el-select v-model="filterQuery.type">
<el-option v-for="(item,index) in typeMap" :key="index" :label="item" :value="index">
</el-option>
</el-select>
</el-form-item>
<el-form-item> <el-form-item>
<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>

17
src/views/basic/basicCompany.vue
Unescape Escape View File

@ -140,6 +140,15 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20" v-show="inputQuery.auditStatus==2" class="el-row" type="flex" style="margin-top: 0px">
<el-col :span="10" class="el-col">
<el-form-item label="驳回意见:" label-width="150px" prop="mobile">
<el-input size="small" v-model="inputQuery.auditComment" disabled></el-input>
</el-form-item>
</el-col>
</el-row>
</el-card> </el-card>
<el-card> <el-card>
<div style="float: right;text-align: right;margin-bottom: 8px;"> <div style="float: right;text-align: right;margin-bottom: 8px;">
@ -453,8 +462,8 @@ export default {
}, },
statusFlag: { statusFlag: {
0: "启用", 0: "有效",
1: "禁用", 1: "失效",
}, },
formName: 1, formName: 1,
formMap: { formMap: {
@ -495,7 +504,6 @@ export default {
}, },
onModifySubmit(val) { onModifySubmit(val) {
this.inputQuery.auditStatus = val;
if (this.editType == 0) { //新增保存 if (this.editType == 0) { //新增保存
this.$refs["inputQuery"].validate(valid => { this.$refs["inputQuery"].validate(valid => {
@ -506,7 +514,7 @@ export default {
type: "warning", type: "warning",
}).then(() => { }).then(() => {
this.loading = true; this.loading = true;
this.inputQuery.auditStatus = val;
addCompany(this.inputQuery).then(response => { addCompany(this.inputQuery).then(response => {
this.loading = false; this.loading = false;
if (response.code === 20000) { if (response.code === 20000) {
@ -531,6 +539,7 @@ export default {
type: "warning", type: "warning",
}).then(() => { }).then(() => {
this.loading = true; this.loading = true;
this.inputQuery.auditStatus = val;
modifyCompany(this.inputQuery).then(response => { modifyCompany(this.inputQuery).then(response => {
this.loading = false; this.loading = false;
if (response.code === 20000) { if (response.code === 20000) {

5
src/views/basic/invWarehouse.vue
Unescape Escape View File

@ -1390,7 +1390,6 @@ export default {
}); });
}, },
loadBusList(val) { loadBusList(val) {
debugger
//根据是否选择用户切换不同的分页方法 //根据是否选择用户切换不同的分页方法
if (this.curSeleUser == null) { if (this.curSeleUser == null) {
if (val != null) { if (val != null) {
@ -1487,7 +1486,6 @@ export default {
handleBussinessTypeSelectionChange(row) { handleBussinessTypeSelectionChange(row) {
let _this = this; let _this = this;
_this.selectBussinessTypeList = []; _this.selectBussinessTypeList = [];
debugger
row.forEach((item) => { row.forEach((item) => {
_this.selectBussinessTypeList.push(item); _this.selectBussinessTypeList.push(item);
}) })
@ -1662,7 +1660,7 @@ export default {
                });                 });
} else { } else {
this.$message.error("移除失败"); this.$message.error(res.message);
} }
}).catch((error) => { }).catch((error) => {
this.$message.error("移除失败"); this.$message.error("移除失败");
@ -1838,7 +1836,6 @@ export default {
page: page, page: page,
limit: 10 limit: 10
}; };
debugger
filterUserBusTypeList(queryParam).then((res) => { filterUserBusTypeList(queryParam).then((res) => {
if (res.code === 20000) { if (res.code === 20000) {
this.bussinessTypeData = res.data.list || []; this.bussinessTypeData = res.data.list || [];

16
src/views/purchase/supCertSet.vue
Unescape Escape View File

@ -391,9 +391,9 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item prop="require"> <el-form-item prop="require">
<el-select v-model="currentProduct.cplx" style="width: 100%"> <el-select v-model="currentProduct.cplx" style="width: 100%">
<el-option label="全部" :value="全部"></el-option> <el-option label="全部" key="全部" value="全部"></el-option>
<el-option label="器械" :value="器械"></el-option> <el-option label="器械" key="器械" value="器械"></el-option>
<el-option label="试剂" :value="试剂"></el-option> <el-option label="试剂" key="试剂" value="试剂"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -407,9 +407,9 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item prop="require"> <el-form-item prop="require">
<el-select v-model="currentProduct.hchzsb" style="width: 100%"> <el-select v-model="currentProduct.hchzsb" style="width: 100%">
<el-option label="全部" :value="全部"></el-option> <el-option label="全部" value="全部"></el-option>
<el-option label="耗材" :value="耗材"></el-option> <el-option label="耗材" value="耗材"></el-option>
<el-option label="设备" :value="设备"></el-option> <el-option label="设备" value="设备"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -497,10 +497,10 @@ export default {
formRules: { formRules: {
name: [ name: [
{required: true, message: "证书名称", trigger: "blur"} {required: true, message: "请输入证书名称", trigger: "blur"}
], ],
need: [ need: [
{required: true, message: "请选择是否禁用", trigger: "blur"} {required: true, message: "请选择是否必传", trigger: "blur"}
], ],
}, },

15
src/views/purchase/supManufacturerEditDialog.vue
Unescape Escape View File

@ -219,6 +219,13 @@
</el-tag> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="状态" prop="status" width="120">
<template slot-scope="scope">
<el-tag :type="(scope.row.status) | statusType">
{{ statusFlag[scope.row.status] }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="备注" prop="remark"></el-table-column> <el-table-column label="备注" prop="remark"></el-table-column>
<el-table-column label="操作" fixed="right" width="250"> <el-table-column label="操作" fixed="right" width="250">
<template slot-scope="scope"> <template slot-scope="scope">
@ -247,14 +254,14 @@
</el-button </el-button
> >
<el-button <!-- <el-button
type="text" type="text"
size="small" size="small"
v-if=" scope.row.auditStatus == 1 && scope.row.status==0" v-if=" scope.row.auditStatus == 1 && scope.row.status==0"
@click.native="disableCert(scope.row,1)" @click.native="disableCert(scope.row,1)"
>禁用 >禁用
</el-button </el-button
> > -->
<el-button <el-button
type="text" type="text"
@ -462,6 +469,10 @@ export default {
3: "变更未审核", 3: "变更未审核",
6: "未审核", 6: "未审核",
}, },
statusFlag: {
0: "有效",
1: "失效",
},
editTye: 1, editTye: 1,
formName: 1, formName: 1,
formMap: { formMap: {

11
src/views/purchase/supProductEditDialog.vue
Unescape Escape View File

@ -265,6 +265,13 @@
</el-tag> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="状态" prop="status" width="120">
<template slot-scope="scope">
<el-tag :type="(scope.row.status) | statusType">
{{ statusFlag[scope.row.status] }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="备注" prop="remark"></el-table-column> <el-table-column label="备注" prop="remark"></el-table-column>
<el-table-column label="操作" fixed="right" width="250"> <el-table-column label="操作" fixed="right" width="250">
<template slot-scope="scope"> <template slot-scope="scope">
@ -511,6 +518,10 @@ export default {
3: "变更未审核", 3: "变更未审核",
6: "未审核", 6: "未审核",
}, },
statusFlag: {
0: "有效",
1: "失效",
},
editTye: 1, editTye: 1,
manufacturerId: null, manufacturerId: null,

5
src/views/thrsys/ThrOrdedrReceiveAdd.vue
Unescape Escape View File

@ -65,9 +65,10 @@
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row="true" <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row="true"
@current-change="handleDetail"> @current-change="handleDetail">
<el-table-column label="序号" type="index" width="60"></el-table-column> <el-table-column label="序号" type="index" width="60"></el-table-column>
<el-table-column label="领用类型" prop="billTypeName"></el-table-column> <el-table-column label="单据类型" prop="billTypeName"></el-table-column>
<el-table-column label="单据号" prop="billNo"></el-table-column> <el-table-column label="单据号" prop="billNo"></el-table-column>
<el-table-column label="往来信息" prop="corpName" <el-table-column label="领用分库" prop="invWarehouseName"></el-table-column>
<el-table-column label="往来信息" prop="fromSubInvName"
show-overflow-tooltip="true"></el-table-column> show-overflow-tooltip="true"></el-table-column>
<el-table-column label="单据日期" prop="billdate"></el-table-column> <el-table-column label="单据日期" prop="billdate"></el-table-column>
<el-table-column label="操作" fixed="right"> <el-table-column label="操作" fixed="right">

2
src/views/thrsys/ThrOrdedrReceiveSearch.vue
Unescape Escape View File

@ -60,7 +60,7 @@
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row="true" <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row="true"
@current-change="handleDetail"> @current-change="handleDetail">
<el-table-column label="序号" type="index" width="60"></el-table-column> <el-table-column label="序号" type="index" width="60"></el-table-column>
<el-table-column label="第三方单据类型" prop="billTypeName"></el-table-column> <el-table-column label="单据类型" prop="billTypeName"></el-table-column>
<el-table-column label="单据号" prop="billNo"></el-table-column> <el-table-column label="单据号" prop="billNo"></el-table-column>
<el-table-column label="往来信息" prop="corpName" <el-table-column label="往来信息" prop="corpName"
show-overflow-tooltip="true"></el-table-column> show-overflow-tooltip="true"></el-table-column>

2
src/views/userManage/customerManage.vue
Unescape Escape View File

@ -420,7 +420,7 @@ export default {
this.getList(); this.getList();
}, },
formSubmit() { formSubmit() {
this.formData.roleId = this.check; this.formData.roleId = 1;
updateCustomers(this.formData) updateCustomers(this.formData)
.then((response) => { .then((response) => {
this.loading = false; this.loading = false;

1
src/views/warehouse/addHosOrder.vue
Unescape Escape View File

@ -927,6 +927,7 @@ export default {
let query = { let query = {
code: this.formData.invWarehouseCode, code: this.formData.invWarehouseCode,
enabled: true, enabled: true,
type:1
}; };
getLocalJoinByUser(query) getLocalJoinByUser(query)
.then((response) => { .then((response) => {

Write Preview
Loading…
Cancel
Save