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

物资入院申请新增字段

Browse Source
dev2.0.1
anthonywj 1 year ago
parent 9d8294938f
commit 653903b46b
3 changed files with 401 additions and 334 deletions
Show Stats Download Patch File Download Diff File

9
.env.production
Unescape Escape View File

@ -23,7 +23,7 @@ ENV = 'production'
# 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://dm.xmglxp.com:8081/UDI_SPMS_SERVER/' # VUE_APP_BASE_API = 'http://dm.xmglxp.com:8081/UDI_SPMS_SERVER/'
@ -33,8 +33,7 @@ VUE_APP_BASE_API = 'http://139.159.247.26:9150/UDI_SPMS_SERVER/'
# VUE_APP_BASE_API = 'http://139.9.174.242:9150/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://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://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://192.168.0.72:9150/UDI_SPMS_SERVER/'
@ -52,10 +51,10 @@ VUE_APP_BASE_API = 'http://139.159.247.26: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'

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

@ -1,7 +1,8 @@
<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 v-if="queryList && queryList.length > 0" :model="filterQuery" size="mini" label-width="120px"
v-show="showSearch">
<!-- <el-row>--> <!-- <el-row>-->
<!-- <el-col :span="6">--> <!-- <el-col :span="6">-->
<!-- <el-form-item label="物资编码:">--> <!-- <el-form-item label="物资编码:">-->
@ -59,8 +60,10 @@
<!-- </el-col>--> <!-- </el-col>-->
<!-- </el-row>--> <!-- </el-row>-->
<el-row style=" display:flex; flex-wrap: wrap; "> <el-row style=" display:flex; flex-wrap: wrap; ">
<template v-for="(item, index) in queryList" > <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-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[item.columnName]"
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
@ -69,7 +72,9 @@
clearable 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-form-item
v-if="item.columnType == 'input' && item.columnName =='queryName' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`" :key="item.id">
<el-autocomplete <el-autocomplete
class="inline-input" class="inline-input"
style="width: 90%" style="width: 90%"
@ -81,7 +86,8 @@
@clear="clearQueryProduct" @clear="clearQueryProduct"
></el-autocomplete> ></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-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`">
<el-select v-model="filterQuery[item.columnName]" <el-select v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
@change="executeFuc($event,'5',item.checkRules)" @change="executeFuc($event,'5',item.checkRules)"
@ -94,10 +100,13 @@
:value="dict.value" :value="dict.value"
/> />
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.name }}</span>
<span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</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 == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`"> <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`">
<el-select <el-select
v-model="filterQuery[item.columnName]" v-model="filterQuery[item.columnName]"
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
@ -114,10 +123,13 @@
:value="item.code" :value="item.code"
/> />
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.name }}</span>
<span v-if="item.isShowXx == '1'" style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</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-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`">
<el-date-picker <el-date-picker
:picker-options="pickerOptions" :picker-options="pickerOptions"
v-model="actDateRange" v-model="actDateRange"
@ -129,7 +141,8 @@
end-placeholder="结束日期" end-placeholder="结束日期"
></el-date-picker> ></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-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)"
:label="item.columnDesc+`:`">
<el-date-picker <el-date-picker
v-model="filterQuery[item.columnName]" v-model="filterQuery[item.columnName]"
:style="`width:${item.width+'px'}`" :style="`width:${item.width+'px'}`"
@ -139,82 +152,82 @@
:placeholder="item.columnDesc" :placeholder="item.columnDesc"
></el-date-picker> ></el-date-picker>
</el-form-item> </el-form-item>
</template> </template>
</el-row> </el-row>
</el-form> </el-form>
<div class="top-right-btn"> <div class="top-right-btn">
<el-button-group style="display:flex;"> <el-button-group style="display:flex;">
<el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button> <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button> <el-button type="primary" icon="el-icon-refresh" @click="onReset">重置</el-button>
<el-button type="primary" icon="el-icon-search" @click="search">查询</el-button> <el-button type="primary" icon="el-icon-search" @click="search">查询</el-button>
<el-button type="primary" icon="el-icon-bottom-right" @click="selectProduct()">选入</el-button> <el-button type="primary" icon="el-icon-bottom-right" @click="selectProduct()">选入</el-button>
</el-button-group> </el-button-group>
</div> </div>
<el-divider style="margin: 15px"></el-divider> <el-divider style="margin: 15px"></el-divider>
<el-table v-loading="loading" :data="list" style="width: 100%" @selection-change="handleSelectionChange" border <el-table v-loading="loading" :data="list" style="width: 100%" @selection-change="handleSelectionChange" border
highlight-current-row> highlight-current-row>
<!-- <el-table-column label="序号" type="index"></el-table-column>--> <!-- <el-table-column label="序号" type="index"></el-table-column>-->
<!-- <el-table-column label="最小销售产品标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>--> <!-- <el-table-column label="最小销售产品标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>-->
<!-- <el-table-column label="物资编码" prop="thirdId" show-overflow-tooltip></el-table-column>--> <!-- <el-table-column label="物资编码" prop="thirdId" show-overflow-tooltip></el-table-column>-->
<!-- <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>--> <!-- <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip></el-table-column>-->
<!-- <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>--> <!-- <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>-->
<!-- <el-table-column label="价格" prop="price" show-overflow-tooltip></el-table-column>--> <!-- <el-table-column label="价格" prop="price" show-overflow-tooltip></el-table-column>-->
<!-- <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>--> <!-- <el-table-column label="生产企业" prop="ylqxzcrbarmc" show-overflow-tooltip></el-table-column>-->
<!-- <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>--> <!-- <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>-->
<!-- <el-table-column label="物资分类" prop="classifyName" show-overflow-tooltip></el-table-column>--> <!-- <el-table-column label="物资分类" prop="classifyName" show-overflow-tooltip></el-table-column>-->
<!-- <el-table-column v-if="isSpCombine" label="锁定状态" prop="lockStatus" show-overflow-tooltip>--> <!-- <el-table-column v-if="isSpCombine" label="锁定状态" prop="lockStatus" show-overflow-tooltip>-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- {{ lockStatusMap[scope.row.lockStatus] }}--> <!-- {{ lockStatusMap[scope.row.lockStatus] }}-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<!-- <el-table-column width="180" label="操作" fixed="right">--> <!-- <el-table-column width="180" label="操作" fixed="right">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <el-button v-if="isSpCombine" type="text" size="small"--> <!-- <el-button v-if="isSpCombine" type="text" size="small"-->
<!-- :disabled="scope.row.originUuid!=null || scope.row.lockStatus===3"--> <!-- :disabled="scope.row.originUuid!=null || scope.row.lockStatus===3"-->
<!-- @click.native.stop="intentSelectUdi(scope.row)">关联DI--> <!-- @click.native.stop="intentSelectUdi(scope.row)">关联DI-->
<!-- </el-button>--> <!-- </el-button>-->
<!-- <el-button type="text" size="small" :disabled="scope.row.lockStatus==3"--> <!-- <el-button type="text" size="small" :disabled="scope.row.lockStatus==3"-->
<!-- @click.native.stop="handleModifyClick(scope.row)">编辑--> <!-- @click.native.stop="handleModifyClick(scope.row)">编辑-->
<!-- </el-button>--> <!-- </el-button>-->
<!-- <el-button type="text" size="small"--> <!-- <el-button type="text" size="small"-->
<!-- @click.native.stop="handleDetailClick(scope.row)">详情--> <!-- @click.native.stop="handleDetailClick(scope.row)">详情-->
<!-- </el-button>--> <!-- </el-button>-->
<!-- <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"--> <!-- <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)"-->
<!-- >--> <!-- >-->
<!-- <span class="el-dropdown-link">--> <!-- <span class="el-dropdown-link">-->
<!-- <i class="el-icon-d-arrow-right el-icon&#45;&#45;right"></i>更多--> <!-- <i class="el-icon-d-arrow-right el-icon&#45;&#45;right"></i>更多-->
<!-- </span>--> <!-- </span>-->
<!-- <el-dropdown-menu slot="dropdown">--> <!-- <el-dropdown-menu slot="dropdown">-->
<!-- &lt;!&ndash; <el-dropdown-item command="handleDetailClick" v-if=" scope.row.lockStatus!=3">详情</el-dropdown-item>&ndash;&gt;--> <!-- &lt;!&ndash; <el-dropdown-item command="handleDetailClick" v-if=" scope.row.lockStatus!=3">详情</el-dropdown-item>&ndash;&gt;-->
<!-- <el-dropdown-item command="sumitLockStatus" v-if="isSpCombine" :disabled="scope.row.lockStatus===3">--> <!-- <el-dropdown-item command="sumitLockStatus" v-if="isSpCombine" :disabled="scope.row.lockStatus===3">-->
<!-- 提交审核--> <!-- 提交审核-->
<!-- </el-dropdown-item>--> <!-- </el-dropdown-item>-->
<!-- <el-dropdown-item command="splitSelectUdi" v-if="isSpCombine" type="text" size="small"--> <!-- <el-dropdown-item command="splitSelectUdi" v-if="isSpCombine" type="text" size="small"-->
<!-- :disabled="scope.row.thirdId===scope.row.nameCode || scope.row.thirdId==null || scope.row.nameCode==null || scope.row.lockStatus===3">--> <!-- :disabled="scope.row.thirdId===scope.row.nameCode || scope.row.thirdId==null || scope.row.nameCode==null || scope.row.lockStatus===3">-->
<!-- 拆分产品--> <!-- 拆分产品-->
<!-- </el-dropdown-item>--> <!-- </el-dropdown-item>-->
<!-- <el-dropdown-item command="deleteCompanyProductRelevance">移除</el-dropdown-item>--> <!-- <el-dropdown-item command="deleteCompanyProductRelevance">移除</el-dropdown-item>-->
<!-- </el-dropdown-menu>--> <!-- </el-dropdown-menu>-->
<!-- </el-dropdown>--> <!-- </el-dropdown>-->
<!-- &lt;!&ndash; <el-button v-if=" scope.row.lockStatus!=3" type="text" size="small"&ndash;&gt;--> <!-- &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; @click.native.stop="handleDetailClick(scope.row)">详情&ndash;&gt;-->
<!-- &lt;!&ndash; </el-button>&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; <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; @click.native.stop="sumitLockStatus(scope.row)">提交审核&ndash;&gt;-->
<!-- &lt;!&ndash; </el-button>&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; <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; :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; 拆分产品&ndash;&gt;-->
<!-- &lt;!&ndash; </el-button>&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 type="text" size="small" @click.native.stop="deleteCompanyProductRelevance(scope.row)">移除&ndash;&gt;-->
<!-- &lt;!&ndash; </el-button>&ndash;&gt;--> <!-- &lt;!&ndash; </el-button>&ndash;&gt;-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<template v-for="(item, index) in tableHeader"> <template v-for="(item, index) in tableHeader">
<el-table-column <el-table-column
v-if="item.columnType == 'id' && executeEval(row,item.expression,true)" v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
type="index" :label="item.columnDesc"></el-table-column> type="index" :label="item.columnDesc"></el-table-column>
@ -248,7 +261,9 @@
:key="item.columnName" :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 :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{
item.lableRuleObj[scope.row[item.columnName]]
}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@ -261,8 +276,11 @@
:key="item.columnName" :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
<span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span> :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> </el-tag>
</template> </template>
</el-table-column> </el-table-column>
@ -315,23 +333,25 @@
:key="item.columnName" :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> <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
scope.row[item.columnName]
}}</span>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
</el-table> </el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
:limit.sync="filterQuery.limit" :limit.sync="filterQuery.limit"
:page.sync="filterQuery.page" :page.sync="filterQuery.page"
@pagination="handleCurrentChange" @pagination="handleCurrentChange"
></pagination> ></pagination>
<el-dialog <el-dialog
title="产品信息编辑" title="产品信息编辑"
:visible.sync="editDialogVisible" :visible.sync="editDialogVisible"
width="80%" width="80%"
@ -339,49 +359,49 @@
:close-on-press-escape="false" :close-on-press-escape="false"
v-if="editDialogVisible" v-if="editDialogVisible"
:before-close="refresh" :before-close="refresh"
> >
<basicProductEdit <basicProductEdit
:productRemarkSet="productRemarkSet" :productRemarkSet="productRemarkSet"
:editQuery="editQuery" :editQuery="editQuery"
:closeDialog="closeDialog"> :closeDialog="closeDialog">
</basicProductEdit> </basicProductEdit>
</el-dialog> </el-dialog>
<el-dialog <el-dialog
title="产品信息详情" title="产品信息详情"
:visible.sync="detailDialogVisible" :visible.sync="detailDialogVisible"
width="70%" width="70%"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
v-if="detailDialogVisible" v-if="detailDialogVisible"
> >
<basicProductDetail <basicProductDetail
:productRemarkSet="productRemarkSet" :productRemarkSet="productRemarkSet"
:editQuery="editQuery" :editQuery="editQuery"
:closeDialog="closeDialog"> :closeDialog="closeDialog">
> >
</basicProductDetail> </basicProductDetail>
</el-dialog> </el-dialog>
<el-dialog <el-dialog
title="关联选入耗材信息" title="关联选入耗材信息"
:visible.sync="selectUdiDialogVisible" :visible.sync="selectUdiDialogVisible"
width="85%" width="85%"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
v-if="selectUdiDialogVisible" v-if="selectUdiDialogVisible"
> >
<selectUdi @closeUdi="closeUdi" :isImportUdi="isImportUdi"></selectUdi> <selectUdi @closeUdi="closeUdi" :isImportUdi="isImportUdi"></selectUdi>
</el-dialog> </el-dialog>
<el-dialog <el-dialog
:title="selectErpTitle" :title="selectErpTitle"
:visible.sync="selectErpDialogVisible" :visible.sync="selectErpDialogVisible"
width="85%" width="85%"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
v-if="selectErpDialogVisible" v-if="selectErpDialogVisible"
> >
<selectErp <selectErp
:closeDialog="closeDialog" :closeDialog="closeDialog"
:uuid="uuid" :uuid="uuid"
:relId="relId" :relId="relId"
@ -391,17 +411,17 @@
:defaultSys="defaultSys" :defaultSys="defaultSys"
@closeUdi="closeUdi" @closeUdi="closeUdi"
:supEnable="true" :supEnable="true"
></selectErp> ></selectErp>
</el-dialog> </el-dialog>
<el-dialog <el-dialog
title="选入DI器械信息" title="选入DI器械信息"
:visible.sync="selectLocalVisible" :visible.sync="selectLocalVisible"
width="85%" width="85%"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
v-if="selectLocalVisible" v-if="selectLocalVisible"
> >
<selectLocalUdi <selectLocalUdi
:closeDialog="closeDialog" :closeDialog="closeDialog"
:relId="relId" :relId="relId"
:thirdId="thirdId" :thirdId="thirdId"
@ -409,23 +429,23 @@
:isImportUdi="isImportUdi" :isImportUdi="isImportUdi"
:data="thisData" :data="thisData"
@closeUdi="closeUdi" @closeUdi="closeUdi"
></selectLocalUdi> ></selectLocalUdi>
</el-dialog> </el-dialog>
<el-dialog <el-dialog
title="选入物资字典信息" title="选入物资字典信息"
:visible.sync="selectProductVisible" :visible.sync="selectProductVisible"
width="85%" width="85%"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
v-if="selectProductVisible" v-if="selectProductVisible"
> >
<selectProduct <selectProduct
:closeSelDialog="closeSelDialog" :closeSelDialog="closeSelDialog"
:uuid="uuid" :uuid="uuid"
></selectProduct> ></selectProduct>
</el-dialog> </el-dialog>
<el-dialog <el-dialog
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
title="新增配送产品" title="新增配送产品"
@ -433,29 +453,29 @@
width="85%" width="85%"
v-if="addProductVisible" v-if="addProductVisible"
@close="closeAddDialog" @close="closeAddDialog"
> >
<ThrProductsAdd <ThrProductsAdd
:closeAddDialog="closeAddDialog" :closeAddDialog="closeAddDialog"
:newType="newType"></ThrProductsAdd> :newType="newType"></ThrProductsAdd>
</el-dialog> </el-dialog>
<el-dialog <el-dialog
title="选择DI版本" title="选择DI版本"
:visible.sync="selectVersionVisible" :visible.sync="selectVersionVisible"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
width="85%" width="85%"
v-if="selectVersionVisible" v-if="selectVersionVisible"
> >
<selectUdiVersion <selectUdiVersion
:closeDialog="closeDialog" :closeDialog="closeDialog"
:relId="relId" :relId="relId"
:uuid="uuid" :uuid="uuid"
:originUuid="originUuid" :originUuid="originUuid"
@closeUdi="closeUdi" @closeUdi="closeUdi"
></selectUdiVersion> ></selectUdiVersion>
</el-dialog> </el-dialog>
</el-card> </el-card>
</div> </div>
</template> </template>
<script> <script>
@ -465,7 +485,7 @@ import {
updateErpProduct, updateErpProduct,
uploadSmp, uploadSmp,
thirdSysDetail, thirdSysDetail,
removeRl, sysFilterOptimize , spcombie, lockStatus, removeDiRl removeRl, sysFilterOptimize, spcombie, lockStatus, removeDiRl
} from "../../../api/basic/udiRelevance"; } from "../../../api/basic/udiRelevance";
import store from "../../../store/index"; import store from "../../../store/index";
import { import {
@ -484,7 +504,7 @@ 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 { import {
getHead,executeFuc getHead, executeFuc
} from "@/utils/customConfig"; } from "@/utils/customConfig";
export default { export default {
@ -521,12 +541,12 @@ export default {
pId: null, pId: null,
}, },
pId: 0, pId: 0,
tableHeader:[], tableHeader: [],
queryList:[], queryList: [],
fromList:[], fromList: [],
options: { options: {
getSysFilter:[] getSysFilter: []
}, },
productType: null, productType: null,
defaultSys: null, defaultSys: null,
@ -1079,11 +1099,11 @@ export default {
} }
}); });
}, },
executeFuc(row,type,clickFuc,value){ executeFuc(row, type, clickFuc, value) {
return executeFuc(this,row,type,clickFuc,value); return executeFuc(this, row, type, clickFuc, value);
}, },
executeEval(row,expression,defaultRet){ executeEval(row, expression, defaultRet) {
if(expression){ if (expression) {
return eval(expression); return eval(expression);
} }
return defaultRet; return defaultRet;
@ -1107,7 +1127,7 @@ export default {
created() { created() {
this.findBasicProductSet(); this.findBasicProductSet();
getHead("basicCompanyProducts","1").then((re) => { getHead("basicCompanyProducts", "1").then((re) => {
// 处理返回的数据 // 处理返回的数据
this.tableObj = re.data; this.tableObj = re.data;
this.tableHeader = re.data.tableList; this.tableHeader = re.data.tableList;

62
src/views/supplier/products/supProductsAdd.vue
Unescape Escape View File

@ -1,6 +1,6 @@
<template> <template>
<el-card class="el-card"> <el-card class="el-card">
<el-form :model="newProductData" size="mini" label-width="150px"> <el-form :model="newProductData" size="mini" label-width="150px" :rules="rules">
<div style="margin-bottom: 20px"> <div style="margin-bottom: 20px">
<!-- <el-row>--> <!-- <el-row>-->
<!-- <el-col :span="12" class="el-col">--> <!-- <el-col :span="12" class="el-col">-->
@ -115,7 +115,47 @@
v-model.trim="newProductData.price"></el-input> v-model.trim="newProductData.price"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="采购类型">
<el-select
v-model="newProductData.purType"
placeholder="请选择"
clearable
style="width: 90%"
>
<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-col :span="12">
<el-form-item label="产品属性">
<el-select
v-model="newProductData.attributeType"
placeholder="请选择"
clearable
style="width: 90%"
>
<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-col :span="12">
<el-form-item label="耗材类别">
<el-select
v-model="newProductData.hcType"
placeholder="请选择"
clearable
style="width: 90%"
>
<el-option label="高值耗材" :value="1"></el-option>
<el-option label="普通耗材" :value="2"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12" v-if="productRemarkSet.remarkEnable1"> <el-col :span="12" v-if="productRemarkSet.remarkEnable1">
<el-form-item :label="productRemarkSet.remarkTitle1+':'"> <el-form-item :label="productRemarkSet.remarkTitle1+':'">
@ -238,7 +278,6 @@
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
<div style='text-align: center; margin-bottom: 10px;'> <div style='text-align: center; margin-bottom: 10px;'>
<el-button type="primary" @click="saveNewProduct">提交</el-button> <el-button type="primary" @click="saveNewProduct">提交</el-button>
<el-button type="primary" @click="closeAddDialog">取消</el-button> <el-button type="primary" @click="closeAddDialog">取消</el-button>
@ -303,6 +342,15 @@ export default {
remarkTitle7: "备注字段7", remarkTitle7: "备注字段7",
remarkTitle8: "备注字段8", remarkTitle8: "备注字段8",
}, },
rules: {
customerId: [
{
required: true,
message: "请选择供应商",
trigger: "change"
}
],
}
} }
}, },
@ -334,10 +382,10 @@ export default {
this.$message.warning("生产企业不能为空！"); this.$message.warning("生产企业不能为空！");
return; return;
} }
if (this.$isBlank(this.newProductData.registerNo)) { // if (this.$isBlank(this.newProductData.registerNo)) {
this.$message.warning("注册证号不能为空！"); // this.$message.warning("注册证号不能为空！");
return; // return;
} // }
if (this.newType == 1) { if (this.newType == 1) {

Write Preview
Loading…
Cancel
Save