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

代码冲突解决

Browse Source
20231126-yw
yuanwei 1 year ago
parent 7e8d211a61
commit 308daccbba
7 changed files with 4986 additions and 2031 deletions
Show Stats Download Patch File Download Diff File

529
src/views/basic/business/stockOrder.vue
Unescape Escape View File

@ -1,75 +1,140 @@
<template>
<div>
<el-card class="el-card">
<el-form :model="query" label-width="100px" v-show="showSearch">
<el-row style="width: 100%">
<el-col :span="8">
<el-form-item label="单号:">
<el-input v-model="query.billNo" style="width: 90%" placeholder="请输入单号" clearable></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="打印状态：" prop="inCodeStatus" clearable>
<el-select v-model="query.inCodeStatus" style="width: 90%">
<el-option label="未打印" :value="0"></el-option>
<el-option label="已打印" :value="1"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-form v-if="queryList && queryList.length > 0" :model="query" label-width="100px" v-show="showSearch">
<!-- <el-row style="width: 100%">-->
<!-- <el-col :span="8">-->
<!-- <el-form-item label="单号:">-->
<!-- <el-input v-model="query.billNo" style="width: 90%" placeholder="请输入单号" clearable></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item label="打印状态：" prop="inCodeStatus" clearable>-->
<!-- <el-select v-model="query.inCodeStatus" style="width: 90%">-->
<!-- <el-option label="未打印" :value="0"></el-option>-->
<!-- <el-option label="已打印" :value="1"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- &lt;!&ndash; <el-col :span="8">&ndash;&gt;-->
<!-- &lt;!&ndash; <el-form-item label="送货单位:">&ndash;&gt;-->
<!-- &lt;!&ndash; <el-input v-model="query.corpName" style="width: 90%" placeholder="请输入送货单位" clearable></el-input>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-form-item>&ndash;&gt;-->
<!-- &lt;!&ndash; </el-col>&ndash;&gt;-->
<!-- <el-col :span="8">-->
<!-- <el-form-item class="query-form-item" label="单据类型:">-->
<!-- <el-select v-model="query.action" placeholder="请选择单据类型"-->
<!-- style="width: 90%"-->
<!-- clearable>-->
<!-- <el-option-->
<!-- v-for="item in busTypes"-->
<!-- :key="item.name"-->
<!-- :label="item.name"-->
<!-- :value="item.action">-->
<!-- <span style="float: left">{{ item.name }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item label="送货单位:">-->
<!-- <el-input v-model="query.corpName" style="width: 90%" placeholder="请输入送货单位" clearable></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-row>-->
<!-- <el-col :span="8">-->
<!-- <el-form-item label="单据状态:">-->
<!-- <el-select v-model="query.status" placeholder="请选择单据状态" style="width: 90%">-->
<!-- <el-option label="草稿" :value=1>草稿</el-option>-->
<!-- <el-option label="待校验" :value=3>待校验</el-option>-->
<!-- <el-option label="待核对" :value=5>待核对</el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col :span="8">
<el-form-item class="query-form-item" label="单据类型:">
<el-select v-model="query.action" placeholder="请选择单据类型"
style="width: 90%"
<!-- <el-col :span="8">-->
<!-- <el-form-item label="创建时间:">-->
<!-- <el-date-picker-->
<!-- :picker-options="pickerOptions"-->
<!-- v-model="actDateRange"-->
<!-- type="daterange"-->
<!-- format="yyyy 年 MM 月 dd 日"-->
<!-- style="width: 90%"-->
<!-- value-format="yyyy-MM-dd"-->
<!-- range-separator="至"-->
<!-- start-placeholder="开始日期"-->
<!-- end-placeholder="结束日期"-->
<!-- >-->
<!-- </el-date-picker>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-row style=" display:flex; flex-wrap: wrap; ">
<template v-for="(item, index) in queryList" >
<el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
<el-input
v-model="query[item.columnName]"
:placeholder="item.columnDesc"
:disabled="executeEval(null,item.disabledFuc,false)"
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
clearable
></el-input>
</el-form-item>
<el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<el-select v-model="query[item.columnName]"
:placeholder="item.columnDesc"
:disabled="executeEval(null,item.disabledFuc,false)"
clearable>
<el-option
v-for="item in busTypes"
:key="item.name"
:label="item.name"
:value="item.action">
<span style="float: left">{{ item.name }}</span>
</el-option>
v-for="dict in item.lableRuleObj"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="单据状态:">
<el-select v-model="query.status" placeholder="请选择单据状态" style="width: 90%">
<el-option label="草稿" :value=1>草稿</el-option>
<el-option label="待校验" :value=3>待校验</el-option>
<el-option label="待核对" :value=5>待核对</el-option>
<el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<el-select
v-model="query[item.columnName]"
:placeholder="item.columnDesc"
@change="executeFuc($event,'5',item.checkRules)"
:disabled="executeEval(null,item.disabledFuc,false)"
filterable
remote
:remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
clearable>
<el-option
v-for="item in options[item.clickFuc]"
:key="item.code"
:label="item.label"
:value="item.code"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="创建时间:">
<el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<el-date-picker
:picker-options="pickerOptions"
v-model="actDateRange"
type="daterange"
format="yyyy 年 MM 月 dd 日"
style="width: 90%"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
>
</el-date-picker>
></el-date-picker>
</el-form-item>
</el-col>
<el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<el-date-picker
v-model="query[item.columnName]"
:style="`width:${item.width+'px'}`"
value-format="yyyy-MM-dd"
:disabled="executeEval(null,item.disabledFuc,false)"
type="date"
:placeholder="item.columnDesc"
></el-date-picker>
</el-form-item>
</template>
</el-row>
</el-form>
@ -85,43 +150,130 @@
<el-table v-loading="loading" :data="list" style="width: 100%;" border highlight-current-row
@row-click="getStockOrderDetailList" ref="multipleTable"
@row-click="(row) => executeFuc(row,'0',tableObj.handleChangeFuc)" ref="multipleTable"
:default-sort="defaultSort"
@sort-change="handleSortChange">
<el-table-column type="selection" width="55">
</el-table-column>
<el-table-column type="index" label="序号" width="50"></el-table-column>
<el-table-column label="单据号" prop="billNo" width="140" show-overflow-tooltip></el-table-column>
<el-table-column label="单据类型" prop="billTypeName" width="120">
</el-table-column>
<el-table-column label="创建时间" prop="createTime" width="150"
sortable="custom"
:sort-orders="['ascending', 'descending']"></el-table-column>
<el-table-column label="打印状态" width="100" prop="inCodeStatus">
<template slot-scope="scope">
<span>{{ enableMap[scope.row.inCodeStatus] }}</span>
@sort-change="handleSortChange" >
<!-- <el-table-column type="selection" width="55">-->
<!-- </el-table-column>-->
<!-- <el-table-column type="index" label="序号" width="50"></el-table-column>-->
<!-- <el-table-column label="单据号" prop="billNo" width="140" show-overflow-tooltip></el-table-column>-->
<!-- <el-table-column label="单据类型" prop="billTypeName" width="120">-->
<!-- </el-table-column>-->
<!-- <el-table-column label="创建时间" prop="createTime" width="150"-->
<!-- sortable="custom"-->
<!-- :sort-orders="['ascending', 'descending']"></el-table-column>-->
<!-- <el-table-column label="打印状态" width="100" prop="inCodeStatus">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ enableMap[scope.row.inCodeStatus] }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="采购部门" prop="deptName" width="120">-->
<!-- </el-table-column>-->
<!-- <el-table-column label="收货仓库" prop="invName" width="150">-->
<!-- </el-table-column>-->
<!-- <el-table-column label="单据来源" prop="fromType" width="120">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ sourceMap[scope.row.fromType] }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="操作" width="200">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- @click.native="qrcodeDetail(scope.row)"-->
<!-- >内部码-->
<!-- </el-button-->
<!-- >-->
<!-- </template>-->
<!-- </el-table-column>-->
<template v-for="(item, index) in tableHeader">
<el-table-column
v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
type="index" :label="item.columnDesc"></el-table-column>
<el-table-column
v-if="item.columnType == 'selection'"
type="selection"
:width="item.width"
:selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
></el-table-column>
<el-table-column
v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
</template>
</el-table-column>
<el-table-column label="采购部门" prop="deptName" width="120">
<el-table-column
v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
</template>
</el-table-column>
<el-table-column label="收货仓库" prop="invName" width="150">
<el-table-column
v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
<span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
</el-tag>
</template>
</el-table-column>
<el-table-column label="单据来源" prop="fromType" width="120">
<el-table-column
v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:width="item.width"
:key="item.columnName"
fixed="right"
>
<template slot-scope="scope">
<span>{{ sourceMap[scope.row.fromType] }}</span>
<el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
:type="buttonItem.type"
:size="buttonItem.size"
:style="buttonItem.style"
:key="buttonItem"
v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
:disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
@click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
>{{ buttonItem.name }}
</el-button>
</template>
</el-table-column>
<el-table-column label="操作" width="200">
<el-table-column
v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native="qrcodeDetail(scope.row)"
>内部码
</el-button
>
<span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
</template>
</el-table-column>
</template>
</el-table>
<pagination
@ -136,25 +288,125 @@
<el-card class="el-card">
<el-table v-loading="detailLoading" :data="detailList" style="width: 100%" border>
<el-table-column type="index" label="序号" width="50"></el-table-column>
<el-table-column label="物资名称" prop="coName"></el-table-column>
<el-table-column label="规格型号" prop="spec"></el-table-column>
<el-table-column label="批次号" prop="batchNo"></el-table-column>
<el-table-column label="单据数量" prop="count"></el-table-column>
<!-- <el-table-column label="实际数量" prop="scanCount"></el-table-column>-->
<el-table-column label="生产日期" prop="productDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.productDate) }}</span>
</template>
</el-table-column>
<el-table-column label="失效日期" prop="expireDate">
<template slot-scope="scope">
<span>{{ convertDateFun(scope.row.expireDate) }}</span>
</template>
</el-table-column>
<el-table-column label="价格" prop="price"></el-table-column>
<el-table-column label="生产企业" prop="manufacturer"></el-table-column>
<el-table-column label="注册/备案号" prop="certCode"></el-table-column>
<!-- <el-table-column type="index" label="序号" width="50"></el-table-column>-->
<!-- <el-table-column label="物资名称" prop="coName"></el-table-column>-->
<!-- <el-table-column label="规格型号" prop="spec"></el-table-column>-->
<!-- <el-table-column label="批次号" prop="batchNo"></el-table-column>-->
<!-- <el-table-column label="单据数量" prop="count"></el-table-column>-->
<!-- &lt;!&ndash; <el-table-column label="实际数量" prop="scanCount"></el-table-column>&ndash;&gt;-->
<!-- <el-table-column label="生产日期" prop="productDate">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ convertDateFun(scope.row.productDate) }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="失效日期" prop="expireDate">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ convertDateFun(scope.row.expireDate) }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="价格" prop="price"></el-table-column>-->
<!-- <el-table-column label="生产企业" prop="ylqxzcrbarmc"></el-table-column>-->
<!-- <el-table-column label="注册/备案号" prop="certCode"></el-table-column>-->
<template v-for="(item, index) in tableHeader2">
<el-table-column
v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
type="index" :label="item.columnDesc"></el-table-column>
<el-table-column
v-if="item.columnType == 'selection'"
type="selection"
:width="item.width"
:selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
></el-table-column>
<el-table-column
v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
<span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
</el-tag>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:width="item.width"
:key="item.columnName"
fixed="right"
>
<template slot-scope="scope">
<el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
:type="buttonItem.type"
:size="buttonItem.size"
:style="buttonItem.style"
:key="buttonItem"
v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
:disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
@click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
>{{ buttonItem.name }}
</el-button>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'text' && !(item.columnName == 'productDate' || item.columnName == 'expireDate') && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'text' && (item.columnName == 'productDate' || item.columnName == 'expireDate') && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ convertDateFun(scope.row[item.columnName]) }}</span>
</template>
</el-table-column>
</template>
</el-table>
<pagination
@ -203,7 +455,10 @@ import {filterAll, filterAllByUser} from "@/api/system/invWarehouse";
import {filterSubByInv, findInvByUser} from '@/api/system/invSubWarehouse'
import {convertDate} from "@/utils/date"
import {filterOrder} from "@/api/inout/order";
import {getLocalJoinByUser} from "@/api/basic/busType";
import {getLocalJoinByUserOptimize} from "@/api/basic/busType";
import {
getHead,executeFuc
} from "@/utils/customConfig";
export default {
name: "stockOrder",
@ -225,7 +480,7 @@ export default {
limit: 10,
startTime: "",
endTime: "",
inCodeStatus: 0,
inCodeStatus: "0",
},
detailQuery: {
orderIdFk: "",
@ -239,6 +494,15 @@ export default {
list: [],
detailList: [],
total: 0,
tableHeader:[],
queryList:[],
fromList:[],
tableHeader2:[],
queryList2:[],
fromList2:[],
options: {
getBusType:[]
},
detailTotal: 0,
loading: false,
detailLoading: false,
@ -342,7 +606,7 @@ export default {
limit: 10,
startTime: "",
endTime: "",
inCodeStatus: 0,
inCodeStatus: "0",
};
this.getList();
@ -440,44 +704,44 @@ export default {
},
qrcodeDetail(row) {
this.idQuery.id = '';
if (this.$isNotBlank(row.id)) {
this.idQuery.id = row.id;
this.idQuery.formData = row;
this.idQuery.filterUDIType = this.filterUDIType;
this.qrcodeDetailVisible = true;
qrcodeDetail(_this,row) {
_this.idQuery.id = '';
if (_this.$isNotBlank(row.id)) {
_this.idQuery.id = row.id;
_this.idQuery.formData = row;
_this.idQuery.filterUDIType = _this.filterUDIType;
_this.qrcodeDetailVisible = true;
}
},
closeQRCodeDetailDialog() {
this.qrcodeDetailVisible = false;
this.getList();
},
getStockOrderDetailList(row) {
if (this.$isNotBlank(row)) {
this.detailQuery.orderIdFk = row.billNo;
getStockOrderDetailList(_this,row) {
if (_this.$isNotBlank(row)) {
_this.detailQuery.orderIdFk = row.billNo;
}
this.detailLoading = true;
stockOrderDetail(this.detailQuery)
_this.detailLoading = true;
stockOrderDetail(_this.detailQuery)
.then((response) => {
this.detailLoading = false;
this.detailList = response.data.list || [];
this.detailTotal = response.data.total;
_this.detailLoading = false;
_this.detailList = response.data.list || [];
_this.detailTotal = response.data.total;
})
.catch(() => {
this.detailLoading = false;
this.detailList = [];
_this.detailLoading = false;
_this.detailList = [];
});
},
getBusType() {
getBusType(_this) {
let query = {
enabled: true,
vueType: "supDelivery",
};
getLocalJoinByUser(query)
getLocalJoinByUserOptimize(query)
.then((response) => {
this.busTypes = response.data.list || [];
this.filterQuery.action = this.busTypes[0].action;
_this.options.getBusType = response.data || [];
_this.query.action = this.busTypes[0].action;
// this.getList();
})
.catch(() => {
@ -495,6 +759,15 @@ export default {
subInvChange() {
this.getBusType();
},
executeFuc(row,type,clickFuc,value){
return executeFuc(this,row,type,clickFuc,value);
},
executeEval(row,expression,defaultRet){
if(expression){
return eval(expression);
}
return defaultRet;
}
},
components: {
draggable,
@ -529,8 +802,22 @@ export default {
created() {
// 加载表格数据
this.getSubInvList();
this.getBusType();
this.getList();
this.getBusType(this);
getHead("stockOrder-1","1").then((re) => {
// 处理返回的数据
this.tableObj = re.data;
this.tableHeader = re.data.tableList;
this.queryList = re.data.queryList;
this.fromList = re.data.fromList;
this.getList()
});
getHead("stockOrder-2","1").then((re) => {
// 处理返回的数据
this.tableObj2 = re.data;
this.tableHeader2 = re.data.tableList;
this.queryList2 = re.data.queryList;
this.fromList2 = re.data.fromList;
});
}
}
</script>

1457
src/views/inout/InvoiceRegByOrder.vue
View File

File diff suppressed because it is too large Load Diff

1537
src/views/inout/IoReturnedSearchOrder.vue
View File

File diff suppressed because it is too large Load Diff

1028
src/views/purchase/cert/supCertAudit.vue
View File

File diff suppressed because it is too large Load Diff

892
src/views/purchase/cert/supCertSearch.vue
View File

File diff suppressed because it is too large Load Diff

821
src/views/purchase/cert/supCertificationAdd.vue
Unescape Escape View File

@ -5,61 +5,145 @@
<el-card>
<el-form
:model="filterQuery"
v-if="queryList && queryList.length > 0"
class="query-form"
label-width="110px"
v-show="showSearch"
>
<el-row>
<el-col span="6">
<el-form-item label="生产企业/代理人:">
<!-- <el-row>-->
<!-- <el-col span="6">-->
<!-- <el-form-item label="企业名称:">-->
<!-- <el-input-->
<!-- v-model="filterQuery.companyName"-->
<!-- style="width: 90%"-->
<!-- placeholder="请输入企业名称"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col span="6">-->
<!-- <el-form-item label="社会信用号:">-->
<!-- <el-input-->
<!-- v-model="filterQuery.creditCode"-->
<!-- style="width: 90%"-->
<!-- placeholder="请输入社会信用号"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col span="6">-->
<!-- <el-form-item label="处理状态:">-->
<!-- <el-select-->
<!-- v-model="filterQuery.auditStatus"-->
<!-- style="width: 90%"-->
<!-- placeholder="请输入处理状态"-->
<!-- >-->
<!-- <el-option label="全部" value=""></el-option>-->
<!-- <el-option label="草稿" value="0"></el-option>-->
<!-- <el-option label="未审核" value="6"></el-option>-->
<!-- <el-option label="变更未审核" value="3"></el-option>-->
<!-- <el-option label="已审核" value="1"></el-option>-->
<!-- <el-option label="已拒绝" value="2"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-row style=" display:flex; flex-wrap: wrap; ">
<template v-for="(item, index) in queryList" >
<el-form-item v-if="item.columnType == 'input' && item.columnName !='queryName' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
<el-input
v-model="filterQuery.companyName"
style="width: 90%"
placeholder="请输入生产企业/代理人"
></el-input>
</el-form-item>
</el-col>
<el-col span="6">
<el-form-item label="社会信用号:">
<el-input
v-model="filterQuery.creditCode"
style="width: 90%"
placeholder="请输入社会信用号"
></el-input>
</el-form-item>
</el-col>
<el-col span="6">
<el-form-item label="处理状态:">
<el-select
v-model="filterQuery.auditStatus"
style="width: 90%"
placeholder="请输入处理状态"
>
<el-option label="全部" value=""></el-option>
<el-option label="草稿" value="0"></el-option>
<el-option label="未审核" value="6"></el-option>
<el-option label="变更未审核" value="3"></el-option>
<el-option label="已审核" value="1"></el-option>
<el-option label="已拒绝" value="2"></el-option>
</el-select>
</el-form-item>
</el-col>
v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc"
:disabled="executeEval(null,item.disabledFuc,false)"
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
clearable
></el-input>
</el-form-item>
<el-form-item v-if="item.columnType == 'input' && item.columnName =='queryName' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
<el-autocomplete
class="inline-input"
style="width: 90%"
v-model="queryName"
:fetch-suggestions="queryProductName"
placeholder="请输入内容"
clearable
@select="handleSelect"
@clear="clearQueryProduct"
></el-autocomplete>
</el-form-item>
<el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<el-select v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc"
@change="executeFuc($event,'5',item.checkRules)"
:disabled="executeEval(null,item.disabledFuc,false)"
clearable>
<el-option
v-for="dict in item.lableRuleObj"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
<span style="float: left">{{ item.name }}</span>
<span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
</el-select>
</el-form-item>
<el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<el-select
v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc"
:disabled="executeEval(null,item.disabledFuc,false)"
filterable
remote
@change="executeFuc($event,'5',item.checkRules)"
:remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
clearable>
<el-option
v-for="item in options[item.clickFuc]"
:key="item.code"
:label="item.label"
:value="item.code"
/>
<span style="float: left">{{ item.name }}</span>
<span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
</el-select>
</el-form-item>
<el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<el-date-picker
:picker-options="pickerOptions"
v-model="actDateRange"
type="daterange"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<el-date-picker
v-model="filterQuery[item.columnName]"
:style="`width:${item.width+'px'}`"
value-format="yyyy-MM-dd"
:disabled="executeEval(null,item.disabledFuc,false)"
type="date"
:placeholder="item.columnDesc"
></el-date-picker>
</el-form-item>
</template>
</el-row>
</el-form>
<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
>
<el-button type="primary" icon="el-icon-refresh" @click="onReset"
>重置</el-button
>重置</el-button
>
<el-button type="primary" icon="el-icon-search" @click="onSubmit"
>查询</el-button
>查询</el-button
>
<el-button type="primary" icon="el-icon-plus" @click="addInfoDialog()"
>添加</el-button
>添加</el-button
>
</el-button-group>
</div>
@ -72,63 +156,150 @@
style="width: 100%"
border
highlight-current-row
@current-change="supManufacturerClick"
@current-change="(row) => executeFuc(row,'0',tableObj.handleChangeFuc)"
>
<el-table-column label="序号" type="index"></el-table-column>
<el-table-column
label="生产企业/代理人"
prop="companyName"
width="250"
></el-table-column>
<el-table-column label="社会信用号" prop="creditCode"></el-table-column>
<el-table-column label="企业类型" prop="bussinessStatus" width="120">
<template slot-scope="scope">
<span>{{ companyTypeMap[scope.row.companyType] }}</span>
</template>
</el-table-column>
<el-table-column label="所在地区" prop="placeArea"></el-table-column>
<el-table-column
label="所在地址"
prop="placeAddress"
:show-overflow-tooltip="true"
></el-table-column>
<el-table-column
label="所属供应商"
prop="supName"
show-overflow-tooltip
></el-table-column>
<el-table-column label="审核状态" prop="auditStatus" width="120">
<template slot-scope="scope">
<el-tag :type="scope.row.auditStatus | statusFilterType">
{{ checkFlag[scope.row.auditStatus] }}
</el-tag>
</template>
</el-table-column>
<!-- <el-table-column label="序号" type="index"></el-table-column>-->
<!-- <el-table-column-->
<!-- label="企业名称"-->
<!-- prop="companyName"-->
<!-- width="250"-->
<!-- ></el-table-column>-->
<!-- <el-table-column label="社会信用号" prop="creditCode"></el-table-column>-->
<!-- <el-table-column label="企业类型" prop="bussinessStatus" width="1">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ companyTypeMap[scope.row.companyType] }}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="所在地区" prop="placeArea"></el-table-column>-->
<!-- <el-table-column-->
<!-- label="所在地址"-->
<!-- prop="placeAddress"-->
<!-- :show-overflow-tooltip="true"-->
<!-- ></el-table-column>-->
<!-- <el-table-column-->
<!-- label="所属供应商"-->
<!-- prop="supName"-->
<!-- show-overflow-tooltip-->
<!-- ></el-table-column>-->
<!-- <el-table-column label="审核状态" prop="auditStatus" width="120">-->
<!-- <template slot-scope="scope">-->
<!-- <el-tag :type="scope.row.auditStatus | statusFilterType">-->
<!-- {{ checkFlag[scope.row.auditStatus] }}-->
<!-- </el-tag>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="操作" width="120">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native.stop="addInfoDialog(scope.row)"
>编辑</el-button
>
<el-button
type="text"
size="small"
:disabled="scope.row.auditStatus === 1"
@click.native.stop="deleteDialog(scope.row)"
>删除
</el-button>
<el-button
type="text"
size="small"
v-if="scope.row.auditStatus === 2"
@click.native.stop="rejectInfo(scope.row)"
>说明
</el-button>
</template>
</el-table-column>
<!-- <el-table-column label="操作" width="120">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- @click.native.stop="addInfoDialog(scope.row)"-->
<!-- >编辑</el-button-->
<!-- >-->
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- :disabled="scope.row.auditStatus === 1"-->
<!-- @click.native.stop="deleteDialog(scope.row)"-->
<!-- >删除-->
<!-- </el-button>-->
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- v-if="scope.row.auditStatus === 2"-->
<!-- @click.native.stop="rejectInfo(scope.row)"-->
<!-- >说明-->
<!-- </el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
<template v-for="(item, index) in tableHeader">
<el-table-column
v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
type="index" :label="item.columnDesc"></el-table-column>
<el-table-column
v-if="item.columnType == 'selection'"
type="selection"
:width="item.width"
:selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
></el-table-column>
<el-table-column
v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
<span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
</el-tag>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:width="item.width"
:key="item.columnName"
fixed="right"
>
<template slot-scope="scope">
<el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
:type="buttonItem.type"
:size="buttonItem.size"
:style="buttonItem.style"
:key="buttonItem"
v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
:disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
@click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
>{{ buttonItem.name }}
</el-button>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
</template>
</el-table-column>
</template>
</el-table>
<pagination
@ -166,56 +337,139 @@
v-show="showSearch2"
label-width="100px"
>
<el-row>
<el-col span="6">
<el-form-item label="物资名称:">
<!-- <el-row>-->
<!-- <el-col span="6">-->
<!-- <el-form-item label="物资名称:">-->
<!-- <el-input-->
<!-- v-model="registrationQuery.recordProductName"-->
<!-- style="width: 90%"-->
<!-- clearable-->
<!-- placeholder="物资名称"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col span="6">-->
<!-- <el-form-item label="注册备案号:">-->
<!-- <el-input-->
<!-- v-model="registrationQuery.recordCode"-->
<!-- style="width: 90%"-->
<!-- clearable-->
<!-- placeholder="注册备案号"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col span="6">-->
<!-- <el-form-item label="注册备案人:">-->
<!-- <el-input-->
<!-- v-model="registrationQuery.recordPeopleName"-->
<!-- style="width: 90%"-->
<!-- clearable-->
<!-- placeholder="注册备案人"-->
<!-- ></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-row style=" display:flex; flex-wrap: wrap; ">
<template v-for="(item, index) in queryList2" >
<el-form-item v-if="item.columnType == 'input' && item.columnName !='queryName' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
<el-input
v-model="registrationQuery.recordProductName"
style="width: 90%"
v-model="registrationQuery[item.columnName]"
:placeholder="item.columnDesc"
:disabled="executeEval(null,item.disabledFuc,false)"
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
clearable
placeholder="物资名称"
></el-input>
</el-form-item>
</el-col>
<el-col span="6">
<el-form-item label="注册备案号:">
<el-input
v-model="registrationQuery.recordCode"
<el-form-item v-if="item.columnType == 'input' && item.columnName =='queryName' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
<el-autocomplete
class="inline-input"
style="width: 90%"
v-model="queryName"
:fetch-suggestions="queryProductName"
placeholder="请输入内容"
clearable
placeholder="注册备案号"
></el-input>
@select="handleSelect"
@clear="clearQueryProduct"
></el-autocomplete>
</el-form-item>
</el-col>
<el-col span="6">
<el-form-item label="注册备案人:">
<el-input
v-model="registrationQuery.recordPeopleName"
style="width: 90%"
clearable
placeholder="注册备案人"
></el-input>
<el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<el-select v-model="registrationQuery[item.columnName]"
:placeholder="item.columnDesc"
@change="executeFuc($event,'5',item.checkRules)"
:disabled="executeEval(null,item.disabledFuc,false)"
clearable>
<el-option
v-for="dict in item.lableRuleObj"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
<span style="float: left">{{ item.name }}</span>
<span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
</el-select>
</el-form-item>
<el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<el-select
v-model="registrationQuery[item.columnName]"
:placeholder="item.columnDesc"
:disabled="executeEval(null,item.disabledFuc,false)"
filterable
remote
@change="executeFuc($event,'5',item.checkRules)"
:remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
clearable>
<el-option
v-for="item in options[item.clickFuc]"
:key="item.code"
:label="item.label"
:value="item.code"
/>
<span style="float: left">{{ item.name }}</span>
<span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
</el-select>
</el-form-item>
<el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<el-date-picker
:picker-options="pickerOptions"
v-model="actDateRange"
type="daterange"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
</el-col>
<el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<el-date-picker
v-model="registrationQuery[item.columnName]"
:style="`width:${item.width+'px'}`"
value-format="yyyy-MM-dd"
:disabled="executeEval(null,item.disabledFuc,false)"
type="date"
:placeholder="item.columnDesc"
></el-date-picker>
</el-form-item>
</template>
</el-row>
</el-form>
<div class="top-right-btn">
<el-button-group style="display: flex">
<el-button icon="el-icon-view" type="primary" @click="hideSearch2"
>显示/隐藏搜索栏</el-button
>显示/隐藏搜索栏</el-button
>
<el-button type="primary" icon="el-icon-refresh" @click="onReset2"
>重置</el-button
>重置</el-button
>
<el-button type="primary" icon="el-icon-search" @click="onSubmit2"
>查询</el-button
>查询</el-button
>
<el-button
type="primary"
icon="el-icon-plus"
@click="registrationDialog()"
>添加</el-button
>添加</el-button
>
</el-button-group>
</div>
@ -228,61 +482,148 @@
border
highlight-current-row
>
<el-table-column type="index" label="序号" width="50"></el-table-column>
<el-table-column
label="注册/备案产品名称"
prop="recordProductName"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="规格型号"
prop="ggxh"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="注册/备案号"
prop="recordCode"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="注册/备案人名称"
prop="recordPeopleName"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="生产企业/代理人"
prop="manufacturerName"
show-overflow-tooltip
></el-table-column>
<el-table-column
label="所属供应商"
prop="supName"
show-overflow-tooltip
></el-table-column>
<el-table-column label="审核状态" prop="auditStatus" width="120">
<template slot-scope="scope">
<el-tag :type="scope.row.auditStatus | statusFilterType">
{{ checkFlag[scope.row.auditStatus] }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" width="120">
<template slot-scope="scope">
<el-button
type="text"
size="small"
@click.native.stop="registrationDialog(scope.row)"
>编辑</el-button
>
<el-button
type="text"
size="small"
:disabled="scope.row.auditStatus === 1"
@click.native="deleteRegistration(scope.row)"
>删除
</el-button>
</template>
</el-table-column>
<!-- <el-table-column type="index" label="序号" width="50"></el-table-column>-->
<!-- <el-table-column-->
<!-- label="注册/备案产品名称"-->
<!-- prop="recordProductName"-->
<!-- show-overflow-tooltip-->
<!-- ></el-table-column>-->
<!-- <el-table-column-->
<!-- label="规格型号"-->
<!-- prop="ggxh"-->
<!-- show-overflow-tooltip-->
<!-- ></el-table-column>-->
<!-- <el-table-column-->
<!-- label="注册/备案号"-->
<!-- prop="recordCode"-->
<!-- show-overflow-tooltip-->
<!-- ></el-table-column>-->
<!-- <el-table-column-->
<!-- label="注册/备案人名称"-->
<!-- prop="recordPeopleName"-->
<!-- show-overflow-tooltip-->
<!-- ></el-table-column>-->
<!-- <el-table-column-->
<!-- label="生产企业"-->
<!-- prop="manufacturerName"-->
<!-- show-overflow-tooltip-->
<!-- ></el-table-column>-->
<!-- <el-table-column-->
<!-- label="所属供应商"-->
<!-- prop="supName"-->
<!-- show-overflow-tooltip-->
<!-- ></el-table-column>-->
<!-- <el-table-column label="审核状态" prop="auditStatus" width="120">-->
<!-- <template slot-scope="scope">-->
<!-- <el-tag :type="scope.row.auditStatus | statusFilterType">-->
<!-- {{ checkFlag[scope.row.auditStatus] }}-->
<!-- </el-tag>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="操作" width="120">-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- @click.native.stop="registrationDialog(scope.row)"-->
<!-- >编辑</el-button-->
<!-- >-->
<!-- <el-button-->
<!-- type="text"-->
<!-- size="small"-->
<!-- :disabled="scope.row.auditStatus === 1"-->
<!-- @click.native="deleteRegistration(scope.row)"-->
<!-- >删除-->
<!-- </el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
<template v-for="(item, index) in tableHeader">
<el-table-column
v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
type="index" :label="item.columnDesc"></el-table-column>
<el-table-column
v-if="item.columnType == 'selection'"
type="selection"
:width="item.width"
:selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
></el-table-column>
<el-table-column
v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
<span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
</el-tag>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:width="item.width"
:key="item.columnName"
fixed="right"
>
<template slot-scope="scope">
<el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
:type="buttonItem.type"
:size="buttonItem.size"
:style="buttonItem.style"
:key="buttonItem"
v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
:disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
@click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
>{{ buttonItem.name }}
</el-button>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
</template>
</el-table-column>
</template>
</el-table>
<pagination
@ -325,6 +666,9 @@ import {
deleteRegistration,
} from "../../../api/purchase/suppliersRegistrationBasic";
import suppliersRegistrationBasic from "@/views/purchase/product/supProductEditDialog";
import {
getHead,executeFuc
} from "@/utils/customConfig";
export default {
name: "supCertificationAdd",
@ -390,6 +734,14 @@ export default {
},
registrationList: [],
certTotal: 0,
tableHeader:[],
queryList:[],
fromList:[],
tableHeader2:[],
queryList2:[],
fromList2:[],
options: {
},
registrationLoading: false,
registrationId: "",
@ -480,20 +832,23 @@ export default {
hideSearch2() {
this.showSearch2 = !this.showSearch2;
},
addInfoDialog(row) {
if (this.$isNotBlank(row)) {
this.enterpriseId = row.id;
this.editType = 1;
this.inputQuery = row;
addInfoDialog(_this,row) {
if(_this == null){
_this = this
}
if (_this.$isNotBlank(row)) {
_this.enterpriseId = row.id;
_this.editType = 1;
_this.inputQuery = row;
} else {
this.enterpriseId = null;
this.editType = 0;
this.inputQuery = {
_this.enterpriseId = null;
_this.editType = 0;
_this.inputQuery = {
auditStatus: 0,
};
}
this.addInfoVisible = true;
_this.addInfoVisible = true;
},
closeDialog(type) {
this.addInfoVisible = false;
@ -517,16 +872,16 @@ export default {
console.log(this.check);
},
rejectInfo(row) {
this.$confirm(row.auditComment, "驳回说明", {
rejectInfo(_this,row) {
_this.$confirm(row.auditComment, "驳回说明", {
confirmButtonText: "确定",
type: "warning",
showCancelButton: false,
}).then(() => {});
},
deleteDialog(row) {
this.$confirm("删除后将清空该生产企业以及所有关联信息?", "提示", {
deleteDialog(_this,row) {
_this.$confirm("删除后将清空该生产企业以及所有关联信息?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
@ -536,17 +891,17 @@ export default {
id: row.id,
};
deleteCompany(tQuery).then(() => {
this.getList();
_this.getList();
});
})
.catch(() => {});
},
supManufacturerClick(row) {
this.registrationQuery.customerId = row.customerId;
this.registrationQuery.manufacturerIdFk = row.manufacturerId;
this.getRegistrationList();
this.currentManufacturer = row;
supManufacturerClick(_this,row) {
_this.registrationQuery.customerId = row.customerId;
_this.registrationQuery.manufacturerIdFk = row.manufacturerId;
_this.getRegistrationList();
_this.currentManufacturer = row;
},
/**---------------------------配送产品资质----------------------*/
@ -575,39 +930,42 @@ export default {
this.registrationQuery.page = 1;
this.getRegistrationList();
},
registrationDialog(row) {
if (this.currentManufacturer == null) {
this.$message.error("请先选中生产企业！");
registrationDialog(_this,row) {
if(_this == null){
_this = this
}
if (_this.currentManufacturer == null) {
_this.$message.error("请先选中生产企业！");
return;
}
if (this.$isNotBlank(row)) {
this.registrationId = row.id;
this.curProductQuery = row;
this.curProductQuery.cuStatus = this.currentManufacturer.auditStatus;
this.curProductQuery.manufacturerId =
this.registrationQuery.manufacturerIdFk;
this.formName = "update";
this.editProductType = 1;
if (_this.$isNotBlank(row)) {
_this.registrationId = row.id;
_this.curProductQuery = row;
_this.curProductQuery.cuStatus = _this.currentManufacturer.auditStatus;
_this.curProductQuery.manufacturerId =
_this.registrationQuery.manufacturerIdFk;
_this.formName = "update";
_this.editProductType = 1;
} else {
this.editProductType = 0;
this.formName = "add";
this.curProductQuery = {
_this.editProductType = 0;
_this.formName = "add";
_this.curProductQuery = {
auditStatus: 0,
cuStatus: this.currentManufacturer.auditStatus,
manufacturerId: this.registrationQuery.manufacturerIdFk,
cuStatus: _this.currentManufacturer.auditStatus,
manufacturerId: _this.registrationQuery.manufacturerIdFk,
};
}
this.registrationVisible = true;
_this.registrationVisible = true;
},
deleteRegistration(row) {
this.$confirm("是否删除?", "提示", {
deleteRegistration(_this,row) {
_this.$confirm("是否删除?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.certLoading = true;
_this.certLoading = true;
let tQuery = {
id: row.id,
filePath: row.filePath,
@ -615,19 +973,19 @@ export default {
};
deleteRegistration(tQuery)
.then((response) => {
this.certLoading = false;
_this.certLoading = false;
if (response.code === 20000) {
this.getRegistrationList();
this.$message({
_this.getRegistrationList();
_this.$message({
type: "success",
message: "删除成功！",
});
} else {
this.$message.error(response.message);
_this.$message.error(response.message);
}
})
.catch(() => {
this.certLoading = false;
_this.certLoading = false;
});
})
.catch(() => {});
@ -659,6 +1017,15 @@ export default {
this.registrationQuery.page = val.page;
this.getRegistrationList();
},
executeFuc(row,type,clickFuc,value){
return executeFuc(this,row,type,clickFuc,value);
},
executeEval(row,expression,defaultRet){
if(expression){
return eval(expression);
}
return defaultRet;
}
},
components: {
suppliersEnterpriseBasicAdd,
@ -668,7 +1035,21 @@ export default {
created() {
this.fileUrl =
this.BASE_URL + "/udiwms/image/register/file/getImage?type=image4&name=";
this.getList();
getHead("supCertificationAdd-1","1").then((re) => {
// 处理返回的数据
this.tableObj = re.data;
this.tableHeader = re.data.tableList;
this.queryList = re.data.queryList;
this.fromList = re.data.fromList;
this.getList();
});
getHead("supCertificationAdd-2","1").then((re) => {
// 处理返回的数据
this.tableObj2 = re.data;
this.tableHeader2 = re.data.tableList;
this.queryList2 = re.data.queryList;
this.fromList2 = re.data.fromList;
});
// this.getRegistrationList();
},
};

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

@ -1,279 +1,461 @@
<template>
<div>
<el-card>
<el-form :model="filterQuery" size="mini" label-width="120px" v-show="showSearch">
<el-row>
<el-col :span="6">
<el-form-item label="物资编码:">
<el-input v-model="filterQuery.unionCode" style="width: 90%" placeholder="请输入产品编码"
clearable="true"></el-input>
<el-form v-if="queryList && queryList.length > 0" :model="filterQuery" size="mini" label-width="120px" v-show="showSearch">
<!-- <el-row>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="物资编码:">-->
<!-- <el-input v-model="filterQuery.unionCode" style="width: 90%" placeholder="请输入产品编码"-->
<!-- 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-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="规格型号:">-->
<!-- <el-input v-model="filterQuery.ggxh" style="width: 90%" placeholder="请输入规格型号" clearable="true"></el-input>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="对照条件:">-->
<!-- <el-select v-model="filterQuery.filterType" style="width: 90%" placeholder="请选择过滤对照条件">-->
<!-- <el-option-->
<!-- v-for="item in filterList"-->
<!-- :key="item.filterType"-->
<!-- :label="item.sysName"-->
<!-- :value="item.filterType">-->
<!-- <span style="float: left">{{ item.sysName }}</span>-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<!-- <el-row>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="生产企业:">-->
<!-- <el-input v-model="filterQuery.ylqxzcrbarmc" style="width: 90%" placeholder="请输入生产企业/注册备案人"-->
<!-- clearable="true"></el-input>-->
<!-- </el-form-item>-->
<!-- </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-form-item>-->
<!-- </el-col>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="审核状态:" v-if="isSpCombine">-->
<!-- <el-select v-model="filterQuery.lockStatus" style="width: 90%" placeholder="请选择审核状态">-->
<!-- <el-option label="全部" value=""></el-option>-->
<!-- <el-option label="未提交" value="1"></el-option>-->
<!-- <el-option label="已提交" value="2"></el-option>-->
<!-- <el-option label="已锁定" value="3"></el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-row style=" display:flex; flex-wrap: wrap; ">
<template v-for="(item, index) in queryList" >
<el-form-item v-if="item.columnType == 'input' && item.columnName !='queryName' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
<el-input
v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc"
:disabled="executeEval(null,item.disabledFuc,false)"
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
clearable
></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-form-item v-if="item.columnType == 'input' && item.columnName =='queryName' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
<el-autocomplete
class="inline-input"
style="width: 90%"
v-model="queryName"
:fetch-suggestions="queryProductName"
placeholder="请输入内容"
clearable
@select="handleSelect"
@clear="clearQueryProduct"
></el-autocomplete>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="规格型号:">
<el-input v-model="filterQuery.ggxh" style="width: 90%" placeholder="请输入规格型号" clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="对照条件:">
<el-select v-model="filterQuery.filterType" style="width: 90%" placeholder="请选择过滤对照条件">
<el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<el-select v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc"
@change="executeFuc($event,'5',item.checkRules)"
:disabled="executeEval(null,item.disabledFuc,false)"
clearable>
<el-option
v-for="item in filterList"
:key="item.filterType"
:label="item.sysName"
:value="item.filterType">
<span style="float: left">{{ item.sysName }}</span>
</el-option>
v-for="dict in item.lableRuleObj"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
<span style="float: left">{{ item.name }}</span>
<span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="6">
<el-form-item label="生产企业:">
<el-input v-model="filterQuery.ylqxzcrbarmc" style="width: 90%" placeholder="请输入生产企业/注册备案人"
clearable="true"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="生产企业:">
<el-input v-model="filterQuery.zczbhhzbapzbh" style="width: 90%" placeholder="请输入生产企业/注册备案人"
clearable="true"></el-input>
<el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<el-select
v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc"
:disabled="executeEval(null,item.disabledFuc,false)"
filterable
remote
@change="executeFuc($event,'5',item.checkRules)"
:remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
clearable>
<el-option
v-for="item in options[item.clickFuc]"
:key="item.code"
:label="item.label"
:value="item.code"
/>
<span style="float: left">{{ item.name }}</span>
<span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
</el-select>
</el-form-item>
</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-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<el-date-picker
:picker-options="pickerOptions"
v-model="actDateRange"
type="daterange"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="审核状态:" v-if="isSpCombine">
<el-select v-model="filterQuery.lockStatus" style="width: 90%" placeholder="请选择审核状态">
<el-option label="全部" value=""></el-option>
<el-option label="未提交" value="1"></el-option>
<el-option label="已提交" value="2"></el-option>
<el-option label="已锁定" value="3"></el-option>
</el-select>
<el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<el-date-picker
v-model="filterQuery[item.columnName]"
:style="`width:${item.width+'px'}`"
value-format="yyyy-MM-dd"
:disabled="executeEval(null,item.disabledFuc,false)"
type="date"
:placeholder="item.columnDesc"
></el-date-picker>
</el-form-item>
</el-col>
</el-row>
</el-form>
<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-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-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>
<el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>
<el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
<el-table-column label="价格" prop="price" show-overflow-tooltip></el-table-column>
<el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
<el-table-column label="物资分类" prop="classifyName" show-overflow-tooltip></el-table-column>
<el-table-column v-if="isSpCombine" label="锁定状态" prop="lockStatus" show-overflow-tooltip>
<template slot-scope="scope">
{{ lockStatusMap[scope.row.lockStatus] }}
</template>
</el-table-column>
<el-table-column width="180" label="操作" fixed="right">
<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 type="text" size="small" :disabled="scope.row.lockStatus==3"
@click.native.stop="handleModifyClick(scope.row)">编辑
</el-button>
<el-button type="text" size="small"
@click.native.stop="handleDetailClick(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>
<pagination
v-show="total>0"
:total="total"
:limit.sync="filterQuery.limit"
:page.sync="filterQuery.page"
@pagination="handleCurrentChange"
></pagination>
<el-dialog
title="产品信息编辑"
:visible.sync="editDialogVisible"
width="80%"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="editDialogVisible"
:before-close="refresh"
>
<basicProductEdit
:productRemarkSet="productRemarkSet"
:editQuery="editQuery"
:closeDialog="closeDialog">
</basicProductEdit>
</el-dialog>
<el-dialog
title="产品信息详情"
:visible.sync="detailDialogVisible"
width="70%"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="detailDialogVisible"
>
<basicProductDetail
:productRemarkSet="productRemarkSet"
:editQuery="editQuery"
:closeDialog="closeDialog">
>
</basicProductDetail>
</el-dialog>
<el-dialog
title="关联选入耗材信息"
:visible.sync="selectUdiDialogVisible"
width="85%"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="selectUdiDialogVisible"
>
<selectUdi @closeUdi="closeUdi" :isImportUdi="isImportUdi"></selectUdi>
</el-dialog>
<el-dialog
:title="selectErpTitle"
:visible.sync="selectErpDialogVisible"
width="85%"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="selectErpDialogVisible"
>
<selectErp
:closeDialog="closeDialog"
:uuid="uuid"
:relId="relId"
:intentThirdId="intentThirdId"
:isImport="isImport"
:data="thisData"
:defaultSys="defaultSys"
@closeUdi="closeUdi"
:supEnable="true"
></selectErp>
</el-dialog>
<el-dialog
title="选入DI器械信息"
:visible.sync="selectLocalVisible"
width="85%"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="selectLocalVisible"
>
<selectLocalUdi
:closeDialog="closeDialog"
:relId="relId"
:thirdId="thirdId"
:idSpliUdi="idSpliUdi"
:isImportUdi="isImportUdi"
:data="thisData"
@closeUdi="closeUdi"
></selectLocalUdi>
</el-dialog>
<el-dialog
title="选入物资字典信息"
:visible.sync="selectProductVisible"
width="85%"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="selectProductVisible"
>
<selectProduct
:closeSelDialog="closeSelDialog"
:uuid="uuid"
></selectProduct>
</el-dialog>
<el-dialog
:close-on-click-modal="false"
:close-on-press-escape="false"
title="新增配送产品"
:visible.sync="addProductVisible"
width="85%"
v-if="addProductVisible"
@close="closeAddDialog"
>
<ThrProductsAdd
:closeAddDialog="closeAddDialog"
:newType="newType"></ThrProductsAdd>
</el-dialog>
<el-dialog
title="选择DI版本"
:visible.sync="selectVersionVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="85%"
v-if="selectVersionVisible"
</template>
</el-row>
</el-form>
<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-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-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>-->
<!-- <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>-->
<!-- <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>-->
<!-- <el-table-column label="价格" prop="price" show-overflow-tooltip></el-table-column>-->
<!-- <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>-->
<!-- <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>-->
<!-- <el-table-column label="物资分类" prop="classifyName" show-overflow-tooltip></el-table-column>-->
<!-- <el-table-column v-if="isSpCombine" label="锁定状态" prop="lockStatus" show-overflow-tooltip>-->
<!-- <template slot-scope="scope">-->
<!-- {{ lockStatusMap[scope.row.lockStatus] }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column width="180" label="操作" fixed="right">-->
<!-- <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 type="text" size="small" :disabled="scope.row.lockStatus==3"-->
<!-- @click.native.stop="handleModifyClick(scope.row)">编辑-->
<!-- </el-button>-->
<!-- <el-button type="text" size="small"-->
<!-- @click.native.stop="handleDetailClick(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&#45;&#45;right"></i>更多-->
<!-- </span>-->
<!-- <el-dropdown-menu slot="dropdown">-->
<!-- &lt;!&ndash; <el-dropdown-item command="handleDetailClick" v-if=" scope.row.lockStatus!=3">详情</el-dropdown-item>&ndash;&gt;-->
<!-- <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>-->
<!-- &lt;!&ndash; <el-button v-if=" scope.row.lockStatus!=3" type="text" size="small"&ndash;&gt;-->
<!-- &lt;!&ndash; @click.native.stop="handleDetailClick(scope.row)">详情&ndash;&gt;-->
<!-- &lt;!&ndash; </el-button>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-button v-if="isSpCombine" type="text" size="small" :disabled="scope.row.lockStatus===3"&ndash;&gt;-->
<!-- &lt;!&ndash; @click.native.stop="sumitLockStatus(scope.row)">提交审核&ndash;&gt;-->
<!-- &lt;!&ndash; </el-button>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-button v-if="isSpCombine" type="text" size="small" @click.native.stop="splitSelectUdi(scope.row)"&ndash;&gt;-->
<!-- &lt;!&ndash; :disabled="scope.row.thirdId===scope.row.nameCode || scope.row.thirdId==null || scope.row.nameCode==null || scope.row.lockStatus===3">&ndash;&gt;-->
<!-- &lt;!&ndash; 拆分产品&ndash;&gt;-->
<!-- &lt;!&ndash; </el-button>&ndash;&gt;-->
<!-- &lt;!&ndash; <el-button type="text" size="small" @click.native.stop="deleteCompanyProductRelevance(scope.row)">移除&ndash;&gt;-->
<!-- &lt;!&ndash; </el-button>&ndash;&gt;-->
<!-- </template>-->
<!-- </el-table-column>-->
<template v-for="(item, index) in tableHeader">
<el-table-column
v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
type="index" :label="item.columnDesc"></el-table-column>
<el-table-column
v-if="item.columnType == 'selection'"
type="selection"
:width="item.width"
:selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
></el-table-column>
<el-table-column
v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
<span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
</el-tag>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:width="item.width"
:key="item.columnName"
fixed="right"
>
<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 type="text" size="small" :disabled="scope.row.lockStatus==3"
@click.native.stop="handleModifyClick(scope.row)">编辑
</el-button>
<el-button type="text" size="small"
@click.native.stop="handleDetailClick(scope.row)">详情
</el-button>
<el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"
>
<selectUdiVersion
:closeDialog="closeDialog"
:relId="relId"
:uuid="uuid"
:originUuid="originUuid"
@closeUdi="closeUdi"
></selectUdiVersion>
</el-dialog>
</el-card>
</div>
<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>
</template>
</el-table-column>
<el-table-column
v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
</template>
</el-table-column>
</template>
</el-table>
<pagination
v-show="total>0"
:total="total"
:limit.sync="filterQuery.limit"
:page.sync="filterQuery.page"
@pagination="handleCurrentChange"
></pagination>
<el-dialog
title="产品信息编辑"
:visible.sync="editDialogVisible"
width="80%"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="editDialogVisible"
:before-close="refresh"
>
<basicProductEdit
:productRemarkSet="productRemarkSet"
:editQuery="editQuery"
:closeDialog="closeDialog">
</basicProductEdit>
</el-dialog>
<el-dialog
title="产品信息详情"
:visible.sync="detailDialogVisible"
width="70%"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="detailDialogVisible"
>
<basicProductDetail
:productRemarkSet="productRemarkSet"
:editQuery="editQuery"
:closeDialog="closeDialog">
>
</basicProductDetail>
</el-dialog>
<el-dialog
title="关联选入耗材信息"
:visible.sync="selectUdiDialogVisible"
width="85%"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="selectUdiDialogVisible"
>
<selectUdi @closeUdi="closeUdi" :isImportUdi="isImportUdi"></selectUdi>
</el-dialog>
<el-dialog
:title="selectErpTitle"
:visible.sync="selectErpDialogVisible"
width="85%"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="selectErpDialogVisible"
>
<selectErp
:closeDialog="closeDialog"
:uuid="uuid"
:relId="relId"
:intentThirdId="intentThirdId"
:isImport="isImport"
:data="thisData"
:defaultSys="defaultSys"
@closeUdi="closeUdi"
:supEnable="true"
></selectErp>
</el-dialog>
<el-dialog
title="选入DI器械信息"
:visible.sync="selectLocalVisible"
width="85%"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="selectLocalVisible"
>
<selectLocalUdi
:closeDialog="closeDialog"
:relId="relId"
:thirdId="thirdId"
:idSpliUdi="idSpliUdi"
:isImportUdi="isImportUdi"
:data="thisData"
@closeUdi="closeUdi"
></selectLocalUdi>
</el-dialog>
<el-dialog
title="选入物资字典信息"
:visible.sync="selectProductVisible"
width="85%"
:close-on-click-modal="false"
:close-on-press-escape="false"
v-if="selectProductVisible"
>
<selectProduct
:closeSelDialog="closeSelDialog"
:uuid="uuid"
></selectProduct>
</el-dialog>
<el-dialog
:close-on-click-modal="false"
:close-on-press-escape="false"
title="新增配送产品"
:visible.sync="addProductVisible"
width="85%"
v-if="addProductVisible"
@close="closeAddDialog"
>
<ThrProductsAdd
:closeAddDialog="closeAddDialog"
:newType="newType"></ThrProductsAdd>
</el-dialog>
<el-dialog
title="选择DI版本"
:visible.sync="selectVersionVisible"
:close-on-click-modal="false"
:close-on-press-escape="false"
width="85%"
v-if="selectVersionVisible"
>
<selectUdiVersion
:closeDialog="closeDialog"
:relId="relId"
:uuid="uuid"
:originUuid="originUuid"
@closeUdi="closeUdi"
></selectUdiVersion>
</el-dialog>
</el-card>
</div>
</template>
<script>
@ -283,7 +465,7 @@ import {
updateErpProduct,
uploadSmp,
thirdSysDetail,
removeRl, sysFilter, spcombie, lockStatus, removeDiRl
removeRl, sysFilterOptimize , spcombie, lockStatus, removeDiRl
} from "../../../api/basic/udiRelevance";
import store from "../../../store/index";
import {
@ -301,7 +483,9 @@ import ThrProductsAdd from "@/views/supplier/company/ThrProductsAdd";
import selectUdiVersion from "@/views/basic/product/UdiinfoSelectVersion";
import basicProductEdit from "@/views/supplier/company/basicCompanyproductEdit";
import basicProductDetail from "@/views/supplier/company/basicCompanyproductDetail"
import {
getHead,executeFuc
} from "@/utils/customConfig";
export default {
data() {
@ -337,6 +521,13 @@ export default {
pId: null,
},
pId: 0,
tableHeader:[],
queryList:[],
fromList:[],
options: {
getSysFilter:[]
},
productType: null,
defaultSys: null,
isImport: false,
@ -763,11 +954,11 @@ export default {
this.sysList = [];
});
},
getSysFilter() {
sysFilter()
getSysFilter(_this) {
sysFilterOptimize()
.then((response) => {
this.loading = false;
this.filterList = response.data.list || [];
_this.loading = false;
_this.options.getSysFilter = response.data.list || [];
})
.catch(() => {
this.loading = false;
@ -888,7 +1079,15 @@ export default {
}
});
},
executeFuc(row,type,clickFuc,value){
return executeFuc(this,row,type,clickFuc,value);
},
executeEval(row,expression,defaultRet){
if(expression){
return eval(expression);
}
return defaultRet;
}
}
,
mounted() {
@ -907,9 +1106,17 @@ export default {
,
created() {
this.findBasicProductSet();
this.getList();
getHead("basicCompanyProducts","1").then((re) => {
// 处理返回的数据
this.tableObj = re.data;
this.tableHeader = re.data.tableList;
this.queryList = re.data.queryList;
this.fromList = re.data.fromList;
this.getList();
});
this.selectSysParam();
this.getSysFilter();
this.getSysFilter(this);
}
,
}

Write Preview
Loading…
Cancel
Save