From 09b701d290094291e877b2cfb601db7da267d6b9 Mon Sep 17 00:00:00 2001 From: WXL <1785969728@qq.com> Date: 星期三, 21 八月 2024 18:55:47 +0800 Subject: [PATCH] 测试完成 --- src/views/outsideChainxj.vue | 4 - src/views/patient/propaganda/index.vue | 7 + src/views/knowledge/questionnaire/compilequer/index.vue | 4 + src/views/knowledge/education/index.vue | 3 + src/views/knowledge/education/compilequer/index.vue | 2 src/views/patient/propaganda/Missioncreation.vue | 138 ++++++++++++++++------------------------------ 6 files changed, 61 insertions(+), 97 deletions(-) diff --git a/src/views/knowledge/education/compilequer/index.vue b/src/views/knowledge/education/compilequer/index.vue index 8e0f833..dae4b40 100644 --- a/src/views/knowledge/education/compilequer/index.vue +++ b/src/views/knowledge/education/compilequer/index.vue @@ -589,7 +589,7 @@ }); } // 瀹f暀鍒嗙被 - getheLibraryAssort({ hetype: 2 }).then((res) => { + getheLibraryAssort({}).then((res) => { this.sortlist = res.rows; console.log(this.sortlist); }); diff --git a/src/views/knowledge/education/index.vue b/src/views/knowledge/education/index.vue index ec87876..c70696b 100644 --- a/src/views/knowledge/education/index.vue +++ b/src/views/knowledge/education/index.vue @@ -183,6 +183,7 @@ label="鏍囬" fixed align="center" + width="150" key="preachname" prop="preachname" :show-overflow-tooltip="true" @@ -197,6 +198,7 @@ <el-table-column label="涓昏鍐呭" align="center" + width="260" key="preachcontent" prop="preachcontent" :show-overflow-tooltip="true" @@ -702,6 +704,7 @@ } else { return this.$modal.msgError("璇峰~鍐欏畬鏁翠俊鎭�"); } + this.classifyform.hetype = 1; addheLibraryAssort(this.classifyform).then((res) => { this.getDeptTree(); this.$modal.msgSuccess("鏂板鎴愬姛"); diff --git a/src/views/knowledge/questionnaire/compilequer/index.vue b/src/views/knowledge/questionnaire/compilequer/index.vue index 97fef32..6d02685 100644 --- a/src/views/knowledge/questionnaire/compilequer/index.vue +++ b/src/views/knowledge/questionnaire/compilequer/index.vue @@ -1360,7 +1360,9 @@ }); } else { this.ruleForm.isoperation = 1; - this.ruleForm.version = this.ruleForm.version ? ruleForm : "1.0"; + this.ruleForm.version = this.ruleForm.version + ? this.ruleForm.version + : "1.0"; compileQtemplate(this.ruleForm).then((res) => { this.$modal.msgSuccess("鏂板鎴愬姛"); this.confirmillness(res.data); diff --git a/src/views/outsideChainxj.vue b/src/views/outsideChainxj.vue index 88ba818..69d0601 100644 --- a/src/views/outsideChainxj.vue +++ b/src/views/outsideChainxj.vue @@ -70,9 +70,7 @@ // }); // 涓存椂鑾峰彇鏁版嵁 axios - .get( - "http://116.62.18.175:8096/profile/upload/show/鎸傚彿闇�鐭�/鎸傚彿闇�鐭�.html" - ) + .get("http://192.168.1.10:8095/profile/upload/show/娴嬭瘯/娴嬭瘯.html") .then((response) => { console.log(response.data, "鏁版嵁"); // 杈撳嚭鑾峰彇鍒扮殑鏂囦欢鍐呭 this.richText = response.data; diff --git a/src/views/patient/propaganda/Missioncreation.vue b/src/views/patient/propaganda/Missioncreation.vue index 7d38d9c..0e93042 100644 --- a/src/views/patient/propaganda/Missioncreation.vue +++ b/src/views/patient/propaganda/Missioncreation.vue @@ -464,96 +464,35 @@ label-width="98px" > <el-form-item - label="瀹f暀涓婚" + label="瀹f暀鍚嶇О" v-if="currenttype == 1 || currenttype == 8" > - <el-input v-model="topqueryParams.name"></el-input> + <el-input v-model="topqueryParams.preachname"></el-input> </el-form-item> - <el-form-item - label="瀹f暀鍚嶇О" - v-if="currenttype == 2 || currenttype == 3 || currenttype == 7" - > - <el-input - v-model="topqueryParams.name" - ></el-input> </el-form-item - ><el-form-item - label="閫氱煡鍚嶇О" - v-if="currenttype == 4 || currenttype == 5" - > - <el-input - v-model="topqueryParams.name" - ></el-input> </el-form-item - ><el-form-item label="浣撴濂楅" v-if="currenttype == 5"> - <el-input v-model="topqueryParams.name"></el-input> - </el-form-item> - <el-form-item label="闂嵎涓婚" v-if="currenttype == 6"> - <el-input v-model="topqueryParams.name"></el-input> - </el-form-item> - <el-form-item label="閫傜敤鐤剧梾" v-if="currenttype != 5"> - <el-input v-model="topqueryParams.name"></el-input> + <el-form-item label="瀹f暀鍒嗙被" prop="region"> + <el-select + v-model="topqueryParams.assortid" + size="medium" + filterable + placeholder="璇烽�夋嫨鍒嗙被" + > + <el-option-group + v-for="group in sortlist" + :key="group.id" + :label="group.assortname" + > + <el-option + v-for="item in group.heLibraryAssortList" + :key="item.id" + :label="item.assortname" + :value="item.id" + > + </el-option> + </el-option-group> + </el-select> </el-form-item> - <el-form-item - label="瀹f暀绫诲瀷" - prop="status" - v-if="currenttype == 1 || currenttype == 8" - > - <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨"> - <el-option - v-for="item in taskoptions" - :key="item.value" - :label="item.label" - :value="item.value" - > - </el-option> - </el-select> - </el-form-item> - <el-form-item - label="閫氱煡绫诲瀷" - prop="status" - v-if="currenttype == 4 || currenttype == 5" - > - <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨"> - <el-option - v-for="item in taskoptions" - :key="item.value" - :label="item.label" - :value="item.value" - > - </el-option> - </el-select> - </el-form-item> - <el-form-item - label="瀹f暀绫诲瀷" - prop="status" - v-if="currenttype == 2 || currenttype == 3 || currenttype == 7" - > - <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨"> - <el-option - v-for="item in taskoptions" - :key="item.value" - :label="item.label" - :value="item.value" - > - </el-option> - </el-select> - </el-form-item> - <el-form-item - label="闂嵎绫诲瀷" - prop="status" - v-if="currenttype == 6" - > - <el-select v-model="topqueryParams.topic" placeholder="璇烽�夋嫨"> - <el-option - v-for="item in taskoptions" - :key="item.value" - :label="item.label" - :value="item.value" - > - </el-option> - </el-select> - </el-form-item> - <el-form-item label="閫傜敤褰㈠紡" prop="status"> + <!-- <el-form-item label="閫傜敤褰㈠紡" prop="status"> <el-select v-model="topqueryParams.topica" placeholder="璇烽�夋嫨"> <el-option v-for="item in taskoptions" @@ -563,9 +502,9 @@ > </el-option> </el-select> - </el-form-item> + </el-form-item> --> - <el-form-item label="閫傜敤绉戝" prop="status"> + <!-- <el-form-item label="閫傜敤绉戝" prop="status"> <el-select v-model="topqueryParams.topicd" placeholder="璇烽�夋嫨"> <el-option v-for="item in topicoptions" @@ -575,13 +514,13 @@ > </el-option> </el-select> - </el-form-item> + </el-form-item> --> <el-form-item> <el-button type="primary" icon="el-icon-search" size="medium" - @click="handleQuery" + @click="Acquisitiontypeget" >鎼滅储</el-button > <el-button @@ -608,7 +547,7 @@ :total="total" :page.sync="topqueryParams.pageNum" :limit.sync="topqueryParams.pageSize" - @pagination="Acquisitiontype" + @pagination="Acquisitiontypeget" /> </el-row> </div> @@ -632,6 +571,7 @@ gethetaskinfo, delhetaskinfo, Editsingletask, + getheLibraryAssort, } from "@/api/AiCentre/index"; import { listDept } from "@/api/system/dept"; @@ -771,6 +711,7 @@ }, ], variableListTime: [], + sortlist: [], tasktopic: null, //鏂板绫诲瀷 SelectPatientslist: [], form: { @@ -807,6 +748,7 @@ this.listDept(); this.Acquisitiontype(); this.Getdetails(); + this.getheLibraryAssort(); }, methods: { @@ -837,6 +779,14 @@ result[item.name] = innerObj; }); return result; + }, + Acquisitiontypeget() { + console.log(2211); + + getlibrarylist(this.topqueryParams).then((response) => { + this.userList = response.rows; + this.total = response.total; + }); }, // 鑾峰彇褰撳墠绫诲瀷 Acquisitiontype() { @@ -967,6 +917,7 @@ this.richText = this.addStyleToImages(this.richText); }) .catch((error) => { + this.$modal.msgError("鑾峰彇瀵屾枃鏈け璐�"); console.error("Failed to fetch file:", error); }); }, @@ -1171,6 +1122,13 @@ }); } }, + getheLibraryAssort() { + // 瀹f暀鍒嗙被 + getheLibraryAssort({}).then((res) => { + this.sortlist = res.rows; + console.log(this.sortlist); + }); + }, // 鑾峰彇绉戝鍒楄〃 listDept() { listDept().then((res) => { diff --git a/src/views/patient/propaganda/index.vue b/src/views/patient/propaganda/index.vue index cb2e9bd..be8ce00 100644 --- a/src/views/patient/propaganda/index.vue +++ b/src/views/patient/propaganda/index.vue @@ -556,8 +556,11 @@ /** 鏂板鎸夐挳鎿嶄綔 */ handleAdd() { this.$router.push({ - path: "/followvisit/particty", - query: { type: 1 }, + path: "/followvisit/Missioncreation", + query: { + type: 1, + serviceType: 4, + }, }); }, /** 淇敼鎸夐挳鎿嶄綔 */ -- Gitblit v1.9.3