Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

src/api/data.js

@@ -62,3 +62,48 @@ export function getPrintTemplate() {
     method: 'get'
   })
 }
+
+
+
+
+export function createDictionaryConfig(params) {
+  console.log('params', params)
+  return request({
+    url: '/api/dictionary/createconfig',
+    method: 'post',
+    data: params
+  })
+}
+
+export function createDictionaryChildConfig(params) {
+  return request({
+    url: '/api/dictionary/createchildconfig',
+    method: 'post',
+    data: params
+  })
+}
+
+export function updateDictionaryChildConfig(params) {
+  console.log('params', params)
+  return request({
+    url: '/api/dictionary/updatechildconfig',
+    method: 'post',
+    data: params
+  })
+}
+
+export function deleteDictionaryChildConfig(params) {
+  return request({
+    url: '/api/dictionary/deletechildconfig',
+    method: 'post',
+    data: params
+  })
+}
+
+export function updateDictionaryTemplate(params) {
+  return request({
+    url: '/api/dictionary/updatetemplate',
+    method: 'post',
+    data: params
+  })
+}

src/api/datastore.js

@@ -7,3 +7,12 @@ export function getConfigList(params) {
     data: params
   })
 }
+
+
+export function getDictionaryConfigList(params) {
+  return request({
+    url: '/api/dictionary/getconfiglist',
+    method: 'get',
+    data: params
+  })
+}

src/store/getters.js

@@ -18,6 +18,9 @@ const getters = {
   data: state => state.data,
   configlist: state => state.data.configlist,
 
+  dictionary_configlist: state => state.data.dictionary_configlist,
+
+
   xt_permission: state => state.xt_permission,
   xt_user: state => state.xt_user,
   schedule_type_selected: state => state.xt_user.schedule_type_selected,

src/store/modules/data.js

@@ -1,14 +1,17 @@
-import { getConfigList } from '@/api/datastore'
-import { getDataConfigList, setDataConfigList } from '@/utils/data_config' // getConfigList from sessionStorage
+import { getConfigList,getDictionaryConfigList } from '@/api/datastore'
+import { getDataConfigList, setDataConfigList,getDataDictionaryConfigList,setDataDictionaryConfigList } from '@/utils/data_config' // getConfigList from sessionStorage
 
 const data = {
   state: {
-    configlist: ''
+    configlist: '',
+    dictionary_configlist:'',
   },
 
   mutations: {
     SET_CONFIGLIST: (state, configlist) => {
       state.configlist = configlist
+    }, SET_DICTIONARY_CONFIGLIST: (state, configlist) => {
+      state.dictionary_configlist = configlist
     }
 
   },
@@ -34,6 +37,26 @@ const data = {
         }).catch(error => {
           reject(error)
         })
+
+
+        getDictionaryConfigList().then(response => {
+          if (!response.data) { // 由于mockjs 不支持自定义状态码只能这样hack
+            reject('error')
+          }
+          const list = response.data.data
+          // console.log('请求返回的数据：', list)
+          if (list) { // 验证返回的configlist是否是一个非空数组
+            // console.log('转换的configlist为：', list.configlist)
+            commit('SET_DICTIONARY_CONFIGLIST', list.configlist)
+            setDataDictionaryConfigList(JSON.stringify(list.configlist))
+            resolve()
+          } else {
+            reject('getInfo: configlist must be a non-null array !')
+          }
+        }).catch(error => {
+          reject(error)
+        })
+
       })
     },
     updateConfigList({ commit }, configArr) {
@@ -128,7 +151,103 @@ const data = {
         setDataConfigList(JSON.stringify(infoJSON))
         resolve()
       })
-    }
+    },
+    updateDictionaryConfigList({ commit }, configArr) {
+      var oldconfiglist = getDataDictionaryConfigList()
+      var infoJSON = JSON.parse(oldconfiglist)
+      return new Promise((resolve, reject) => {
+        var module = configArr.module
+        if (infoJSON[module] === undefined) {
+          infoJSON[module] = []
+        }
+        infoJSON[module].push(configArr)
+        commit('SET_DICTIONARY_CONFIGLIST', infoJSON)
+        setDataDictionaryConfigList(JSON.stringify(infoJSON))
+        resolve()
+      })
+    },
+    updateChildDictionaryConfigList({ commit }, param) {
+      var configArr = param[0]
+      var state = param[1]
+      var oldconfiglist = getDataDictionaryConfigList()
+      var infoJSON = JSON.parse(oldconfiglist)
+      return new Promise((resolve, reject) => {
+        var module = configArr.module
+        var parentConfig = infoJSON[module]
+        var parent_id = configArr.parent_id
+        for (var i = 0; i < parentConfig.length; i++) {
+          var newconfig = parentConfig[i]
+          if (parent_id === newconfig.id) {
+            if (state === 'create') {
+              if (infoJSON[module][i]['childs'] === null) {
+                infoJSON[module][i]['childs'] = []
+              }
+              infoJSON[module][i]['childs'].unshift(configArr)
+              break
+            } else {
+              for (var j = 0; j < newconfig['childs'].length; j++) {
+                var newchildconfig = newconfig['childs'][j]
+                if (newchildconfig.org_id === 0 && newchildconfig.id === configArr.delete_id_system && configArr.status === 1) {
+                  infoJSON[module][i]['childs'][j] = configArr
+                  break
+                }
+                if (newchildconfig.id === configArr.id) {
+                  if (state === 'update') {
+                    infoJSON[module][i]['childs'][j] = configArr
+                  } else if (state === 'delete') {
+                    infoJSON[module][i]['childs'].splice(j, 1)
+                  }
+                  break
+                }
+              }
+            }
+            break
+          }
+        }
+        commit('SET_DICTIONARY_CONFIGLIST', infoJSON)
+        setDataDictionaryConfigList(JSON.stringify(infoJSON))
+        resolve()
+      })
+    },
+    updateParentDictionaryConfigList({ commit }, param) {
+      var configArr = param[0]
+      var state = param[1]
+      var oldconfiglist = getDataDictionaryConfigList()
+      var infoJSON = JSON.parse(oldconfiglist)
+      return new Promise((resolve, reject) => {
+        var module = configArr.module
+        if (infoJSON[module] === undefined) {
+          infoJSON[module] = []
+        }
+        if (state === 'create') {
+          infoJSON[module].push(configArr)
+        } else {
+          for (var i = 0; i < infoJSON[module].length; i++) {
+            var parentConfig = infoJSON[module][i]
+            if (parentConfig.org_id === 0 && parentConfig.id === configArr.delete_id_system && configArr.status === 1) {
+              infoJSON[module][i] = configArr
+              break
+            }
+
+            if (parentConfig.id === configArr.id) {
+              if (state === 'update') {
+                infoJSON[module][i] = configArr
+                break
+              } else if (state === 'delete') {
+                infoJSON[module].splice(i, 1)
+                break
+              }
+            }
+          }
+        }
+        commit('SET_DICTIONARY_CONFIGLIST', infoJSON)
+        setDataDictionaryConfigList(JSON.stringify(infoJSON))
+        resolve()
+      })
+    },
+
+
+
 
   }
 }

src/utils/data.js

@@ -36,3 +36,41 @@ export function getDataConfig(module, field) {
     }
   }
 }
+
+
+export function getDictionaryDataConfig(module, field) {
+  var storeConfigList = store.getters.dictionary_configlist
+  var moduleConfig = storeConfigList[module]
+  if (moduleConfig == undefined) {
+    return false
+  }
+  if (module === 'summary' || module === 'education' || module === 'nursing_record' || module === 'special_record') {
+    var Aresult = []
+    for (var j = 0; j < moduleConfig.length; j++) {
+      var Atemp = []
+      var Aconfig = moduleConfig[j]
+      Atemp['id'] = Aconfig.value
+      Atemp['value'] = Aconfig.content
+      Atemp['text'] = Aconfig.title
+      Aresult.push(Atemp)
+    }
+    return Aresult
+  } else {
+    for (var i = 0; i < moduleConfig.length; i++) {
+      var newConfig = moduleConfig[i]
+      if (newConfig.field_name === field) {
+        var result = []
+        if (newConfig.childs != null) {
+          for (var j = 0; j < newConfig.childs.length; j++) {
+            var tempconfig = newConfig.childs[j]
+            var temp = []
+            temp['id'] = tempconfig.value
+            temp['name'] = tempconfig.name
+            result.push(temp)
+          }
+        }
+        return result
+      }
+    }
+  }
+}

