代码提交

CMS1.0/.env.production

@@ -5,8 +5,8 @@ VITE_APP_TITLE = 加一后台管理系统
 VITE_APP_ENV = 'production'
 
 # 若依管理系统/生产环境
-VITE_APP_BASE_API = '/api/'
-VITE_APP_BASE_WS = 'wss://kf.longing.net.cn:7000/websocket'
+VITE_APP_BASE_API = 'http://192.168.1.15:8060/'
+VITE_APP_BASE_WS = 'ws://192.168.1.15:8010/'
 
 
 # 是否在打包时开启压缩，支持 gzip 和 brotli

CMS1.0/src/store/commonSelect/common.js

@@ -2,9 +2,11 @@ import { getPageListData } from '@/api/main/system/system'
 import { addDateRange } from '@/utils/ruoyi'
 const useSelectStore = defineStore('common', {
     state: () => ({
+        questionnaireData:[],
         templateListData:[],
         userListData: [],
         deptListData: [],
+        deptUserTree:[],
         orderTypeTree: [],
         knowledgeCatalogTree:[],//工单目录1
         knowledgeLabeTree:[],
@@ -22,16 +24,21 @@ const useSelectStore = defineStore('common', {
     }),
     actions: {
         async getSelectData(payload) {
+            const questionnairResult = await getPageListData('/survey/survey/getGoingList')    //  /common/user
+            this.questionnaireData = getUserSelcet(questionnairResult.data, 'title', 'surveyId')
             const templateResult = await getPageListData('/sms/template')    //  /common/user
             this.templateListData = getUserSelcet(templateResult.data, 'templateCode', 'templateId')
+            this.templateNameListData = getUserSelcet(templateResult.data, 'templateName', 'templateId')
             const deptResult = await getPageListData('/common/dept') // /common/dept
             this.deptListData = arrayToTree(deptResult.data, 100)   
             const userResult = await getPageListData('/common/user')    //  /common/user
             this.userListData = getUserSelcet(userResult.data, 'nickName', 'userName')
             this.workorderUserList = workorderGlvUserList(userResult.data)
+
+            const deptUserResult = await getPageListData('/common/work/type/treeselect')  //  /common/worker/type/treeselect    
+            this.deptUserTree = filterTreeData(deptUserResult.data) ;//filterTreeData(workordertypeResult.data)
             const workordertypeResult = await getPageListData('/common/work/type/treeselect')  //  /common/worker/type/treeselect    
             this.orderTypeTree = workordertypeResult.data;//filterTreeData(workordertypeResult.data)
-            
             const knowledgeCatalogResult = await getPageListData('/common/work/type/treeselect',{category:1})
             this.knowledgeCatalogTree = filterTreeData(knowledgeCatalogResult.data) 
             const knowledgeLabelResult = await getPageListData('/common/work/type/treeselect',{category:2})

CMS1.0/src/utils/commonDic.js

@@ -57,6 +57,106 @@ export const nations = [
   { value: '56', title: '基诺族' },
 ];
 
+export const patientsData = [
+  {
+    title: '无',
+    value: '1',
+  },
+  {
+    title: '固定',
+    value: '2',
+  },
+  {
+    title: '一次',
+    value: '每日',
+  },
+
+];
+export const periodData = [
+  {
+    title: '每天',
+    value: '1',
+  },
+  {
+    title: '一次',
+    value: '2',
+  },
+
+];
+export const matchMode = [
+  {
+    title: '导入',
+    value: '1',
+  },
+  {
+    title: '筛选',
+    value: '2',
+  },
+
+];
+export const repetitionMode = [
+  {
+    title: '不去重',
+    value: '1',
+  },
+  {
+    title: '全局不重复',
+    value: '2',
+  },
+  {
+    title: '计划内不重复',
+    value: '3',
+  },
+
+];
+export const allotMode = [
+  {
+    title: '均分',
+    value: '1',
+  },
+  {
+    title: '比例',
+    value: '2',
+  },
+
+];
+export const followType = [
+  {
+    title: '体检随访',
+    value: '体检随访',
+  },
+  {
+    title: '门诊随访',
+    value: '门诊随访',
+  },
+  {
+    title: '出院随访',
+    value: '3出院随访',
+  }
+];
+export const followWay = [
+  {
+    title: '电话',
+    value: '1',
+  },
+  {
+    title: '短信',
+    value: '2',
+  }
+
+];
+export const followExecution = [
+  {
+    title: '人工',
+    value: '1',
+  },
+  {
+    title: '自动',
+    value: '2',
+  }
+
+];
+
 
 export const sex = [
   {

CMS1.0/src/utils/telWebsocket.js

@@ -11,10 +11,10 @@ let ws // websocket 实例
 let cls = 0
 let lockReconnect = false // 避免重复连接
 let websocktTimer // 定时器 39.164.159.226
-// let wsUrl = 'ws://192.168.1.10:9002'
+let wsUrl = 'ws://192.168.1.10:9002'
 // let wsUrl = 'ws://39.164.159.226:9002'
 // let wsUrl = 'ws://123.13.222.95:9002'
-let wsUrl = 'wss://kf.longing.net.cn:9002'
+// let wsUrl = 'wss://kf.longing.net.cn:9002'
 
 let globalCallback
 const errorType = ['SayBusy','SayFree','Logout','Login','Auth']

CMS1.0/src/views/main/followUp/addFollowUpPlan/addFollowUpPlan.vue

@@ -15,25 +15,25 @@
       <el-card class="box-card">
         <template #header>
           <div class="card-header">
-            <span class="card-title">{{ workBasicData.source === '电话' ? '问卷配置' : '短信配置' }}</span>
+            <span class="card-title">{{ workBasicData.way === '1' ? '问卷配置' : '短信配置' }}</span>
           </div>
         </template>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="选择模版" label-width="200px" v-if="workBasicData.source === '电话'">
-              <el-select v-model="selectValue" placeholder="请选择模版" style="width: 240px">
-                <el-option v-for="item in selectOptions" :key="item.value" :label="item.label" :value="item.value" />
+            <el-form-item label="选择模版" label-width="200px" v-if="workBasicData.way === '1'">
+              <el-select v-model="questionnaire" placeholder="请选择模版" style="width: 240px">
+                <el-option v-for="item in questionnaireData" :key="item.value" :label="item.title" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="选择模版" label-width="200px" v-if="workBasicData.source === '短信'">
-              <el-select v-model="selectValue" placeholder="请选择模版" style="width: 240px">
-                <el-option v-for="item in selectOptions11" :key="item.value" :label="item.label" :value="item.value" />
+            <el-form-item label="选择模版" label-width="200px" v-if="workBasicData.way === '2'">
+              <el-select v-model="smsValue" placeholder="请选择模版" style="width: 240px">
+                <el-option v-for="item in smsData" :key="item.value" :label="item.title" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <div class="templateBox">
-              <div class="template-title">{{ workBasicData.source === '电话' ? '问卷模版' : '短信模版' }}</div>
+            <div class="templateBox" v-if="workBasicData.way === '2'">
+              <div class="template-title">短信模版</div>
               <div>
                 <el-tag type="primary">患者姓名</el-tag>
                 您好！我是开封市医院回访专员<el-tag type="primary">坐席昵称</el-tag>。
@@ -53,16 +53,44 @@
         </template>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="选择模版" label-width="200px">
-              <el-select v-model="selectValue" placeholder="请选择模版" style="width: 240px">
-                <el-option label="均分" value="均分" />
-                <el-option label="比例" value="比例" />
+            <el-form-item label="分配方式" label-width="200px">
+              <el-select v-model="allocation" placeholder="请选择分配方式" style="width: 240px">
+                <el-option v-for="item in allotMode" :key="item.value" :label="item.title" :value="item.value" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <div class="questionBox">
-              <seat-list></seat-list>
+              <div class="questionBox">
+                <el-table :data="seatListData" border style="margin-bottom: 15px;">
+                  <el-table-column prop="usercode" label="成员"></el-table-column>
+                  <el-table-column prop="username" label="工号"></el-table-column>
+                  <el-table-column prop="userdept" label="部门"></el-table-column>
+                  <el-table-column label="比例" v-if="allocation==='2'">
+                    <template #default="scope">
+                      <span v-show="scope.$index !== editIndex">{{ scope.row.proportion }}</span>
+                      <el-input
+                        v-show="scope.$index === editIndex"
+                        v-model="scope.row.proportion"
+                      ></el-input>
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="操作">
+                    <template #default="{ row }">
+                      <div style="display: flex;">
+                        <el-button link @click="handleEdit(row)" v-if="allocation==='2'">编辑</el-button>
+                        <el-button type="primary" link @click="handleSave" v-if="allocation==='2'">保存</el-button>
+                        <el-button type="danger" link @click="handleDelete(row)"
+                          >删除</el-button
+                        >
+                      </div>
+                    </template>
+                  </el-table-column>
+                </el-table>
+                  <el-button class="mt-4" style="width: 100%" @click="onAddItem">
+                    新增坐席
+                  </el-button>
+              </div>
             </div>
           </el-col>
         </el-row>
@@ -72,275 +100,159 @@
         <template #header>
           <div class="card-header">
             <span class="card-title">患者匹配规则</span>
-            <a class="card-titleFr">下载导入模版</a>
+            <a class="card-titleFr" v-if="matchingMethod === '1'">下载导入模版</a>
           </div>
 
         </template>
         <el-row>
           <el-col :span="12">
             <el-form-item label="去重方式" label-width="200px">
-              <el-select v-model="selectValue2" placeholder="请选择去重方式" style="width: 240px">
-                <el-option v-for="item in selectOptions2" :key="item.value" :label="item.label" :value="item.value" />
+              <el-select v-model="deduplication" placeholder="请选择去重方式" style="width: 240px">
+                <el-option v-for="item in repetitionMode" :key="item.value" :label="item.title" :value="item.value" />
               </el-select>
             </el-form-item>
             <el-form-item label="匹配方式" label-width="200px">
-              <el-select v-model="selectValue3" placeholder="请选择匹配方式" @change="changeSelect3" style="width: 240px">
-                <el-option v-for="item in selectOptions3" :key="item.value" :label="item.label" :value="item.value" />
+              <el-select v-model="matchingMethod" placeholder="请选择匹配方式" @change="changeSelect3" style="width: 240px">
+                <el-option v-for="item in matchMode" :key="item.value" :label="item.title" :value="item.value" :disabled="item.value=='1'" />
               </el-select>
             </el-form-item>
-            <el-form-item label="周期" label-width="200px" v-if="selectValue3 === '筛选'">
-              <el-select v-model="selectValue4" placeholder="请选择周期" style="width: 240px">
-                <el-option label="一次" value="一次" />
-                <el-option label="每天" value="每天" />
+            <el-form-item label="周期" label-width="200px" v-if="matchingMethod === '2'">
+              <el-select v-model="cycle" placeholder="请选择周期" style="width: 240px">
+                <el-option v-for="item in periodData" :key="item.value" :label="item.title" :value="item.value" />
               </el-select>
             </el-form-item>
-            <el-form-item label="时间" label-width="200px" v-if="selectValue3 === '筛选'">
-              <el-time-picker style="width: 240px" v-model="dataValue1" placeholder="请选择时间" />
+            <el-form-item label="时间" label-width="200px" v-if="matchingMethod === '2'">
+              <el-time-picker style="width: 240px" v-model="executionTime" placeholder="请选择时间" />
             </el-form-item>
-            <el-form-item label="患者数量" label-width="200px" v-if="selectValue3 === '筛选'">
-              <el-radio-group v-model="dataRadio1">
-                <el-radio label="1">无</el-radio>
-                <el-radio label="2">固定</el-radio>
-                <el-radio label="3">每日</el-radio>
+            <el-form-item label="患者数量" label-width="200px" v-if="matchingMethod === '2'">
+              <el-radio-group v-model="patientsNumRule"> 
+                <el-radio v-for="item in patientsData" :label="item.value" >{{item.title}}</el-radio>
               </el-radio-group>
-              <el-input-number style="margin-left: 30px;" v-model="dataNum1" :min="1" :max="10" />
+              
+            </el-form-item>
+            <el-form-item label="" label-width="200px" v-if="patientsNumRule!=='1'">
+              <el-input-number v-model="patientsNum" :min="1" :max="9999" />
             </el-form-item>
+            
           </el-col>
           <el-col :span="12">
             <div class="questionBox">
-              <patient-list v-if="selectValue3 === '导入'"></patient-list>
-              <div v-if="selectValue3 === '筛选'">
+              
+              <patient-list v-if="matchingMethod === '1'"></patient-list>
+              <div v-if="matchingMethod === '2'" style="position: relative;">
                 <div>筛选条件</div>
-                <div v-for="item in filterData" style="display: flex;">
-                  <div v-for="itemChild in item" style="margin: 15px 15px 0px 0px;">
-                    <el-select v-if="itemChild.type === 'select'" v-model="itemChild.value" placeholder="请选择"
+                <div v-for="( item , index ) in filterData" style="display: flex; margin-top: 15px;" >
+                    <el-select class="formItem" v-model="item.officeItem.value" @change="officeItemChange($event,index)" placeholder="请选择" style="width: 120px">
+                      <el-option 
+                        v-for="itemSon in item.officeItem.data" 
+                        :key="itemSon.value" 
+                        :label="itemSon.label"
+                        :value="itemSon.value" 
+                      />
+                    </el-select>
+                    <el-select class="formItem" v-model="item.relationItem.value" placeholder="请选择"
                       style="width: 120px">
-                      <el-option v-for="itemSon in itemChild.data" :key="itemSon.value" :label="itemSon.label"
+                      <el-option v-for="itemSon in item.relationItem.data" :key="itemSon.value" :label="itemSon.label"
                         :value="itemSon.value" />
                     </el-select>
-                    <el-input v-if="itemChild.type === 'input'" v-model="itemChild.value" style="width: 120px"
+                    <el-select class="formItem" v-model="item.numberItem.value" v-if="item.numberItem.type ==='select'" placeholder="请选择" style="width: 120px">
+                      <el-option v-for="itemSon in item.numberItem.data" :key="itemSon.value" 
+                      :label="itemSon.name"
+                      :value="itemSon.value" />
+                    </el-select>
+                    <el-input class="formItem" v-model="item.numberItem.value" v-if="item.numberItem.type ==='input'"  style="width: 120px"
                       placeholder="请输入" />
-
-                  </div>
+                      
+                </div>
+                <div class="filterIcon">
+                  <el-button :icon="Plus" circle @click="filterAddItem" />
+                  <el-button :icon="Minus" circle @click="filterMinuItem" v-if="filterData.length > 1"/>
                 </div>
+                
               </div>
             </div>
           </el-col>
         </el-row>
       </el-card>
       <div style="width: 100%; height: 50px;"></div>
-      <div class="box-btns" v-if="planId">
+      <div class="box-btns" v-if="!planId">
         <el-button style="margin-right: 30px;" type="primary" @click="handleConfirmClick">确 定</el-button>
       </div>
 
     </div>
     <el-dialog v-model="centerDialogVisibleQues" title="问卷信息" align-center width="30%" :modal="true" :show-close="true">
       <el-form-item label="链接：" label-width="150px">
-        <el-radio-group v-model="quesRadio1">
-          <el-radio label="1">无</el-radio>
-          <el-radio label="2">固定</el-radio>
-          <el-radio label="3">每日</el-radio>
+        <el-radio-group v-model="messageType">
+          <el-radio label="1">问卷</el-radio>
+          <el-radio label="2">远程链接</el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="" label-width="150px">
+      <el-form-item  label-width="150px" v-if="messageType === '1'">
+        <el-select v-model="questionnaire" placeholder="请选择模版" style="width: 240px">
+          <el-option v-for="item in questionnaireData" :key="item.value" :label="item.title" :value="item.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label-width="150px" v-if="messageType === '2'">
         <el-input v-model="quesIput" placeholder="请输入链接"></el-input>
       </el-form-item>
       <div style="text-align: center; margin: 0 auto;">
-        <el-button type="primary">确定</el-button>
+        <el-button type="primary" @click= "centerDialogVisibleQues = false">确定</el-button>
       </div>
     </el-dialog>
+    <el-dialog
+      v-model="centerDialogVisibleAddWorkorder"
+      title="新增坐席"
+      center
+      width="50%"
+      :modal="true"
+      :show-close="true"
+    >
+    <el-form-item label="请选择坐席" label-width="200px">
+      <el-select
+        v-model="seatSelectvalue"
+        multiple
+        filterable
+        remote
+        reserve-keyword
+        placeholder="Please enter a keyword"
+        :remote-method="remoteMethod"
+        :loading="loading"
+        style="width: 240px"
+      >
+        <el-option
+          v-for="item in rangeSeatData"
+          :key="item.value"
+          :label="item.title"
+          :value="item.value"
+        />
+      </el-select>
+    </el-form-item>
+    <div style="text-align: center;">
+      <el-button style="margin-right: 30px;" type="primary" @click="handleSeatTrue">确 定</el-button>
+    </div>
+    </el-dialog>
   </div>
 </template>
 
 <script setup>
+  import {
+    Plus,
+    Minus
+} from '@element-plus/icons-vue'
+import moment from 'moment';
 import PageAdd from '@/components/page-add';
 import seatList from './cpns/seatList/seatList';
 import patientList from './cpns/patientList/patientList';
 import { modalConfig } from './config/modal.config';
 import { usePageModal } from '@/hooks/use-page-add';
 import useSelectStore from '@/store/commonSelect/common';
-import { createPageData, editPageData } from '@/api/main/system/system';
-import { onMounted, ref, watch } from 'vue';
+import { createPageData, editPageData,getPageListData } from '@/api/main/system/system';
 
+import { 
+  followType,followWay,followExecution,allotMode,repetitionMode,
+  matchMode,periodData,patientsData } from "@/utils/commonDic.js";
 
-const { proxy } = getCurrentInstance();
-
-const formData = ref({});
-const workBasicData = ref({});
-const callId = ref({});
-const planId = ref('')
-const selectValue = ref('')
-const selectValue2 = ref('')
-const selectValue3 = ref('筛选')
-const selectValue4 = ref('')
-const dataValue1 = ref('')
-const dataRadio1 = ref('1')
-const dataNum1 = ref(1)
-
-const filterData = ref([
-  [{
-    type: 'select',
-    data: [{
-      value: '1',
-      label: '1',
-    },
-    {
-      value: '2',
-      label: '2',
-    }
-    ],
-    value: '1'
-  }, {
-    type: 'input',
-    data: [{
-      value: '1',
-      label: '1',
-    },
-    {
-      value: '2',
-      label: '2',
-    }
-    ],
-    value: '2'
-  }, {
-    type: 'select',
-    data: [{
-      value: '1',
-      label: '1',
-    },
-    {
-      value: '2',
-      label: '2',
-    }
-    ],
-    value: '2'
-  }],
-  [{
-    type: 'select',
-    data: [{
-      value: '1',
-      label: '1',
-    },
-    {
-      value: '2',
-      label: '2',
-    }
-    ],
-    value: '2'
-  }, {
-    type: 'select',
-    data: [{
-      value: '1',
-      label: '1',
-    },
-    {
-      value: '2',
-      label: '2',
-    }
-    ],
-    value: '2'
-  }, {
-    type: 'input',
-    value: '2'
-  }]
-])
-const selectOptions = [
-  {
-    value: '问卷模版1',
-    label: '问卷模版1',
-  },
-  {
-    value: '问卷模版2',
-    label: '问卷模版2',
-  },
-  {
-    value: '问卷模版3',
-    label: '问卷模版3',
-  }
-]
-const selectOptions11 = [
-  {
-    value: '短信模版1',
-    label: '短信模版1',
-  },
-  {
-    value: '短信模版2',
-    label: '短信模版2',
-  },
-  {
-    value: '短信模版2',
-    label: '短信模版2',
-  }
-]
-const selectOptions2 = [
-  {
-    value: '不去重',
-    label: '不去重',
-  },
-  {
-    value: '全部不重复',
-    label: '全部不重复',
-  },
-  {
-    value: '计划不重复',
-    label: '计划不重复',
-  }
-]
-
-const centerDialogVisibleQues = ref(false)
-const quesIput = ref('1')
-const quesRadio1 = ref('1')
-function changeSelect3(data) {
-  console.log(data)
-}
-const selectOptions3 = [
-  {
-    value: '导入',
-    label: '导入',
-  },
-  {
-    value: '筛选',
-    label: '筛选',
-  }
-]
-const tableData = [
-  {
-    date: '2016-05-03',
-    name: 'Tom',
-    state: 'California',
-    city: 'Los Angeles',
-    address: 'No. 189, Grove St, Los Angeles',
-    zip: 'CA 90036',
-    tag: 'Home',
-  },
-  {
-    date: '2016-05-02',
-    name: 'Tom',
-    state: 'California',
-    city: 'Los Angeles',
-    address: 'No. 189, Grove St, Los Angeles',
-    zip: 'CA 90036',
-    tag: 'Office',
-  },
-  {
-    date: '2016-05-04',
-    name: 'Tom',
-    state: 'California',
-    city: 'Los Angeles',
-    address: 'No. 189, Grove St, Los Angeles',
-    zip: 'CA 90036',
-    tag: 'Home',
-  },
-  {
-    date: '2016-05-01',
-    name: 'Tom',
-    state: 'California',
-    city: 'Los Angeles',
-    address: 'No. 189, Grove St, Los Angeles',
-    zip: 'CA 90036',
-    tag: 'Office',
-  },
-]
+import { onMounted, ref, watch } from 'vue';
 const props = defineProps({
   getDefaultInfo: {
     type: Object,
@@ -355,30 +267,128 @@ watch(props, (nweProps) => {
   planId.value = nweProps.planId
   initMethod(nweProps);
 });
+
+const { proxy } = getCurrentInstance();
+const planId = ref('')
+const loading = ref(false)
+const seatSelectvalue = ref()
+const rangeSeatData = ref([])
+const seatData =  ref([]) 
+const seatDataList = ref([])
+const seatValue = ref()
+const seatListData = ref([])
+const seatResultData = ref([])
+const filterOfficeData = ref([])
+const filterObjData = ref({
+    officeItem:{
+      type: 'select',
+      data: [],
+      value: ''
+    },
+    relationItem:{
+      type: 'select',
+      data: [],
+      value: ''
+    },
+    numberItem: {
+      type: 'input',
+      value: ''
+    }
+})
+const filterLongData = ref([])
+const filterData = ref([])
+
+
+const formData = ref({});
+const workBasicData = ref({});
+const questionnaire = ref('') // 问卷模版id
+const message = ref('') // 短信模版id
+const quesIput = ref('1') // 链接
+const messageType = ref('1') // 短信模版问卷id
+const allocation = ref('') // 分配方式 
+
+const deduplication = ref('') // 去重方式
+const matchingMethod = ref('2') // 匹配方式
+const cycle = ref('') // 周期
+const executionTime = ref('') // 时间
+const patientsNumRule = ref('1') // 患者规则
+const patientsNum = ref(1)  // 患者数量
+const filterResultData = ref([])
+
+const questionnaireData = useSelectStore().questionnaireData
+const smsData = useSelectStore().templateNameListData
+
+const centerDialogVisibleQues = ref(false)
+function changeSelect3(data) {
+  console.log(data)
+}
 onMounted(() => {
-  workBasicData.value.source = '电话'
+  workBasicData.value.way = '1'
   initMethod(props);
 });
-
 function initMethod(data) {
-  console.log(data)
+  getFilterList()
+  getSeatList()
+  seatData.value = useSelectStore().userListData
+}
+const centerDialogVisibleAddWorkorder = ref(false);
+const onAddItem = () => {
+  seatSelectvalue.value = []
+  centerDialogVisibleAddWorkorder.value = true;
+}
+function handleSeatTrue() {
+  centerDialogVisibleAddWorkorder.value = false;
+  console.log(seatSelectvalue.value)
+  console.log(seatDataList.value);
+  seatDataList.value.forEach(element => {
+    const obj = {}
+    obj.username = element.nickName
+    obj.usercode = element.userName
+    // obj.userdept = element.dept ?element.dept.deptName:''
+    obj.proportion = ''
+    if (seatSelectvalue.value.indexOf(obj.usercode)!=-1) {
+      seatResultData.value.push(obj)
+      // obj.userdept = element.dept ?element.dept.deptName:''
+      seatListData.value.push(obj)
+     
+    }
+    
+  });
+  console.log(seatListData.value)
+
+}
+const remoteMethod = (query) => {
+  if (query) {
+    loading.value = true
+    setTimeout(() => {
+      loading.value = false
+      rangeSeatData.value = seatData.value.filter((item) => {
+        return item.title.toLowerCase().includes(query.toLowerCase())
+      })
+    }, 200)
+  } else {
+    rangeSeatData.value = []
+  }
 }
 function questionHandle() {
-  console.log("问卷")
   centerDialogVisibleQues.value = true
 }
 const modalConfigRef = computed(() => {
-  //  来源
-  const processorSourceItem = modalConfig.formItems.find((item) => item.field === 'source');
-  processorSourceItem.options = useSelectStore().dictSourceList;
-
-
+  //  随访类型
+  const processorTypeItem = modalConfig.formItems.find((item) => item.field === 'type');
+  processorTypeItem.options = followType;
+  //  随访方式
+  const processorwayItem = modalConfig.formItems.find((item) => item.field === 'way');
+  processorwayItem.options = followWay;
+  //  随访方式
+  const processorExecutionItem = modalConfig.formItems.find((item) => item.field === 'executionMethod');
+  processorExecutionItem.options = followExecution;
+  
   return modalConfig;
 });
 
 // 工单基础信息
 const getWorkBasicData = (item) => {
-
   workBasicData.value = item;
   console.log(workBasicData.value)
 };
@@ -388,22 +398,122 @@ defineExpose({
 const handleConfirmClick = () => {
   pageModalRef.value.formRef.ruleFormRef.validate((bool) => {
     if (bool) {
-      if (JSON.stringify(props.getDefaultInfo) !== '{}') {
-        formData.value.workorderId = props.getDefaultInfo.workorderId;
-        editPageData('/order/workorder', formData.value).then((data) => {
-          proxy.$modal.msgSuccess('编辑成功！');
-        });
-      } else {
-        let creatUrl = '/order/workorder';
-        creatUrl = '/order/workorder?callid=' + callId.value;
-        createPageData(creatUrl, formData.value).then((data) => {
-          proxy.$modal.msgSuccess('新增成功！');
-        });
-      }
+      handleFilter()
+      formData.value = workBasicData.value
+      formData.value.beginEffective = moment(workBasicData.value.indate[0]).format('YYYY-MM-DD HH:mm:ss')
+      formData.value.endEffective = moment(workBasicData.value.indate[1]).format('YYYY-MM-DD HH:mm:ss')
+      delete formData.value.indate
+      formData.value.questionnaire = questionnaire.value
+      formData.value.message = message.value
+      formData.value.messageType = messageType.value
+      formData.value.messageParameter =  messageType.value==='1' ? questionnaire.value : quesIput.value
+      formData.value.allocation = allocation.value
+      formData.value.seats = seatResultData.value //seatResultData.value
+      formData.value.deduplication = deduplication.value
+      formData.value.matchingMethod = matchingMethod.value
+      formData.value.cycle = cycle.value
+      formData.value.executionTime = moment(executionTime.value).format('HH:mm:ss') 
+      formData.value.patientsNumRule =patientsNumRule.value
+      formData.value.patientsNum = patientsNum.value
+      formData.value.screen = JSON.stringify(filterResultData.value)
+      console.log(formData.value)
+      createPageData('/SfPlan/sfPlan', formData.value).then((data) => {
+            proxy.$modal.msgSuccess('新增成功！');
+      })
+      // editPageData('/order/workorder', formData.value).then((data) => {})
     }
   });
 };
 
+
+const editIndex = ref(-1)
+const handleEdit = (row) => {
+  editIndex.value = seatListData.value.indexOf(row)
+}
+const handleSave = () => {
+  editIndex.value = -1
+  console.log(seatListData.value)
+}
+const handleDelete = (row) => {
+  seatListData.value.splice(seatListData.value.indexOf(row), 1)
+}
+const props2 = {
+  multiple: true,
+  checkStrictly: true,
+}
+function getSeatList() {
+  getPageListData('/system/user').then((res)=>{
+    seatDataList.value = res.data
+  })
+}
+function filterAddItem() {
+  
+  const newObj = {
+      officeItem:{
+        type: 'select',
+        data: filterOfficeData.value,
+        value: ''
+      },
+      relationItem:{
+        type: 'select',
+        data: [],
+        value: ''
+      },
+      numberItem: {
+        type: 'input',
+        value: ''
+      }
+  }
+  filterData.value.push(newObj) 
+}
+function filterMinuItem() {
+  filterData.value.pop()
+}
+function handleFilter() {
+  console.log(filterData.value); 
+  filterResultData.value = [] 
+  filterData.value.forEach(ele => {
+    const obj = {}
+    obj.field = ele.officeItem.value
+    obj.operate = ele.relationItem.value
+    obj.value = ele.numberItem.value
+    filterResultData.value.push(obj)
+  });
+  console.log(JSON.stringify(filterResultData.value));
+}
+function officeItemChange(value,index) {
+  console.log(value,index);
+  filterLongData.value.forEach(ele => {
+    if (ele.field.value === value) {
+      filterData.value[index].relationItem.data = ele.operate
+      if (ele.value) {
+        filterData.value[index].numberItem.type = 'select'
+        filterData.value[index].numberItem.data = ele.value
+      } else{
+        filterData.value[index].numberItem.type = 'input'
+      }
+    }
+  });
+}
+function getFilterList() {
+  getPageListData('/SfPlan/sfPlan/option').then((res)=>{
+    console.log(res);
+    if (res.data.length>0) {
+      filterLongData.value = res.data
+      res.data.forEach(ele => {
+        const obj = {
+          value:ele.field.value,
+          label:ele.field.name,
+        }
+        filterObjData.value.officeItem.data.push(obj)
+        filterOfficeData.value.push(obj)
+      });
+      filterData.value.push(filterObjData.value)
+    }
+   console.log(filterData.value);
+  })
+}
+
 // 1.处理逻辑
 const newCallback = () => { };
 const editCallback = () => { };
@@ -463,6 +573,14 @@ const [pageModalRef, defaultInfo] = usePageModal(newCallback, editCallback);
 }
 
 .questionBox {
-  width: 100%;
+  width: 400px;
+  .filterIcon{
+    position: absolute;
+    right: -70px;
+    bottom: 0px;
+  }
+  .formItem{
+    margin-right: 8px;
+  }
 }
 </style>

CMS1.0/src/views/main/followUp/addFollowUpPlan/config/modal.config.js

@@ -1,18 +1,18 @@
+import moment from 'moment';
 import { rules } from './account-config'
 
 export const modalConfig = {
   formItems: [
     {
       required : true ,
-      field: 'caller',
+      field: 'name',
       type: 'input',
       label: '计划名称',
       placeholder: '请输入计划名称'
     },
     {
       required : true ,
-      field: 'source',
-      prop: 'source',
+      field: 'type',
       type: 'select',
       label: '随访类型',
       placeholder: '请选择随访类型',
@@ -20,41 +20,32 @@ export const modalConfig = {
     },
     {
       required : true ,
-      field: 'source',
-      prop: 'source',
+      field: 'way',
       type: 'select',
       label: '随访方式',
       placeholder: '请选择随访方式',
-      options : [{
-        title:'电话',
-        value:'电话'
-      },{
-        title:'短信',
-        value:'短信'
-      }]
+      options : []
     },
     {
       required : true ,
-      field: 'source',
-      prop: 'source',
+      field: 'executionMethod',
       type: 'select',
       label: '执行方式',
       placeholder: '请选择来源',
       options : []
     },
     {
-      field: 'pulmonaryNoduleTime', //string
+      field: 'indate', //string
       type: 'datepicker',
-      label: '有效期',
+      label: '有效期', 
       otherOptions: {
         'range-separator': '至',
         type: 'datetimerange',
-        'value-format': 'YYYY-MM-DD',
+        'value-format': 'YYYY-MM-DD HH:mm:ss',
       }
     },
     {
-      field: 'content',
-      prop: 'content',
+      field: 'describes',
       type: 'textarea',
       colLayout: { span: 16 },
       label: '描述',

CMS1.0/src/views/main/followUp/addFollowUpPlan/cpns/seatList/seatList.vue

@@ -48,15 +48,9 @@
 </template>
 
 <script setup>
-import { usePageModal } from '@/hooks/use-page-add';
-import useSelectStore from '@/store/commonSelect/common';
-import { createPageData, editPageData } from '@/api/main/system/system';
 import { onMounted, ref, watch } from 'vue';
 
 const { proxy } = getCurrentInstance();
-const formData = ref({});
-const workBasicData = ref({});
-const callId = ref({});
 const centerDialogVisibleAddWorkorder = ref(false);
 const onAddItem = () => {
   console.log('新增')
@@ -108,16 +102,7 @@ const props = defineProps({
     default: () => ({}),
   }
 });
-watch(props, (nweProps) => {
-  initMethod(nweProps);
-});
-onMounted(() => {
-  initMethod(props);
-});
 
-function initMethod(data) {
-  console.log(data)
-}
 const props2 = {
   multiple: true,
   checkStrictly: true,
@@ -391,4 +376,5 @@ const options = [
     ],
   },
 ]
+
 </script>

CMS1.0/src/views/main/workflow/form/form.vue

@@ -28,7 +28,7 @@ import { defineComponent, ref } from 'vue'
 import PageSearch from '@/components/page-search'
 import PageContent from '@/components/page-content'
 import PageModal from '@/components/page-modal'
-import FormDetail from '@/views/tool/form-detail'
+import FormDetail from '@/tool/form-detail'
 
 import { searchFormConfig } from './config/search.config'
 import { contentTableConfig } from './config/content.config'