同步自助平台代码

feature-order-fix
zhengmingliang 2 years ago
parent fad77aab35
commit 5a2ed31531

@ -4,11 +4,24 @@
<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-form-item class="query-form-item">
<el-input <el-input
v-model="filterQuery.name" v-model="filterQuery.originName"
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-input
v-model="filterQuery.originAction"
placeholder="单据类型代码"
style="width: 200px"
></el-input>
</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>

@ -168,7 +168,7 @@
<el-button <el-button
type="text" type="text"
size="small" :disabled="!configParms.basicInv" size="small" :disabled="!configParms.basicInv"
@click.native.stop="addBussinessType(scope.row)" @click.native.stop="selsectBussinessType(scope.row)"
>管理单据类型 >管理单据类型
</el-button </el-button
> >
@ -346,6 +346,53 @@
</div> </div>
</el-dialog> </el-dialog>
<!--添加单据类型弹窗---->
<!--添加单据类型弹窗-->
<el-dialog
title="仓库关联单据类型"
:close-on-click-modal="false"
:close-on-press-escape="false"
:visible.sync="userBussinessTypeFormVisible"
>
<el-row type="flex" justify="end">
<el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
<el-button
type="primary"
@click.native="addBussinessType()"
:loading="loading"
>选入
</el-button
>
</el-button-group>
</el-row>
<el-table v-loading="loading" :data="userBussinessTypeList" ref="typeList"
style="width: 100%">
<el-table-column label="单据类型编码" prop="action" fixed></el-table-column>
<el-table-column label="单据类型名称" prop="name" fixed></el-table-column>
<el-table-column label="操作" fixed="right">
<template slot-scope="scope">
<el-button
type="text"
size="small"
:disabled="!configParms.basicInv"
@click.native.stop="delWarehouseBussinessType(scope.row.id)"
>移除
</el-button
>
</template>
</el-table-column>
</el-table>
<div slot="footer" class="dialog-footer">
<el-button @click.native="userBussinessTypeFormVisible = !userBussinessTypeFormVisible"
>取消
</el-button
>
</div>
</el-dialog>
<!--表单界面--> <!--表单界面-->
<el-dialog <el-dialog
:title="formMap[formName]" :title="formMap[formName]"
@ -727,7 +774,7 @@ import {
warehouseUserList, saveWarehouseBussinessType, warehouseUserList, saveWarehouseBussinessType,
saveWarehouseUser, updateDirector, disableWarehouse, saveWarehouseUser, updateDirector, disableWarehouse,
deleteWarehouseBussinessType, deleteWarehouseBussinessType,
bindThrWarehouse, unbindThrWarehouse, filterThridSubByInv, getThrsysDetail bindThrWarehouse, unbindThrWarehouse, filterThridSubByInv, getThrsysDetail,delWarehouseBussinessType
} from "../../api/basic/invWarehouse"; } from "../../api/basic/invWarehouse";
import { import {
filterSubAll, saveSubWarehouse, deleteSubWarehouse, filterSubAll, saveSubWarehouse, deleteSubWarehouse,
@ -831,6 +878,8 @@ export default {
currentSubId: null, currentSubId: null,
thrWareHouseVisible: false, thrWareHouseVisible: false,
thrSubWareHouseVisible: false, thrSubWareHouseVisible: false,
userBussinessTypeList:[],
userBussinessTypeFormVisible:false,
sysList: [], sysList: [],
sysSubList: [], sysSubList: [],
checkThrWarehouseRow: null, checkThrWarehouseRow: null,
@ -877,7 +926,8 @@ export default {
bussinessTypeQuery: { bussinessTypeQuery: {
enabled: true, enabled: true,
page: 1, page: 1,
limit: 10 limit: 10,
ids:""
}, },
bussinessTypeTotal: 0, bussinessTypeTotal: 0,
curSeleUser: null, curSeleUser: null,
@ -1355,10 +1405,15 @@ export default {
}) })
}); });
}, },
getBussinessType(val) { getBussinessType(val,obj) {
if (val != null) { if (val != null) {
this.bussinessTypeQuery.page = val; this.bussinessTypeQuery.page = val;
} }
if(obj!=undefined){
var action=obj.toString();
this.bussinessTypeQuery.ids=action;
}
this.bussinessTypeQuery.code=this.busQuery.code; this.bussinessTypeQuery.code=this.busQuery.code;
getJoinBussinessType(this.bussinessTypeQuery).then((res) => { getJoinBussinessType(this.bussinessTypeQuery).then((res) => {
this.selectBussinessTypeList = []; this.selectBussinessTypeList = [];
@ -1435,20 +1490,42 @@ export default {
}); });
} }
}, },
// addBussinessType(row) {
// this.currentCode = row.code;
// this.currentRow = row;
// this.loadLinkData(row);
// if (this.currentCode == null || this.currentCode == '') {
// this.$message.error('');
// } else if (this.currentCode != row.code) {
// this.$message.error("")
// } else {
// this.bussinessTypeFormVisible = true;
// this.bussinessTypeQuery.page = 1;
// this.getBussinessType();
// }
// },
addBussinessType(row) { addBussinessType(row) {
this.currentCode = row.code; var action=[];
this.currentRow = row; for(var i=0;i<this.userBussinessTypeList.length;i++){
this.loadLinkData(row); action.push(this.userBussinessTypeList[i].action);
if (this.currentCode == null || this.currentCode == '') { }
this.$message.error('请先选择仓库');
} else if (this.currentCode != row.code) {
this.$message.error("请先选择当前分库!")
} else {
this.bussinessTypeFormVisible = true; this.bussinessTypeFormVisible = true;
this.bussinessTypeQuery.page = 1; this.bussinessTypeQuery.page = 1;
this.getBussinessType(); this.getBussinessType(1,action);
}
}, },
selsectBussinessType(row){
var busQuery = {
code: this.currentCode,
page: 1,
limit: 10000
}
warehouseBussinessTypeList(busQuery).then((res) => {
this.userBussinessTypeList = res.data.list;
}).catch((error) => {
this.$message.error("单据类型数据加载失败")
});
this.userBussinessTypeFormVisible = true;
},
addBussinessTypeData() { addBussinessTypeData() {
// if (this.selectBussinessTypeList.length == 0) { // if (this.selectBussinessTypeList.length == 0) {
// this.$message.error("") // this.$message.error("")
@ -1475,6 +1552,7 @@ export default {
this.bussinessTypeData = []; this.bussinessTypeData = [];
this.busTotal = 0; this.busTotal = 0;
}); });
this.selectWhouseBussinessType();
} else { } else {
this.$message.error(res.message); this.$message.error(res.message);
} }
@ -1484,6 +1562,17 @@ export default {
}); });
// } // }
}, },
selectWhouseBussinessType(){
var busQuery = {
code: this.currentCode,
page: 1,
limit: 100000
}
warehouseBussinessTypeList(busQuery).then((res) => {
this.userBussinessTypeList = res.data.list || [];
}).catch((error) => {
});
},
updateDirector(row) { updateDirector(row) {
row.director = !row.director; row.director = !row.director;
updateDirector(row).then((res) => { updateDirector(row).then((res) => {
@ -1506,20 +1595,55 @@ export default {
this.curSeleUser = row; this.curSeleUser = row;
this.relBusUserVisile = true; this.relBusUserVisile = true;
}, },
//
handleUserSubDel(row){
if (row.id) {
this.$confirm("确认移除单据吗?", "提示", {
type: "warning",
})
.then(() => {
this.deleteLoading = true;
let para = {id: row.id};
deleteSubWarehouse(para)
.then((response) => {
this.deleteLoading = false;
if (response.code !== 20000) {
this.$message.error(response.message);
return false;
}
this.$message.success("删除成功");
this.loadSubData(row.parentId);
})
.catch(() => {
this.deleteLoading = false;
});
})
.catch(() => {
this.$message.info("取消删除");
});
}
},
delWarehouseBussinessType(id) { delWarehouseBussinessType(id) {
let params = {id: id}; let params = {id: id};
deleteWarehouseBussinessType(params).then((res) => { deleteWarehouseBussinessType(params).then((res) => {
if (res.code == 20000) { if (res.code == 20000) {
this.$message.success("已移除"); this.$message.success("已移除");
for (let i = 0; i < this.bussinessTypeData.length; i++) { this.bussinessTypeData = [];
if (this.bussinessTypeData[i].id == id) { this.selectWhouseBussinessType();
this.bussinessTypeData.splice(i, 1);   var busQuerys = {
return;                         code: this.currentCode,
}                         page: 1,
}                         limit: 10
                    }
            warehouseBussinessTypeList(busQuerys).then((res) => {
                    this.bussinessTypeData = res.data.list;
                }).catch((error) => {
                    this.$message.error("单据类型数据加载失败")
                });
} else { } else {
this.$message.error("移除失败"); this.$message.error(res.message);
} }
}).catch((error) => { }).catch((error) => {
this.$message.error("移除失败"); this.$message.error("移除失败");

@ -146,12 +146,12 @@
平衡补单 平衡补单
</el-button> </el-button>
</div> </div>
<el-button <!-- <el-button
type="text" type="text"
size="small" size="small"
@click.native="rollback(scope.row)" @click.native="rollback(scope.row)"
>撤回 >撤回
</el-button> </el-button> -->
<el-button <el-button
v-if="scope.row.uploadFlag" v-if="scope.row.uploadFlag"
type="text" type="text"

@ -61,9 +61,9 @@
<el-table-column label="操作" fixed="right"> <el-table-column label="操作" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" @click.native.stop="submitOrder(scope.row)" <!-- <el-button type="text" size="small" @click.native.stop="submitOrder(scope.row)"
>提交 >提交
</el-button> </el-button> -->
<el-button <el-button
type="text" type="text"
size="small" size="small"
@ -88,7 +88,7 @@
<el-card class="el-card"> <el-card class="el-card">
<el-table v-loading="loading" :data="detailList" style="width: 100%"> <el-table v-loading="loading" :data="detailList" style="width: 100%">
<el-table-column label="序号" type="index" width="120"></el-table-column> <el-table-column label="序号" type="index" width="120"></el-table-column>
<el-table-column label="产品编码" prop="productId"></el-table-column> <!-- <el-table-column label="产品编码" prop="productId"></el-table-column> -->
<el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column> <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column> <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column> <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>

@ -95,7 +95,18 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20" style="margin-top: -10px" v-show="formData.status==4">
<el-col :span="3">
<div class="ao-text">
<span>拒绝原因</span>
</div>
</el-col>
<el-col :span="7">
<el-form-item >
<el-input v-model="formData.auditRemark" auto-complete="off" :disabled="true"></el-input>
</el-form-item>
</el-col>
</el-row>
</el-card> </el-card>
@ -272,7 +283,7 @@ export default {
this.$message.warning('未添加产品'); this.$message.warning('未添加产品');
return; return;
} }
if (status === '0') { if (status === '2') {
for (let i = 0; i < this.codeArray.length; i++) { for (let i = 0; i < this.codeArray.length; i++) {
if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") { if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
return this.$message.error('单据数量不能为0'); return this.$message.error('单据数量不能为0');

@ -61,9 +61,9 @@
<el-table-column label="操作" fixed="right"> <el-table-column label="操作" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" size="small" @click.native.stop="submitOrder(scope.row)" <!-- <el-button type="text" size="small" @click.native.stop="submitOrder(scope.row)"
>提交 >提交
</el-button> </el-button> -->
<el-button <el-button
type="text" type="text"
size="small" size="small"
@ -88,7 +88,7 @@
<el-card class="el-card"> <el-card class="el-card">
<el-table v-loading="loading" :data="detailList" style="width: 100%"> <el-table v-loading="loading" :data="detailList" style="width: 100%">
<el-table-column label="序号" type="index" width="120"></el-table-column> <el-table-column label="序号" type="index" width="120"></el-table-column>
<el-table-column label="产品编码" prop="productId"></el-table-column> <!-- <el-table-column label="产品编码" prop="productId"></el-table-column> -->
<el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column> <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column> <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column> <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>

@ -61,7 +61,7 @@
<el-button <el-button
type="text" type="text"
size="small" size="small"
:disabled=" scope.row.status==3" :disabled=" scope.row.status==2"
@click.native="newDistributionForm(scope.$index, scope.row)" @click.native="newDistributionForm(scope.$index, scope.row)"
>审核 >审核
</el-button </el-button
@ -83,7 +83,7 @@
<el-card class="el-card"> <el-card class="el-card">
<el-table v-loading="loading" :data="detailList" style="width: 100%"> <el-table v-loading="loading" :data="detailList" style="width: 100%">
<el-table-column label="序号" type="index" width="120"></el-table-column> <el-table-column label="序号" type="index" width="120"></el-table-column>
<el-table-column label="产品编码" prop="productId"></el-table-column> <!-- <el-table-column label="产品编码" prop="productId"></el-table-column> -->
<el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column> <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column> <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column> <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>

@ -121,6 +121,16 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-col :span="3" v-show="formData.status==4">
<div class="ao-text">
                            <span>拒绝原因</span>
                        </div>
                    </el-col>
                    <el-col :span="7" v-show="formData.status==4">
                        <el-form-item >
                            <el-input v-model="formData.auditRemark" auto-complete="off" :disabled="true"></el-input>
                        </el-form-item>
                    </el-col>
</el-card> </el-card>
@ -299,7 +309,7 @@ export default {
this.$message.warning('未添加产品'); this.$message.warning('未添加产品');
return; return;
} }
if (status === '0') { if (status === '2') {
for (let i = 0; i < this.codeArray.length; i++) { for (let i = 0; i < this.codeArray.length; i++) {
if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") { if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
return this.$message.error('单据数量不能为0'); return this.$message.error('单据数量不能为0');

@ -82,7 +82,7 @@
<el-card class="el-card"> <el-card class="el-card">
<el-table v-loading="loading" :data="detailList" style="width: 100%"> <el-table v-loading="loading" :data="detailList" style="width: 100%">
<el-table-column label="序号" type="index" width="120"></el-table-column> <el-table-column label="序号" type="index" width="120"></el-table-column>
<el-table-column label="产品编码" prop="productId"></el-table-column> <!-- <el-table-column label="产品编码" prop="productId"></el-table-column> -->
<el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column> <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column> <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column> <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>

@ -69,6 +69,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
:disabled="scope.row.status!=2"
size="small" size="small"
@click.native="newDistributionForm(scope.$index, scope.row)" @click.native="newDistributionForm(scope.$index, scope.row)"
>审核 >审核
@ -91,7 +92,7 @@
<el-card class="el-card"> <el-card class="el-card">
<el-table v-loading="loading" :data="detailList" style="width: 100%"> <el-table v-loading="loading" :data="detailList" style="width: 100%">
<el-table-column label="序号" type="index" width="120"></el-table-column> <el-table-column label="序号" type="index" width="120"></el-table-column>
<el-table-column label="产品编码" prop="productId"></el-table-column> <!-- <el-table-column label="产品编码" prop="productId"></el-table-column> -->
<el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column> <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column> <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column> <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>

@ -281,6 +281,7 @@ export default {
targetInv: null, targetInv: null,
targetSubInv: null, targetSubInv: null,
targetBillType: null, targetBillType: null,
auditRemark:"",
}, },
formRules: {}, formRules: {},
codeArray: [], codeArray: [],

@ -11,14 +11,14 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item class="query-form-item"> <!-- <el-form-item class="query-form-item">
<el-select v-model="filterQuery.status" placeholder="审核状态"> <el-select v-model="filterQuery.status" placeholder="审核状态">
<el-option label="全部" value=""></el-option> <el-option label="全部" value=""></el-option>
<el-option label="未审核" value="2"></el-option> <el-option label="未审核" value="2"></el-option>
<el-option label="已审核" value="3"></el-option> <el-option label="已审核" value="3"></el-option>
<el-option label="已拒绝" value="4"></el-option> <el-option label="已拒绝" value="4"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item> -->
<el-form-item class="query-form-item"> <el-form-item class="query-form-item">
<span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span> <span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span>
<el-date-picker <el-date-picker
@ -90,7 +90,7 @@
<el-card class="el-card"> <el-card class="el-card">
<el-table v-loading="loading" :data="detailList" style="width: 100%"> <el-table v-loading="loading" :data="detailList" style="width: 100%">
<el-table-column label="序号" type="index" width="120"></el-table-column> <el-table-column label="序号" type="index" width="120"></el-table-column>
<el-table-column label="产品编码" prop="productId"></el-table-column> <!-- <el-table-column label="产品编码" prop="productId"></el-table-column> -->
<el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column> <el-table-column label="产品通用名" prop="productName" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column> <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
<el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column> <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip="true"></el-table-column>

@ -88,8 +88,8 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item prop="need"> <el-form-item prop="need">
<el-select v-model="formData.status" style="width: 100%"> <el-select v-model="formData.status" style="width: 100%">
<el-option label="禁用" :value=1></el-option> <el-option label="失效" :value=1></el-option>
<el-option label="启用" :value=0></el-option> <el-option label="有效" :value=0></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>

@ -360,9 +360,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>
@ -501,7 +501,7 @@ export default {
{required: true, message: "证书名称", trigger: "blur"} {required: true, message: "证书名称", trigger: "blur"}
], ],
need: [ need: [
{required: true, message: "请选择是否必传", trigger: "blur"} {required: true, message: "请选择是否禁用", trigger: "blur"}
], ],
}, },
@ -535,10 +535,10 @@ export default {
formManufactureRules: { formManufactureRules: {
name: [ name: [
{required: true, message: "证书名称", trigger: "blur"} {required: true, message: "请输入证书名称", trigger: "blur"}
], ],
need: [ need: [
{required: true, message: "请选择是否禁用", trigger: "blur"} {required: true, message: "请选择是否必传", trigger: "blur"}
], ],
}, },

@ -76,6 +76,7 @@
<el-button <el-button
type="text" type="text"
size="small" size="small"
:disabled="scope.row.auditStatus === 1"
@click.native.stop="deleteDialog(scope.row)" @click.native.stop="deleteDialog(scope.row)"
>删除 >删除
</el-button </el-button
@ -184,6 +185,7 @@
<el-button <el-button
type="text" type="text"
size="small" size="small"
:disabled="scope.row.auditStatus === 1"
@click.native="deleteRegistration(scope.row)" @click.native="deleteRegistration(scope.row)"
>删除 >删除
</el-button </el-button
@ -464,9 +466,18 @@ export default {
this.getRegistrationList(); this.getRegistrationList();
}, },
onSubmit2() { onSubmit2() {
if(this.currentManufacturer==null){
this.$message.error("请先选中生产企业!");
return
}
this.getRegistrationList(); this.getRegistrationList();
}, },
registrationDialog(row) { registrationDialog(row) {
if(this.currentManufacturer==null){
this.$message.error("请先选中生产企业!");
return
}
if (this.$isNotBlank(row)) { if (this.$isNotBlank(row)) {
this.registrationId = row.id; this.registrationId = row.id;
this.curProductQuery = row; this.curProductQuery = row;
@ -549,7 +560,7 @@ export default {
created() { created() {
this.fileUrl = BASE_URL + "/udiwms/image/register/file/getImage?type=image4&name="; this.fileUrl = BASE_URL + "/udiwms/image/register/file/getImage?type=image4&name=";
this.getList(); this.getList();
this.getRegistrationList(); // this.getRegistrationList();
}, },
} }
</script> </script>

@ -142,6 +142,11 @@
<el-table-column label="有效期" prop="vailDate"></el-table-column> <el-table-column label="有效期" prop="vailDate"></el-table-column>
<el-table-column label="失效期" prop="expireDate"></el-table-column> <el-table-column label="失效期" prop="expireDate"></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="证书状态" prop="status">
<template slot-scope="scope">
{{ supStatus[scope.row.status] }}
</template>
</el-table-column>
<el-table-column label="审核状态" prop="auditStatus" width="120"> <el-table-column label="审核状态" prop="auditStatus" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="(scope.row.auditStatus) | statusFilterType"> <el-tag :type="(scope.row.auditStatus) | statusFilterType">
@ -355,6 +360,10 @@ export default {
3: "变更未审核", 3: "变更未审核",
6: "未审核", 6: "未审核",
}, },
supStatus: {
0: "有效",
1: "失效",
},
certAuditVisible: false, certAuditVisible: false,
currentAudit: {}, currentAudit: {},
}; };

@ -15,7 +15,7 @@
size="mini" size="mini"
icon="search" icon="search"
v-if="inputQuery.auditStatus == 0" v-if="inputQuery.auditStatus == 0"
@click="onModifySubmit(0)" @click="addOrModifyCompany(0)"
>草稿保存 >草稿保存
</el-button </el-button
> >
@ -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">
@ -226,7 +233,6 @@
type="text" type="text"
size="small" size="small"
@click.native="addCert(scope.row)" @click.native="addCert(scope.row)"
v-if="scope.row.auditStatus == 0 || scope.row.auditStatus == 2|| scope.row.auditStatus == 6"
>编辑 >编辑
</el-button </el-button
> >
@ -247,7 +253,7 @@
</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"
@ -263,7 +269,7 @@
@click.native="disableCert(scope.row,0)" @click.native="disableCert(scope.row,0)"
>启用 >启用
</el-button </el-button
> > -->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -332,6 +338,7 @@ import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
import {getSupComapnys} from "@/api/purchase/supCompany"; import {getSupComapnys} from "@/api/purchase/supCompany";
import {getUUID} from "@/utils/strUtil"; import {getUUID} from "@/utils/strUtil";
import supCertSetSelectDialog from "@/views/purchase/supCertSetSelectDialog"; import supCertSetSelectDialog from "@/views/purchase/supCertSetSelectDialog";
import {getCompany} from "@/api/inout/company";
export default { export default {
name: "supManufacturerEdit", name: "supManufacturerEdit",
@ -359,7 +366,7 @@ export default {
classesDisplay: false, classesDisplay: false,
selectedOptions: [], selectedOptions: [],
selectedOptions2: [], selectedOptions2: [],
options: regionDataPlus, options: regionData,
rules: { rules: {
customerId: [ customerId: [
@ -468,6 +475,10 @@ export default {
1: "新增生产企业资质证书", 1: "新增生产企业资质证书",
2: "编辑生产企业资质证书", 2: "编辑生产企业资质证书",
}, },
formMap: {
1: "新增生产企业资质证书",
2: "编辑生产企业资质证书",
},
manufacturerId: null, manufacturerId: null,
customerId: null, customerId: null,
selectCertVisible: false, selectCertVisible: false,
@ -475,15 +486,14 @@ export default {
}; };
}, },
created() { created() {
console.log(this.fromType + "----------------------");
if (this.editType == 0) { if (this.editType == 0) {
this.inputQuery.manufacturerId = getUUID("") this.inputQuery.manufacturerId = getUUID("")
} else { } else {
this.certQuery.customerId = this.inputQuery.customerId; this.certQuery.customerId = this.inputQuery.customerId;
this.selectedOptions = this.inputQuery.placeAreaCode.split(","); this.selectedOptions = this.inputQuery.placeAreaCode.split(",");
this.selectedOptions2 = this.inputQuery.productionAreaCode.split(","); if(this.inputQuery.productionAreaCode!="" && this.inputQuery.productionAreaCode!=null && this.inputQuery.productionAreaCode!=undefined){
this.selectedOptions2 = this.inputQuery.productionAreaCode.split(",");
}
} }
this.certQuery.manufacturerIdFk = this.inputQuery.manufacturerId; this.certQuery.manufacturerIdFk = this.inputQuery.manufacturerId;
@ -502,30 +512,46 @@ export default {
}, },
methods: { methods: {
onModifySubmit(type) { onModifySubmit(type) {
this.$refs["inputQuery"].validate(valid => { //
if (valid) { let query = {
customerId: this.$store.getters.customerId
let formData = JSON.parse(JSON.stringify(this.inputQuery));
formData.auditStatus = type;
this.loading = true;
let urlName = this.editType == 0 ? 'add' : 'update';
addOrModifyCompany(formData, urlName).then(response => {
this.loading = false;
if (response.code === 20000) {
this.addCloseDialog(true);
this.$message.success("保存成功");
} else {
this.$message.error(response.message);
}
});
} else {
console.log("error submit!!");
return false;
} }
}); getCompany(query)
}, .then((response) => {
if(response.data.auditStatus!=1){
this.$message.error("本企业信息还未通过审核!");
falg=false;
return;
}else{
this.addOrModifyCompany(type);
}}).catch(() => {
});
},
addOrModifyCompany (type){
this.$refs["inputQuery"].validate(valid => {
if (valid) {
let formData = JSON.parse(JSON.stringify(this.inputQuery));
formData.auditStatus = type;
this.loading = true;
let urlName = this.editType == 0 ? 'add' : 'update';
addOrModifyCompany(formData, urlName).then(response => {
this.loading = false;
if (response.code === 20000) {
this.addCloseDialog(true);
this.$message.success("保存成功");
} else {
this.$message.error(response.message);
}
});
} else {
console.log("error submit!!");
return false;
}
});
},
certHandleCurrentChange(val) { certHandleCurrentChange(val) {
this.certQuery.page = val; this.certQuery.page = val;
this.getCompanyCertList(); this.getCompanyCertList();

@ -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">
@ -286,10 +293,18 @@
<el-button <el-button
type="text" type="text"
size="small" size="small"
:disabled="scope.row.auditStatus === 1"
@click.native="deleteCompanyCert(scope.row)" @click.native="deleteCompanyCert(scope.row)"
>删除 >删除
</el-button </el-button
> >
<el-button
type="text"
size="small"
v-if="scope.row.auditStatus === 2"
@click.native.stop="rejectInfo(scope.row)"
>说明
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -505,7 +520,10 @@ export default {
6: "未审核", 6: "未审核",
}, },
editTye: 1, editTye: 1,
statusFlag: {
0: "有效",
1: "失效",
},
manufacturerId: null, manufacturerId: null,
productId: null, productId: null,
customerId: null, customerId: null,
@ -565,7 +583,16 @@ export default {
toViewCompanyCert(row) { toViewCompanyCert(row) {
window.open(this.certFileUrl + row.filePath); window.open(this.certFileUrl + row.filePath);
}, },
rejectInfo(row) {
this.$confirm(row.auditComment, "拒绝说明", {
confirmButtonText: "确定",
type: "warning",
showCancelButton: false,
})
.then(() => {
});
},
findMethod(query) { findMethod(query) {
this.fromOptions = []; this.fromOptions = [];
let cQuery = { let cQuery = {

@ -68,9 +68,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">

@ -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>

@ -471,7 +471,7 @@ export default {
} }
if (status === '0') { if (status === '2') {
for (let i = 0; i < this.codeArray.length; i++) { for (let i = 0; i < this.codeArray.length; i++) {
if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") { if (this.$isBlank(this.codeArray[i].count) || this.codeArray[i].count == "0") {
return this.$message.error('单据数量不能为0'); return this.$message.error('单据数量不能为0');

Loading…
Cancel
Save