From d65aa7fee641733e13fcbcd6c326d6bd27a45d96 Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期二, 15 四月 2025 11:52:54 +0800
Subject: [PATCH] qx
---
src/views/reservation/reservations/index.vue | 235 ++++++----
src/views/hosp/rules/index.vue | 787 ++++++++++++++++++++++++++++++++-------
src/views/hosp/advicerules/index.vue | 167 ++++----
src/views/hosp/ruleAdvice/index.vue | 4
4 files changed, 867 insertions(+), 326 deletions(-)
diff --git a/src/views/hosp/advicerules/index.vue b/src/views/hosp/advicerules/index.vue
index c95e6fa..abbb93c 100644
--- a/src/views/hosp/advicerules/index.vue
+++ b/src/views/hosp/advicerules/index.vue
@@ -137,89 +137,92 @@
</div>
</div>
</el-col>
- <el-table
- v-loading="loading"
- :data="advicerulesList"
- @selection-change="handleSelectionChange"
- >
- <el-table-column type="selection" width="55" align="center" />
- <el-table-column label="搴忓彿" width="50" align="center">
- <template slot-scope="scope">
- {{ scope.$index + 1 }}
- <!-- 浣跨敤 $index 鏉ユ樉绀哄簭鍙凤紝浠�1寮�濮� -->
- </template>
- </el-table-column>
- <el-table-column label="缂栫爜" align="center" prop="bm" />
- <el-table-column label="绉戝" align="center" prop="ks" />
- <el-table-column label="妫�鏌ラ」鐩�" align="center" prop="jcxm" />
- <el-table-column
- label="涓昏璇婃柇"
- align="center"
- :show-overflow-tooltip="true"
- width="120"
- prop="zyzd"
- />
- <el-table-column
- label="寤鸿鍚嶇О"
- align="center"
- :show-overflow-tooltip="true"
- width="150"
- prop="jymc"
- />
- <el-table-column
- label="寤鸿鍐呭"
- align="center"
- :show-overflow-tooltip="true"
- width="200"
- prop="jynr"
- />
- <el-table-column
- label="鎬у埆"
- align="center"
- prop="xb"
- :formatter="formatSex"
- />
- <el-table-column label="鑼冨洿" align="center" prop="fwz" />
- <el-table-column label="鑼冨洿鏈�灏忓��" align="center" prop="fwzxz" />
- <el-table-column label="鑼冨洿鏈�澶у��" align="center" prop="fwzdz" />
- <el-table-column label="寮傚父鏍囧織" align="center" prop="ycbz" />
- <el-table-column label="鏄惁鐤剧梾" align="center" prop="sfjb">
- </el-table-column>
- <el-table-column label="鏄惁甯歌鐥�" align="center" prop="sfcjb">
- </el-table-column>
- <el-table-column label="鏄惁鎱㈡�х梾" align="center" prop="sfmxb">
- </el-table-column>
- <el-table-column
- label="鏄惁閲嶅ぇ鐤剧梾"
- align="center"
- width="120"
- prop="sfzdjb"
- ></el-table-column>
- <el-table-column
- label="鎿嶄綔"
- align="center"
- class-name="small-padding fixed-width"
+ <div style="width: 100%">
+ <el-table
+ v-loading="loading"
+ :data="advicerulesList"
+ @selection-change="handleSelectionChange"
+ height="520"
>
- <template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['hosp:advicerules:edit']"
- >
- </el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['hosp:advicerules:remove']"
- >
- </el-button>
- </template>
- </el-table-column>
- </el-table>
+ <el-table-column type="selection" width="55" align="center" />
+ <el-table-column label="搴忓彿" width="50" align="center">
+ <template slot-scope="scope">
+ {{ scope.$index + 1 }}
+ <!-- 浣跨敤 $index 鏉ユ樉绀哄簭鍙凤紝浠�1寮�濮� -->
+ </template>
+ </el-table-column>
+ <el-table-column label="缂栫爜" align="center" prop="bm" />
+ <el-table-column label="绉戝" align="center" prop="ks" />
+ <el-table-column label="妫�鏌ラ」鐩�" align="center" prop="jcxm" />
+ <el-table-column
+ label="涓昏璇婃柇"
+ align="center"
+ :show-overflow-tooltip="true"
+ width="120"
+ prop="zyzd"
+ />
+ <el-table-column
+ label="寤鸿鍚嶇О"
+ align="center"
+ :show-overflow-tooltip="true"
+ width="150"
+ prop="jymc"
+ />
+ <el-table-column
+ label="寤鸿鍐呭"
+ align="center"
+ :show-overflow-tooltip="true"
+ width="200"
+ prop="jynr"
+ />
+ <el-table-column
+ label="鎬у埆"
+ align="center"
+ prop="xb"
+ :formatter="formatSex"
+ />
+ <el-table-column label="鑼冨洿" align="center" prop="fwz" />
+ <el-table-column label="鑼冨洿鏈�灏忓��" align="center" prop="fwzxz" />
+ <el-table-column label="鑼冨洿鏈�澶у��" align="center" prop="fwzdz" />
+ <el-table-column label="寮傚父鏍囧織" align="center" prop="ycbz" />
+ <el-table-column label="鏄惁鐤剧梾" align="center" prop="sfjb">
+ </el-table-column>
+ <el-table-column label="鏄惁甯歌鐥�" align="center" prop="sfcjb">
+ </el-table-column>
+ <el-table-column label="鏄惁鎱㈡�х梾" align="center" prop="sfmxb">
+ </el-table-column>
+ <el-table-column
+ label="鏄惁閲嶅ぇ鐤剧梾"
+ align="center"
+ width="120"
+ prop="sfzdjb"
+ ></el-table-column>
+ <el-table-column
+ label="鎿嶄綔"
+ align="center"
+ class-name="small-padding fixed-width"
+ >
+ <template slot-scope="scope">
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-edit"
+ @click="handleUpdate(scope.row)"
+ v-hasPermi="['hosp:advicerules:edit']"
+ >
+ </el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="handleDelete(scope.row)"
+ v-hasPermi="['hosp:advicerules:remove']"
+ >
+ </el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
</el-row>
<pagination
v-show="total > 0"
diff --git a/src/views/hosp/ruleAdvice/index.vue b/src/views/hosp/ruleAdvice/index.vue
index d8b945a..d57632a 100644
--- a/src/views/hosp/ruleAdvice/index.vue
+++ b/src/views/hosp/ruleAdvice/index.vue
@@ -440,7 +440,7 @@
this.open = true;
this.title = "娣诲姞鐥呯+鎰忚";
listRules(this.queryParams).then((response) => {
- this.rulesList = response.rows;
+ this.rulesList = response.data.rows;
});
},
/** 淇敼鎸夐挳鎿嶄綔 */
@@ -460,7 +460,7 @@
bingzhong: query,
};
listRules(data).then((response) => {
- this.rulesList = response.rows;
+ this.rulesList = response.data.rows;
});
}
},
diff --git a/src/views/hosp/rules/index.vue b/src/views/hosp/rules/index.vue
index bee0558..fc11abb 100644
--- a/src/views/hosp/rules/index.vue
+++ b/src/views/hosp/rules/index.vue
@@ -4,14 +4,28 @@
<!--閮ㄩ棬鏁版嵁-->
<el-col :span="4" :xs="24">
<div class="head-container">
- <el-input v-model="xmmc" placeholder="璇疯緭鍏ラ」鐩悕" clearable size="small" prefix-icon="el-icon-search"
- style="margin-bottom: 20px" />
+ <el-input
+ v-model="xmmc"
+ placeholder="璇疯緭鍏ラ」鐩悕"
+ clearable
+ size="small"
+ prefix-icon="el-icon-search"
+ style="margin-bottom: 20px"
+ />
</div>
<div class="scrollable-container">
<div class="content">
- <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false"
- :filter-node-method="filterNode" ref="tree" node-key="id" :default-expanded-keys="treeId"
- highlight-current @node-click="handleNodeClick" />
+ <el-tree
+ :data="deptOptions"
+ :props="defaultProps"
+ :expand-on-click-node="false"
+ :filter-node-method="filterNode"
+ ref="tree"
+ node-key="id"
+ :default-expanded-keys="treeId"
+ highlight-current
+ @node-click="handleNodeClick"
+ />
</div>
</div>
<!-- <el-scrollbar style="height: 629px; width: 100%">
@@ -46,52 +60,111 @@
</el-col>
<el-col :span="19" :xs="24">
<div class="guding">
- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
- label-width="68px">
+ <el-form
+ :model="queryParams"
+ ref="queryForm"
+ size="small"
+ :inline="true"
+ v-show="showSearch"
+ label-width="68px"
+ >
<el-form-item label="椤圭洰鍚�" prop="proName">
- <el-input v-model="queryParams.proName" placeholder="璇疯緭鍏ラ」鐩悕" clearable
- @keyup.enter.native="handleQuery" />
+ <el-input
+ v-model="queryParams.proName"
+ placeholder="璇疯緭鍏ラ」鐩悕"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
</el-form-item>
<el-form-item label="瑙勫垯绫诲瀷" prop="ruleType">
- <el-select v-model="queryParams.ruleType" placeholder="璇烽�夋嫨瑙勫垯绫诲瀷" clearable>
- <el-option v-for="dict in dict.type.tj_rule_type" :key="dict.value" :label="dict.label"
- :value="dict.value" />
+ <el-select
+ v-model="queryParams.ruleType"
+ placeholder="璇烽�夋嫨瑙勫垯绫诲瀷"
+ clearable
+ >
+ <el-option
+ v-for="dict in dict.type.tj_rule_type"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
</el-select>
</el-form-item>
<el-form-item label="鐥呯" prop="bingzhong">
- <el-input v-model="queryParams.bingzhong" placeholder="璇疯緭鍏ョ梾绉�" clearable
- @keyup.enter.native="handleQuery" />
+ <el-input
+ v-model="queryParams.bingzhong"
+ placeholder="璇疯緭鍏ョ梾绉�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
</el-form-item>
<el-form-item label="鐥呯鎷奸煶" prop="bzPinyin">
- <el-input v-model="queryParams.bzPinyin" placeholder="璇疯緭鍏ョ梾绉嶆嫾闊�" clearable
- @keyup.enter.native="handleQuery" />
+ <el-input
+ v-model="queryParams.bzPinyin"
+ placeholder="璇疯緭鍏ョ梾绉嶆嫾闊�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
</el-form-item>
<el-form-item label="鎬у埆" prop="sex">
- <el-select v-model="queryParams.sex" placeholder="璇烽�夋嫨鎬у埆" clearable>
- <el-option v-for="dict in dict.type.tj_rule_sex" :key="dict.value" :label="dict.label"
- :value="dict.value" />
+ <el-select
+ v-model="queryParams.sex"
+ placeholder="璇烽�夋嫨鎬у埆"
+ clearable
+ >
+ <el-option
+ v-for="dict in dict.type.tj_rule_sex"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
</el-select>
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-search"
+ size="mini"
+ @click="handleQuery"
+ >鎼滅储</el-button
+ >
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+ >閲嶇疆</el-button
+ >
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd"
- v-hasPermi="['hosp:rules:add']">鏂板
+ <el-button
+ type="primary"
+ icon="el-icon-plus"
+ size="mini"
+ @click="handleAdd"
+ v-hasPermi="['hosp:rules:add']"
+ >鏂板
</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
- v-hasPermi="['hosp:rules:edit']">淇敼
+ <el-button
+ type="primary"
+ icon="el-icon-edit"
+ size="mini"
+ :disabled="single"
+ @click="handleUpdate"
+ v-hasPermi="['hosp:rules:edit']"
+ >淇敼
</el-button>
</el-col>
<el-col :span="1.5">
- <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
- v-hasPermi="['hosp:rules:remove']">鍒犻櫎
+ <el-button
+ type="primary"
+ icon="el-icon-delete"
+ size="mini"
+ :disabled="multiple"
+ @click="handleDelete"
+ v-hasPermi="['hosp:rules:remove']"
+ >鍒犻櫎
</el-button>
</el-col>
<!-- <el-col :span="1.5">
@@ -105,56 +178,190 @@
>瀵煎嚭
</el-button>
</el-col> -->
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ <right-toolbar
+ :showSearch.sync="showSearch"
+ @queryTable="getList"
+ ></right-toolbar>
</el-row>
- <el-table border v-loading="loading" :data="rulesList" @selection-change="handleSelectionChange" height="540">
- <el-table-column type="selection" width="55" align="center" />
- <el-table-column label="搴忓彿" align="center" prop="newID" width="55" />
- <!-- <el-table-column label="椤圭洰id" align="center" prop="proId" /> -->
- <el-table-column label="椤圭洰鍚�" align="center" prop="proName" :show-overflow-tooltip="true" />
- <el-table-column label="瑙勫垯绫诲瀷" align="center" prop="ruleType" :show-overflow-tooltip="true">
- <template slot-scope="scope">
- <dict-tag :options="dict.type.tj_rule_type" :value="scope.row.ruleType" />
- </template>
- </el-table-column>
- <el-table-column label="瑙勫垯" align="center" prop="ruleStr" :show-overflow-tooltip="true" />
- <el-table-column label="鐥呯" align="center" prop="bingzhong" :show-overflow-tooltip="true" />
- <el-table-column label="褰卞儚琛ㄧ幇" align="center" prop="yxbx" :show-overflow-tooltip="true" />
- <el-table-column label="鐥呯鎷奸煶" align="center" prop="bzPinyin" :show-overflow-tooltip="true" />
- <el-table-column label="鎬у埆" align="center" prop="sex" :show-overflow-tooltip="true">
- <template slot-scope="scope">
- <dict-tag :options="dict.type.tj_rule_sex" :value="scope.row.sex" />
- </template>
- </el-table-column>
- <el-table-column label="骞撮緞-" align="center" prop="ageLt" :show-overflow-tooltip="true" />
- <el-table-column label="骞撮緞+" align="center" prop="ageGt" :show-overflow-tooltip="true" />
- <el-table-column label="瑙勫垯鑼冨洿-" align="center" prop="ruleLt" :show-overflow-tooltip="true" />
- <el-table-column label="瑙勫垯鑼冨洿+" align="center" prop="ruleGt" width="90" :show-overflow-tooltip="true" />
- <el-table-column label="鏍囪瘑" align="center" prop="sign" :show-overflow-tooltip="true" />
- <el-table-column label="绉瀬鎬�" align="center" prop="idPositive" :show-overflow-tooltip="true" />
- <el-table-column label="鑼冨洿" align="center" prop="reference" :show-overflow-tooltip="true" />
- <el-table-column label="浼樺厛绾�" align="center" prop="sort" :show-overflow-tooltip="true" />
- <el-table-column label="灏忎簬鏍囪瘑" align="center" prop="lowSymbol" :show-overflow-tooltip="true" />
- <el-table-column label="澶т簬鏍囪瘑" align="center" prop="heighSymbol" :show-overflow-tooltip="true" />
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
- <template slot-scope="scope">
- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
- v-hasPermi="['hosp:rules:edit']" title="淇敼">
- </el-button>
- <el-button size="mini" type="text" icon="el-icon-tickets" @click="handleDetail(scope.row)"
- title="璇︽儏"></el-button>
- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
- v-hasPermi="['hosp:rules:remove']" title="鍒犻櫎">
- </el-button>
- </template>
- </el-table-column>
- </el-table>
+ <div style="width: 100%;">
+ <el-table
+ border
+ v-loading="loading"
+ :data="rulesList"
+ @selection-change="handleSelectionChange"
+ height="520"
+ >
+ <el-table-column type="selection" width="55" align="center" />
+ <el-table-column
+ label="搴忓彿"
+ align="center"
+ prop="newID"
+ width="55"
+ />
+ <!-- <el-table-column label="椤圭洰id" align="center" prop="proId" /> -->
+ <el-table-column
+ label="椤圭洰鍚�"
+ align="center"
+ prop="proName"
+ :show-overflow-tooltip="true"
+ />
+ <el-table-column
+ label="瑙勫垯绫诲瀷"
+ align="center"
+ prop="ruleType"
+ :show-overflow-tooltip="true"
+ >
+ <template slot-scope="scope">
+ <dict-tag
+ :options="dict.type.tj_rule_type"
+ :value="scope.row.ruleType"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="瑙勫垯"
+ align="center"
+ prop="ruleStr"
+ :show-overflow-tooltip="true"
+ />
+ <el-table-column
+ label="鐥呯"
+ align="center"
+ prop="bingzhong"
+ :show-overflow-tooltip="true"
+ />
+ <el-table-column
+ label="褰卞儚琛ㄧ幇"
+ align="center"
+ prop="yxbx"
+ :show-overflow-tooltip="true"
+ />
+ <el-table-column
+ label="鐥呯鎷奸煶"
+ align="center"
+ prop="bzPinyin"
+ :show-overflow-tooltip="true"
+ />
+ <el-table-column
+ label="鎬у埆"
+ align="center"
+ prop="sex"
+ :show-overflow-tooltip="true"
+ >
+ <template slot-scope="scope">
+ <dict-tag
+ :options="dict.type.tj_rule_sex"
+ :value="scope.row.sex"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="骞撮緞-"
+ align="center"
+ prop="ageLt"
+ :show-overflow-tooltip="true"
+ />
+ <el-table-column
+ label="骞撮緞+"
+ align="center"
+ prop="ageGt"
+ :show-overflow-tooltip="true"
+ />
+ <el-table-column
+ label="瑙勫垯鑼冨洿-"
+ align="center"
+ prop="ruleLt"
+ :show-overflow-tooltip="true"
+ />
+ <el-table-column
+ label="瑙勫垯鑼冨洿+"
+ align="center"
+ prop="ruleGt"
+ width="90"
+ :show-overflow-tooltip="true"
+ />
+ <el-table-column
+ label="鏍囪瘑"
+ align="center"
+ prop="sign"
+ :show-overflow-tooltip="true"
+ />
+ <el-table-column
+ label="绉瀬鎬�"
+ align="center"
+ prop="idPositive"
+ :show-overflow-tooltip="true"
+ />
+ <el-table-column
+ label="鑼冨洿"
+ align="center"
+ prop="reference"
+ :show-overflow-tooltip="true"
+ />
+ <el-table-column
+ label="浼樺厛绾�"
+ align="center"
+ prop="sort"
+ :show-overflow-tooltip="true"
+ />
+ <el-table-column
+ label="灏忎簬鏍囪瘑"
+ align="center"
+ prop="lowSymbol"
+ :show-overflow-tooltip="true"
+ />
+ <el-table-column
+ label="澶т簬鏍囪瘑"
+ align="center"
+ prop="heighSymbol"
+ :show-overflow-tooltip="true"
+ />
+ <el-table-column
+ label="鎿嶄綔"
+ align="center"
+ class-name="small-padding fixed-width"
+ >
+ <template slot-scope="scope">
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-edit"
+ @click="handleUpdate(scope.row)"
+ v-hasPermi="['hosp:rules:edit']"
+ title="淇敼"
+ >
+ </el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-tickets"
+ @click="handleDetail(scope.row)"
+ title="璇︽儏"
+ ></el-button>
+ <el-button
+ size="mini"
+ type="text"
+ icon="el-icon-delete"
+ @click="handleDelete(scope.row)"
+ v-hasPermi="['hosp:rules:remove']"
+ title="鍒犻櫎"
+ >
+ </el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </div>
<div class="pag">
<div class="pag1">
- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize" @pagination="getListByXmId" />
+ <pagination
+ v-show="total > 0"
+ :total="total"
+ :page.sync="queryParams.pageNum"
+ :limit.sync="queryParams.pageSize"
+ @pagination="getListByXmId"
+ />
</div>
</div>
</div>
@@ -162,35 +369,89 @@
</el-row>
<!-- 娣诲姞鎴栦慨鏀硅鍒�+鐥呯瀵硅瘽妗� -->
- <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body :close-on-click-modal="false">
- <el-form ref="form" :model="form" :rules="rules" label-width="80px" :inline="true">
+ <el-dialog
+ :title="title"
+ :visible.sync="open"
+ width="1000px"
+ append-to-body
+ :close-on-click-modal="false"
+ >
+ <el-form
+ ref="form"
+ :model="form"
+ :rules="rules"
+ label-width="80px"
+ :inline="true"
+ >
<!-- <el-form-item label="椤圭洰id" prop="proId">
<el-input v-model="form.proId" placeholder="璇疯緭鍏ラ」鐩甶d" />
</el-form-item> -->
<el-form-item label="椤圭洰鍚�" prop="proName">
- <el-select :remote-method="getRemoteData" v-model="form.proName" remote filterable style="width: 200px"
- placeholder="璇烽�夋嫨椤圭洰鍚�" clearable @change="idFn">
- <el-option v-for="dict in proList" :key="dict.proId" :label="dict.proName" :value="dict.proName" />
+ <el-select
+ :remote-method="getRemoteData"
+ v-model="form.proName"
+ remote
+ filterable
+ style="width: 200px"
+ placeholder="璇烽�夋嫨椤圭洰鍚�"
+ clearable
+ @change="idFn"
+ >
+ <el-option
+ v-for="dict in proList"
+ :key="dict.proId"
+ :label="dict.proName"
+ :value="dict.proName"
+ />
</el-select>
<!-- <el-input v-model="form.proName" placeholder="璇疯緭鍏ラ」鐩悕" style="width:200px" /> -->
</el-form-item>
<el-form-item label="瑙勫垯绫诲瀷" prop="ruleType">
- <el-select v-model="form.ruleType" placeholder="璇烽�夋嫨瑙勫垯绫诲瀷" style="width: 200px">
- <el-option v-for="dict in dict.type.tj_rule_type" :key="dict.value" :label="dict.label"
- :value="dict.value"></el-option>
+ <el-select
+ v-model="form.ruleType"
+ placeholder="璇烽�夋嫨瑙勫垯绫诲瀷"
+ style="width: 200px"
+ >
+ <el-option
+ v-for="dict in dict.type.tj_rule_type"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
</el-select>
</el-form-item>
- <el-form-item label="鎬у埆" prop="sex">
- <el-select v-model="form.sex" placeholder="璇烽�夋嫨鎬у埆" style="width: 200px">
- <el-option v-for="dict in dict.type.tj_rule_sex" :key="dict.value" :label="dict.label"
- :value="dict.value"></el-option>
+ <el-form-item label="鎬у埆" prop="sex">
+ <el-select
+ v-model="form.sex"
+ placeholder="璇烽�夋嫨鎬у埆"
+ style="width: 200px"
+ >
+ <el-option
+ v-for="dict in dict.type.tj_rule_sex"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ ></el-option>
</el-select>
</el-form-item>
-
+
<el-form-item label="鐥呯" prop="bingzhong">
- <el-select :remote-method="getRemoteData1" v-model="form.bingzhong" remote filterable style="width: 490px"
- placeholder="璇烽�夋嫨鐥呯" clearable @change="idFn1">
- <el-option v-for="dict in bingzhongList" :key="dict.id" :label="dict.icdname" :value="dict.icdname" />
+ <el-select
+ :remote-method="getRemoteData1"
+ v-model="form.bingzhong"
+ remote
+ filterable
+ style="width: 490px"
+ placeholder="璇烽�夋嫨鐥呯"
+ clearable
+ @change="idFn1"
+ >
+ <el-option
+ v-for="dict in bingzhongList"
+ :key="dict.id"
+ :label="dict.icdname"
+ :value="dict.icdname"
+ />
</el-select>
<!-- <el-input v-model="form.bingzhong" placeholder="璇疯緭鍏ョ梾绉�" style="width:200px" /> -->
</el-form-item>
@@ -199,47 +460,109 @@
</el-form-item> -->
<el-form-item label="鐤剧梾缂栫爜 " prop="icdCode">
- <el-input v-model="form.icdCode" placeholder="璇疯緭鍏ョ柧鐥呯紪鐮�" style="width: 200px" disabled />
+ <el-input
+ v-model="form.icdCode"
+ placeholder="璇疯緭鍏ョ柧鐥呯紪鐮�"
+ style="width: 200px"
+ disabled
+ />
</el-form-item>
-
+
<el-form-item label="骞撮緞-" prop="ageLt">
- <el-input v-model="form.ageLt" placeholder="璇疯緭鍏ュ勾榫�-" style="width: 200px" />
+ <el-input
+ v-model="form.ageLt"
+ placeholder="璇疯緭鍏ュ勾榫�-"
+ style="width: 200px"
+ />
</el-form-item>
<el-form-item label="骞撮緞+" prop="ageGt">
- <el-input v-model="form.ageGt" placeholder="璇疯緭鍏ュ勾榫�+" style="width: 200px" />
+ <el-input
+ v-model="form.ageGt"
+ placeholder="璇疯緭鍏ュ勾榫�+"
+ style="width: 200px"
+ />
</el-form-item>
<el-form-item label="瑙勫垯鑼冨洿-" prop="ruleLt">
- <el-input v-model="form.ruleLt" placeholder="璇疯緭鍏ヨ鍒欒寖鍥�-" style="width: 200px" />
+ <el-input
+ v-model="form.ruleLt"
+ placeholder="璇疯緭鍏ヨ鍒欒寖鍥�-"
+ style="width: 200px"
+ />
</el-form-item>
<el-form-item label="瑙勫垯鑼冨洿+" prop="ruleGt">
- <el-input v-model="form.ruleGt" placeholder="璇疯緭鍏ヨ鍒欒寖鍥�+" style="width: 200px" />
+ <el-input
+ v-model="form.ruleGt"
+ placeholder="璇疯緭鍏ヨ鍒欒寖鍥�+"
+ style="width: 200px"
+ />
</el-form-item>
<el-form-item label="鏍囪瘑" prop="sign">
- <el-select v-model="form.sign" remote filterable style="width: 200px" placeholder="璇烽�夋嫨鐥呯" clearable>
- <el-option v-for="dict in dataList" :key="dict.id" :label="dict.label" :value="dict.label" />
+ <el-select
+ v-model="form.sign"
+ remote
+ filterable
+ style="width: 200px"
+ placeholder="璇烽�夋嫨鐥呯"
+ clearable
+ >
+ <el-option
+ v-for="dict in dataList"
+ :key="dict.id"
+ :label="dict.label"
+ :value="dict.label"
+ />
</el-select>
<!-- <el-input v-model="form.sign" placeholder="璇疯緭鍏ユ爣璇�" style="width:200px" /> -->
</el-form-item>
<el-form-item label="鑼冨洿" prop="reference">
- <el-input v-model="form.reference" placeholder="璇疯緭鍏ヨ寖鍥�" style="width: 200px" />
+ <el-input
+ v-model="form.reference"
+ placeholder="璇疯緭鍏ヨ寖鍥�"
+ style="width: 200px"
+ />
</el-form-item>
<el-form-item label="浼樺厛绾�" prop="sort">
- <el-input-number v-model="form.sort" @change="handleChange" :min="1" label="鎻忚堪鏂囧瓧"></el-input-number>
+ <el-input-number
+ v-model="form.sort"
+ @change="handleChange"
+ :min="1"
+ label="鎻忚堪鏂囧瓧"
+ ></el-input-number>
<!-- <el-input v-model="form.sort" placeholder="璇疯緭鍏ヤ紭鍏堢骇" style="width:200px" /> -->
</el-form-item>
<el-form-item label="灏忎簬鏍囪瘑" prop="lowSymbol">
- <el-input v-model="form.lowSymbol" placeholder="璇疯緭鍏ュ皬浜庢爣璇�" style="width: 200px" />
+ <el-input
+ v-model="form.lowSymbol"
+ placeholder="璇疯緭鍏ュ皬浜庢爣璇�"
+ style="width: 200px"
+ />
</el-form-item>
<el-form-item label="澶т簬鏍囪瘑" prop="heighSymbol">
- <el-input v-model="form.heighSymbol" placeholder="璇疯緭鍏ュぇ浜庢爣璇�" style="width: 200px" />
+ <el-input
+ v-model="form.heighSymbol"
+ placeholder="璇疯緭鍏ュぇ浜庢爣璇�"
+ style="width: 200px"
+ />
</el-form-item>
<el-form-item label="瑙勫垯琛ㄧ幇" prop="yxbx">
- <el-input type="textarea" :rows="3" v-model="form.yxbx" placeholder="璇疯緭鍏ヨ鍒欒〃鐜�" style="width: 782px" />
+ <el-input
+ type="textarea"
+ :rows="3"
+ v-model="form.yxbx"
+ placeholder="璇疯緭鍏ヨ鍒欒〃鐜�"
+ style="width: 782px"
+ />
</el-form-item>
<el-form-item label="瑙勫垯缁撹 " prop="ruleStr">
- <el-input type="textarea" :rows="3" v-model="form.ruleStr" placeholder="璇疯緭鍏ヨ鍒欑粨璁�" style="width: 782px" />
+ <el-input
+ type="textarea"
+ :rows="3"
+ v-model="form.ruleStr"
+ placeholder="璇疯緭鍏ヨ鍒欑粨璁�"
+ style="width: 782px"
+ />
</el-form-item>
- <!-- <el-form-item label="褰卞儚琛ㄧ幇 " prop="yxbx">
+ <!-- <el-form-item label="褰卞儚琛ㄧ幇 " prop="yxbx">
<el-input
v-model="form.yxbx"
placeholder="璇疯緭鍏ュ奖鍍忚〃鐜�"
@@ -249,21 +572,40 @@
/>
</el-form-item> -->
<el-form-item label="寤鸿鍚嶇О" prop="adviceBt">
- <el-input v-model="form.adviceBt" style="width: 782px" placeholder="璇疯緭鍏ュ缓璁唴瀹�" >
+ <el-input
+ v-model="form.adviceBt"
+ style="width: 782px"
+ placeholder="璇疯緭鍏ュ缓璁唴瀹�"
+ >
</el-input>
</el-form-item>
-
+
<el-form-item label="寤鸿鍐呭" prop="adviceNr">
- <span slot="label" style="display: inline-block; border-bottom: 2px solid blue" @click="getDetailed">
+ <span
+ slot="label"
+ style="display: inline-block; border-bottom: 2px solid blue"
+ @click="getDetailed"
+ >
寤鸿鍐呭
</span>
- <el-input v-if="key !== 'N'" style="width: 782px" type="textarea" :rows="3" v-model="form.adviceNr"
- placeholder="璇疯緭鍏ュ缓璁唴瀹�">
+ <el-input
+ v-if="key !== 'N'"
+ style="width: 782px"
+ type="textarea"
+ :rows="3"
+ v-model="form.adviceNr"
+ placeholder="璇疯緭鍏ュ缓璁唴瀹�"
+ >
</el-input>
</el-form-item>
<el-form-item label="寤鸿鍐呭" prop="adviceNr" v-if="key == 'N'">
- <el-input type="textarea" :rows="3" v-model="form.adviceNr" placeholder="璇疯緭鍏ュ缓璁唴瀹�">
+ <el-input
+ type="textarea"
+ :rows="3"
+ v-model="form.adviceNr"
+ placeholder="璇疯緭鍏ュ缓璁唴瀹�"
+ >
</el-input>
</el-form-item>
</el-form>
@@ -274,32 +616,87 @@
</el-dialog>
<!-- 寤鸿鍐呭鍙婂缓璁悕绉板脊妗� -->
- <el-dialog title="寤鸿鍐呭" :visible.sync="dialogTableVisible" width="80%" :close-on-click-modal="false"
- @close="clearForm">
+ <el-dialog
+ title="寤鸿鍐呭"
+ :visible.sync="dialogTableVisible"
+ width="80%"
+ :close-on-click-modal="false"
+ @close="clearForm"
+ >
<div class="app-container">
- <el-form :model="form" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form
+ :model="form"
+ ref="queryForm"
+ size="small"
+ :inline="true"
+ v-show="showSearch"
+ label-width="68px"
+ >
<el-form-item label="鏍囬" prop="title">
- <el-input v-model="queryParam.bt" placeholder="璇疯緭鍏ユ爣棰�" clearable @keyup.enter.native="handlecharge" />
+ <el-input
+ v-model="queryParam.bt"
+ placeholder="璇疯緭鍏ユ爣棰�"
+ clearable
+ @keyup.enter.native="handlecharge"
+ />
</el-form-item>
<el-form-item label="寤鸿鍐呭" prop="jynr">
- <el-input v-model="queryParam.nr" placeholder="璇疯緭鍏ュ缓璁�" clearable @keyup.enter.native="handlecharge" />
+ <el-input
+ v-model="queryParam.nr"
+ placeholder="璇疯緭鍏ュ缓璁�"
+ clearable
+ @keyup.enter.native="handlecharge"
+ />
</el-form-item>
<el-form-item>
- <el-button type="primary" icon="el-icon-search" size="mini" @click="handlecharge">鎼滅储</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-search"
+ size="mini"
+ @click="handlecharge"
+ >鎼滅储</el-button
+ >
</el-form-item>
</el-form>
- <el-table v-loading="loading" :data="adviceList" ref="tb" @selection-change="handleSelectionChange1" border>
+ <el-table
+ v-loading="loading"
+ :data="adviceList"
+ ref="tb"
+ @selection-change="handleSelectionChange1"
+ border
+ >
<el-table-column type="selection" align="center" fixed />
- <el-table-column label="搴忓彿" align="center" width="60" prop="newID" />
- <el-table-column label="鏍囬" align="center" prop="title" width="120" :show-overflow-tooltip="true" />
- <el-table-column label="寤鸿" align="center" prop="advice" :show-overflow-tooltip="true" />
+ <el-table-column
+ label="搴忓彿"
+ align="center"
+ width="60"
+ prop="newID"
+ />
+ <el-table-column
+ label="鏍囬"
+ align="center"
+ prop="title"
+ width="120"
+ :show-overflow-tooltip="true"
+ />
+ <el-table-column
+ label="寤鸿"
+ align="center"
+ prop="advice"
+ :show-overflow-tooltip="true"
+ />
</el-table>
<div class="pag">
<div class="pag1">
- <pagination v-show="total > 0" :total="total" :page.sync="queryParam.page" :limit.sync="queryParam.pageSize"
- @pagination="getlistJynr" />
+ <pagination
+ v-show="total > 0"
+ :total="total"
+ :page.sync="queryParam.page"
+ :limit.sync="queryParam.pageSize"
+ @pagination="getlistJynr"
+ />
</div>
</div>
</div>
@@ -311,37 +708,99 @@
</el-dialog>
<!-- 璇︽儏寮规 -->
- <el-dialog :title="title" :visible.sync="openOne" width="1000px" append-to-body :close-on-click-modal="false">
- <el-form ref="form" :model="form" :rules="rules" label-width="80px" :inline="true">
+ <el-dialog
+ :title="title"
+ :visible.sync="openOne"
+ width="1000px"
+ append-to-body
+ :close-on-click-modal="false"
+ >
+ <el-form
+ ref="form"
+ :model="form"
+ :rules="rules"
+ label-width="80px"
+ :inline="true"
+ >
<el-form-item label="椤圭洰鍚�" prop="proName">
- <el-input v-model="form.proName" placeholder="璇疯緭鍏ラ」鐩悕" style="width: 200px" disabled />
+ <el-input
+ v-model="form.proName"
+ placeholder="璇疯緭鍏ラ」鐩悕"
+ style="width: 200px"
+ disabled
+ />
</el-form-item>
<el-form-item label="瑙勫垯绫诲瀷" prop="ruleType">
- <el-input v-model="form.ruleType" placeholder="璇疯緭鍏ヨ鍒欑被鍨�" style="width: 200px" disabled />
+ <el-input
+ v-model="form.ruleType"
+ placeholder="璇疯緭鍏ヨ鍒欑被鍨�"
+ style="width: 200px"
+ disabled
+ />
</el-form-item>
<el-form-item label="瑙勫垯" prop="ruleStr">
- <el-input v-model="form.ruleStr" placeholder="璇疯緭鍏ヨ鍒�" style="width: 200px" disabled />
+ <el-input
+ v-model="form.ruleStr"
+ placeholder="璇疯緭鍏ヨ鍒�"
+ style="width: 200px"
+ disabled
+ />
</el-form-item>
<el-form-item label="鐥呯" prop="bingzhong">
- <el-input v-model="form.bingzhong" placeholder="璇疯緭鍏ョ梾绉�" style="width: 200px" disabled />
+ <el-input
+ v-model="form.bingzhong"
+ placeholder="璇疯緭鍏ョ梾绉�"
+ style="width: 200px"
+ disabled
+ />
</el-form-item>
<el-form-item label="鐤剧梾缂栫爜 " prop="icdCode">
- <el-input v-model="form.icdCode" placeholder="璇疯緭鍏ョ柧鐥呯紪鐮�" style="width: 200px" disabled />
+ <el-input
+ v-model="form.icdCode"
+ placeholder="璇疯緭鍏ョ柧鐥呯紪鐮�"
+ style="width: 200px"
+ disabled
+ />
</el-form-item>
<el-form-item label="鎬у埆" prop="sex">
- <el-input v-model="form.sex" placeholder="璇疯緭鍏ユ�у埆" style="width: 200px" disabled />
+ <el-input
+ v-model="form.sex"
+ placeholder="璇疯緭鍏ユ�у埆"
+ style="width: 200px"
+ disabled
+ />
</el-form-item>
<el-form-item label="骞撮緞-" prop="ageLt">
- <el-input v-model="form.ageLt" placeholder="璇疯緭鍏ュ勾榫�-" style="width: 200px" disabled />
+ <el-input
+ v-model="form.ageLt"
+ placeholder="璇疯緭鍏ュ勾榫�-"
+ style="width: 200px"
+ disabled
+ />
</el-form-item>
<el-form-item label="骞撮緞+" prop="ageGt">
- <el-input v-model="form.ageGt" placeholder="璇疯緭鍏ュ勾榫�+" style="width: 200px" disabled />
+ <el-input
+ v-model="form.ageGt"
+ placeholder="璇疯緭鍏ュ勾榫�+"
+ style="width: 200px"
+ disabled
+ />
</el-form-item>
<el-form-item label="瑙勫垯鑼冨洿-" prop="ruleLt">
- <el-input v-model="form.ruleLt" placeholder="璇疯緭鍏ヨ鍒欒寖鍥�-" style="width: 200px" disabled />
+ <el-input
+ v-model="form.ruleLt"
+ placeholder="璇疯緭鍏ヨ鍒欒寖鍥�-"
+ style="width: 200px"
+ disabled
+ />
</el-form-item>
<el-form-item label="瑙勫垯鑼冨洿+" prop="ruleGt">
- <el-input v-model="form.ruleGt" placeholder="璇疯緭鍏ヨ鍒欒寖鍥�+" style="width: 200px" disabled />
+ <el-input
+ v-model="form.ruleGt"
+ placeholder="璇疯緭鍏ヨ鍒欒寖鍥�+"
+ style="width: 200px"
+ disabled
+ />
</el-form-item>
<!-- <el-form-item label="鏍囪瘑" prop="sign">
<el-select
@@ -361,28 +820,64 @@
</el-select>
</el-form-item> -->
<el-form-item label="鑼冨洿" prop="reference">
- <el-input v-model="form.reference" placeholder="璇疯緭鍏ヨ寖鍥�" style="width: 200px" disabled />
+ <el-input
+ v-model="form.reference"
+ placeholder="璇疯緭鍏ヨ寖鍥�"
+ style="width: 200px"
+ disabled
+ />
</el-form-item>
<el-form-item label="浼樺厛绾�" prop="sort">
- <el-input-number v-model="form.sort" @change="handleChange" :min="1" label="鎻忚堪鏂囧瓧" disabled></el-input-number>
+ <el-input-number
+ v-model="form.sort"
+ @change="handleChange"
+ :min="1"
+ label="鎻忚堪鏂囧瓧"
+ disabled
+ ></el-input-number>
</el-form-item>
<el-form-item label="灏忎簬鏍囪瘑" prop="lowSymbol">
- <el-input v-model="form.lowSymbol" placeholder="璇疯緭鍏ュ皬浜庢爣璇�" style="width: 200px" disabled />
+ <el-input
+ v-model="form.lowSymbol"
+ placeholder="璇疯緭鍏ュ皬浜庢爣璇�"
+ style="width: 200px"
+ disabled
+ />
</el-form-item>
<el-form-item label="澶т簬鏍囪瘑" prop="heighSymbol">
- <el-input v-model="form.heighSymbol" placeholder="璇疯緭鍏ュぇ浜庢爣璇�" style="width: 200px" disabled />
+ <el-input
+ v-model="form.heighSymbol"
+ placeholder="璇疯緭鍏ュぇ浜庢爣璇�"
+ style="width: 200px"
+ disabled
+ />
</el-form-item>
<el-form-item label="寤鸿鍚嶇О" prop="adviceBt">
- <el-input v-model="form.adviceBt" style="width: 782px" placeholder="璇疯緭鍏ュ缓璁唴瀹�" disabled>
+ <el-input
+ v-model="form.adviceBt"
+ style="width: 782px"
+ placeholder="璇疯緭鍏ュ缓璁唴瀹�"
+ disabled
+ >
</el-input>
</el-form-item>
<el-form-item label="寤鸿鍐呭" prop="adviceNr">
- <span slot="label" style="display: inline-block; border-bottom: 2px solid blue" @click="getDetailed">
+ <span
+ slot="label"
+ style="display: inline-block; border-bottom: 2px solid blue"
+ @click="getDetailed"
+ >
寤鸿鍐呭
</span>
- <el-input disabled style="width: 782px" type="textarea" :rows="3" v-model="form.adviceNr"
- placeholder="璇疯緭鍏ュ缓璁唴瀹�">
+ <el-input
+ disabled
+ style="width: 782px"
+ type="textarea"
+ :rows="3"
+ v-model="form.adviceNr"
+ placeholder="璇疯緭鍏ュ缓璁唴瀹�"
+ >
</el-input>
</el-form-item>
</el-form>
@@ -628,16 +1123,16 @@
getListByXmId() {
this.loading = true;
listRules(this.queryParams).then((response) => {
- response.rows.forEach((item, index) => {
+ response.data.rows.forEach((item, index) => {
item.newID =
(this.queryParams.pageNum - 1) * this.queryParams.pageSize +
index +
1;
});
- this.rulesList = response.rows;
+ this.rulesList = response.data.rows;
console.log(this.rulesList, 999);
- this.total = response.total;
+ this.total = response.data.total;
this.loading = false;
});
},
@@ -776,7 +1271,7 @@
});
},
// 姝ユ暟
- handleChange(value) { },
+ handleChange(value) {},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
this.reset();
@@ -827,7 +1322,7 @@
this.getListByXmId();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
})
- .catch(() => { });
+ .catch(() => {});
},
},
};
diff --git a/src/views/reservation/reservations/index.vue b/src/views/reservation/reservations/index.vue
index 5d3052d..a9cb9a9 100644
--- a/src/views/reservation/reservations/index.vue
+++ b/src/views/reservation/reservations/index.vue
@@ -857,9 +857,19 @@
"
>
<el-table :data="tableData1" border style="width: 100%">
- <el-table-column prop="proName" label="椤圭洰" width="180" align="center">
+ <el-table-column
+ prop="proName"
+ label="椤圭洰"
+ width="180"
+ align="center"
+ >
</el-table-column>
- <el-table-column prop="proType" label="鎬у埆" width="50" align="center">
+ <el-table-column
+ prop="proType"
+ label="鎬у埆"
+ width="50"
+ align="center"
+ >
<template slot-scope="scope">
<template v-if="isAll(scope.row.proType)">
鍏ㄩ儴
@@ -873,7 +883,11 @@
</template>
</el-table-column>
- <el-table-column prop="ordPrice" label="搴旀敹閲戦" align="center">
+ <el-table-column
+ prop="ordPrice"
+ label="搴旀敹閲戦"
+ align="center"
+ >
</el-table-column>
<el-table-column label="鎶樻墸" width="160px" align="center">
<template slot-scope="scope">
@@ -887,14 +901,22 @@
:step="0.1"
:max="10"
:min="0"
- :disabled="true"
+ :disabled="true"
>
</el-input-number>
</template>
</el-table-column>
- <el-table-column prop="nowPrice" label="瀹炴敹閲戦" align="center">
+ <el-table-column
+ prop="nowPrice"
+ label="瀹炴敹閲戦"
+ align="center"
+ >
</el-table-column>
- <el-table-column prop="proCheckMethod" label="鏄惁绌鸿吂" align="center">
+ <el-table-column
+ prop="proCheckMethod"
+ label="鏄惁绌鸿吂"
+ align="center"
+ >
<template slot-scope="scope">
<dict-tag
:options="dict.type.sys_yes_no"
@@ -1079,7 +1101,7 @@
</div>
</el-col>
</el-row>
-
+
<el-dialog
title="瀵兼鍗曢瑙�"
:visible.sync="dialogVisibles"
@@ -1097,7 +1119,6 @@
</div>
</template>
</el-drawer>
-
<el-dialog
title="PDF 棰勮"
@@ -1137,7 +1158,7 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer2">
- <el-button type="primary" @click="submitType" >纭� 瀹�</el-button>
+ <el-button type="primary" @click="submitType">纭� 瀹�</el-button>
<el-button @click="cancel">鍙� 娑�</el-button>
</div>
</el-dialog>
@@ -1611,9 +1632,19 @@
"
>
<el-table :data="tableData1" border style="width: 100%">
- <el-table-column prop="proName" label="椤圭洰" width="180" align="center">
+ <el-table-column
+ prop="proName"
+ label="椤圭洰"
+ width="180"
+ align="center"
+ >
</el-table-column>
- <el-table-column prop="proType" label="鎬у埆" width="50" align="center">
+ <el-table-column
+ prop="proType"
+ label="鎬у埆"
+ width="50"
+ align="center"
+ >
<template slot-scope="scope">
<template v-if="isAll(scope.row.proType)">
鍏ㄩ儴
@@ -1627,7 +1658,11 @@
</template>
</el-table-column>
- <el-table-column prop="ordPrice" label="搴旀敹閲戦" align="center">
+ <el-table-column
+ prop="ordPrice"
+ label="搴旀敹閲戦"
+ align="center"
+ >
</el-table-column>
<el-table-column label="鎶樻墸" width="160px" align="center">
<template slot-scope="scope">
@@ -1641,14 +1676,22 @@
:step="0.1"
:max="10"
:min="0"
- :disabled="true"
+ :disabled="true"
>
</el-input-number>
</template>
</el-table-column>
- <el-table-column prop="nowPrice" label="瀹炴敹閲戦" align="center">
+ <el-table-column
+ prop="nowPrice"
+ label="瀹炴敹閲戦"
+ align="center"
+ >
</el-table-column>
- <el-table-column prop="proCheckMethod" label="鏄惁绌鸿吂" align="center">
+ <el-table-column
+ prop="proCheckMethod"
+ label="鏄惁绌鸿吂"
+ align="center"
+ >
<template slot-scope="scope">
<dict-tag
:options="dict.type.sys_yes_no"
@@ -1853,10 +1896,9 @@
</template>
<script>
-import { addComp,
- addPlOrderAndDetail } from "@/api/system/comp";
+import { addComp, addPlOrderAndDetail } from "@/api/system/comp";
import Big from "big.js";
-import { Loading } from 'element-ui';
+import { Loading } from "element-ui";
import {
listReservation,
gettjCancel,
@@ -1934,7 +1976,7 @@
url: "",
open2: false,
forms: {
- tjCategory:"12"
+ tjCategory: "12",
},
dialogVisible: false,
/** 鐓х浉鏈哄脊绐楁ā鍧�-start */
@@ -1993,7 +2035,7 @@
// 鏄惁鏄剧ず寮瑰嚭灞�
pacId: "",
- cusIds:[],
+ cusIds: [],
// 缁撴灉
result: "",
proIds: [],
@@ -2682,104 +2724,107 @@
this.open2 = true;
},
-
submitType() {
// let cusIds = [];
// this.selectList.forEach((item) => {
// cusIds.push(item.idCard);
// });
- let loadingInstance1 = Loading.service({ fullscreen: true,text:"绛惧埌涓�" });
+ let loadingInstance1 = Loading.service({
+ fullscreen: true,
+ text: "绛惧埌涓�",
+ });
let data = {
cusIds: this.cusIds,
tjCategory: this.forms.tjCategory,
};
this.open2 = false;
addPlOrderAndDetail(data).then((res) => {
- if(res.code == 200){
+ if (res.code == 200) {
this.open2 = false;
- this.$modal.msgSuccess("绛惧埌鎴愬姛");
- if (res.file) {
- let base64 = res.file;
- this.base64ToBlob({
- b64data: base64,
- contentType: "application/pdf",
- }).then((res) => {
- this.dialogVisible = true;
- // 杞悗鍚庣殑blob瀵硅薄
- try {
- this.url = res.preview;
- } catch (error) {
- this.url = window.webkitURL.createObjectURL(res.preview);
+ this.$modal.msgSuccess("绛惧埌鎴愬姛");
+ if (res.file) {
+ let base64 = res.file;
+ this.base64ToBlob({
+ b64data: base64,
+ contentType: "application/pdf",
+ }).then((res) => {
+ this.dialogVisible = true;
+ // 杞悗鍚庣殑blob瀵硅薄
+ try {
+ this.url = res.preview;
+ } catch (error) {
+ this.url = window.webkitURL.createObjectURL(res.preview);
+ }
+ });
+ } else {
+ let _this = this;
+ this.$nextTick(() => {
+ // 浠ユ湇鍔＄殑鏂瑰紡璋冪敤鐨� Loading 闇�瑕佸紓姝ュ叧闂�
+ loadingInstance1.close();
+ });
+ var websocket = null;
+ var url = _this.valueUrls;
+ if ("WebSocket" in window) {
+ websocket = new WebSocket(url);
+ } else if ("MozWebSocket" in window) {
+ websocket = new MozWebSocket(url);
+ } else {
}
- });
- }else{
- let _this = this;
- this.$nextTick(() => { // 浠ユ湇鍔＄殑鏂瑰紡璋冪敤鐨� Loading 闇�瑕佸紓姝ュ叧闂�
- loadingInstance1.close();
-});
- var websocket = null;
- var url = _this.valueUrls;
- if ("WebSocket" in window) {
- websocket = new WebSocket(url);
- } else if ("MozWebSocket" in window) {
- websocket = new MozWebSocket(url);
- } else {
- }
- if (websocket == null) {
- alert("11111");
- }
- websocket.onopen = function () {
- try {
- // 杩炴帴璁惧
- var jsonObjs = {
- type: 4,
- data: res,
- };
- var jStrs = JSON.stringify(jsonObjs);
- websocket.send(jStrs);
- } catch (err) {
- var tryTime = 0;
- // 閲嶈瘯10娆★紝姣忔涔嬮棿闂撮殧3绉�
- if (tryTime < 1) {
- var t1 = setTimeout(function () {
- tryTime++;
+ if (websocket == null) {
+ alert("11111");
+ }
+ websocket.onopen = function () {
+ console.log('res',res);
+
+ try {
+ // 杩炴帴璁惧
var jsonObjs = {
type: 4,
data: res,
};
var jStrs = JSON.stringify(jsonObjs);
websocket.send(jStrs);
- }, 1 * 1000);
- } else {
- console.error("閲嶈繛澶辫触.");
- }
- }
- };
- websocket.onclose = function () {
- alert("杩炴帴鍏抽棴");
- };
- websocket.onmessage = function (event) {
- var resultObj = JSON.parse(event.data);
- _this.cardreader = false;
- };
+ } catch (err) {
+ var tryTime = 0;
+ // 閲嶈瘯10娆★紝姣忔涔嬮棿闂撮殧3绉�
+ if (tryTime < 1) {
+ var t1 = setTimeout(function () {
+ tryTime++;
+ var jsonObjs = {
+ type: 4,
+ data: res,
+ };
+ var jStrs = JSON.stringify(jsonObjs);
+ websocket.send(jStrs);
+ }, 1 * 1000);
+ } else {
+ console.error("閲嶈繛澶辫触.");
+ }
+ }
+ };
+ websocket.onclose = function () {
+ alert("杩炴帴鍏抽棴");
+ };
+ websocket.onmessage = function (event) {
+ var resultObj = JSON.parse(event.data);
+ _this.cardreader = false;
+ };
- //杩炴帴鍙戠敓閿欒鐨勫洖璋冩柟娉�
- websocket.onerror = function () {
- alert("璇锋鏌ヨ繛鎺ユ槸鍚︽甯�");
- };
-
-
- this.getList()
- }
- }else{
- this.$nextTick(() => { // 浠ユ湇鍔＄殑鏂瑰紡璋冪敤鐨� Loading 闇�瑕佸紓姝ュ叧闂�
+ //杩炴帴鍙戠敓閿欒鐨勫洖璋冩柟娉�
+ websocket.onerror = function () {
+ alert("璇锋鏌ヨ繛鎺ユ槸鍚︽甯�");
+ };
+
+ this.getList();
+ }
+ } else {
+ this.$nextTick(() => {
+ // 浠ユ湇鍔＄殑鏂瑰紡璋冪敤鐨� Loading 闇�瑕佸紓姝ュ叧闂�
loadingInstance1.close();
-});
+ });
}
-
});
},
-
base64ToBlob({ b64data = "", contentType = "", sliceSize = 512 } = {}) {
return new Promise((resolve, reject) => {
@@ -3206,8 +3251,6 @@
height: 700px;
overflow: hidden;
}
-
-
#printIframe::-webkit-scrollbar {
width: 6px;
--
Gitblit v1.8.0