src/utils/data_config.js

@@ -2,6 +2,9 @@ const dataConfigKey = 'data_config_list'
 
 const filedConfigKey = 'filed_config_list'
 
+const dataDictionaryConfigKey = 'data_dictionary_config_list'
+
+
 
 
 export function getDataConfigList() {
@@ -29,3 +32,19 @@ export function setFiledConfigList(infoJSONStr) {
 export function removeFiledConfigList() {
   window.sessionStorage.removeItem(filedConfigKey)
 }
+
+
+
+
+export function getDataDictionaryConfigList() {
+  return window.sessionStorage.getItem(dataDictionaryConfigKey)
+}
+
+export function setDataDictionaryConfigList(infoJSONStr) {
+  window.sessionStorage.setItem(dataDictionaryConfigKey, infoJSONStr)
+}
+
+export function removeDataDictionaryConfigList() {
+  window.sessionStorage.removeItem(dataDictionaryConfigKey)
+}
+

src/xt_pages/data/components/configure.vue

@@ -5,28 +5,36 @@
                 <el-input style="width: 180px;margin-right:10px;" @keyup.enter.native='searchAction' v-model.trim="search_input" class="filter-item"/>
                 <el-button style="margin-right:10px;" class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
             </div>
-            <el-table :data="drugList" border style="width: 100%" :row-style="{ color: '#303133' }" 
-             :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}" 
-              highlight-current-row
-             @current-change="handleRowChange">
-                <el-table-column prop="name" label="名称" align="center">
-                    <template slot-scope="scope">
-                        {{scope.row.name}}
-                    </template>
-                </el-table-column>
-                <el-table-column prop="field_name" label="字段名" align="center">
-                   <template slot-scope="scope">
-                      {{scope.row.field_name}}
-                   </template>
-                </el-table-column>
-            </el-table>
+            <!--<el-table :data="drugList" border style="width: 100%" :row-style="{ color: '#303133' }" -->
+             <!--:header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}" -->
+              <!--highlight-current-row-->
+             <!--@current-change="handleRowChange">-->
+                <!--<el-table-column prop="name" label="名称" align="center">-->
+                    <!--<template slot-scope="scope">-->
+                        <!--{{scope.row.name}}-->
+                    <!--</template>-->
+                <!--</el-table-column>-->
+                <!--<el-table-column prop="field_name" label="字段名" align="center">-->
+                   <!--<template slot-scope="scope">-->
+                      <!--{{scope.row.field_name}}-->
+                   <!--</template>-->
+                <!--</el-table-column>-->
+            <!--</el-table>-->
+          <keep-alive>
+            <div>
+              <drug-table></drug-table>
+            </div>
+          </keep-alive>
+
         </div>
         <div style="width:50%;padding-left:10px;">
-            <el-button style="margin-bottom:10px;float:right;" class="filter-item" type="primary" @click="toAdd">新增</el-button>
-            <el-table :data="tableData" border style="width: 100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}">
-                <el-table-column prop="date" label="名称" align="center"></el-table-column>
-                <el-table-column prop="date" label="字段名" align="center"></el-table-column>
-            </el-table>
+          <drug-table-son></drug-table-son>
+
+          <!--<el-button style="margin-bottom:10px;float:right;" class="filter-item" type="primary" @click="toAdd">新增</el-button>-->
+            <!--<el-table :data="tableData" border style="width: 100%" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)', color: '#606266'}">-->
+                <!--<el-table-column prop="date" label="名称" align="center"></el-table-column>-->
+                <!--<el-table-column prop="date" label="字段名" align="center"></el-table-column>-->
+            <!--</el-table>-->
             <add-configure ref="addConfigure"></add-configure>
         </div>
     </div>
@@ -38,8 +46,12 @@
 
 <script>
 import addConfigure from './addConfigure'
