From b734890015ea3b6870969e7bc6637a2481ed4bd9 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期四, 24 八月 2023 10:15:23 +0800
Subject: [PATCH] Merge branch 'DeBug' of http://116.62.18.175:6699/r/~yxh/smartor-web into yxh01
---
src/views/followvisit/tasklist/FollowupDetails/index.vue | 313 +++++++++++++++++----------------------------------
1 files changed, 105 insertions(+), 208 deletions(-)
diff --git a/src/views/followvisit/tasklist/FollowupDetails/index.vue b/src/views/followvisit/tasklist/FollowupDetails/index.vue
index 59d944c..b480e12 100644
--- a/src/views/followvisit/tasklist/FollowupDetails/index.vue
+++ b/src/views/followvisit/tasklist/FollowupDetails/index.vue
@@ -88,179 +88,7 @@
}}</el-button>
<el-button @click="resetForm('ruleForm')">閲嶇疆</el-button>
</div>
- <!-- 闂嵎璁剧疆 -->
- <!-- <div v-if="Editprogress == 2">
- <div class="leftvlue-jbxx">
- <div class="examine-jic">
- <div class="headline">鏂规璁剧疆</div>
- <div class="jic-value">
- <el-form ref="form" :model="form" label-width="105px">
- <el-form-item label="鎮ｈ�呮潵婧�">
- <el-select v-model="form.region" placeholder="璇烽�夋嫨娲诲姩鍖哄煙">
- <el-option label="鍖哄煙涓�" value="shanghai"></el-option>
- <el-option label="鍖哄煙浜�" value="beijing"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鍑洪櫌绉戝" prop="desc">
- <el-cascader
- class="demo-cascader"
- placeholder="鍖呭惈"
- v-model="form.templatevalue"
- :options="options"
- :props="{ expandTrigger: 'hover' }"
- ></el-cascader>
- <el-select v-model="form.data2" placeholder="璇烽�夋嫨閫傜敤绉戝">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鍑洪櫌鐥呭尯" prop="desc">
- <el-cascader
- class="demo-cascader"
- placeholder="涓嶅寘鍚�"
- v-model="form.templatevalue"
- :options="options"
- :props="{ expandTrigger: 'hover' }"
- ></el-cascader>
- <el-select v-model="form.data2" placeholder="璇烽�夋嫨閫傜敤绉戝">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鎮ｈ�呮潵婧�" prop="desc">
- <el-cascader
- class="demo-cascader"
- placeholder="鍖呭惈"
- v-model="form.templatevalue"
- :options="options"
- :props="{ expandTrigger: 'hover' }"
- ></el-cascader>
- <el-select v-model="form.data2" placeholder="璇烽�夋嫨閫傜敤绉戝">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="灏辫瘖绉戝" prop="desc">
- <el-cascader
- class="demo-cascader"
- placeholder="鍖呭惈"
- v-model="form.templatevalue"
- :options="options"
- :props="{ expandTrigger: 'hover' }"
- ></el-cascader>
- <el-select v-model="form.data2" placeholder="璇烽�夋嫨閫傜敤绉戝">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="閲嶅璁″垝澶勭悊:">
- <el-radio-group v-model="form.resource">
- <el-radio label="鏂拌鍒掕嚜鍔ㄧ粨妗�"></el-radio>
- <el-radio label="鍘熻鍒掕嚜鍔ㄧ粨妗�"></el-radio>
- </el-radio-group>
- </el-form-item>
- <el-form-item label="杩囨湡浠诲姟澶勭悊:">
- <el-radio-group v-model="form.resource">
- <el-radio label="鑷姩鍏抽棴"></el-radio>
- <el-radio label="鑷姩鎵ц"></el-radio>
- <el-radio label="浜哄伐澶勭悊"></el-radio>
- </el-radio-group>
- </el-form-item>
- <el-form-item label="鎵�鏈変换鍔″畬鎴愯嚜鍔ㄧ粨妗�:" label-width="158px">
- <el-radio-group v-model="form.resource">
- <el-radio label="鏄�"></el-radio>
- <el-radio label="鍚�"></el-radio>
- </el-radio-group>
- </el-form-item>
- <el-form-item label="">
- <el-row gutter="5">
- <el-col :span="8"
- ><el-select v-model="form.value" placeholder="璇烽�夋嫨鑷姩缁撴鏂瑰紡">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option> </el-select
- ></el-col>
- </el-row>
- <el-row gutter="5">
- <el-col :span="6"
- ><el-select v-model="form.value" placeholder="璇烽�夋嫨鎮ｈ�呯姸鎬�">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option> </el-select
- ></el-col>
- <el-col :span="6"
- ><el-select v-model="form.value" placeholder="璇烽�夋嫨">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option> </el-select
- ></el-col>
- </el-row>
- <el-row type="flex" gutter="5">
- <el-col :span="6"
- ><el-select v-model="form.value" placeholder="璇烽�夋嫨">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option> </el-select
- ></el-col>
- <el-col :span="6"
- ><el-select v-model="form.value" placeholder="璇烽�夋嫨">
- <el-option
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- >
- </el-option> </el-select
- ></el-col>
- </el-row>
- </el-form-item>
- </el-form>
- </div>
- </div>
- </div>
- <el-button type="primary" @click="laststep()">涓婁竴姝�</el-button>
- <el-button type="success" @click="submitForm('ruleForm')"
- >涓嬩竴姝�</el-button
- >
- <el-button @click="resetForm('ruleForm')">閲嶇疆</el-button>
- </div> -->
<!-- 浠诲姟璇︽儏 -->
<div v-if="Editprogress == 2">
<div class="leftvlue-jbxx">
@@ -410,7 +238,7 @@
></right-toolbar> -->
<el-table
v-loading="loading"
- :data="sonuserList"
+ :data="userList"
@selection-change="handleSelectionChange"
>
<el-table-column
@@ -815,7 +643,7 @@
<!--鐢ㄦ埛鏁版嵁-->
<el-form
- :model="topqueryParams"
+ :model="deliverytopqueryParams"
ref="queryForm"
size="small"
:inline="true"
@@ -823,12 +651,12 @@
label-width="98px"
>
<el-form-item label="浠诲姟鍚嶇О">
- <el-input v-model="topqueryParams.name"></el-input>
+ <el-input v-model="deliverytopqueryParams.name"></el-input>
</el-form-item>
<el-form-item label="浠诲姟绫诲瀷" prop="status">
<el-select
- v-model="topqueryParams.topic"
+ v-model="deliverytopqueryParams.topic"
placeholder="璇烽�夋嫨"
>
<el-option
@@ -843,7 +671,7 @@
<el-form-item label="浠诲姟鐘舵��" prop="status">
<el-select
- v-model="topqueryParams.topic"
+ v-model="deliverytopqueryParams.topic"
placeholder="璇烽�夋嫨"
>
<el-option
@@ -934,11 +762,11 @@
prop="topicnumber"
width="120"
:show-overflow-tooltip="true"
- >
- <template slot-scope="scope">
+ />
+ <!-- <template slot-scope="scope">
<div>鎵ц瀹屾垚/鎵ц澶辫触</div>
</template>
- </el-table-column>
+ </el-table-column> -->
<el-table-column
label="鎿嶄綔"
align="center"
@@ -987,6 +815,13 @@
</el-table-column>
</el-table>
</el-row>
+ <pagination
+ v-show="sontotal > 0"
+ :total="sontotal"
+ :page.sync="deliverytopqueryParams.pageNum"
+ :limit.sync="deliverytopqueryParams.pageSize"
+ @pagination="handleAdd"
+ />
</div>
</div>
</div>
@@ -1010,7 +845,7 @@
<el-row :gutter="20">
<!--鐢ㄦ埛鏁版嵁-->
<el-form
- :model="topqueryParams"
+ :model="patientqueryParams"
ref="queryForm"
size="small"
:inline="true"
@@ -1018,10 +853,13 @@
label-width="98px"
>
<el-form-item label="鎮ｈ�呭悕绉帮細">
- <el-input v-model="topqueryParams.name"></el-input>
+ <el-input v-model="patientqueryParams.name"></el-input>
</el-form-item>
<el-form-item label="鎮ｈ�呮潵婧�" prop="status">
- <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨">
+ <el-select
+ v-model="patientqueryParams.topic"
+ placeholder="璇烽�夋嫨"
+ >
<el-option
v-for="item in topicoptions"
:key="item.value"
@@ -1032,7 +870,10 @@
</el-select>
</el-form-item>
<el-form-item label="鍑洪櫌绉戝" prop="status">
- <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨">
+ <el-select
+ v-model="patientqueryParams.topic"
+ placeholder="璇烽�夋嫨"
+ >
<el-option
v-for="item in topicoptions"
:key="item.value"
@@ -1044,7 +885,10 @@
</el-form-item>
<el-form-item label="鍑洪櫌鐥呭尯" prop="status">
- <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨">
+ <el-select
+ v-model="patientqueryParams.topic"
+ placeholder="璇烽�夋嫨"
+ >
<el-option
v-for="item in topicoptions"
:key="item.value"
@@ -1072,45 +916,41 @@
</el-form>
<el-table
- v-loading="loading"
- :data="userList"
+ v-loading="patientloading"
+ :data="patientuserList"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="50" align="center" />
<el-table-column
label="搴忓彿"
align="center"
- key="userId"
- prop="userId"
+ key="patid"
+ prop="patid"
/>
<el-table-column
label="鎮ｈ�呭悕绉�"
align="center"
sortable
- key="userName"
- prop="userName"
+ key="name"
+ prop="name"
:show-overflow-tooltip="true"
/>
<el-table-column
- label="鍏ラ櫌鏃ユ湡"
+ label="鎮ｈ�呮潵婧�"
align="center"
- key="nickName"
- prop="nickName"
+ key="source"
+ prop="source"
/>
<el-table-column
- label="鎵ц鐘舵��"
+ label="鎵嬫満鍙风爜"
align="center"
- key="topicnumber"
- prop="topicnumber"
+ key="telcode"
+ prop="telcode"
width="120"
:show-overflow-tooltip="true"
- >
- <template slot-scope="scope">
- <div>鎵ц瀹屾垚/鎵ц澶辫触</div>
- </template>
- </el-table-column>
+ />
<el-table-column
label="浠诲姟璇︽儏"
@@ -1142,11 +982,18 @@
</el-table-column>
</el-table>
</el-row>
+ <pagination
+ v-show="patienttotal > 0"
+ :total="patienttotal"
+ :page.sync="patientqueryParams.pageNum"
+ :limit.sync="patientqueryParams.pageSize"
+ @pagination="handleAddpatient"
+ />
</div>
</div>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisiblepatient = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="dialogVisiblepatient = false"
+ <el-button type="primary" @click="AddDispatchpatients"
>纭畾娣诲姞</el-button
>
</span>
@@ -1161,19 +1008,36 @@
addsvr_prjtask,
updatesvr_prjtask,
delsvr_prjtask,
+ Addpatienttask,
} from "@/api/smartorpor/svr_prjtask";
+import { listpat_archive } from "@/api/smartorpor/pat_archive";
+import { listsvr_prjtaskline } from "@/api/smartorpor/svr_prjtaskline";
export default {
data() {
return {
Editprogress: 2, //缂栬緫杩涘害
loading: false, // 閬僵灞�
+ patientloading: false, // 閬僵灞�
dialogVisible: false, //浠诲姟璇︽儏寮规
dialogVisiblepatient: false, //娣诲姞鎮ｈ�呭脊妗�
- topqueryParams: {},
+ topqueryParams: {
+ pageNum: 1, //
+ pageSize: 10,
+ },
+ deliverytopqueryParams: {
+ pageNum: 1, //
+ pageSize: 10,
+ },
+ patientqueryParams: {
+ pageNum: 1, //
+ pageSize: 10,
+ },
topicoptions: [],
showSearch: true, //
total: 0, //
+ sontotal: 0, //
+ patienttotal: 0, //
// 閫変腑鏁扮粍
ids: [],
// 闈炲崟涓鐢�
@@ -1182,6 +1046,7 @@
multiple: true,
// 鐢ㄦ埛琛ㄦ牸鏁版嵁
userList: null,
+ patientuserList: null,
sonuserList: null,
form: {
name: "",
@@ -1240,16 +1105,35 @@
// }
// });
},
+ // 瀛愪换鍔′竴绾у脊妗�
handleAdd() {
+ listsvr_prjtaskline(this.deliverytopqueryParams).then((response) => {
+ console.log(response);
+ this.sonuserList = response.rows;
+ this.sontotal = response.total;
+ this.loading = false;
+ });
this.dialogVisible = true;
},
+ // 瀛愪换鍔′簩绾у脊妗�
handleAddpatient() {
+ listpat_archive(this.patientqueryParams).then((response) => {
+ console.log(response);
+ this.patientuserList = response.rows;
+ this.patienttotal = response.total;
+ this.loading = false;
+ });
this.dialogVisiblepatient = true;
},
handleUpdate() {},
handleDelete() {},
handleExport() {},
- handleSelectionChange() {},
+ // 澶氶�夋閫変腑鏁版嵁
+ handleSelectionChange(selection) {
+ this.ids = selection.map((item) => item.patid).join(",");
+ // let result = this.ids.join(",");
+ console.log(this.ids);
+ },
getList() {},
handleQuery() {},
resetQuery() {},
@@ -1275,10 +1159,21 @@
// 鏂板瀛愪换鍔�
Addsubtask() {
this.topqueryParams.pguid = 2;
- addsvr_prjtask(this.topqueryParams).then((res) => {
+ // addsvr_prjtask(this.topqueryParams).then((res) => {
+ // console.log(res);
+ // });
+ },
+ // 鏂板娲鹃�佹偅鑰�
+ AddDispatchpatients() {
+ let objictpint = {};
+ objictpint.patientes = this.ids;
+ objictpint.pguid = 2;
+ Addpatienttask(objictpint).then((res) => {
console.log(res);
});
+ this.dialogVisiblepatient = false;
},
+
// 鏌ヨ瀛愪换鍔″垪琛�
Getsubtask() {
this.topqueryParams.pguid = 2;
@@ -1286,10 +1181,12 @@
// this.topqueryParams.pid = this.$route.query.id;
// console.log(this.topqueryParams.pid);
listsvr_prjtask(this.topqueryParams).then((res) => {
- this.sonuserList = res.rows;
- console.log(this.sonuserList);
+ this.userList = res.rows;
+ this.total = res.total;
+ console.log(this.userList);
});
},
+ /** 鏌ヨ鎮ｈ�呭垪琛� */
},
};
</script>
--
Gitblit v1.9.3