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

This commit is contained in:
闫晓茹 2024-03-06 11:32:25 +08:00
commit 2b5707b00e
2 changed files with 305 additions and 311 deletions

View File

@ -82,18 +82,6 @@
>新增</el-button >新增</el-button
> >
</el-col> </el-col>
<!-- <el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['manage:script:export']"
>导出</el-button
>
</el-col> -->
<right-toolbar <right-toolbar
:showSearch.sync="showSearch" :showSearch.sync="showSearch"
@queryTable="getList" @queryTable="getList"
@ -139,7 +127,6 @@
:data="scriptList" :data="scriptList"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
> >
<!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column <el-table-column
label="序号" label="序号"
align="center" align="center"
@ -196,6 +183,13 @@
class-name="small-padding fixed-width" class-name="small-padding fixed-width"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-search"
@click="handlesee(scope.row)"
>预览</el-button
>
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
@ -204,13 +198,6 @@
v-hasPermi="['manage:script:edit']" v-hasPermi="['manage:script:edit']"
>修改</el-button >修改</el-button
> >
<!-- <el-button
size="mini"
type="text"
icon="el-icon-notebook-2"
@click="management(scope.row)"
>分类管理</el-button
> -->
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
@ -234,7 +221,7 @@
/> />
<!-- 添加或修改话术信息对话框 --> <!-- 添加或修改话术信息对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body v-if="open">
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="通用话术名称" prop="commonScriptName"> <el-form-item label="通用话术名称" prop="commonScriptName">
<el-input <el-input
@ -345,11 +332,11 @@
>{{ diseaseTypeName }}</el-button >{{ diseaseTypeName }}</el-button
> >
</el-form-item> </el-form-item>
<el-form-item label="图片" prop="platformId"> <el-form-item label="图片" prop="scriptFilePath">
<stationAcatar <stationAcatar
@imgUrl="imgUrl" @imgUrl="imgUrl"
:img="form.propagandaCoverPath" :img="form.scriptFilePath"
:type="'propagandaCoverUrl'" :type="'scriptUrl'"
/> />
</el-form-item> </el-form-item>
</el-form> </el-form>
@ -511,6 +498,18 @@
@pagination="infodisease" @pagination="infodisease"
/> />
</el-dialog> </el-dialog>
<!-- 预览弹框 -->
<el-dialog
title="提示"
:visible.sync="dialogsee"
width="30%"
:before-close="seeClose"
>
<img :src="baseUrl + form.scriptFilePath" alt="" />
<span slot="footer" class="dialog-footer">
<el-button @click="dialogsee = false"> </el-button>
</span>
</el-dialog>
</div> </div>
</template> </template>
@ -528,7 +527,7 @@ export default {
name: '', name: '',
departmentId: null, departmentId: null,
count: '',// count: '',//
sumcount:'', sumcount: '',
@ -602,7 +601,11 @@ export default {
value: 'SUSPEND', value: 'SUSPEND',
label: '暂停' label: '暂停'
},], },],
baseUrl: process.env.VUE_APP_BASE_API,
//
dialogsee: false,
// //
loading: true, loading: true,
// //
@ -725,7 +728,20 @@ export default {
methods: { methods: {
// //
imgUrl(imgUrl) { imgUrl(imgUrl) {
this.form.propagandaCoverPath = imgUrl; this.form.scriptFilePath = imgUrl;
},
//
handlesee(row) {
const id = row.id
getScript(id).then(response => {
this.form = response.data;
this.dialogsee = true;
});
},
//
seeClose() {
this.dialogsee = false;
}, },
// //
clickinnerVisible() { clickinnerVisible() {
@ -814,7 +830,7 @@ export default {
// //
let sum = 0; let sum = 0;
this.DepartmentoList.forEach((item) => { this.DepartmentoList.forEach((item) => {
if(item.countNum !=null){ if (item.countNum != null) {
console.log(item.countNum) console.log(item.countNum)
sum += item.countNum; sum += item.countNum;
@ -871,6 +887,7 @@ export default {
diseaseTypeName: null, diseaseTypeName: null,
diseaseTypeCode: null, diseaseTypeCode: null,
commonScriptName: null, commonScriptName: null,
scriptFilePath:null,
scriptName: null, scriptName: null,
scriptId: null, scriptId: null,
platformId: null, platformId: null,

View File

@ -52,6 +52,7 @@
</el-form-item> </el-form-item>
<el-form-item label="服务包价格" prop="packagePrice"> <el-form-item label="服务包价格" prop="packagePrice">
<el-input <el-input
oninput="value=value.replace(/[^\d.]/g,'')"
v-model="queryParams.packagePrice" v-model="queryParams.packagePrice"
placeholder="请输入服务包价格" placeholder="请输入服务包价格"
clearable clearable
@ -175,7 +176,11 @@
align="center" align="center"
prop="packageVersion" prop="packageVersion"
/> />
<el-table-column label="服务期限" align="center" prop="packageTermAndUnit" /> <el-table-column
label="服务期限"
align="center"
prop="packageTermAndUnit"
/>
<el-table-column <el-table-column
label="服务包简介" label="服务包简介"
align="center" align="center"
@ -216,8 +221,7 @@
type="text" type="text"
icon="el-icon-s-promotion" icon="el-icon-s-promotion"
@click="release(scope.row)" @click="release(scope.row)"
v-if="scope.row.whetherRelease==0" v-if="scope.row.whetherRelease == 0"
>发布</el-button >发布</el-button
> >
<el-button <el-button
@ -226,7 +230,6 @@
icon="el-icon-notebook-2 icon="el-icon-notebook-2
" "
@click="detail(scope.row)" @click="detail(scope.row)"
>详情</el-button >详情</el-button
> >
<el-button <el-button
@ -332,11 +335,7 @@
<el-form-item label="服务包名称" prop="packageName"> <el-form-item label="服务包名称" prop="packageName">
<el-input v-model="form.packageName" placeholder="请输入服务包名称" /> <el-input v-model="form.packageName" placeholder="请输入服务包名称" />
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="服务包简介" prop="packageIntroduction">
label="服务包简介"
prop="packageIntroduction"
>
<el-input <el-input
v-model="form.packageIntroduction" v-model="form.packageIntroduction"
placeholder="请输入服务包简介" placeholder="请输入服务包简介"
@ -344,6 +343,7 @@
</el-form-item> </el-form-item>
<el-form-item label="服务包价格" prop="packagePrice"> <el-form-item label="服务包价格" prop="packagePrice">
<el-input <el-input
oninput="value=value.replace(/[^\d.]/g,'')"
v-model="form.packagePrice" v-model="form.packagePrice"
placeholder="请输入服务包价格" placeholder="请输入服务包价格"
style="width: 204px" style="width: 204px"
@ -351,21 +351,13 @@
<template slot="append"></template> <template slot="append"></template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="服务包版本" prop="packageVersion">
label="服务包版本"
prop="packageVersion"
>
<el-input <el-input
v-model="form.packageVersion" v-model="form.packageVersion"
placeholder="请输入服务包版本" placeholder="请输入服务包版本"
/> />
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="硬件类型" prop="hardwareType">
label="硬件类型"
prop="hardwareType"
>
<el-select <el-select
v-model="form.hardwareType" v-model="form.hardwareType"
placeholder="请选择" placeholder="请选择"
@ -381,9 +373,9 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="服务包期限" prop="packageTerm"> <el-form-item label="服务包期限" prop="packageTerm">
<el-input v-model="form.packageTerm" placeholder="请输入服务包期限"> <el-input v-model="form.packageTerm" placeholder="请输入服务包期限" style="width: 208px">
<el-select <el-select
style="width: 100px" style="width: 60px"
slot="append" slot="append"
v-model="form.packageTermUnit" v-model="form.packageTermUnit"
placeholder="请选择" placeholder="请选择"
@ -401,14 +393,16 @@
</el-form-item> </el-form-item>
<br /> <br />
<div v-for="(aitem, index) in form.voList" :key="index"> <div v-for="(aitem, index) in form.voList" :key="index">
<el-form-item <el-form-item
label="服务包内容" label="服务包内容"
:rules="rules.voList.serviceWayName" :rules="rules.voList.serviceWayName"
:prop="`voList.${index}.serviceWayName`" :prop="`voList.${index}.serviceWayName`"
> >
<el-select v-model="aitem.serviceWayName" placeholder="请选择服务方式" @change="changeway"> <el-select
v-model="aitem.serviceWayName"
placeholder="请选择服务方式"
@change="changeway"
>
<el-option <el-option
v-for="item in optionsway" v-for="item in optionsway"
:key="item.id" :key="item.id"
@ -422,8 +416,12 @@
:rules="rules.voList.serviceContent" :rules="rules.voList.serviceContent"
:prop="`voList.${index}.serviceContent`" :prop="`voList.${index}.serviceContent`"
> >
<el-select v-model="aitem.serviceContent" placeholder="请选择服务内容" @change="changcontent"> <el-select
style="margin-left:10px"
v-model="aitem.serviceContent"
placeholder="请选择服务内容"
@change="changcontent"
>
<el-option <el-option
v-for="item in optionscontent" v-for="item in optionscontent"
:key="item.id" :key="item.id"
@ -438,7 +436,10 @@
:rules="rules.voList.serviceFrequencyText" :rules="rules.voList.serviceFrequencyText"
:prop="`voList.${index}.serviceFrequencyText`" :prop="`voList.${index}.serviceFrequencyText`"
> >
<el-select v-model="aitem.serviceFrequencyText" placeholder="请选择服务频次"> <el-select
v-model="aitem.serviceFrequencyText"
placeholder="请选择服务频次"
>
<el-option <el-option
v-for="item in optionsfrequency" v-for="item in optionsfrequency"
:key="item.id" :key="item.id"
@ -448,7 +449,6 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-form-item> </el-form-item>
<el-button <el-button
type="primary" type="primary"
@ -472,7 +472,7 @@
<el-form-item label="服务包备注" prop="packageRemark"> <el-form-item label="服务包备注" prop="packageRemark">
<el-input <el-input
style="width:810px" style="width: 810px"
type="textarea" type="textarea"
v-model="form.packageRemark" v-model="form.packageRemark"
placeholder="请输入服务包备注" placeholder="请输入服务包备注"
@ -480,7 +480,12 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitFormadd" v-if="title == '复制服务包基础信息'"> </el-button> <el-button
type="primary"
@click="submitFormadd"
v-if="title == '复制服务包基础信息'"
> </el-button
>
<el-button type="primary" @click="submitForm" v-else> </el-button> <el-button type="primary" @click="submitForm" v-else> </el-button>
<el-button @click="cancel"> </el-button> <el-button @click="cancel"> </el-button>
</div> </div>
@ -643,60 +648,40 @@
title="详情" title="详情"
:visible.sync="detailshow" :visible.sync="detailshow"
width="50%" width="50%"
:before-close="handleClose"> :before-close="handleClose"
>
<el-form <el-form
ref="form" ref="form"
:model="formdetail" :model="formdetail"
label-width="150px" label-width="150px"
:inline="true" :inline="true"
> >
<el-form-item <el-form-item label="病种名称:" prop="packageVersion">
label="病种名称:" <span>{{ formdetail.diseaseTypeName }}</span>
prop="packageVersion"
>
<span>{{formdetail.diseaseTypeName}}</span>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="服务包名称:" prop="packageVersion">
label="服务包名称:" <span>{{ formdetail.packageName }}</span>
prop="packageVersion"
>
<span>{{formdetail.packageName}}</span>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="价格:" prop="packageVersion">
label="价格:" <span>{{ formdetail.packagePrice }}</span>
prop="packageVersion"
>
<span>{{formdetail.packagePrice}}</span>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="服务期限:" prop="packageVersion">
label="服务期限:" <span>{{ formdetail.packageTermAndUnit }}</span>
prop="packageVersion"
>
<span>{{formdetail.packageTermAndUnit}}</span>
</el-form-item> </el-form-item>
<el-form-item <el-form-item label="硬件类型:" prop="packageVersion">
label="硬件类型:" <span>{{
prop="packageVersion" formdetail.hardwareType == "BLOOD_PRESSURE" ? "血压仪" : ""
}}</span>
> <span>{{
<span>{{formdetail.hardwareType=="BLOOD_PRESSURE"?'血压仪':''}}</span> formdetail.hardwareType == "GLUCOSE_METER" ? "血糖仪" : ""
<span>{{formdetail.hardwareType=="GLUCOSE_METER"?'血糖仪':''}}</span> }}</span>
<span>{{formdetail.hardwareType=="ELECTROCARDIOGRA"?'心电仪':''}}</span> <span>{{
formdetail.hardwareType == "ELECTROCARDIOGRA" ? "心电仪" : ""
}}</span>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-table <el-table v-loading="loading" :data="datailList">
v-loading="loading" <el-table-column label="序号" type="index" />
:data="datailList"
>
<el-table-column
label="序号"
type="index"
/>
<el-table-column <el-table-column
label="服务方式" label="服务方式"
align="center" align="center"
@ -708,12 +693,16 @@
prop="serviceContent" prop="serviceContent"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column label="服务频次" align="center" prop="serviceFrequencyText" /> <el-table-column
label="服务频次"
align="center"
prop="serviceFrequencyText"
/>
</el-table> </el-table>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="detailshow = false">关闭</el-button> <el-button @click="detailshow = false">关闭</el-button>
</span> </span>
</el-dialog> </el-dialog>
<!-- 发布弹框 --> <!-- 发布弹框 -->
<el-dialog <el-dialog
title="提示" title="提示"
@ -732,7 +721,7 @@
</template> </template>
<script> <script>
import { listServicepackage, getServicepackage, delServicepackage, addServicepackage, updateServicepackage,serviceWayList,serviccontent,editReleaseStatus,listServicePackageNum } from "@/api/manage/servicepackage"; import { listServicepackage, getServicepackage, delServicepackage, addServicepackage, updateServicepackage, serviceWayList, serviccontent, editReleaseStatus, listServicePackageNum } from "@/api/manage/servicepackage";
import { department, listDisease } from "@/api/manage/script"; import { department, listDisease } from "@/api/manage/script";
export default { export default {
@ -789,8 +778,10 @@ export default {
optionscontent: [], optionscontent: [],
// //
optionsfrequency: [ optionsfrequency: [
{ value: '', {
label: ''} value: '',
label: ''
}
], ],
optionstype: [{ optionstype: [{
@ -815,11 +806,11 @@ export default {
label: '日' label: '日'
}, },
], ],
value:'year', value: 'year',
detailshow:false, detailshow: false,
datailList:[], datailList: [],
dialogexamine: false,// dialogexamine: false,//
examineid:null,//id examineid: null,//id
idd: 0, idd: 0,
select: '', select: '',
// //
@ -860,32 +851,32 @@ export default {
}, },
// //
form: {}, form: {},
formdetail:{}, formdetail: {},
// //
rules: { rules: {
departmentId: [ departmentId: [
{ required: true, message: "所属科室id不能为空", trigger: "blur" } { required: true, message: "所属科室id不能为空", trigger: "blur" }
], ],
packageIntroduction:[ packageIntroduction: [
{ required: true, message: "服务包简介不能为空", trigger: "blur" } { required: true, message: "服务包简介不能为空", trigger: "blur" }
], ],
packagePrice:[ packagePrice: [
{ required: true, message: "服务包价格不能为空", trigger: "blur" } { required: true, message: "服务包价格不能为空", trigger: "blur" }
], ],
packageVersion:[ packageVersion: [
{ required: true, message: "服务包版本不能为空", trigger: "blur" } { required: true, message: "服务包版本不能为空", trigger: "blur" }
], ],
// packageVersion:[ // packageVersion:[
// ], // ],
packageName:[ packageName: [
{ required: true, message: "服务包名称不能为空", trigger: "blur" } { required: true, message: "服务包名称不能为空", trigger: "blur" }
], ],
packageTerm:[ packageTerm: [
{ required: true, message: "服务包期限不能为空", trigger: "blur" } { required: true, message: "服务包期限不能为空", trigger: "blur" }
], ],
voList:{ voList: {
serviceWayName: [ serviceWayName: [
{ {
required: true, required: true,
@ -918,46 +909,42 @@ export default {
this.Departmentlist(); this.Departmentlist();
}, },
methods: { methods: {
changepackageTermUnit(e){ changepackageTermUnit(e) {
this.$set(this.form,'packageTermUnit',e); this.$set(this.form, 'packageTermUnit', e);
// this.form.packageTermUnit=e // this.form.packageTermUnit=e
}, },
// //
detail(row){ detail(row) {
this.detailshow=true this.detailshow = true
getServicepackage(row.id).then(response => { getServicepackage(row.id).then(response => {
this.formdetail = response.data; this.formdetail = response.data;
this.datailList=response.data.voList this.datailList = response.data.voList
this.datailList.forEach(el=>{ this.datailList.forEach(el => {
if(el.serviceFrequencyEnd){ if (el.serviceFrequencyEnd) {
el.serviceFrequencyText=el.serviceFrequencyStart+'~'+el.serviceFrequencyEnd el.serviceFrequencyText = el.serviceFrequencyStart + '~' + el.serviceFrequencyEnd
}else{ } else {
el.serviceFrequencyText=el.serviceFrequencyText el.serviceFrequencyText = el.serviceFrequencyText
} }
}) })
console.log(this.datailList)
}); });
}, },
// //
handleClose(){ handleClose() {
this.detailshow=false this.detailshow = false
}, },
// //
release(row) { release(row) {
this.examineid = row.id this.examineid = row.id
this.dialogexamine = true this.dialogexamine = true
}, },
// //
cancelamine() { cancelamine() {
var propagandaStatus =1 var propagandaStatus = 1
editReleaseStatus(this.examineid,propagandaStatus).then(response => { editReleaseStatus(this.examineid, propagandaStatus).then(response => {
this.$message({ this.$message({
type: "success", type: "success",
message: "发布成功" message: "发布成功"
@ -968,16 +955,15 @@ this.$set(this.form,'packageTermUnit',e);
}, },
// //
amineClose() { amineClose() {
this.dialogexamine = false this.dialogexamine = false
}, },
// //
submitamine() { submitamine() {
var propagandaStatus =0 var propagandaStatus = 0
editReleaseStatus(this.examineid,propagandaStatus).then(response => { editReleaseStatus(this.examineid, propagandaStatus).then(response => {
this.$message({ this.$message({
type: "success", type: "success",
message: "发布不通过" message: "发布不通过"
@ -997,9 +983,6 @@ this.$set(this.form,'packageTermUnit',e);
var obj = { var obj = {
serviceWayName: null, serviceWayName: null,
serviceContent: null, serviceContent: null,
// serviceFrequencyText:"",
// serviceFrequencyStart: null,
// serviceFrequencyEnd:null,
idd: this.idd idd: this.idd
}; };
if (this.form.voList.length == 5) { if (this.form.voList.length == 5) {
@ -1018,37 +1001,32 @@ this.$set(this.form,'packageTermUnit',e);
this.loading = false; this.loading = false;
}); });
}, },
// //
getserviceWayList(){ getserviceWayList() {
serviceWayList().then(response => { serviceWayList().then(response => {
this.optionsway = response.data; this.optionsway = response.data;
}); });
}, },
// //
changeway(e){ changeway(e) {
var id =null var id = null
id=this.optionsway.find(f => f.serviceWayName == e).id id = this.optionsway.find(f => f.serviceWayName == e).id
serviccontent(id).then(response => { serviccontent(id).then(response => {
this.optionscontent = response.rows; this.optionscontent = response.rows;
}); });
console.log(e,'00000') this.form.voList.serviceContent='';
}, },
// //
changcontent(e){ changcontent(e) {
var id =null var id = null
id=this.optionscontent.find(f => f.serviceContent == e).id id = this.optionscontent.find(f => f.serviceContent == e).id
this.optionsfrequency=this.optionscontent.find(f=> f.id==id).serviceWayFrequencyList this.optionsfrequency = this.optionscontent.find(f => f.id == id).serviceWayFrequencyList
console.log(this.optionsfrequency,'777777') this.optionsfrequency.forEach(el => {
this.optionsfrequency.forEach(el=>{ if (el.serviceFrequencyType == "DIGIT") {
if(el.serviceFrequencyType=="DIGIT"){ el.serviceFrequencyText = el.serviceFrequencyStart + '~' + el.serviceFrequencyEnd
el.serviceFrequencyText=el.serviceFrequencyStart+'~'+el.serviceFrequencyEnd
}else if(el.serviceFrequencyType=="serviceFrequencyType"){
this.optionsfrequency=this.optionscontent.find(f=> f.id==e).serviceWayFrequencyList
console.log(this.optionsfrequency,'00000')
} else if (el.serviceFrequencyType == "serviceFrequencyType") {
this.optionsfrequency = this.optionscontent.find(f => f.id == e).serviceWayFrequencyList
} }
}) })
}, },
@ -1081,7 +1059,6 @@ this.$set(this.form,'packageTermUnit',e);
this.queryParams.departmentId = '' this.queryParams.departmentId = ''
this.itemname = null this.itemname = null
this.getList() this.getList()
} }
}, },
// //
@ -1207,7 +1184,7 @@ this.$set(this.form,'packageTermUnit',e);
this.single = selection.length !== 1 this.single = selection.length !== 1
this.multiple = !selection.length this.multiple = !selection.length
}, },
// //
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.getserviceWayList() this.getserviceWayList()
@ -1217,7 +1194,7 @@ this.$set(this.form,'packageTermUnit',e);
serviceWayName: null, serviceWayName: null,
serviceContent: null, serviceContent: null,
serviceFrequencyStart: null, serviceFrequencyStart: null,
serviceFrequencyEnd:null, serviceFrequencyEnd: null,
idd: this.idd, idd: this.idd,
}, },
], ],
@ -1226,7 +1203,7 @@ this.$set(this.form,'packageTermUnit',e);
this.form.whetherRelease = 0 this.form.whetherRelease = 0
this.form.packageTermUnit='年' this.form.packageTermUnit = '年'
if (this.itemname) { if (this.itemname) {
this.form.departmentName = this.departmentName this.form.departmentName = this.departmentName
this.form.departmentId = this.itemname this.form.departmentId = this.itemname
@ -1247,12 +1224,12 @@ this.$set(this.form,'packageTermUnit',e);
const id = row.id || this.ids const id = row.id || this.ids
getServicepackage(id).then(response => { getServicepackage(id).then(response => {
this.form = response.data; this.form = response.data;
this.form.voList.forEach(el=>{ this.form.voList.forEach(el => {
if(!el.serviceFrequencyText){ if (!el.serviceFrequencyText) {
el.serviceFrequencyText=el.serviceFrequencyStart+'~'+el.serviceFrequencyEnd el.serviceFrequencyText = el.serviceFrequencyStart + '~' + el.serviceFrequencyEnd
}else{ } else {
el.serviceFrequencyText=el.serviceFrequencyText el.serviceFrequencyText = el.serviceFrequencyText
} }
}) })
@ -1263,16 +1240,16 @@ this.$set(this.form,'packageTermUnit',e);
}); });
}, },
// //
copy(row){ copy(row) {
const id = row.id || this.ids const id = row.id || this.ids
getServicepackage(id).then(response => { getServicepackage(id).then(response => {
this.form = response.data; this.form = response.data;
this.form.voList.forEach(el=>{ this.form.voList.forEach(el => {
if(!el.serviceFrequencyText){ if (!el.serviceFrequencyText) {
el.serviceFrequencyText=el.serviceFrequencyStart+'~'+el.serviceFrequencyEnd el.serviceFrequencyText = el.serviceFrequencyStart + '~' + el.serviceFrequencyEnd
}else{ } else {
el.serviceFrequencyText=el.serviceFrequencyText el.serviceFrequencyText = el.serviceFrequencyText
} }
}) })
this.diseaseTypeName = response.data.diseaseTypeName this.diseaseTypeName = response.data.diseaseTypeName
@ -1283,17 +1260,17 @@ this.$set(this.form,'packageTermUnit',e);
}); });
}, },
// //
submitFormadd(){ submitFormadd() {
this.form.whetherRelease = 0 this.form.whetherRelease = 0
this.form.voList.forEach(e=>{ this.form.voList.forEach(e => {
if(e.serviceFrequencyText.includes('~')){ if (e.serviceFrequencyText.includes('~')) {
const str = e.serviceFrequencyText; const str = e.serviceFrequencyText;
const parts = str.split('~'); const parts = str.split('~');
e.serviceFrequencyStart = parts[0]; e.serviceFrequencyStart = parts[0];
e.serviceFrequencyEnd = parts[1]; e.serviceFrequencyEnd = parts[1];
e.serviceFrequencyText=null e.serviceFrequencyText = null
}else{ } else {
e.serviceFrequencyText=e.serviceFrequencyText e.serviceFrequencyText = e.serviceFrequencyText
} }
}) })
if (this.diseaseTypeName == "请选择病种") { if (this.diseaseTypeName == "请选择病种") {
@ -1318,21 +1295,21 @@ this.$set(this.form,'packageTermUnit',e);
}); });
}, },
// //
submitForm() { submitForm() {
console.log(this.form) console.log(this.form)
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
if(this.form.voList){ if (this.form.voList) {
this.form.voList.forEach(e=>{ this.form.voList.forEach(e => {
if(e.serviceFrequencyText.includes('~')){ if (e.serviceFrequencyText.includes('~')) {
const str = e.serviceFrequencyText; const str = e.serviceFrequencyText;
const parts = str.split('~'); const parts = str.split('~');
e.serviceFrequencyStart = parts[0]; e.serviceFrequencyStart = parts[0];
e.serviceFrequencyEnd = parts[1]; e.serviceFrequencyEnd = parts[1];
e.serviceFrequencyText=null e.serviceFrequencyText = null
}else{ } else {
e.serviceFrequencyText=e.serviceFrequencyText e.serviceFrequencyText = e.serviceFrequencyText
} }
if (this.form.id != null) { if (this.form.id != null) {
this.form.departmentName = this.departmentName this.form.departmentName = this.departmentName