+import DrugTable from './drugTable'
+import DrugTableSon from './drugTableSon'
 export default {
     components:{
+      DrugTableSon,
+      DrugTable,
         addConfigure
     },
     data(){
@@ -59,7 +71,7 @@ export default {
       },
       handleRowChange(currentRow, oldCurrentRow){
          console.log("currentrow",currentRow.id)
-         this.currentId = currentRow.id;  
+         this.currentId = currentRow.id;
       },
     },
     created(){

src/xt_pages/data/components/drugTable.vue

@@ -0,0 +1,363 @@
+<template>
+  <div class="" style="margin-right:20px;">
+    <el-table
+      style="margin-top: 42px;"
+      :row-style="{ color: '#303133' }"
+      :header-cell-style="{
+        backgroundColor: 'rgb(245, 247, 250)',
+        color: '#606266'
+      }"
+      :key="tableKey"
+      :data="list"
+      v-loading="listLoading"
+      border
+      fit
+      highlight-current-row
+      @current-change="handleRowChange"
+    >
+      <el-table-column align="center" label="名称">
+        <template slot-scope="scope">
+          <span>{{ scope.row.name }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="字段名">
+        <template slot-scope="scope">
+          <span>{{ scope.row.field_name }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
+      <el-form
+        :rules="rules"
+        ref="dataForm"
+        :model="temp"
+        label-width="70px"
+        style="width: 500px; margin-left:50px;"
+      >
+        <el-form-item :label="$t('data_config.config_name')" prop="config_name">
+          <el-input v-model="temp.name" placeholder="请输入名称"></el-input>
+        </el-form-item>
+        <el-form-item
+          :label="$t('data_config.config_field')"
+          prop="config_field"
+        >
+          <el-input
+            v-model="temp.field_name"
+            placeholder="请输入字段名称"
+          ></el-input>
+        </el-form-item>
+        <el-form-item :label="$t('data_config.remark')">
+          <el-input
+            type="textarea"
+            :autosize="{ minRows: 4, maxRows: 4 }"
+            placeholder="请输入备注"
+            v-model="temp.remark"
+          >
+          </el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible = false">{{
+          $t("table.cancel")
+          }}</el-button>
+        <el-button
+          v-if="dialogStatus == 'create'"
+          type="primary"
+          @click="createData"
+        >{{ $t("table.confirm") }}</el-button
+        >
+        <el-button v-else type="primary" @click="updateData">{{
+          $t("table.confirm")
+          }}</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog title="Reading statistics" :visible.sync="dialogPvVisible">
+      <el-table
+        :data="pvData"
+        border
+        fit
+        highlight-current-row
+        style="width: 100%"
+      >
+        <el-table-column prop="key" label="Channel"> </el-table-column>
+        <el-table-column prop="pv" label="Pv"> </el-table-column>
+      </el-table>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="dialogPvVisible = false">{{
+          $t("table.confirm")
+        }}</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import { createDictionaryConfig } from "@/api/data";
+  import waves from "@/directive/waves"; // 水波纹指令
+  import { parseTime } from "@/utils";
+  import store from "@/store";
+  import bus from "@/assets/eventBus";
+  import { getDictionaryDataConfig } from "@/utils/data";
+
+
+  export default {
+    name: "drugTable",
+    directives: {
+      waves
+    },
+    props: {
+      type: {
+        type: String,
+        default: "patient"
+      }
+    },
+    data() {
+      return {
+        currentId: undefined,
+        tableKey: 0,
+        // list: null,
+        total: null,
+        listLoading: true,
+        listQuery: {
+          page: 1,
+          limit: 20,
+          importance: undefined,
+          title: undefined,
+          type: this.type,
+          sort: "+id"
+        },
+        importanceOptions: [1, 2, 3],
+        // calendarTypeOptions,
+        sortOptions: [
+          { label: "ID Ascending", key: "+id" },
+          { label: "ID Descending", key: "-id" }
+        ],
+        statusOptions: ["published", "draft", "deleted"],
+        showReviewer: false,
+        temp: {
+          id: undefined,
+          parent_id: 0,
+          module: this.type,
+          org_id: 0,
+          name: "",
+          field_name: undefined,
+          value: "",
+          remark: ""
+        },
+        dialogFormVisible: false,
+        dialogStatus: "",
+        textMap: {
+          update: "修改",
+          create: "新增"
+        },
+        dialogPvVisible: false,
+        pvData: [],
+        rules: {
+          name: [{ required: true, message: "请输入名称", trigger: "blur" }],
+          field_name: [
+            { required: true, message: "请输入字段名", trigger: "blur" }
+          ],
+          config_value: [
+            { required: false, message: "title is required", trigger: "blur" }
+          ]
+        },
+        downloadLoading: false
+      };
+    },
+    watch: {
+      "temp.config_field": function() {
+        this.temp.config_field = this.temp.config_field.replace(/[^A-Za-z]/g, "");
+      }
+    },
+    computed: {
+      list: function() {
+        // const list = store.getters.configlist[this.type]
+        // this.total = list.length
+        return store.getters.dictionary_configlist['system'];
+      }
+    },
+    filters: {
+      statusFilter(status) {
+        const statusMap = {
+          published: "success",
+          draft: "info",
+          deleted: "danger"
+        };
+        return statusMap[status];
+      },
+      typeFilter(type) {
+        return calendarTypeKeyValue[type];
+      }
+    },
+    created() {
+      this.getList();
+    },
+    methods: {
+      fieldChange: function(newValue) {
+        this.temp.config_field = newValue.replace(/[^A-Za-z]/g, "");
+      },
+      handleRowChange(currentRow, oldCurrentRow) {
+        if (currentRow != undefined) {
+          this.currentId = currentRow.id;
+          bus.$emit("drugParentChangeId", currentRow);
+        }
+      },
+      getList() {
+        // debugger
+        // var test = getConfig('patient','blood_types')
+        this.listLoading = true;
+        setTimeout(() => {
+          this.listLoading = false;
+        }, 1 * 1000);
+      },
+      handleFilter() {
+        this.listQuery.page = 1;
+        this.getList();
+      },
+      handleSizeChange(val) {
+        this.listQuery.limit = val;
+        this.getList();
+      },
+      handleCurrentChange(val) {
+        this.listQuery.page = val;
+        this.getList();
+      },
+      handleModifyStatus(row, status) {
+        this.$message({
+          message: "操作成功",
+          type: "success"
+        });
+        row.status = status;
+      },
+      resetTemp() {
+        this.temp = {
+          id: undefined,
+          parent_id: 0,
+          module: this.type,
+          org_id: 0,
+          name: "",
+          field_name: undefined,
+          value: "",
+          remark: ""
+        };
+      },
+      handleCreate() {
+        this.resetTemp();
+        this.dialogStatus = "create";
+        this.dialogFormVisible = true;
+        this.$nextTick(() => {
+          this.$refs["dataForm"].clearValidate();
+        });
+      },
+      createData() {
+        this.$refs["dataForm"].validate(valid => {
+          if (valid) {
+            createDictionaryConfig(this.temp).then(response => {
+              if (!response.data) {
+                // 由于mockjs 不支持自定义状态码只能这样hack
+                reject("error");
+              }
+              if (response.data.state === 0) {
+                this.$message.error(response.data.msg);
+              }
+              const result = response.data.data.dataconfig;
+              // 更新store
+              store.dispatch("updateDictionaryConfigList", result).then(() => {});
+
+              this.dialogFormVisible = false;
+
+              this.$message.success("创建成功");
+            });
+          }
+        });
+      },
+      handleUpdate(row) {
+        this.temp = Object.assign({}, row); // copy obj
+        this.temp.timestamp = new Date(this.temp.timestamp);
+        this.dialogStatus = "update";
+        this.dialogFormVisible = true;
+        this.$nextTick(() => {
+          this.$refs["dataForm"].clearValidate();
+        });
+      },
+      updateData() {
+        this.$refs["dataForm"].validate(valid => {
+          if (valid) {
+            const tempData = Object.assign({}, this.temp);
+            tempData.timestamp = +new Date(tempData.timestamp); // change Thu Nov 30 2017 16:41:05 GMT+0800 (CST) to 1512031311464
+            updateArticle(tempData).then(() => {
+              for (const v of this.list) {
+                if (v.id === this.temp.id) {
+                  const index = this.list.indexOf(v);
+                  this.list.splice(index, 1, this.temp);
+                  break;
+                }
+              }
+              this.dialogFormVisible = false;
+
+              this.$message.success("更新成功");
+            });
+          }
+        });
+      },
+      handleDelete(row) {
+        this.$message.success("删除成功");
+
+        const index = this.list.indexOf(row);
+        this.list.splice(index, 1);
+      },
+      handleFetchPv(pv) {
+        fetchPv(pv).then(response => {
+          this.pvData = response.data.pvData;
+          this.dialogPvVisible = true;
+        });
+      },
+      handleDownload() {
+        this.downloadLoading = true;
+        import("@/vendor/Export2Excel").then(excel => {
+          const tHeader = ["timestamp", "title", "type", "importance", "status"];
+          const filterVal = [
+            "timestamp",
+            "title",
+            "type",
+            "importance",
+            "status"
+          ];
+          const data = this.formatJson(filterVal, this.list);
+          excel.export_json_to_excel({
+            header: tHeader,
+            data,
+            filename: "table-list"
+          });
+          this.downloadLoading = false;
+        });
+      },
+      formatJson(filterVal, jsonData) {
+        return jsonData.map(v =>
+          filterVal.map(j => {
+            if (j === "timestamp") {
+              return parseTime(v[j]);
+            } else {
+              return v[j];
+            }
+          })
+        );
+      }
+    }
+  };
+</script>
+<style>
+  .el-table td,
+  .el-table th.is-leaf,
+  .el-table--border,
+  .el-table--group {
+    border-color: #d0d3da;
+  }
+  .el-table--border::after,
+  .el-table--group::after,
+  .el-table::before {
+    background-color: #d0d3da;
+  }
+</style>

src/xt_pages/data/components/drugTableSon.vue

@@ -0,0 +1,489 @@
+<template>
+  <div class="">
+    <div class="filter-container">
+      <el-button
+        style="float: right;"
+        class="filter-item"
+        size="small"
+        :disabled="addState"
+        @click="handleCreate"
+        type="primary"
+        icon="el-icon-circle-plus-outline"
+      >{{ $t("table.add") }}</el-button
+      >
+    </div>
+    <el-table
+      :row-style="{ color: '#303133' }"
+      :header-cell-style="{
+        backgroundColor: 'rgb(245, 247, 250)',
+        color: '#606266'
+      }"
+      :key="tableKey"
+      :data="list"
+      v-loading="listLoading"
+      border
+      fit
+      highlight-current-row
+    >
+      <el-table-column align="center" label="名称">
+        <template slot-scope="scope">
+          <span @click="handleUpdate(scope.row)">{{ scope.row.name }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        align="center"
+        :label="$t('table.actions')"
+        width="230"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-tooltip class="item" effect="dark" content="编辑" placement="top">
+            <el-button
+              icon="el-icon-edit-outline"
+              type="primary"
+              size="small"
+              @click="handleUpdate(scope.row)"
+            ></el-button>
+          </el-tooltip>
+
+          <el-tooltip class="item" effect="dark" content="删除" placement="top">
+            <el-button
+              icon="el-icon-delete"
+              v-if="scope.row.status != 'deleted'"
+              size="small"
+              type="danger"
+              @click="handleModifyStatus(scope.row, 'deleted')"
+            >
+            </el-button>
+          </el-tooltip>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
+      <el-form
+        :rules="rules"
+        ref="dataForm"
+        :model="temp"
+        label-position="right"
+        label-width="70px"
+      >
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('data_config.config_name')" prop="name">
+              <el-input v-model="temp.name" placeholder="请输入名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="排序" prop="order">
+              <el-input
+                type="age"
+                v-model.number="temp.orders"
+                placeholder="请输入排序值，数值越大，排序越靠前"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item :label="$t('data_config.remark')">
+          <el-input
+            type="textarea"
+            :autosize="{ minRows: 4, maxRows: 4 }"
+            placeholder="请输入备注"
+            v-model="temp.remark"
+          >
+          </el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible = false">{{
+          $t("table.cancel")
+          }}</el-button>
+        <el-button
+          v-if="dialogStatus == 'create'"
+          type="primary"
+          @click="createData"
+        >{{ $t("table.confirm") }}</el-button
+        >
+        <el-button v-else type="primary" @click="updateData">{{
+          $t("table.confirm")
+          }}</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog title="Reading statistics" :visible.sync="dialogPvVisible">
+      <el-table
+        :data="pvData"
+        border
+        fit
+        highlight-current-row
+        style="width: 100%"
+      >
+        <el-table-column prop="key" label="Channel"> </el-table-column>
+        <el-table-column prop="pv" label="Pv"> </el-table-column>
+      </el-table>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="dialogPvVisible = false">{{
+          $t("table.confirm")
+        }}</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+  import {
+    fetchList,
+    fetchPv,
+    createArticle,
+    updateArticle
+  } from "@/api/article";
+  import waves from "@/directive/waves"; // 水波纹指令
+  import { parseTime } from "@/utils";
+  import store from "@/store";
+  import bus from "@/assets/eventBus";
+  import {
+    createConfig,
+    createDictionaryChildConfig,
+    updateDictionaryChildConfig,
+    deleteDictionaryChildConfig
+  } from "@/api/data";
+
+  const calendarTypeOptions = [
+    { key: "CN", display_name: "China" },
+    { key: "US", display_name: "USA" },
+    { key: "JP", display_name: "Japan" },
+    { key: "EU", display_name: "Eurozone" }
+  ];
+
+  // arr to obj ,such as { CN : "China", US : "USA" }
+  const calendarTypeKeyValue = calendarTypeOptions.reduce((acc, cur) => {
+    acc[cur.key] = cur.display_name;
+    return acc;
+  }, {});
+
+  export default {
+    name: "drugTableSon",
+    directives: {
+      waves
+    },
+    props: {
+      type: {
+        type: String,
+        default: "patient"
+      }
+    },
+    data() {
+      return {
+        currentId: undefined,
+        tableKey: 0,
+        total: null,
+        listLoading: false,
+        listQuery: {
+          page: 1,
+          limit: 20,
+          importance: undefined,
+          title: undefined,
+          type: this.type,
+          sort: "+id"
+        },
+        importanceOptions: [1, 2, 3],
+        calendarTypeOptions,
+        sortOptions: [
+          { label: "ID Ascending", key: "+id" },
+          { label: "ID Descending", key: "-id" }
+        ],
+        statusOptions: ["published", "draft", "deleted"],
+        showReviewer: false,
+        temp: {
+          id: undefined,
+          parent_id: 0,
+          module: this.type,
+          org_id: 0,
+          name: "",
+          field_name: undefined,
+          value: "",
+          remark: "",
+          orders: 0
+        },
+        dialogFormVisible: false,
+        dialogStatus: "",
+        textMap: {
+          update: "编辑",
+          create: "新增"
+        },
+        dialogPvVisible: false,
+        pvData: [],
+        rules: {
+          name: [{ required: true, message: "请输入名称", trigger: "blur" }],
+          order: [
+            { type: "number", message: "排序必须为数字值", trigger: "blur" }
+          ]
+          // timestamp: [{ type: 'date', required: true, message: 'timestamp is required', trigger: 'change' }],
+          // title: [{ required: true, message: 'title is required', trigger: 'blur' }]
+        },
+        downloadLoading: false,
+        parentConfig: undefined,
+        addState: true
+      };
+    },
+    computed: {
+      list: function() {
+        if (this.parentConfig != undefined) {
+          this.addState = false;
+          const list = store.getters.dictionary_configlist[this.parentConfig.module];
+          for (var i = 0; i < list.length; i++) {
+            if (list[i].id === this.parentConfig.id) {
+              return list[i]["childs"];
+              break;
+            }
+          }
+          // return store.getters.configlist[this.parentConfig.module][this.parentConfig.index ]["childs"];
+        }
+      }
+    },
+    filters: {
+      statusFilter(status) {
+        const statusMap = {
+          published: "success",
+          draft: "info",
+          deleted: "danger"
+        };
+        return statusMap[status];
+      },
+      typeFilter(type) {
+        return calendarTypeKeyValue[type];
+      }
+    },
+    created() {
+      // this.getList()
+    },
+    mounted() {
+      var _this = this;
+      bus.$on("drugParentChangeId", function(parentData) {
+        _this.parentConfig = parentData;
+        // _this.list = parentData.childs
+        console.log(parentData)
+        _this.temp = {
+          id: undefined,
+          parent_id: parentData.id,
+          module: parentData.module,
+          org_id: parentData.org_id,
+          name: "",
+          field_name: undefined,
+          value: "",
+          remark: "",
+          orders: ""
+        };
+      });
+    },
+    methods: {
+      handleRowChange(currentRow, oldCurrentRow) {
+        this.currentId = currentRow.id;
+      },
+
+      handleFilter() {
+        this.listQuery.page = 1;
+        this.getList();
+      },
+      handleSizeChange(val) {
+        this.listQuery.limit = val;
+        this.getList();
+      },
+      handleCurrentChange(val) {
+        this.listQuery.page = val;
+        this.getList();
+      },
+      handleModifyStatus(row, status) {
+
+        this.temp = Object.assign({}, row); // copy obj
+        this.$confirm("此操作将永久删除该配置项, 是否继续?", "提示", {
+          confirmButtonText: "确 定",
+          cancelButtonText: "取 消",
+          type: "warning"
+        })
+          .then(() => {
+            const tempData = Object.assign({}, this.temp);
+            deleteDictionaryChildConfig(tempData).then(response => {
+              if (!response.data) {
+                // 由于mockjs 不支持自定义状态码只能这样hack
+                reject("error");
+              }
+              if (response.data.state === 0) {
+                this.$message.error(response.data.msg);
+              }
+
+              const result = response.data.data.dataconfig;
+              store
+                .dispatch("updateChildDictionaryConfigList", [tempData, "delete"])
+                .then(() => {
+                  next();
+                });
+            });
+
+            this.$message({
+              type: "success",
+              message: "删除成功!"
+            });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消删除"
+            });
+          });
+      },
+      resetTemp() {
+        this.temp = {
+          id: undefined,
+          parent_id: this.parentConfig.id,
+          module: this.parentConfig.module,
+          org_id: this.parentConfig.org_id,
+          name: "",
+          field_name: undefined,
+          value: "",
+          remark: "",
+          orders: 0
+        };
+      },
+      handleCreate() {
+        this.resetTemp();
+        this.dialogStatus = "create";
+        // for (let i = 0; i < this.list.length; i++) {
+        //  if (
+        //    this.list[i].name == "无肝素" ||
+        //   this.list[i].name == "普通肝素" ||
+        //   this.list[i].name == "低分子肝素钠" ||
+        //    this.list[i].name == "低分子肝素钙" ||
+        //   this.list[i].name == "阿加曲班" ||
+        //    this.list[i].name == "枸橼酸钠"
+        //  ) {
+        //    this.$message.error("该项暂不支持新增");
+        //    return false;
+        //  }
+        // }
+
+        this.dialogFormVisible = true;
+        this.$nextTick(() => {
+          this.$refs["dataForm"].clearValidate();
+        });
+      },
+      createData() {
+        this.$refs["dataForm"].validate(valid => {
+          if (valid) {
+            createDictionaryChildConfig(this.temp).then(response => {
+              if (!response.data) {
+                // 由于mockjs 不支持自定义状态码只能这样hack
+                reject("error");
+              }
+              if (response.data.state === 0) {
+                this.$message.error(response.data.msg);
+              }
+              const result = response.data.data.dataconfig;
+
+              // this.list.unshift(tempval)
+              // 更新store
+              store
+                .dispatch("updateChildDictionaryConfigList", [result, "create"])
+                .then(() => {});
+
+              this.dialogFormVisible = false;
+              this.$message.success("创建成功");
+            });
+          }
+        });
+      },
+      handleUpdate(row) {
+
+        this.temp = Object.assign({}, row); // copy obj
+        this.dialogStatus = "update";
+        this.dialogFormVisible = true;
+        this.$nextTick(() => {
+          this.$refs["dataForm"].clearValidate();
+        });
+      },
+      updateData() {
+        this.$refs["dataForm"].validate(valid => {
+          if (valid) {
+            const tempData = Object.assign({}, this.temp);
+            console.log("tempData", tempData);
+            updateDictionaryChildConfig(tempData).then(response => {
+              if (!response.data) {
+                // 由于mockjs 不支持自定义状态码只能这样hack
+                reject("error");
+              }
+              if (response.data.state === 0) {
+                this.$message.error(response.data.msg);
+              }
+
+              const result = response.data.data.dataconfig;
+              store
+                .dispatch("updateChildDictionaryConfigList", [result, "update"])
+                .then(() => {});
+
+              this.dialogFormVisible = false;
+
+              this.$message.success("更新成功");
+            });
+          }
+        });
+      },
+      handleDelete(row) {
+        this.$message.success("删除成功");
+        const index = this.list.indexOf(row);
+        this.list.splice(index, 1);
+      },
+      handleFetchPv(pv) {
+        fetchPv(pv).then(response => {
+          this.pvData = response.data.pvData;
+          this.dialogPvVisible = true;
+        });
+      },
+      handleDownload() {
+        this.downloadLoading = true;
+        import("@/vendor/Export2Excel").then(excel => {
+          const tHeader = ["timestamp", "title", "type", "importance", "status"];
+          const filterVal = [
+            "timestamp",
+            "title",
+            "type",
+            "importance",
+            "status"
+          ];
+          const data = this.formatJson(filterVal, this.list);
+          excel.export_json_to_excel({
+            header: tHeader,
+            data,
+            filename: "table-list"
+          });
+          this.downloadLoading = false;
+        });
+      },
+      formatJson(filterVal, jsonData) {
+        return jsonData.map(v =>
+          filterVal.map(j => {
+            if (j === "timestamp") {
+              return parseTime(v[j]);
+            } else {
+              return v[j];
+            }
+          })
+        );
+      }
+    }
+  };
+</script>
+
+<style rel="stylesheet/css" lang="scss" scoped></style>
+<style>
+  .el-table td,
+  .el-table th.is-leaf,
+  .el-table--border,
+  .el-table--group {
+    border-color: #d0d3da;
+  }
+  .el-table--border::after,
+  .el-table--group::after,
+  .el-table::before {
+    background-color: #d0d3da;
+  }
+</style>

