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

Merge remote-tracking branch 'origin/dev_ksck' into dev_ksck

Browse Source
dev_ksck2.0
chenhc 2 years ago
parent 81294d4104 09ba95c75c
commit d37972bc83
11 changed files with 748 additions and 600 deletions
Show Stats Download Patch File Download Diff File

2
.env.development
Unescape Escape View File

@ -5,7 +5,7 @@ VUE_APP_TITLE = UDI管理系统
ENV = 'development' ENV = 'development'
# 开发环境 # 开发环境
VUE_APP_BASE_API = 'http://192.168.0.166:9991' VUE_APP_BASE_API = 'http://127.0.0.1:9991'
VUE_APP_SYNC_API ="http://127.0.0.1:10001" VUE_APP_SYNC_API ="http://127.0.0.1:10001"

4
.env.production
Unescape Escape View File

@ -27,7 +27,7 @@ ENV = 'production'
# 平潭正式 # 平潭正式
# VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/' VUE_APP_BASE_API = 'http://55.55.0.62:9150/UDI_WMS_MC/'
# 漳州中医院 # 漳州中医院
# VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.240.119:9150/UDI_WMS_MC/'
@ -41,7 +41,7 @@ ENV = 'production'
# 长泰医院 # 长泰医院
VUE_APP_BASE_API = 'http://192.168.6.189:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://192.168.6.189:9150/UDI_WMS_MC/'
# 三明大田医院 # 三明大田医院
# VUE_APP_BASE_API = 'http://172.20.124.4:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://172.20.124.4:9150/UDI_WMS_MC/'

2
src/views/basic/corpMaintain/corpMaintain.vue
Unescape Escape View File

@ -15,7 +15,7 @@
<el-option label="客户" value="1"></el-option> <el-option label="客户" value="1"></el-option>
<el-option label="供应商" value="2"></el-option> <el-option label="供应商" value="2"></el-option>
<el-option label="内部科室" value="3"></el-option> <el-option label="内部科室" value="3"></el-option>
<!-- <el-option label="特殊科室" value="3"></el-option>--> <!-- <el-option label="特殊科室" value="3"></el-option>-->
<el-option label="特殊往来" value="4"></el-option> <el-option label="特殊往来" value="4"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>

4
src/views/basic/destiny/skProject.vue
Unescape Escape View File

@ -373,6 +373,10 @@ export default {
} }
, ,
created() { created() {
this.filterQuery.name = this.$route.query.cpmctymc;
if (this.filterQuery.name != null) {
this.getList()
}
this.getList(); this.getList();
} }
} }

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

