| src/api/account/contract.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/doctor/checkAll/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/hosp/order/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/hosp/project/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/system/contract/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/views/system/info/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| vue.config.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/api/account/contract.js
New file @@ -0,0 +1,38 @@ import request from '@/utils/request' // 查询合同列表 export function getList(query) { return request({ url: '/system/htxxb/list', method: 'get', params: query }) } // 修改合同 export function edithtxxb(data) { return request({ url: '/system/htxxb', method: 'put', data: data }) } // 新增合同 export function addhtxxb(data) { return request({ url: '/system/htxxb', method: 'post', data: data }) } // 删除体检项目建议规则新表 export function delhtxxb(id) { return request({ url: '/system/htxxb/' + id, method: 'delete' }) }
@@ -92,7 +92,8 @@ </el-table-column> <el-table-column label="出生日期" align="center" prop="cusBrithday" :show-overflow-tooltip="true" width="110px" /> <el-table-column label="电话" align="center" prop="cusPhone" :show-overflow-tooltip="true" width="130px" /> <el-table-column label="审核时间" align="center" prop="shsj" :show-overflow-tooltip="true" width="180px" /> <el-table-column label="审核时间" align="center" prop="shsj" :show-overflow-tooltip="true" width="180px" v-if="tjStatus == 1" /> <el-table-column label="体检时间" align="center" prop="tjTime" :show-overflow-tooltip="true" width="180px" v-if="tjStatus == 0" /> <!-- <el-table-column label="完成时间" align="center" prop="finishTime" :show-overflow-tooltip="true" width="160px" /> --> <el-table-column label="套餐名称" align="center" prop="pacName" :show-overflow-tooltip="true" width="160px" /> <el-table-column label="状态" align="center" prop="tjStatus" :show-overflow-tooltip="true" width="120px" src/views/hosp/order/index.vue
@@ -1957,6 +1957,8 @@ this.DataList = []; this.DataList3 = []; this.Datalists = []; this.filterText = "", this.filterage = "", this.TotalPrice1 = 0; this.orderId = row.orderId; this.cusId = row.tjCusIdCard; @@ -2033,6 +2035,8 @@ this.DataList = []; this.DataList3 = []; this.Datalists = []; this.filterText = "", this.filterage = "", this.TotalPrice1 = 0; this.orderId = this.ids; this.cusId = this.cusIds; src/views/hosp/project/index.vue
@@ -469,11 +469,27 @@ ></el-option> </el-select> </el-form-item> <el-form-item label="标本类型" prop="specimenType"> <el-select v-model="form.specimenType" placeholder="请选择标本类型" style="width: 200px" filterable clearable > <el-option v-for="dict in dict.type.yblx" :key="dict.value" :label="dict.label" :value="dict.value" ></el-option> </el-select> </el-form-item> <el-form-item label="检查部位" prop="checkBw"> <el-select v-model="form.checkBw" placeholder="请选择检查部位" style="width: 200px" style="width: 260px" filterable clearable > @@ -489,7 +505,7 @@ <el-input v-model="form.proMetering" placeholder="请输入单位" style="width: 260px" style="width: 200px" /> </el-form-item> <el-form-item label="参考范围" prop="proScope"> @@ -503,14 +519,14 @@ <el-input v-model="form.sl" placeholder="请输入数量" style="width: 200px" style="width: 260px" /> </el-form-item> <el-form-item label="组合标志" prop="sfzhfy"> <el-select v-model="form.sfzhfy" placeholder="请选择是否组合标志" style="width: 260px" style="width: 200px" > <el-option v-for="dict in dict.type.sys_yes_no" @@ -547,7 +563,7 @@ <el-input v-model="form.hisXmmc" placeholder="his项目名称" style="width: 200px" style="width: 260px" ></el-input> </el-form-item> <el-form-item label="his项目名称" prop="hisXmmc" v-if="key == 'N'"> @@ -561,7 +577,7 @@ <el-input v-model="form.hisXmbm" placeholder="请输入his编码" style="width: 260px" style="width: 200px" /> </el-form-item> <el-form-item label="his单价" prop="hisdj"> @@ -582,14 +598,14 @@ <el-input v-model="form.lisXmmc" placeholder="请输入LIS项目" style="width: 200px" style="width: 260px" ></el-input> </el-form-item> <el-form-item label="LIS编码" prop="lisXmbm"> <el-input v-model="form.lisXmbm" placeholder="请输入his编码" style="width: 260px" style="width: 200px" /> </el-form-item> <el-form-item label="备注" prop="proRemark"> @@ -603,11 +619,11 @@ <el-input v-model="form.xh" placeholder="请输入排序" style="width: 200px" style="width: 260px" /> </el-form-item> <el-form-item label="是否参与异常" prop="sfcyyc"> <el-select v-model="form.sfcyyc" placeholder="请选择是否参与异常" style="width: 260px"> <el-select v-model="form.sfcyyc" placeholder="请选择是否参与异常" style="width: 200px"> <el-option v-for="dict in dictTypesy" :key="dict.value" :label="dict.label" :value="dict.value"></el-option> </el-select> @@ -962,6 +978,7 @@ "sys_dict_position", "tj_result_type", "sys_yes_no", "yblx", ], components: { Treeselect, IconSelect, Packagese }, data() { @@ -1101,7 +1118,7 @@ watch: { deptName(val) { this.debounceFilter(val); }, }, treeId(newVal) { console.log(newVal,8989) if (newVal && newVal.length > 0) { src/views/system/contract/index.vue
@@ -8,7 +8,7 @@ v-show="showSearch" label-width="68px" > <el-form-item label="单位名称" prop="company"> <el-form-item label="单位名称" v-show="showSearch" prop="company"> <el-select :remote-method="getRemoteData" v-model="queryParams.company" @@ -239,6 +239,28 @@ label-width="80px" :inline="true" > <el-form-item label="单位名称" prop="cnName"> <!-- <el-input v-model="form.cnName" placeholder="请输入中文名称" /> --> <el-select :remote-method="getRemoteData" v-model="form.cnName" remote default-first-option allow-create filterable style="width: 200px" placeholder="请选择单位名称" clearable @change="idFn1" > <el-option v-for="dict in CompanyList" :key="dict.cnName" :label="dict.cnName" :value="dict.drugManufacturerId" /> </el-select> </el-form-item> <el-form-item label="合同类型" prop="htlx"> <el-select v-model="form.htlx" @@ -256,7 +278,6 @@ </el-select> </el-form-item> <el-form-item label="企业名称" prop="qymc"> <el-input placeholder="请输入企业名称" @@ -265,7 +286,7 @@ ></el-input> </el-form-item> <el-form-item label="合同金额" prop="htje"> <el-form-item label="合同金额" prop="htje"> <el-input placeholder="请输入合同金额" v-model="form.htje" @@ -335,8 +356,6 @@ ></el-input> </el-form-item> <el-form-item label="续签标志" prop="xqbz"> <el-input placeholder="请输入续签合同标志" @@ -361,7 +380,21 @@ ></el-input> </el-form-item> <el-form-item label="开票名称" prop="kpmc"> <el-input placeholder="请输入开票名称" v-model="form.kpmc" clearable ></el-input> </el-form-item> <el-form-item label="开票税号" prop="kpsh"> <el-input placeholder="请输入开票税号" v-model="form.kpsh" clearable ></el-input> </el-form-item> <el-form-item label="备注" prop="remark"> <el-input @@ -379,21 +412,143 @@ <el-button @click="cancel">取 消</el-button> </div> </el-dialog> <!-- 添加单位对话框 --> <el-dialog :title="title" :visible.sync="open1" width="1000px" append-to-body > <el-form ref="form" :model="form" :rules="rules" label-width="98px" :inline="true" @submit.native.prevent > <el-form-item label="单位名称" prop="cnName"> <el-input v-model="form.cnName" placeholder="请输入中文名称" style="width: 510px" /> </el-form-item> <el-form-item label="统一信用代码" prop="taxNumber"> <el-input v-model="form.taxNumber" placeholder="请输入统一信用代码" style="width: 510px" /> </el-form-item> <el-form-item label="法人代表" prop="legalPerson"> <el-input v-model="form.legalPerson" placeholder="请输入法人" /> </el-form-item> <el-form-item label="联系人" prop="contactPerson"> <el-input v-model="form.contactPerson" placeholder="请输入联系人" /> </el-form-item> <el-form-item label="联系电话" prop="contactPhone"> <el-input v-model="form.contactPhone" placeholder="请输入联系电话" /> </el-form-item> <el-form-item label="传真" prop="faxNumber"> <el-input v-model="form.faxNumber" placeholder="请输入传真" /> </el-form-item> <el-form-item label="注册地址" prop="registerAddress"> <el-input v-model="form.registerAddress" placeholder="请输入注册地址" style="width: 830px" /> </el-form-item> <el-form-item label="通讯地址" prop="mailingAddress"> <el-input v-model="form.mailingAddress" placeholder="请输入通讯地址" style="width: 830px" /> </el-form-item> <br /> <el-form-item label="开户银行" prop="bankAccount"> <el-input v-model="form.bankAccount" placeholder="请输入开户银行" style="width: 510px" /> </el-form-item> <el-form-item label="银行账户" prop="countNum"> <el-input v-model="form.countNum" placeholder="请输入银行账户" style="width: 510px" /> </el-form-item> <el-form-item label="联系邮箱" prop="email"> <el-input v-model="form.email" placeholder="请输入邮箱" /> </el-form-item> <el-form-item label="负责人" prop="principal"> <el-input v-model="form.principal" placeholder="请输入负责人" /> </el-form-item> <el-form-item label="网址" prop="url"> <el-input v-model="form.url" placeholder="请输入网址" /> </el-form-item> <el-form-item label="行政区划名称" prop="areaName"> <el-select filterable v-model="form.areaName" placeholder="请选择行政区划名称" clearable style="width: 198px" > <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label" :value="dict.value" /> </el-select> </el-form-item> <el-form-item label="备注" prop="remark"> <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" :rows="2" label-width="400px" style="width: 830px" resize="none" ></el-input> </el-form-item> </el-form> <div slot="footer" class="dialog-footer"> <el-button type="primary" @click="submitForm1">确 定</el-button> <el-button @click="cancel1">取 消</el-button> </div> </el-dialog> </div> </template> <script> // import { getList, addhtxxb, edithtxxb, delhtxxb } from "@/api/account/contract"; import { getZybCompList, queryCompany, getconfigKey, getCompany } from "@/api/team/tuanti"; import { getList, addhtxxb, edithtxxb, delhtxxb } from "@/api/account/contract"; import { getZybCompList, queryCompany, getconfigKey, getCompany, } from "@/api/team/tuanti"; import { addDept, addComp, updateComp, Deptlist, getDwAndDwDept, newExcelImport, } from "@/api/system/comp"; export default { @@ -402,6 +557,16 @@ dicts: ["sys_type_contract"], data() { let checkPhoneNum = (rule, value, callback) => { let patter = new RegExp(/^1\s*[3456789]\s*(\d\s*){9}$/); if (value == "" && value == undefined && !value) { return callback(""); } else if (value != undefined && value != "") { return callback(); } else if (!patter.test(value)) { return callback(""); } }; return { // 遮罩层 @@ -442,6 +607,7 @@ // 是否显示弹出层 open: false, open1: false, objs: { drugManufacturerId: "", @@ -478,6 +644,14 @@ trigger: "blur", }, ], cnName: [{ required: true, validator: checkPhoneNum, trigger: "blur" }], contactPerson: [ { required: true, validator: checkPhoneNum, trigger: "blur" }, ], contactPhone: [ { required: true, validator: checkPhoneNum, trigger: "blur" }, ], }, }; }, @@ -492,7 +666,7 @@ getList() { this.loading = true; /* getList(this.queryParams).then((response) => { getList(this.queryParams).then((response) => { for (let i = 0; i < response.rows.length; i++) { response.rows[i].newID = i + 1; } @@ -500,9 +674,9 @@ this.dataList = response.rows; this.loading = false; }); */ }); // 获取单位信息集合 // 获取单位信息集合 getCompany(this.queryParam).then((response) => { this.CompanyList = response.data; }); @@ -522,18 +696,19 @@ }); }, // 体检公司拼音搜索 // 体检公司拼音搜索 getRemoteData(query) { if (query) { let compName = query; queryCompany(compName).then((response) => { console.log(response,123); console.log(response, 123); this.CompanyList = response.data; }); } }, idFn1(value) { if (value) { this.form.dictCompId = value; @@ -549,7 +724,7 @@ /** 新增按钮操作 */ handleAdd1() { this.reset(); this.open = true; this.open1 = true; this.title = "添加体检单位信息维护"; }, @@ -558,7 +733,39 @@ cancel() { this.open = false; this.reset(); // this.getList(); // this.getList(); }, cancel1(){ this.open1 = false; }, /** 提交按钮 */ submitForm1() { this.$refs["form"].validate((valid) => { if (valid) { if (this.form.drugManufacturerId != null) { updateComp(this.form).then((response) => { this.$modal.msgSuccess("修改成功"); this.open1 = false; this.getList(); }); } else { if ( this.form.cnName && this.form.contactPerson && this.form.contactPhone ) { addComp(this.form).then((response) => { this.$modal.msgSuccess("新增成功"); this.open1 = false; this.getList(); }); } else { this.$modal.msgError("请填写必传项"); } } } }); }, // 搜索 @@ -679,7 +886,7 @@ this.open = true; this.title = "合同信息详情"; this.title = "添加合同信息详情"; }, /** 修改按钮操作 */ @@ -692,6 +899,11 @@ this.open = true; this.title = "合同信息详情"; /* this.form = { ...row, cnName: row.drugManufacturerId, // 确保这里是 ID }; */ }, handleDelete(row) { src/views/system/info/index.vue
@@ -36,7 +36,8 @@ type="primary" icon="el-icon-search" size="mini" @click="handleQuery" style="margin:0 15px;" @click="handleQuery" style="margin: 0 15px" >搜索</el-button > <el-button icon="el-icon-refresh" size="mini" @click="resetQuery" @@ -115,7 +116,12 @@ /> <el-table-column label="差额" align="center" prop="difference" /> <el-table-column label="签约人" align="center" prop="payer" /> <el-table-column label="预约时间" align="center" prop="createTime" /> <el-table-column label="预约时间" align="center" prop="createTime" :formatter="formatDate" /> </el-table> <el-form @@ -126,7 +132,7 @@ label-width="100px" > <el-row> <el-col :span="6"> <el-col :span="5"> <el-form-item label="负责人" style="display: flex"> <el-input v-model="formInline.payer" @@ -134,12 +140,12 @@ ></el-input> </el-form-item> </el-col> <el-col :span="7"> <el-col :span="6"> <el-form-item label="交易金额" style="display: flex"> <el-input v-model="formInline.price" placeholder="金额"></el-input> </el-form-item> </el-col> <el-col :span="7"> <el-col :span="6"> <el-form-item label="交易类型" prop="payType" style="display: flex"> <el-select v-model="formInline.payType" @@ -154,23 +160,66 @@ </el-select> </el-form-item> </el-col> <el-col :span="7"> <el-col :span="4"> <el-form-item style="display: flex"> <el-button type="primary" size="mini" @click="SubmitEvent" style="margin: 0 15px" >收费</el-button > </el-form-item> </el-col> <!-- <el-col :span="7"> <el-form-item> <el-button type="primary" size="mini" @click="SubmitEvent" style="margin:0 15px;" <el-button type="primary" size="mini" @click="SubmitEvent" style="margin: 0 15px" >收费</el-button > <el-button type="primary" size="mini" @click="handleDelete" >退费</el-button > </el-form-item> </el-col> </el-col> --> </el-row> </el-form> <el-button-group style="margin-left: 20px; margin-top: 20px"> <el-button type="primary" size="mini">已检未结账人员</el-button> <el-button type="primary" size="mini">未检人员</el-button> <el-button type="primary" size="mini">全部人员</el-button> </el-button-group> <el-row :gutter="20"> <el-col :span="12" :xs="24" style="padding: 0px 20px"> <div class="tj"> <span class="tj_txt">体检人员情况表</span> </div> <el-table v-loading="loading" :data="peopleList" border max-height="260px" > <el-table-column type="selection" width="55" align="center" /> <el-table-column label="序号" align="center" prop="newID" /> <el-table-column label="姓名" align="center" prop="name" /> <el-table-column label="性别" align="center" prop="sex" /> <el-table-column label="电话" align="center" prop="iphone" /> <el-table-column label="状态" align="center" prop="tjStatus" /> <el-table-column label="体检时间" align="center" prop="tjTime"> </el-table-column> </el-table> </el-col> <el-col :span="12" :xs="24"> <div class="tj"> <span class="tj_txt">已缴费记录</span> <span class="tj_txt">已结账记录</span> </div> <el-table @@ -192,24 +241,11 @@ <el-table-column label="交易人员" align="center" prop="payer" /> <el-table-column label="操作人员" align="center" prop="payee"> </el-table-column> <el-table-column label="操作时间" align="center" prop="createTime" /> </el-table> </el-col> <el-col :span="12" :xs="24" style="padding: 0px 20px"> <div class="tj"> <span class="tj_txt">体检人员情况表</span> </div> <el-table v-loading="loading" :data="peopleList" border max-height="260px" > <el-table-column label="序号" align="center" prop="newID" /> <el-table-column label="姓名" align="center" prop="name" /> <el-table-column label="状态" align="center" prop="tjStatus" /> <el-table-column label="体检时间" align="center" prop="tjTime"> <el-table-column label="结账时间" align="center" prop="createTime" /> <el-table-column label="操作" align="center"> <template> <el-button type="primary">撤销结账</el-button> </template> </el-table-column> </el-table> </el-col> @@ -295,6 +331,14 @@ }, methods: { /** 查询体检单位缴费明细列表 */ formatDate(row) { if (!row.createTime) return ""; const date = new Date(row.createTime); const year = date.getFullYear(); const month = (date.getMonth() + 1).toString().padStart(2, "0"); const day = date.getDate().toString().padStart(2, "0"); return `${year}-${month}-${day}`; }, getList() { // this.loading = true; // listInfo(this.queryParams).then(response => { @@ -396,7 +440,7 @@ }, // 多选框选中数据 handleSelectionChange(selection) { console.log(2222) console.log(2222); if (selection.length > 1) { let del_row = selection.shift(); this.$refs.tb.toggleRowSelection(del_row, false); //设置这一行取消选中 @@ -431,7 +475,7 @@ }); } }); console.log(11111) console.log(11111); if (this.teamNo) { getTeamTjPeopleList(this.teamNo).then((res) => { if (res.data) { vue.config.js
@@ -54,6 +54,10 @@ [process.env.VUE_APP_BASE_API]: { // target: `https://ltpeis.xaltjdkj.cn:5801/`, // target: `http://192.168.1.99:5012`, <<<<<<< HEAD ======= // target: `http://192.168.1.2:5011`, >>>>>>> 37c5fa644553d6e24c729b62408e631a8c50e379 target: `http://192.168.1.113:5011`, // // target: `http://192.168.0.99:8080/ltkj-admin`, // target: `https://ltpeis.xaltjdkj.cn:5011/ltkj-admin`,