src/xt_pages/data/specialDictionary.vue

@@ -18,10 +18,12 @@
                     <!--<inspection></inspection>-->
                 <!--</el-tab-pane>-->
                 <el-tab-pane label="生产厂商" name="5">
-                    <manufacturer></manufacturer>
+                    <!--<manufacturer></manufacturer>-->
+                  <manufacturer> </manufacturer>
                 </el-tab-pane>
                 <el-tab-pane label="供应商" name="6">
-                    <supplier></supplier>
+                    <!--<supplier></supplier>-->
+                  <dealer></dealer>
                 </el-tab-pane>
                 <el-tab-pane label="配置项字典" name="7">
                     <configure></configure>
@@ -38,18 +40,18 @@ import drugs from './components/drugs'
 import consumables from './components/consumables'
 import project from './components/project'
 import inspection from './components/inspection'
-import manufacturer from './components/manufacturer'
-import supplier from './components/supplier'
-import configure from './components/configure'
+import manufacturer from '../stock/config/manufacturer'
+import configure from './compone，nts/configure'
+import Dealer from '../stock/config/dealer'
 export default {
     components:{
+      Dealer,
         BreadCrumb,
         drugs,
         consumables,
         project,
         inspection,
         manufacturer,
-        supplier,
         configure
     },
     data(){

src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue

@@ -429,7 +429,7 @@
         <el-row :gutter="20"> -->
 
         <el-col :span="8" v-if="isShow('实际置换量')">
-          <el-form-item v-if="this.template_id == 20" label="实际置换量(ml): ">
+          <el-form-item v-if="this.template_id == 20 || this.template_id == 21" label="实际置换量(ml): ">
             <el-input v-model="form.actual_displacement"></el-input>
           </el-form-item>
           <el-form-item v-else label="实际置换量(L): ">

src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue

@@ -8,7 +8,7 @@
       :modal-append-to-body="false"
     >
 
-      <div class="txsj">
+      <!-- <div class="txsj">
         <el-button
           round
           @click="openLast(3)"
@@ -20,7 +20,7 @@
           @click="openNext(4)"
         >下一方
         </el-button>
-      </div>
+      </div> -->
       
 
       <!--<el-table-->
@@ -159,6 +159,15 @@
 
 
       <div slot="footer" class="dialog-footer">
+        <el-button
+          @click="openLast(3)"
+        >上一方
+        </el-button>
+
+        <el-button
+          @click="openNext(4)"
+        >下一方
+        </el-button>
         <el-button @click="isLastOrNextVisible = false">取 消</el-button>
         <el-button type="primary" @click="AddNewAdvice('adForm')">设为本次临嘱</el-button>
       </div>
@@ -171,7 +180,8 @@
       @close="resetDialog"
       :modal-append-to-body="false"
     >
-      <div class="txsj">
+    <div style="font-size:16px;">上机时间：{{this.getTime(dialysis_order.start_time,'{h}:{i}')}}</div>
+      <!-- <div class="txsj">
         <el-button
           round
           @click="openLast(1)"
@@ -183,7 +193,7 @@
           @click="openNext(2)"
         >下一方
         </el-button>
-      </div>
+      </div> -->
 
       <div class="txsj" v-show="showAdvicePanel">
         <el-button
@@ -561,6 +571,21 @@
         <el-button type="primary" v-if="form.id == 0" @click="submitAdvice" :loading="loading">保 存</el-button>
         <el-button type="primary" v-else @click="submitEditAdvice" :loading="loading">保 存</el-button>
       </div>
+      <div slot="footer" class="dialog-footer" v-show="!showAdviceForm">
+        <div class="txsj">
+          <el-button
+            round
+            @click="openLast(1)"
+          >上一方
+          </el-button>
+
+          <el-button
+            round
+            @click="openNext(2)"
+          >下一方
+          </el-button>
+        </div>
+      </div>
       <!-- 医嘱表单 end -->
     </el-dialog>
     <el-dialog
@@ -619,6 +644,7 @@
   import AddGroupAdvice from './adviceDialog/AddGroupAdvice'
   import EditGroupAdvice from './adviceDialog/EditGroupAdvice'
   import { uParseTime } from '@/utils/tools'
+  import { parseTime } from '@/utils'
   import {
     CheckDoctorAdvice,
     CreateDoctorAdvice,
@@ -2247,7 +2273,13 @@
           this.GetLastOrNextDoctorAdvice(params)
 
         }
-      }
+      },
+      getTime(value, temp) {
+        if (value != undefined) {
+          return parseTime(value, temp)
+        }
+        return ''
+      },
     },
     created() {
       var date = this.$route.query && this.$route.query.date

src/xt_pages/dialysis/details/dialog/computer_dialog.vue

@@ -129,7 +129,8 @@
       if (this.form.puncture_nurse_id == 0) {
         this.form.puncture_nurse_id = this.$store.getters.xt_user.user.id
       }
-
+      
+     
     },
     watch: {
       'schedule.id': function() {

src/xt_pages/medicalScheduling/schedulingStatistics.vue

@@ -775,29 +775,15 @@ export default {
                 return Count
             }
         },
-        // toPrint(){
-        //     this.$router.push({
-        //         path: '/medicalScheduling/statistics/print',
-        //         // query: { date: date }
-        //     })
-        // },
-    //     toPrint: function() {
-    //         import('@/vendor/Export2Excel').then(excel => {
-    // 　　　　  const tHeader = ['编号', '标题', '作者','回顾', '时间'];
-    // 　　　　  const filterVal = ['id', 'title','author','pageviews','display_time'];
-    // 　　　　　const list = [
-    //            {id: 1, title: 2, author: 3, pageviews: 4, display_time: 5},
-    //            {id: 6, title: 7, author: 8, pageviews: 9, display_time: 10},
-    //            {id: 11, title: 12, author: 13, pageviews: 14, display_time: 15},
-    //          ];
-    // 　　　　　const data = this.formatJson(filterVal, list);
-    //         console.log("data",data)
-    // 　　　   excel.export_json_to_excel(tHeader, data, '书刊数据');
-    //         })
-    //     },
-    //     formatJson(filterVal, jsonData) {
-    //       return jsonData.map(v => filterVal.map(j => v[j]))
-    //     },
+        toPrint(){
+            this.$router.push({
+                path: '/medicalScheduling/statistics/print?start_time='+this.start_time+"&end_time="+this.end_time,
+                // query: { date: date }
+            })
+        },
+        formatJson(filterVal, jsonData) {
+          return jsonData.map(v => filterVal.map(j => v[j]))
+        },
 
         //获取统计图数据
         getchartlist(){

src/xt_pages/medicalScheduling/statistics_print.vue

@@ -15,31 +15,40 @@
                         <span class="main_title">{{ $store.getters.xt_user.org.org_name }}医护排班统计表</span>
                     </div>
                     <div style="text-align:right;margin-bottom:20px;font-size: 18px;">
-                      打印时间：
+                      打印时间：{{ getNowFormatDate()}}
                     </div>
                     <div class="table_panel">
                         <table class="table">
                             <thead>
                                 <tr>
-                                    <td width="120">医护姓名</td>
-                                    <td width="120">医护姓名</td>
-                                    <td width="120">医护姓名</td>
-                                    <td width="120">医护姓名</td>
-                                    <td width="120">医护姓名</td>
-                                    <td width="120">医护姓名</td>
+                                  <td width="150">医护姓名</td>
+                                  <td width="120" v-for="(modeItem, index) in scheduleList" :key="index">{{modeItem.class_name}}</td>
+                                  <td width="120">总工时/小时</td>
+                                  <td width="120">出勤/天</td>
+                                  <td width="120">缺勤/天</td>
                                 </tr>
                             </thead>
                             <tbody>
-                                <tr>
-                                    <td width="120">医护姓名</td>
-                                    <td width="120">医护姓名</td>
-                                    <td width="120">医护姓名</td>
-                                    <td width="120">医护姓名</td>
-                                    <td width="120">医护姓名</td>
-                                    <td width="120">医护姓名</td>
+                                <tr v-for="(item,i) in tableData" :key="i">
+                                  <td width="120">
+                                    {{ item.user_name}}
+                                   </td>
+                                   <td width="120" v-for="(it,i) in scheduleList" :key="i">
+                                    {{ getCount(item.doctor_id,it.class_name) }}
+                                   </td>
+                                   <td width="120">
+                                    {{ item.totalminute/60}}
+                                   </td>
+                                    <td width="120">
+                                    {{item.attendance}}
+                                   </td>
+                                   <td width="120">
+                                    {{item.absence}}
+                                   </td>
                                 </tr>
                             </tbody>
                         </table>
+                        
                     </div>
                 </div>
             </div>
@@ -49,6 +58,8 @@
 
 <script>
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
+import { getDoctorList,getScheduleListTotal,getScheduleList } from '@/api/doctorSchedule'
+import { parseTime } from '@/utils'
 import print from 'print-js'
 export default {
     components:{
@@ -60,13 +71,195 @@ export default {
                 { path: false, name: '医护排班' },
                 { path: false, name: '排班统计打印' }
             ],
+            start_time:0,
+            end_time:0,
+            doctorlist:[],
+            tableData:[],
+            scheduleList:[],
         }
     },
     created(){
-
+      
+      var startime =  this.$route.query.start_time
+      this.start_time = parseInt(startime)
+       console.log("开始时间",this.start_time)
+      var end_time = this.$route.query.end_time
+      this.end_time = parseInt(end_time)
+      console.log("结束时间",this.end_time)
+       //获取该机构所有医护人员
+      this.getDoctorList()
+       // 获取统计表的数据
+      this.getlist()
+       //获取所有排班种
+      this.getScheduleList()
     },
     methods:{
+      getDoctorList(){
+        getDoctorList().then(response=>{
+          var list =  response.data.data.list
+          var doctorlist =  response.data.data.doctorlist
+          var nurselist =  response.data.data.nurselist
+          this.doctorArr = doctorlist
+          this.nurseArr = nurselist
+          this.doctorlist.push(...nurselist)
+          this.doctorlist.push(...doctorlist)
+        })
+      },
+
+      //获取统计表数据
+        getlist(){
+            if(this.timeSlot == 1){
+               this.start_time = this.getTimestamp(this.weekDayArr[0]),
+               this.end_time = this.getTimestamp(this.weekDayArr[6])
+            }
+            const params = {
+                start_time:this.start_time,
+                end_time:this.end_time,
+            }
+            // console.log("params",params)
+            getScheduleListTotal(params).then(response=>{
+                if(response.data.state == 1){
+                    //获取每个班次对应的次数
+                    var scheudleTotal =  response.data.data.scheudletotal
+                    // console.log("scheudletotal",scheudleTotal)
+                    //获取总分钟数
+                    var list = response.data.data.list
+                    // console.log("list",list)
+                    var workday = response.data.data.workDay
+                    // console.log("workday",workday)
+                    var noWorkDay = response.data.data.noWorkDay
+                    // console.log("noWorkDay",noWorkDay)
+
+                    let tempArr = [], newArr = []
+                    for (let i = 0; i < scheudleTotal.length; i++) {
+                        if (tempArr.indexOf(scheudleTotal[i].user_name) === -1) {
+                            newArr.push({
+                                user_name: scheudleTotal[i].user_name,
+                                doctor_id:scheudleTotal[i].doctor_id,
+                                list: [{class_name:scheudleTotal[i].class_name,doctor_id:scheudleTotal[i].doctor_id,Count:scheudleTotal[i].Count}]
+                            })
+                            tempArr.push(scheudleTotal[i].user_name);
+                        } else {
+                            for (let j = 0; j < newArr.length; j++) {
+                                if (newArr[j].user_name == scheudleTotal[i].user_name) {
+                                    newArr[j].list.push({class_name:scheudleTotal[i].class_name,doctor_id:scheudleTotal[i].doctor_id,Count:scheudleTotal[i].Count})
+                                }
+                            }
+                        }
+                    }
+
+                    newArr.map(item => {
+                        list.map(it => {
+                            if(item.doctor_id == it.doctor_id){
+                                item.totalminute = it.totalminute
+                            }
+                        })
+                    })
+                    newArr.map(item => {
+                        workday.map(it => {
+                            if(item.doctor_id == it.doctor_id){
+                                item.attendance = it.Count
+                            }
+                        })
+                    })
+                    newArr.map(item => {
+                        noWorkDay.map(it => {
+                            if(item.doctor_id == it.doctor_id){
+                                item.absence = it.Count
+                            }
+                        })
+                    })
+
+                    let arr = [...newArr]
+
+                    arr.sort(this.compare('doctor_id'))
+                    this.doctorlist.sort(this.compare('admin_user_id'))
+                    this.doctorlist.forEach((item, index) => {
+                      if (arr[index] && item.admin_user_id == arr[index].doctor_id) {
+
+                      }else{
+                        arr.splice(index, 0, {user_name: item.user_name, doctor_id: item.admin_user_id, list: []})
+                      }
+                    })
 
+
+                    console.log('打印数据',arr)
+                    this.tableData = arr
+                    this.$nextTick(() => {
+                      this.$refs.tab.doLayout()
+                    })
+                }
+            })
+        },
+        compare(property){
+            return function(a,b){
+              var value1 = a[property];
+              var value2 = b[property];
+              return value2 - value1;
+            }
+        },
+         //获取所有班种
+        getScheduleList(){
+          getScheduleList().then(response=>{
+             if(response.data.state == 1){
+                var schedulelist = response.data.data.scheduleList
+                // console.log("schedulelist",schedulelist)
+                this.scheduleList = schedulelist
+             }
+          })
+        },
+
+         printAction: function() {
+          const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 16px; padding: 10px 5px; white-space: pre-line;} .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
+
+          printJS({
+          printable: 'print_content',
+          type: 'html',
+          documentTitle: '  ',
+          style: style,
+          scanStyles: false
+          })
+      },
+       getCount(id,name){
+            if(id != undefined){
+                let Count = '';
+                this.tableData.map(item => {
+                    if(item.doctor_id == id){
+                        if(item.list){
+                            item.list.map(it => {
+                                if(it.class_name == name){
+                                    Count = it.Count
+                                }
+                            })
+                        }
+
+                    }
+                })
+                return Count
+            }
+        },
+       getTime(value, temp) {
+        if (value != undefined) {
+          return parseTime(value, temp)
+        }
+        return ''
+      },
+
+     getNowFormatDate() {
+        var date = new Date();
+        var seperator1 = "-";
+        var year = date.getFullYear();
+        var month = date.getMonth() + 1;
+        var strDate = date.getDate();
+        if (month >= 1 && month <= 9) {
+            month = "0" + month;
+        }
+        if (strDate >= 0 && strDate <= 9) {
+            strDate = "0" + strDate;
+        }
+        var currentdate = year + seperator1 + month + seperator1 + strDate;
+        return currentdate;
+      },
     }
 }
 </script>

