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> <template>
<div> <div>
<el-card class="el-card"> <el-card class="el-card">
<el-form :model="query" label-width="100px" v-show="showSearch"> <el-form v-if="queryList && queryList.length > 0" :model="query" label-width="100px" v-show="showSearch">
<el-row style="width: 100%"> <!-- <el-row style="width: 100%">-->
<el-col :span="8"> <!-- <el-col :span="8">-->
<el-form-item label="单号:"> <!-- <el-form-item label="单号:">-->
<el-input v-model="query.billNo" style="width: 90%" placeholder="请输入单号" clearable></el-input> <!-- <el-input v-model="query.billNo" style="width: 90%" placeholder="请输入单号" clearable></el-input>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </el-col>-->
<el-col :span="8"> <!-- <el-col :span="8">-->
<el-form-item label="打印状态：" prop="inCodeStatus" clearable> <!-- <el-form-item label="打印状态：" prop="inCodeStatus" clearable>-->
<el-select v-model="query.inCodeStatus" style="width: 90%"> <!-- <el-select v-model="query.inCodeStatus" style="width: 90%">-->
<el-option label="未打印" :value="0"></el-option> <!-- <el-option label="未打印" :value="0"></el-option>-->
<el-option label="已打印" :value="1"></el-option> <!-- <el-option label="已打印" :value="1"></el-option>-->
</el-select> <!-- </el-select>-->
</el-form-item> <!-- </el-form-item>-->
</el-col> <!-- </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-row>-->
<!-- <el-form-item label="送货单位:">--> <!-- <el-col :span="8">-->
<!-- <el-input v-model="query.corpName" style="width: 90%" placeholder="请输入送货单位" clearable></el-input>--> <!-- <el-form-item label="单据状态:">-->
<!-- </el-form-item>--> <!-- <el-select v-model="query.status" placeholder="请选择单据状态" style="width: 90%">-->
<!-- </el-col>--> <!-- <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-col :span="8">-->
<el-select v-model="query.action" placeholder="请选择单据类型" <!-- <el-form-item label="创建时间:">-->
style="width: 90%" <!-- <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> clearable>
<el-option <el-option
v-for="item in busTypes" v-for="dict in item.lableRuleObj"
:key="item.name" :key="dict.value"
:label="item.name" :label="dict.label"
:value="item.action"> :value="dict.value"
<span style="float: left">{{ item.name }}</span> />
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
</el-row> <el-select
v-model="query[item.columnName]"
<el-row> :placeholder="item.columnDesc"
<el-col :span="8"> @change="executeFuc($event,'5',item.checkRules)"
<el-form-item label="单据状态:"> :disabled="executeEval(null,item.disabledFuc,false)"
<el-select v-model="query.status" placeholder="请选择单据状态" style="width: 90%"> filterable
<el-option label="草稿" :value=1>草稿</el-option> remote
<el-option label="待校验" :value=3>待校验</el-option> :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
<el-option label="待核对" :value=5>待核对</el-option> clearable>
<el-option
v-for="item in options[item.clickFuc]"
:key="item.code"
:label="item.label"
:value="item.code"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<el-col :span="8">
<el-form-item label="创建时间:">
<el-date-picker <el-date-picker
:picker-options="pickerOptions" :picker-options="pickerOptions"
v-model="actDateRange" v-model="actDateRange"
type="daterange" type="daterange"
format="yyyy 年 MM 月 dd 日" format="yyyy 年 MM 月 dd 日"
style="width: 90%"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
> ></el-date-picker>
</el-date-picker>
</el-form-item> </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-row>
</el-form> </el-form>
@ -85,43 +150,130 @@
<el-table v-loading="loading" :data="list" style="width: 100%;" border highlight-current-row <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" :default-sort="defaultSort"
@sort-change="handleSortChange"> @sort-change="handleSortChange" >
<el-table-column type="selection" width="55"> <!-- <el-table-column type="selection" width="55">-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column type="index" label="序号" width="50"></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="billNo" width="140" show-overflow-tooltip></el-table-column>-->
<el-table-column label="单据类型" prop="billTypeName" width="120"> <!-- <el-table-column label="单据类型" prop="billTypeName" width="120">-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="创建时间" prop="createTime" width="150" <!-- <el-table-column label="创建时间" prop="createTime" width="150"-->
sortable="custom" <!-- sortable="custom"-->
:sort-orders="['ascending', 'descending']"></el-table-column> <!-- :sort-orders="['ascending', 'descending']"></el-table-column>-->
<el-table-column label="打印状态" width="100" prop="inCodeStatus"> <!-- <el-table-column label="打印状态" width="100" prop="inCodeStatus">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<span>{{ enableMap[scope.row.inCodeStatus] }}</span> <!-- <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> </template>
</el-table-column> </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>
<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>
<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"> <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> </template>
</el-table-column> </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"> <template slot-scope="scope">
<el-button <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
type="text"
size="small"
@click.native="qrcodeDetail(scope.row)"
>内部码
</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</template>
</el-table> </el-table>
<pagination <pagination
@ -136,25 +288,125 @@
<el-card class="el-card"> <el-card class="el-card">
<el-table v-loading="detailLoading" :data="detailList" style="width: 100%" border> <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 type="index" label="序号" width="50"></el-table-column>-->
<el-table-column label="物资名称" prop="coName"></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="spec"></el-table-column>-->
<el-table-column label="批次号" prop="batchNo"></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="count"></el-table-column>-->
<!-- <el-table-column label="实际数量" prop="scanCount"></el-table-column>--> <!-- &lt;!&ndash; <el-table-column label="实际数量" prop="scanCount"></el-table-column>&ndash;&gt;-->
<el-table-column label="生产日期" prop="productDate"> <!-- <el-table-column label="生产日期" prop="productDate">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<span>{{ convertDateFun(scope.row.productDate) }}</span> <!-- <span>{{ convertDateFun(scope.row.productDate) }}</span>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="失效日期" prop="expireDate"> <!-- <el-table-column label="失效日期" prop="expireDate">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<span>{{ convertDateFun(scope.row.expireDate) }}</span> <!-- <span>{{ convertDateFun(scope.row.expireDate) }}</span>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="价格" prop="price"></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="ylqxzcrbarmc"></el-table-column>-->
<el-table-column label="注册/备案号" prop="certCode"></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> </el-table>
<pagination <pagination
@ -203,7 +455,10 @@ import {filterAll, filterAllByUser} from "@/api/system/invWarehouse";
import {filterSubByInv, findInvByUser} from '@/api/system/invSubWarehouse' import {filterSubByInv, findInvByUser} from '@/api/system/invSubWarehouse'
import {convertDate} from "@/utils/date" import {convertDate} from "@/utils/date"
import {filterOrder} from "@/api/inout/order"; 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 { export default {
name: "stockOrder", name: "stockOrder",
@ -225,7 +480,7 @@ export default {
limit: 10, limit: 10,
startTime: "", startTime: "",
endTime: "", endTime: "",
inCodeStatus: 0, inCodeStatus: "0",
}, },
detailQuery: { detailQuery: {
orderIdFk: "", orderIdFk: "",
@ -239,6 +494,15 @@ export default {
list: [], list: [],
detailList: [], detailList: [],
total: 0, total: 0,
tableHeader:[],
queryList:[],
fromList:[],
tableHeader2:[],
queryList2:[],
fromList2:[],
options: {
getBusType:[]
},
detailTotal: 0, detailTotal: 0,
loading: false, loading: false,
detailLoading: false, detailLoading: false,
@ -342,7 +606,7 @@ export default {
limit: 10, limit: 10,
startTime: "", startTime: "",
endTime: "", endTime: "",
inCodeStatus: 0, inCodeStatus: "0",
}; };
this.getList(); this.getList();
@ -440,44 +704,44 @@ export default {
}, },
qrcodeDetail(row) { qrcodeDetail(_this,row) {
this.idQuery.id = ''; _this.idQuery.id = '';
if (this.$isNotBlank(row.id)) { if (_this.$isNotBlank(row.id)) {
this.idQuery.id = row.id; _this.idQuery.id = row.id;
this.idQuery.formData = row; _this.idQuery.formData = row;
this.idQuery.filterUDIType = this.filterUDIType; _this.idQuery.filterUDIType = _this.filterUDIType;
this.qrcodeDetailVisible = true; _this.qrcodeDetailVisible = true;
} }
}, },
closeQRCodeDetailDialog() { closeQRCodeDetailDialog() {
this.qrcodeDetailVisible = false; this.qrcodeDetailVisible = false;
this.getList(); this.getList();
}, },
getStockOrderDetailList(row) { getStockOrderDetailList(_this,row) {
if (this.$isNotBlank(row)) { if (_this.$isNotBlank(row)) {
this.detailQuery.orderIdFk = row.billNo; _this.detailQuery.orderIdFk = row.billNo;
} }
this.detailLoading = true; _this.detailLoading = true;
stockOrderDetail(this.detailQuery) stockOrderDetail(_this.detailQuery)
.then((response) => { .then((response) => {
this.detailLoading = false; _this.detailLoading = false;
this.detailList = response.data.list || []; _this.detailList = response.data.list || [];
this.detailTotal = response.data.total; _this.detailTotal = response.data.total;
}) })
.catch(() => { .catch(() => {
this.detailLoading = false; _this.detailLoading = false;
this.detailList = []; _this.detailList = [];
}); });
}, },
getBusType() { getBusType(_this) {
let query = { let query = {
enabled: true, enabled: true,
vueType: "supDelivery", vueType: "supDelivery",
}; };
getLocalJoinByUser(query) getLocalJoinByUserOptimize(query)
.then((response) => { .then((response) => {
this.busTypes = response.data.list || []; _this.options.getBusType = response.data || [];
this.filterQuery.action = this.busTypes[0].action; _this.query.action = this.busTypes[0].action;
// this.getList(); // this.getList();
}) })
.catch(() => { .catch(() => {
@ -495,6 +759,15 @@ export default {
subInvChange() { subInvChange() {
this.getBusType(); 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: { components: {
draggable, draggable,
@ -529,8 +802,22 @@ export default {
created() { created() {
// 加载表格数据 // 加载表格数据
this.getSubInvList(); this.getSubInvList();
this.getBusType(); this.getBusType(this);
this.getList(); 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> </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-card>
<el-form <el-form
:model="filterQuery" :model="filterQuery"
v-if="queryList && queryList.length > 0"
class="query-form" class="query-form"
label-width="110px" label-width="110px"
v-show="showSearch" v-show="showSearch"
> >
<el-row> <!-- <el-row>-->
<el-col span="6"> <!-- <el-col span="6">-->
<el-form-item label="生产企业/代理人:"> <!-- <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 <el-input
v-model="filterQuery.companyName" v-model="filterQuery[item.columnName]"
style="width: 90%" :placeholder="item.columnDesc"
placeholder="请输入生产企业/代理人" :disabled="executeEval(null,item.disabledFuc,false)"
></el-input> @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
</el-form-item> clearable
</el-col> ></el-input>
<el-col span="6"> </el-form-item>
<el-form-item label="社会信用号:"> <el-form-item v-if="item.columnType == 'input' && item.columnName =='queryName' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
<el-input <el-autocomplete
v-model="filterQuery.creditCode" class="inline-input"
style="width: 90%" style="width: 90%"
placeholder="请输入社会信用号" v-model="queryName"
></el-input> :fetch-suggestions="queryProductName"
</el-form-item> placeholder="请输入内容"
</el-col> clearable
<el-col span="6"> @select="handleSelect"
<el-form-item label="处理状态:"> @clear="clearQueryProduct"
<el-select ></el-autocomplete>
v-model="filterQuery.auditStatus" </el-form-item>
style="width: 90%" <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
placeholder="请输入处理状态" <el-select v-model="filterQuery[item.columnName]"
> :placeholder="item.columnDesc"
<el-option label="全部" value=""></el-option> @change="executeFuc($event,'5',item.checkRules)"
<el-option label="草稿" value="0"></el-option> :disabled="executeEval(null,item.disabledFuc,false)"
<el-option label="未审核" value="6"></el-option> clearable>
<el-option label="变更未审核" value="3"></el-option> <el-option
<el-option label="已审核" value="1"></el-option> v-for="dict in item.lableRuleObj"
<el-option label="已拒绝" value="2"></el-option> :key="dict.value"
</el-select> :label="dict.label"
</el-form-item> :value="dict.value"
</el-col> />
<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-row>
</el-form> </el-form>
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group style="display: flex"> <el-button-group style="display: flex">
<el-button icon="el-icon-view" type="primary" @click="hideSearch" <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 type="primary" icon="el-icon-refresh" @click="onReset"
>重置</el-button >重置</el-button
> >
<el-button type="primary" icon="el-icon-search" @click="onSubmit" <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 type="primary" icon="el-icon-plus" @click="addInfoDialog()"
>添加</el-button >添加</el-button
> >
</el-button-group> </el-button-group>
</div> </div>
@ -72,63 +156,150 @@
style="width: 100%" style="width: 100%"
border border
highlight-current-row 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="序号" type="index"></el-table-column>-->
<el-table-column <!-- <el-table-column-->
label="生产企业/代理人" <!-- label="企业名称"-->
prop="companyName" <!-- prop="companyName"-->
width="250" <!-- width="250"-->
></el-table-column> <!-- ></el-table-column>-->
<el-table-column label="社会信用号" prop="creditCode"></el-table-column> <!-- <el-table-column label="社会信用号" prop="creditCode"></el-table-column>-->
<el-table-column label="企业类型" prop="bussinessStatus" width="120"> <!-- <el-table-column label="企业类型" prop="bussinessStatus" width="1">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<span>{{ companyTypeMap[scope.row.companyType] }}</span> <!-- <span>{{ companyTypeMap[scope.row.companyType] }}</span>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="所在地区" prop="placeArea"></el-table-column> <!-- <el-table-column label="所在地区" prop="placeArea"></el-table-column>-->
<el-table-column <!-- <el-table-column-->
label="所在地址" <!-- label="所在地址"-->
prop="placeAddress" <!-- prop="placeAddress"-->
:show-overflow-tooltip="true" <!-- :show-overflow-tooltip="true"-->
></el-table-column> <!-- ></el-table-column>-->
<el-table-column <!-- <el-table-column-->
label="所属供应商" <!-- label="所属供应商"-->
prop="supName" <!-- prop="supName"-->
show-overflow-tooltip <!-- show-overflow-tooltip-->
></el-table-column> <!-- ></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">-->
{{ checkFlag[scope.row.auditStatus] }} <!-- {{ checkFlag[scope.row.auditStatus] }}-->
</el-tag> <!-- </el-tag>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="操作" width="120"> <!-- <el-table-column label="操作" width="120">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<el-button <!-- <el-button-->
type="text" <!-- type="text"-->
size="small" <!-- size="small"-->
@click.native.stop="addInfoDialog(scope.row)" <!-- @click.native.stop="addInfoDialog(scope.row)"-->
>编辑</el-button <!-- >编辑</el-button-->
> <!-- >-->
<el-button <!-- <el-button-->
type="text" <!-- type="text"-->
size="small" <!-- size="small"-->
:disabled="scope.row.auditStatus === 1" <!-- :disabled="scope.row.auditStatus === 1"-->
@click.native.stop="deleteDialog(scope.row)" <!-- @click.native.stop="deleteDialog(scope.row)"-->
>删除 <!-- >删除-->
</el-button> <!-- </el-button>-->
<el-button <!-- <el-button-->
type="text" <!-- type="text"-->
size="small" <!-- size="small"-->
v-if="scope.row.auditStatus === 2" <!-- v-if="scope.row.auditStatus === 2"-->
@click.native.stop="rejectInfo(scope.row)" <!-- @click.native.stop="rejectInfo(scope.row)"-->
>说明 <!-- >说明-->
</el-button> <!-- </el-button>-->
</template> <!-- </template>-->
</el-table-column> <!-- </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> </el-table>
<pagination <pagination
@ -166,56 +337,139 @@
v-show="showSearch2" v-show="showSearch2"
label-width="100px" label-width="100px"
> >
<el-row> <!-- <el-row>-->
<el-col span="6"> <!-- <el-col span="6">-->
<el-form-item label="物资名称:"> <!-- <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 <el-input
v-model="registrationQuery.recordProductName" v-model="registrationQuery[item.columnName]"
style="width: 90%" :placeholder="item.columnDesc"
:disabled="executeEval(null,item.disabledFuc,false)"
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
clearable clearable
placeholder="物资名称"
></el-input> ></el-input>
</el-form-item> </el-form-item>
</el-col> <el-form-item v-if="item.columnType == 'input' && item.columnName =='queryName' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
<el-col span="6"> <el-autocomplete
<el-form-item label="注册备案号:"> class="inline-input"
<el-input
v-model="registrationQuery.recordCode"
style="width: 90%" style="width: 90%"
v-model="queryName"
:fetch-suggestions="queryProductName"
placeholder="请输入内容"
clearable clearable
placeholder="注册备案号" @select="handleSelect"
></el-input> @clear="clearQueryProduct"
></el-autocomplete>
</el-form-item> </el-form-item>
</el-col> <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<el-col span="6"> <el-select v-model="registrationQuery[item.columnName]"
<el-form-item label="注册备案人:"> :placeholder="item.columnDesc"
<el-input @change="executeFuc($event,'5',item.checkRules)"
v-model="registrationQuery.recordPeopleName" :disabled="executeEval(null,item.disabledFuc,false)"
style="width: 90%" clearable>
clearable <el-option
placeholder="注册备案人" v-for="dict in item.lableRuleObj"
></el-input> :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-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-row>
</el-form> </el-form>
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group style="display: flex"> <el-button-group style="display: flex">
<el-button icon="el-icon-view" type="primary" @click="hideSearch2" <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 type="primary" icon="el-icon-refresh" @click="onReset2"
>重置</el-button >重置</el-button
> >
<el-button type="primary" icon="el-icon-search" @click="onSubmit2" <el-button type="primary" icon="el-icon-search" @click="onSubmit2"
>查询</el-button >查询</el-button
> >
<el-button <el-button
type="primary" type="primary"
icon="el-icon-plus" icon="el-icon-plus"
@click="registrationDialog()" @click="registrationDialog()"
>添加</el-button >添加</el-button
> >
</el-button-group> </el-button-group>
</div> </div>
@ -228,61 +482,148 @@
border border
highlight-current-row highlight-current-row
> >
<el-table-column type="index" label="序号" width="50"></el-table-column> <!-- <el-table-column type="index" label="序号" width="50"></el-table-column>-->
<el-table-column <!-- <el-table-column-->
label="注册/备案产品名称" <!-- label="注册/备案产品名称"-->
prop="recordProductName" <!-- prop="recordProductName"-->
show-overflow-tooltip <!-- show-overflow-tooltip-->
></el-table-column> <!-- ></el-table-column>-->
<el-table-column <!-- <el-table-column-->
label="规格型号" <!-- label="规格型号"-->
prop="ggxh" <!-- prop="ggxh"-->
show-overflow-tooltip <!-- show-overflow-tooltip-->
></el-table-column> <!-- ></el-table-column>-->
<el-table-column <!-- <el-table-column-->
label="注册/备案号" <!-- label="注册/备案号"-->
prop="recordCode" <!-- prop="recordCode"-->
show-overflow-tooltip <!-- show-overflow-tooltip-->
></el-table-column> <!-- ></el-table-column>-->
<el-table-column <!-- <el-table-column-->
label="注册/备案人名称" <!-- label="注册/备案人名称"-->
prop="recordPeopleName" <!-- prop="recordPeopleName"-->
show-overflow-tooltip <!-- show-overflow-tooltip-->
></el-table-column> <!-- ></el-table-column>-->
<el-table-column <!-- <el-table-column-->
label="生产企业/代理人" <!-- label="生产企业"-->
prop="manufacturerName" <!-- prop="manufacturerName"-->
show-overflow-tooltip <!-- show-overflow-tooltip-->
></el-table-column> <!-- ></el-table-column>-->
<el-table-column <!-- <el-table-column-->
label="所属供应商" <!-- label="所属供应商"-->
prop="supName" <!-- prop="supName"-->
show-overflow-tooltip <!-- show-overflow-tooltip-->
></el-table-column> <!-- ></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">-->
{{ checkFlag[scope.row.auditStatus] }} <!-- {{ checkFlag[scope.row.auditStatus] }}-->
</el-tag> <!-- </el-tag>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="操作" width="120"> <!-- <el-table-column label="操作" width="120">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<el-button <!-- <el-button-->
type="text" <!-- type="text"-->
size="small" <!-- size="small"-->
@click.native.stop="registrationDialog(scope.row)" <!-- @click.native.stop="registrationDialog(scope.row)"-->
>编辑</el-button <!-- >编辑</el-button-->
> <!-- >-->
<el-button <!-- <el-button-->
type="text" <!-- type="text"-->
size="small" <!-- size="small"-->
:disabled="scope.row.auditStatus === 1" <!-- :disabled="scope.row.auditStatus === 1"-->
@click.native="deleteRegistration(scope.row)" <!-- @click.native="deleteRegistration(scope.row)"-->
>删除 <!-- >删除-->
</el-button> <!-- </el-button>-->
</template> <!-- </template>-->
</el-table-column> <!-- </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> </el-table>
<pagination <pagination
@ -325,6 +666,9 @@ import {
deleteRegistration, deleteRegistration,
} from "../../../api/purchase/suppliersRegistrationBasic"; } from "../../../api/purchase/suppliersRegistrationBasic";
import suppliersRegistrationBasic from "@/views/purchase/product/supProductEditDialog"; import suppliersRegistrationBasic from "@/views/purchase/product/supProductEditDialog";
import {
getHead,executeFuc
} from "@/utils/customConfig";
export default { export default {
name: "supCertificationAdd", name: "supCertificationAdd",
@ -390,6 +734,14 @@ export default {
}, },
registrationList: [], registrationList: [],
certTotal: 0, certTotal: 0,
tableHeader:[],
queryList:[],
fromList:[],
tableHeader2:[],
queryList2:[],
fromList2:[],
options: {
},
registrationLoading: false, registrationLoading: false,
registrationId: "", registrationId: "",
@ -480,20 +832,23 @@ export default {
hideSearch2() { hideSearch2() {
this.showSearch2 = !this.showSearch2; this.showSearch2 = !this.showSearch2;
}, },
addInfoDialog(row) { addInfoDialog(_this,row) {
if (this.$isNotBlank(row)) { if(_this == null){
this.enterpriseId = row.id; _this = this
this.editType = 1; }
this.inputQuery = row; if (_this.$isNotBlank(row)) {
_this.enterpriseId = row.id;
_this.editType = 1;
_this.inputQuery = row;
} else { } else {
this.enterpriseId = null; _this.enterpriseId = null;
this.editType = 0; _this.editType = 0;
this.inputQuery = { _this.inputQuery = {
auditStatus: 0, auditStatus: 0,
}; };
} }
this.addInfoVisible = true; _this.addInfoVisible = true;
}, },
closeDialog(type) { closeDialog(type) {
this.addInfoVisible = false; this.addInfoVisible = false;
@ -517,16 +872,16 @@ export default {
console.log(this.check); console.log(this.check);
}, },
rejectInfo(row) { rejectInfo(_this,row) {
this.$confirm(row.auditComment, "驳回说明", { _this.$confirm(row.auditComment, "驳回说明", {
confirmButtonText: "确定", confirmButtonText: "确定",
type: "warning", type: "warning",
showCancelButton: false, showCancelButton: false,
}).then(() => {}); }).then(() => {});
}, },
deleteDialog(row) { deleteDialog(_this,row) {
this.$confirm("删除后将清空该生产企业以及所有关联信息?", "提示", { _this.$confirm("删除后将清空该生产企业以及所有关联信息?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning",
@ -536,17 +891,17 @@ export default {
id: row.id, id: row.id,
}; };
deleteCompany(tQuery).then(() => { deleteCompany(tQuery).then(() => {
this.getList(); _this.getList();
}); });
}) })
.catch(() => {}); .catch(() => {});
}, },
supManufacturerClick(row) { supManufacturerClick(_this,row) {
this.registrationQuery.customerId = row.customerId; _this.registrationQuery.customerId = row.customerId;
this.registrationQuery.manufacturerIdFk = row.manufacturerId; _this.registrationQuery.manufacturerIdFk = row.manufacturerId;
this.getRegistrationList(); _this.getRegistrationList();
this.currentManufacturer = row; _this.currentManufacturer = row;
}, },
/**---------------------------配送产品资质----------------------*/ /**---------------------------配送产品资质----------------------*/
@ -575,39 +930,42 @@ export default {
this.registrationQuery.page = 1; this.registrationQuery.page = 1;
this.getRegistrationList(); this.getRegistrationList();
}, },
registrationDialog(row) { registrationDialog(_this,row) {
if (this.currentManufacturer == null) { if(_this == null){
this.$message.error("请先选中生产企业！"); _this = this
}
if (_this.currentManufacturer == null) {
_this.$message.error("请先选中生产企业！");
return; return;
} }
if (this.$isNotBlank(row)) { if (_this.$isNotBlank(row)) {
this.registrationId = row.id; _this.registrationId = row.id;
this.curProductQuery = row; _this.curProductQuery = row;
this.curProductQuery.cuStatus = this.currentManufacturer.auditStatus; _this.curProductQuery.cuStatus = _this.currentManufacturer.auditStatus;
this.curProductQuery.manufacturerId = _this.curProductQuery.manufacturerId =
this.registrationQuery.manufacturerIdFk; _this.registrationQuery.manufacturerIdFk;
this.formName = "update"; _this.formName = "update";
this.editProductType = 1; _this.editProductType = 1;
} else { } else {
this.editProductType = 0; _this.editProductType = 0;
this.formName = "add"; _this.formName = "add";
this.curProductQuery = { _this.curProductQuery = {
auditStatus: 0, auditStatus: 0,
cuStatus: this.currentManufacturer.auditStatus, cuStatus: _this.currentManufacturer.auditStatus,
manufacturerId: this.registrationQuery.manufacturerIdFk, manufacturerId: _this.registrationQuery.manufacturerIdFk,
}; };
} }
this.registrationVisible = true; _this.registrationVisible = true;
}, },
deleteRegistration(row) { deleteRegistration(_this,row) {
this.$confirm("是否删除?", "提示", { _this.$confirm("是否删除?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning",
}) })
.then(() => { .then(() => {
this.certLoading = true; _this.certLoading = true;
let tQuery = { let tQuery = {
id: row.id, id: row.id,
filePath: row.filePath, filePath: row.filePath,
@ -615,19 +973,19 @@ export default {
}; };
deleteRegistration(tQuery) deleteRegistration(tQuery)
.then((response) => { .then((response) => {
this.certLoading = false; _this.certLoading = false;
if (response.code === 20000) { if (response.code === 20000) {
this.getRegistrationList(); _this.getRegistrationList();
this.$message({ _this.$message({
type: "success", type: "success",
message: "删除成功！", message: "删除成功！",
}); });
} else { } else {
this.$message.error(response.message); _this.$message.error(response.message);
} }
}) })
.catch(() => { .catch(() => {
this.certLoading = false; _this.certLoading = false;
}); });
}) })
.catch(() => {}); .catch(() => {});
@ -659,6 +1017,15 @@ export default {
this.registrationQuery.page = val.page; this.registrationQuery.page = val.page;
this.getRegistrationList(); 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: { components: {
suppliersEnterpriseBasicAdd, suppliersEnterpriseBasicAdd,
@ -668,7 +1035,21 @@ export default {
created() { created() {
this.fileUrl = this.fileUrl =
this.BASE_URL + "/udiwms/image/register/file/getImage?type=image4&name="; 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(); // this.getRegistrationList();
}, },
}; };

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

@ -1,279 +1,461 @@
<template> <template>
<div> <div>
<el-card> <el-card>
<el-form :model="filterQuery" size="mini" label-width="120px" v-show="showSearch"> <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" size="mini" label-width="120px" v-show="showSearch">
<el-row> <!-- <el-row>-->
<el-col :span="6"> <!-- <el-col :span="6">-->
<el-form-item label="物资编码:"> <!-- <el-form-item label="物资编码:">-->
<el-input v-model="filterQuery.unionCode" style="width: 90%" placeholder="请输入产品编码" <!-- <el-input v-model="filterQuery.unionCode" style="width: 90%" placeholder="请输入产品编码"-->
clearable="true"></el-input> <!-- 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-form-item>
</el-col> <el-form-item v-if="item.columnType == 'input' && item.columnName =='queryName' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
<el-col :span="6"> <el-autocomplete
<el-form-item label="物资名称:"> class="inline-input"
<el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入物资名称" style="width: 90%"
clearable="true"></el-input> v-model="queryName"
:fetch-suggestions="queryProductName"
placeholder="请输入内容"
clearable
@select="handleSelect"
@clear="clearQueryProduct"
></el-autocomplete>
</el-form-item> </el-form-item>
</el-col> <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<el-col :span="6"> <el-select v-model="filterQuery[item.columnName]"
<el-form-item label="规格型号:"> :placeholder="item.columnDesc"
<el-input v-model="filterQuery.ggxh" style="width: 90%" placeholder="请输入规格型号" clearable="true"></el-input> @change="executeFuc($event,'5',item.checkRules)"
</el-form-item> :disabled="executeEval(null,item.disabledFuc,false)"
</el-col> clearable>
<el-col :span="6">
<el-form-item label="对照条件:">
<el-select v-model="filterQuery.filterType" style="width: 90%" placeholder="请选择过滤对照条件">
<el-option <el-option
v-for="item in filterList" v-for="dict in item.lableRuleObj"
:key="item.filterType" :key="dict.value"
:label="item.sysName" :label="dict.label"
:value="item.filterType"> :value="dict.value"
<span style="float: left">{{ item.sysName }}</span> />
</el-option> <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-select>
</el-form-item> </el-form-item>
</el-col> <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
</el-row> <el-select
<el-row> v-model="filterQuery[item.columnName]"
<el-col :span="6"> :placeholder="item.columnDesc"
<el-form-item label="生产企业:"> :disabled="executeEval(null,item.disabledFuc,false)"
<el-input v-model="filterQuery.ylqxzcrbarmc" style="width: 90%" placeholder="请输入生产企业/注册备案人" filterable
clearable="true"></el-input> remote
</el-form-item> @change="executeFuc($event,'5',item.checkRules)"
</el-col> :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
<el-col :span="6"> clearable>
<el-form-item label="生产企业:"> <el-option
<el-input v-model="filterQuery.zczbhhzbapzbh" style="width: 90%" placeholder="请输入生产企业/注册备案人" v-for="item in options[item.clickFuc]"
clearable="true"></el-input> :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>
</el-col> <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<el-col :span="6"> <el-date-picker
<el-form-item label="第三方产品编码:"> :picker-options="pickerOptions"
<el-input v-model="filterQuery.thrPiId" style="width: 90%" placeholder="请输入第三方产品编码" v-model="actDateRange"
clearable="true"></el-input> 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>
</el-col> <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
<el-col :span="6"> <el-date-picker
<el-form-item label="审核状态:" v-if="isSpCombine"> v-model="filterQuery[item.columnName]"
<el-select v-model="filterQuery.lockStatus" style="width: 90%" placeholder="请选择审核状态"> :style="`width:${item.width+'px'}`"
<el-option label="全部" value=""></el-option> value-format="yyyy-MM-dd"
<el-option label="未提交" value="1"></el-option> :disabled="executeEval(null,item.disabledFuc,false)"
<el-option label="已提交" value="2"></el-option> type="date"
<el-option label="已锁定" value="3"></el-option> :placeholder="item.columnDesc"
</el-select> ></el-date-picker>
</el-form-item> </el-form-item>
</el-col> </template>
</el-row> </el-row>
</el-form> </el-form>
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group style="display:flex;"> <el-button-group style="display:flex;">
<el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button> <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button> <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="search">查询</el-button> <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
<el-button type="primary" icon="el-icon-bottom-right" @click="selectProduct()">选入</el-button> <el-button type="primary" icon="el-icon-bottom-right" @click="selectProduct()">选入</el-button>
</el-button-group> </el-button-group>
</div> </div>
<el-divider style="margin: 15px"></el-divider> <el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" @selection-change="handleSelectionChange" border <el-table v-loading="loading" :data="list" style="width: 100%" @selection-change="handleSelectionChange" border
highlight-current-row> highlight-current-row>
<el-table-column label="序号" type="index"></el-table-column> <!-- <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="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="thirdId" show-overflow-tooltip></el-table-column>-->
<el-table-column label="物资名称" prop="cpmctymc" 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="ggxh" show-overflow-tooltip></el-table-column>-->
<el-table-column label="价格" prop="price" 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="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>-->
<el-table-column label="注册/备案号" prop="zczbhhzbapzbh" 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 label="物资分类" prop="classifyName" show-overflow-tooltip></el-table-column>-->
<el-table-column v-if="isSpCombine" label="锁定状态" prop="lockStatus" show-overflow-tooltip> <!-- <el-table-column v-if="isSpCombine" label="锁定状态" prop="lockStatus" show-overflow-tooltip>-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
{{ lockStatusMap[scope.row.lockStatus] }} <!-- {{ lockStatusMap[scope.row.lockStatus] }}-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column width="180" label="操作" fixed="right"> <!-- <el-table-column width="180" label="操作" fixed="right">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<el-button v-if="isSpCombine" type="text" size="small" <!-- <el-button v-if="isSpCombine" type="text" size="small"-->
:disabled="scope.row.originUuid!=null || scope.row.lockStatus===3" <!-- :disabled="scope.row.originUuid!=null || scope.row.lockStatus===3"-->
@click.native.stop="intentSelectUdi(scope.row)">关联DI <!-- @click.native.stop="intentSelectUdi(scope.row)">关联DI-->
</el-button> <!-- </el-button>-->
<el-button type="text" size="small" :disabled="scope.row.lockStatus==3" <!-- <el-button type="text" size="small" :disabled="scope.row.lockStatus==3"-->
@click.native.stop="handleModifyClick(scope.row)">编辑 <!-- @click.native.stop="handleModifyClick(scope.row)">编辑-->
</el-button> <!-- </el-button>-->
<el-button type="text" size="small" <!-- <el-button type="text" size="small"-->
@click.native.stop="handleDetailClick(scope.row)">详情 <!-- @click.native.stop="handleDetailClick(scope.row)">详情-->
</el-button> <!-- </el-button>-->
<el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" <!-- <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"-->
> <!-- >-->
<span class="el-dropdown-link"> <!-- <span class="el-dropdown-link">-->
<i class="el-icon-d-arrow-right el-icon--right"></i>更多 <!-- <i class="el-icon-d-arrow-right el-icon&#45;&#45;right"></i>更多-->
</span> <!-- </span>-->
<el-dropdown-menu slot="dropdown"> <!-- <el-dropdown-menu slot="dropdown">-->
<!-- <el-dropdown-item command="handleDetailClick" v-if=" scope.row.lockStatus!=3">详情</el-dropdown-item>--> <!-- &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 command="sumitLockStatus" v-if="isSpCombine" :disabled="scope.row.lockStatus===3">-->
提交审核 <!-- 提交审核-->
</el-dropdown-item> <!-- </el-dropdown-item>-->
<el-dropdown-item command="splitSelectUdi" v-if="isSpCombine" type="text" size="small" <!-- <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"> <!-- :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>-->
<el-dropdown-item command="deleteCompanyProductRelevance">移除</el-dropdown-item> <!-- <el-dropdown-item command="deleteCompanyProductRelevance">移除</el-dropdown-item>-->
</el-dropdown-menu> <!-- </el-dropdown-menu>-->
</el-dropdown> <!-- </el-dropdown>-->
<!-- <el-button v-if=" scope.row.lockStatus!=3" type="text" size="small"--> <!-- &lt;!&ndash; <el-button v-if=" scope.row.lockStatus!=3" type="text" size="small"&ndash;&gt;-->
<!-- @click.native.stop="handleDetailClick(scope.row)">详情--> <!-- &lt;!&ndash; @click.native.stop="handleDetailClick(scope.row)">详情&ndash;&gt;-->
<!-- </el-button>--> <!-- &lt;!&ndash; </el-button>&ndash;&gt;-->
<!-- <el-button v-if="isSpCombine" type="text" size="small" :disabled="scope.row.lockStatus===3"--> <!-- &lt;!&ndash; <el-button v-if="isSpCombine" type="text" size="small" :disabled="scope.row.lockStatus===3"&ndash;&gt;-->
<!-- @click.native.stop="sumitLockStatus(scope.row)">提交审核--> <!-- &lt;!&ndash; @click.native.stop="sumitLockStatus(scope.row)">提交审核&ndash;&gt;-->
<!-- </el-button>--> <!-- &lt;!&ndash; </el-button>&ndash;&gt;-->
<!-- <el-button v-if="isSpCombine" type="text" size="small" @click.native.stop="splitSelectUdi(scope.row)"--> <!-- &lt;!&ndash; <el-button v-if="isSpCombine" type="text" size="small" @click.native.stop="splitSelectUdi(scope.row)"&ndash;&gt;-->
<!-- :disabled="scope.row.thirdId===scope.row.nameCode || scope.row.thirdId==null || scope.row.nameCode==null || scope.row.lockStatus===3">--> <!-- &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;-->
<!-- </el-button>--> <!-- &lt;!&ndash; </el-button>&ndash;&gt;-->
<!-- <el-button type="text" size="small" @click.native.stop="deleteCompanyProductRelevance(scope.row)">移除--> <!-- &lt;!&ndash; <el-button type="text" size="small" @click.native.stop="deleteCompanyProductRelevance(scope.row)">移除&ndash;&gt;-->
<!-- </el-button>--> <!-- &lt;!&ndash; </el-button>&ndash;&gt;-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
</el-table> <template v-for="(item, index) in tableHeader">
<el-table-column
v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
<pagination type="index" :label="item.columnDesc"></el-table-column>
v-show="total>0" <el-table-column
:total="total" v-if="item.columnType == 'selection'"
:limit.sync="filterQuery.limit" type="selection"
:page.sync="filterQuery.page" :width="item.width"
@pagination="handleCurrentChange" :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
></pagination> ></el-table-column>
<el-table-column
<el-dialog v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
title="产品信息编辑" :prop="item.columnName"
:visible.sync="editDialogVisible" :label="item.columnDesc"
width="80%" :sortable="item.sort"
:close-on-click-modal="false" :width="item.width"
:close-on-press-escape="false" :show-overflow-tooltip="item.tooltip"
v-if="editDialogVisible" :key="item.columnName"
:before-close="refresh" >
> <template slot-scope="scope">
<basicProductEdit <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
:productRemarkSet="productRemarkSet" </template>
:editQuery="editQuery" </el-table-column>
:closeDialog="closeDialog"> <el-table-column
</basicProductEdit> v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
:prop="item.columnName"
:label="item.columnDesc"
</el-dialog> :sortable="item.sort"
<el-dialog :width="item.width"
title="产品信息详情" :show-overflow-tooltip="item.tooltip"
:visible.sync="detailDialogVisible" :key="item.columnName"
width="70%" >
:close-on-click-modal="false" <template slot-scope="scope">
:close-on-press-escape="false" <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
v-if="detailDialogVisible" </template>
> </el-table-column>
<basicProductDetail <el-table-column
:productRemarkSet="productRemarkSet" v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
:editQuery="editQuery" :prop="item.columnName"
:closeDialog="closeDialog"> :label="item.columnDesc"
> :sortable="item.sort"
</basicProductDetail> :width="item.width"
</el-dialog> :show-overflow-tooltip="item.tooltip"
<el-dialog :key="item.columnName"
title="关联选入耗材信息" >
:visible.sync="selectUdiDialogVisible" <template slot-scope="scope">
width="85%" <el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
:close-on-click-modal="false" <span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
:close-on-press-escape="false" </el-tag>
v-if="selectUdiDialogVisible" </template>
> </el-table-column>
<selectUdi @closeUdi="closeUdi" :isImportUdi="isImportUdi"></selectUdi> <el-table-column
</el-dialog> v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
<el-dialog :prop="item.columnName"
:title="selectErpTitle" :label="item.columnDesc"
:visible.sync="selectErpDialogVisible" :width="item.width"
width="85%" :key="item.columnName"
:close-on-click-modal="false" fixed="right"
:close-on-press-escape="false" >
v-if="selectErpDialogVisible" <template slot-scope="scope">
> <el-button v-if="isSpCombine" type="text" size="small"
<selectErp :disabled="scope.row.originUuid!=null || scope.row.lockStatus===3"
:closeDialog="closeDialog" @click.native.stop="intentSelectUdi(scope.row)">关联DI
:uuid="uuid" </el-button>
:relId="relId" <el-button type="text" size="small" :disabled="scope.row.lockStatus==3"
:intentThirdId="intentThirdId" @click.native.stop="handleModifyClick(scope.row)">编辑
:isImport="isImport" </el-button>
:data="thisData" <el-button type="text" size="small"
:defaultSys="defaultSys" @click.native.stop="handleDetailClick(scope.row)">详情
@closeUdi="closeUdi" </el-button>
:supEnable="true"
></selectErp> <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"
</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 <span class="el-dropdown-link">
:closeDialog="closeDialog" <i class="el-icon-d-arrow-right el-icon--right"></i>更多
:relId="relId" </span>
:uuid="uuid" <el-dropdown-menu slot="dropdown">
:originUuid="originUuid" <!-- <el-dropdown-item command="handleDetailClick" v-if=" scope.row.lockStatus!=3">详情</el-dropdown-item>-->
@closeUdi="closeUdi" <el-dropdown-item command="sumitLockStatus" v-if="isSpCombine" :disabled="scope.row.lockStatus===3">
></selectUdiVersion> 提交审核
</el-dialog> </el-dropdown-item>
</el-card> <el-dropdown-item command="splitSelectUdi" v-if="isSpCombine" type="text" size="small"
</div> :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> </template>
<script> <script>
@ -283,7 +465,7 @@ import {
updateErpProduct, updateErpProduct,
uploadSmp, uploadSmp,
thirdSysDetail, thirdSysDetail,
removeRl, sysFilter, spcombie, lockStatus, removeDiRl removeRl, sysFilterOptimize , spcombie, lockStatus, removeDiRl
} from "../../../api/basic/udiRelevance"; } from "../../../api/basic/udiRelevance";
import store from "../../../store/index"; import store from "../../../store/index";
import { import {
@ -301,7 +483,9 @@ import ThrProductsAdd from "@/views/supplier/company/ThrProductsAdd";
import selectUdiVersion from "@/views/basic/product/UdiinfoSelectVersion"; import selectUdiVersion from "@/views/basic/product/UdiinfoSelectVersion";
import basicProductEdit from "@/views/supplier/company/basicCompanyproductEdit"; import basicProductEdit from "@/views/supplier/company/basicCompanyproductEdit";
import basicProductDetail from "@/views/supplier/company/basicCompanyproductDetail" import basicProductDetail from "@/views/supplier/company/basicCompanyproductDetail"
import {
getHead,executeFuc
} from "@/utils/customConfig";
export default { export default {
data() { data() {
@ -337,6 +521,13 @@ export default {
pId: null, pId: null,
}, },
pId: 0, pId: 0,
tableHeader:[],
queryList:[],
fromList:[],
options: {
getSysFilter:[]
},
productType: null, productType: null,
defaultSys: null, defaultSys: null,
isImport: false, isImport: false,
@ -763,11 +954,11 @@ export default {
this.sysList = []; this.sysList = [];
}); });
}, },
getSysFilter() { getSysFilter(_this) {
sysFilter() sysFilterOptimize()
.then((response) => { .then((response) => {
this.loading = false; _this.loading = false;
this.filterList = response.data.list || []; _this.options.getSysFilter = response.data.list || [];
}) })
.catch(() => { .catch(() => {
this.loading = false; 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() { mounted() {
@ -907,9 +1106,17 @@ export default {
, ,
created() { created() {
this.findBasicProductSet(); 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.selectSysParam();
this.getSysFilter(); this.getSysFilter(this);
} }
, ,
} }

Write Preview
Loading…
Cancel
Save