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

Merge remote-tracking branch 'origin/dev2.0' into 20231126-yw

Browse Source 
# Conflicts:
#	src/views/basic/business/stockOrder.vue
#	src/views/inout/InvoiceRegByOrder.vue
#	src/views/inout/IoReturnedSearchOrder.vue
#	src/views/purchase/cert/supCertAudit.vue
#	src/views/purchase/cert/supCertSearch.vue
#	src/views/purchase/cert/supCertificationAdd.vue
#	src/views/supplier/company/basicCompanyProducts.vue
20231126-yw
yuanwei 1 year ago
parent 209257f6f2 939a4b9b6d
commit ae647a4d59
29 changed files with 2207 additions and 4773 deletions
Show Stats Download Patch File Download Diff File

2
.env.development
Unescape Escape View File

@ -4,7 +4,7 @@ VUE_APP_TITLE = 供应商自助管理平台
# 开发环境配置 # 开发环境配置
ENV = 'development' ENV = 'development'
VUE_APP_BASE_API = 'http://127.0.0.1:9993' VUE_APP_BASE_API = 'http://192.168.0.166:9993'
# 应用访问路径 例如使用前缀 /admin/ # 应用访问路径 例如使用前缀 /admin/
VUE_APP_CONTEXT_PATH = '/' VUE_APP_CONTEXT_PATH = '/'

28
.env.production
Unescape Escape View File

@ -23,25 +23,45 @@ ENV = 'production'
# 刘恩典 # 刘恩典
# VUE_APP_BASE_API = 'http://192.168.0.117:9150/UDI_SPMS_SERVER/' # VUE_APP_BASE_API = 'http://192.168.0.117:9150/UDI_SPMS_SERVER/'
# VUE_APP_BASE_API = 'http://192.168.0.117:9160/UDI_SPMS_SERVER/' # VUE_APP_BASE_API = 'http://192.168.0.117:9160/UDI_SPMS_SERVER/'
# VUE_APP_BASE_API = 'http://192.168.0.127:9170/UDI_SPMS_SERVER/'
# 漳州中医院 # 漳州中医院
VUE_APP_BASE_API = 'http://116.204.116.198:9150/UDI_SPMS_SERVER/' # VUE_APP_BASE_API = 'http://116.204.116.198:9150/UDI_SPMS_SERVER/'
# 平和 # 平和
# VUE_APP_BASE_API = 'http://121.36.152.129:9150/UDI_SPMS_SERVER/' # VUE_APP_BASE_API = 'http://121.36.152.129:9150/UDI_SPMS_SERVER/'
# 长泰医院 # 长泰医院
# VUE_APP_BASE_API = 'http://139.159.247.26:9150/UDI_SPMS_SERVER/' VUE_APP_BASE_API = 'http://139.159.247.26:9150/UDI_SPMS_SERVER/'
# VUE_APP_BASE_API = 'http://192.168.0.139:9150/UDI_SPMS_SERVER/'
# VUE_APP_BASE_API = 'http://dm.xmglxp.com:8081/UDI_SPMS_SERVER/'
# VUE_APP_BASE_API = 'http://dm.xmglxp.com:81/UDI_SPMS_SERVER/'
#诏安医院
# VUE_APP_BASE_API = 'http://139.9.174.242:9150/UDI_SPMS_SERVER/'
# VUE_APP_BASE_API = 'http://192.168.0.17:9150/UDI_SPMS_SERVER/'
# 大田
# VUE_APP_BASE_API = 'http://110.83.220.178:9150/UDI_SPMS_SERVER/'
# 云霄妇幼
# VUE_APP_BASE_API = 'http://122.112.160.36:9160/UDI_SPMS_SERVER/'
# VUE_APP_BASE_API = 'http://192.168.0.72:9150/UDI_SPMS_SERVER/'
# 南靖
# VUE_APP_BASE_API = 'http://183.250.74.182:9150/UDI_SPMS_SERVER/'
# 东山
# VUE_APP_BASE_API = 'http://116.204.108.228:9150/UDI_SPMS_SERVER/'
# 应用访问路径 例如使用前缀 /admin/ # 应用访问路径 例如使用前缀 /admin/
# 域名 # 域名
# VUE_APP_CONTEXT_PATH = '/' VUE_APP_CONTEXT_PATH = '/'
# 其他 # 其他
VUE_APP_CONTEXT_PATH = '/UDI_SPMS_CLIENT/' # VUE_APP_CONTEXT_PATH = '/UDI_SPMS_CLIENT/'
# 监控地址 # 监控地址
VUE_APP_MONITRO_ADMIN = '/admin/login' VUE_APP_MONITRO_ADMIN = '/admin/login'

10
src/api/inout/order.js
Unescape Escape View File

@ -537,3 +537,13 @@ export function orderDetailAdd(params) {
data: params data: params
}); });
} }
export function copyOrder(params) {
return axios({
url: "/udiwms/inout/order/copyOrder",
method: "post",
data: params
});
}

9
src/api/thrsys/thrHsfl.js
Unescape Escape View File

@ -7,3 +7,12 @@ export function getHslbs(query) {
params: query params: query
}); });
} }
export function getThrProductType(query) {
return axios({
url: "/udiwms/thrsys/getThrProductType",
method: "get",
params: query
});
}

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