@ -42,158 +42,159 @@
size="mini" size="mini"
label-width="100px" label-width="100px"
> >
<!-- <el-row>--> <!-- <el-row>-->
<!-- <el-col :span="18">--> <!-- <el-col :span="18">-->
<!-- <el-form-item class="query-form-item" label="UDI码:">--> <!-- <el-form-item class="query-form-item" label="UDI码:">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="filterQuery.udiCode"--> <!-- v-model="filterQuery.udiCode"-->
<!-- style="width: 97%"--> <!-- style="width: 97%"-->
<!-- placeholder="请扫描或输入UDI码"--> <!-- placeholder="请扫描或输入UDI码"-->
<!-- clearable="true"--> <!-- clearable="true"-->
<!-- @keyup.enter.native="keyup_submit($event)"--> <!-- @keyup.enter.native="keyup_submit($event)"-->
<!-- ></el-input>--> <!-- ></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </el-col>--> <!-- </el-col>-->
<!-- </el-row>--> <!-- </el-row>-->
<!-- <el-row>--> <!-- <el-row>-->
<!-- <el-col :span="6">--> <!-- <el-col :span="6">-->
<!-- <el-form-item class="query-form-item" label="最小销售标识:">--> <!-- <el-form-item class="query-form-item" label="最小销售标识:">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="filterQuery.unionCode"--> <!-- v-model="filterQuery.unionCode"-->
<!-- placeholder="请输入最小销售标识"--> <!-- placeholder="请输入最小销售标识"-->
<!-- style="width: 90%"--> <!-- style="width: 90%"-->
<!-- clearable="true"--> <!-- clearable="true"-->
<!-- ></el-input>--> <!-- ></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </el-col>--> <!-- </el-col>-->
<!-- <el-col :span="6">--> <!-- <el-col :span="6">-->
<!-- <el-form-item class="query-form-item" label="物资名称:">--> <!-- <el-form-item class="query-form-item" label="物资名称:">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="filterQuery.cpmctymc"--> <!-- v-model="filterQuery.cpmctymc"-->
<!-- placeholder="请输入物资名称"--> <!-- placeholder="请输入物资名称"-->
<!-- clearable="true"--> <!-- clearable="true"-->
<!-- style="width: 90%"--> <!-- style="width: 90%"-->
<!-- ></el-input>--> <!-- ></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </el-col>--> <!-- </el-col>-->
<!-- <el-col :span="6">--> <!-- <el-col :span="6">-->
<!-- <el-form-item class="query-form-item" label="规格型号:">--> <!-- <el-form-item class="query-form-item" label="规格型号:">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="filterQuery.ggxh"--> <!-- v-model="filterQuery.ggxh"-->
<!-- placeholder="请输入规格型号"--> <!-- placeholder="请输入规格型号"-->
<!-- clearable="true"--> <!-- clearable="true"-->
<!-- style="width: 90%"--> <!-- style="width: 90%"-->
<!-- ></el-input>--> <!-- ></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </el-col>--> <!-- </el-col>-->
<!-- <el-col :span="6">--> <!-- <el-col :span="6">-->
<!-- <el-form-item class="query-form-item" label="对照条件:">--> <!-- <el-form-item class="query-form-item" label="对照条件:">-->
<!-- <el-select--> <!-- <el-select-->
<!-- v-model="filterQuery.filterType"--> <!-- v-model="filterQuery.filterType"-->
<!-- placeholder="请选择过滤对照条件"--> <!-- placeholder="请选择过滤对照条件"-->
<!-- style="width: 90%"--> <!-- style="width: 90%"-->
<!-- >--> <!-- >-->
<!-- <el-option--> <!-- <el-option-->
<!-- v-for="item in filterList"--> <!-- v-for="item in filterList"-->
<!-- :key="item.filterType"--> <!-- :key="item.filterType"-->
<!-- :label="item.sysName"--> <!-- :label="item.sysName"-->
<!-- :value="item.filterType"--> <!-- :value="item.filterType"-->
<!-- >--> <!-- >-->
<!-- <span style="float: left">{{ item.sysName }}</span>--> <!-- <span style="float: left">{{ item.sysName }}</span>-->
<!-- </el-option>--> <!-- </el-option>-->
<!-- </el-select>--> <!-- </el-select>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </el-col>--> <!-- </el-col>-->
<!-- </el-row>--> <!-- </el-row>-->
<!-- <el-row>--> <!-- <el-row>-->
<!-- <el-col :span="6">--> <!-- <el-col :span="6">-->
<!-- <el-form-item class="query-form-item" label="注册备案人:">--> <!-- <el-form-item class="query-form-item" label="注册备案人:">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="filterQuery.ylqxzcrbarmc"--> <!-- v-model="filterQuery.ylqxzcrbarmc"-->
<!-- placeholder="请输入注册备案人"--> <!-- placeholder="请输入注册备案人"-->
<!-- style="width: 90%"--> <!-- style="width: 90%"-->
<!-- clearable="true"--> <!-- clearable="true"-->
<!-- ></el-input>--> <!-- ></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </el-col>--> <!-- </el-col>-->
<!-- <el-col :span="6">--> <!-- <el-col :span="6">-->
<!-- <el-form-item class="query-form-item" label="第三方编码:">--> <!-- <el-form-item class="query-form-item" label="第三方编码:">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="filterQuery.thrPiId"--> <!-- v-model="filterQuery.thrPiId"-->
<!-- placeholder="请输入第三方主系统编码"--> <!-- placeholder="请输入第三方主系统编码"-->
<!-- style="width: 90%"--> <!-- style="width: 90%"-->
<!-- clearable="true"--> <!-- clearable="true"-->
<!-- ></el-input>--> <!-- ></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </el-col>--> <!-- </el-col>-->
<!-- <el-col :span="6">--> <!-- <el-col :span="6">-->
<!-- <el-form-item class="query-form-item" label="集采状态:">--> <!-- <el-form-item class="query-form-item" label="集采状态:">-->
<!-- <el-select--> <!-- <el-select-->
<!-- v-model="filterQuery.groupBuy"--> <!-- v-model="filterQuery.groupBuy"-->
<!-- placeholder="请选择集采状态"--> <!-- placeholder="请选择集采状态"-->
<!-- clearable--> <!-- clearable-->
<!-- style="width: 90%"--> <!-- style="width: 90%"-->
<!-- >--> <!-- >-->
<!-- <el-option label="全部" value=""></el-option>--> <!-- <el-option label="全部" value=""></el-option>-->
<!-- <el-option label="集采" value="true"></el-option>--> <!-- <el-option label="集采" value="true"></el-option>-->
<!-- <el-option label="非集采" value="false"></el-option>--> <!-- <el-option label="非集采" value="false"></el-option>-->
<!-- </el-select>--> <!-- </el-select>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </el-col>--> <!-- </el-col>-->
<!-- <el-col :span="6">--> <!-- <el-col :span="6">-->
<!-- <el-form-item class="query-form-item" label="可配送状态:">--> <!-- <el-form-item class="query-form-item" label="可配送状态:">-->
<!-- <el-select--> <!-- <el-select-->
<!-- v-model="filterQuery.dispatch"--> <!-- v-model="filterQuery.dispatch"-->
<!-- placeholder="请选择可配送状态"--> <!-- placeholder="请选择可配送状态"-->
<!-- clearable--> <!-- clearable-->
<!-- style="width: 90%"--> <!-- style="width: 90%"-->
<!-- >--> <!-- >-->
<!-- <el-option label="全部" value=""></el-option>--> <!-- <el-option label="全部" value=""></el-option>-->
<!-- <el-option label="可配送" value="true"></el-option>--> <!-- <el-option label="可配送" value="true"></el-option>-->
<!-- <el-option label="不可配送" value="false"></el-option>--> <!-- <el-option label="不可配送" value="false"></el-option>-->
<!-- </el-select>--> <!-- </el-select>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </el-col>--> <!-- </el-col>-->
<!-- </el-row>--> <!-- </el-row>-->
<!-- <el-row>--> <!-- <el-row>-->
<!-- <el-col :span="6">--> <!-- <el-col :span="6">-->
<!-- <el-form-item class="query-form-item" label="注册/备案号:">--> <!-- <el-form-item class="query-form-item" label="注册/备案号:">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="filterQuery.zczbhhzbapzbh"--> <!-- v-model="filterQuery.zczbhhzbapzbh"-->
<!-- placeholder="请输入注册/备案号"--> <!-- placeholder="请输入注册/备案号"-->
<!-- style="width: 90%"--> <!-- style="width: 90%"-->
<!-- clearable="true"--> <!-- clearable="true"-->
<!-- ></el-input>--> <!-- ></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </el-col>--> <!-- </el-col>-->
<!-- <el-col :span="6">--> <!-- <el-col :span="6">-->
<!-- <el-form-item class="query-form-item" label="生产企业:">--> <!-- <el-form-item class="query-form-item" label="生产企业:">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="filterQuery.manufactory"--> <!-- v-model="filterQuery.manufactory"-->
<!-- placeholder="请输入生产企业"--> <!-- placeholder="请输入生产企业"-->
<!-- style="width: 90%"--> <!-- style="width: 90%"-->
<!-- clearable="true"--> <!-- clearable="true"-->
<!-- ></el-input>--> <!-- ></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </el-col>--> <!-- </el-col>-->
<!-- <el-col :span="6">--> <!-- <el-col :span="6">-->
<!-- <el-form-item class="query-form-item" label="是否在用:">--> <!-- <el-form-item class="query-form-item" label="是否在用:">-->
<!-- <el-select--> <!-- <el-select-->
<!-- v-model="filterQuery.isDisable"--> <!-- v-model="filterQuery.isDisable"-->
<!-- placeholder="请选择是否在用"--> <!-- placeholder="请选择是否在用"-->
<!-- clearable--> <!-- clearable-->
<!-- style="width: 90%"--> <!-- style="width: 90%"-->
<!-- >--> <!-- >-->
<!-- <el-option label="在用" value="false"></el-option>--> <!-- <el-option label="在用" value="false"></el-option>-->
<!-- <el-option label="停用" value="true"></el-option>--> <!-- <el-option label="停用" value="true"></el-option>-->
<!-- </el-select>--> <!-- </el-select>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </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' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id"> <el-form-item v-if="item.columnType == 'input' && 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"
@ -202,7 +203,8 @@
clearable clearable
></el-input> ></el-input>
</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"
:disabled="executeEval(null,item.disabledFuc,false)" :disabled="executeEval(null,item.disabledFuc,false)"
@ -215,7 +217,8 @@
/> />
</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"
@ -232,7 +235,8 @@
/> />
</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
v-model="dateRange" v-model="dateRange"
:style="`width:${item.width+'px'}`" :style="`width:${item.width+'px'}`"
@ -245,7 +249,8 @@
:default-time="['00:00:00', '23:59:59']" :default-time="['00:00:00', '23:59:59']"
></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'}`"
@ -314,211 +319,211 @@
key="1" key="1"
@selection-change="(row) => executeFuc(row,'0',tableObj.handleChangeFuc)" @selection-change="(row) => executeFuc(row,'0',tableObj.handleChangeFuc)"
> >
<!-- <el-table-column label="序号" type="index"></el-table-column>--> <!-- <el-table-column label="序号" type="index"></el-table-column>-->
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- label="最小销售产品标识"--> <!-- label="最小销售产品标识"-->
<!-- prop="nameCode"--> <!-- prop="nameCode"-->
<!-- width="140"--> <!-- width="140"-->
<!-- show-overflow-tooltip--> <!-- show-overflow-tooltip-->
<!-- ></el-table-column>--> <!-- ></el-table-column>-->
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- label="主系统编码"--> <!-- label="主系统编码"-->
<!-- prop="mainId"--> <!-- prop="mainId"-->
<!-- width="120"--> <!-- width="120"-->
<!-- show-overflow-tooltip--> <!-- show-overflow-tooltip-->
<!-- ></el-table-column>--> <!-- ></el-table-column>-->
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- label="物资名称"--> <!-- label="物资名称"-->
<!-- prop="cpmctymc"--> <!-- prop="cpmctymc"-->
<!-- width="160"--> <!-- width="160"-->
<!-- show-overflow-tooltip--> <!-- show-overflow-tooltip-->
<!-- ></el-table-column>--> <!-- ></el-table-column>-->
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- label="规格型号"--> <!-- label="规格型号"-->
<!-- prop="ggxh"--> <!-- prop="ggxh"-->
<!-- width="160"--> <!-- width="160"-->
<!-- show-overflow-tooltip--> <!-- show-overflow-tooltip-->
<!-- ></el-table-column>--> <!-- ></el-table-column>-->
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- label="商品名称"--> <!-- label="商品名称"-->
<!-- prop="spmc"--> <!-- prop="spmc"-->
<!-- width="160"--> <!-- width="160"-->
<!-- show-overflow-tooltip--> <!-- show-overflow-tooltip-->
<!-- v-if="$auth.hasPermi('basic:spmc')"--> <!-- v-if="$auth.hasPermi('basic:spmc')"-->
<!-- ></el-table-column>--> <!-- ></el-table-column>-->
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- label="商品条码"--> <!-- label="商品条码"-->
<!-- prop="sptm"--> <!-- prop="sptm"-->
<!-- width="160"--> <!-- width="160"-->
<!-- show-overflow-tooltip--> <!-- show-overflow-tooltip-->
<!-- v-if="$auth.hasPermi('basic:sptm')"--> <!-- v-if="$auth.hasPermi('basic:sptm')"-->
<!-- ></el-table-column>--> <!-- ></el-table-column>-->
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- label="医保编码"--> <!-- label="医保编码"-->
<!-- prop="ybbm"--> <!-- prop="ybbm"-->
<!-- width="160"--> <!-- width="160"-->
<!-- show-overflow-tooltip--> <!-- show-overflow-tooltip-->
<!-- v-if="$auth.hasPermi('basic:ybbm')"--> <!-- v-if="$auth.hasPermi('basic:ybbm')"-->
<!-- ></el-table-column>--> <!-- ></el-table-column>-->
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- label="计量单位"--> <!-- label="计量单位"-->
<!-- prop="measname"--> <!-- prop="measname"-->
<!-- width="160"--> <!-- width="160"-->
<!-- show-overflow-tooltip--> <!-- show-overflow-tooltip-->
<!-- v-if="$auth.hasPermi('basic:measname')"--> <!-- v-if="$auth.hasPermi('basic:measname')"-->
<!-- ></el-table-column>--> <!-- ></el-table-column>-->
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- label="注册/备案号"--> <!-- label="注册/备案号"-->
<!-- prop="zczbhhzbapzbh"--> <!-- prop="zczbhhzbapzbh"-->
<!-- width="160"--> <!-- width="160"-->
<!-- show-overflow-tooltip--> <!-- show-overflow-tooltip-->
<!-- ></el-table-column>--> <!-- ></el-table-column>-->
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- label="注册/备案人"--> <!-- label="注册/备案人"-->
<!-- prop="ylqxzcrbarmc"--> <!-- prop="ylqxzcrbarmc"-->
<!-- width="180"--> <!-- width="180"-->
<!-- show-overflow-tooltip--> <!-- show-overflow-tooltip-->
<!-- ></el-table-column>--> <!-- ></el-table-column>-->
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- :label="productRemarkSet.remarkTitle1"--> <!-- :label="productRemarkSet.remarkTitle1"-->
<!-- prop="basicPrductRemak1"--> <!-- prop="basicPrductRemak1"-->
<!-- width="180"--> <!-- width="180"-->
<!-- show-overflow-tooltip--> <!-- show-overflow-tooltip-->
<!-- v-if="$auth.hasPermi('basic:basicPrductRemak1')"--> <!-- v-if="$auth.hasPermi('basic:basicPrductRemak1')"-->
<!-- ></el-table-column>--> <!-- ></el-table-column>-->
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- :label="productRemarkSet.remarkTitle2"--> <!-- :label="productRemarkSet.remarkTitle2"-->
<!-- prop="basicPrductRemak2"--> <!-- prop="basicPrductRemak2"-->
<!-- width="180"--> <!-- width="180"-->
<!-- show-overflow-tooltip--> <!-- show-overflow-tooltip-->
<!-- v-if="$auth.hasPermi('basic:basicPrductRemak2')"--> <!-- v-if="$auth.hasPermi('basic:basicPrductRemak2')"-->
<!-- ></el-table-column>--> <!-- ></el-table-column>-->
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- :label="productRemarkSet.remarkTitle3"--> <!-- :label="productRemarkSet.remarkTitle3"-->
<!-- prop="basicPrductRemak3"--> <!-- prop="basicPrductRemak3"-->
<!-- width="180"--> <!-- width="180"-->
<!-- show-overflow-tooltip--> <!-- show-overflow-tooltip-->
<!-- v-if="$auth.hasPermi('basic:basicPrductRemak3')"--> <!-- v-if="$auth.hasPermi('basic:basicPrductRemak3')"-->
<!-- ></el-table-column>--> <!-- ></el-table-column>-->
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- :label="productRemarkSet.remarkTitle4"--> <!-- :label="productRemarkSet.remarkTitle4"-->
<!-- prop="basicPrductRemak4"--> <!-- prop="basicPrductRemak4"-->
<!-- width="180"--> <!-- width="180"-->
<!-- show-overflow-tooltip--> <!-- show-overflow-tooltip-->
<!-- v-if="$auth.hasPermi('basic:basicPrductRemak4')"--> <!-- v-if="$auth.hasPermi('basic:basicPrductRemak4')"-->
<!-- ></el-table-column>--> <!-- ></el-table-column>-->
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- :label="productRemarkSet.remarkTitle5"--> <!-- :label="productRemarkSet.remarkTitle5"-->
<!-- prop="basicPrductRemak5"--> <!-- prop="basicPrductRemak5"-->
<!-- width="180"--> <!-- width="180"-->
<!-- show-overflow-tooltip--> <!-- show-overflow-tooltip-->
<!-- v-if="$auth.hasPermi('basic:basicPrductRemak5')"--> <!-- v-if="$auth.hasPermi('basic:basicPrductRemak5')"-->
<!-- ></el-table-column>--> <!-- ></el-table-column>-->
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- :label="productRemarkSet.remarkTitle6"--> <!-- :label="productRemarkSet.remarkTitle6"-->
<!-- prop="basicPrductRemak6"--> <!-- prop="basicPrductRemak6"-->
<!-- width="180"--> <!-- width="180"-->
<!-- show-overflow-tooltip--> <!-- show-overflow-tooltip-->
<!-- v-if="$auth.hasPermi('basic:basicPrductRemak6')"--> <!-- v-if="$auth.hasPermi('basic:basicPrductRemak6')"-->
<!-- ></el-table-column>--> <!-- ></el-table-column>-->
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- :label="productRemarkSet.remarkTitle7"--> <!-- :label="productRemarkSet.remarkTitle7"-->
<!-- prop="basicPrductRemak7"--> <!-- prop="basicPrductRemak7"-->
<!-- width="180"--> <!-- width="180"-->
<!-- show-overflow-tooltip--> <!-- show-overflow-tooltip-->
<!-- v-if="$auth.hasPermi('basic:basicPrductRemak7')"--> <!-- v-if="$auth.hasPermi('basic:basicPrductRemak7')"-->
<!-- ></el-table-column>--> <!-- ></el-table-column>-->
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- :label="productRemarkSet.remarkTitle8"--> <!-- :label="productRemarkSet.remarkTitle8"-->
<!-- prop="hslbName"--> <!-- prop="hslbName"-->
<!-- width="180"--> <!-- width="180"-->
<!-- show-overflow-tooltip--> <!-- show-overflow-tooltip-->
<!-- v-if="$auth.hasPermi('basic:basicPrductRemak8')"--> <!-- v-if="$auth.hasPermi('basic:basicPrductRemak8')"-->
<!-- >--> <!-- >-->
<!-- &lt;!&ndash; <template slot-scope="scope">&ndash;&gt;--> <!-- &lt;!&ndash; <template slot-scope="scope">&ndash;&gt;-->
<!-- &lt;!&ndash; {{ getHsflMethod(scope.row.basicPrductRemak8) }}&ndash;&gt;--> <!-- &lt;!&ndash; {{ getHsflMethod(scope.row.basicPrductRemak8) }}&ndash;&gt;-->
<!-- &lt;!&ndash; </template>&ndash;&gt;--> <!-- &lt;!&ndash; </template>&ndash;&gt;-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- label="是否在用"--> <!-- label="是否在用"-->
<!-- prop="isDisable"--> <!-- prop="isDisable"-->
<!-- width="180"--> <!-- width="180"-->
<!-- show-overflow-tooltip--> <!-- show-overflow-tooltip-->
<!-- >--> <!-- >-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <el-tag :type="scope.row.isDisable | isDisableFilterType">--> <!-- <el-tag :type="scope.row.isDisable | isDisableFilterType">-->
<!-- {{ isDisableMap[scope.row.isDisable] }}--> <!-- {{ isDisableMap[scope.row.isDisable] }}-->
<!-- </el-tag>--> <!-- </el-tag>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- label="集采状态"--> <!-- label="集采状态"-->
<!-- prop="groupBuy"--> <!-- prop="groupBuy"-->
<!-- width="120"--> <!-- width="120"-->
<!-- show-overflow-tooltip--> <!-- show-overflow-tooltip-->
<!-- v-if="$auth.hasPermi('basic:groupBuy')"--> <!-- v-if="$auth.hasPermi('basic:groupBuy')"-->
<!-- >--> <!-- >-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <el-tag :type="scope.row.groupBuy | statusFilterType">--> <!-- <el-tag :type="scope.row.groupBuy | statusFilterType">-->
<!-- {{ groupBuyMap[scope.row.groupBuy] }}--> <!-- {{ groupBuyMap[scope.row.groupBuy] }}-->
<!-- </el-tag>--> <!-- </el-tag>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- label="可配送状态"--> <!-- label="可配送状态"-->
<!-- prop="dispatch"--> <!-- prop="dispatch"-->
<!-- width="120"--> <!-- width="120"-->
<!-- show-overflow-tooltip--> <!-- show-overflow-tooltip-->
<!-- v-if="$auth.hasPermi('basic:dispatch')"--> <!-- v-if="$auth.hasPermi('basic:dispatch')"-->
<!-- >--> <!-- >-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <el-tag :type="scope.row.dispatch | statusFilterType">--> <!-- <el-tag :type="scope.row.dispatch | statusFilterType">-->
<!-- {{ dispatchMap[scope.row.dispatch] }}--> <!-- {{ dispatchMap[scope.row.dispatch] }}-->
<!-- </el-tag>--> <!-- </el-tag>-->
<!-- </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--> <!-- <el-button-->
<!-- type="text"--> <!-- type="text"-->
<!-- size="small" v-if="vueRouteSource==1"--> <!-- size="small" v-if="vueRouteSource==1"-->
<!-- :disabled="scope.row.originUuid != null"--> <!-- :disabled="scope.row.originUuid != null"-->
<!-- @click.native.stop="intentSelectUdi(scope.row)"--> <!-- @click.native.stop="intentSelectUdi(scope.row)"-->
<!-- >关联DI--> <!-- >关联DI-->
<!-- </el-button>--> <!-- </el-button>-->
<!-- <el-button--> <!-- <el-button-->
<!-- type="text"--> <!-- type="text"-->
<!-- size="small"--> <!-- size="small"-->
<!-- @click.native.stop="handleModifyClick(scope.row)"--> <!-- @click.native.stop="handleModifyClick(scope.row)"-->
<!-- >详情--> <!-- >详情-->
<!-- </el-button>--> <!-- </el-button>-->
<!-- <el-button--> <!-- <el-button-->
<!-- type="text"--> <!-- type="text"-->
<!-- size="small" v-if="vueRouteSource==1"--> <!-- size="small" v-if="vueRouteSource==1"-->
<!-- @click.native.stop="diEdit(scope.row)"--> <!-- @click.native.stop="diEdit(scope.row)"-->
<!-- >编辑--> <!-- >编辑-->
<!-- </el-button>--> <!-- </el-button>-->
<!-- <el-button--> <!-- <el-button-->
<!-- type="text"--> <!-- type="text"-->
<!-- size="small" v-if="vueRouteSource==1"--> <!-- size="small" v-if="vueRouteSource==1"-->
<!-- @click.native.stop="deleteDialog(scope.row)"--> <!-- @click.native.stop="deleteDialog(scope.row)"-->
<!-- >删除--> <!-- >删除-->
<!-- </el-button>--> <!-- </el-button>-->
<!-- <el-button--> <!-- <el-button-->
<!-- type="text"--> <!-- type="text"-->
<!-- size="small" v-if="vueRouteSource==2"--> <!-- size="small" v-if="vueRouteSource==2"-->
<!-- @click.native.stop="uploadThird(scope.row)"--> <!-- @click.native.stop="uploadThird(scope.row)"-->
<!-- >上传--> <!-- >上传-->
<!-- </el-button>--> <!-- </el-button>-->
<!-- </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)"
@ -538,7 +543,7 @@
:show-overflow-tooltip="item.tooltip" :show-overflow-tooltip="item.tooltip"
:key="item.columnName" :key="item.columnName"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio> <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
</template> </template>
</el-table-column> </el-table-column>
@ -551,8 +556,10 @@
:show-overflow-tooltip="item.tooltip" :show-overflow-tooltip="item.tooltip"
: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
@ -564,9 +571,12 @@
:show-overflow-tooltip="item.tooltip" :show-overflow-tooltip="item.tooltip"
: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>
@ -601,7 +611,9 @@
: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>
@ -1885,7 +1897,7 @@ export default {
sysList: [], sysList: [],
filterList: [], filterList: [],
options: { options: {
getSysFilter:[] getSysFilter: []
}, },
total: 0, total: 0,
thirdNo: "", thirdNo: "",
@ -1985,7 +1997,7 @@ export default {
hideSearch() { hideSearch() {
this.showSearch = !this.showSearch; this.showSearch = !this.showSearch;
}, },
keyup_submit(_this,event) { keyup_submit(_this, event) {
_this.filterQuery.page = 1; _this.filterQuery.page = 1;
_this.getList(); _this.getList();
event.target.select(); event.target.select();
@ -2065,7 +2077,7 @@ export default {
}); });
}, },
deleteDialog(_this,rowId) { deleteDialog(_this, rowId) {
_this.$confirm("此操作将永久删除该产品信息, 是否继续?", "提示", { _this.$confirm("此操作将永久删除该产品信息, 是否继续?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
@ -2201,7 +2213,7 @@ export default {
}); });
}); });
}, },
intentSelectUdi(_this,val) { intentSelectUdi(_this, val) {
_this.relId = val.id; _this.relId = val.id;
_this.isImportUdi = true; _this.isImportUdi = true;
_this.isImport = true; _this.isImport = true;
@ -2221,7 +2233,7 @@ export default {
this.selectLocalVisible = true; this.selectLocalVisible = true;
}, },
handleSelectionChange(_this,val) { handleSelectionChange(_this, val) {
_this.multipleSelection = val; _this.multipleSelection = val;
}, },
@ -2234,7 +2246,7 @@ export default {
this.filterQuery.page = val.page; this.filterQuery.page = val.page;
this.getList(); this.getList();
}, },
handleModifyClick(_this,row) { handleModifyClick(_this, row) {
_this.uuid = row.uuid; _this.uuid = row.uuid;
_this.relId = row.id; _this.relId = row.id;
_this.isImport = false; _this.isImport = false;
@ -2261,7 +2273,7 @@ export default {
}, },
uploadMsg(_this,row) { uploadMsg(_this, row) {
_this.$alert(row.uploadMsg, '上传', { _this.$alert(row.uploadMsg, '上传', {
confirmButtonText: '确定', confirmButtonText: '确定',
callback: action => { callback: action => {
@ -2274,7 +2286,7 @@ export default {
}, },
uploadThird(_this,row) { uploadThird(_this, row) {
_this.$confirm('确定上传至第三方系统?', '提示', { _this.$confirm('确定上传至第三方系统?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
@ -2340,7 +2352,7 @@ export default {
} }
}, },
getSysFilter(_this,query) { getSysFilter(_this, query) {
sysFilterOptimize() sysFilterOptimize()
.then((response) => { .then((response) => {
_this.loading = false; _this.loading = false;
@ -2361,7 +2373,7 @@ export default {
this.editSingleFormat.nameCode = temp.nameCode; this.editSingleFormat.nameCode = temp.nameCode;
this.editSingleDiDialogVisible = true; this.editSingleDiDialogVisible = true;
}, },
diEdit(_this,row) { diEdit(_this, row) {
_this.uuid = row.uuid; _this.uuid = row.uuid;
_this.relId = row.id; _this.relId = row.id;
_this.isImport = false; _this.isImport = false;
@ -2487,11 +2499,11 @@ export default {
this.loading = false; this.loading = false;
}); });
}, },
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;
@ -2516,8 +2528,9 @@ export default {
// if (this.isChoose != null) // if (this.isChoose != null)
// this.isSelect = this.isChoose; // this.isSelect = this.isChoose;
this.vueRouteSource = this.$route.query.vueRouteSource; this.vueRouteSource = this.$route.query.vueRouteSource;
this.findBasicProductSet(); this.findBasicProductSet();
getHead("product","1").then((re) => { getHead("product", "1").then((re) => {
// 处理返回的数据 // 处理返回的数据
this.tableObj = re.data; this.tableObj = re.data;
this.tableHeader = re.data.tableList; this.tableHeader = re.data.tableList;
@ -2527,7 +2540,13 @@ export default {
}); });
this.getTerrList(); this.getTerrList();
// this.selectSysParam(); // this.selectSysParam();
this.getSysFilter(this,""); this.getSysFilter(this, "");
this.filterQuery.cpmctymc = this.$route.query.cpmctymc;
if (this.filterQuery.cpmctymc != null) {
this.getList()
}
}, },
}; };
</script> </script>

298
src/views/basic/product/udiInfoManageSp.vue
Unescape Escape View File

@ -1,10 +1,11 @@
<template> <template>
<div> <div>
<el-card> <el-card>
<el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" label-width="120px"> <el-form v-if="queryList && queryList.length > 0 && showSearch" :model="filterQuery" label-width="120px">
<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' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id"> <el-form-item v-if="item.columnType == 'input' && 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"
@ -13,7 +14,8 @@
clearable clearable
></el-input> ></el-input>
</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"
:disabled="executeEval(null,item.disabledFuc,false)" :disabled="executeEval(null,item.disabledFuc,false)"
@ -26,7 +28,8 @@
/> />
</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"
@ -43,7 +46,8 @@
/> />
</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
v-model="dateRange" v-model="dateRange"
:style="`width:${item.width+'px'}`" :style="`width:${item.width+'px'}`"
@ -56,7 +60,8 @@
:default-time="['00:00:00', '23:59:59']" :default-time="['00:00:00', '23:59:59']"
></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'}`"
@ -69,86 +74,86 @@
</template> </template>
</el-row> </el-row>
<!-- <el-row>--> <!-- <el-row>-->
<!-- <el-col :span="6">--> <!-- <el-col :span="6">-->
<!-- <el-form-item label="供应商:">--> <!-- <el-form-item label="供应商:">-->
<!-- <el-select--> <!-- <el-select-->
<!-- v-model="filterQuery.unitFk"--> <!-- v-model="filterQuery.unitFk"-->
<!-- style="width: 90%"--> <!-- style="width: 90%"-->
<!-- filterable--> <!-- filterable-->
<!-- remote--> <!-- remote-->
<!-- clearable="true"--> <!-- clearable="true"-->
<!-- reserve-keyword--> <!-- reserve-keyword-->
<!-- placeholder="请选择供应商"--> <!-- placeholder="请选择供应商"-->
<!-- :remote-method="findMethod"--> <!-- :remote-method="findMethod"-->
<!-- :loading="loading"--> <!-- :loading="loading"-->
<!-- >--> <!-- >-->
<!-- <el-option--> <!-- <el-option-->
<!-- v-for="item in fromOptions"--> <!-- v-for="item in fromOptions"-->
<!-- :key="item.name"--> <!-- :key="item.name"-->
<!-- :label="item.name"--> <!-- :label="item.name"-->
<!-- :value="item.erpId"--> <!-- :value="item.erpId"-->
<!-- >--> <!-- >-->
<!-- <span style="float: left">{{ item.name }}</span>--> <!-- <span style="float: left">{{ item.name }}</span>-->
<!-- </el-option>--> <!-- </el-option>-->
<!-- </el-select>--> <!-- </el-select>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </el-col>--> <!-- </el-col>-->
<!-- <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="请输入DI/医保编码/商品条码"--> <!-- <el-input v-model="filterQuery.unionCode" style="width: 90%" placeholder="请输入DI/医保编码/商品条码"-->
<!-- clearable="true"></el-input>--> <!-- clearable="true"></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </el-col>--> <!-- </el-col>-->
<!-- <el-col :span="6">--> <!-- <el-col :span="6">-->
<!-- <el-form-item label="物资名称:">--> <!-- <el-form-item label="物资名称:">-->
<!-- <el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入物资名称"--> <!-- <el-input v-model="filterQuery.cpmctymc" style="width: 90%" placeholder="请输入物资名称"-->
<!-- clearable="true"></el-input>--> <!-- clearable="true"></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </el-col>--> <!-- </el-col>-->
<!-- <el-col :span="6">--> <!-- <el-col :span="6">-->
<!-- <el-form-item label="规格型号:">--> <!-- <el-form-item label="规格型号:">-->
<!-- <el-input v-model="filterQuery.ggxh" style="width: 90%" placeholder="请输入规格型号" clearable="true"></el-input>--> <!-- <el-input v-model="filterQuery.ggxh" style="width: 90%" placeholder="请输入规格型号" clearable="true"></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </el-col>--> <!-- </el-col>-->
<!-- </el-row>--> <!-- </el-row>-->
<!-- <el-row>--> <!-- <el-row>-->
<!-- <el-col :span="6">--> <!-- <el-col :span="6">-->
<!-- <el-form-item label="对照条件:">--> <!-- <el-form-item label="对照条件:">-->
<!-- <el-select v-model="filterQuery.filterType" style="width: 90%" placeholder="请选择过滤对照条件">--> <!-- <el-select v-model="filterQuery.filterType" style="width: 90%" placeholder="请选择过滤对照条件">-->
<!-- <el-option--> <!-- <el-option-->
<!-- v-for="item in filterList"--> <!-- v-for="item in filterList"-->
<!-- :key="item.filterType"--> <!-- :key="item.filterType"-->
<!-- :label="item.sysName"--> <!-- :label="item.sysName"-->
<!-- :value="item.filterType">--> <!-- :value="item.filterType">-->
<!-- <span style="float: left">{{ item.sysName }}</span>--> <!-- <span style="float: left">{{ item.sysName }}</span>-->
<!-- </el-option>--> <!-- </el-option>-->
<!-- </el-select>--> <!-- </el-select>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </el-col>--> <!-- </el-col>-->
<!-- <el-col :span="6">--> <!-- <el-col :span="6">-->
<!-- <el-form-item label="生产企业:">--> <!-- <el-form-item label="生产企业:">-->
<!-- <el-input v-model="filterQuery.ylqxzcrbarmc" style="width: 90%" placeholder="请输入生产企业/注册备案人"--> <!-- <el-input v-model="filterQuery.ylqxzcrbarmc" style="width: 90%" placeholder="请输入生产企业/注册备案人"-->
<!-- clearable="true"></el-input>--> <!-- clearable="true"></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </el-col>--> <!-- </el-col>-->
<!-- <el-col :span="6">--> <!-- <el-col :span="6">-->
<!-- <el-form-item label="第三方物资编码:">--> <!-- <el-form-item label="第三方物资编码:">-->
<!-- <el-input v-model="filterQuery.thrPiId" style="width: 90%" placeholder="请输入第三方物资编码"--> <!-- <el-input v-model="filterQuery.thrPiId" style="width: 90%" placeholder="请输入第三方物资编码"-->
<!-- clearable="true"></el-input>--> <!-- clearable="true"></el-input>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </el-col>--> <!-- </el-col>-->
<!-- <el-col :span="6">--> <!-- <el-col :span="6">-->
<!-- <el-form-item label="状态:" v-if="isSpCombine">--> <!-- <el-form-item label="状态:" v-if="isSpCombine">-->
<!-- <el-select v-model="filterQuery.lockStatus" style="width: 90%" placeholder="状态">--> <!-- <el-select v-model="filterQuery.lockStatus" style="width: 90%" placeholder="状态">-->
<!-- <el-option label="全部" value=""></el-option>--> <!-- <el-option label="全部" value=""></el-option>-->
<!-- <el-option label="未提交" value="1"></el-option>--> <!-- <el-option label="未提交" value="1"></el-option>-->
<!-- <el-option label="已提交" value="2"></el-option>--> <!-- <el-option label="已提交" value="2"></el-option>-->
<!-- <el-option label="已锁定" value="3"></el-option>--> <!-- <el-option label="已锁定" value="3"></el-option>-->
<!-- </el-select>--> <!-- </el-select>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </el-col>--> <!-- </el-col>-->
<!-- </el-row>--> <!-- </el-row>-->
</el-form> </el-form>
@ -185,7 +190,7 @@
:show-overflow-tooltip="item.tooltip" :show-overflow-tooltip="item.tooltip"
:key="item.columnName" :key="item.columnName"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio> <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
</template> </template>
</el-table-column> </el-table-column>
@ -198,8 +203,10 @@
:show-overflow-tooltip="item.tooltip" :show-overflow-tooltip="item.tooltip"
: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
@ -211,9 +218,12 @@
:show-overflow-tooltip="item.tooltip" :show-overflow-tooltip="item.tooltip"
: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>
@ -248,40 +258,42 @@
: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-column type="selection" width="55"></el-table-column>--> <!-- <el-table-column type="selection" width="55"></el-table-column>-->
<!-- <el-table-column label="序号" type="index"></el-table-column>--> <!-- <el-table-column label="序号" type="index"></el-table-column>-->
<!-- <el-table-column label="供应商" prop="companyName" show-overflow-tooltip></el-table-column>--> <!-- <el-table-column label="供应商" prop="companyName" show-overflow-tooltip></el-table-column>-->
<!-- <el-table-column label="最小销售产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>--> <!-- <el-table-column label="最小销售产品标识" prop="nameCode" show-overflow-tooltip></el-table-column>-->
<!-- <el-table-column label="主系统物资编码" prop="mainId" show-overflow-tooltip></el-table-column>--> <!-- <el-table-column label="主系统物资编码" prop="mainId" 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="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="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>--> <!-- <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" 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="classifyName" show-overflow-tooltip></el-table-column>--> <!-- <el-table-column label="物资分类" prop="classifyName" show-overflow-tooltip></el-table-column>-->
<!-- <el-table-column--> <!-- <el-table-column-->
<!-- v-if="isSpCombine"--> <!-- v-if="isSpCombine"-->
<!-- label="状态"--> <!-- label="状态"-->
<!-- prop="lockStatus"--> <!-- prop="lockStatus"-->
<!-- width="80"--> <!-- width="80"-->
<!-- show-overflow-tooltip--> <!-- 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="120" label="操作">--> <!-- <el-table-column width="120" label="操作">-->
<!-- <template slot-scope="scope">--> <!-- <template slot-scope="scope">-->
<!-- <el-button type="text" @click.native.stop="handleModifyClick(scope.row)">详情</el-button>--> <!-- <el-button type="text" @click.native.stop="handleModifyClick(scope.row)">详情</el-button>-->
<!-- <el-button type="text" @click.native.stop="handleDeleteClick(scope.row.id)">移除</el-button>--> <!-- <el-button type="text" @click.native.stop="handleDeleteClick(scope.row.id)">移除</el-button>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
</el-table> </el-table>
<el-dialog <el-dialog
@ -336,7 +348,7 @@ import {
updateErpProduct, updateErpProduct,
uploadSmp, uploadSmp,
thirdSysDetail, thirdSysDetail,
removeRl, sysFilter,sysFilterOptimize, spcombie, lockStatus removeRl, sysFilter, sysFilterOptimize, spcombie, lockStatus
} from "@/api/basic/udiRelevance"; } from "@/api/basic/udiRelevance";
import {selectSysParamByKey} from "@/api/param/systemParamConfig"; import {selectSysParamByKey} from "@/api/param/systemParamConfig";
import {filterByUuid, filterCompany} from "@/api/basic/udiInfo"; import {filterByUuid, filterCompany} from "@/api/basic/udiInfo";
@ -393,12 +405,12 @@ export default {
sysList: [], sysList: [],
filterList: [], filterList: [],
options: { options: {
findMethod:[], findMethod: [],
getSysFilter:[], getSysFilter: [],
}, },
queryList:[], queryList: [],
tableHeader:[], tableHeader: [],
fromList:[], fromList: [],
total: 0, total: 0,
thirdNo: "", thirdNo: "",
uuid: "111", uuid: "111",
@ -621,7 +633,7 @@ export default {
}, },
handleSelectionChange(_this,val) { handleSelectionChange(_this, val) {
_this.multipleSelection = val; _this.multipleSelection = val;
}, },
cancelDialog() { cancelDialog() {
@ -631,7 +643,7 @@ export default {
this.filterQuery.page = val.page; this.filterQuery.page = val.page;
this.getList(); this.getList();
}, },
handleModifyClick(_this,row) { handleModifyClick(_this, row) {
_this.uuid = row.uuid; _this.uuid = row.uuid;
_this.relId = row.rlId; _this.relId = row.rlId;
_this.isImport = false; _this.isImport = false;
@ -648,7 +660,7 @@ export default {
}; };
_this.checked = row.isUseDy == 1; _this.checked = row.isUseDy == 1;
}, },
handleDeleteClick(_this,rowId){ handleDeleteClick(_this, row) {
_this.$confirm("此操作将删除该供应商器械信息, 是否继续?", "提示", { _this.$confirm("此操作将删除该供应商器械信息, 是否继续?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
@ -656,7 +668,7 @@ export default {
}) })
.then(() => { .then(() => {
let dQuery = { let dQuery = {
id: rowId, id: row.id,
}; };
deleteCompanyProductRelevance(dQuery) deleteCompanyProductRelevance(dQuery)
.then((response) => { .then((response) => {
@ -684,7 +696,7 @@ export default {
selectData.forEach((row) => { selectData.forEach((row) => {
postQuery.ids.push(row.rlId); postQuery.ids.push(row.rlId);
}); });
if(postQuery.ids.length<=0){ if (postQuery.ids.length <= 0) {
this.$message.error("请先选择产品！"); this.$message.error("请先选择产品！");
return return
} }
@ -727,7 +739,7 @@ export default {
this.sysList = []; this.sysList = [];
}); });
}, },
getSysFilter(_this,query) { getSysFilter(_this, query) {
sysFilterOptimize() sysFilterOptimize()
.then((response) => { .then((response) => {
_this.loading = false; _this.loading = false;
@ -832,7 +844,7 @@ export default {
}); });
}, },
findMethod(_this,query) { findMethod(_this, query) {
let cQuery = { let cQuery = {
key: query, key: query,
corpType: 2, corpType: 2,
@ -849,11 +861,11 @@ export default {
_this.options.findMethod = []; _this.options.findMethod = [];
}); });
}, },
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;
@ -872,7 +884,7 @@ export default {
} }
, ,
created() { created() {
getHead("udiInfoManageSp","1").then((re) => { getHead("udiInfoManageSp", "1").then((re) => {
// 处理返回的数据 // 处理返回的数据
this.tableObj = re.data; this.tableObj = re.data;
this.tableHeader = re.data.tableList; this.tableHeader = re.data.tableList;
@ -881,8 +893,8 @@ export default {
this.getList() this.getList()
}); });
this.selectSysParam(); this.selectSysParam();
this.getSysFilter(this,""); this.getSysFilter(this, "");
this.findMethod(this,""); this.findMethod(this, "");
} }
, ,
} }

10
src/views/inout/DialogSelectInvProduct.vue
Unescape Escape View File

@ -68,7 +68,7 @@
<el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row="false" border <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row="false" border
@current-change="handleChange" @current-change="handleChange"
ref="multipleTable"> ref="multipleTable">
<el-table-column label width="45" v-if="type=3"> <el-table-column label width="45" v-if="type==3 ">
<template slot-scope="scope"> <template slot-scope="scope">
<el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio> <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
</template> </template>
@ -190,7 +190,6 @@ export default {
supId: null, supId: null,
page: 1, page: 1,
limit: 10, limit: 10,
invCode: this.invQueryData.targetInvCode,
}; };
this.getList(); this.getList();
}, },
@ -213,9 +212,11 @@ export default {
getList() { getList() {
this.loading = true; this.loading = true;
this.filterQuery.invCode = this.invQueryData.invCode; if (this.type == 1) {
this.filterQuery.invCode = this.invQueryData.targetInvCode;
} else
this.filterQuery.invCode = this.invQueryData.invCode;
this.filterQuery.filterNoInv = 1; this.filterQuery.filterNoInv = 1;
//寄售 //寄售
if (this.invQueryData.advanceType == 3) { if (this.invQueryData.advanceType == 3) {
getInvPreProductStock(this.filterQuery) getInvPreProductStock(this.filterQuery)
@ -388,7 +389,6 @@ export default {
, ,
created() { created() {
this.findBasicProductSet(); this.findBasicProductSet();
this.filterQuery.invCode = this.invQueryData.targetInvCode;
// 加载表格数据 // 加载表格数据
this.getList(); this.getList();
} }

91
src/views/thirdSys/api/DialogEditBusDown.vue
Unescape Escape View File

@ -4,7 +4,7 @@
<el-row :gutter="20" class="el-row" type="flex"> <el-row :gutter="20" class="el-row" type="flex">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="单据类型:" label-width="120px"> <el-form-item label="单据类型:" label-width="120px">
<el-select style="width: 80%;" v-model="thirdBuyForm.name" placeholder="单据类型"> <el-select style="width: 80%;" v-model="thirdBuyForm.name" placeholder="单据类型" @change="actionChange">
<el-option <el-option
v-for="item in bussinessTypeList" v-for="item in bussinessTypeList"
:key="item.action" :key="item.action"
@ -42,6 +42,34 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20" class="el-row" type="flex">
<el-col :span="24" class="el-col">
<el-form-item label-width="120px" label="往来单位:">
<el-select
v-model="thirdBuyForm.fromCorp"
filterable
remote
clearable
reserve-keyword
style="width: 80%"
placeholder="请输入往来信息"
:remote-method="findMethod"
>
<el-option
v-for="item in fromOptions"
:key="item.erpId"
:label="item.name"
:value="item.erpId"
>
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20" class="el-row" type="flex"> <el-row :gutter="20" class="el-row" type="flex">
<el-col :span="24" class="el-col"> <el-col :span="24" class="el-col">
<el-form-item label-width="120px" label="接口地址:"> <el-form-item label-width="120px" label="接口地址:">
@ -54,6 +82,7 @@
</el-form-item> </el-form-item>
</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">
<el-col :span="24" class="el-col"> <el-col :span="24" class="el-col">
<el-form-item label-width="120px" label="备注:"> <el-form-item label-width="120px" label="备注:">
@ -71,15 +100,16 @@
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button @click.native="closeDialog( editGeOrderParamVisible = !editGeOrderParamVisible)"
>取消
</el-button
>
<el-button <el-button
type="primary" type="primary"
@click.native="addBussinessTypeData()" @click.native="addBussinessTypeData()"
>提交 >提交
</el-button> </el-button>
<el-button @click.native="closeDialog( editGeOrderParamVisible = !editGeOrderParamVisible)"
>取消
</el-button
>
</div> </div>
</div> </div>
@ -90,6 +120,7 @@ import {getOriginBusType} from "@/api/basic/busOriginType";
import {filterForThirdSys} from "@/api/basic/busType"; import {filterForThirdSys} from "@/api/basic/busType";
import {isBlank} from "@/utils/strUtil"; import {isBlank} from "@/utils/strUtil";
import {saveBusTypes} from "@/api/thrsys/basicThirdSys"; import {saveBusTypes} from "@/api/thrsys/basicThirdSys";
import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
export default { export default {
name: "DialogEditBusDown", name: "DialogEditBusDown",
@ -102,11 +133,18 @@ export default {
type: Function, type: Function,
required: true, required: true,
}, },
type: {
type: Object,
required: true,
}
}, },
data() { data() {
return { return {
bussinessTypeList: [], bussinessTypeList: [],
thridBusFilter: [], thridBusFilter: [],
loading: false,
fromOptions: [],
curAction: {},
} }
}, },
@ -134,10 +172,10 @@ export default {
this.$message.error("单据类型不能为空！") this.$message.error("单据类型不能为空！")
return; return;
} }
if (isBlank(this.thirdBuyForm.thirdBuyCode)) { // if (isBlank(this.thirdBuyForm.thirdBuyCode)) {
this.$message.error("第三方单据类型不能为空！"); // this.$message.error("第三方单据类型不能为空！");
return; // return;
} // }
if (!isBlank(this.thirdBuyForm.remark)) { if (!isBlank(this.thirdBuyForm.remark)) {
if (this.thirdBuyForm.remark.length > 200) { if (this.thirdBuyForm.remark.length > 200) {
@ -148,8 +186,6 @@ export default {
if (this.getOrdersEditBtnVisible) { if (this.getOrdersEditBtnVisible) {
this.editGeOrderParamVisible = false; this.editGeOrderParamVisible = false;
} else {
this.bussinessTypeFormVisible = false;
} }
//匹配编码 //匹配编码
@ -169,12 +205,45 @@ export default {
}).catch((error) => { }).catch((error) => {
this.$message.error(error.message); this.$message.error(error.message);
}) })
}, },
actionChange(item) {
for (let i = 0; i < this.bussinessTypeList.length; i++) {
if (this.bussinessTypeList[i].name == item) {
this.curAction = this.bussinessTypeList[i]
}
}
},
//获取往来单位候选列表
findMethod(query) {
this.fromOptions = []
let cQuery = {
key: query,
corpType: this.curAction.corpType,
outType: null,
page: 1,
limit: 20
}
getBasicUnitMaintains(cQuery)
.then((response) => {
this.loading = false
this.fromOptions = response.data.list || []
})
.catch(() => {
this.loading = false
})
}
}, },
created() { created() {
this.getBussinessType(); this.getBussinessType();
this.remoteMethod(); this.remoteMethod();
this.findMethod(this.thirdBuyForm.name);
} }
} }
</script> </script>

33
src/views/thirdSys/api/index.vue
Unescape Escape View File

@ -154,7 +154,6 @@
<el-table-column label="第三方单据类型" prop="thirdBuyName"></el-table-column> <el-table-column label="第三方单据类型" prop="thirdBuyName"></el-table-column>
<el-table-column label="接口地址" prop="url" width="400" show-overflow-tooltip></el-table-column> <el-table-column label="接口地址" prop="url" width="400" show-overflow-tooltip></el-table-column>
<el-table-column label="备注" prop="remark" show-overflow-tooltip></el-table-column> <el-table-column label="备注" prop="remark" show-overflow-tooltip></el-table-column>
<el-table-column label="操作" width="200" prop="price"> <el-table-column label="操作" width="200" prop="price">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="submitOrderVisible" <el-button v-if="submitOrderVisible"
@ -205,6 +204,7 @@
width="45%" width="45%"
> >
<DialogEditBusDown :thirdBuyForm="thirdBuyForm" <DialogEditBusDown :thirdBuyForm="thirdBuyForm"
:type="orderType"
:closeDialog="closeDialog"></DialogEditBusDown> :closeDialog="closeDialog"></DialogEditBusDown>
</el-dialog> </el-dialog>
@ -321,7 +321,9 @@ export default {
thridBusFilter: [], thridBusFilter: [],
thirdSysDetailList: [], thirdSysDetailList: [],
selectInterfaceList: [], selectInterfaceList: [],
currentRow: null currentRow: null,
orderType: 1,//设置下载单据类型,
typeId: null,
}; };
}, },
@ -374,6 +376,25 @@ export default {
this.addBussinessTypeBtnVisible = true; this.addBussinessTypeBtnVisible = true;
this.getOrdersEditBtnVisible = true; this.getOrdersEditBtnVisible = true;
this.submitOrderVisible = false; this.submitOrderVisible = false;
this.orderType = 1;
} else if (row.key === "invSfOrderUrl") {
this.addBussinessTypeBtnVisible = true;
this.getOrdersEditBtnVisible = true;
this.submitOrderVisible = false;
this.orderType = 2;
this.typeId = 3;
} else if (row.key === "invPhOrderUrl") {
this.addBussinessTypeBtnVisible = true;
this.getOrdersEditBtnVisible = true;
this.submitOrderVisible = false;
this.orderType = 2;
this.typeId = 4;
} else if (row.key === "invGhOrderUrl") {
this.addBussinessTypeBtnVisible = true;
this.getOrdersEditBtnVisible = true;
this.submitOrderVisible = false;
this.orderType = 2;
this.typeId = 5;
} else { } else {
this.addBussinessTypeBtnVisible = false; this.addBussinessTypeBtnVisible = false;
} }
@ -425,6 +446,12 @@ export default {
query.type = 1; query.type = 1;
} else if (row.key == "orderSubmitUrl") { } else if (row.key == "orderSubmitUrl") {
query.type = 2; query.type = 2;
} else if (row.key == "invSfOrderUrl") {
query.type = 3;
} else if (row.key == "invPhOrderUrl") {
query.type = 4;
} else if (row.key == "invGhOrderUrl") {
query.type = 5;
} else { } else {
this.busTypeList = []; this.busTypeList = [];
return; return;
@ -547,7 +574,7 @@ export default {
id: null, id: null,
code: null, code: null,
name: null, name: null,
type: 1, type: this.typeId,
url: null, url: null,
thirdSys: this.thirdSysFk, thirdSys: this.thirdSysFk,
remark: null remark: null

35
src/views/thirdSys/invOrder/thrInvOrder.vue
Unescape Escape View File

@ -66,7 +66,7 @@
<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="getList">查询</el-button> <el-button type="primary" icon="el-icon-search" @click="getList">查询</el-button>
<el-button type="primary" icon="el-icon-search" @click="dlThrInvOrder">下载</el-button> <el-button type="primary" icon="el-icon-download" @click="dlThrInvOrder">下载</el-button>
</el-button-group> </el-button-group>
</div> </div>
@ -76,8 +76,8 @@
<el-table-column label="序号" type="index" width="60"></el-table-column> <el-table-column label="序号" type="index" width="60"></el-table-column>
<el-table-column label="单据号" prop="billNo"></el-table-column> <el-table-column label="单据号" prop="billNo"></el-table-column>
<el-table-column label="单据时间" prop="billDate"></el-table-column> <el-table-column label="单据时间" prop="billDate"></el-table-column>
<el-table-column label="出入库类型" prop="mainAction"></el-table-column> <el-table-column label="单据类型" prop="billTypeName"></el-table-column>
<el-table-column label="第三方单据类型" prop="billType"></el-table-column> <el-table-column label="仓库" prop="invName"></el-table-column>
<el-table-column label="外部系统" prop="thirdSysFk"></el-table-column> <el-table-column label="外部系统" prop="thirdSysFk"></el-table-column>
<!-- <el-table-column label="单据状态" prop="status"></el-table-column>--> <!-- <el-table-column label="单据状态" prop="status"></el-table-column>-->
<el-table-column <el-table-column
@ -101,11 +101,9 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="160"> <el-table-column label="操作" width="160" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" @click.native.stop="deleteDialog(scope.row)"
>删除
</el-button>
<el-button v-show="scope.row.status == 0 && (scope.row.exMsg === null || scope.row.exMsg === '')" <el-button v-show="scope.row.status == 0 && (scope.row.exMsg === null || scope.row.exMsg === '')"
type="text" @click.native.stop="generateBill(scope.row)" STYLE="color:rgb(0,0,255)" type="text" @click.native.stop="generateBill(scope.row)" STYLE="color:rgb(0,0,255)"
>生成单据 >生成单据
@ -118,6 +116,9 @@
@click.native.stop="refreshBill(scope.row)" @click.native.stop="refreshBill(scope.row)"
>更新 >更新
</el-button> </el-button>
<el-button type="text" @click.native.stop="deleteDialog(scope.row)"
>删除
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -153,14 +154,15 @@
<el-table-column label="患者编码" prop="sickerCode"></el-table-column> <el-table-column label="患者编码" prop="sickerCode"></el-table-column>
<el-table-column label="患者名称" prop="sickerName"></el-table-column> <el-table-column label="患者名称" prop="sickerName"></el-table-column>
<el-table-column label="操作" width="160"> <el-table-column label="操作" width="160" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" v-if="scope.row.relId==null" @click.native.stop="jump(scope.row)"
>处理
</el-button>
<el-button type="text" @click.native.stop="deleteDetailDialog(scope.row)" <el-button type="text" @click.native.stop="deleteDetailDialog(scope.row)"
>删除 >删除
</el-button> </el-button>
<el-button type="text" v-if="scope.row.relId==null" @click.native.stop="jump()"
>处理
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -517,11 +519,11 @@ export default {
this.getList(); this.getList();
} }
}, },
jump() { jump(row) {
if (this.jumpSkProject == 1) { if (this.jumpSkProject == 1) {
this.$router.push('/thirdSys/destiny/skProject') this.$router.push('/thirdSys/destiny/skProject?cpmctymc=' + row.cpmctymc)
} else { } else {
this.$router.push('/basic/product/maintain?vueRouteSource=1') this.$router.push('/basic/product/maintain?vueRouteSource=1&cpmctymc=' + row.cpmctymc)
} }
}, },
changRed({row}) { changRed({row}) {
@ -535,6 +537,11 @@ export default {
* 手动下载第三方收费出入库明细 * 手动下载第三方收费出入库明细
*/ */
dlThrInvOrder() { dlThrInvOrder() {
if (this.actDateRange != null) {
this.filterQuery.startDate = this.actDateRange[0];
this.filterQuery.endDate = this.actDateRange[1];
}
this.$confirm("是否确定下载日期范围为：[" + this.filterQuery.startDate + "---" + this.filterQuery.endDate + "]的出入库明细？", "提示", { this.$confirm("是否确定下载日期范围为：[" + this.filterQuery.startDate + "---" + this.filterQuery.endDate + "]的出入库明细？", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",

84
src/views/thirdSys/invOrder/thrInvOrderGenerate.vue
Unescape Escape View File

@ -59,32 +59,34 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row type="flex"> <el-row type="flex">
<el-form-item <el-col :span="11">
prop="fromCorp" <el-form-item
label="往来信息:" prop="fromCorp"
> label="往来信息:"
<el-select
v-model="generateOrderDate.fromCorp"
filterable
remote
clearable
reserve-keyword
style="width: 90%"
placeholder="请输入往来信息"
:remote-method="findMethod"
:loading="loading"
:disabled="corpOrderIdDisabled"
> >
<el-option <el-select
v-for="item in fromOptions" v-model="generateOrderDate.fromCorp"
:key="item.erpId" filterable
:label="item.name" remote
:value="item.erpId" clearable
reserve-keyword
style="width: 90%"
placeholder="请输入往来信息"
:remote-method="findMethod"
:loading="loading"
:disabled="corpOrderIdDisabled"
> >
<span style="float: left">{{ item.name }}</span> <el-option
</el-option> v-for="item in fromOptions"
</el-select> :key="item.erpId"
</el-form-item> :label="item.name"
:value="item.erpId"
>
<span style="float: left">{{ item.name }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row> </el-row>
<div style="text-align: center; margin-bottom: 10px;"> <div style="text-align: center; margin-bottom: 10px;">
@ -96,11 +98,11 @@
</template> </template>
<script> <script>
import { generateOrder,generateGhOrder } from '@/api/thrsys/thrInvOrder' import {generateOrder, generateGhOrder} from '@/api/thrsys/thrInvOrder'
import { findByFrom, findInvByUser } from '../../../api/system/invSubWarehouse' import {findByFrom, findInvByUser} from '../../../api/system/invSubWarehouse'
import { parseTime } from '../../../utils/coTools' import {parseTime} from '../../../utils/coTools'
import { findByInvUser, getBusTypeList } from '@/api/basic/busType' import {findByInvUser, getBusTypeList} from '@/api/basic/busType'
import { getBasicUnitMaintains } from '../../../api/basic/basicUnitMaintain' import {getBasicUnitMaintains} from '../../../api/basic/basicUnitMaintain'
export default { export default {
name: 'thrInvOrderGenerate', name: 'thrInvOrderGenerate',
@ -153,14 +155,15 @@ export default {
genUnit: false, genUnit: false,
checkWebNew: null, checkWebNew: null,
mainAction: null mainAction: null
} },
loading: false,
} }
}, },
methods: { methods: {
//提交 //提交
generateOrder() { generateOrder() {
if (this.sourceType === 1 || this.sourceType === 2 ){ if (this.sourceType === 1 || this.sourceType === 2) {
generateOrder(this.generateOrderDate).then((res) => { generateOrder(this.generateOrderDate).then((res) => {
if (res.code == 20000) { if (res.code == 20000) {
this.$message.success('生成成功!') this.$message.success('生成成功!')
@ -173,7 +176,7 @@ export default {
}).catch((error) => { }).catch((error) => {
this.$message.error(error.message) this.$message.error(error.message)
}) })
}else if (this.sourceType === 3){ } else if (this.sourceType === 3) {
generateGhOrder(this.generateOrderDate).then((res) => { generateGhOrder(this.generateOrderDate).then((res) => {
if (res.code == 20000) { if (res.code == 20000) {
this.$message.success('生成成功!') this.$message.success('生成成功!')
@ -235,14 +238,15 @@ export default {
this.findMethod() this.findMethod()
}, },
//根据仓库,用户获取单据类型 //根据仓库,用户获取单据类型
getBusTypeByInv() { getBusTypeByInv(key) {
let query = { let query = {
code: this.generateOrderDate.invCode, code: this.generateOrderDate.invCode,
editType: 2 //可编辑 action: key,//可编辑
} }
findByInvUser(query) findByInvUser(query)
.then((response) => { .then((response) => {
this.busTypeOptions = response.data || [] this.busTypeOptions = response.data || []
this.curAction = this.getActionItem(this.generateOrderDate.action)
}) })
.catch(() => { .catch(() => {
}) })
@ -257,14 +261,18 @@ export default {
}, },
//获取往来单位候选列表 //获取往来单位候选列表
findMethod(query) { findMethod(query) {
debugger
this.fromOptions = [] this.fromOptions = []
let cQuery = { let cQuery = {
key: query, key: query,
corpType: 4, corpType: this.curAction.corpType,
outType: null, outType: null,
page: 1, page: 1,
limit: 20 limit: 20
} }
if (this.curAction.corpType == 0) {
cQuery.corpType = null;
}
getBasicUnitMaintains(cQuery) getBasicUnitMaintains(cQuery)
.then((response) => { .then((response) => {
this.loading = false this.loading = false
@ -287,12 +295,14 @@ export default {
date, date,
'{y}-{m}-{d} {h}:{i}:{s}' '{y}-{m}-{d} {h}:{i}:{s}'
) )
this.generateOrderDate.corpOrderId = this.generateOrderDate.corpOrderId =
parseTime(date, '{y}{m}{d}{h}{i}{s}') + parseTime(date, '{y}{m}{d}{h}{i}{s}') +
Math.ceil(Math.random() * 89 + 10) Math.ceil(Math.random() * 89 + 10)
this.generateOrderDate.deptCode = this.$store.getters.deptCode this.generateOrderDate.action = this.generateOrderDate.billType;
this.generateOrderDate.invCode = this.$store.getters.locInvCode this.getBusTypeByInv(this.generateOrderDate.billType);
this.findInvListByUser() this.findInvListByUser()
this.findMethod(this.generateOrderDate.fromCorp)
} }
} }

Write Preview
Loading…
Cancel
Save