Merge branch 'wulong' of http://116.62.18.175:6699/r/~yxh/smartor-web into ...

yxh

2023-11-21 dacf3c6ae5ede1c0a8a8b4afb24e2a3b62f0e368

Merge branch 'wulong' of http://116.62.18.175:6699/r/~yxh/smartor-web into yxh01

 package.json

@@ -38,9 +38,9 @@
  "dependencies": {
    "@antv/x6": "^1.18.3",
    "@antv/x6-vue-shape": "^1.2.3",
    "@vue/composition-api": "^1.0.0-rc.6",
    "@riophae/vue-treeselect": "0.4.0",
    "@vue/babel-plugin-jsx": "^1.1.5",
    "@vue/composition-api": "^1.0.0-rc.6",
    "axios": "0.24.0",
    "clipboard": "2.0.8",
    "codemirror": "^5.65.13",
@@ -52,6 +52,7 @@
    "file-saver": "^2.0.5",
    "fuse.js": "6.4.3",
    "highlight.js": "9.18.5",
    "insert-css": "^2.0.0",
    "jquery": "^3.7.0",
    "js-beautify": "1.13.0",
    "js-cookie": "3.0.1",

 src/api/patient/homepage.js

@@ -2,13 +2,13 @@
import { parseStrEmpty } from "@/utils/ruoyi";//处理字符串,und,null转换为'';

// æŸ¥è¯¢æ‚£è€…列表
// export function listpatient(query) {
//   return request({
//     url: '/smartor/patarchive/list',
//     method: 'get',
//     params: query
//   })
// };
export function listpatient(query) {
  return request({
    url: '/smartor/patarchive/list',
    method: 'get',
    params: query
  })
};
// ç”¨æˆ·ä¿¡æ¯æŸ¥è¯¢æ‚£è€…列表
export function messagelistpatient(data) {
  return request({

 src/api/smartorpor/pat_archive.js

@@ -1,6 +1,28 @@

    /*患者档案API接口
          patid// è‡ªå¢žID 
   name// å§“名 
   sex// æ€§åˆ«   1:男  2:女
   iccardno// è¯ä»¶å·ç  
   birthdate// ç”Ÿæ—¥ 
   age// å¹´é¾„ 
   source// æ¥æº 
   archivetime// å»ºæ¡£æ—¶é—´ 
   archiveby// å»ºæ¡£äºº 
   telcode// æ‰‹æœºå·ç  
   relativetelcode// äº²å±žå·ç  
   iccardtype// è¯ä»¶ç±»åž‹ 
   orgid// æœºæž„ID 
   openid// å¾®ä¿¡openid 
   del_flag// åˆ é™¤æ ‡è®° 
   update_by// æ›´æ–°äºº 
   update_time// æ›´æ–°æ—¶é—´ 
   create_by// åˆ›å»ºäºº 
   create_time// åˆ›å»ºæ—¶é—´ 
   isupload// ä¸Šä¼ æ ‡è®° 
   upload_time// ä¸Šä¼ æ—¶é—´ 
   pid//父ID
   guid//GUID

          patid// è‡ªå¢žID 
   name// å§“名 
   sex// æ€§åˆ«   1:男  2:女
   iccardno// è¯ä»¶å·ç  
   birthdate// ç”Ÿæ—¥ 
   age// å¹´é¾„ 
   source// æ¥æº 
   archivetime// å»ºæ¡£æ—¶é—´ 
   archiveby// å»ºæ¡£äºº 
   telcode// æ‰‹æœºå·ç  
   relativetelcode// äº²å±žå·ç  
   iccardtype// è¯ä»¶ç±»åž‹ 
   orgid// æœºæž„ID 
   openid// å¾®ä¿¡openid 
   del_flag// åˆ é™¤æ ‡è®° 
   update_by// æ›´æ–°äºº 
   update_time// æ›´æ–°æ—¶é—´ 
   create_by// åˆ›å»ºäºº 
   create_time// åˆ›å»ºæ—¶é—´ 
   isupload// ä¸Šä¼ æ ‡è®° 
   upload_time// ä¸Šä¼ æ—¶é—´ 
   pid//父ID
   guid//GUID
    */
    import request from '@/utils/request'


 src/api/system/tag.js

@@ -3,8 +3,8 @@
// æŸ¥è¯¢æ ‡ç­¾åˆ—表
export function listTag(query) {
  return request({
    url: '/system/tag/list',
    method: 'get',
    url: '/base/tag/list',
    method: 'post',
    params: query
  })
}
@@ -12,7 +12,7 @@
// æŸ¥è¯¢æ ‡ç­¾è¯¦ç»†
export function getTag(tagid) {
  return request({
    url: '/system/tag/' + tagid,
    url: '/base/tag/' + tagid,
    method: 'get'
  })
}
@@ -20,7 +20,7 @@
// æ–°å¢žæ ‡ç­¾
export function addTag(data) {
  return request({
    url: '/system/tag',
    url: '/base/tag',
    method: 'post',
    data: data
  })
@@ -29,7 +29,7 @@
// ä¿®æ”¹æ ‡ç­¾
export function updateTag(data) {
  return request({
    url: '/system/tag',
    url: '/base/tag',
    method: 'put',
    data: data
  })
@@ -38,7 +38,7 @@
// åˆ é™¤æ ‡ç­¾
export function delTag(tagid) {
  return request({
    url: '/system/tag/' + tagid,
    url: '/base/tag/' + tagid,
    method: 'delete'
  })
}

 src/components/SFtable/index.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,99 @@
<template>
    <el-table
      :data="currentList"
      style="width: 1158px"
      :header-cell-style="{
        background: '#f3f6fb',
        color: '#666',
        height: '42px',
        'font-weight': 400,
      }"
      :highlight-current-row="true"
      empty-text="暂无数据"
    >
      <el-table-column type="index" :index="indexMethod" label="序号" width="80">
      </el-table-column>
      <el-table-column
        v-for="(item, index) in tableLabel"
        :key="index"
        :prop="item.prop"
        :width="item.width"
        :label="item.label"
        :formatter="formatData"
      >
      </el-table-column>
      <el-table-column label="操作" width="100">
        <template slot-scope="scope">
          <el-button type="text" @click.native="$emit('details', scope.row)"
            >查看详情</el-button
          >
        </template>
      </el-table-column>
    </el-table>
  </template>
  
  <script>
  import dayjs from "dayjs";
  export default {
    data() {
      return {};
    },
    props: {
      currentList: {
        type: Array,
        required: true,
      },
      tableLabel: {
        type: Array,
        default: () => [],
      },
      currentIndex: {
        type: Number,
        required: true,
      },
    },
    created() {},
  
    methods: {
      indexMethod(index) {
        return parseInt(this.currentIndex) - 9 + index;
      },
    //   æ•°æ®è¿‡æ»¤
      formatData(row, column, cellValue) {
        if (column.property === "createType") {
          if (cellValue === 1) {
            return "自动";
          }
          return "手动";
        }
        if (column.property === "createTime") {
          return dayjs(cellValue).format("YYYY.MM.DD HH:mm:ss");
        }
        return cellValue;
      },
    },
  };
  </script>
  
  <style lang="scss">
  .el-table td,
  .el-table th.is-leaf {
    border-bottom: unset;
  }
  .el-table td,
  .el-table th {
    padding: 5px 0;
  }
  .el-table thead {
    font-weight: 400;
    color: #666;
  }
  .dialog-footer {
    width: 100%;
    padding: 10px 20px 20px;
    text-align: center !important;
    -webkit-box-sizing: border-box;
    box-sizing: border-box;
  }
  </style>
  

 src/views/followvisit/tasklist/FollowupDetails/index.vue

@@ -138,7 +138,7 @@
                        placeholder="请选择"
                      >
                        <el-option
                          v-for="item in topicoptions"
                          v-for="item in taskoptions"
                          :key="item.value"
                          :label="item.label"
                          :value="item.value"
@@ -181,11 +181,11 @@
                  <el-row :gutter="10" class="mb8">
                    <el-col :span="1.5">
                      <el-select
                        v-model="topqueryParams.topic"
                        v-model="tasktopic"
                        placeholder="请选择新增类型"
                      >
                        <el-option
                          v-for="item in topicoptions"
                          v-for="item in taskoptions"
                          :key="item.value"
                          :label="item.label"
                          :value="item.value"
@@ -199,23 +199,13 @@
                        plain
                        icon="el-icon-plus"
                        size="medium"
                        :disabled="!tasktopic"
                        @click="handleAdd"
                        v-hasPermi="['system:user:add']"
                        >新增</el-button
                      >
                    </el-col>
                    <el-col :span="1.5">
                      <el-button
                        type="success"
                        plain
                        icon="el-icon-edit"
                        size="medium"
                        :disabled="single"
                        @click="handleUpdate"
                        v-hasPermi="['system:user:edit']"
                        >修改</el-button
                      >
                    </el-col>

                    <el-col :span="1.5">
                      <el-button
                        type="danger"
@@ -1048,6 +1038,7 @@
      userList: null,
      patientuserList: null,
      sonuserList: null,
      tasktopic: null, //新增类型
      form: {
        name: "",
        region: "",
@@ -1080,6 +1071,24 @@
          label: "北京烤鸭",
        },
      ],
      taskoptions: [
        {
          value: "1",
          label: "通知",
        },
        {
          value: "2",
          label: "随访",
        },
        {
          value: "3",
          label: "问卷",
        },
        {
          value: "4",
          label: "宣教",
        },
      ],
      quote: false,
    };
  },
@@ -1087,6 +1096,7 @@
  created() {
    this.Addsubtask();
    this.Getsubtask();
    
  },

  methods: {
@@ -1107,6 +1117,7 @@
    },
    // å­ä»»åŠ¡ä¸€çº§å¼¹æ¡†
    handleAdd() {
      this.multiple = true;
      listsvr_prjtaskline(this.deliverytopqueryParams).then((response) => {
        console.log(response);
        this.sonuserList = response.rows;
@@ -1117,6 +1128,7 @@
    },
    // å­ä»»åŠ¡äºŒçº§å¼¹æ¡†
    handleAddpatient() {
      console.log(this.multiple);
      listpat_archive(this.patientqueryParams).then((response) => {
        console.log(response);
        this.patientuserList = response.rows;
@@ -1130,8 +1142,10 @@
    handleExport() {},
    // å¤šé€‰æ¡†é€‰ä¸­æ•°æ®
    handleSelectionChange(selection) {
      this.ids = null;
      this.ids = selection.map((item) => item.patid).join(",");
      // let result = this.ids.join(",");
      this.multiple = !selection.length;
      console.log(this.ids);
    },
    getList() {},

 src/views/followvisit/tasklist/index.vue

@@ -156,7 +156,7 @@
          prop="describe"
        />
        <el-table-column
          label="任务总数"
          label="子任务总数"
          align="center"
          key="nickName"
          prop="nickName"
@@ -579,7 +579,7 @@
    /** æŸ¥è¯¢é—¨è¯Šéšè®¿åˆ—表 */
    getList() {
      this.loading = true;
      listsvr_prj(this.addDateRange(this.topqueryParams, this.dateRange)).then(
      listUser(this.addDateRange(this.topqueryParams, this.dateRange)).then(
        (response) => {
          console.log(response);
          this.userList = response.rows;

 src/views/patient/patient/index.vue

@@ -478,8 +478,16 @@
  updatepat_archive,
  delpat_archive,
} from "@/api/smartorpor/pat_archive";
import { listbase_tag } from "@/api/smartorpor/base_tag";

import {
  messagelistpatient,
  alterpatient,
  addpatient,
  particularpatient,
  deletepatient,
  Exporterrorpatient,
  toleadpatient,
} from "@/api/patient/homepage";
import { listtag } from "@/api/system/label";
import { getToken } from "@/utils/auth";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -634,7 +642,7 @@
    /** æŸ¥è¯¢æ‚£è€…列表 */
    getList() {
      this.loading = true;
      listpat_archive(this.queryParams).then((response) => {
      messagelistpatient(this.queryParams).then((response) => {
        console.log(response);
        this.userList = response.rows;
        this.total = response.total;
@@ -644,7 +652,7 @@
    /** æŸ¥è¯¢æ ‡ç­¾åˆ—表 */
    gettabList() {
      const queryParams = {};
      listbase_tag().then((response) => {
      listtag().then((response) => {
        console.log(response);
        this.optionstag = response.rows;
      });
@@ -718,7 +726,7 @@
    handleUpdate(row) {
      console.log(row);
      const userIds = row.patid || this.ids;
      getpat_archive(userIds).then((response) => {
      particularpatient(userIds).then((response) => {
        console.log(response);
        this.form = response.data;
      });
@@ -729,7 +737,7 @@
    //修改/新增患者
    submitForm() {
      if (this.amendtag) {
        updatepat_archive(this.form)
        alterpatient(this.form)
          .then((response) => {
            console.log(response);
          })
@@ -738,7 +746,7 @@
            this.$modal.msgSuccess("修改成功");
          });
      } else {
        addpat_archive(this.form)
        addpatient(this.form)
          .then((response) => {
            console.log(response);
          })
@@ -758,7 +766,7 @@
      this.$modal
        .confirm('是否确认删除用户编号为"' + userIds + '"的数据项？')
        .then(function () {
          return delpat_archive(userIds);
          return deletepatient(userIds);
        })
        .then(() => {
          this.getList();

 src/views/system/label/index.vue

@@ -195,8 +195,8 @@
                <template slot-scope="scope">
                  <el-switch
                    v-model="scope.row.isupload"
                    :active-value="'1'"
                    :inactive-value="'0'"
                    :active-value="1"
                    :inactive-value="0"
                    active-color="#13ce66"
                    @change="handleStatusChange(scope.row)"
                  ></el-switch>
@@ -325,7 +325,19 @@
</template>

<script>
import { changetagcategory } from "@/api/system/label";
import {
  changetagcategory,
  toamendtag,
  toamendtagcategory,
  addapitag,
  addtagcategory,
  detailstag,
  deletetag,
  deletetagcategory,
  exporttag,
  listtag,
  tagclassifylist,
} from "@/api/system/label";
import {
  listbase_tag,
  getbase_tag,
@@ -513,7 +525,7 @@
  methods: {
    /** æŸ¥è¯¢æ ‡ç­¾åˆ—表 */
    getList() {
      listbase_tag(this.addDateRange(this.queryParams)).then((response) => {
      listtag(this.addDateRange(this.queryParams)).then((response) => {
        console.log(response);
        this.total = response.total;
        this.userList = response.rows;
@@ -546,13 +558,13 @@
    // æ·»åŠ /修改标签
    Maintenancetag() {
      if (this.lstamendtag) {
        updatebase_tag(this.addDateRange(this.tagform)).then((response) => {
        toamendtag(this.addDateRange(this.tagform)).then((response) => {
          console.log(response);
          this.lstamendtagVisible = false;
          this.getList();
        });
      } else {
        addbase_tag(this.addDateRange(this.tagform)).then((response) => {
        addapitag(this.addDateRange(this.tagform)).then((response) => {
          console.log(response);
          this.lstamendtagVisible = false;

@@ -570,7 +582,7 @@

    // èŽ·å–标签分类
    gitclasify() {
      listbase_tagcategory(this.addDateRange(this.forms)).then((response) => {
      tagclassifylist(this.addDateRange(this.forms)).then((response) => {
        console.log(response);
        this.numberlb = response.total;
        this.editableTabs = response.rows;
@@ -580,14 +592,14 @@
    submitsidecolumn() {
      if (this.amendtag) {
        this.classifyform.tagcategoryid = this.idds;
        updatebase_tagcategory(this.addDateRange(this.classifyform)).then(
        toamendtagcategory(this.addDateRange(this.classifyform)).then(
          (response) => {
            console.log(response);
            this.gitclasify();
          }
        );
      } else {
        addbase_tagcategory(this.addDateRange(this.classifyform)).then(
        addtagcategory(this.addDateRange(this.classifyform)).then(
          (response) => {
            console.log(response);
            this.gitclasify();
@@ -603,7 +615,7 @@
    //删除分类
    deletefenlei(row) {
      if (this.deleteVisible) {
        delbase_tagcategory(this.idds).then((response) => {
        deletetagcategory(this.idds).then((response) => {
          console.log(response);
          this.gitclasify();
        });
@@ -643,17 +655,17 @@
    // æ ‡ç­¾çŠ¶æ€ä¿®æ”¹
    handleStatusChange(row) {
      console.log(row.isupload);
      let text = row.isupload == "0" ? "停用" : "启用";
      let text = row.isupload == 0 ? "停用" : "启用";
      this.$modal
        .confirm('确认要"' + text + '""' + row.tagname + '"标签吗？')
        .then(function () {
          return updatebase_tag(row);
          return toamendtag(row);
        })
        .then(() => {
          this.$modal.msgSuccess(text + "成功");
        })
        .catch(function () {
          row.isupload = row.isupload == "0" ? "1" : "0";
          row.isupload = row.isupload == 0 ? 1 : 0;
        });
    },
    /** æœç´¢æŒ‰é’®æ“ä½œ */
@@ -689,7 +701,7 @@
            : "是否确认删除选中的数据项？"
        )
        .then(function () {
          return delbase_tag(tagids);
          return deletetag(tagids);
        })
        .then(() => {
          this.getList();

 vue.config.js

@@ -36,8 +36,8 @@
      // detail: https://cli.vuejs.org/config/#devserver-proxy
      [process.env.VUE_APP_BASE_API]: {
        // target1: `http://192.168.1.4:8080`,
        // target: `http://192.168.1.3:8080`,
        target: `http://www.hxsoft.com:8080`,
        target:`http://localhost:8080`,
        // target: `http://www.hxsoft.com:8080`,
        changeOrigin: true,
        pathRewrite: {
          ['^' + process.env.VUE_APP_BASE_API]: ''