From ea19bff6e73e7c00bb2e273a747ae27e57dcbc08 Mon Sep 17 00:00:00 2001 From: WXL <1785969728@qq.com> Date: 星期一, 27 十一月 2023 17:09:59 +0800 Subject: [PATCH] 提交信息 --- src/assets/images/fwwu.png | 0 src/views/followvisit/outpatient/index.vue | 414 +++++++++++++++++++------ src/assets/images/duanxinfuwu.png | 0 src/assets/images/duanxinjilu.png | 0 src/components/Assistant/index.vue | 51 +-- src/views/shortmessage/healthinformation/index.vue | 2 src/views/patient/patient/index.vue | 41 + src/assets/images/huanzheliebiao.png | 0 src/views/followvisit/record/index.vue | 24 - src/assets/images/ren.png | 0 src/assets/images/dianhua.png | 0 src/assets/images/duanxin-.png | 0 src/assets/images/zxlt.png | 0 src/assets/images/shoushuzhudaoyisheng.png | 0 src/views/followvisit/discharge/index.vue | 419 +++++++++++++++++++------ 15 files changed, 675 insertions(+), 276 deletions(-) diff --git a/src/assets/images/dianhua.png b/src/assets/images/dianhua.png new file mode 100644 index 0000000..e2031ca --- /dev/null +++ b/src/assets/images/dianhua.png Binary files differ diff --git a/src/assets/images/duanxin-.png b/src/assets/images/duanxin-.png new file mode 100644 index 0000000..05ff2b5 --- /dev/null +++ b/src/assets/images/duanxin-.png Binary files differ diff --git a/src/assets/images/duanxinfuwu.png b/src/assets/images/duanxinfuwu.png new file mode 100644 index 0000000..5c86cd5 --- /dev/null +++ b/src/assets/images/duanxinfuwu.png Binary files differ diff --git a/src/assets/images/duanxinjilu.png b/src/assets/images/duanxinjilu.png new file mode 100644 index 0000000..1dd1afc --- /dev/null +++ b/src/assets/images/duanxinjilu.png Binary files differ diff --git a/src/assets/images/fwwu.png b/src/assets/images/fwwu.png new file mode 100644 index 0000000..3766bbd --- /dev/null +++ b/src/assets/images/fwwu.png Binary files differ diff --git a/src/assets/images/huanzheliebiao.png b/src/assets/images/huanzheliebiao.png new file mode 100644 index 0000000..389bab9 --- /dev/null +++ b/src/assets/images/huanzheliebiao.png Binary files differ diff --git a/src/assets/images/ren.png b/src/assets/images/ren.png new file mode 100644 index 0000000..3859adb --- /dev/null +++ b/src/assets/images/ren.png Binary files differ diff --git a/src/assets/images/shoushuzhudaoyisheng.png b/src/assets/images/shoushuzhudaoyisheng.png new file mode 100644 index 0000000..c165d3b --- /dev/null +++ b/src/assets/images/shoushuzhudaoyisheng.png Binary files differ diff --git a/src/assets/images/zxlt.png b/src/assets/images/zxlt.png new file mode 100644 index 0000000..46d9e10 --- /dev/null +++ b/src/assets/images/zxlt.png Binary files differ diff --git a/src/components/Assistant/index.vue b/src/components/Assistant/index.vue index 7328736..a77428a 100644 --- a/src/components/Assistant/index.vue +++ b/src/components/Assistant/index.vue @@ -68,7 +68,7 @@ }, distanceBottom: { type: Number, - default: 700, + default: 600, }, isScrollHidden: { type: Boolean, @@ -104,40 +104,24 @@ activeIndex: 0, //楂樹寒鏄剧ず powerList: [ { - path: require("@/assets/images/涓嬭浇.png"), - label: "杩炴帴CTI", + path: require("@/assets/images/huanzheliebiao.png"), + label: "鎮h��", }, { - path: require("@/assets/images/涓嬭浇.png"), - label: "绛惧叆", + path: require("@/assets/images/fwwu.png"), + label: "鏈嶅姟", }, { - path: require("@/assets/images/涓嬭浇.png"), - label: "绛惧嚭", + path: require("@/assets/images/duanxinjilu.png"), + label: "鐭俊", }, { - path: require("@/assets/images/涓嬭浇.png"), - label: "缃棽", + path: require("@/assets/images/dianhua.png"), + label: "鐢佃瘽", }, { - path: require("@/assets/images/涓嬭浇.png"), - label: "缃繖", - }, - { - path: require("@/assets/images/涓嬭浇.png"), - label: "鎷ㄥ彿", - }, - { - path: require("@/assets/images/涓嬭浇.png"), - label: "鍜ㄨ", - }, - { - path: require("@/assets/images/涓嬭浇.png"), - label: "淇濇寔", - }, - { - path: require("@/assets/images/涓嬭浇.png"), - label: "鎭㈠", + path: require("@/assets/images/zxlt.png"), + label: "鍦ㄧ嚎鑱婂ぉ", }, ], }; @@ -172,7 +156,7 @@ // 浼哥缉鎮诞鐞� handelFlex() { if (this.flag) { - this.buffer(this.box, "height", 700); + this.buffer(this.box, "height", 600); } else { this.buffer(this.box, "height", 70); } @@ -400,7 +384,7 @@ .item-container { margin-top: 10px; width: 70px; - height: 600px; + height: 500px; display: flex; justify-content: space-between; align-items: center; @@ -410,7 +394,7 @@ width: 40px; height: 40px; border-radius: 50%; - background-color: #69707a; + background-color: #f1f7ff; display: flex; justify-content: center; align-items: center; @@ -477,10 +461,11 @@ } .active { - background-color: #1a1818 !important; + background-color: #f9f1db !important; } .active-des { - color: #1a1818 !important; - font-weight: bold !important; + color: #71dcfa !important; + font-size: 20px !important; + font-weight: 500 !important; } </style> diff --git a/src/views/followvisit/discharge/index.vue b/src/views/followvisit/discharge/index.vue index 3b969de..f3de6a2 100644 --- a/src/views/followvisit/discharge/index.vue +++ b/src/views/followvisit/discharge/index.vue @@ -88,36 +88,12 @@ > </el-col> <el-col :span="1.5"> - <el-button - type="success" - plain - icon="el-icon-edit" - size="medium" - :disabled="single" - @click="handleUpdate" - v-hasPermi="['system:user:edit']" - >淇敼</el-button - > - </el-col> - <el-col :span="1.5"> - <el-button - type="danger" - plain - icon="el-icon-delete" - size="medium" - :disabled="multiple" - @click="handleDelete" - v-hasPermi="['system:user:remove']" - >鍒犻櫎</el-button - > - </el-col> - <el-col :span="19"> <div class="documentf"> <div class="document"> <el-button type="warning" plain - icon="el-icon-download" + icon="el-icon-upload2" size="medium" @click="handleExport" v-hasPermi="['system:user:export']" @@ -126,13 +102,80 @@ </div> </div> </el-col> + <el-col :span="1.5"> + <div class="documentf"> + <div class="document"> + <el-button + type="success" + plain + icon="el-icon-download" + size="medium" + @click="toleadExport" + v-hasPermi="['system:user:export']" + >瀵煎叆</el-button + > + </div> + </div> + </el-col> + <el-col :span="1.5"> + <div class="documentf"> + <div class="document"> + <el-button + type="info" + icon="el-icon-refresh" + size="medium" + @click="TaskReset" + v-hasPermi="['system:user:export']" + >浠诲姟閲嶇疆</el-button + > + </div> + </div> + </el-col> + <el-col :span="1.5"> + <div class="documentf"> + <div class="document"> + <el-button + type="success" + icon="el-icon-position" + size="medium" + @click="AllStarted" + v-hasPermi="['system:user:export']" + >鍏ㄩ儴寮�濮�</el-button + > + </div> + </div> + </el-col> + <el-col :span="1.5"> + <div class="documentf"> + <div class="document"> + <el-button + type="warning" + icon="el-icon-remove" + size="medium" + @click="AllStop" + v-hasPermi="['system:user:export']" + >鍏ㄩ儴鍋滄</el-button + > + </div> + </div> + </el-col> + <el-col :span="1.5"> + <div class="documentf"> + <div class="document"> + <el-button + type="primary" + icon="el-icon-remove" + size="medium" + @click="Sendtimesetting" + v-hasPermi="['system:user:export']" + >鍙戦�佹椂闂磋缃�</el-button + > + </div> + </div> + </el-col> + <!-- <el-col :span="1.5"> </el-col> --> </el-row> - <!-- <right-toolbar - :showSearch.sync="showSearch" - @queryTable="getList" - :columns="columns" - ></right-toolbar> --> <el-table v-loading="loading" :data="userList" @@ -147,41 +190,37 @@ /> <el-table-column - label="浠诲姟鍚嶇О" + label="鐥呭巻鍙�" align="center" sortable key="userName" prop="userName" - :show-overflow-tooltip="true" + width="120" /> + <el-table-column label="濮撳悕" align="center" key="types" prop="types" /> <el-table-column - label="鏈嶅姟妯℃澘" - align="center" - key="types" - prop="types" - /> - <el-table-column - label="鍒涘缓鏃ユ湡" + label="骞撮緞" align="center" key="nickName" prop="nickName" /> <el-table-column - label="寰呮墽琛�/鎬绘暟" + label="搴婂彿" + align="center" + key="nickName" + prop="nickName" + /> + <el-table-column + label="鐥呭尯" align="center" key="phonenumber" prop="phonenumber" width="120" > - <template slot-scope="scope"> - <span style="margin-left: 10px" - >{{ scope.row.date }}/{{ scope.row.data }}</span - > - </template> </el-table-column> <el-table-column - label="鎵ц鐘舵��" + label="鐤剧梾鍚嶇О" align="center" key="topicnumber" prop="topicnumber" @@ -189,21 +228,52 @@ :show-overflow-tooltip="true" > <template slot-scope="scope"> - <div>鎵ц瀹屾垚/鎵ц澶辫触</div> + <div>杞诲害楠ㄨ</div> </template> </el-table-column> <el-table-column - label="瀹℃牳浜�" + label="闅忚鐘舵��" + align="center" + key="topicnumber" + prop="topicnumber" + width="120" + :show-overflow-tooltip="true" + > + <template slot-scope="scope"> + <div>鏈畬鎴�</div> + </template> + </el-table-column> + <el-table-column + label="闅忚鏂规" align="center" key="topicnumberaa" prop="topicnumberaa" - sortable width="120" - :show-overflow-tooltip="true" + /> + <el-table-column + label="瀹f暀鏉愭枡" + align="center" + key="topicnumberaa" + prop="topicnumberaa" + width="120" + /> + <el-table-column + label="闅忚鏂瑰紡" + align="center" + key="topicnumberaa" + prop="topicnumberaa" + width="120" + /> + <el-table-column + label="闅忚浜哄憳" + align="center" + key="topicnumberaa" + prop="topicnumberaa" + width="120" /> <el-table-column - label="瀹℃牳鏃堕棿" + label="灏辫瘖鏃堕棿" sortable align="center" prop="createTime" @@ -214,25 +284,30 @@ </template> </el-table-column> <el-table-column - label="鎿嶄綔" + label="闅忚鏃堕棿" + sortable align="center" - width="120" - class-name="small-padding fixed-width" + prop="createTime" + width="160" > <template slot-scope="scope"> - <el-button - size="medium" - type="text" - @click="handleUpdate(scope.row)" - v-hasPermi="['system:user:edit']" - ><span class="button-zx" - ><i class="el-icon-s-promotion"></i>寮�濮嬫墽琛�</span - ></el-button - > + <span>{{ parseTime(scope.row.createTime) }}</span> </template> </el-table-column> <el-table-column - label="浠诲姟璇︽儏" + label="鍥炲鏃堕棿" + sortable + align="center" + prop="createTime" + width="160" + > + <template slot-scope="scope"> + <span>{{ parseTime(scope.row.createTime) }}</span> + </template> + </el-table-column> + + <el-table-column + label="鎿嶄綔" align="center" width="200" class-name="small-padding fixed-width" @@ -241,28 +316,28 @@ <el-button size="medium" type="text" - @click="handleUpdate(scope.row)" - v-hasPermi="['system:user:edit']" - ><span class="button-xq" - ><i class="el-icon-s-data"></i>璇︽儏</span - ></el-button - > - <el-button - size="medium" - type="text" - @click="handleUpdate(scope.row)" + @click="followupvisit(scope.row)" v-hasPermi="['system:user:edit']" ><span class="button-bb" - ><i class="el-icon-s-order"></i>鎶ヨ〃</span + ><i class="el-icon-s-promotion"></i>閲嶆柊闅忚</span ></el-button > <el-button size="medium" type="text" - @click="handleUpdate(scope.row)" + @click="handlestop(scope.row)" v-hasPermi="['system:user:edit']" ><span class="button-sc" - ><i class="el-icon-delete"></i>鍒犻櫎</span + ><i class="el-icon-delete"></i>鍋滄</span + ></el-button + > + <el-button + size="medium" + type="text" + @click="Seedetails(scope.row)" + v-hasPermi="['system:user:edit']" + ><span class="button-zx" + ><i class="el-icon-s-order"></i>鏌ョ湅璇︽儏</span ></el-button > </template> @@ -331,6 +406,81 @@ <el-button @click="cancel">杩� 鍥�</el-button> </div> </el-dialog> + <!-- 淇敼鍙戦�佹椂闂村璇濇 --> + <el-dialog + title="鍙戦�佹椂闂磋缃�" + :visible.sync="modificationVisible" + width="45%" + > + <div style="margin-bottom: 20px; color: red"> + 缁熶竴淇敼褰撳ぉ鏈彂閫佺殑浠诲姟鏃堕棿 + </div> + + <el-form + :model="ruleForm" + :rules="rules" + ref="ruleForm" + label-width="120px" + class="demo-ruleForm" + > + <el-form-item label="鍙戦�佹棩鏈�"> + <el-date-picker + v-model="ruleForm.value1" + type="date" + placeholder="閫夋嫨鏃ユ湡" + > + </el-date-picker> + </el-form-item> + + <el-form-item label="鏃堕棿娈�" prop="type"> + <el-checkbox-group v-model="ruleForm.type"> + <el-checkbox label="涓婂崍" name="type"></el-checkbox> + <el-checkbox label="涓嬪崍" name="type"></el-checkbox> + <el-checkbox label="鏅氫笂" name="type"></el-checkbox> + </el-checkbox-group> + </el-form-item> + <el-form-item label="涓婂崍鏃堕棿鍖洪棿" required> + <el-time-picker + is-range + v-model="ruleForm.value2" + range-separator="鑷�" + start-placeholder="寮�濮嬫椂闂�" + end-placeholder="缁撴潫鏃堕棿" + placeholder="閫夋嫨鏃堕棿鑼冨洿" + > + </el-time-picker> + </el-form-item> + <el-form-item label="涓嬪崍鏃堕棿鍖洪棿" required> + <el-time-picker + is-range + v-model="ruleForm.value3" + range-separator="鑷�" + start-placeholder="寮�濮嬫椂闂�" + end-placeholder="缁撴潫鏃堕棿" + placeholder="閫夋嫨鏃堕棿鑼冨洿" + > + </el-time-picker> + </el-form-item> + <el-form-item label="鏅氫笂鏃堕棿鍖洪棿" required> + <el-time-picker + is-range + v-model="ruleForm.value4" + range-separator="鑷�" + start-placeholder="寮�濮嬫椂闂�" + end-placeholder="缁撴潫鏃堕棿" + placeholder="閫夋嫨鏃堕棿鑼冨洿" + > + </el-time-picker> + </el-form-item> + </el-form> + + <span slot="footer" class="dialog-footer"> + <el-button @click="modificationVisible = false">鍙� 娑�</el-button> + <el-button type="primary" @click="modificationVisible = false" + >纭� 瀹�</el-button + > + </span> + </el-dialog> </div> </template> @@ -371,6 +521,8 @@ title: "鏂板闂ㄨ瘖闅忚", // 鏄惁鏄剧ず淇敼銆佹坊鍔犲脊鍑哄眰 addalteropen: false, + // 淇敼鍙戦�佹椂闂村璇濇 + modificationVisible: false, // 閮ㄩ棬鍚嶇О deptName: undefined, // 榛樿瀵嗙爜 @@ -379,8 +531,9 @@ dateRange: [], // 宀椾綅閫夐」 postOptions: [], - // 瑙掕壊閫夐」 - roleOptions: [], + ruleForm: { + type: [], + }, dynamicTags: ["閫夐」涓�", "閫夐」浜�", "閫夐」涓�"], //閫夐」 inputVisible: false, inputValue: "", @@ -696,20 +849,20 @@ // }); }, /** 淇敼鎸夐挳鎿嶄綔 */ - handleUpdate(row) { - this.reset(); - const userId = row.userId || this.ids; - getUser(userId).then((response) => { - this.form = response.data; - this.postOptions = response.posts; - this.roleOptions = response.roles; - this.$set(this.form, "postIds", response.postIds); - this.$set(this.form, "roleIds", response.roleIds); - this.addalteropen = true; - this.title = "淇敼鐢ㄦ埛"; - this.form.password = ""; - }); - }, + // handleUpdate(row) { + // this.reset(); + // const userId = row.userId || this.ids; + // getUser(userId).then((response) => { + // this.form = response.data; + // this.postOptions = response.posts; + // this.roleOptions = response.roles; + // this.$set(this.form, "postIds", response.postIds); + // this.$set(this.form, "roleIds", response.roleIds); + // this.addalteropen = true; + // this.title = "淇敼鐢ㄦ埛"; + // this.form.password = ""; + // }); + // }, /** 閲嶇疆瀵嗙爜鎸夐挳鎿嶄綔 */ handleResetPwd(row) { this.$prompt('璇疯緭鍏�"' + row.userName + '"鐨勬柊瀵嗙爜', "鎻愮ず", { @@ -761,6 +914,58 @@ }) .catch(() => {}); }, + // 鍏ㄩ儴鍋滄 + AllStop() { + this.$modal + .confirm("鏄惁鍋滄鍏ㄩ儴浠诲姟锛�") + .then(function () { + return console.log("鍋滄鎴愬姛"); + }) + .then(() => { + this.getList(); + this.$modal.msgWarning("鍋滄鎴愬姛"); + }) + .catch(() => {}); + }, + // 鍏ㄩ儴寮�濮� + AllStarted() { + this.$modal + .confirm("鏄惁寮�鍚叏閮ㄤ换鍔★紵") + .then(function () { + return console.log("寮�鍚垚鍔�"); + }) + .then(() => { + this.getList(); + this.$modal.msgSuccess("寮�鍚垚鍔�"); + }) + .catch(() => {}); + }, + // 浠诲姟閲嶇疆 + TaskReset() { + this.$modal + .confirm("鏄惁閲嶇疆閫変腑鐨勪换鍔¢」锛�") + .then(function () { + return console.log("閫変腑鎴愬姛"); + }) + .then(() => { + this.getList(); + this.$modal.msgSuccess("閲嶇疆鎴愬姛"); + }) + .catch(() => {}); + }, + // 璁剧疆鍙戦�佹椂闂� + Sendtimesetting() { + this.modificationVisible = true; + }, + // 璺宠浆璇︽儏椤� + Seedetails() { + this.$router.push({ + path: "/followvisit/record/detailpage/", + query: { id: "1" }, + }); + }, + // 瀵煎叆鎸夐挳 + toleadExport() {}, /** 瀵煎嚭鎸夐挳鎿嶄綔 */ handleExport() { this.download( @@ -783,7 +988,7 @@ } .document { - width: 100px; + // width: 100px; height: 50px; } @@ -866,15 +1071,24 @@ } .button-bb { font-weight: 500; - color: #2ba05c; + background-color: #2ba05c; + padding: 5px; + border-radius: 1px; + color: #ffffff; } .button-xq { font-weight: 500; - color: #409eff; + background-color: #409eff; + padding: 5px; + border-radius: 1px; + color: #ffffff; } .button-sc { font-weight: 500; - color: #dd302a; + background-color: #dd302a; + padding: 5px; + border-radius: 1px; + color: #ffffff; } .button-zx { background: #4fabe9; @@ -889,9 +1103,10 @@ } } -::v-deep.el-checkbox-group { - span { - font-size: 24px; - } -} +// 閫夐」瀛椾綋鏀惧ぇ +// ::v-deep.el-checkbox-group { +// span { +// font-size: 24px; +// } +// } </style> diff --git a/src/views/followvisit/outpatient/index.vue b/src/views/followvisit/outpatient/index.vue index 3b969de..2623298 100644 --- a/src/views/followvisit/outpatient/index.vue +++ b/src/views/followvisit/outpatient/index.vue @@ -88,36 +88,12 @@ > </el-col> <el-col :span="1.5"> - <el-button - type="success" - plain - icon="el-icon-edit" - size="medium" - :disabled="single" - @click="handleUpdate" - v-hasPermi="['system:user:edit']" - >淇敼</el-button - > - </el-col> - <el-col :span="1.5"> - <el-button - type="danger" - plain - icon="el-icon-delete" - size="medium" - :disabled="multiple" - @click="handleDelete" - v-hasPermi="['system:user:remove']" - >鍒犻櫎</el-button - > - </el-col> - <el-col :span="19"> <div class="documentf"> <div class="document"> <el-button type="warning" plain - icon="el-icon-download" + icon="el-icon-upload2" size="medium" @click="handleExport" v-hasPermi="['system:user:export']" @@ -126,13 +102,80 @@ </div> </div> </el-col> + <el-col :span="1.5"> + <div class="documentf"> + <div class="document"> + <el-button + type="success" + plain + icon="el-icon-download" + size="medium" + @click="toleadExport" + v-hasPermi="['system:user:export']" + >瀵煎叆</el-button + > + </div> + </div> + </el-col> + <el-col :span="1.5"> + <div class="documentf"> + <div class="document"> + <el-button + type="info" + icon="el-icon-refresh" + size="medium" + @click="TaskReset" + v-hasPermi="['system:user:export']" + >浠诲姟閲嶇疆</el-button + > + </div> + </div> + </el-col> + <el-col :span="1.5"> + <div class="documentf"> + <div class="document"> + <el-button + type="success" + icon="el-icon-position" + size="medium" + @click="AllStarted" + v-hasPermi="['system:user:export']" + >鍏ㄩ儴寮�濮�</el-button + > + </div> + </div> + </el-col> + <el-col :span="1.5"> + <div class="documentf"> + <div class="document"> + <el-button + type="warning" + icon="el-icon-remove" + size="medium" + @click="AllStop" + v-hasPermi="['system:user:export']" + >鍏ㄩ儴鍋滄</el-button + > + </div> + </div> + </el-col> + <el-col :span="1.5"> + <div class="documentf"> + <div class="document"> + <el-button + type="primary" + icon="el-icon-remove" + size="medium" + @click="Sendtimesetting" + v-hasPermi="['system:user:export']" + >鍙戦�佹椂闂磋缃�</el-button + > + </div> + </div> + </el-col> + <!-- <el-col :span="1.5"> </el-col> --> </el-row> - <!-- <right-toolbar - :showSearch.sync="showSearch" - @queryTable="getList" - :columns="columns" - ></right-toolbar> --> <el-table v-loading="loading" :data="userList" @@ -147,41 +190,31 @@ /> <el-table-column - label="浠诲姟鍚嶇О" + label="鐥呭巻鍙�" align="center" sortable key="userName" prop="userName" - :show-overflow-tooltip="true" + width="120" /> + <el-table-column label="濮撳悕" align="center" key="types" prop="types" /> <el-table-column - label="鏈嶅姟妯℃澘" - align="center" - key="types" - prop="types" - /> - <el-table-column - label="鍒涘缓鏃ユ湡" + label="骞撮緞" align="center" key="nickName" prop="nickName" /> <el-table-column - label="寰呮墽琛�/鎬绘暟" + label="绉戝" align="center" key="phonenumber" prop="phonenumber" width="120" > - <template slot-scope="scope"> - <span style="margin-left: 10px" - >{{ scope.row.date }}/{{ scope.row.data }}</span - > - </template> </el-table-column> <el-table-column - label="鎵ц鐘舵��" + label="鐤剧梾鍚嶇О" align="center" key="topicnumber" prop="topicnumber" @@ -189,21 +222,52 @@ :show-overflow-tooltip="true" > <template slot-scope="scope"> - <div>鎵ц瀹屾垚/鎵ц澶辫触</div> + <div>杞诲害楠ㄨ</div> </template> </el-table-column> <el-table-column - label="瀹℃牳浜�" + label="闅忚鐘舵��" + align="center" + key="topicnumber" + prop="topicnumber" + width="120" + :show-overflow-tooltip="true" + > + <template slot-scope="scope"> + <div>鏈畬鎴�</div> + </template> + </el-table-column> + <el-table-column + label="闅忚鏂规" align="center" key="topicnumberaa" prop="topicnumberaa" - sortable width="120" - :show-overflow-tooltip="true" + /> + <el-table-column + label="瀹f暀鏉愭枡" + align="center" + key="topicnumberaa" + prop="topicnumberaa" + width="120" + /> + <el-table-column + label="闅忚鏂瑰紡" + align="center" + key="topicnumberaa" + prop="topicnumberaa" + width="120" + /> + <el-table-column + label="闅忚浜哄憳" + align="center" + key="topicnumberaa" + prop="topicnumberaa" + width="120" /> <el-table-column - label="瀹℃牳鏃堕棿" + label="灏辫瘖鏃堕棿" sortable align="center" prop="createTime" @@ -214,25 +278,31 @@ </template> </el-table-column> <el-table-column - label="鎿嶄綔" + label="闅忚鏃堕棿" + sortable align="center" - width="120" - class-name="small-padding fixed-width" + prop="createTime" + width="160" > <template slot-scope="scope"> - <el-button - size="medium" - type="text" - @click="handleUpdate(scope.row)" - v-hasPermi="['system:user:edit']" - ><span class="button-zx" - ><i class="el-icon-s-promotion"></i>寮�濮嬫墽琛�</span - ></el-button - > + <span>{{ parseTime(scope.row.createTime) }}</span> </template> </el-table-column> <el-table-column - label="浠诲姟璇︽儏" + label="鍥炲鏃堕棿" + sortable + align="center" + prop="createTime" + width="160" + > + <template slot-scope="scope"> + <span>{{ parseTime(scope.row.createTime) }}</span> + </template> + </el-table-column> + + + <el-table-column + label="鎿嶄綔" align="center" width="200" class-name="small-padding fixed-width" @@ -241,28 +311,28 @@ <el-button size="medium" type="text" - @click="handleUpdate(scope.row)" - v-hasPermi="['system:user:edit']" - ><span class="button-xq" - ><i class="el-icon-s-data"></i>璇︽儏</span - ></el-button - > - <el-button - size="medium" - type="text" - @click="handleUpdate(scope.row)" + @click="followupvisit(scope.row)" v-hasPermi="['system:user:edit']" ><span class="button-bb" - ><i class="el-icon-s-order"></i>鎶ヨ〃</span + ><i class="el-icon-s-promotion"></i>閲嶆柊闅忚</span ></el-button > <el-button size="medium" type="text" - @click="handleUpdate(scope.row)" + @click="handlestop(scope.row)" v-hasPermi="['system:user:edit']" ><span class="button-sc" - ><i class="el-icon-delete"></i>鍒犻櫎</span + ><i class="el-icon-delete"></i>鍋滄</span + ></el-button + > + <el-button + size="medium" + type="text" + @click="Seedetails(scope.row)" + v-hasPermi="['system:user:edit']" + ><span class="button-zx" + ><i class="el-icon-s-order"></i>鏌ョ湅璇︽儏</span ></el-button > </template> @@ -331,6 +401,81 @@ <el-button @click="cancel">杩� 鍥�</el-button> </div> </el-dialog> + <!-- 淇敼鍙戦�佹椂闂村璇濇 --> + <el-dialog + title="鍙戦�佹椂闂磋缃�" + :visible.sync="modificationVisible" + width="45%" + > + <div style="margin-bottom: 20px; color: red"> + 缁熶竴淇敼褰撳ぉ鏈彂閫佺殑浠诲姟鏃堕棿 + </div> + + <el-form + :model="ruleForm" + :rules="rules" + ref="ruleForm" + label-width="120px" + class="demo-ruleForm" + > + <el-form-item label="鍙戦�佹棩鏈�"> + <el-date-picker + v-model="ruleForm.value1" + type="date" + placeholder="閫夋嫨鏃ユ湡" + > + </el-date-picker> + </el-form-item> + + <el-form-item label="鏃堕棿娈�" prop="type"> + <el-checkbox-group v-model="ruleForm.type"> + <el-checkbox label="涓婂崍" name="type"></el-checkbox> + <el-checkbox label="涓嬪崍" name="type"></el-checkbox> + <el-checkbox label="鏅氫笂" name="type"></el-checkbox> + </el-checkbox-group> + </el-form-item> + <el-form-item label="涓婂崍鏃堕棿鍖洪棿" required> + <el-time-picker + is-range + v-model="ruleForm.value2" + range-separator="鑷�" + start-placeholder="寮�濮嬫椂闂�" + end-placeholder="缁撴潫鏃堕棿" + placeholder="閫夋嫨鏃堕棿鑼冨洿" + > + </el-time-picker> + </el-form-item> + <el-form-item label="涓嬪崍鏃堕棿鍖洪棿" required> + <el-time-picker + is-range + v-model="ruleForm.value3" + range-separator="鑷�" + start-placeholder="寮�濮嬫椂闂�" + end-placeholder="缁撴潫鏃堕棿" + placeholder="閫夋嫨鏃堕棿鑼冨洿" + > + </el-time-picker> + </el-form-item> + <el-form-item label="鏅氫笂鏃堕棿鍖洪棿" required> + <el-time-picker + is-range + v-model="ruleForm.value4" + range-separator="鑷�" + start-placeholder="寮�濮嬫椂闂�" + end-placeholder="缁撴潫鏃堕棿" + placeholder="閫夋嫨鏃堕棿鑼冨洿" + > + </el-time-picker> + </el-form-item> + </el-form> + + <span slot="footer" class="dialog-footer"> + <el-button @click="modificationVisible = false">鍙� 娑�</el-button> + <el-button type="primary" @click="modificationVisible = false" + >纭� 瀹�</el-button + > + </span> + </el-dialog> </div> </template> @@ -371,6 +516,8 @@ title: "鏂板闂ㄨ瘖闅忚", // 鏄惁鏄剧ず淇敼銆佹坊鍔犲脊鍑哄眰 addalteropen: false, + // 淇敼鍙戦�佹椂闂村璇濇 + modificationVisible: false, // 閮ㄩ棬鍚嶇О deptName: undefined, // 榛樿瀵嗙爜 @@ -379,8 +526,9 @@ dateRange: [], // 宀椾綅閫夐」 postOptions: [], - // 瑙掕壊閫夐」 - roleOptions: [], + ruleForm: { + type: [], + }, dynamicTags: ["閫夐」涓�", "閫夐」浜�", "閫夐」涓�"], //閫夐」 inputVisible: false, inputValue: "", @@ -696,20 +844,20 @@ // }); }, /** 淇敼鎸夐挳鎿嶄綔 */ - handleUpdate(row) { - this.reset(); - const userId = row.userId || this.ids; - getUser(userId).then((response) => { - this.form = response.data; - this.postOptions = response.posts; - this.roleOptions = response.roles; - this.$set(this.form, "postIds", response.postIds); - this.$set(this.form, "roleIds", response.roleIds); - this.addalteropen = true; - this.title = "淇敼鐢ㄦ埛"; - this.form.password = ""; - }); - }, + // handleUpdate(row) { + // this.reset(); + // const userId = row.userId || this.ids; + // getUser(userId).then((response) => { + // this.form = response.data; + // this.postOptions = response.posts; + // this.roleOptions = response.roles; + // this.$set(this.form, "postIds", response.postIds); + // this.$set(this.form, "roleIds", response.roleIds); + // this.addalteropen = true; + // this.title = "淇敼鐢ㄦ埛"; + // this.form.password = ""; + // }); + // }, /** 閲嶇疆瀵嗙爜鎸夐挳鎿嶄綔 */ handleResetPwd(row) { this.$prompt('璇疯緭鍏�"' + row.userName + '"鐨勬柊瀵嗙爜', "鎻愮ず", { @@ -761,6 +909,58 @@ }) .catch(() => {}); }, + // 鍏ㄩ儴鍋滄 + AllStop() { + this.$modal + .confirm("鏄惁鍋滄鍏ㄩ儴浠诲姟锛�") + .then(function () { + return console.log("鍋滄鎴愬姛"); + }) + .then(() => { + this.getList(); + this.$modal.msgWarning("鍋滄鎴愬姛"); + }) + .catch(() => {}); + }, + // 鍏ㄩ儴寮�濮� + AllStarted() { + this.$modal + .confirm("鏄惁寮�鍚叏閮ㄤ换鍔★紵") + .then(function () { + return console.log("寮�鍚垚鍔�"); + }) + .then(() => { + this.getList(); + this.$modal.msgSuccess("寮�鍚垚鍔�"); + }) + .catch(() => {}); + }, + // 浠诲姟閲嶇疆 + TaskReset() { + this.$modal + .confirm("鏄惁閲嶇疆閫変腑鐨勪换鍔¢」锛�") + .then(function () { + return console.log("閫変腑鎴愬姛"); + }) + .then(() => { + this.getList(); + this.$modal.msgSuccess("閲嶇疆鎴愬姛"); + }) + .catch(() => {}); + }, + // 璁剧疆鍙戦�佹椂闂� + Sendtimesetting() { + this.modificationVisible = true; + }, + // 璺宠浆璇︽儏椤� + Seedetails() { + this.$router.push({ + path: "/followvisit/record/detailpage/", + query: { id: "1" }, + }); + }, + // 瀵煎叆鎸夐挳 + toleadExport() {}, /** 瀵煎嚭鎸夐挳鎿嶄綔 */ handleExport() { this.download( @@ -783,7 +983,7 @@ } .document { - width: 100px; + // width: 100px; height: 50px; } @@ -866,15 +1066,24 @@ } .button-bb { font-weight: 500; - color: #2ba05c; + background-color: #2ba05c; + padding: 5px; + border-radius: 1px; + color: #ffffff; } .button-xq { font-weight: 500; - color: #409eff; + background-color: #409eff; + padding: 5px; + border-radius: 1px; + color: #ffffff; } .button-sc { font-weight: 500; - color: #dd302a; + background-color: #dd302a; + padding: 5px; + border-radius: 1px; + color: #ffffff; } .button-zx { background: #4fabe9; @@ -889,9 +1098,10 @@ } } -::v-deep.el-checkbox-group { - span { - font-size: 24px; - } -} +// 閫夐」瀛椾綋鏀惧ぇ +// ::v-deep.el-checkbox-group { +// span { +// font-size: 24px; +// } +// } </style> diff --git a/src/views/followvisit/record/index.vue b/src/views/followvisit/record/index.vue index e221418..6d8904c 100644 --- a/src/views/followvisit/record/index.vue +++ b/src/views/followvisit/record/index.vue @@ -87,30 +87,6 @@ >鏂板</el-button > </el-col> - <!-- <el-col :span="1.5"> - <el-button - type="success" - plain - icon="el-icon-edit" - size="medium" - :disabled="single" - @click="handleUpdate" - v-hasPermi="['system:user:edit']" - >淇敼</el-button - > - </el-col> --> - <!-- <el-col :span="1.5"> - <el-button - type="danger" - plain - icon="el-icon-delete" - size="medium" - :disabled="multiple" - @click="handleDelete" - v-hasPermi="['system:user:remove']" - >鍒犻櫎</el-button - > - </el-col> --> <el-col :span="1.5"> <div class="documentf"> <div class="document"> diff --git a/src/views/patient/patient/index.vue b/src/views/patient/patient/index.vue index b785d7a..7a46484 100644 --- a/src/views/patient/patient/index.vue +++ b/src/views/patient/patient/index.vue @@ -307,7 +307,7 @@ <el-table-column label="鎿嶄綔" align="center" - width="160" + width="190" class-name="small-padding fixed-width" > <template slot-scope="scope"> @@ -330,7 +330,7 @@ type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:user:edit']" - ><span class="button-textxg" + ><span class="button-textxga" ><i class="el-icon-edit"></i>淇敼</span ></el-button > @@ -339,8 +339,8 @@ type="text" @click="Distributionservice(scope.row)" v-hasPermi="['system:user:edit']" - ><span class="button-textxg" - ><i class="el-icon-edit"></i>鏈嶅姟</span + ><span class="button-textxg" + ><i class="el-icon-menu"></i>鏈嶅姟</span ></el-button > </template> @@ -566,6 +566,22 @@ <el-button @click="submitclose">鍙� 娑�</el-button> </div> </el-dialog> + <!-- 璺宠浆鏈嶅姟瀵硅瘽妗� --> + <el-dialog title="閫夋嫨鏈嶅姟绫诲瀷" :visible.sync="serviceVisible"> + <el-radio-group v-model="serviceradio"> + <el-radio :label="1">瀹f暀</el-radio> + <el-radio :label="2">闂嵎</el-radio> + <el-radio :label="3">闂ㄨ瘖闅忚</el-radio> + <el-radio :label="4">澶嶈瘖澶嶆煡</el-radio> + <el-radio :label="5">浣撴閫氱煡</el-radio> + </el-radio-group> + <div slot="footer" class="dialog-footer"> + <el-button @click="serviceVisible = false">鍙� 娑�</el-button> + <el-button type="primary" @click="serviceVisible = false" + >鍒涘缓鏈嶅姟</el-button + > + </div> + </el-dialog> </div> </template> @@ -623,6 +639,8 @@ // 榛樿瀵嗙爜 initPassword: undefined, amendtag: false, //鏄惁淇敼 + serviceVisible: false, + serviceradio: 1, // 鏃ユ湡鑼冨洿 dateRange: [], paperstypes: [ @@ -789,16 +807,8 @@ this.loading = false; }); }, - - // 绛涢�夎妭鐐� - filterNode(value, data) { - if (!value) return true; - return data.label.indexOf(value) !== -1; - }, - // 鑺傜偣鍗曞嚮浜嬩欢 - handleNodeClick(data) { - this.queryParams.deptId = data.id; - this.handleQuery(); + Distributionservice(row) { + this.serviceVisible = true; }, // 鍙栨秷鎸夐挳 @@ -1084,4 +1094,7 @@ .button-textsc { color: #28cfe6; } +.button-textxg{ + color: #de7897; +} </style> diff --git a/src/views/shortmessage/healthinformation/index.vue b/src/views/shortmessage/healthinformation/index.vue index 65f835a..2a29ca9 100644 --- a/src/views/shortmessage/healthinformation/index.vue +++ b/src/views/shortmessage/healthinformation/index.vue @@ -1,5 +1,5 @@ <template> - <div></div> + <div>閫氱煡妯$増</div> </template> <script> -- Gitblit v1.9.3