From 4e6c841dd09baff7fafb0e21fec36ee7faf61588 Mon Sep 17 00:00:00 2001 From: WXL <1785969728@qq.com> Date: 星期一, 09 九月 2024 15:01:41 +0800 Subject: [PATCH] 测试完成 --- src/views/patient/patient/physical.vue | 8 dist.zip | 0 src/views/complaint/complaintmy/index.vue | 2 vue.config.js | 6 src/views/system/dept/index.vue | 4 src/views/patient/patient/outpatient.vue | 4 src/views/patient/propaganda/QuestionnaireTask.vue | 126 ++++++++------- src/views/system/user/index.vue | 11 src/views/followvisit/record/detailpage/index.vue | 279 ++++++++++++++++++---------------- src/views/followvisit/satisfaction/particulars/index.vue | 6 src/views/outsideChainwt.vue | 8 src/views/patient/patient/hospital.vue | 4 src/views/patient/patient/behospitalized.vue | 4 src/views/patient/patient/profile/index.vue | 6 src/views/repositoryai/intention/index.vue | 3 src/api/AiCentre/external.js | 8 + 16 files changed, 253 insertions(+), 226 deletions(-) diff --git a/dist.zip b/dist.zip index a0407f6..07b2e2f 100644 --- a/dist.zip +++ b/dist.zip Binary files differ diff --git a/src/api/AiCentre/external.js b/src/api/AiCentre/external.js index 2c5b55d..aacc838 100644 --- a/src/api/AiCentre/external.js +++ b/src/api/AiCentre/external.js @@ -53,3 +53,11 @@ data: data }); } +// 鑾峰彇闂嵎锛堝唴锛� +export function getsearchrResults(data) { + return request({ + url: "/smartor/subtaskAnswer/selectPatQuestionResult", + method: "post", + data: data + }); +} diff --git a/src/views/complaint/complaintmy/index.vue b/src/views/complaint/complaintmy/index.vue index fcdc24c..0dc4681 100644 --- a/src/views/complaint/complaintmy/index.vue +++ b/src/views/complaint/complaintmy/index.vue @@ -230,7 +230,7 @@ <div style="margin-top: 15px"> <el-input placeholder="璇疯緭鍏ユ墜鏈哄彿" - v-model="form.input3" + v-model="form.telcode" class="input-with-select" > <el-button slot="append" icon="el-icon-search"></el-button> diff --git a/src/views/followvisit/record/detailpage/index.vue b/src/views/followvisit/record/detailpage/index.vue index 58ee792..d145d8a 100644 --- a/src/views/followvisit/record/detailpage/index.vue +++ b/src/views/followvisit/record/detailpage/index.vue @@ -3,23 +3,16 @@ <div class="Followupdetailspage"> <div class="Followuserinfo"> <div> - <div class="userinfo-text">{{ sendname }}<span>鎮h�呮湇鍔¤鎯呰鎯�</span> + <div class="userinfo-text"> + {{ sendname }}<span>鎮h�呮湇鍔¤鎯�</span> <!-- <el-button type="success">闅忚鍚庣煭淇�</el-button> --> </div> </div> <div> <el-table :data="logsheetlist" style="width: 100%"> - <el-table-column - prop="sendname" - align="center" - label="濮撳悕" - > + <el-table-column prop="sendname" align="center" label="濮撳悕"> </el-table-column> - <el-table-column - prop="sendstate" - align="center" - label="鏈嶅姟鐘舵��" - > + <el-table-column prop="sendstate" align="center" label="鏈嶅姟鐘舵��"> </el-table-column> <el-table-column prop="updateTime" @@ -29,8 +22,13 @@ show-overflow-tooltip > </el-table-column> - <el-table-column prop="taskName" align="center" width="200" - show-overflow-tooltip label="浠诲姟鍚嶇О"> + <el-table-column + prop="taskName" + align="center" + width="200" + show-overflow-tooltip + label="浠诲姟鍚嶇О" + > </el-table-column> <el-table-column prop="templatename" @@ -49,24 +47,24 @@ > </el-table-column> <el-table-column - label="鎿嶄綔" - fixed="right" - align="center" - width="200" - class-name="small-padding fixed-width" - > - <template slot-scope="scope"> - <el-button - size="medium" - type="text" - @click="Seedetails(scope.row)" - v-hasPermi="['system:user:edit']" - ><span class="button-zx" - ><i class="el-icon-s-order"></i>鏌ョ湅鏈嶅姟</span - ></el-button - > - </template> - </el-table-column> + label="鎿嶄綔" + fixed="right" + align="center" + width="200" + class-name="small-padding fixed-width" + > + <template slot-scope="scope"> + <el-button + size="medium" + type="text" + @click="Seedetails(scope.row)" + v-hasPermi="['system:user:edit']" + ><span class="button-zx" + ><i class="el-icon-s-order"></i>鏌ョ湅鏈嶅姟</span + ></el-button + > + </template> + </el-table-column> </el-table> </div> </div> @@ -77,78 +75,94 @@ ><i class="el-icon-notebook-1"></i> 闂嵎闅忚缁撴灉</span > <div class="CONTENT"> - <div class="title">{{ taskname ? taskname : "闂嵎" }}</div> - <div class="preview-left"> - <!-- 鍗曢�� --> - <div - class="topic-dev" - v-for="(item, index) in tableDatatop" - :key="item.aaa" - > - <div class="scriptTopic-dev" :key="index" v-if="item.scriptType == 1"> - <div class="dev-text"> - {{ index + 1 }}銆乕鍗曢�塢<span>{{ item.scriptContent }}</span> - </div> - <div class="dev-xx"> - <el-radio-group - v-model="item.scriptResult" - @change="handleOptionChange($event, index, item)" + <div class="title">{{ taskname ? taskname : "闂嵎" }}</div> + <div class="preview-left"> + <!-- 鍗曢�� --> + <div + class="topic-dev" + v-for="(item, index) in tableDatatop" + :key="item.aaa" > - <el-radio - v-for="(items, index) in item.svyLibTemplateTargetoptions" + <div + class="scriptTopic-dev" :key="index" - :label="items.optioncontent" - >{{ items.optioncontent }}</el-radio + v-if="item.scriptType == 1" > - </el-radio-group> - </div> - <div v-show="item.prompt"> - <el-alert :title="item.prompt" type="warning"> </el-alert> - </div> - </div> - <!-- 澶氶�� --> - <div class="scriptTopic-dev" :key="index" v-if="item.scriptType == 2"> - <div class="dev-text"> - {{ index + 1 }}銆乕澶氶�塢<span>{{ item.scriptContent }}</span> - </div> - <div class="dev-xx"> - <el-checkbox-group - v-model="item.scriptResult" - @change="updateScore($event, index, item)" - > - <el-checkbox - @change="$forceUpdate()" - v-for="(items, indexs) in item.svyLibTemplateTargetoptions" - :key="indexs" - :label="items.optioncontent" + <div class="dev-text"> + {{ index + 1 }}銆乕鍗曢�塢<span>{{ item.scriptContent }}</span> + </div> + <div class="dev-xx"> + <el-radio-group + v-model="item.scriptResult" + @change="handleOptionChange($event, index, item)" + > + <el-radio + v-for="( + items, index + ) in item.svyLibTemplateTargetoptions" + :key="index" + :label="items.optioncontent" + >{{ items.optioncontent }}</el-radio + > + </el-radio-group> + </div> + <div v-show="item.prompt"> + <el-alert :title="item.prompt" type="warning"> </el-alert> + </div> + </div> + <!-- 澶氶�� --> + <div + class="scriptTopic-dev" + :key="index" + v-if="item.scriptType == 2" > - {{ items.optioncontent }} - </el-checkbox> - </el-checkbox-group> - </div> - <div v-show="item.prompt && item.scriptResult[0]"> - <el-alert :title="item.prompt" type="warning"> </el-alert> + <div class="dev-text"> + {{ index + 1 }}銆乕澶氶�塢<span>{{ item.scriptContent }}</span> + </div> + <div class="dev-xx"> + <el-checkbox-group + v-model="item.scriptResult" + @change="updateScore($event, index, item)" + > + <el-checkbox + @change="$forceUpdate()" + v-for="( + items, indexs + ) in item.svyLibTemplateTargetoptions" + :key="indexs" + :label="items.optioncontent" + > + {{ items.optioncontent }} + </el-checkbox> + </el-checkbox-group> + </div> + <div v-show="item.prompt && item.scriptResult[0]"> + <el-alert :title="item.prompt" type="warning"> </el-alert> + </div> + </div> + <!-- 濉┖ --> + <div + class="scriptTopic-dev" + :key="index" + v-if="item.scriptType == 4" + > + <div class="dev-text"> + {{ index + 1 }}銆乕闂瓟]<span>{{ item.scriptContent }}</span> + </div> + <div class="dev-xx"> + <el-input + type="textarea" + :rows="2" + placeholder="璇疯緭鍏ョ瓟妗�" + v-model="item.scriptResult" + clearable + > + </el-input> + </div> + </div> + </div> </div> </div> - <!-- 濉┖ --> - <div class="scriptTopic-dev" :key="index" v-if="item.scriptType == 4"> - <div class="dev-text"> - {{ index + 1 }}銆乕闂瓟]<span>{{ item.scriptContent }}</span> - </div> - <div class="dev-xx"> - <el-input - type="textarea" - :rows="2" - placeholder="璇疯緭鍏ョ瓟妗�" - v-model="item.scriptResult" - clearable - > - </el-input> - </div> - </div> - </div> - </div> - </div> </el-tab-pane> <el-tab-pane> <span class="mulsz" slot="label" @@ -157,7 +171,8 @@ <div class="borderdiv"> <div> <div class="leftside"> - <i class="el-icon-phone-outline"></i><span>鎮ㄤ粖澶╄韩浣撴儏鍐垫�庝箞鏍�</span> + <i class="el-icon-phone-outline"></i + ><span>鎮ㄤ粖澶╄韩浣撴儏鍐垫�庝箞鏍�</span> </div> <div class="offside"> <i class="el-icon-user"></i> @@ -178,11 +193,7 @@ </template> <script> -import { - getsearchrResult, - getTaskservelist, - -} from "@/api/AiCentre/index"; +import { getsearchrResults, getTaskservelist } from "@/api/AiCentre/index"; export default { data() { return { @@ -190,50 +201,56 @@ userid: "", input: "浠婂ぉ韬綋杩樹笉閿�", radio: "2", - taskname:'', - tableDatatop: [],//棰樼洰琛� - logsheetlist:[], - sendname:null, - serviceType:null, - taskid:null, - patid:null, + taskname: "", + tableDatatop: [], //棰樼洰琛� + logsheetlist: [], + sendname: null, + serviceType: null, + taskid: null, + patid: null, }; }, created() { - this.taskid=this.$route.query.taskid; - this.sendname=this.$route.query.sendname; - this.patid=this.$route.query.patid; - this.serviceType=this.$route.query.serviceType; - this.getsearchrResult(); + this.taskid = this.$route.query.taskid; + this.sendname = this.$route.query.sendname; + this.patid = this.$route.query.patid; + this.serviceType = this.$route.query.serviceType; + this.getsearchrResults(); this.getTaskservelist(); }, - methods: { // 鑾峰彇闂嵎鏁版嵁 - getsearchrResult(){ - getsearchrResult({ - taskid:this.taskid, - patid:this.patid, + getsearchrResults() { + getsearchrResults({ + taskid: this.taskid, + patid: this.patid, }).then((res) => { if (res.code === 200) { this.tableDatatop = res.data.scriptResult.script; + this.tableDatatop.forEach((item) => { + if (item.scriptResult && item.scriptType != 2) { + item.scriptResult = JSON.parse(item.scriptResult); + } else if (item.scriptResult && item.scriptType == 2) { + item.scriptResult = item.scriptResult.split("&"); + } + }); this.taskname = res.data.taskName; } }); }, // 鑾峰彇鎮h�呰褰� - getTaskservelist(){ + getTaskservelist() { getTaskservelist({ - patid:this.patid, + patid: this.patid, }).then((res) => { if (res.code == 200) { this.logsheetlist = res.rows; } }); }, - Seedetails(){}, + Seedetails() {}, }, }; </script> @@ -290,15 +307,15 @@ } } .CONTENT { - padding: 10px; - .title { - font-size: 22px; - font-weight: bold; - margin-bottom: 20px; - text-align: center; - } + padding: 10px; + .title { + font-size: 22px; + font-weight: bold; + margin-bottom: 20px; + text-align: center; } - .preview-left { +} +.preview-left { margin: 20px; // margin: 20px; padding: 30px; diff --git a/src/views/followvisit/satisfaction/particulars/index.vue b/src/views/followvisit/satisfaction/particulars/index.vue index 5b14aaf..52eb2fe 100644 --- a/src/views/followvisit/satisfaction/particulars/index.vue +++ b/src/views/followvisit/satisfaction/particulars/index.vue @@ -478,7 +478,7 @@ { label: "闂ㄨ瘖缂栧彿", width: "", prop: "name" }, { label: "濮撳悕", width: "", prop: "name" }, { label: "骞撮緞", width: "", prop: "age" }, - { label: "鑱旂郴鐢佃瘽", width: "", prop: "name" }, + { label: "鑱旂郴鐢佃瘽", width: "", prop: "telcode" }, { label: "灏辫瘖绉戝", width: "", prop: "impTemplate" }, { label: "璇婃柇", width: "", prop: "name" }, { label: "鍑洪櫌鏃堕棿", width: "", prop: "name" }, @@ -492,7 +492,7 @@ { label: "闂ㄨ瘖缂栧彿", width: "", prop: "name" }, { label: "濮撳悕", width: "", prop: "name" }, { label: "骞撮緞", width: "", prop: "age" }, - { label: "鑱旂郴鐢佃瘽", width: "", prop: "name" }, + { label: "鑱旂郴鐢佃瘽", width: "", prop: "telcode" }, { label: "灏辫瘖绉戝", width: "", prop: "impTemplate" }, { label: "璇婃柇", width: "", prop: "name" }, { label: "鍑洪櫌鏃堕棿", width: "", prop: "name" }, @@ -506,7 +506,7 @@ { label: "鍛樺伐缂栧彿", width: "", prop: "name" }, { label: "濮撳悕", width: "", prop: "name" }, { label: "骞撮緞", width: "", prop: "age" }, - { label: "鑱旂郴鐢佃瘽", width: "", prop: "name" }, + { label: "鑱旂郴鐢佃瘽", width: "", prop: "telcode" }, { label: "鎵�鍦ㄧ瀹�", width: "", prop: "impTemplate" }, { label: "瀹屾垚鏃堕棿", width: "", prop: "create_time" }, { label: "鐘舵��", width: "", prop: "sex" }, diff --git a/src/views/outsideChainwt.vue b/src/views/outsideChainwt.vue index 99b818c..ff02544 100644 --- a/src/views/outsideChainwt.vue +++ b/src/views/outsideChainwt.vue @@ -82,17 +82,17 @@ <div class="CONTENT" v-else> <div class="preview-left" style="margin-top: 100px;"> <div style="font-size: 24px;color: #175997; font-weight: 600; margin-bottom: 10px;">鎰熻阿鎮ㄧ殑閰嶅悎!</div> - <div style="font-size: 20px;">閭eソ鐨勶紝鎮ㄨ鐨勮繖浜涙儏鍐垫垜閮借涓嬫潵浜嗭紝鎮ㄨ繖杈硅寰楄鎸夌収鍖荤敓璇寸殑澶嶈瘖鏃堕棿鏉ラ櫌澶嶆煡銆傚缓璁偍鍚堢悊钀ュ吇锛岄ギ椋熸竻娣★紝澶氬悆瀵屽惈绾ょ淮绱犵殑椋熺墿锛岄伩鍏嶈緵杈e埡婵�鎬ч鐗╋紝閫傚害鐨勫悍澶嶉敾鐐硷紝濡傛暎姝ャ�佽笣娉佃繍鍔ㄧ瓑锛岄闃茶鏍撳舰鎴愩�傚鏋滄湁浠讳綍涓嶉�傛垨鐤戦棶锛屼篃璇烽殢鏃朵笌鎴戜滑鑱旂郴銆傞偅鏈鍥炶鍒版缁撴潫锛岀鎮ㄨ韩浣撳仴搴凤紒</div> + <div style="font-size: 20px;">{{ revisitAfter }}</div> </div> </div> - <el-dialog + <!-- <el-dialog :visible.sync="dialogVisible" width="50%" > <div> <el-alert :title="revisitAfter" type="success"> </el-alert> </div> - </el-dialog> + </el-dialog> --> </div> </template> @@ -225,6 +225,7 @@ if (this.revisitAfter) { this.dialogVisible=true } + this.accomplish=true; this.$modal.msgSuccess("鎻愪氦鎴愬姛"); } }); @@ -248,7 +249,6 @@ form.svyLibTemplateScriptVOS = arr; Cachequestionnaire(form).then((res) => { if (res.code == 200) { - this.$modal.msgSuccess("鎻愪氦鎴愬姛"); if (subm) { this.submitForm(); } diff --git a/src/views/patient/patient/behospitalized.vue b/src/views/patient/patient/behospitalized.vue index e0c54a2..6a2047e 100644 --- a/src/views/patient/patient/behospitalized.vue +++ b/src/views/patient/patient/behospitalized.vue @@ -198,8 +198,8 @@ <el-table-column label="鑱旂郴鐢佃瘽" align="center" - key="telephone" - prop="telephone" + key="telcode" + prop="telcode" width="120" /> diff --git a/src/views/patient/patient/hospital.vue b/src/views/patient/patient/hospital.vue index ff41d50..659c808 100644 --- a/src/views/patient/patient/hospital.vue +++ b/src/views/patient/patient/hospital.vue @@ -198,8 +198,8 @@ <el-table-column label="鑱旂郴鐢佃瘽" align="center" - key="telephone" - prop="telephone" + key="telcode" + prop="telcode" width="120" /> diff --git a/src/views/patient/patient/outpatient.vue b/src/views/patient/patient/outpatient.vue index 220fc5b..0aa2c3e 100644 --- a/src/views/patient/patient/outpatient.vue +++ b/src/views/patient/patient/outpatient.vue @@ -187,8 +187,8 @@ <el-table-column label="鑱旂郴鐢佃瘽" align="center" - key="telephone" - prop="telephone" + key="telcode" + prop="telcode" width="120" /> <!-- <el-table-column diff --git a/src/views/patient/patient/physical.vue b/src/views/patient/patient/physical.vue index aab929e..2440772 100644 --- a/src/views/patient/patient/physical.vue +++ b/src/views/patient/patient/physical.vue @@ -49,7 +49,7 @@ <el-select v-model="queryParams.tagIds" multiple - filterable + filterable placeholder="璇烽�夋嫨" > <el-option @@ -187,10 +187,10 @@ width="120" /> <el-table-column - label="鑱旂郴鐢佃瘽锛堢己锛�" + label="鑱旂郴鐢佃瘽" align="center" - key="telephone" - prop="telephone" + key="telcode" + prop="telcode" width="120" /> <el-table-column diff --git a/src/views/patient/patient/profile/index.vue b/src/views/patient/patient/profile/index.vue index 66ceabc..6853899 100644 --- a/src/views/patient/patient/profile/index.vue +++ b/src/views/patient/patient/profile/index.vue @@ -405,8 +405,8 @@ <el-table-column label="鑱旂郴鐢佃瘽" align="center" - key="telephone" - prop="telephone" + key="telcode" + prop="telcode" width="120" /> <el-table-column @@ -723,7 +723,7 @@ <el-input v-model="numberform.contactname"></el-input> </el-form-item> <el-form-item label="鑱旂郴鐢佃瘽"> - <el-input v-model="numberform.contactway"></el-input> + <el-input v-model="numberform.telcode"></el-input> </el-form-item> <el-form-item label="鍏崇郴"> <el-input v-model="numberform.relation"></el-input> diff --git a/src/views/patient/propaganda/QuestionnaireTask.vue b/src/views/patient/propaganda/QuestionnaireTask.vue index 1c8b4ea..7259f01 100644 --- a/src/views/patient/propaganda/QuestionnaireTask.vue +++ b/src/views/patient/propaganda/QuestionnaireTask.vue @@ -416,66 +416,66 @@ </el-dialog> <el-dialog title="妯℃澘棰勮" :visible.sync="previewtf" width="60%"> <div class="preview-left"> - <!-- 鍗曢�� --> - <div - class="scriptTopic-dev" - v-for="item in questionList" - :key="item.sort" - v-if="item.scriptType == 1" - > - <div class="dev-text"> - {{ item.sort }}銆乕鍗曢�塢<span>{{ item.scriptContent }}</span> + <div v-for="item in questionList"> + <!-- 鍗曢�� --> + <div + class="scriptTopic-dev" + :key="item.sort" + v-if="item.scriptType == 1" + > + <div class="dev-text"> + {{ item.sort }}銆乕鍗曢�塢<span>{{ item.scriptContent }}</span> + </div> + <div class="dev-xx"> + <el-radio-group v-model="item.remark"> + <el-radio + v-for="(items, index) in item.svyLibTemplateTargetoptions" + :key="index" + :label="index" + >{{ items.optioncontent }}</el-radio + > + </el-radio-group> + </div> </div> - <div class="dev-xx"> - <el-radio-group v-model="item.remark"> - <el-radio - v-for="(items, index) in item.svyLibTemplateTargetoptions" - :key="index" - :label="index" - >{{ items.optioncontent }}</el-radio - > - </el-radio-group> + <!-- 澶氶�� --> + <div + class="scriptTopic-dev" + :key="item.sort" + v-if="item.scriptType == 2" + > + <div class="dev-text"> + {{ item.sort }}銆乕澶氶�塢<span>{{ item.scriptContent }}</span> + </div> + <div class="dev-xx"> + <el-checkbox-group v-model="qremark"> + <el-checkbox + v-for="(items, index) in item.svyLibTemplateTargetoptions" + :key="index" + :label="index" + > + {{ items.optioncontent }} + </el-checkbox> + </el-checkbox-group> + </div> </div> - </div> - <!-- 澶氶�� --> - <div - class="scriptTopic-dev" - v-for="item in questionList" - v-if="item.scriptType == 2" - > - <div class="dev-text"> - {{ item.sort }}銆乕澶氶�塢<span>{{ item.scriptContent }}</span> - </div> - <div class="dev-xx"> - <el-checkbox-group v-model="multiplechoice"> - <el-checkbox - v-for="items in item.svyLibTemplateTargetoptions" - :key="items.optioncontent" - :label="items.optioncontent" - > - {{ items.optioncontent }} - </el-checkbox> - </el-checkbox-group> - </div> - </div> - <!-- 濉┖ --> - <div - class="scriptTopic-dev" - v-for="item in questionList" - :key="item.sort" - v-if="item.scriptType == 4" - > - <div class="dev-text"> - {{ item.sort }}銆乕濉┖]<span>{{ item.scriptContent }}</span> - </div> - <div class="dev-xx"> - <el-input placeholder="璇疯緭鍏ョ瓟妗�" v-model="item.radioas" clearable> - </el-input> + <!-- 濉┖ --> + <div + class="scriptTopic-dev" + :key="item.sort" + v-if="item.scriptType == 4" + > + <div class="dev-text"> + {{ item.sort }}銆乕闂瓟]<span>{{ item.scriptContent }}</span> + </div> + <div class="dev-xx"> + <el-input placeholder="璇疯緭鍏ョ瓟妗�" v-model="radioas" clearable> + </el-input> + </div> </div> </div> </div> <span slot="footer" class="dialog-footer"> - <el-button @click="previewGo">鍓嶅線妯℃澘璇︽儏淇敼</el-button> + <!-- <el-button @click="previewGo">鍓嶅線妯℃澘璇︽儏淇敼</el-button> --> <el-button type="primary" @click="previewFn">纭浣跨敤</el-button> </span> </el-dialog> @@ -963,11 +963,13 @@ submitForm(formName) { if (this.time4 && this.form.sendType == 3) this.form.showTimeMorn = this.time4; - this.form.sendTimeslot = [{ - begantime: this.time4, - endtime: "", - xh: 1, - }]; + this.form.sendTimeslot = [ + { + begantime: this.time4, + endtime: "", + xh: 1, + }, + ]; if (this.checkList[0]) { this.form.preachform = this.checkList.join(","); } else { @@ -1026,6 +1028,8 @@ this.libId = row.svyid; this.Tasktemplate = row; this.questionList = row.svyTemplateLibScripts; + console.log(row.svyTemplateLibScripts); + this.previewtf = true; this.previewid = row.svyid; this.Variablehandling(row.svyTemplateLibScripts, 1); @@ -1040,7 +1044,6 @@ getQtemplatelist({ svyid: this.form.libtemplateid }).then((res) => { if (res.code == 200) { console.log(); - this.questionList = res.rows[0].svyTemplateLibScripts; this.previewtf = true; } @@ -1229,7 +1232,8 @@ this.overallCase = this.form.patTaskRelevances.concat(); this.checkList = this.form.preachform.split(","); console.log(this.form, "this.form"); - if (this.form.showDate)this.daytime = this.form.showDate.split(","); + if (this.form.showDate) + this.daytime = this.form.showDate.split(","); if (this.form.showTimeMorn) { if (this.form.sendType == 3) { this.time4 = this.form.showTimeMorn; diff --git a/src/views/repositoryai/intention/index.vue b/src/views/repositoryai/intention/index.vue index 0411e4e..2622f35 100644 --- a/src/views/repositoryai/intention/index.vue +++ b/src/views/repositoryai/intention/index.vue @@ -809,9 +809,6 @@ targetdesc: [ { required: true, message: "鎸囨爣鎻忚堪涓嶈兘涓虹┖", trigger: "blur" }, ], - dynamicTags: [ - { required: true, message: "鏍囩涓嶈兘涓虹┖", trigger: "blur" }, - ], valueType: [ { required: true, message: "鍊肩被鍨嬩笉鑳戒负绌�", trigger: "blur" }, ], diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue index e4dceb6..74149b4 100644 --- a/src/views/system/dept/index.vue +++ b/src/views/system/dept/index.vue @@ -184,9 +184,9 @@ </el-form-item> </el-col> <el-col :span="12"> - <el-form-item label="鑱旂郴鐢佃瘽" prop="phone"> + <el-form-item label="鑱旂郴鐢佃瘽" prop="telcode"> <el-input - v-model="form.phone" + v-model="form.telcode" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" maxlength="11" /> diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index d31eecf..7322ae1 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -737,14 +737,15 @@ /** 鏂板鎸夐挳鎿嶄綔 */ handleAdd() { this.reset(); - getUser().then((response) => { - this.postOptions = response.posts; - this.roleOptions = response.roles; - this.open = true; + this.open = true; this.title = "娣诲姞鐢ㄦ埛"; this.form.password = this.initPassword; this.form.depts = []; - }); + // getUser().then((response) => { + // this.postOptions = response.posts; + // this.roleOptions = response.roles; + + // }); }, /** 淇敼鎸夐挳鎿嶄綔 */ handleUpdate(row) { diff --git a/vue.config.js b/vue.config.js index 527692e..6474684 100644 --- a/vue.config.js +++ b/vue.config.js @@ -9,7 +9,7 @@ const name = process.env.VUE_APP_TITLE || '鎮h�呮櫤鎱ф湇鍔$郴缁�' // 缃戦〉鏍囬 -const port = process.env.port || process.env.npm_config_port || 8096 // 绔彛 +const port = process.env.port || process.env.npm_config_port || 8093 // 绔彛 // vue.config.js 閰嶇疆璇存槑 //瀹樻柟vue.config.js 鍙傝�冩枃妗� https://cli.vuejs.org/zh/config/#css-loaderoptions @@ -35,9 +35,9 @@ proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { - target: `http://192.168.1.10:8095`, + // target: `http://192.168.1.10:8095`, // target:`http://localhost:8095`, - // target: `http://192.168.101.135:8095`, + target: `http://192.168.101.135:8095`, changeOrigin: true, pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: '' -- Gitblit v1.9.3