src/xt_pages/qcd/basicInformationAnalysis.vue

@@ -64,7 +64,7 @@
       </div>
       <div v-if="way == 0" class="cell clearfix" style="align-items:normal">
         <div style="float:left">
-          <div class="infoBox" style="width:370px;">
+          <div class="infoBox">
             <div class="infoOne">
               <div class="titleBox">
                 <span class="point"></span>
@@ -274,12 +274,10 @@
         </div>
       </div>
       <div v-else>
-        <div style="margin-bottom:20px;">
-          <p style="font-size: 16px;font-weight: bold;color: #000;">透析总量</p>
+        <div  style="margin-bottom:20px;">
           <line-chart :options="chart"></line-chart>
         </div>
-        <div>
-          <p style="font-size: 16px;font-weight: bold;color: #000;">转归统计</p>
+        <div >
           <line-chart :options="bar"></line-chart>
         </div>
       </div>
@@ -353,8 +351,8 @@ export default {
 
       way: 0,
       wayArr: [
-        { value: 0, label: "统计图", state: 0 },
-        { value: 1, label: "趋势图", state: 1 }
+        { value: 0, label: "统计表", state: 0 },
+        { value: 1, label: "统计图", state: 1 }
       ],
       modesData: {
        xAxis: [],

src/xt_pages/stock/Dialog/manufacturerOrDealerDialog.vue

@@ -20,45 +20,45 @@
       </el-col>
 
       <el-col :span="8">
-        <el-form-item label="联系人" >
-          <el-input  v-model="formValue.contact"></el-input>
+        <el-form-item label="拼音" prop="pinyin">
+          <el-input  v-model="formValue.pinyin"></el-input>
         </el-form-item>
       </el-col>
       <el-col :span="8">
-        <el-form-item label="联系电话" >
-          <el-input  v-model="formValue.contact_phone" type="number"></el-input>
+        <el-form-item label="五笔" prop="wubi">
+          <el-input  v-model="formValue.wubi"></el-input>
         </el-form-item>
       </el-col>
     </el-row>
 
 
-    <el-row>
-      <el-col :span="8">
-        <el-form-item label="联系地址">
-          <el-input  v-model="formValue.contact_address"></el-input>
-        </el-form-item>
-      </el-col>
-
-      <el-col :span="8">
-        <el-form-item label="QQ/微信">
-          <el-input  v-model="formValue.platform_number"></el-input>
-        </el-form-item>
-      </el-col>
-
-      <el-col :span="8">
-        <el-form-item label="Email">
-          <el-input  v-model="formValue.email"></el-input>
-        </el-form-item>
-      </el-col>
-    </el-row>
-
-      <el-col>
-        <el-form-item label="备注">
-          <el-input  type="textarea" :row="5" v-model="formValue.remark"
-                    placeholder="请输入内容">
-          </el-input>
-        </el-form-item>
-      </el-col>
+    <!--<el-row>-->
+      <!--<el-col :span="8">-->
+        <!--<el-form-item label="联系地址">-->
+          <!--<el-input  v-model="formValue.contact_address"></el-input>-->
+        <!--</el-form-item>-->
+      <!--</el-col>-->
+
+      <!--<el-col :span="8">-->
+        <!--<el-form-item label="QQ/微信">-->
+          <!--<el-input  v-model="formValue.platform_number"></el-input>-->
+        <!--</el-form-item>-->
+      <!--</el-col>-->
+
+      <!--<el-col :span="8">-->
+        <!--<el-form-item label="Email">-->
+          <!--<el-input  v-model="formValue.email"></el-input>-->
+        <!--</el-form-item>-->
+      <!--</el-col>-->
+    <!--</el-row>-->
+
+      <!--<el-col>-->
+        <!--<el-form-item label="备注">-->
+          <!--<el-input  type="textarea" :row="5" v-model="formValue.remark"-->
+                    <!--placeholder="请输入内容">-->
+          <!--</el-input>-->
+        <!--</el-form-item>-->
+      <!--</el-col>-->
     </el-form>
 
 
@@ -97,6 +97,8 @@
           email: '',
           contact_address: '',
           remark: '',
+          pinyin:'',
+          wubi:'',
 
         },
         resetForm:{
@@ -108,6 +110,8 @@
           email: '',
           contact_address: '',
           remark: '',
+          pinyin:'',
+          wubi:'',
         },
         rules: {
           manufacturer_name: [
@@ -115,6 +119,10 @@
           ],
           dealer_name: [
             {required: true, message: '请输入经销商名称', trigger: 'blur'},
+          ], pinyin: [
+            {required: true, message: '请输入拼音', trigger: 'blur'},
+          ], wubi: [
+            {required: true, message: '请输入五笔', trigger: 'blur'},
           ],
 
         }
@@ -148,7 +156,6 @@
         this.visibility = false
       },
       cancle: function (formName) {
-        console.log("11111")
         this.$emit('dialog-cancle', this.getValue());
         this.$refs['formValue'].resetFields();
       },

