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/'

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();
} }
} }

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

@ -193,7 +193,8 @@
<!-- </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'}`"
@ -552,7 +557,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
@ -565,8 +572,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>
@ -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>
@ -2516,6 +2528,7 @@ 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) => {
// 处理返回的数据 // 处理返回的数据
@ -2528,6 +2541,12 @@ 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>

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

@ -4,7 +4,8 @@
<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'}`"
@ -199,7 +204,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
@ -212,8 +219,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>
@ -248,7 +258,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>
@ -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) => {

8
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;
if (this.type == 1) {
this.filterQuery.invCode = this.invQueryData.targetInvCode;
} else
this.filterQuery.invCode = this.invQueryData.invCode; 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: "取消",

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

@ -59,6 +59,7 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row type="flex"> <el-row type="flex">
<el-col :span="11">
<el-form-item <el-form-item
prop="fromCorp" prop="fromCorp"
label="往来信息:" label="往来信息:"
@ -85,6 +86,7 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </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;">
@ -153,7 +155,8 @@ export default {
genUnit: false, genUnit: false,
checkWebNew: null, checkWebNew: null,
mainAction: null mainAction: null
} },
loading: false,
} }
}, },
@ -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