Merge branch 'feature/story-126' into develop

.gitignore

@@ -21,3 +21,5 @@ selenium-debug.log
 
 package-lock.json
 yarn.lock
+
+six.pharmacy**.zip

src/api/decoct/index.js

@@ -0,0 +1,103 @@
+import request from '@/utils/request';
+
+// 查询待行区列表
+export function listDecoctRoute(query) {
+  const {pageNum, pageSize, ...data} = query;
+  return request({
+    url: `/yfc-admin/web/waiting/pageList`,
+    method: 'post',
+    data,
+    params: {pageNum, pageSize},
+  });
+}
+
+export function editDecoctRoute(model) {
+  if (typeof model.createTime === 'string') model.createTime = model.createTime.replace(' ', 'T');
+  if (typeof model.updateTime === 'string') model.updateTime = model.updateTime.replace(' ', 'T');
+  return request({
+    url: model.id ? `/yfc-admin/web/waiting/update` : `/yfc-admin/web/waiting/add`,
+    method: 'post',
+    data: model,
+  });
+}
+
+export function deleteDecoctRoute(model) {
+  return request({
+    url: `/yfc-admin/web/waiting/delete/${model.id}`,
+    method: 'get',
+  });
+}
+
+export function getDecoctRouteOptions() {
+  return request({
+    url: `/yfc-admin/web/waiting/list`,
+    method: 'post',
+    data: {},
+  })
+}
+
+// 查询煎药区列表
+export function listDecoctStation(query) {
+  const {pageNum, pageSize, ...data} = query;
+  return request({
+    url: `/yfc-admin/web/decoction/pageList`,
+    method: 'post',
+    data,
+    params: {pageNum, pageSize},
+  });
+}
+
+export function editDecoctStation(model) {
+  if (typeof model.createTime === 'string') model.createTime = model.createTime.replace(' ', 'T');
+  if (typeof model.updateTime === 'string') model.updateTime = model.updateTime.replace(' ', 'T');
+  return request({
+    url: model.id ? `/yfc-admin/web/decoction/update` : `/yfc-admin/web/decoction/add`,
+    method: 'post',
+    data: model,
+  });
+}
+
+export function deleteDecoctStation(model) {
+  return request({
+    url: `/yfc-admin/web/decoction/delete/${model.id}`,
+    method: 'get',
+  });
+}
+
+
+export function getDecoctStationOptions() {
+  return request({
+    url: `/yfc-admin/web/decoction/list`,
+    method: 'post',
+    data: {},
+  })
+}
+
+export function getDecoctOperatorList() {
+  return request({
+    url: `/system/user/decoctUserList`,
+    method: 'get'
+  })
+}
+
+// 查询绑桶记录列表
+export function listDecoctBucket(query) {
+  const {pageNum, pageSize, ...data} = query;
+  return request({
+    url: `/yfc-admin/web/decoction/bindBarrelList`,
+    method: 'post',
+    data,
+    params: {pageNum, pageSize},
+  });
+}
+
+export function exportDecoctBucket(query) {
+  const {pageNum, pageSize, ...data} = query;
+  return request({
+    url: `/yfc-admin/web/decoction/bindBarrelExcel`,
+    method: 'post',
+    data,
+    responseType: 'blob',
+    download: true,
+  })
+}

src/views/decoct/bucket.vue