src/xt_pages/stock/config/dealer.vue

@@ -41,29 +41,39 @@
           border
           v-loading="loading"
         >
-          <el-table-column label="经销商编码" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.dealer_code }}
-            </template>
-          </el-table-column>
+          <!--<el-table-column label="经销商编码" align="center">-->
+            <!--<template slot-scope="scope">-->
+              <!--{{ scope.row.dealer_code }}-->
+            <!--</template>-->
+          <!--</el-table-column>-->
           <el-table-column label="经销商名称" align="center">
             <template slot-scope="scope">
               {{ scope.row.dealer_name }}
             </template>
           </el-table-column>
-          <el-table-column label="联系人" align="center">
+          <!--<el-table-column label="联系人" align="center">-->
+            <!--<template slot-scope="scope">-->
+              <!--{{ scope.row.contact }}-->
+            <!--</template>-->
+          <!--</el-table-column>-->
+          <!--<el-table-column label="联系人电话" align="center">-->
+            <!--<template slot-scope="scope">-->
+              <!--{{ scope.row.contact_phone }}-->
+            <!--</template>-->
+          <!--</el-table-column>-->
+          <!--<el-table-column label="联系地址" align="center">-->
+            <!--<template slot-scope="scope">-->
+              <!--{{ scope.row.contact_address }}-->
+            <!--</template>-->
+          <!--</el-table-column>-->
+          <el-table-column label="五笔" align="center">
             <template slot-scope="scope">