@ -1,140 +1,75 @@
<template> <template>
<div> <div>
<el-card class="el-card"> <el-card class="el-card">
<el-form v-if="queryList && queryList.length > 0" :model="query" label-width="100px" v-show="showSearch"> <el-form :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-row>-->
<!-- <el-col :span="8">--> <!-- <el-col :span="8">-->
<!-- <el-form-item label="单据状态:">--> <!-- <el-form-item label="送货单位:">-->
<!-- <el-select v-model="query.status" placeholder="请选择单据状态" style="width: 90%">--> <!-- <el-input v-model="query.corpName" style="width: 90%" placeholder="请输入送货单位" clearable></el-input>-->
<!-- <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-form-item>-->
<!-- </el-col>--> <!-- </el-col>-->
<el-col :span="8">
<!-- <el-col :span="8">--> <el-form-item class="query-form-item" label="单据类型:">
<!-- <el-form-item label="创建时间:">--> <el-select v-model="query.action" placeholder="请选择单据类型"
<!-- <el-date-picker--> style="width: 90%"
<!-- :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="dict in item.lableRuleObj" v-for="item in busTypes"
:key="dict.value" :key="item.name"
:label="dict.label" :label="item.name"
:value="dict.value" :value="item.action">
/> <span style="float: left">{{ item.name }}</span>
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`"> </el-col>
<el-select </el-row>
v-model="query[item.columnName]"
:placeholder="item.columnDesc" <el-row>
@change="executeFuc($event,'5',item.checkRules)" <el-col :span="8">
:disabled="executeEval(null,item.disabledFuc,false)" <el-form-item label="单据状态:">
filterable <el-select v-model="query.status" placeholder="请选择单据状态" style="width: 90%">
remote <el-option label="草稿" :value=1>草稿</el-option>
:remote-method="(query) => executeFuc(query,'5',item.clickFuc)" <el-option label="待校验" :value=3>待校验</el-option>
clearable> <el-option label="待核对" :value=5>待核对</el-option>
<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-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`"> </el-col>
<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-form-item> </el-date-picker>
<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> </el-form-item>
</template> </el-col>
</el-row> </el-row>
</el-form> </el-form>
@ -150,130 +85,43 @@
<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="(row) => executeFuc(row,'0',tableObj.handleChangeFuc)" ref="multipleTable" @row-click="getStockOrderDetailList" 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 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>
<el-table-column <el-table-column type="index" label="序号" width="50"></el-table-column>
v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)" <el-table-column label="单据号" prop="billNo" width="140" show-overflow-tooltip></el-table-column>
:prop="item.columnName" <el-table-column label="单据类型" prop="billTypeName" width="120">
: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 <el-table-column label="创建时间" prop="createTime" width="150"
v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)" sortable="custom"
:prop="item.columnName" :sort-orders="['ascending', 'descending']"></el-table-column>
:label="item.columnDesc" <el-table-column label="打印状态" width="100" prop="inCodeStatus">
:sortable="item.sort"
:width="item.width"
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope"> <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>{{ enableMap[scope.row.inCodeStatus] }}</span>
<span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="采购部门" prop="deptName" width="120">
v-if="item.columnType == 'button' && executeEval(row,item.expression,true)" </el-table-column>
:prop="item.columnName" <el-table-column label="收货仓库" prop="invName" width="150">
:label="item.columnDesc" </el-table-column>
:width="item.width" <el-table-column label="单据来源" prop="fromType" width="120">
:key="item.columnName"
fixed="right"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj" <span>{{ sourceMap[scope.row.fromType] }}</span>
: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 <el-table-column label="操作" width="200">
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">
<span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span> <el-button
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
@ -288,125 +136,25 @@
<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>
<!-- &lt;!&ndash; <el-table-column label="实际数量" prop="scanCount"></el-table-column>&ndash;&gt;--> <!-- <el-table-column label="实际数量" prop="scanCount"></el-table-column>-->
<!-- <el-table-column label="生产日期" prop="productDate">--> <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"> <template slot-scope="scope">
<el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio> <span>{{ convertDateFun(scope.row.productDate) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="失效日期" prop="expireDate">
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"> <template slot-scope="scope">
<span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span> <span>{{ convertDateFun(scope.row.expireDate) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="价格" prop="price"></el-table-column>
v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)" <el-table-column label="生产企业" prop="manufacturer"></el-table-column>
:prop="item.columnName" <el-table-column label="注册/备案号" prop="certCode"></el-table-column>
: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
@ -455,10 +203,7 @@ 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 {getLocalJoinByUserOptimize} from "@/api/basic/busType"; import {getLocalJoinByUser} from "@/api/basic/busType";
import {
getHead,executeFuc
} from "@/utils/customConfig";
export default { export default {
name: "stockOrder", name: "stockOrder",
@ -480,7 +225,7 @@ export default {
limit: 10, limit: 10,
startTime: "", startTime: "",
endTime: "", endTime: "",
inCodeStatus: "0", inCodeStatus: 0,
}, },
detailQuery: { detailQuery: {
orderIdFk: "", orderIdFk: "",
@ -494,15 +239,6 @@ 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,
@ -606,7 +342,7 @@ export default {
limit: 10, limit: 10,
startTime: "", startTime: "",
endTime: "", endTime: "",
inCodeStatus: "0", inCodeStatus: 0,
}; };
this.getList(); this.getList();
@ -704,44 +440,44 @@ export default {
}, },
qrcodeDetail(_this,row) { qrcodeDetail(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(_this,row) { getStockOrderDetailList(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(_this) { getBusType() {
let query = { let query = {
enabled: true, enabled: true,
vueType: "supDelivery", vueType: "supDelivery",
}; };
getLocalJoinByUserOptimize(query) getLocalJoinByUser(query)
.then((response) => { .then((response) => {
_this.options.getBusType = response.data || []; this.busTypes = response.data.list || [];
_this.query.action = this.busTypes[0].action; this.filterQuery.action = this.busTypes[0].action;
// this.getList(); // this.getList();
}) })
.catch(() => { .catch(() => {
@ -759,15 +495,6 @@ 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,
@ -802,22 +529,8 @@ export default {
created() { created() {
// 加载表格数据 // 加载表格数据
this.getSubInvList(); this.getSubInvList();
this.getBusType(this); this.getBusType();
getHead("stockOrder-1","1").then((re) => { this.getList();
// 处理返回的数据
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>

9
src/views/basic/product/SelectDIDetailDialog.vue
Unescape Escape View File

@ -312,6 +312,15 @@
></el-input> ></el-input>
</div> </div>
</el-col> </el-col>
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>产品货号或编号:&nbsp;</span>
</div>
<el-input style="width: 65%" :disabled="!checked" size="small" splaceholder="请输入内容"
v-model="editQuery.cphhhbh"></el-input>
</div>
</el-col>
</el-row> </el-row>
</el-collapse-item> </el-collapse-item>

14
src/views/basic/product/product.vue
Unescape Escape View File

@ -1151,7 +1151,17 @@
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>产品货号或编号:&nbsp;</span>
</div>
<el-input style="width: 65%" :disabled="!checked" size="small" splaceholder="请输入内容"
v-model="editQuery.cphhhbh"></el-input>
</div>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex"> <el-row :gutter="20" class="el-row" type="flex">
<el-col <el-col
:span="12" :span="12"
@ -1466,7 +1476,7 @@
<el-collapse-item name="6"> <el-collapse-item name="6">
<template slot="title"> <template slot="title">
<p class="form-title">版本信息</p> <p class="form-title">国家DI标识数据库版本信息</p>
</template> </template>
<el-row :gutter="20" class="el-row" type="flex"> <el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col"> <el-col :span="12" class="el-col">

49
src/views/basic/product/productEdit.vue
Unescape Escape View File

@ -242,12 +242,26 @@
<el-row type="flex" class="edit-row"> <el-row type="flex" class="edit-row">
<el-col :span="12" v-if="productRemarkSet.remarkEnable7"> <el-col :span="12" v-if="productRemarkSet.remarkEnable7">
<el-form-item :label="productRemarkSet.remarkTitle7+':'"> <el-form-item :label="productRemarkSet.remarkTitle7+':'">
<el-input <el-select
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak7" v-model="editQuery.basicPrductRemak7"
></el-input> filterable
remote
clearable="true"
reserve-keyword
placeholder="请选择物资类别"
:remote-method="findThrTypeMethod"
style="width: 80%"
>
<el-option
v-for="item in thrTypeOptions"
:key="item.code"
:label="item.name"
:value="item.code"
>
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
</el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" v-if="productRemarkSet.remarkEnable8"> <el-col :span="12" v-if="productRemarkSet.remarkEnable8">
@ -593,7 +607,7 @@ import selectErp from "./udiInfoselectErpUdi";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
import {getListMenu, getOneName} from '@/api/basic/basicHospType' import {getListMenu, getOneName} from '@/api/basic/basicHospType'
import {getHslbs} from "@/api/thrsys/thrHsfl"; import {getHslbs, getThrProductType} from "@/api/thrsys/thrHsfl";
export default { export default {
@ -654,6 +668,7 @@ export default {
}, },
loading: false, loading: false,
hsflOptions: [], hsflOptions: [],
thrTypeOptions: [],
} }
}, },
components: { components: {
@ -675,6 +690,9 @@ export default {
if (this.editQuery.basicPrductRemak8 != null) { if (this.editQuery.basicPrductRemak8 != null) {
this.findHsflMethod(this.editQuery.basicPrductRemak8); this.findHsflMethod(this.editQuery.basicPrductRemak8);
} }
if (this.editQuery.basicPrductRemak7 != null) {
this.findThrTypeMethod(this.editQuery.basicPrductRemak7);
}
}, },
methods: { methods: {
diableChange() { diableChange() {
@ -905,8 +923,23 @@ export default {
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
}); });
} },
, findThrTypeMethod(query) {
this.thrTypeOptions = [];
let cQuery = {
key: query,
page: 1,
limit: 20
};
getThrProductType(cQuery)
.then((response) => {
this.loading = false;
this.thrTypeOptions = response.data.list || [];
})
.catch(() => {
this.loading = false;
});
},
} }
} }

12
src/views/basic/product/udilnfoManageSpDetail.vue
Unescape Escape View File

@ -316,6 +316,18 @@
></el-input> ></el-input>
</div> </div>
</el-col> </el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>产品货号或编号:&nbsp;</span>
</div>
<el-input style="width: 65%" :disabled="!checked" size="small" splaceholder="请输入内容"
v-model="editQuery.cphhhbh"></el-input>
</div>
</el-col>
</el-row> </el-row>
</el-collapse-item> </el-collapse-item>

9
src/views/biz/UdiTrace.vue
Unescape Escape View File

@ -325,6 +325,15 @@
></el-input> ></el-input>
</div> </div>
</el-col> </el-col>
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>产品货号或编号:&nbsp;</span>
</div>
<el-input style="width: 65%" :disabled="!checked" size="small" splaceholder="请输入内容"
v-model="editQuery.cphhhbh"></el-input>
</div>
</el-col>
</el-row> </el-row>
</el-collapse-item> </el-collapse-item>

5
src/views/inout/DialogCreateOrder.vue
Unescape Escape View File

@ -74,7 +74,7 @@
<el-col :span="11"> <el-col :span="11">
<el-form-item prop="action" label="单据类型:"> <el-form-item prop="action" label="单据类型:">
<el-select v-model="orderFormData.action" placeholder="请选择单据类型" <el-select v-model="orderFormData.action" placeholder="请选择单据类型"
:disabled="corpOrderIdDisabled" :disabled="corpOrderIdDisabled && orderFormData.action!=null"
style="width: 90%" style="width: 90%"
@change="actionChange"> @change="actionChange">
<el-option <el-option
@ -957,6 +957,9 @@ export default {
this.refreshCodesPanel(); this.refreshCodesPanel();
// //加载选择框候选数据 // //加载选择框候选数据
this.findInvListByUser(); this.findInvListByUser();
if (this.orderFormData.action == null) {
this.getBusTypeByInv();
} else
this.initBusType(); this.initBusType();
this.findMethod(this.orderFormData.fromCorp); this.findMethod(this.orderFormData.fromCorp);

28
src/views/inout/DialogInvoice.vue
Unescape Escape View File

@ -164,18 +164,18 @@ export default {
// machineNo: [ // machineNo: [
// {required: true, message: "请输入机器编码", trigger: "blur"} // {required: true, message: "请输入机器编码", trigger: "blur"}
// ], // ],
invoiceCode: [ // invoiceCode: [
{required: true, message: "请输入发票代码", trigger: "blur"} // {required: true, message: "请输入发票代码", trigger: "blur"}
], // ],
invoiceEncode: [ invoiceEncode: [
{required: true, message: "请输入发票编码", trigger: "blur"} {required: true, message: "请输入发票编码", trigger: "blur"}
], ],
price: [ price: [
{required: true, message: "请输入发票价格", trigger: "blur"} {required: true, message: "请输入发票价格", trigger: "blur"}
], ],
remark: [ // remark: [
{required: true, message: "请输入备注", trigger: "blur"} // {required: true, message: "请输入备注", trigger: "blur"}
], // ],
}, },
loading: false, loading: false,
uploadUrl: "", uploadUrl: "",
@ -196,10 +196,10 @@ export default {
// this.$message.error("机器编码不能为空！"); // this.$message.error("机器编码不能为空！");
// return; // return;
// } // }
if (this.$isBlank(this.inputQuery.invoiceCode)) { // if (this.$isBlank(this.inputQuery.invoiceCode)) {
this.$message.error("发票代码不能为空！"); // this.$message.error("发票代码不能为空！");
return; // return;
} // }
if (this.$isBlank(this.inputQuery.invoiceEncode)) { if (this.$isBlank(this.inputQuery.invoiceEncode)) {
this.$message.error("发票编码不能为空！"); this.$message.error("发票编码不能为空！");
return; return;
@ -208,10 +208,10 @@ export default {
this.$message.error("发票价格不能为空！"); this.$message.error("发票价格不能为空！");
return; return;
} }
if (this.$isBlank(this.inputQuery.remark)) { // if (this.$isBlank(this.inputQuery.remark)) {
this.$message.error("备注不能为空！"); // this.$message.error("备注不能为空！");
return; // return;
} // }
updateById(this.inputQuery).then((res) => { updateById(this.inputQuery).then((res) => {
if (res.code == 20000) { if (res.code == 20000) {
this.$message({ this.$message({

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

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

@ -5,129 +5,45 @@
<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="100px" 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[item.columnName]" v-model="filterQuery.companyName"
:placeholder="item.columnDesc" style="width: 90%"
:disabled="executeEval(null,item.disabledFuc,false)" placeholder="请输入生产企业/代理人"
@keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
clearable
></el-input> ></el-input>
</el-form-item> </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-col>
<el-autocomplete <el-col span="6">
class="inline-input" <el-form-item label="社会信用号:">
<el-input
v-model="filterQuery.creditCode"
style="width: 90%" style="width: 90%"
v-model="queryName" placeholder="请输入社会信用号"
:fetch-suggestions="queryProductName" ></el-input>
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>
<el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`"> </el-col>
<el-col span="6">
<el-form-item label="处理状态:">
<el-select <el-select
v-model="filterQuery[item.columnName]" v-model="filterQuery.auditStatus"
:placeholder="item.columnDesc" style="width: 90%"
:disabled="executeEval(null,item.disabledFuc,false)" placeholder="请输入处理状态"
filterable >
remote <el-option label="全部" value=""></el-option>
@change="executeFuc($event,'5',item.checkRules)" <el-option label="草稿" value="0"></el-option>
:remote-method="(query) => executeFuc(query,'5',item.clickFuc)" <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="item in options[item.clickFuc]" <el-option label="已拒绝" value="2"></el-option>
: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-select>
</el-form-item> </el-form-item>
<el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`"> </el-col>
<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>
@ -156,150 +72,63 @@
style="width: 100%" style="width: 100%"
border border
highlight-current-row highlight-current-row
@current-change="(row) => executeFuc(row,'0',tableObj.handleChangeFuc)" @current-change="supManufacturerClick"
> >
<!-- <el-table-column label="序号" type="index"></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>-->
<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 <el-table-column
v-if="item.columnType == 'selection'" label="生产企业/代理人"
type="selection" prop="companyName"
:width="item.width" width="250"
:selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
></el-table-column> ></el-table-column>
<el-table-column label="社会信用号" prop="creditCode"></el-table-column>
<el-table-column <el-table-column label="企业类型" prop="bussinessStatus" width="120">
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"> <template slot-scope="scope">
<el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio> <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 <el-table-column
v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)" label="所在地址"
:prop="item.columnName" prop="placeAddress"
:label="item.columnDesc" :show-overflow-tooltip="true"
:sortable="item.sort" ></el-table-column>
: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
v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)" label="所属供应商"
:prop="item.columnName" prop="supName"
:label="item.columnDesc" show-overflow-tooltip
:sortable="item.sort" ></el-table-column>
:width="item.width" <el-table-column label="审核状态" prop="auditStatus" width="120">
:show-overflow-tooltip="item.tooltip"
:key="item.columnName"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])"> <el-tag :type="scope.row.auditStatus | statusFilterType">
<span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span> {{ checkFlag[scope.row.auditStatus] }}
</el-tag> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column
v-if="item.columnType == 'button' && executeEval(row,item.expression,true)" <el-table-column label="操作" width="120">
:prop="item.columnName"
:label="item.columnDesc"
:width="item.width"
:key="item.columnName"
fixed="right"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj" <el-button
:type="buttonItem.type" type="text"
:size="buttonItem.size" size="small"
:style="buttonItem.style" @click.native.stop="addInfoDialog(scope.row)"
:key="buttonItem" >编辑</el-button
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"> <el-button
<span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span> 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> </template>
</el-table-column> </el-table-column>
</template>
</el-table> </el-table>
<pagination <pagination
@ -337,120 +166,37 @@
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[item.columnName]" v-model="registrationQuery.recordProductName"
:placeholder="item.columnDesc" style="width: 90%"
: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-form-item v-if="item.columnType == 'input' && item.columnName =='queryName' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id"> </el-col>
<el-autocomplete <el-col span="6">
class="inline-input" <el-form-item label="注册备案号:">
<el-input
v-model="registrationQuery.recordCode"
style="width: 90%" style="width: 90%"
v-model="queryName"
:fetch-suggestions="queryProductName"
placeholder="请输入内容"
clearable clearable
@select="handleSelect" placeholder="注册备案号"
@clear="clearQueryProduct" ></el-input>
></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="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-form-item>
<el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`"> </el-col>
<el-date-picker <el-col span="6">
v-model="registrationQuery[item.columnName]" <el-form-item label="注册备案人:">
:style="`width:${item.width+'px'}`" <el-input
value-format="yyyy-MM-dd" v-model="registrationQuery.recordPeopleName"
:disabled="executeEval(null,item.disabledFuc,false)" style="width: 90%"
type="date" clearable
:placeholder="item.columnDesc" placeholder="注册备案人"
></el-date-picker> ></el-input>
</el-form-item> </el-form-item>
</template> </el-col>
</el-row> </el-row>
</el-form> </el-form>
@ -482,148 +228,61 @@
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-->
<!-- 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 <el-table-column
v-if="item.columnType == 'id' && executeEval(row,item.expression,true)" label="注册/备案产品名称"
type="index" :label="item.columnDesc"></el-table-column> prop="recordProductName"
show-overflow-tooltip
></el-table-column>
<el-table-column <el-table-column
v-if="item.columnType == 'selection'" label="规格型号"
type="selection" prop="ggxh"
:width="item.width" show-overflow-tooltip
:selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)" label="注册/备案号"
:prop="item.columnName" prop="recordCode"
:label="item.columnDesc" show-overflow-tooltip
:sortable="item.sort" ></el-table-column>
: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 <el-table-column
v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)" label="注册/备案人名称"
:prop="item.columnName" prop="recordPeopleName"
:label="item.columnDesc" show-overflow-tooltip
:sortable="item.sort" ></el-table-column>
: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
v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)" label="生产企业/代理人"
:prop="item.columnName" prop="manufacturerName"
:label="item.columnDesc" show-overflow-tooltip
:sortable="item.sort" ></el-table-column>
:width="item.width" <el-table-column
:show-overflow-tooltip="item.tooltip" label="所属供应商"
:key="item.columnName" prop="supName"
> show-overflow-tooltip
></el-table-column>
<el-table-column label="审核状态" prop="auditStatus" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])"> <el-tag :type="scope.row.auditStatus | statusFilterType">
<span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span> {{ checkFlag[scope.row.auditStatus] }}
</el-tag> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="操作" width="120">
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">
<el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj" <el-button
:type="buttonItem.type" type="text"
:size="buttonItem.size" size="small"
:style="buttonItem.style" @click.native.stop="registrationDialog(scope.row)"
:key="buttonItem" >编辑</el-button
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"> <el-button
<span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span> type="text"
size="small"
:disabled="scope.row.auditStatus === 1"
@click.native="deleteRegistration(scope.row)"
>删除
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</template>
</el-table> </el-table>
<pagination <pagination
@ -666,9 +325,6 @@ 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",
@ -734,14 +390,6 @@ export default {
}, },
registrationList: [], registrationList: [],
certTotal: 0, certTotal: 0,
tableHeader:[],
queryList:[],
fromList:[],
tableHeader2:[],
queryList2:[],
fromList2:[],
options: {
},
registrationLoading: false, registrationLoading: false,
registrationId: "", registrationId: "",
@ -832,23 +480,20 @@ export default {
hideSearch2() { hideSearch2() {
this.showSearch2 = !this.showSearch2; this.showSearch2 = !this.showSearch2;
}, },
addInfoDialog(_this,row) { addInfoDialog(row) {
if(_this == null){ if (this.$isNotBlank(row)) {
_this = this this.enterpriseId = row.id;
} this.editType = 1;
if (_this.$isNotBlank(row)) { this.inputQuery = 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;
@ -872,16 +517,16 @@ export default {
console.log(this.check); console.log(this.check);
}, },
rejectInfo(_this,row) { rejectInfo(row) {
_this.$confirm(row.auditComment, "驳回说明", { this.$confirm(row.auditComment, "驳回说明", {
confirmButtonText: "确定", confirmButtonText: "确定",
type: "warning", type: "warning",
showCancelButton: false, showCancelButton: false,
}).then(() => {}); }).then(() => {});
}, },
deleteDialog(_this,row) { deleteDialog(row) {
_this.$confirm("删除后将清空该生产企业以及所有关联信息?", "提示", { this.$confirm("删除后将清空该生产企业以及所有关联信息?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
type: "warning", type: "warning",
@ -891,17 +536,17 @@ export default {
id: row.id, id: row.id,
}; };
deleteCompany(tQuery).then(() => { deleteCompany(tQuery).then(() => {
_this.getList(); this.getList();
}); });
}) })
.catch(() => {}); .catch(() => {});
}, },
supManufacturerClick(_this,row) { supManufacturerClick(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;
}, },
/**---------------------------配送产品资质----------------------*/ /**---------------------------配送产品资质----------------------*/
@ -930,42 +575,39 @@ export default {
this.registrationQuery.page = 1; this.registrationQuery.page = 1;
this.getRegistrationList(); this.getRegistrationList();
}, },
registrationDialog(_this,row) { registrationDialog(row) {
if(_this == null){ if (this.currentManufacturer == null) {
_this = this this.$message.error("请先选中生产企业！");
}
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(_this,row) { deleteRegistration(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,
@ -973,19 +615,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(() => {});
@ -1017,15 +659,6 @@ 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,
@ -1035,21 +668,7 @@ 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=";
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(); 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();
}, },
}; };

16
src/views/purchase/manufacturer/supManufacturerAuditDialog.vue
Unescape Escape View File

@ -13,7 +13,8 @@
<el-button v-if="editType==2" type="primary" size="mini" icon="search" @click="onPassSubmit">审核通过</el-button> <el-button v-if="editType==2" type="primary" size="mini" icon="search" @click="onPassSubmit">审核通过</el-button>
<el-button v-if="editType==2" type="primary" size="mini" icon="search" @click="onRejectSubmit">审核拒绝 <el-button v-if="editType==2" type="primary" size="mini" icon="search" @click="onRejectSubmit">审核拒绝
</el-button> </el-button>
<el-button v-if="editType==1 && auditType!=1" type="primary" size="mini" icon="search" @click="printSupCertAll">打印 <el-button v-if="editType==1 && auditType!=1" type="primary" size="mini" icon="search"
@click="printSupCertAll">打印
</el-button> </el-button>
</div> </div>
<el-row :gutter="20" class="el-row" type="flex" style="margin-top: 20px"> <el-row :gutter="20" class="el-row" type="flex" style="margin-top: 20px">
@ -46,7 +47,7 @@
</el-row> </el-row>
<el-row :gutter="20" class="el-row" type="flex"> <el-row :gutter="20" class="el-row" type="flex">
<el-col :span="10" class="el-col"> <el-col :span="10" class="el-col">
<el-form-item label="企业名称:" label-width="150px" prop="companyName"> <el-form-item label="生产企业/代理人:" label-width="150px" prop="companyName">
<el-input <el-input
size="small" size="small"
placeholder="请输入内容" disabled placeholder="请输入内容" disabled
@ -200,7 +201,8 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" width="250"> <el-table-column label="操作" width="250">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="editType==1 && auditType!=1" type="text" size="small" @click.native="printSupCert(scope.row)">打印 <el-button v-if="editType==1 && auditType!=1" type="text" size="small"
@click.native="printSupCert(scope.row)">打印
</el-button> </el-button>
<el-button type="text" size="small" v-if="editType==2" @click.native="auditCert(scope.row)">编辑</el-button> <el-button type="text" size="small" v-if="editType==2" @click.native="auditCert(scope.row)">编辑</el-button>
<el-button <el-button
@ -215,6 +217,12 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-image-viewer
v-if="imgViewer"
style="z-index: 9999"
:on-close="closeImgViewer"
:url-list="imgList"
/>
<el-pagination <el-pagination
:page-size="certQuery.limit" :page-size="certQuery.limit"
@current-change="certHandleCurrentChange" @current-change="certHandleCurrentChange"
@ -368,6 +376,7 @@ export default {
selectedOptions: [], selectedOptions: [],
selectedOptions2: [], selectedOptions2: [],
imgViewerVisible: false, imgViewerVisible: false,
imgViewer: false,
imgList: [], imgList: [],
options: regionDataPlus, options: regionDataPlus,
rules: { rules: {
@ -566,6 +575,7 @@ export default {
} }
}); });
this.imgViewerVisible = true; this.imgViewerVisible = true;
this.imgViewer = true
const m = (e) => { const m = (e) => {
e.preventDefault() e.preventDefault()
}; };

4
src/views/purchase/manufacturer/supManufacturerEditDialog.vue
Unescape Escape View File

@ -69,10 +69,10 @@
</el-row> </el-row>
<el-row :gutter="20" class="el-row" type="flex"> <el-row :gutter="20" class="el-row" type="flex">
<el-col :span="10" class="el-col"> <el-col :span="10" class="el-col">
<el-form-item label="生产企业:" label-width="150px" prop="companyName"> <el-form-item label="生产企业/代理人:" label-width="150px" prop="companyName">
<el-input <el-input
size="small" size="small"
placeholder="请输入生产企业" placeholder="请输入生产企业/代理人"
v-model.trim="inputQuery.companyName" v-model.trim="inputQuery.companyName"
@input="change()" @input="change()"
></el-input> ></el-input>

9
src/views/supplier/company/SelectDIDetailDialog.vue
Unescape Escape View File

@ -295,6 +295,15 @@
></el-input> ></el-input>
</div> </div>
</el-col> </el-col>
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>产品货号或编号:&nbsp;</span>
</div>
<el-input style="width: 65%" :disabled="!checked" size="small" splaceholder="请输入内容"
v-model="editQuery.cphhhbh"></el-input>
</div>
</el-col>
</el-row> </el-row>
</el-collapse-item> </el-collapse-item>

9
src/views/supplier/company/ThrProductsAdd.vue
Unescape Escape View File

@ -274,6 +274,15 @@
></el-input> ></el-input>
</div> </div>
</el-col> </el-col>
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>产品货号或编号:&nbsp;</span>
</div>
<el-input style="width: 65%" :disabled="!checked" size="small" splaceholder="请输入内容"
v-model="editQuery.cphhhbh"></el-input>
</div>
</el-col>
</el-row> </el-row>
</div> </div>

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

@ -1,145 +1,68 @@
<template> <template>
<div> <div>
<el-card> <el-card>
<el-form v-if="queryList && queryList.length > 0" :model="filterQuery" size="mini" label-width="120px" v-show="showSearch"> <el-form :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-form-item v-if="item.columnType == 'input' && item.columnName =='queryName' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id"> </el-col>
<el-autocomplete <el-col :span="6">
class="inline-input" <el-form-item label="物资名称:">
style="width: 90%" <el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入物资名称"
v-model="queryName" clearable="true"></el-input>
:fetch-suggestions="queryProductName"
placeholder="请输入内容"
clearable
@select="handleSelect"
@clear="clearQueryProduct"
></el-autocomplete>
</el-form-item> </el-form-item>
<el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`"> </el-col>
<el-select v-model="filterQuery[item.columnName]" <el-col :span="6">
:placeholder="item.columnDesc" <el-form-item label="规格型号:">
@change="executeFuc($event,'5',item.checkRules)" <el-input v-model="filterQuery.ggxh" style="width: 90%" placeholder="请输入规格型号" clearable="true"></el-input>
: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>
<el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`"> </el-col>
<el-select <el-col :span="6">
v-model="filterQuery[item.columnName]" <el-form-item label="对照条件:">
:placeholder="item.columnDesc" <el-select v-model="filterQuery.filterType" style="width: 90%" placeholder="请选择过滤对照条件">
: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 <el-option
v-for="item in options[item.clickFuc]" v-for="item in filterList"
:key="item.code" :key="item.filterType"
:label="item.label" :label="item.sysName"
:value="item.code" :value="item.filterType">
/> <span style="float: left">{{ item.sysName }}</span>
<span style="float: left">{{ item.name }}</span> </el-option>
<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-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`"> </el-col>
<el-date-picker </el-row>
:picker-options="pickerOptions" <el-row>
v-model="actDateRange" <el-col :span="6">
type="daterange" <el-form-item label="生产企业:">
format="yyyy 年 MM 月 dd 日" <el-input v-model="filterQuery.ylqxzcrbarmc" style="width: 90%" placeholder="请输入生产企业/注册备案人"
value-format="yyyy-MM-dd" clearable="true"></el-input>
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`"> </el-col>
<el-date-picker <el-col :span="6">
v-model="filterQuery[item.columnName]" <el-form-item label="生产企业:">
:style="`width:${item.width+'px'}`" <el-input v-model="filterQuery.zczbhhzbapzbh" style="width: 90%" placeholder="请输入生产企业/注册备案人"
value-format="yyyy-MM-dd" clearable="true"></el-input>
:disabled="executeEval(null,item.disabledFuc,false)"
type="date"
:placeholder="item.columnDesc"
></el-date-picker>
</el-form-item> </el-form-item>
</template> </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>
</el-form> </el-form>
<div class="top-right-btn"> <div class="top-right-btn">
@ -154,126 +77,21 @@
<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">-->
<!-- {{ 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"> <template slot-scope="scope">
<el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])"> {{ lockStatusMap[scope.row.lockStatus] }}
<span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column width="180" label="操作" fixed="right">
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">
<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"
@ -303,22 +121,22 @@
<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"-->
<!-- @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> </template>
</el-table-column> </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>
@ -465,7 +283,7 @@ import {
updateErpProduct, updateErpProduct,
uploadSmp, uploadSmp,
thirdSysDetail, thirdSysDetail,
removeRl, sysFilterOptimize , spcombie, lockStatus, removeDiRl removeRl, sysFilter, spcombie, lockStatus, removeDiRl
} from "../../../api/basic/udiRelevance"; } from "../../../api/basic/udiRelevance";
import store from "../../../store/index"; import store from "../../../store/index";
import { import {
@ -483,9 +301,7 @@ 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() {
@ -521,13 +337,6 @@ 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,
@ -954,11 +763,11 @@ export default {
this.sysList = []; this.sysList = [];
}); });
}, },
getSysFilter(_this) { getSysFilter() {
sysFilterOptimize() sysFilter()
.then((response) => { .then((response) => {
_this.loading = false; this.loading = false;
_this.options.getSysFilter = response.data.list || []; this.filterList = response.data.list || [];
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
@ -1079,15 +888,7 @@ 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() {
@ -1106,17 +907,9 @@ export default {
, ,
created() { created() {
this.findBasicProductSet(); this.findBasicProductSet();
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.getList();
});
this.selectSysParam(); this.selectSysParam();
this.getSysFilter(this); this.getSysFilter();
} }
, ,
} }

120
src/views/supplier/company/basicCompanyProductsImport.vue
Unescape Escape View File

@ -420,7 +420,18 @@
></el-input> ></el-input>
</div> </div>
</el-col> </el-col>
<el-col :span="12">
<div class="text item">
<div class="itemTag">
<span>是否可集采:&nbsp;</span>
</div>
<el-radio-group v-model="repEditQuery.groupBuy" style="margin-top: 10px">
<el-radio :label="true">是</el-radio>
<el-radio :label="false">否</el-radio>
</el-radio-group>
</div>
</el-col>
</el-row> </el-row>
@ -507,12 +518,15 @@
<div class="itemTag"> <div class="itemTag">
<span>{{ productRemarkSet.remarkTitle6 }}:&nbsp;</span> <span>{{ productRemarkSet.remarkTitle6 }}:&nbsp;</span>
</div> </div>
<el-input <el-select
style="width: 65%"
size="small"
splaceholder="请输入内容"
v-model="repEditQuery.basicPrductRemak6" v-model="repEditQuery.basicPrductRemak6"
></el-input> placeholder="请选择"
clearable
style="width: 65%"
>
<el-option label="扣费" value="1"></el-option>
<el-option label="不扣费" value="0"></el-option>
</el-select>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
@ -524,26 +538,56 @@
<div class="itemTag"> <div class="itemTag">
<span>{{ productRemarkSet.remarkTitle7 }}:&nbsp;</span> <span>{{ productRemarkSet.remarkTitle7 }}:&nbsp;</span>
</div> </div>
<el-input <el-select
style="width: 65%"
size="small"
splaceholder="请输入内容"
v-model="repEditQuery.basicPrductRemak7" v-model="repEditQuery.basicPrductRemak7"
></el-input> filterable
remote
clearable="true"
reserve-keyword
placeholder="请选择物资类别"
:remote-method="findThrTypeMethod"
style="width: 65%"
>
<el-option
v-for="item in thrTypeOptions"
:key="item.code"
:label="item.name"
:value="item.code"
>
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
</el-option>
</el-select>
</div> </div>
</el-col> </el-col>
<el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable8"> <el-col :span="12" class="el-col"
v-if="productRemarkSet.remarkEnable8 && repEditQuery.basicPrductRemak6=='1'">
<div class="text item"> <div class="text item">
<div class="itemTag"> <div class="itemTag">
<span>{{ productRemarkSet.remarkTitle8 }}:&nbsp;</span> <span>{{ productRemarkSet.remarkTitle8 }}:&nbsp;</span>
</div> </div>
<el-input <el-select
style="width: 65%"
size="small"
splaceholder="请输入内容"
v-model="repEditQuery.basicPrductRemak8" v-model="repEditQuery.basicPrductRemak8"
></el-input> filterable
remote
style="width: 65%"
clearable="true"
reserve-keyword
placeholder="请选择物价类别"
:remote-method="findHsflMethod"
>
<el-option
v-for="item in hsflOptions"
:key="item.hsbm"
:label="item.hsmc"
:value="item.hsbm"
>
<span style="float: left">{{ item.hsmc }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.hsbm }}</span>
</el-option>
</el-select>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
@ -560,6 +604,7 @@ import {filterByUuid} from "../../../api/basic/udiInfo";
import {insertCompanyProductRelevance, insertFilter} from "../../../api/basic/companyProductRelevance"; import {insertCompanyProductRelevance, insertFilter} from "../../../api/basic/companyProductRelevance";
import store from "../../../store"; import store from "../../../store";
import {isBlank} from "@/utils/strUtil"; import {isBlank} from "@/utils/strUtil";
import {getHslbs, getThrProductType} from "@/api/thrsys/thrHsfl";
export default { export default {
name: "UdIInfoSelect", name: "UdIInfoSelect",
@ -599,7 +644,7 @@ export default {
supplementRequest: null, supplementRequest: null,
}, },
loading: false, loading: false,
editQuery: null, editQuery: {},
repEditQuery: { repEditQuery: {
sptm: null, sptm: null,
ybbm: null, ybbm: null,
@ -652,6 +697,8 @@ export default {
selectLocalVisible: false, selectLocalVisible: false,
productRemarkSet: {}, productRemarkSet: {},
supplementRequest: null, supplementRequest: null,
hsflOptions: [],
thrTypeOptions: [],
}; };
}, },
@ -750,6 +797,7 @@ export default {
}, },
allExport() { allExport() {
debugger
this.postQuery.customerId = store.getters.customerId; this.postQuery.customerId = store.getters.customerId;
this.postQuery.supplementRequest = this.repEditQuery; this.postQuery.supplementRequest = this.repEditQuery;
insertFilter(this.postQuery).then(response => { insertFilter(this.postQuery).then(response => {
@ -943,6 +991,39 @@ export default {
} }
}); });
}, },
findHsflMethod(query) {
this.hsflOptions = [];
let cQuery = {
key: query,
page: 1,
limit: 20
};
getHslbs(cQuery)
.then((response) => {
this.loading = false;
this.hsflOptions = response.data.list || [];
})
.catch(() => {
this.loading = false;
});
}
,
findThrTypeMethod(query) {
this.thrTypeOptions = [];
let cQuery = {
key: query,
page: 1,
limit: 20
};
getThrProductType(cQuery)
.then((response) => {
this.loading = false;
this.thrTypeOptions = response.data.list || [];
})
.catch(() => {
this.loading = false;
});
},
}, },
mounted() { mounted() {
}, },
@ -950,7 +1031,10 @@ export default {
created() { created() {
this.selectSysParam(); this.selectSysParam();
this.findBasicProductSet(); this.findBasicProductSet();
this.findHsflMethod(this.repEditQuery.basicPrductRemak8);
// }
// if (this.editQuery.basicPrductRemak7 != null) {
this.findThrTypeMethod(this.repEditQuery.basicPrductRemak7);
}, },
}; };
</script> </script>

11
src/views/supplier/company/basicCompanyproductDetail.vue
Unescape Escape View File

@ -508,6 +508,15 @@
></el-input> ></el-input>
</div> </div>
</el-col> </el-col>
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>产品货号或编号:&nbsp;</span>
</div>
<el-input style="width: 65%" :disabled="!checked" size="small" splaceholder="请输入内容"
v-model="editQuery.cphhhbh"></el-input>
</div>
</el-col>
</el-row> </el-row>
<el-row :gutter="20" class="el-row" type="flex"> <el-row :gutter="20" class="el-row" type="flex">
@ -782,7 +791,7 @@
<el-collapse-item name="6"> <el-collapse-item name="6">
<template slot="title"> <template slot="title">
<p class="form-title">版本信息</p> <p class="form-title">国家DI标识数据库版本信息</p>
</template> </template>
<el-row :gutter="20" class="el-row" type="flex"> <el-row :gutter="20" class="el-row" type="flex">

70
src/views/supplier/company/basicCompanyproductEdit.vue
Unescape Escape View File

@ -140,27 +140,44 @@
</el-col> </el-col>
<el-col :span="12" v-if="productRemarkSet.remarkEnable6"> <el-col :span="12" v-if="productRemarkSet.remarkEnable6">
<el-form-item :label="productRemarkSet.remarkTitle6+':'"> <el-form-item :label="productRemarkSet.remarkTitle6+':'">
<el-input <el-select
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak6" v-model="editQuery.basicPrductRemak6"
></el-input> placeholder="请选择"
clearable
style="width: 80%"
>
<el-option label="扣费" value="1"></el-option>
<el-option label="不扣费" value="0"></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row type="flex" class="edit-row"> <el-row type="flex" class="edit-row">
<el-col :span="12" v-if="productRemarkSet.remarkEnable7"> <el-col :span="12" v-if="productRemarkSet.remarkEnable7">
<el-form-item :label="productRemarkSet.remarkTitle7+':'"> <el-form-item :label="productRemarkSet.remarkTitle7+':'">
<el-input <el-select
style="width: 80%"
size="small"
splaceholder="请输入内容"
v-model="editQuery.basicPrductRemak7" v-model="editQuery.basicPrductRemak7"
></el-input> filterable
remote
clearable="true"
reserve-keyword
placeholder="请选择物资类别"
:remote-method="findThrTypeMethod"
style="width: 80%"
>
<el-option
v-for="item in thrTypeOptions"
:key="item.code"
:label="item.name"
:value="item.code"
>
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
</el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" v-if="productRemarkSet.remarkEnable8"> <el-col :span="12" v-if="productRemarkSet.remarkEnable8==true && editQuery.basicPrductRemak6=='1'">
<el-form-item :label="productRemarkSet.remarkTitle8+':'"> <el-form-item :label="productRemarkSet.remarkTitle8+':'">
<el-select <el-select
v-model="editQuery.basicPrductRemak8" v-model="editQuery.basicPrductRemak8"
@ -245,7 +262,7 @@ import {updateById} from '@/api/basic/udiRelevance'
import {filterByUuid} from '@/api/basic/udiInfo' import {filterByUuid} from '@/api/basic/udiInfo'
import selectErp from "./udiInfoselectErpUdi"; import selectErp from "./udiInfoselectErpUdi";
import selectUdiVersion from '@/views/basic/product/UdiinfoSelectVersion' import selectUdiVersion from '@/views/basic/product/UdiinfoSelectVersion'
import {getHslbs} from "@/api/thrsys/thrHsfl"; import {getHslbs, getThrProductType} from "@/api/thrsys/thrHsfl";
export default { export default {
name: 'productEdit', name: 'productEdit',
@ -293,6 +310,7 @@ export default {
editSingleDiDialogVisible: false, editSingleDiDialogVisible: false,
selectErpDialogVisible: false, //选入ERP产品 selectErpDialogVisible: false, //选入ERP产品
hsflOptions: [], hsflOptions: [],
thrTypeOptions: [],
} }
}, },
@ -300,6 +318,7 @@ export default {
submitUpload() { submitUpload() {
var data = { var data = {
id: this.editQuery.prid, id: this.editQuery.prid,
uid: this.editQuery.rlId,
sptm: this.editQuery.sptm, sptm: this.editQuery.sptm,
spmc: this.editQuery.spmc, spmc: this.editQuery.spmc,
measname: this.editQuery.measname, measname: this.editQuery.measname,
@ -446,8 +465,24 @@ export default {
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
}); });
} },
,
findThrTypeMethod(query) {
this.thrTypeOptions = [];
let cQuery = {
key: query,
page: 1,
limit: 20
};
getThrProductType(cQuery)
.then((response) => {
this.loading = false;
this.thrTypeOptions = response.data.list || [];
})
.catch(() => {
this.loading = false;
});
},
}, },
components: { components: {
@ -461,9 +496,12 @@ export default {
limit: 10, limit: 10,
}; };
this.getDetailList(ttquery); this.getDetailList(ttquery);
if (this.editQuery.basicPrductRemak8 != null) { // if (this.editQuery.basicPrductRemak8 != null) {
this.findHsflMethod(this.editQuery.basicPrductRemak8); this.findHsflMethod(this.editQuery.basicPrductRemak8);
} // }
// if (this.editQuery.basicPrductRemak7 != null) {
this.findThrTypeMethod(this.editQuery.basicPrductRemak7);
// }
}, },
} }

3
src/views/supplier/company/basicProductEdit.vue
Unescape Escape View File

@ -197,6 +197,7 @@
></el-input> ></el-input>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20" class="el-row" type="flex"> <el-row :gutter="20" class="el-row" type="flex">
@ -712,7 +713,7 @@
<el-collapse-item name="5"> <el-collapse-item name="5">
<template slot="title"> <template slot="title">
<p class="form-title">版本信息</p> <p class="form-title">国家DI标识数据库版本信息</p>
</template> </template>
<el-row :gutter="20" class="el-row" type="flex"> <el-row :gutter="20" class="el-row" type="flex">
<el-col :span="8" class="el-col"> <el-col :span="8" class="el-col">

9
src/views/supplier/products/selectDIDetailDialog.vue
Unescape Escape View File

@ -347,6 +347,15 @@
v-model="editQuery.cpms"></el-input> v-model="editQuery.cpms"></el-input>
</div> </div>
</el-col> </el-col>
<el-col :span="12" class="el-col">
<div class="text item">
<div class="itemTag">
<span>产品货号或编号:&nbsp;</span>
</div>
<el-input style="width: 65%" :disabled="!checked" size="small" splaceholder="请输入内容"
v-model="editQuery.cphhhbh"></el-input>
</div>
</el-col>
</el-row> </el-row>
</el-collapse-item> </el-collapse-item>

70
src/views/supplier/products/supAddDiProductSelectUdi.vue
Unescape Escape View File

@ -197,6 +197,18 @@
v-model="editQuery.price"></el-input> v-model="editQuery.price"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item
label="是否可集采:"
prop="groupBuy"
class="query-form-item"
>
<el-radio-group v-model="editQuery.groupBuy">
<el-radio :label="true">是</el-radio>
<el-radio :label="false">否</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
@ -241,8 +253,15 @@
<el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable6"> <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable6">
<el-form-item :label="productRemarkSet.remarkTitle6"> <el-form-item :label="productRemarkSet.remarkTitle6">
<el-input style="width: 65%" size="small" splaceholder="请输入内容" <el-select
v-model="editQuery.basicPrductRemak6"></el-input> v-model="editQuery.basicPrductRemak6"
placeholder="请选择"
clearable
style="width: 80%"
>
<el-option label="扣费" value="1"></el-option>
<el-option label="不扣费" value="0"></el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@ -250,12 +269,31 @@
<el-row> <el-row>
<el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable7"> <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable7">
<el-form-item :label="productRemarkSet.remarkTitle7 "> <el-form-item :label="productRemarkSet.remarkTitle7 ">
<el-input style="width: 65%" size="small" splaceholder="请输入内容" <el-select
v-model="editQuery.basicPrductRemak7"></el-input> v-model="editQuery.basicPrductRemak7"
filterable
remote
clearable="true"
reserve-keyword
placeholder="请选择物资类别"
:remote-method="findThrTypeMethod"
style="width: 80%"
>
<el-option
v-for="item in thrTypeOptions"
:key="item.code"
:label="item.name"
:value="item.code"
>
<span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
</el-option>
</el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable8"> <el-col :span="12" class="el-col"
v-if="productRemarkSet.remarkEnable8==true && editQuery.basicPrductRemak6=='1'">
<el-form-item :label="productRemarkSet.remarkTitle8"> <el-form-item :label="productRemarkSet.remarkTitle8">
<el-select <el-select
v-model="editQuery.basicPrductRemak8" v-model="editQuery.basicPrductRemak8"
@ -310,7 +348,7 @@ import selectDiDetail from './selectDIDetailDialog'
import store from '@/store' import store from '@/store'
import {getBasicThirdSys} from '@/api/basic/basicThirdSys' import {getBasicThirdSys} from '@/api/basic/basicThirdSys'
import {finProductSet} from '@/api/param/systemParamConfig' import {finProductSet} from '@/api/param/systemParamConfig'
import {getHslbs} from "@/api/thrsys/thrHsfl"; import {getHslbs, getThrProductType} from "@/api/thrsys/thrHsfl";
export default { export default {
name: 'closeDialog', name: 'closeDialog',
@ -393,6 +431,7 @@ export default {
selectThirdSys: [], selectThirdSys: [],
productRemarkSet: {}, productRemarkSet: {},
hsflOptions: [], hsflOptions: [],
thrTypeOptions: [],
} }
}, },
methods: { methods: {
@ -630,8 +669,23 @@ export default {
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
}); });
} },
, findThrTypeMethod(query) {
this.thrTypeOptions = [];
let cQuery = {
key: query,
page: 1,
limit: 20
};
getThrProductType(cQuery)
.then((response) => {
this.loading = false;
this.thrTypeOptions = response.data.list || [];
})
.catch(() => {
this.loading = false;
});
},
}, },
created() { created() {

Write Preview
Loading…
Cancel
Save