@@ -0,0 +1,214 @@
+<script>
+import dayjs from 'dayjs';
+import {exportDecoctBucket, listDecoctBucket} from '@/api/decoct';
+import {listMedicalMechanism} from '@/api/medical/mechanism';
+
+/**
+ * 绑桶记录
+ */
+export default {
+  name: 'DecoctBucket',
+  components: {},
+  data() {
+    return {
+      deployStateArr: [
+        {name: '已审核', id: 110, key: 'audited'},
+        // { name: "已审核不通过", id: 120, key: "---" },
+        {name: '已调配', id: 130, key: 'allocated'},
+        {name: '已复核', id: 140, key: 'reviewed'},
+        {name: '已浸泡', id: 150, key: 'soaked'},
+        {name: '已煎煮', id: 160, key: 'cooked'},
+        {name: '已先煎', id: 161, key: 'preCooked'},
+        {name: '已开始煎煮', id: 162, key: 'startedCooking'},
+        {name: '已后下', id: 163, key: 'lowered'},
+        {name: '已结束煎煮', id: 164, key: 'finishedCooking'},
+        {name: '已开始浓缩', id: 165, key: 'startedConcentration'},
+        {name: '已结束浓缩', id: 166, key: 'finishedConcentration'},
+        {name: '已打包', id: 170, key: 'packaged'},
+        {name: '已上架', id: 171, key: 'grounding'},
+        {name: '已发药', id: 175, key: 'send'},
+        // { name: "煎药已作废", id: 999, key: "---" },
+      ],
+      listMedicalMechanismArr: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+
+        date: [],
+        yljgId: void 0,
+        name: void 0,
+        preNo: void 0,
+        orderNo: void 0,
+        thread: void 0,
+        deviceCode: void 0,
+      },
+      exporting: false,
+      loading: false,
+      dataset: [],
+      total: 0,
+
+      // 选择的
+      selected: [],
+    };
+  },
+  created() {
+    this.resetQuery();
+    listMedicalMechanism().then((res) => {this.listMedicalMechanismArr = res.data;});
+  },
+  methods: {
+    getQueryParams() {
+      const {date, ...params} = this.queryParams;
+      if (date && date.length) {
+        params.startTime = date[0];
+        params.endTime = date[1];
+      } else {
+        params.startTime = '';
+        params.endTime = '';
+      }
+      return params;
+    },
+    async getList() {
+      this.loading = true;
+      try {
+        const res = await listDecoctBucket(this.getQueryParams());
+        this.dataset = res.rows;
+        this.total = res.total;
+      } catch (e) {}
+      this.loading = false;
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm('queryForm');
+      const now = dayjs().format('YYYY-MM-DD');
+      this.queryParams.date = [now, now];
+      this.handleQuery();
+    },
+    async handleExport() {
+      this.exporting = true;
+      try {
+        const data = await exportDecoctBucket(this.getQueryParams());
+        this.$message.success(`导出 ${data.name} 成功`);
+      } catch (error) {}
+      this.exporting = false;
+    },
+
+    handleSelectionChange(selection) {
+      this.selected = [...selection];
+    },
+  },
+};
+</script>
+
+<template>
+  <div class="app-container">
+    <el-row :gutter="24">
+      <el-col :span="24" :xs="24">
+        <el-form ref="queryForm" label-width="68px" :inline="true" :model="queryParams">
+          <div class="query-box">
+            <div class="query-box__left">
+              <el-form-item label="" prop="date">
+                <el-date-picker v-model="queryParams.date" size="mini"
+                                type="daterange" value-format="yyyy-MM-dd"
+                                range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
+                />
+              </el-form-item>
+              <el-form-item label="" prop="yljgId">
+                <el-select v-model="queryParams.yljgId" placeholder="医疗机构" filterable clearable>
+                  <el-option v-for="item in listMedicalMechanismArr" :key="item.id"
+                             :label="item.name" :value="item.id" :disabled="item.state !== '1'"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="" prop="thread">
+                <el-select v-model="queryParams.thread" placeholder="流程状态" clearable>
+                  <el-option v-for="item in deployStateArr" :key="item.id"
+                             :label="item.name" :value="item.id.toString()"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="" prop="deviceCode">
+                <el-input style="width: 240px" placeholder="桶编号" clearable size="small"
+                          v-model="queryParams.deviceCode" @keyup.enter.native="handleQuery"/>
+              </el-form-item>
+              <el-form-item label="" prop="name">
+                <el-input style="width: 240px" placeholder="患者姓名" clearable size="small"
+                          v-model="queryParams.name" @keyup.enter.native="handleQuery"/>
+              </el-form-item>
+              <el-form-item label="" prop="preNo">
+                <el-input style="width: 240px" placeholder="处方号" clearable size="small"
+                          v-model="queryParams.preNo" @keyup.enter.native="handleQuery"/>
+              </el-form-item>
+              <el-form-item label="" prop="orderNo">
+                <el-input style="width: 240px" placeholder="订单号" clearable size="small"
+                          v-model="queryParams.orderNo" @keyup.enter.native="handleQuery"/>
+              </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" size="mini" @click="handleExport()">导出</el-button>
+                <!--                v-hasPermi="['decoct:bucket:export']"-->
+              </el-form-item>
+            </div>
+          </div>
+        </el-form>
+
+        <el-table v-loading="loading" :data="dataset" @selection-change="handleSelectionChange" border>
+          <!--<el-table-column type="selection" width="50" align="center"/>-->
+          <el-table-column type="index" label="序号" align="center" width="55"/>
+          <el-table-column prop="hospitalName" label="医疗机构" min-width="180" align="center"></el-table-column>
+          <el-table-column prop="orderNo" label="订单号" align="center"></el-table-column>
+          <el-table-column prop="preNo" label="处方号" align="center"></el-table-column>
+          <el-table-column prop="name" label="患者" align="center"></el-table-column>
+          <el-table-column label="流程状态" prop="thread" align="center">
+            <template slot-scope="scope">
+              {{ (deployStateArr.find(option => option.id.toString() === scope.row.thread) || {}).name || scope.row.thread }}
+            </template>
+          </el-table-column>
+          <el-table-column prop="operatingTime" label="操作时间" align="center"
+                           :show-overflow-tooltip="true"></el-table-column>
+          <el-table-column prop="operator" label="操作人" align="center"></el-table-column>
+
+          <el-table-column label="桶编号" prop="deviceCode" align="center"/>
+          <el-table-column label="煎药区" prop="areaName" align="center" :show-overflow-tooltip="true"/>
+          <el-table-column label="待行区" prop="waitingName" align="center" :show-overflow-tooltip="true"/>
+          <el-table-column label="加水量(ml)" prop="soakingWaterValue" align="center" :show-overflow-tooltip="true"/>
+        </el-table>
+
+        <pagination v-show="total > 0" :total="total"
+                    :page.sync="queryParams.pageNum"
+                    :limit.sync="queryParams.pageSize"
+                    @pagination="getList"/>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<style scoped lang="scss">
+.edit-dialog-wrapper {
+  ::v-deep {
+    .el-select {
+      width: 100%;
+    }
+
+    .el-input-group {
+      border-top-left-radius: 8px;
+      border-bottom-left-radius: 8px;
+
+      .el-input__inner {
+        border-radius: inherit;
+      }
+
+      .el-input-group__append {
+        border-top-right-radius: 8px;
+        border-bottom-right-radius: 8px;
+      }
+    }
+  }
+}
+</style>