-              {{ scope.row.contact }}
+              {{ scope.row.wubi }}
             </template>
           </el-table-column>
-          <el-table-column label="联系人电话" align="center">
+          <el-table-column label="拼音" align="center">
             <template slot-scope="scope">
-              {{ scope.row.contact_phone }}
-            </template>
-          </el-table-column>
-          <el-table-column label="联系地址" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.contact_address }}
+              {{ scope.row.pinyin }}
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center">
@@ -161,7 +171,9 @@ export default {
           platform_number: "",
           email: "",
           contact_address: "",
-          remark: ""
+          remark: "",
+          pinyin:'',
+          wubi:'',
         },
         resetForm: {
           manufacturer_name: "",
@@ -171,7 +183,9 @@ export default {
           platform_number: "",
           email: "",
           contact_address: "",
-          remark: ""
+          remark: "",
+          pinyin:'',
+          wubi:'',
         }
       }
     };
@@ -203,6 +217,11 @@ export default {
           this.dealerDialog.formValue.contact_address =
             response.data.data.dealer.contact_address;
           this.dealerDialog.formValue.remark = response.data.data.dealer.remark;
+
+          this.dealerDialog.formValue.pinyin = response.data.data.dealer.pinyin;
+          this.dealerDialog.formValue.wubi = response.data.data.dealer.wubi;
+
+
           this.dealerDialog.isCreated = 2;
           this.$refs.dialog.show();
 
@@ -255,6 +274,10 @@ export default {
           this.dealerDialog.formValue.contact_address =
             response.data.data.dealer.contact_address;
           this.dealerDialog.formValue.remark = response.data.data.dealer.remark;
+
+          this.dealerDialog.formValue.pinyin = response.data.data.dealer.pinyin;
+          this.dealerDialog.formValue.wubi = response.data.data.dealer.wubi;
+
           this.dealerDialog.isCreated = 3;
           this.dealerDialog.isVisibility = true;
         }
@@ -274,7 +297,9 @@ export default {
           contact_address: val.contact_address,
           remark: val.remark,
           dealer_code: this.dealer_code,
-          id: this.editId
+          id: this.editId,
+          pinyin: val.pinyin,
+          wubi:val.wubi,
         };
         modifyDealer(params).then(response => {
           if (response.data.state == 0) {
@@ -298,6 +323,12 @@ export default {
             this.dealerData[this.editIndex].dealer_code =
               response.data.data.dealer.dealer_code;
 
+            this.dealerData[this.editIndex].pinyin =
+              response.data.data.dealer.pinyin;
+            this.dealerData[this.editIndex].wubi =
+              response.data.data.dealer.wubi;
+
+
             this.$message.success("修改成功");
           }
         });

src/xt_pages/stock/config/manufacturer.vue

@@ -36,31 +36,37 @@
             border
             v-loading="loading"
           >
-            <el-table-column label="厂家编码" align="center">
-              <template slot-scope="scope">
-                {{ scope.row.manufacturer_code }}
-              </template>
-            </el-table-column>
+            <!--<el-table-column label="厂家编码" align="center">-->
+              <!--<template slot-scope="scope">-->
+                <!--{{ scope.row.manufacturer_code }}-->
+              <!--</template>-->
+            <!--</el-table-column>-->
             <el-table-column label="厂家名称" align="center">
               <template slot-scope="scope">
                 {{ scope.row.manufacturer_name }}
               </template>
             </el-table-column>
-            <el-table-column label="联系人" align="center">
+            <!--<el-table-column label="联系人" align="center">-->
+              <!--<template slot-scope="scope">-->
+                <!--{{ scope.row.contact }}-->
+              <!--</template>-->
+            <!--</el-table-column>-->
+            <!--<el-table-column label="联系人电话" align="center">-->
+              <!--<template slot-scope="scope">-->
+                <!--{{ scope.row.contact_phone }}-->
+              <!--</template>-->
+            <!--</el-table-column>-->
+            <el-table-column label="五笔" align="center">
               <template slot-scope="scope">
-                {{ scope.row.contact }}
+                {{ scope.row.wubi }}
               </template>
             </el-table-column>
-            <el-table-column label="联系人电话" align="center">
+            <el-table-column label="拼音" align="center">
               <template slot-scope="scope">
-                {{ scope.row.contact_phone }}
-              </template>
-            </el-table-column>
-            <el-table-column label="联系地址" align="center">
-              <template slot-scope="scope">
-                {{ scope.row.contact_address }}
+                {{ scope.row.pinyin }}
               </template>
             </el-table-column>
+
             <el-table-column label="操作" align="center">
               <template slot-scope="scope">
                 <el-tooltip
@@ -161,7 +167,10 @@ export default {
           platform_number: "",
           email: "",
           contact_address: "",
-          remark: ""
+          remark: "",
+          pinyin:"",
+          wubi:"",
+
         },
         resetForm: {
           manufacturer_name: "",
@@ -171,7 +180,9 @@ export default {
           platform_number: "",
           email: "",
           contact_address: "",
-          remark: ""
+          remark: "",
+          pinyin:"",
+          wubi:"",
         }
       }
     };
@@ -202,6 +213,11 @@ export default {
             response.data.data.manufacturer.contact_address;
           this.manufacturerDialog.formValue.remark =
             response.data.data.manufacturer.remark;
+          this.manufacturerDialog.formValue.pinyin =
+            response.data.data.manufacturer.pinyin;
+          this.manufacturerDialog.formValue.wubi =
+            response.data.data.manufacturer.wubi;
+
           this.manufacturerDialog.isCreated = 2;
           this.$refs.dialog.show();
           this.manufacturer_code =
@@ -255,6 +271,12 @@ export default {
             response.data.data.manufacturer.contact_address;
           this.manufacturerDialog.formValue.remark =
             response.data.data.manufacturer.remark;
+
+          this.manufacturerDialog.formValue.pinyin =
+            response.data.data.manufacturer.pinyin;
+          this.manufacturerDialog.formValue.wubi =
+            response.data.data.manufacturer.wubi;
+
           this.manufacturerDialog.isCreated = 3;
           this.manufacturerDialog.isVisibility = true;
         }
@@ -274,7 +296,10 @@ export default {
           contact_address: val.contact_address,
           remark: val.remark,
           manufacturer_code: this.manufacturer_code,
-          id: this.editId
+          id: this.editId,
+          pinyin: val.pinyin,
+          wubi: val.wubi,
+
         };
         modifyManufacturer(params).then(response => {
           if (response.data.state == 0) {
@@ -298,6 +323,15 @@ export default {
             this.manufacturerData[this.editIndex].manufacturer_code =
               response.data.data.manufacturer.manufacturer_code;
 
+
+            this.manufacturerData[this.editIndex].pinyin =
+              response.data.data.manufacturer.pinyin;
+            this.manufacturerData[this.editIndex].wubi =
+              response.data.data.manufacturer.wubi;
+
+
+
+
             this.$message.success("修改成功");
           }
         });