src/views/decoct/device/components/edit.vue

@@ -18,6 +18,13 @@
       <el-form-item label="设备地址:">
         <el-input v-model="formInline.deviceIp" placeholder="设备地址"></el-input>
       </el-form-item>
+      <el-form-item label="关联煎药区" prop="decoctionAreaCode">
+        <el-select v-model="formInline.decoctionAreaCode" placeholder="请选择备用煎药区" filterable>
+          <el-option v-for="item in stationOptions" :key="item.id"
+                     :label="item.areaName" :value="item.areaCode" :disabled="item.state !== 0"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="启用状态:" required>
         <el-radio-group v-model="formInline.status">
           <el-radio :label="0">开启</el-radio>
@@ -30,6 +37,7 @@
 
 <script>
 import { getDeviceDetail, addDevice, updateDevice } from "@/api/decoct/device";
+import { getDecoctStationOptions } from '@/api/decoct';
 export default {
   props: {
     disabled: {
@@ -41,6 +49,7 @@ export default {
   data() {
     return {
       formInline: {
+        decoctionAreaCode: void 0,
         deviceName: '',
         deviceType: '',
         deviceCode: '',
@@ -49,6 +58,8 @@ export default {
         status: 0,
       },
       loading: false,
+      // 煎药区
+      stationOptions: [],
       typeOptions: []
     }
   },
@@ -56,6 +67,7 @@ export default {
     this.getDicts("device_type").then((response) => {
       this.typeOptions = response.data;
     });
+    getDecoctStationOptions().then((response) => {this.stationOptions = response.data;}, () => []);
   },
   methods: {
     openDialog() {
@@ -80,6 +92,7 @@ export default {
     // 修改
     toUpdate() {
       this.loading = true;
+      this.formInline.decoctionAreaName = this.formInline.decoctionAreaCode == null ? '' : (this.stationOptions.find(option => option.areaCode === this.formInline.decoctionAreaCode) || {}).areaName || '';
       updateDevice(this.formInline).then((response) => {
         this.msgSuccess('修改成功')
         this.$emit('success')
@@ -90,6 +103,7 @@ export default {
     // 新增
     toAdd() {
       this.loading = true;
+      this.formInline.decoctionAreaName = this.formInline.decoctionAreaCode == null ? '' : (this.stationOptions.find(option => option.areaCode === this.formInline.decoctionAreaCode) || {}).areaName || '';
       addDevice(this.formInline).then((response) => {
         this.msgSuccess('新增成功')
         this.$emit('success')
@@ -103,7 +117,6 @@ export default {
 
 <style lang="scss" scoped>
 .edit-dialog {
-  height: 400px;
   overflow: auto;
   &-formInline{
     width: 330px;

src/views/decoct/route.vue

@@ -0,0 +1,312 @@
+<script>
+import {deleteDecoctRoute, editDecoctRoute, listDecoctRoute} from '@/api/decoct';
+
+/**
+ * 待行区管理
+ */
+export default {
+  name: 'DecoctRoute',
+  components: {},
+  data() {
+    return {
+      lineGroupOptions: [],
+      stateOptions: [
+        {label: '启用', value: 0},
+        {label: '停用', value: 1},
+      ],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        areaName: void 0,
+        areaCode: void 0,
+        state: void 0,
+      },
+      loading: false,
+      dataset: [],
+      total: 0,
+      // 编辑参数
+      editTitle: '',
+      editOpen: false,
+      editModel: {
+        areaName: void 0,
+        areaCode: void 0,
+        remark: '',
+        state: 0,
+        lineGroup: void 0,
+      },
+      editRules: {
+        areaName: [{required: true, message: '待行区名称不能为空', trigger: 'blur'}],
+        areaCode: [{required: true, message: '待行区编号不能为空', trigger: 'blur'}],
+      },
+      editError: '',
+      submitting: false,
+
+      // 选择的
+      selected: [],
+    };
+  },
+  created() {
+    this.handleQuery();
+  },
+  methods: {
+    async getList() {
+      this.loading = true;
+      try {
+        const res = await listDecoctRoute(this.queryParams);
+        this.dataset = res.rows.map((row) => Object.assign(row, {
+          createTime: (row.createTime || '').replace('T', ' '),
+          updateTime: (row.updateTime || '').replace('T', ' '),
+        }));
+        this.total = res.total;
+      } catch (e) {}
+      this.loading = false;
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm('queryForm');
+      this.handleQuery();
+    },
+    async handleDelete(model) {
+      try {
+        await deleteDecoctRoute(model);
+        await this.getList();
+        this.$message.success('删除成功');
+      } catch (e) { }
+    },
+    async handleEdit(model) {
+      this.editModel = Object.assign({
+        areaName: void 0,
+        areaCode: void 0,
+        remark: '',
+        state: 0,
+        lineGroup: void 0,
+      }, model);
+      if (this.editModel.lineGroup != null) this.editModel.lineGroup = this.editModel.lineGroup.toString();
+      if (this.lineGroupOptions.length === 0) {
+        const loading = this.$loading({
+          lock: true,
+          text: '加载中...',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)',
+        });
+        await this.getDicts('line_group').then((response) => {this.lineGroupOptions = response.data;}, () => []);
+        loading.close();
+      }
+      this.editTitle = (this.editModel.id ? `编辑` : `新增`) + '待行区';
+      this.editOpen = true;
+      this.editError = '';
+      this.$nextTick(() => {
+        this.$refs['editForm'].clearValidate();
+      });
+    },
+    async handleEditSubmit() {
+      this.editError = '';
+      const valid = await this.$refs['editForm'].validate().then(() => true, (err) => {
+        this.$message.warning({showClose: true, message: `请补充完整表单`});
+        return false;
+      });
+      if (!valid) return;
+
+      this.submitting = true;
+      try {
+        await editDecoctRoute(this.editModel);
+        this.$message.success('保存成功');
+        this.editOpen = false;
+        await this.getList();
+      } catch (e) {
+        this.editError = e.message;
+      }
+      this.submitting = false;
+    },
+    async handleUpdate(data, rows = []) {
+      if (rows.length === 0) rows = this.selected;
+      if (rows.length === 0) return;
+
+      const confirm = await this.$confirm(`是否修改 ${rows.length} 项待行区数据的状态?`, '提示', {
+        confirmButtonText: data.state === 0 ? '启用' : '停用',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => true, () => false);
+      if (!confirm) return;
+
+      const loading = this.$loading({
+        lock: true,
+        text: '更新中...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)',
+      });
+      try {
+        await Promise.all(rows.map((row) => editDecoctRoute({...row, ...data})));
+        this.$message.success('更新状态成功');
+      } catch (e) {}
+      await this.getList();
+      loading.close();
+    },
+
+    handleSelectionChange(selection) {
+      this.selected = [...selection];
+    },
+  },
+};
+</script>
+
+<template>
+  <div class="app-container">
+    <el-row :gutter="24">
+      <el-col :span="24" :xs="24">
+        <el-form ref="queryForm" label-width="68px" :inline="true" :model="queryParams">
+          <div class="query-box">
+            <div class="query-box__left">
+              <el-form-item label="" prop="areaName">
+                <el-input style="width: 240px" placeholder="待行区名称" clearable size="small"
+                          v-model="queryParams.areaName" @keyup.enter.native="handleQuery"/>
+              </el-form-item>
+              <el-form-item label="" prop="areaCode">
+                <el-input style="width: 240px" placeholder="待行区编号" clearable size="small"
+                          v-model="queryParams.areaCode" @keyup.enter.native="handleQuery"/>
+              </el-form-item>
+
+              <el-form-item label="" prop="state">
+                <el-select v-model="queryParams.state" placeholder="状态" filterable clearable>
+                  <el-option v-for="item in stateOptions" :key="item.value" :label="item.label" :value="item.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-form-item>
+            </div>
+          </div>
+        </el-form>
+
+        <div style="display: flex; justify-content: space-between; margin-bottom: 12px; clear: both;">
+          <div>
+            <el-button type="primary" plain icon="el-icon-plus" size="mini"
+                       @click="handleEdit()"
+                       v-hasPermi="['decoct:route:add']"
+            >新增
+            </el-button>
+          </div>
+          <div>
+            <el-button size="mini" :disabled="selected.length === 0" v-has-permi="['decoct:route:edit']"
+                       @click="handleUpdate({ state: 0 })">启用
+            </el-button>
+            <el-button size="mini" :disabled="selected.length === 0" v-has-permi="['decoct:route:edit']"
+                       @click="handleUpdate({ state: 1 })">停用
+            </el-button>
+          </div>
+        </div>
+
+        <el-table v-loading="loading" :data="dataset" @selection-change="handleSelectionChange" border>
+          <el-table-column type="selection" width="50" align="center"/>
+          <el-table-column type="index" label="序号" align="center" width="55"/>
+          <el-table-column label="待行区名称" prop="areaName" align="center" :show-overflow-tooltip="true"/>
+          <el-table-column label="待行区编号" prop="areaCode" align="center"/>
+          <el-table-column label="状态" prop="state" align="center">
+            <template slot-scope="scope">
+              {{ (stateOptions.find(option => option.value === scope.row.state) || {}).label }}
+            </template>
+          </el-table-column>
+          <el-table-column label="备注" prop="remark" align="center" :show-overflow-tooltip="true"/>
+          <!--<el-table-column label="创建时间" prop="createTime" align="center" :show-overflow-tooltip="true"/>-->
+          <!--<el-table-column label="更新时间" prop="createTime" align="center" :show-overflow-tooltip="true"/>-->
+          <el-table-column
+            label="操作"
+            align="center"
+            width="160"
+            class-name="small-padding fixed-width"
+          >
+            <template slot-scope="scope">
+              <el-button type="primary" style="width: 40px" size="mini"
+                         @click="handleEdit(scope.row)"
+                         v-hasPermi="['decoct:route:edit']"
+              >修改
+              </el-button>
+              <el-popconfirm style="margin-left: 10px;" v-hasPermi="['decoct:route:remove']" title="确定删除吗？"
+                             confirm-button-text="删除" confirm-button-type="danger" @confirm="handleDelete(scope.row)"
+              >
+                <template #reference>
+                  <el-button style="width: 40px" size="mini">删除</el-button>
+                </template>
+              </el-popconfirm>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination v-show="total > 0" :total="total"
+                    :page.sync="queryParams.pageNum"
+                    :limit.sync="queryParams.pageSize"
+                    @pagination="getList"/>
+      </el-col>
+    </el-row>
+
+    <el-dialog class="edit-dialog-wrapper" :title="editTitle" :visible.sync="editOpen" width="600px" append-to-body>
+      <el-form ref="editForm" :model="editModel" :rules="editRules" label-width="100px" @submit="handleEditSubmit()">
+        <el-form-item label="待行区名称" prop="areaName">
+          <el-input v-model="editModel.areaName" placeholder="请输入待行区名称" maxlength="30"/>
+        </el-form-item>
+        <el-form-item label="待行区编号" prop="areaCode">
+          <el-input v-model="editModel.areaCode" placeholder="请输入待行区编号" maxlength="30"/>
+        </el-form-item>
+        <el-form-item label="线组" prop="lineGroup">
+          <el-select v-model="editModel.lineGroup" placeholder="请选择线组" clearable>
+            <el-option v-for="item in lineGroupOptions" :key="item.dictCode"
+                       :label="item.dictLabel" :value="item.dictValue" :disabled="item.status !== '0'"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 4}"
+                    v-model="editModel.remark" placeholder="请输入备注">
+          </el-input>
+        </el-form-item>
+        <el-form-item label="状态" prop="lineGroup">
+          <el-select v-model="editModel.state" placeholder="请选择状态">
+            <el-option v-for="item in stateOptions" :key="item.value"
+                       :label="item.label" :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <div style="display: flex;justify-content: space-between;align-items: center;">
+          <div style="color: #ff4949;">{{ editError }}</div>
+          <div>
+            <el-button type="primary" :loading="submitting" @click="handleEditSubmit()">保 存</el-button>
+            <el-button :disabled="submitting" @click="editOpen = false;">取 消</el-button>
+          </div>
+        </div>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<style scoped lang="scss">
+.edit-dialog-wrapper {
+  ::v-deep {
+    .el-select {
+      width: 100%;
+    }
+
+    .el-input-group {
+      border-top-left-radius: 8px;
+      border-bottom-left-radius: 8px;
+
+      .el-input__inner {
+        border-radius: inherit;
+      }
+
+      .el-input-group__append {
+        border-top-right-radius: 8px;
+        border-bottom-right-radius: 8px;
+      }
+    }
+  }
+}
+</style>

src/views/decoct/station.vue

@@ -0,0 +1,480 @@
+<script>
+import {
+  deleteDecoctStation,
+  editDecoctStation, getDecoctOperatorList,
+  getDecoctRouteOptions,
+  getDecoctStationOptions,
+  listDecoctStation,
+} from '@/api/decoct';
+import {listMedicalMechanism} from '@/api/medical/mechanism';
+
+/**
+ * 煎药区管理
+ */
+export default {
+  name: 'DecoctStation',
+  components: {},
+  data() {
+    return {
+      // 煎煮人
+      decoctionOptions: [],
+      // 待行区
+      routeOptions: [],
+      // 煎药区
+      stationOptions: [],
+      // 备用煎药区
+      stationOptionsForEdit: [],
+      stateOptions: [
+        {label: '启用', value: 0},
+        {label: '停用', value: 1},
+      ],
+      toxicOptions: [
+        {dictLabel: '毒性', dictValue: 1, dictCode: 1, status: '0'},
+        {dictLabel: '无毒', dictValue: 2, dictCode: 2, status: '0'},
+      ],
+      typeOptions: [
+        {dictLabel: '普通煎药区', dictValue: 1, dictCode: 1, status: '0'},
+        {dictLabel: '智能煎药区', dictValue: 2, dictCode: 2, status: '0'},
+      ],
+      usageMethodOptions: [],
+      listMedicalMechanismArr: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+
+        hospitalCode: void 0,
+        areaName: void 0,
+        areaCode: void 0,
+        areaType: void 0,
+        toxicPieces: void 0,
+        prescriptionUsageCode: void 0,
+        state: void 0,
+      },
+      loading: false,
+      dataset: [],
+      total: 0,
+      // 编辑参数
+      editTitle: '',
+      editOpen: false,
+      editModel: {
+        areaName: void 0,
+        areaCode: void 0,
+        areaType: void 0,
+        toxicPieces: void 0,
+        prescriptionUsageCode: void 0,
+        hospitalCode: void 0,
+        selfPackage: void 0,
+        reserveAreaCode: void 0,
+        waitingCode: void 0,
+        decoctionManagerId: void 0,
+        coefficient: void 0,
+
+        packagingSpecifications: [],
+
+        state: 0,
+      },
+      editRules: {
+        areaName: [{required: true, message: '煎药区名称不能为空', trigger: 'blur'}],
+        areaCode: [{required: true, message: '煎药区编号不能为空', trigger: 'blur'}],
+        areaType: [{required: true, message: '类型不能为空', trigger: 'blur'}],
+        waitingCode: [{required: true, message: '对应待行区不能为空', trigger: 'blur'}],
+      },
+      editError: '',
+      submitting: false,
+
+      // 选择的
+      selected: [],
+    };
+  },
+  created() {
+    this.handleQuery();
+    this.getDicts('usage_method').then((response) => {this.usageMethodOptions = response.data;});
+    listMedicalMechanism().then((res) => {this.listMedicalMechanismArr = res.data;});
+  },
+  methods: {
+    async getList() {
+      this.loading = true;
+      try {
+        const res = await listDecoctStation(this.queryParams);
+        this.dataset = res.rows.map((row) => Object.assign(row, {
+          createTime: (row.createTime || '').replace('T', ' '),
+          updateTime: (row.updateTime || '').replace('T', ' '),
+        }));
+        this.total = res.total;
+      } catch (e) {}
+      this.loading = false;
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm('queryForm');
+      this.handleQuery();
+    },
+    async handleDelete(model) {
+      try {
+        await deleteDecoctStation(model);
+        await this.getList();
+        this.$message.success('删除成功');
+      } catch (e) { }
+    },
+    async handleEdit(model) {
+      this.editModel = Object.assign({
+        areaName: void 0,
+        areaCode: void 0,
+        state: 0,
+        packagingSpecifications: [],
+      }, model);
+
+      if (typeof this.editModel.packagingSpecifications === 'string') this.editModel.packagingSpecifications = this.editModel.packagingSpecifications.split(',');
+      if (this.editModel.toxicPieces === 0) delete this.editModel.toxicPieces;
+      if (this.editModel.prescriptionUsageCode != null) this.editModel.prescriptionUsageCode = this.editModel.prescriptionUsageCode.toString();
+      if (this.editModel.selfPackage != null) this.editModel.selfPackage = this.editModel.selfPackage.toString();
+      if (typeof this.editModel.decoctionManagerId === 'string') this.editModel.decoctionManagerId = +this.editModel.decoctionManagerId;
+
+      const loading = this.$loading({
+        lock: true,
+        text: '加载中...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)',
+      });
+      if (this.decoctionOptions.length === 0) await getDecoctOperatorList().then((response) => {this.decoctionOptions = response.data;}, () => []);
+      if (this.routeOptions.length === 0) await getDecoctRouteOptions().then((response) => {this.routeOptions = response.data;}, () => []);
+      if (this.stationOptions.length === 0) await getDecoctStationOptions().then((response) => {this.stationOptions = response.data;}, () => []);
+      if (this.editModel.id) this.stationOptionsForEdit = this.editModel.id ? this.stationOptions.filter(option => option.id !== this.editModel.id) : this.stationOptions;
+      loading.close();
+      this.editTitle = (this.editModel.id ? `编辑` : `新增`) + '煎药区';
+      this.editOpen = true;
+      this.editError = '';
+      this.$nextTick(() => {
+        this.$refs['editForm'].clearValidate();
+      });
+    },
+    async handleEditSubmit() {
+      this.editError = '';
+      const valid = await this.$refs['editForm'].validate().then(() => true, (err) => {
+        this.$message.warning({showClose: true, message: `请补充完整表单`});
+        return false;
+      });
+      if (!valid) return;
+
+      this.submitting = true;
+      try {
+        const {packagingSpecifications, ...model} = this.editModel;
+        if (Array.isArray(packagingSpecifications)) model.packagingSpecifications = packagingSpecifications.join(',');
+
+        model.prescriptionUsageName = model.prescriptionUsageCode == null ? '' : (this.usageMethodOptions.find(option => option.dictValue === model.prescriptionUsageCode) || {}).dictLabel || '';
+        model.hospitalName = model.hospitalCode == null ? '' : (this.listMedicalMechanismArr.find(option => option.code === model.hospitalCode) || {}).name || '';
+        model.reserveAreaName = model.reserveAreaCode == null ? '' : (this.stationOptions.find(option => option.areaCode === model.reserveAreaCode) || {}).areaName || '';
+        model.waitingName = model.waitingCode == null ? '' : (this.routeOptions.find(option => option.areaCode === model.waitingCode) || {}).areaName || '';
+        model.decoctionManagerName = model.decoctionManagerId == null ? '' : (this.decoctionOptions.find(option => option.userId === model.decoctionManagerId) || {}).nickName || '';
+
+        await editDecoctStation(model);
+        this.$message.success('保存成功');
+        this.editOpen = false;
+        await this.getList();
+      } catch (e) {
+        this.editError = e.message;
+      }
+      this.submitting = false;
+      this.stationOptions = [];
+    },
+    async handleUpdate(data, rows = []) {
+      if (rows.length === 0) rows = this.selected;
+      if (rows.length === 0) return;
+
+      const confirm = await this.$confirm(`是否修改 ${rows.length} 项煎药区数据的状态?`, '提示', {
+        confirmButtonText: data.state === 0 ? '启用' : '停用',
+        cancelButtonText: '取消',
+        type: 'warning',
+      }).then(() => true, () => false);
+      if (!confirm) return;
+
+      const loading = this.$loading({
+        lock: true,
+        text: '更新中...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)',
+      });
+      try {
+        await Promise.all(rows.map((row) => editDecoctStation({...row, ...data})));
+        this.$message.success('更新状态成功');
+      } catch (e) {}
+      await this.getList();
+      loading.close();
+      this.stationOptions = [];
+    },
+
+    handleSelectionChange(selection) {
+      this.selected = [...selection];
+    },
+  },
+};
+</script>
+
+<template>
+  <div class="app-container">
+    <el-row :gutter="24">
+      <el-col :span="24" :xs="24">
+        <el-form ref="queryForm" label-width="68px" :inline="true" :model="queryParams">
+          <div class="query-box">
+            <div class="query-box__left">
+              <el-form-item label="" prop="hospitalCode">
+                <el-select v-model="queryParams.hospitalCode" placeholder="医疗机构" filterable clearable>
+                  <el-option v-for="item in listMedicalMechanismArr" :key="item.id"
+                             :label="item.name" :value="item.code" :disabled="item.state !== '1'"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="" prop="areaName">
+                <el-input style="width: 240px" placeholder="煎药区名称" clearable size="small"
+                          v-model="queryParams.areaName" @keyup.enter.native="handleQuery"/>
+              </el-form-item>
+              <el-form-item label="" prop="areaCode">
+                <el-input style="width: 240px" placeholder="煎药区编号" clearable size="small"
+                          v-model="queryParams.areaCode" @keyup.enter.native="handleQuery"/>
+              </el-form-item>
+
+              <el-form-item label="" prop="toxicPieces">
+                <el-select v-model="queryParams.toxicPieces" placeholder="毒性饮片" filterable clearable>
+                  <el-option v-for="item in toxicOptions" :key="item.dictCode"
+                             :label="item.dictLabel" :value="item.dictValue" :disabled="item.status !== '0'"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="" prop="prescriptionUsageCode">
+                <el-select v-model="queryParams.prescriptionUsageCode" placeholder="处方用法" filterable clearable>
+                  <el-option v-for="item in usageMethodOptions" :key="item.dictCode"
+                             :label="item.dictLabel" :value="item.dictValue" :disabled="item.status !== '0'"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="" prop="areaType">
+                <el-select v-model="queryParams.areaType" placeholder="类型" filterable clearable>
+                  <el-option v-for="item in typeOptions" :key="item.dictCode"
+                             :label="item.dictLabel" :value="item.dictValue" :disabled="item.status !== '0'"
+                  />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="" prop="state">
+                <el-select v-model="queryParams.state" placeholder="状态" clearable>
+                  <el-option v-for="item in stateOptions" :key="item.value" :label="item.label" :value="item.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-form-item>
+            </div>
+          </div>
+        </el-form>
+        <div style="display: flex; justify-content: space-between; margin-bottom: 12px; clear: both;">
+          <div>
+            <el-button type="primary" plain icon="el-icon-plus" size="mini"
+                       @click="handleEdit()"
+                       v-hasPermi="['decoct:station:add']"
+            >新增
+            </el-button>
+          </div>
+          <div>
+            <el-button size="mini" :disabled="selected.length === 0" v-has-permi="['decoct:station:edit']"
+                       @click="handleUpdate({ state: 0 })">启用
+            </el-button>
+            <el-button size="mini" :disabled="selected.length === 0" v-has-permi="['decoct:station:edit']"
+                       @click="handleUpdate({ state: 1 })">停用
+            </el-button>
+          </div>
+        </div>
+
+        <el-table v-loading="loading" :data="dataset" @selection-change="handleSelectionChange" border>
+          <el-table-column type="selection" width="50" align="center"/>
+          <el-table-column type="index" label="序号" align="center" width="55"/>
+          <el-table-column label="煎药区名称" prop="areaName" align="center" :show-overflow-tooltip="true"/>
+          <el-table-column label="煎药区编号" prop="areaCode" align="center"/>
+          <el-table-column label="毒性饮片" prop="toxicPieces" align="center">
+            <template slot-scope="scope">
+              {{ (toxicOptions.find(option => option.dictValue === scope.row.toxicPieces) || {}).dictLabel }}
+            </template>
+          </el-table-column>
+          <el-table-column label="处方用法" prop="prescriptionUsageName" align="center">
+            <!--<template slot-scope="scope">
+              {{ (usageMethodOptions.find(option => option.dictValue === scope.row.prescriptionUsageCode) || {}).dictLabel || scope.row.prescriptionUsageName }}
+            </template>-->
+          </el-table-column>
+
+          <el-table-column label="所属医疗机构" prop="hospitalName" align="center" :show-overflow-tooltip="true"/>
+          <el-table-column label="备用煎药区" prop="reserveAreaName" align="center" :show-overflow-tooltip="true"/>
+          <el-table-column label="对应待行区" prop="waitingName" align="center" :show-overflow-tooltip="true"/>
+          <el-table-column label="类型" prop="areaType" align="center">
+            <template slot-scope="scope">
+              {{ (typeOptions.find(option => option.dictValue === scope.row.areaType) || {}).dictLabel }}
+            </template>
+          </el-table-column>
+          <el-table-column label="煎药负责人" prop="decoctionManagerName" align="center"/>
+          <el-table-column label="包装规格" prop="packagingSpecifications" align="center" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              {{ (scope.row.packagingSpecifications || '').split(',').map(v => `${v} ml`).join('  -  ') }}
+            </template>
+          </el-table-column>
+          <el-table-column label="状态" prop="state" align="center">
+            <template slot-scope="scope">
+              {{ (stateOptions.find(option => option.value === scope.row.state) || {}).label }}
+            </template>
+          </el-table-column>
+          <!--<el-table-column label="创建时间" prop="createTime" align="center" :show-overflow-tooltip="true"/>-->
+          <!--<el-table-column label="更新时间" prop="createTime" align="center" :show-overflow-tooltip="true"/>-->
+          <el-table-column
+            label="操作"
+            align="center"
+            width="160"
+            class-name="small-padding fixed-width"
+          >
+            <template slot-scope="scope">
+              <el-button type="primary" style="width: 40px" size="mini"
+                         @click="handleEdit(scope.row)"
+                         v-hasPermi="['decoct:station:edit']"
+              >修改
+              </el-button>
+              <el-popconfirm style="margin-left: 10px;" v-hasPermi="['decoct:station:remove']" title="确定删除吗？"
+                             confirm-button-text="删除" confirm-button-type="danger" @confirm="handleDelete(scope.row)"
+              >
+                <template #reference>
+                  <el-button style="width: 40px" size="mini">删除</el-button>
+                </template>
+              </el-popconfirm>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination v-show="total > 0" :total="total"
+                    :page.sync="queryParams.pageNum"
+                    :limit.sync="queryParams.pageSize"
+                    @pagination="getList"/>
+      </el-col>
+    </el-row>
+
+    <el-dialog class="edit-dialog-wrapper" :title="editTitle" :visible.sync="editOpen" width="600px" append-to-body>
+      <el-form ref="editForm" :model="editModel" :rules="editRules" label-width="100px" @submit="handleEditSubmit()">
+        <el-form-item label="煎药区名称" prop="areaName">
+          <el-input v-model="editModel.areaName" placeholder="请输入煎药区名称" maxlength="30"/>
+        </el-form-item>
+        <el-form-item label="煎药区编号" prop="areaCode">
+          <el-input v-model="editModel.areaCode" placeholder="请输入煎药区编号" maxlength="30"/>
+        </el-form-item>
+        <el-form-item label="类型" prop="areaType">
+          <el-select v-model="editModel.areaType" placeholder="请选择类型" filterable>
+            <el-option v-for="item in typeOptions" :key="item.dictCode"
+                       :label="item.dictLabel" :value="item.dictValue" :disabled="item.status !== '0'"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="毒性饮片" prop="toxicPieces">
+          <el-select v-model="editModel.toxicPieces" placeholder="请选择毒性饮片" clearable filterable>
+            <el-option v-for="item in toxicOptions" :key="item.dictCode"
+                       :label="item.dictLabel" :value="item.dictValue" :disabled="item.status !== '0'"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="处方用法" prop="prescriptionUsageCode">
+          <el-select v-model="editModel.prescriptionUsageCode" placeholder="请选择处方用法" clearable filterable>
+            <el-option v-for="item in usageMethodOptions" :key="item.dictCode"
+                       :label="item.dictLabel" :value="item.dictValue" :disabled="item.status !== '0'"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="所属医疗机构" prop="hospitalCode">
+          <el-select v-model="editModel.hospitalCode" placeholder="请选择所属医疗机构" clearable filterable>
+            <el-option v-for="item in listMedicalMechanismArr" :key="item.id"
+                       :label="item.name" :value="item.code" :disabled="item.state !== '1'"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="包装规格" prop="packagingSpecifications">
+          <div style="display: flex">
+            <el-input placeholder="最小值" v-model.number="editModel.packagingSpecifications[0]">
+              <template slot="append">ml</template>
+            </el-input>
+            <div style="margin: 0 12px"></div>
+            <el-input placeholder="最大值" v-model.number="editModel.packagingSpecifications[1]">
+              <template slot="append">ml</template>
+            </el-input>
+          </div>
+        </el-form-item>
+        <el-form-item label="自立袋包装" prop="selfPackage">
+          <el-select v-model="editModel.selfPackage" placeholder="请选择" clearable>
+            <el-option label="是" value="2"/>
+            <el-option label="否" value="1"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备用煎药区" prop="reserveAreaCode">
+          <el-select v-model="editModel.reserveAreaCode" placeholder="请选择备用煎药区" clearable filterable>
+            <el-option v-for="item in stationOptionsForEdit" :key="item.id"
+                       :label="item.areaName" :value="item.areaCode" :disabled="item.state !== 0"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="对应待行区" prop="waitingCode">
+          <el-select v-model="editModel.waitingCode" placeholder="请选择对应待行区" clearable filterable>
+            <el-option v-for="item in routeOptions" :key="item.id"
+                       :label="item.areaName" :value="item.areaCode" :disabled="item.state !== 0"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="煎药负责人" prop="decoctionManagerId">
+          <el-select v-model="editModel.decoctionManagerId" placeholder="请选择煎药负责人" clearable filterable>
+            <el-option v-for="item in decoctionOptions" :key="item.userId"
+                       :label="item.nickName" :value="item.userId" :disabled="item.status !== '0'"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="派桶系数" prop="coefficient">
+          <el-input v-model.number="editModel.coefficient" placeholder="请输入派桶系数"/>
+        </el-form-item>
+        <el-form-item label="状态" prop="lineGroup">
+          <el-select v-model="editModel.state" placeholder="请选择状态">
+            <el-option v-for="item in stateOptions" :key="item.value"
+                       :label="item.label" :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <div style="display: flex;justify-content: space-between;align-items: center;">
+          <div style="color: #ff4949;">{{ editError }}</div>
+          <div>
+            <el-button type="primary" :loading="submitting" @click="handleEditSubmit()">保 存</el-button>
+            <el-button :disabled="submitting" @click="editOpen = false;">取 消</el-button>
+          </div>
+        </div>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<style scoped lang="scss">
+.edit-dialog-wrapper {
+  ::v-deep {
+    .el-select {
+      width: 100%;
+    }
+
+    .el-input-group {
+      border-top-left-radius: 8px;
+      border-bottom-left-radius: 8px;
+
+      .el-input__inner {
+        border-radius: inherit;
+      }
+
+      .el-input-group__append {
+        border-top-right-radius: 8px;
+        border-bottom-right-radius: 8px;
+      }
+    }
+  }
+}
+</style>

src/views/pda/dispatch/index.vue

@@ -22,6 +22,7 @@ export default {
       },
       // 遮罩层
       showSearch: true,
+      exporting: true,
       // 显示搜索条件
       loading: true,
       dataset: [],